libs-gui HC cleanup and .bmp fix

6 files changed, 22 insertions, 217 deletions

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4f76193d4b90..d08994c9d6de 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -392,11 +392,6 @@ void DeInitVCL()
         delete pSVData->maWinData.mpMsgBoxImgList;
         pSVData->maWinData.mpMsgBoxImgList = NULL;
     }
-    if ( pSVData->maWinData.mpMsgBoxHCImgList )
-    {
-        delete pSVData->maWinData.mpMsgBoxHCImgList;
-        pSVData->maWinData.mpMsgBoxHCImgList = NULL;
-    }
     if ( pSVData->maCtrlData.mpCheckImgList )
     {
         delete pSVData->maCtrlData.mpCheckImgList;
@@ -437,21 +432,11 @@ void DeInitVCL()
         delete pSVData->maCtrlData.mpDisclosurePlus;
         pSVData->maCtrlData.mpDisclosurePlus = NULL;
     }
-    if ( pSVData->maCtrlData.mpDisclosurePlusHC )
-    {
-        delete pSVData->maCtrlData.mpDisclosurePlusHC;
-        pSVData->maCtrlData.mpDisclosurePlusHC = NULL;
-    }
     if ( pSVData->maCtrlData.mpDisclosureMinus )
     {
         delete pSVData->maCtrlData.mpDisclosureMinus;
         pSVData->maCtrlData.mpDisclosureMinus = NULL;
     }
-    if ( pSVData->maCtrlData.mpDisclosureMinusHC )
-    {
-        delete pSVData->maCtrlData.mpDisclosureMinusHC;
-        pSVData->maCtrlData.mpDisclosureMinusHC = NULL;
-    }
     if ( pSVData->mpDefaultWin )
     {
         delete pSVData->mpDefaultWin;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2373395ae248..51f602542ae1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -4382,18 +4382,11 @@ void DisclosureButton::ImplDrawCheckBoxState()
         ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData );
         if( ! rCtrlData.mpDisclosurePlus )
             rCtrlData.mpDisclosurePlus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS ) ) );
-        if( ! rCtrlData.mpDisclosurePlusHC )
-            rCtrlData.mpDisclosurePlusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS_HC ) ) );
         if( ! rCtrlData.mpDisclosureMinus )
             rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) );
-        if( ! rCtrlData.mpDisclosureMinusHC )
-            rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) );
 
         Image* pImg = NULL;
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC;
-        else
-            pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
+        pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
 
         DBG_ASSERT( pImg, "no disclosure image" );
         if( ! pImg )
@@ -4429,5 +4422,4 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt )
         Button::KeyInput( rKEvt );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 6d2360dae6cb..a6792b202b3d 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -80,68 +80,3 @@ String SV_BUTTONTEXT_ABORT
 {
     Text [ en-US ] = "~Abort";
 };
