diff options
23 files changed, 20 insertions, 68 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index dc9195a11b09..658974f3df31 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -50,7 +50,6 @@ FrameControl::FrameControl( const Reference< XComponentContext >& rxContext) : BaseControl ( rxContext ) , OBroadcastHelper ( m_aMutex ) , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) - , m_aInterfaceContainer ( m_aMutex ) , m_aConnectionPointContainer ( new OConnectionPointContainerHelper(m_aMutex) ) { } diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index e17fea7701f2..00c16a595052 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -213,7 +213,6 @@ private: css::uno::Reference< css::frame::XFrame2 > m_xFrame; OUString m_sComponentURL; css::uno::Sequence< css::beans::PropertyValue > m_seqLoaderArguments; - ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer; css::uno::Reference<OConnectionPointContainerHelper> m_aConnectionPointContainer; }; // class FrameControl diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 8d285b8b2134..80d39fed870d 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -111,13 +111,11 @@ PropertySetMap_Impl; // class PropertySetInfo_Impl class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo > { - Reference< XComponentContext > m_xContext; Sequence< Property >* m_pProps; PersistentPropertySet* m_pOwner; public: - PropertySetInfo_Impl( const Reference< XComponentContext >& xContext, - PersistentPropertySet* pOwner ); + PropertySetInfo_Impl( PersistentPropertySet* pOwner ); virtual ~PropertySetInfo_Impl(); // XPropertySetInfo @@ -1238,7 +1236,7 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo PropertySetInfo_Impl*& rpInfo = m_pImpl->m_pInfo; if ( !rpInfo ) { - rpInfo = new PropertySetInfo_Impl( m_xContext, this ); + rpInfo = new PropertySetInfo_Impl( this ); rpInfo->acquire(); } return Reference< XPropertySetInfo >( rpInfo ); @@ -2197,10 +2195,8 @@ PropertySetRegistry& PersistentPropertySet::getPropertySetRegistry() PropertySetInfo_Impl::PropertySetInfo_Impl( - const Reference< XComponentContext >& xContext, PersistentPropertySet* pOwner ) -: m_xContext( xContext ), - m_pProps( nullptr ), +: m_pProps( nullptr ), m_pOwner( pOwner ) { } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8b411846d1a1..030c487e0588 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -1316,7 +1316,6 @@ BaseContent::cPSL() PropertySetInfoChangeNotifier* p = nullptr; if( m_pPropertySetInfoChangeListeners ) p = new PropertySetInfoChangeNotifier( this, - m_xContentIdentifier, m_pPropertySetInfoChangeListeners->getElements() ); return p; @@ -1350,7 +1349,6 @@ BaseContent::cPCL() } p = new PropertyChangeNotifier( this, - m_xContentIdentifier, listener ); } diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 95be18aa33dd..ed6224436020 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -32,8 +32,7 @@ using namespace com::sun::star::ucb; #endif XCommandInfo_impl::XCommandInfo_impl( shell* pMyShell ) - : m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ) + : m_pMyShell( pMyShell ) { } diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index c0d22df40c66..bb3c49834e5b 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -92,7 +92,6 @@ namespace fileaccess { private: shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; }; } diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 89f7f56b7a9c..5d314e989752 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -32,9 +32,8 @@ using namespace com::sun::star::ucb; #define THROW_WHERE "" #endif -XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ) - : m_xProvider( pMyShell->m_pProvider ), - m_aFile( aUncPath ), +XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock ) + : m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) { diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 3fcc4b593765..d070e5240713 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -42,7 +42,7 @@ namespace fileaccess { { public: - XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ); + XInputStream_impl( const OUString& aUncPath, bool bLock ); virtual ~XInputStream_impl(); @@ -137,7 +137,6 @@ namespace fileaccess { private: - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index aba54e3c5fcd..f8b496287c52 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -149,10 +149,8 @@ void ContentEventNotifier::notifyExchanged() PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( const uno::Reference< XContent >& xCreatorContent, - const uno::Reference< XContentIdentifier >& xCreatorId, const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) : m_xCreatorContent( xCreatorContent ), - m_xCreatorId( xCreatorId ), m_sListeners( sListeners ) { @@ -202,10 +200,8 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty PropertyChangeNotifier::PropertyChangeNotifier( const css::uno::Reference< XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ) : m_xCreatorContent( xCreatorContent ), - m_xCreatorId( xCreatorId ), m_pListeners( pListeners ) { } diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index b65af7ad7042..be304b821447 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -64,12 +64,10 @@ namespace fileaccess { { private: css::uno::Reference< css::ucb::XContent > m_xCreatorContent; - css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: PropertySetInfoChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); @@ -85,12 +83,10 @@ namespace fileaccess { { private: css::uno::Reference< css::ucb::XContent > m_xCreatorContent; - css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; ListenerMap* m_pListeners; public: PropertyChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ); ~PropertyChangeNotifier(); diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 9bf21571f587..2b0cf40e0a3c 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::ucb; XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ) : m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ), m_count( 0 ), m_seq( 0 ) { diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index ecb92c8eb7a1..a4800bff1277 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -53,9 +53,8 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< throw( css::uno::RuntimeException, std::exception ) override; private: - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - sal_Int32 m_count; + shell* m_pMyShell; + sal_Int32 m_count; css::uno::Sequence< css::beans::Property > m_seq; }; } diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 978263290d98..5028cdc17ca0 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -79,7 +79,6 @@ XRow_impl::XRow_impl( shell* pMyShell,const uno::Sequence< uno::Any >& seq ) : m_aValueMap( seq ), m_nWasNull(false), m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ), m_xTypeConverter( nullptr ) { } diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 5be0822e1303..bf09f2f0b21e 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -158,11 +158,10 @@ namespace fileaccess { css::uno::RuntimeException, std::exception) override; private: - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; css::uno::Sequence< css::uno::Any > m_aValueMap; - bool m_nWasNull; - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + bool m_nWasNull; + shell* m_pMyShell; css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; }; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 3f973de9143b..1210817e360e 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -47,7 +47,6 @@ XResultSet_impl::XResultSet_impl( shell* pMyShell, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) : m_pMyShell( pMyShell ) - , m_xProvider( pMyShell->m_pProvider ) , m_nRow( -1 ) , m_nWasNull ( false ) , m_nOpenMode( OpenMode ) diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index daa5de3ae6b9..505994b5519a 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -582,17 +582,12 @@ class XResultSet_impl : public Notifier, private: - // Members - // const uno::Reference< lang::XMultiServiceFactory > m_xMSF; - // const uno::Reference< ucb::XContentProvider > m_xProvider; - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + bool m_nIsOpen; sal_Int32 m_nRow; - bool m_nWasNull; + bool m_nWasNull; sal_Int32 m_nOpenMode; - bool m_bRowCountFinal; + bool m_bRowCountFinal; typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index ca8598035fc8..1eaa8c5a5cc5 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -41,11 +41,9 @@ using namespace css::ucb; /* */ /******************************************************************************/ -XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ) +XStream_impl::XStream_impl( const OUString& aUncPath, bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), - m_pMyShell( pMyShell ), - m_xProvider( m_pMyShell->m_pProvider ), m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index f031fc836022..adc5bde2367c 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -49,7 +49,7 @@ class XStream_impl : public cppu::WeakImplHelper< public: - XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ); + XStream_impl( const OUString& aUncPath, bool bLock ); /** * Returns an error code as given by filerror.hxx @@ -178,10 +178,7 @@ class XStream_impl : public cppu::WeakImplHelper< osl::Mutex m_aMutex; bool m_bInputStreamCalled,m_bOutputStreamCalled; - - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index cb27c763df17..a10d2020371b 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -661,7 +661,7 @@ shell::open( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XInputStream_impl* xInputStream = new XInputStream_impl( this, aUnqPath, bLock ); // from filinpstr.hxx + XInputStream_impl* xInputStream = new XInputStream_impl( aUnqPath, bLock ); // from filinpstr.hxx sal_Int32 ErrorCode = xInputStream->CtorSuccess(); @@ -697,7 +697,7 @@ shell::open_rw( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XStream_impl* xStream = new XStream_impl( this, aUnqPath, bLock ); // from filstr.hxx + XStream_impl* xStream = new XStream_impl( aUnqPath, bLock ); // from filstr.hxx sal_Int32 ErrorCode = xStream->CtorSuccess(); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 17e366f5369b..e1c0cdbd1550 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -551,9 +551,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, Reference< XDynamicResultSet > xSet = new DynamicResultSet( m_xContext, - this, aOpenCommand, - Environment, new ResultSetFactoryI(m_xContext, m_xProvider.get(), aOpenCommand.Properties, diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index 2e764f6115d4..c3c1fbfcfe12 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -39,13 +39,9 @@ using namespace ftp; DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, - const rtl::Reference< FTPContent >& rxContent, const OpenCommandArgument2& rCommand, - const Reference< XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ), - m_xEnv( rxEnv ), m_pFactory( pFactory ) { } diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 757bc68d4e0a..b39a3d993011 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -31,8 +31,6 @@ namespace ftp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - rtl::Reference< FTPContent > m_xContent; - css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,9 +40,7 @@ namespace ftp { public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< FTPContent >& rxContent, const css::ucb::OpenCommandArgument2& rCommand, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index 45f84febc5bd..fe766ab9819d 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -42,9 +42,6 @@ namespace ftp { css::io::XOutputStream>& out); virtual ~FTPOutputStreamContainer() {} - - private: - css::uno::Reference< css::io::XOutputStream> m_out; }; |