get this to build again

5 files changed, 7 insertions, 51 deletions

diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 6ecab0555..3b573f1f8 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -266,14 +266,6 @@ namespace dbaui
     */
     void adjustToolBoxSize(ToolBox* _pToolBox);
 
-    /** isHiContrast check if we are in hi contrast mode.
-        @param	_pWindow
-            The window we have to check on.
-        @return
-            <TRUE/> if so, otherwise <FALSE/>
-    */
-    sal_Bool isHiContrast(Window* _pWindow);
-
     void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId );
 
     /** check if SQL92 name checking is enabled
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index ef5efc08b..af22fc44d 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -255,7 +255,7 @@
 // free
 //  ...
 // free
-#define	IMG_JOINS_H				RID_IMAGE_START + 32
+#define REPORTFOLDER_TREE_ICON          RID_IMAGE_START + 24
 #define	IMG_FORMFOLDER_TREE_L			RID_IMAGE_START + 39
 #define	IMG_REPORTFOLDER_TREE_L			RID_IMAGE_START + 40
 #define	IMG_QUERYFOLDER_TREE_L			RID_IMAGE_START + 41
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 1ad4678d5..b1a2c6c2e 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -87,16 +87,13 @@ namespace dbaui
                 the name of the object
             @param  _out_rImage
                 the normal image to use for the object
-            @param  _out_rImageHC
-                the high-contrast version of the image to use for the object
             @return
                 the image to be used for the object.
         */
         void getImages(
             const String& _rName,
             const sal_Int32 _nDatabaseObjectType,
-            Image& _out_rImage,
-            Image& _out_rImageHC
+            Image& _out_rImage
         );
 
         /** returns the default image to be used for a database object
@@ -108,19 +105,11 @@ namespace dbaui
             @param  _nDatabaseObjectType
                 the type of the object. Must be one of the css.sdb.application.DatabaseObject
                 constants.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for the object type.
         */
         Image getDefaultImage(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
-        );
+            sal_Int32 _nDatabaseObjectType);
 
         /** returns the resource ID for the default image to be used for a database object
 
@@ -131,19 +120,12 @@ namespace dbaui
             @param  _nDatabaseObjectType
                 the type of the object. Must be one of the css.sdb.application.DatabaseObject
                 constants.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the resource ID image to be used for the object type. Must be fed into a
                 ModuleRes instance to actually load the image.
         */
         USHORT getDefaultImageResourceID(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
+            sal_Int32 _nDatabaseObjectType
         );
 
         /** retrieves the image to be used for folders of database objects
@@ -152,31 +134,18 @@ namespace dbaui
                 constants.
             @param  _rName
                 the name of the object
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for folders of the given type
         */
         Image getFolderImage(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
+            sal_Int32 _nDatabaseObjectType
         );
 
         /** retrieves the image to be used for a database as a whole.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for folders of this type
         */
-        Image getDatabaseImage( bool _bHighContrast );
+        Image getDatabaseImage();
     };
 
 //........................................................................
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 965407e4e..88f7d2117 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -133,10 +133,8 @@ namespace dbaui
         /** will be called whenthe id of the image list is needed.
             @param	_eBitmapSet
                 <svtools/imgdef.hxx>
-            @param	_bHiContast
-                <TRUE/> when in high contrast mode.
         */
-        virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const;
+        virtual ImageList getImageList(sal_Int16 _eBitmapSet) const;
 
         /** will be called when the controls need to be resized.
         */
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 0d6ef5da4..507003f97 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -471,9 +471,6 @@ namespace dbaui
         // remove all grid columns and dispose them
         void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer);
 
-        sal_Bool isHiContrast() const;
-
-
         /** checks if the currently displayed entry changed
             @param	_sName
                     Name of the changed entry