INTEGRATION: CWS warnings01 (1.11.32); FILE MERGED

2006/01/25 17:35:38 sb 1.11.32.3: RESYNC: (1.11-1.12); FILE MERGED
2005/11/16 15:20:37 pl 1.11.32.2: #i55991# removed warnings
2005/10/28 14:48:42 cd 1.11.32.1: #i55991# Warning free code changes for gcc

1 files changed, 15 insertions, 33 deletions

diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 44d4ebd275..e53c89920c 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: moduleimagemanager.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2006-01-05 18:10:52 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:31:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -170,7 +170,7 @@ namespace framework
 
 static osl::Mutex*          pImageListWrapperMutex = 0;
 static GlobalImageList*     pGlobalImageList = 0;
-static char* ImageType_Prefixes[ImageType_COUNT] =
+static const char* ImageType_Prefixes[ImageType_COUNT] =
 {
     "res/commandimagelist/sc_",
     "res/commandimagelist/lc_",
@@ -206,8 +206,8 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceF
 //_________________________________________________________________________________________________________________
 
 CmdImageList::CmdImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager, const rtl::OUString& aModuleIdentifier ) :
-    m_aModuleIdentifier( aModuleIdentifier ),
     m_bVectorInit( sal_False ),
+    m_aModuleIdentifier( aModuleIdentifier ),
     m_xServiceManager( rServiceManager ),
     m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
 {
@@ -332,7 +332,7 @@ Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUS
     return Image();
 }
 
-bool CmdImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCommandURL )
 {
     impl_fillCommandToImageNameMap();
     CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
@@ -432,11 +432,6 @@ DEFINE_XTYPEPROVIDER_6                  (   ModuleImageManager
                                             ::com::sun::star::ui::XUIConfigurationPersistence
                                         )
 
-static OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
-{
-    return OUString();
-}
-
 static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType )
 {
     static Size   aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL );
@@ -481,20 +476,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
     return nIndex;
 }
 
-static sal_Int16 implts_convertIndexToImageType( sal_Int16 nIndex )
-{
-    sal_Int16 nImageType = ::com::sun::star::ui::ImageType::SIZE_DEFAULT;
-    switch ( nImageType )
-    {
-        case 0: break;
-        case 1: nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE; break;
-        case 2: nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; break;
-        case 3: nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                              ::com::sun::star::ui::ImageType::SIZE_LARGE; break;
-    }
-    return nImageType;
-}
-
 const rtl::Reference< GlobalImageList >& ModuleImageManager::implts_getGlobalImageList()
 {
     ResetableGuard aGuard( m_aLock );
@@ -574,9 +555,9 @@ sal_Bool ModuleImageManager::implts_loadUserImages(
             uno::Reference< XInputStream > xInputStream = xStream->getInputStream();
 
             ImageListsDescriptor aUserImageListInfo;
-            sal_Bool bResult = ImagesConfiguration::LoadImages( m_xServiceManager,
-                                                                xInputStream,
-                                                                aUserImageListInfo );
+            ImagesConfiguration::LoadImages( m_xServiceManager,
+                                             xInputStream,
+                                             aUserImageListInfo );
             if (( aUserImageListInfo.pImageList != 0 ) &&
                 ( aUserImageListInfo.pImageList->Count() > 0 ))
             {
@@ -738,17 +719,18 @@ sal_Bool ModuleImageManager::implts_storeUserImages(
 
 ModuleImageManager::ModuleImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
     ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
+    , m_xUserConfigStorage( 0 )
+    , m_xUserImageStorage( 0 )
+    , m_xUserBitmapsStorage( 0 )
     , m_bReadOnly( true )
+    , m_bInitialized( false )
     , m_bModified( false )
-    , m_xUserImageStorage( 0 )
-    , m_xUserConfigStorage( 0 )
     , m_bConfigRead( false )
     , m_bDisposed( false )
-    , m_bInitialized( false )
-    , m_xServiceManager( xServiceManager )
     , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
     , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))
+    , m_xServiceManager( xServiceManager )
+    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
     , m_pDefaultImageList( 0 )
 {
     for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
@@ -1283,7 +1265,7 @@ throw ( ::com::sun::star::uno::Exception,
 {
     ResetableGuard aGuard( m_aLock );
 
-    uno::Reference< uno::XInterface > xThis( static_cast< OWeakObject* >( this ));
+    uno::Reference< uno::XInterface > xRefThis( static_cast< OWeakObject* >( this ));
 
     if ( m_bDisposed )
         throw DisposedException();