-
-/* HelpTexte, die wir derzeit nicht mehr verwenden:
-SV_BUTTONHELPTEXT_OK
-{
-    Text = "Schlie�t dieses Dialogfeld und speichert alle vorgenommenen �nderungen." ;
-};
-
-SV_BUTTONHELPTEXT_CANCEL
-{
-    Text = "Schlie�t dieses Dialogfeld, ohne Ihre �nderungen zu speichern." ;
-};
-
-SV_BUTTONHELPTEXT_HELP
-{
-    Text = "Zeigt Hilfe zu diesem Fenster an." ;
-};
-
-SV_BUTTONHELPTEXT_MORE
-{
-    Text = "Zeigt weitere Einstellm�glichkeiten an oder versteckt diese wieder." ;
-};
-
-Finnische-Texte:
-OK          OK
-CANCEL      Peruuta
-HELP        ~Ohje
-MORE        ~Enemm�n
-YES         ~Kyll�
-NO          ~Ei
-RETRY       ~Yrit�uudelleen
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index a42a9531d9ee..59d7ea3d443e 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -138,26 +138,3 @@ String SV_SHORTCUT_SPLITTER
 {
     Text [ en-US ] = "Split window separator" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 35b52f422ac8..871cd6af2b29 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -35,27 +35,27 @@
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
 {
-    File = "check.bmp";
+    File = "check.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET)
 {
-    File = "checkwin.bmp";
+    File = "checkwin.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET)
 {
-    File = "checkos2.bmp";
+    File = "checkos2.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET)
 {
-    File = "checkmac.bmp";
+    File = "checkmac.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET)
 {
-    File = "checkunx.bmp";
+    File = "checkunx.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
@@ -65,39 +65,39 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 
 Bitmap (SV_RESID_BITMAP_SCROLLBMP)
 {
-    File = "scrbmp.bmp";
+    File = "scrbmp.png";
 };
 
 Bitmap (SV_RESID_BITMAP_SCROLLMSK)
 {
-    File = "scrmsk.bmp";
+    File = "scrmsk.png";
 };
 
 // -----------------------------------------------------------------------
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
 {
-    File = "radio.bmp";
+    File = "radio.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET)
 {
-    File = "radiowin.bmp";
+    File = "radiowin.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET)
 {
-    File = "radioos2.bmp";
+    File = "radioos2.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET)
 {
-    File = "radiomac.bmp";
+    File = "radiomac.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET)
 {
-    File = "radiounx.bmp";
+    File = "radiounx.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
@@ -112,32 +112,32 @@ Bitmap SV_RESID_BITMAP_MSGBOX
 
 Bitmap SV_RESID_BITMAP_PIN
 {
-    File = "pin.bmp";
+    File = "pin.png";
 };
 
 Bitmap SV_RESID_BITMAP_CLOSEDOC
 {
-    File = "closedoc.bmp";
+    File = "closedoc.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITHPIN
 {
-    File = "splhpin.bmp";
+    File = "splhpin.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVPIN
 {
-    File = "splvpin.bmp";
+    File = "splvpin.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITHARW
 {
-    File = "splharw.bmp";
+    File = "splharw.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVARW
 {
-    File = "splvarw.bmp";
+    File = "splvarw.png";
 };
 
 Bitmap (SV_ICON_SIZE48_START)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 709ee79d1424..c380791de83b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -73,89 +73,19 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re
 {
     SetPaintTransparent( TRUE );
     SetBackground();
-    if( useHCColorReplacement() )
-        maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
-    else
-        maPageVDev.SetBackground( Color( COL_WHITE ) );
+    maPageVDev.SetBackground( Color( COL_WHITE ) );
 }
 
 PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
 {
 }
 
-bool PrintDialog::PrintPreviewWindow::useHCColorReplacement() const
-{
-    bool bRet = false;
-    if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        try
-        {
-            // get service provider
-            Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() );
-            // create configuration hierachical access name
-            if( xSMgr.is() )
-            {
-                try
-                {
-                    Reference< XMultiServiceFactory > xConfigProvider(
-                        Reference< XMultiServiceFactory >(
-                            xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                            "com.sun.star.configuration.ConfigurationProvider" ))),
-                            UNO_QUERY )
-                        );
-                    if( xConfigProvider.is() )
-                    {
-                        Sequence< Any > aArgs(1);
-                        PropertyValue aVal;
-                        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
-                        aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Accessibility" ) );
-                        aArgs.getArray()[0] <<= aVal;
-                        Reference< XNameAccess > xConfigAccess(
-                            Reference< XNameAccess >(
-                                xConfigProvider->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ),
-                                UNO_QUERY )
-                            );
-                        if( xConfigAccess.is() )
-                        {
-                            try
-                            {
-                                sal_Bool bValue = sal_False;
-                                Any aAny = xConfigAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsForPagePreviews" ) ) );
-                                if( aAny >>= bValue )
-                                    bRet = bool(bValue);
-                            }
-                            catch( NoSuchElementException& )
-                            {
-                            }
-                            catch( WrappedTargetException& )
-                            {
-                            }
-                        }
-                    }
-                }
-                catch( Exception& )
-                {
-                }
-            }
-        }
-        catch( WrappedTargetException& )
-        {
-        }
-    }
-    return bRet;
-}
-
 void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt )
 {
     // react on settings changed
     if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS )
     {
-        if( useHCColorReplacement() )
-            maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
-        else
-            maPageVDev.SetBackground( Color( COL_WHITE ) );
+        maPageVDev.SetBackground( Color( COL_WHITE ) );
     }
     Window::DataChanged( i_rDCEvt );
 }
@@ -304,10 +234,6 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
     #endif
     SetQuickHelpText( aBuf.makeStringAndClear() );
     maMtf = i_rNewPreview;
-    if( useHCColorReplacement() )
-    {
-        maMtf.ReplaceColors( Color( COL_BLACK ), Color( COL_WHITE ), 30 );
-    }
 
     maOrigSize = i_rOrigSize;
     maReplacementString = i_rReplacement;
@@ -598,9 +524,7 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId )
     , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) )
     , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) )
     , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
-    , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) )
     , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
-    , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) )
     , mnCollateUIMode( 0 )
     , maLayout( NULL, true )
 {
@@ -1730,20 +1654,12 @@ void PrintDialog::checkControlDependencies()
         maJobPage.maCollateBox.Enable( FALSE );
 
     Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
-    Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg );
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     Size aImgSize( aImg.GetSizePixel() );
-    Size aHCImgSize( aHCImg.GetSizePixel() );
-
-    if( aHCImgSize.Width() > aImgSize.Width() )
-        aImgSize.Width() = aHCImgSize.Width();
-    if( aHCImgSize.Height() > aImgSize.Height() )
-        aImgSize.Height() = aHCImgSize.Height();
 
     // adjust size of image
     maJobPage.maCollateImage.SetSizePixel( aImgSize );
-    maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg );
+    maJobPage.maCollateImage.SetImage( aImg );
     maJobPage.maLayout.resize();
 
     // enable setup button only for printers that can be setup