[Libreoffice-commits] .: sw/inc sw/source

[Caolán McNamara]

 sw/inc/docsh.hxx           |    2 +-
 sw/source/ui/app/app.src   |    1 -
 sw/source/ui/app/docst.cxx |   12 +++---------
 sw/source/ui/inc/app.hrc   |    1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit c115da6cd8a3978f647f8efdaf45fcc2db5fb03c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 11 17:10:38 2010 +0000

    follow logically changes in sfx2 and drop BMP_STYLES_FAMILY_NUM_HC

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 4e06b3f..7a73e39 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -212,7 +212,7 @@ public:
                         USHORT nIdx2 = INDEX_IGNORE,
                         USHORT nIdx3 = INDEX_IGNORE);
 
-    virtual Bitmap 		GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode );
+    virtual Bitmap 		GetStyleFamilyBitmap( SfxStyleFamily eFamily );
 
     // View setzen fuer Aktionen ueber Shell
     void 		  SetView(SwView* pVw);
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index acad200..cf76bf6 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -181,7 +181,6 @@ BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
 
 // Bitmap fuer die NumerierungsVorlagen im Organizer
 Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
-Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.bmp" ; };
 
 String STR_ENV_TITLE
 {
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 4f0f7c2..4ed9abd 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -1261,17 +1261,11 @@ void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell* 	pAc
     Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, FALSE, bColumn, pActShell);
 }
 
-Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode )
+Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
 {
     if( SFX_STYLE_FAMILY_PSEUDO == eFamily )
-    {
-        if ( eColorMode == BMP_COLOR_NORMAL )
-            return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
-        else
-            return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM_HC ));
-    }
-
-    return SfxObjectShell::GetStyleFamilyBitmap( eFamily, eColorMode );
+        return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
+    return SfxObjectShell::GetStyleFamilyBitmap( eFamily );
 }
 
 
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 04cb0da..30ca41b 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -58,7 +58,6 @@
 
 // Bitmap fuer die NumerierungsVorlagen im Organizer
 #define BMP_STYLES_FAMILY_NUM		    (RC_APP_BEGIN + 17)
-#define BMP_STYLES_FAMILY_NUM_HC	    (RC_APP_BEGIN + 18)
 
 // Strings fuer Bereiche in der Konfiguration
 #define STR_GRP_FILE				    (RC_APP_BEGIN + 56)