diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-15 16:37:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 09:47:00 +0200 |
commit | 8a118589217464d4325d9b587b8cee12639d3db6 (patch) | |
tree | 334ba0d2802ef4500912e006c5284a695811af1c /framework | |
parent | -Werror,-Wunused-value (Clang towards 3.2) (diff) | |
download | core-8a118589217464d4325d9b587b8cee12639d3db6.tar.gz core-8a118589217464d4325d9b587b8cee12639d3db6.zip |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I57abfb3b3d659edcd130788d173c2df3b79101f0
Diffstat (limited to 'framework')
15 files changed, 7 insertions, 30 deletions
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index f16b0b6a28f4..74ce9152f185 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -215,9 +215,6 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider /** prevent recursive calling of Application::Reschedule(). */ static sal_Int32 m_nInReschedule; - /** time where there last start call was made. */ - sal_Int32 m_nStartTime; - //------------------------------------------- // interface diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 4365266840e4..dbae903d9d1d 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -182,7 +182,6 @@ namespace framework UIElementTypesVector m_aUIElements; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xDocConfigStorage; bool m_bReadOnly; - bool m_bInitialized; bool m_bModified; bool m_bConfigRead; bool m_bDisposed; diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index 296c106f973d..fbf1b20e6a75 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -110,7 +110,6 @@ class WindowStateConfiguration : private ThreadHelpBase ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap; private: - sal_Bool m_bConfigRead; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ModuleToWindowStateFileMap m_aModuleToFileHashMap; ModuleToWindowStateConfigHashMap m_aModuleToWindowStateHashMap; diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index c8752d4b6e28..86e73b54fdd6 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -68,7 +68,6 @@ namespace framework rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); long* m_pHeightArray; - sal_Bool m_bRebuildMenu; com::sun::star::awt::FontDescriptor m_aFontDescriptor; ::com::sun::star::frame::status::FontHeight m_aFontHeight; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xCurrentFontDispatch; diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx index 752079bc2373..7a820842ca9c 100644 --- a/framework/inc/uielement/statusbar.hxx +++ b/framework/inc/uielement/statusbar.hxx @@ -47,8 +47,6 @@ class FrameworkStatusBar : public StatusBar private: StatusBarManager* m_pMgr; - sal_Bool m_bShow : 1, - m_bLock : 1; }; } diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index 5a7c1f96a64a..99dc12f2a525 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -106,7 +106,6 @@ namespace framework ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigListener; sal_Bool m_bConfigAccessInitialized; - bool m_bConfigDirty; }; diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 5750985795e1..2d660a7425b4 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -153,7 +153,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: OReadMenuBarHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer, const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); virtual ~OReadMenuBarHandler(); @@ -186,8 +185,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase sal_Bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; - - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; }; // OReadMenuBarHandler diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 86260a98c7ce..746884d95288 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -222,7 +222,6 @@ namespace framework ::cppu::OInterfaceContainerHelper m_aUndoListeners; ::cppu::OInterfaceContainerHelper m_aModifyListeners; IUndoManagerImplementation& m_rUndoManagerImplementation; - UndoManagerHelper& m_rAntiImpl; ::std::stack< bool > m_aContextVisibilities; #if OSL_DEBUG_LEVEL > 0 ::std::stack< bool > m_aContextAPIFlags; @@ -234,7 +233,7 @@ namespace framework ::osl::Mutex& getMutex() { return m_aMutex; } public: - UndoManagerHelper_Impl( UndoManagerHelper& i_antiImpl, IUndoManagerImplementation& i_undoManagerImpl ) + UndoManagerHelper_Impl( IUndoManagerImplementation& i_undoManagerImpl ) :m_aMutex() ,m_aQueueMutex() ,m_disposed( false ) @@ -244,7 +243,6 @@ namespace framework ,m_aUndoListeners( m_aMutex ) ,m_aModifyListeners( m_aMutex ) ,m_rUndoManagerImplementation( i_undoManagerImpl ) - ,m_rAntiImpl( i_antiImpl ) { getUndoManager().AddUndoListener( *this ); } @@ -938,7 +936,7 @@ namespace framework //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) - :m_pImpl( new UndoManagerHelper_Impl( *this, i_undoManagerImpl ) ) + :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) { } diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 27ac1f45e6db..680835d77bbd 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -289,7 +289,7 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; m_bMenuBarMode = sal_True; - m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_xMenuBarContainer, m_xContainerFactory )); + m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_xMenuBarContainer, m_xContainerFactory )); m_xReader->startDocument(); } @@ -328,14 +328,12 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName // ----------------------------------------------------------------------------- OReadMenuBarHandler::OReadMenuBarHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) : m_nElementDepth( 0 ), m_bMenuMode( sal_False ), m_xMenuBarContainer( rMenuBarContainer ), - m_xContainerFactory( rFactory ), - mxServiceFactory( xServiceFactory ) + m_xContainerFactory( rFactory ) { } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 1972d4ac0662..a7789bdf151d 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -64,7 +64,6 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_eDockOperation( DOCKOP_ON_COLROW ), m_ePreviewDetection( PREVIEWFRAME_UNKNOWN ), m_bComponentAttached( false ), - m_bMustLayout( false ), m_bLayoutDirty( false ), m_bStoreWindowState( false ), m_bGlobalSettings( false ), diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 139619f06474..0f4d2b7ac212 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -321,7 +321,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a std::auto_ptr< GlobalSettings > m_pGlobalSettings; bool m_bComponentAttached; - bool m_bMustLayout; bool m_bLayoutDirty; bool m_bStoreWindowState; bool m_bGlobalSettings; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 3d0f96253b24..0ce2e54409a4 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -590,7 +590,6 @@ UIConfigurationManager::UIConfigurationManager( com::sun::star::uno::Reference< ThreadHelpBase( &Application::GetSolarMutex() ) , m_xDocConfigStorage( 0 ) , m_bReadOnly( true ) - , m_bInitialized( false ) , m_bModified( false ) , m_bConfigRead( false ) , m_bDisposed( false ) diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 6506edd44b5c..8dd3d83362bd 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -71,8 +71,7 @@ DEFINE_INIT_SERVICE ( FontSizeMenuController, {} ) FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : svt::PopupMenuControllerBase( xServiceManager ), - m_pHeightArray( 0 ), - m_bRebuildMenu( sal_True ) + m_pHeightArray( 0 ) { } diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 438099a43097..5fb182dae718 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -37,9 +37,7 @@ FrameworkStatusBar::FrameworkStatusBar( Window* pParent, WinBits nWinBits ) : StatusBar( pParent, nWinBits ), - m_pMgr( NULL ), - m_bShow( sal_False ), - m_bLock( sal_False ) + m_pMgr( NULL ) { // set optimal size SetOutputSizePixel( CalcWindowSizePixel() ); diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index f6d55dbe40fb..11ff2a17fdc9 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -89,8 +89,7 @@ ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( Referenc m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )), m_sRoot(_sRoot), m_xServiceManager( rServiceManager ), - m_bConfigAccessInitialized( sal_False ), - m_bConfigDirty(true) + m_bConfigAccessInitialized( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::ConfigurationAccess_FactoryManager" ); m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( SERVICENAME_CFGPROVIDER),UNO_QUERY ); |