[Libreoffice-commits] .: 2 commits - connectivity/source sfx2/inc sfx2/source

[Caolán McNamara]

 connectivity/source/drivers/hsqldb/HConnection.cxx |    6 +++---
 connectivity/source/inc/hsqldb/HConnection.hxx     |    2 +-
 sfx2/inc/sfx2/objsh.hxx                            |    4 +---
 sfx2/source/doc/objcont.cxx                        |   11 ++---------
 4 files changed, 7 insertions(+), 16 deletions(-)

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

    WaE remove unused variables, merge both GetStyleFamilyBitmap together

diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 9d0cfe6..76ae476 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 72bc3e1..2381fd1 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)
commit f60a69e90debb59af1af210dae7c77f623778f4b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 11 16:26:08 2010 +0000

    WaE, remove unused parameters

diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 6ac46f0..7cdb58a 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -219,7 +219,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
+    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
 
@@ -227,7 +227,7 @@ namespace connectivity { namespace hsqldb
         if ( !impl_isTextTable_nothrow( _TableName ) )
             return NULL;
 
-        return impl_getTextTableIcon_nothrow( _ColorMode );
+        return impl_getTextTableIcon_nothrow();
     }
 
     // -------------------------------------------------------------------
@@ -347,7 +347,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XGraphic > OHsqlConnection::impl_getTextTableIcon_nothrow( ::sal_Int32 _ColorMode )
+    Reference< XGraphic > OHsqlConnection::impl_getTextTableIcon_nothrow()
     {
         Reference< XGraphic > xGraphic;
         try
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 50e825c..5c86cf9 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -135,7 +135,7 @@ namespace connectivity
             /** retrieves the icon for HSQL TEXT TABLEs
             */
             ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
-                impl_getTextTableIcon_nothrow( ::sal_Int32 _ColorMode );
+                impl_getTextTableIcon_nothrow();
         };
 
         //==========================================================================