Purged BmpColorMode from libs-gui - impress

sd/source/ui/app/res_bmp.src

@@ -264,91 +264,82 @@ Bitmap BMP_FOILN_01
 {
     File = "foiln01.bmp" ;
 };
+
 Bitmap BMP_FOILN_01_H
 {
     File = "foiln01_h.bmp" ;
 };
+
 Bitmap BMP_PAGE
 {
     File = "page.bmp" ;
 };
+
 Bitmap BMP_PAGE_H
 {
     File = "page_h.bmp" ;
 };
+
 Bitmap BMP_PAGE_EXCLUDED
 {
     File = "pageexcl.bmp" ;
 };
+
 Bitmap BMP_PAGEOBJS_EXCLUDED
 {
     File = "pagobjex.bmp" ;
 };
+
 Bitmap BMP_PAGEOBJS
 {
     File = "pageobjs.bmp" ;
 };
+
 Bitmap BMP_OBJECTS
 {
     File = "objects.bmp" ;
 };
+
 Bitmap BMP_OLE
 {
     File = "ole.bmp" ;
 };
+
 Bitmap BMP_GROUP
 {
     File = "group.bmp" ;
 };
+
 Bitmap BMP_DOC_OPEN
 {
     File = "docopen.bmp" ;
 };
+
 Bitmap BMP_DOC_CLOSED
 {
     File = "docclose.bmp" ;
 };
+
 Bitmap BMP_DOC_TEXT
 {
     File = "doctext.bmp" ;
 };
+
 Bitmap BMP_EXPAND
 {
     File = "plus.bmp" ;
 };
+
 Bitmap BMP_COLLAPSE
 {
     File = "minus.bmp" ;
 };
+
 Bitmap BMP_GRAPHIC
 {
     File = "graphic.bmp" ;
 };
