From ec1c96a9b69a5a2546fe2564cd92fe9e33471fbc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 1 Nov 2012 15:01:34 +0200
Subject: fdo#46808,remove unnecessary MSF field from
 ucbhelper::ContentIdentifier

...which has lots of nice knock-on effects.

Change-Id: Icc93fdb70f24903b08702654db4e1105eb1d438e
---
 ucbhelper/inc/ucbhelper/contentidentifier.hxx   |  7 -------
 ucbhelper/source/provider/contenthelper.cxx     |  2 +-
 ucbhelper/source/provider/contentidentifier.cxx | 20 +++-----------------
 3 files changed, 4 insertions(+), 25 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
index 8fb73d9651bb..31f0a276ea36 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
@@ -25,10 +25,6 @@
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include "ucbhelper/ucbhelperdllapi.h"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
-} } } }
-
 namespace rtl {
     class OUString;
 }
@@ -52,9 +48,6 @@ class UCBHELPER_DLLPUBLIC ContentIdentifier :
                   public com::sun::star::ucb::XContentIdentifier
 {
 public:
-    ContentIdentifier( const com::sun::star::uno::Reference<
-                        com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                       const rtl::OUString& rURL );
     ContentIdentifier( const rtl::OUString& rURL );
     virtual ~ContentIdentifier();
 
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 );
 }
 
 //=========================================================================
-- 
cgit