[Libreoffice-commits] .: sd/source

Joseph Powers jpowers at kemper.freedesktop.org
Sat Nov 13 00:48:54 PST 2010


 sd/source/ui/app/res_bmp.src  |   50 ++++++++++++++++++++----------------------
 sd/source/ui/dlg/animobjs.cxx |   29 ++++++++++--------------
 sd/source/ui/dlg/copydlg.cxx  |    9 +++----
 sd/source/ui/dlg/dlgass.cxx   |    8 ++----
 sd/source/ui/dlg/dlgsnap.cxx  |   12 +++-------
 sd/source/ui/dlg/dlgsnap.src  |   48 ----------------------------------------
 sd/source/ui/inc/dlgsnap.hrc  |    6 -----
 sd/source/ui/inc/res_bmp.hrc  |    6 -----
 8 files changed, 49 insertions(+), 119 deletions(-)

New commits:
commit eda60e9e4fde0b21928d17095a7c4a553bfcb575
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Nov 13 00:34:34 2010 -0800

    Purged BmpColorMode from libs-gui - impress

diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 17d5b1a..e78d099 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/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
+};
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 48ece79..7033b21 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -134,8 +134,8 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
     {
         const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
         SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) );
-        SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() 
-            ? ViewShell::OUTPUT_DRAWMODE_CONTRAST 
+        SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode()
+            ? ViewShell::OUTPUT_DRAWMODE_CONTRAST
             : ViewShell::OUTPUT_DRAWMODE_COLOR );
     }
 }
@@ -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);
@@ -232,7 +227,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 AnimationWindow::~AnimationWindow()
 {
     ULONG i, nCount;
-    
+
     delete pControllerItem;
 
     // Bitmapliste bereinigen
@@ -430,7 +425,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
     // Code jetzt in AddObj()
     SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE );
 
-    GetBindings().GetDispatcher()->Execute( 
+    GetBindings().GetDispatcher()->Execute(
         SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
     return( 0L );
 }
@@ -534,7 +529,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG )
     // Code jetzt in CreatePresObj()
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE );
 
-    GetBindings().GetDispatcher()->Execute( 
+    GetBindings().GetDispatcher()->Execute(
         SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
     return( 0L );
 }
@@ -598,7 +593,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls )
             const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
             aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
             aVD.SetDrawMode( rStyles.GetHighContrastMode()
-                ? ViewShell::OUTPUT_DRAWMODE_CONTRAST 
+                ? ViewShell::OUTPUT_DRAWMODE_CONTRAST
                 : ViewShell::OUTPUT_DRAWMODE_COLOR );
             aVD.Erase();
             pObject->SingleObjectPainter( aVD ); // #110094#-17
@@ -855,7 +850,7 @@ BOOL AnimationWindow::Close()
     {
         SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE );
 
-        GetBindings().GetDispatcher()->Execute( 
+        GetBindings().GetDispatcher()->Execute(
             SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
         SfxDockingWindow::Close();
@@ -954,7 +949,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                 for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ )
                 {
                     SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject );
-                
+
                     pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() );
                     aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 );
 
@@ -964,7 +959,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
 
                     // Clone
                     pPage->InsertObject( pSnapShot->Clone(), aBmpExList.GetCurPos() + 1 );
-                    
+
                     // Weiterschalten der BitmapListe
                     aBmpExList.Next();
                 }
@@ -1147,7 +1142,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
             AnimationBitmap aAnimBmp;
             long            nLoopCount = 0L;
             USHORT          nPos = aLbLoopCount.GetSelectEntryPos();
-            
+
             if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich
                 nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32();
 
@@ -1285,7 +1280,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt )
 AnimationControllerItem::AnimationControllerItem(
     USHORT _nId,
     AnimationWindow* pAnimWin,
-    SfxBindings*	_pBindings) 
+    SfxBindings*	_pBindings)
     : SfxControllerItem( _nId, *_pBindings ),
       pAnimationWin( pAnimWin )
 {
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index a341443..54062d1 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,10 +65,10 @@ namespace sd {
 \************************************************************************/
 
 CopyDlg::CopyDlg(
-    ::Window* pWindow, 
+    ::Window* pWindow,
     const SfxItemSet& rInAttrs,
-    XColorTable* pColTab, 
-    ::sd::View* pInView ) 
+    XColorTable* pColTab,
+    ::sd::View* pInView )
     : SfxModalDialog     ( pWindow, SdResId( DLG_COPY ) ),
       maFtCopies           ( this, SdResId( FT_COPIES ) ),
       maNumFldCopies       ( this, SdResId( NUM_FLD_COPIES ) ),
@@ -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
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index e1b7042..e0c952c 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -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 );
 
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 3f48ae3..d2ada13 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,9 +54,9 @@
 \************************************************************************/
 
 SdSnapLineDlg::SdSnapLineDlg(
-    ::Window* pWindow, 
+    ::Window* pWindow,
     const SfxItemSet& rInAttrs,
-    ::sd::View* pView) 
+    ::sd::View* pView)
     : ModalDialog (pWindow, SdResId(DLG_SNAPLINE)),
       aFlPos      (this, SdResId(FL_POSITION)),
       aFtX        (this, SdResId(FT_X)),
@@ -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));
@@ -98,7 +94,7 @@ SdSnapLineDlg::SdSnapLineDlg(
     SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
 
     // #i48497# Consider page origin
-    SdrPageView* pPV = pView->GetSdrPageView();	
+    SdrPageView* pPV = pView->GetSdrPageView();
     Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1);
     pPV->LogicToPagePos(aLeftTop);
     Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2);
diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src
index 43bdb41..1112ade 100644
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -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" ; };
-    };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/source/ui/inc/dlgsnap.hrc b/sd/source/ui/inc/dlgsnap.hrc
index f7a2024..6d4c1a6 100644
--- a/sd/source/ui/inc/dlgsnap.hrc
+++ b/sd/source/ui/inc/dlgsnap.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -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
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 6ed00c8..d87f748 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/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 !!!
  */


More information about the Libreoffice-commits mailing list