-Image IMG_PIPETTE_H
-{
-    ImageBitmap = Bitmap { File = "pipette_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_GET1OBJECT_H
-{
-    ImageBitmap = Bitmap { File = "get1obj_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_GETALLOBJECT_H
-{
-    ImageBitmap = Bitmap { File = "getallob_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_REMOVEBMP_H
-{
-    ImageBitmap = Bitmap { File = "del1bmp_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_REMOVEALLBMP_H
-{
-    ImageBitmap = Bitmap { File = "delall_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
+
 #define SfxStyleFamiliesRes1\
     Text [ en-US ] = "Graphics Styles" ;\
 
@@ -406,22 +397,27 @@ Bitmap BMP_PRESOBJ_GRAPHIC
 {
     File = "image.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_OBJECT
 {
     File = "object.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_CHART
 {
     File = "chart.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_ORGCHART
 {
     File = "orgchart.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_TABLE
 {
     File = "table.bmp" ;
 };
+
 Bitmap BMP_WAIT_ICON
 {
     File = "waiticon.bmp";
@@ -433,15 +429,18 @@ Bitmap BMP_FADE_EFFECT_INDICATOR
 {
     File = "fade_effect_indicator.bmp";
 };
+
 Bitmap BMP_FADE_EFFECT_INDICATOR_H
 {
     File = "fade_effect_indicator_hc.bmp";
 };
+
 Bitmap BMP_COMMENTS_INDICATOR
 {
     File = "comments_indicator.bmp";
 };
+
 Bitmap BMP_COMMENTS_INDICATOR_H
 {
     File = "comments_indicator_hc.bmp";
-};
+};
\ No newline at end of file

sd/source/ui/dlg/animobjs.cxx

@@ -182,11 +182,6 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 {
     FreeResource();
 
-    aBtnGetOneObject.SetModeImage( Image( SdResId( IMG_GET1OBJECT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnGetAllObjects.SetModeImage( Image( SdResId( IMG_GETALLOBJECT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnRemoveBitmap.SetModeImage( Image( SdResId( IMG_REMOVEBMP_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnRemoveAll.SetModeImage( Image( SdResId( IMG_REMOVEALLBMP_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     // neues Dokument mit Seite erzeugen
     pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL);
     SdPage* pPage = (SdPage*) pMyDoc->AllocPage(FALSE);

sd/source/ui/dlg/copydlg.cxx

@@ -102,7 +102,6 @@ CopyDlg::CopyDlg(
     FreeResource();
 
     // Set up the view data button (image and accessible name).
-    maBtnSetViewData.SetModeImage( Image( SdResId( IMG_PIPETTE_H ) ), BMP_COLOR_HIGHCONTRAST );
     maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText());
 
     // Farbtabellen

sd/source/ui/dlg/dlgass.cxx

@@ -443,8 +443,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
         mpPage1OpenPB->SetText(sText);
         // Place icon left of text and both centered in the button.
         mpPage1OpenPB->SetModeImage(
-            GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))),
-            BMP_COLOR_NORMAL);
+            GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open")))
+        );
         mpPage1OpenPB->EnableImageDisplay(TRUE);
         mpPage1OpenPB->EnableTextDisplay(TRUE);
         mpPage1OpenPB->SetImageAlign(IMAGEALIGN_LEFT);
@@ -463,7 +463,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage1OpenLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectFileHdl));
     mpPage1OpenLB->SetDoubleClickHdl(rFinishLink);
     mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl));
-    //  mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION)));
 
     // Seite 2
     maAssistentFunc.InsertControl(2, &maPreview );
@@ -529,7 +528,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
         mpPage3LogoCB = new CheckBox( pWindow, SdResId( CB_PAGE3_LOGO) ));
 
     mpPage3EffectLB->Fill();
-//  mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE );
     mpPage3EffectLB->SetSelectHdl( LINK(this,AssistentDlgImpl,SelectEffectHdl ));
     mpPage3EffectLB->SetDropDownLineCount( 12 );
 

sd/source/ui/dlg/dlgsnap.cxx

@@ -74,10 +74,6 @@ SdSnapLineDlg::SdSnapLineDlg(
       eUIUnit(pView->GetDoc()->GetUIUnit()),
       aUIScale(pView->GetDoc()->GetUIScale())
 {
-    aRbPoint.SetModeRadioImage( Image( SdResId( BMP_POINT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aRbVert.SetModeRadioImage( Image( SdResId( BMP_VERTICAL_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aRbHorz.SetModeRadioImage( Image( SdResId( BMP_HORIZONTAL_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     aRbHorz.SetClickHdl(LINK(this, SdSnapLineDlg, ClickHdl));

sd/source/ui/dlg/dlgsnap.src

@@ -157,50 +157,4 @@ ModalDialog DLG_SNAPLINE
             ImageBitmap = Bitmap { File = "hlplhorz.bmp" ; };
         };
     };
-
-    Image BMP_POINT_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlppoint_h.bmp" ; };
-    };
-
-    Image BMP_VERTICAL_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplvert_h.bmp" ; };
-    };
-
-    Image BMP_HORIZONTAL_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplhorz_h.bmp" ; };
-    };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

sd/source/ui/inc/dlgsnap.hrc

@@ -38,7 +38,3 @@
 #define RB_HORIZONTAL 11
 #define RB_VERTICAL 12
 #define RB_POINT 13
-
-#define BMP_POINT_H 1
-#define BMP_VERTICAL_H 2
-#define BMP_HORIZONTAL_H 3

sd/source/ui/inc/res_bmp.hrc

@@ -217,12 +217,6 @@
 
 // -----------------------------------------------------------------------------
 
-#define IMG_PIPETTE_H                       RID_APP_START+21
-#define IMG_GET1OBJECT_H                    RID_APP_START+22
-#define IMG_GETALLOBJECT_H                  RID_APP_START+23
-#define IMG_REMOVEBMP_H                     RID_APP_START+24
-#define IMG_REMOVEALLBMP_H                  RID_APP_START+25
-
 /*
  *  ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!!
  */