get this to build again

11 files changed, 12 insertions, 126 deletions

diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 0621222ec8b7..f6724fe50747 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -251,8 +251,6 @@
 // -----------------------------------------------------------------------
 #define RID_IMG_TREENODE_COLLAPSED          ( RID_IMAGE_START +   1 )
 #define RID_IMG_TREENODE_EXPANDED           ( RID_IMAGE_START +   2 )
-#define RID_IMG_TREENODE_COLLAPSED_HC       ( RID_IMAGE_START +   3 )
-#define RID_IMG_TREENODE_EXPANDED_HC        ( RID_IMAGE_START +   4 )
 #define REPORT_TREE_ICON                    ( RID_IMAGE_START +   5 )
 // menu -----------------------------------------------------------------------
 #define RID_MENU_REPORT                     ( RID_MENU_START + 0 )
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 43ad175d827d..e74d9bb4a6ec 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -512,16 +512,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
     return 0L;
 }
 //------------------------------------------------------------------------------
-ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
-    sal_Int16 nH = IMG_ADDFIELD_DLG_SCH;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_ADDFIELD_DLG_LC;
-        nH = IMG_ADDFIELD_DLG_LCH;
-    }
-    return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+    return ImageList(ModuleRes(nN));
 }
 //------------------------------------------------------------------
 void OAddFieldWindow::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 9da0ab2fe17c..f688d243cafe 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -285,19 +285,6 @@ ImageList IMG_CONDFORMAT_DLG_SC
     };
 };
 
-ImageList IMG_CONDFORMAT_DLG_SCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/sch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/sch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/sch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/sch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/sch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/sch_fontdialog.png" ; SID_CHAR_DLG ; > ;
-    };
-};
 ImageList IMG_CONDFORMAT_DLG_LC
 {
     MASKCOLOR;
@@ -311,21 +298,6 @@ ImageList IMG_CONDFORMAT_DLG_LC
         < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ;
     };
 };
-ImageList IMG_CONDFORMAT_DLG_LCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/lch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/lch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/lch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/lch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/lch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/lch_fontdialog.png" ; SID_CHAR_DLG ; > ;
-    };
-};
-
-
 
 ImageList 31000
 {
@@ -384,17 +356,6 @@ ImageList IMG_ADDFIELD_DLG_SC
     };
 };
 
-ImageList IMG_ADDFIELD_DLG_SCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/sch_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/sch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/sch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
-    };
-};
-
 ImageList IMG_ADDFIELD_DLG_LC
 {
     MASKCOLOR;
@@ -406,17 +367,6 @@ ImageList IMG_ADDFIELD_DLG_LC
     };
 };
 
-ImageList IMG_ADDFIELD_DLG_LCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/lch_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/lch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/lch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
-    };
-};
-
 FixedLine ADDFIELD_FL_HELP_SEPARATOR
 {
     SVLook = TRUE ;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index cc5d7abf7d14..2fae51b6e76b 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -386,16 +386,12 @@ void Condition::ApplyCommand( USHORT _nCommandId, const ::Color& _rColor)
     m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
 }
 //------------------------------------------------------------------------------
-ImageList Condition::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
-    sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_CONDFORMAT_DLG_LC;
-        nH = IMG_CONDFORMAT_DLG_LCH;
-    }
-    return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+    return ImageList(ModuleRes(nN));
 }
 //------------------------------------------------------------------
 void Condition::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index d382722ba818..e2c473177e7a 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -113,10 +113,8 @@ namespace rptui
         /** will be called when the 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/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 1a2d2a567057..b08d8da392c1 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1467,16 +1467,11 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     }
 }
 
-/**
- * @param _bHiContast (sic) unused noop. FIXME: please remove carefully
- */
-ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool /*_bHiContast*/) const
+ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_CONDFORMAT_DLG_LC;
-    }
     return ImageList(ModuleRes( nN ));
 }
 
