fdo#46808, remove unnecessary XMultiServiceFactory fields

Change-Id: I140d82ed38afc56cbd06b0045eff0787fc99e2a6

4 files changed, 3 insertions, 24 deletions

diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 80c013b2c55c..a6be0dd83478 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -102,7 +102,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiService
     : ThreadHelpBase     (&Application::GetSolarMutex()        )
     , m_xSMGR            (xSMGR                                )
     , m_aSharedStorages  (                                     )
-    , m_lDocumentStorages(xSMGR                                )
+    , m_lDocumentStorages()
     , m_aLocale          (::comphelper::Locale::X_NOTRANSLATE())
 {
 }
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 42bb80cf131f..1cd7a21d811f 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -39,8 +39,6 @@
 
 #include <com/sun/star/io/XSeekable.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 
 #define PATH_SEPERATOR_ASCII        "/"
 #define PATH_SEPERATOR_UNICODE      ((sal_Unicode)'/')
@@ -53,14 +51,6 @@ namespace framework
 //-----------------------------------------------
 StorageHolder::StorageHolder()
     : ThreadHelpBase(                                        )
-    , m_xSMGR       (::comphelper::getProcessServiceFactory())
-{
-}
-
-//-----------------------------------------------
-StorageHolder::StorageHolder(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
-    : ThreadHelpBase(     )
-    , m_xSMGR       (xSMGR)
 {
 }
 
@@ -469,7 +459,6 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    m_xSMGR     = rCopy.m_xSMGR; // ???
     m_xRoot     = rCopy.m_xRoot;
     m_lStorages = rCopy.m_lStorages;
 
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 93498669cdd5..922f12a4c945 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -105,8 +105,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                 StorageHolder m_lStoragesUser;
 
                 TSharedStorages()
-                    : m_lStoragesShare(::comphelper::getProcessServiceFactory())
-                    , m_lStoragesUser (::comphelper::getProcessServiceFactory())
+                    : m_lStoragesShare()
+                    , m_lStoragesUser ()
                 {};
 
                 virtual ~TSharedStorages() {};
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 9b4955b7e699..bfde625885c2 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -27,8 +27,6 @@
 
 #include <com/sun/star/embed/XStorage.hpp>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
 
 namespace framework
 {
@@ -72,9 +70,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
     private:
 
         /** @short  TODO */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
-
-        /** @short  TODO */
         css::uno::Reference< css::embed::XStorage > m_xRoot;
 
         /** @short  TODO */
@@ -92,11 +87,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         //---------------------------------------
         /** @short  TODO
          */
-        StorageHolder(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
-
-        //---------------------------------------
-        /** @short  TODO
-         */
         virtual ~StorageHolder();
 
         //---------------------------------------