diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-11 17:10:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-11 17:10:09 +0000 |
| commit | 1a565396616851113cdc0cdc0275bee76e1afe46 (patch) | |
| tree | 93c39edff66ef452ee929f8e164b72e34f12962c | |
| parent | ecf28fe6aa3eee6f75421b4b5f8ce4969daa916b (diff) | |
WaE remove unused variables, merge both GetStyleFamilyBitmap together
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index e41c00794e7c..b9f2ce59bc8b 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -579,9 +579,7 @@ public: virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16 nIdx3); - virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily ); - - virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode ); + virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily); virtual sal_Bool Insert( SfxObjectShell &rSource, sal_uInt16 nSourceIdx1, diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index a98a2723b15d..b0a84188107e 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -465,7 +465,7 @@ void SfxObjectShell::GetContent(String &rText, bCanDel=((pStyle->GetMask() & SFXSTYLEBIT_USERDEF) == SFXSTYLEBIT_USERDEF); rClosedBitmap = rOpenedBitmap = - GetStyleFamilyBitmap(pStyle->GetFamily(), eColorMode ); + GetStyleFamilyBitmap(pStyle->GetFamily()); } break; case CONTENT_MACRO: @@ -474,15 +474,8 @@ void SfxObjectShell::GetContent(String &rText, } //-------------------------------------------------------------------- -Bitmap SfxObjectShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily ) -{ - DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" ); - return SfxObjectShell::GetStyleFamilyBitmap( eFamily, BMP_COLOR_NORMAL ); -} - -//-------------------------------------------------------------------- -Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode ) +Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily) { USHORT nResId = 0; switch(eFamily) |