@@ -1493,20 +1488,9 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
 
 //------------------------------------------------------------------
 // load the images
-ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType _eType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException ))
+ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException ))
 {
-    if (_eType == vcl::HIGHCONTRAST_NO)
-    {
-        return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC));
-    }
-    else if (_eType == vcl::HIGHCONTRAST_YES)
-    {
-        return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SCH));
-    }
-    else
-    {
-        throw com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("High contrast parameter is wrong.")), NULL, 0);
-    }
+    return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC));
 }
 
 // =============================================================================
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index cbfc8608d1bb..374ec169a055 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -110,10 +110,8 @@ public:
     /** will be called when the 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/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 84178a76feaa..5a05e2593b39 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -188,10 +188,8 @@ public:
         /** will be called when the image list is needed.
             @param  _eSymbolsSize
                 <svtools/imgdef.hxx>
-            @param  _bHiContast
-                <TRUE/> when in high contrast mode.
         */
-    virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const;
+    virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const;
 
     // ImageListProvider interface
     virtual ImageList getImageList(vcl::ImageListType) SAL_THROW ((com::sun::star::lang::IllegalArgumentException ));
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 50d4311d9ed4..2ae45214b44b 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -46,8 +46,6 @@ namespace rptui
         OSectionWindow*             m_pParent;
         static Image*               s_pDefCollapsed;
         static Image*               s_pDefExpanded;
-        static Image*               s_pDefCollapsedHC;
-        static Image*               s_pDefExpandedHC;
         static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
 
         sal_Bool                    m_bShowRuler;
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index da2e56a178e8..90dcb4a5ab92 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -51,8 +51,6 @@ namespace rptui
 
 Image*  OStartMarker::s_pDefCollapsed       = NULL;
 Image*  OStartMarker::s_pDefExpanded        = NULL;
-Image*  OStartMarker::s_pDefCollapsedHC = NULL;
-Image*  OStartMarker::s_pDefExpandedHC  = NULL;
 oslInterlockedCount OStartMarker::s_nImageRefCount  = 0;
 
 DBG_NAME( rpt_OStartMarker )
@@ -94,8 +92,6 @@ OStartMarker::~OStartMarker()
     {
         DELETEZ(s_pDefCollapsed);
         DELETEZ(s_pDefExpanded);
-        DELETEZ(s_pDefCollapsedHC);
-        DELETEZ(s_pDefExpandedHC);
     } // if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 )
 }
 // -----------------------------------------------------------------------------
@@ -191,11 +187,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 // -----------------------------------------------------------------------------
 void OStartMarker::changeImage()
 {
-    Image* pImage = NULL;
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC;
-    else
-        pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
+    Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
     m_aImage.SetImage(*pImage);
 }
 // -----------------------------------------------------------------------
@@ -204,20 +196,10 @@ void OStartMarker::initDefaultNodeImages()
     if ( !s_pDefCollapsed )
     {
         s_pDefCollapsed     = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED      ) );
-        s_pDefCollapsedHC   = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED_HC   ) );
         s_pDefExpanded      = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED       ) );
-        s_pDefExpandedHC    = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC    ) );
     }
 
-    Image* pImage = NULL;
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC;
-    }
-    else
-    {
-        pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
-    }
+    Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
     m_aImage.SetImage(*pImage);
     m_aImage.SetMouseTransparent(TRUE);
     m_aImage.SetBackground();
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 4a84f7bd034d..50f8138c861c 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -122,18 +122,6 @@ Image RID_IMG_TREENODE_EXPANDED
     MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
 };
 
-Image RID_IMG_TREENODE_COLLAPSED_HC
-{
-    ImageBitmap = Bitmap { File = "plus_sch.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
-Image RID_IMG_TREENODE_EXPANDED_HC
-{
-    ImageBitmap = Bitmap { File = "minus_sch.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
 String STR_SHOW_RULER
 {
     Text [ en-US ] = "Show ruler";