summaryrefslogtreecommitdiff
path: root/framework/source/fwe
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-15 16:37:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-16 09:47:00 +0200
commit8a118589217464d4325d9b587b8cee12639d3db6 (patch)
tree334ba0d2802ef4500912e006c5284a695811af1c /framework/source/fwe
parent529951aae5c731ed76fb980fc841699a0cc82a40 (diff)
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I57abfb3b3d659edcd130788d173c2df3b79101f0
Diffstat (limited to 'framework/source/fwe')
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx6
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx6
2 files changed, 4 insertions, 8 deletions
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 )
{
}