diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-13 17:32:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-13 21:03:32 +0000 |
| commit | 969750a995e473da9381dd8b2c06ad98abd37054 (patch) | |
| tree | 0cedba3f9718d667de609b79c638f4db6fc81ebd | |
| parent | 505409cbe575ed248cc6ade4e7f9048a08947d53 (diff) | |
remove unused HiContrast args
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/docvor.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 15 |
3 files changed, 1 insertions, 35 deletions
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index b9f2ce59bc8b..214061611aa3 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -567,15 +567,6 @@ public: sal_uInt16 nIdx1, sal_uInt16 nIdx2 = INDEX_IGNORE ); - virtual void GetContent( String &, - Bitmap &rClosedBitmap, - Bitmap &rOpenedBitmap, - BmpColorMode eColorMode, - sal_Bool &bCanDelete, - sal_uInt16 nPos, - sal_uInt16 nIdx1, - sal_uInt16 nIdx2 = INDEX_IGNORE ); - virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16 nIdx3); diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index ea3b383982fc..c44953a6b971 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1165,20 +1165,10 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry ) */ { - // wenn keine Childs vorhanden sind, gfs. Childs - // einfuegen - BmpColorMode eColorMode = BMP_COLOR_NORMAL; - - if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) - eColorMode = BMP_COLOR_HIGHCONTRAST; - - if ( !GetModel()->HasChilds( pEntry ) ) { WaitObject aWaitCursor( this ); - // Choose the correct mask color dependent from eColorMode. This must be adopted if - // we change the mask color for normal images, too! Color aMaskColor( COL_LIGHTMAGENTA ); // hier sind alle initial eingefuegt @@ -1208,7 +1198,7 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry ) { BOOL bDeletable; aRef->GetContent( - aText, aClosedBmp, aOpenedBmp, eColorMode, bDeletable, + aText, aClosedBmp, aOpenedBmp, bDeletable, i, aPath[nDocLevel+1], aPath[nDocLevel+2]); // Create image with the correct mask color diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index bfa123429800..cdcbbd85a473 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -401,24 +401,9 @@ BOOL SfxObjectShell::CanHaveChilds(USHORT nIdx1, //-------------------------------------------------------------------- -void SfxObjectShell::GetContent(String &rText, - Bitmap &rClosedBitmap, - Bitmap &rOpenedBitmap, - BOOL &bCanDel, - USHORT i, - USHORT nIdx1, - USHORT nIdx2 ) -{ - DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" ); - SfxObjectShell::GetContent( rText, rClosedBitmap, rOpenedBitmap, BMP_COLOR_NORMAL, bCanDel, i, nIdx1, nIdx2 ); -} - -//-------------------------------------------------------------------- - void SfxObjectShell::GetContent(String &rText, Bitmap &rClosedBitmap, Bitmap &rOpenedBitmap, - BmpColorMode eColorMode, BOOL &bCanDel, USHORT i, USHORT nIdx1, |