diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-11 17:10:38 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-11 17:10:38 +0000 |
commit | 296c8514d0e46c983915843408b8bb35e3396fbc (patch) | |
tree | e13d0b58d50e992a08739023b5014100015e5ac7 /sw/source/ui/app | |
parent | eedebcddadd9369154b18a5dae45a9191a9d4689 (diff) |
follow logically changes in sfx2 and drop BMP_STYLES_FAMILY_NUM_HC
Diffstat (limited to 'sw/source/ui/app')
-rw-r--r-- | sw/source/ui/app/app.src | 1 | ||||
-rw-r--r-- | sw/source/ui/app/docst.cxx | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 1255df56904d..64eeab3c8d63 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 842e79829def..a5c5028b61d7 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* 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 ); } |