diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-01 15:01:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 16:43:15 +0100 |
| commit | ec1c96a9b69a5a2546fe2564cd92fe9e33471fbc (patch) | |
| tree | dd7fcf0feadfbf456b351f752dc8d28dd1deffbf /ucbhelper/source | |
| parent | 41a71413f4ebe69a48ee068fd5c785d6015c0cca (diff) | |
fdo#46808,remove unnecessary MSF field from ucbhelper::ContentIdentifier
...which has lots of nice knock-on effects.
Change-Id: Icc93fdb70f24903b08702654db4e1105eb1d438e
Diffstat (limited to 'ucbhelper/source')
| -rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentidentifier.cxx | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 39e08fc242b5..e09a5ab84559 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -774,7 +774,7 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent() if ( !aURL.isEmpty() ) { uno::Reference< com::sun::star::ucb::XContentIdentifier > xId( - new ContentIdentifier( m_xSMgr, aURL ) ); + new ContentIdentifier( aURL ) ); try { xParent.set( m_xProvider->queryContent( xId ) ); diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index c8dd27fdc69d..e99b67fcffd0 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -47,13 +47,11 @@ namespace ucbhelper struct ContentIdentifier_Impl { - Reference< XMultiServiceFactory > m_xSMgr; OUString m_aContentId; OUString m_aProviderScheme; osl::Mutex m_aMutex; - ContentIdentifier_Impl( const Reference< XMultiServiceFactory >& rSMgr, - const OUString& rURL ); + ContentIdentifier_Impl( const OUString& rURL ); }; //========================================================================= @@ -62,10 +60,7 @@ struct ContentIdentifier_Impl // //========================================================================= -ContentIdentifier_Impl::ContentIdentifier_Impl( - const Reference< XMultiServiceFactory >& rSMgr, - const OUString& rURL ) -: m_xSMgr( rSMgr ) +ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL ) { // Normalize URL scheme ( it's case insensitive ). @@ -86,18 +81,9 @@ ContentIdentifier_Impl::ContentIdentifier_Impl( // //========================================================================= -ContentIdentifier::ContentIdentifier( - const Reference< XMultiServiceFactory >& rxSMgr, - const OUString& rURL ) -{ - m_pImpl = new ContentIdentifier_Impl( rxSMgr, rURL ); -} - -//========================================================================= ContentIdentifier::ContentIdentifier( const OUString& rURL ) { - m_pImpl = new ContentIdentifier_Impl( - Reference< XMultiServiceFactory >(), rURL ); + m_pImpl = new ContentIdentifier_Impl( rURL ); } //========================================================================= |