mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.20.30); FILE MERGED

Browse Source 
2006/05/29 07:55:08 sb 1.20.30.6: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
2006/05/23 16:13:48 sb 1.20.30.5: RESYNC: (1.25-1.28); FILE MERGED
2006/04/07 16:08:52 sb 1.20.30.4: RESYNC: (1.24-1.25); FILE MERGED
2006/01/25 17:36:18 sb 1.20.30.3: RESYNC: (1.20-1.24); FILE MERGED
2005/11/16 15:20:46 pl 1.20.30.2: #i55991# removed warnings
2005/10/28 14:48:46 cd 1.20.30.1: #i55991# Warning free code changes for gcc
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 10:42:03 +00:00
parent 3063a096ad
commit 812b393460
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
framework/source/uielement/toolbarmanager.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: toolbarmanager.cxx,v $ * $RCSfile: toolbarmanager.cxx,v $
* *
* $Revision: 1.28 $ * $Revision: 1.29 $
* *
* last change: $Author: rt $ $Date: 2006-05-05 08:11:12 $ * last change: $Author: hr $ $Date: 2006-06-19 11:42:03 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -283,8 +283,6 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager
return xLayoutManager; return xLayoutManager;
} }
static void ImplClearPopupMenu( ToolBox *pToolBar );
//***************************************************************************************************************** //*****************************************************************************************************************
// XInterface, XTypeProvider, XServiceInfo // XInterface, XTypeProvider, XServiceInfo
//***************************************************************************************************************** //*****************************************************************************************************************
@@ -313,15 +311,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
ToolBar* pToolBar ) : ToolBar* pToolBar ) :
ThreadHelpBase( &Application::GetSolarMutex() ), ThreadHelpBase( &Application::GetSolarMutex() ),
OWeakObject(), OWeakObject(),
m_aListenerContainer( m_aLock.getShareableOslMutex() ),
m_xServiceManager( rServiceManager ),
m_xFrame( rFrame ),
m_pToolBar( pToolBar ),
m_bDisposed( sal_False ), m_bDisposed( sal_False ),
m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark() ), m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark() ),
m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ), m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ),
m_bModuleIdentified( sal_False ), m_bModuleIdentified( sal_False ),
m_aResourceName( rResourceName ),
m_bAddedToTaskPaneList( sal_True ), m_bAddedToTaskPaneList( sal_True ),
m_bFrameActionRegistered( sal_False ), m_bFrameActionRegistered( sal_False ),
m_bUpdateControllers( sal_False ), m_bUpdateControllers( sal_False ),
@@ -329,6 +322,11 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
m_bImageMirrored( sal_False ), m_bImageMirrored( sal_False ),
m_bCanBeCustomized( sal_True ), m_bCanBeCustomized( sal_True ),
m_lImageRotation( 0 ), m_lImageRotation( 0 ),
m_pToolBar( pToolBar ),
m_aResourceName( rResourceName ),
m_xFrame( rFrame ),
m_aListenerContainer( m_aLock.getShareableOslMutex() ),
m_xServiceManager( rServiceManager ),
m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ) m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
{ {
Window* pWindow = m_pToolBar; Window* pWindow = m_pToolBar;
@@ -369,11 +367,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL )); OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL ));
OUString aToolbarName = rResourceName.copy( idx ); OUString aToolbarName = rResourceName.copy( idx );
aHelpIdAsString += aToolbarName; aHelpIdAsString += aToolbarName;
// if ( aToolbarName.equalsAscii( "fullscreenbar" ))
// {
// m_pToolBar->SetStyle( m_pToolBar->GetStyle() & ~WB_CLOSEABLE );
// m_pToolBar->SetFloatStyle( m_pToolBar->GetFloatStyle() & ~WB_CLOSEABLE );
// }
m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) ); m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
@@ -1402,11 +1395,11 @@ void ToolBarManager::RequestImages()
} }
m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark(); m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark();
sal_Int16 j = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast ); sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast );
if ( m_xDocImageManager.is() ) if ( m_xDocImageManager.is() )
aDocGraphicSeq = m_xDocImageManager->getImages( j, aCmdURLSeq ); aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq );
aModGraphicSeq = m_xModuleImageManager->getImages( j, aCmdURLSeq ); aModGraphicSeq = m_xModuleImageManager->getImages( p, aCmdURLSeq );
i = 0; i = 0;
pIter = m_aCommandMap.begin(); pIter = m_aCommandMap.begin();
@@ -1478,7 +1471,7 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
} }
} }
IMPL_LINK( ToolBarManager, Click, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
{ {
ResetableGuard aGuard( m_aLock ); ResetableGuard aGuard( m_aLock );
@@ -1497,7 +1490,7 @@ IMPL_LINK( ToolBarManager, Click, ToolBox*, pToolBar )
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
{ {
ResetableGuard aGuard( m_aLock ); ResetableGuard aGuard( m_aLock );
@@ -1516,7 +1509,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, pToolBar )
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
{ {
ResetableGuard aGuard( m_aLock ); ResetableGuard aGuard( m_aLock );
@@ -1901,7 +1894,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, Select, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
{ {
if ( m_bDisposed ) if ( m_bDisposed )
return 1; return 1;
@@ -1916,17 +1909,17 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, pToolBar )
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, Highlight, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, Highlight, ToolBox*, EMPTYARG )
{ {
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, Activate, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, Activate, ToolBox*, EMPTYARG )
{ {
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, Deactivate, ToolBox*, pToolBar ) IMPL_LINK( ToolBarManager, Deactivate, ToolBox*, EMPTYARG )
{ {
return 1; return 1;
} }
@@ -1986,7 +1979,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
return 1; return 1;
} }
IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, pTimer ) IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG )
{ {
// The guard must be in its own context as the we can get destroyed when our // The guard must be in its own context as the we can get destroyed when our
// own xInterface reference get destroyed! // own xInterface reference get destroyed!
@@ -2004,7 +1997,7 @@ IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, pTimer )
return 0; return 0;
} }
IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
{ {
try try
{ {