Kaydet (Commit) ae25ee16 authored tarafından Noel Grandin's avatar Noel Grandin

fdo#46808, remove unnecessary XMultiServiceFactory fields

Change-Id: I140d82ed38afc56cbd06b0045eff0787fc99e2a6
üst fbd4588a
...@@ -102,7 +102,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiService ...@@ -102,7 +102,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiService
: ThreadHelpBase (&Application::GetSolarMutex() ) : ThreadHelpBase (&Application::GetSolarMutex() )
, m_xSMGR (xSMGR ) , m_xSMGR (xSMGR )
, m_aSharedStorages ( ) , m_aSharedStorages ( )
, m_lDocumentStorages(xSMGR ) , m_lDocumentStorages()
, m_aLocale (::comphelper::Locale::X_NOTRANSLATE()) , m_aLocale (::comphelper::Locale::X_NOTRANSLATE())
{ {
} }
......
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XSeekable.hpp>
#include <comphelper/processfactory.hxx>
#define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_ASCII "/"
#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/')
...@@ -53,14 +51,6 @@ namespace framework ...@@ -53,14 +51,6 @@ namespace framework
//----------------------------------------------- //-----------------------------------------------
StorageHolder::StorageHolder() StorageHolder::StorageHolder()
: ThreadHelpBase( ) : 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) ...@@ -469,7 +459,6 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
// SAFE -> ---------------------------------- // SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock); WriteGuard aWriteLock(m_aLock);
m_xSMGR = rCopy.m_xSMGR; // ???
m_xRoot = rCopy.m_xRoot; m_xRoot = rCopy.m_xRoot;
m_lStorages = rCopy.m_lStorages; m_lStorages = rCopy.m_lStorages;
......
...@@ -105,8 +105,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas ...@@ -105,8 +105,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
StorageHolder m_lStoragesUser; StorageHolder m_lStoragesUser;
TSharedStorages() TSharedStorages()
: m_lStoragesShare(::comphelper::getProcessServiceFactory()) : m_lStoragesShare()
, m_lStoragesUser (::comphelper::getProcessServiceFactory()) , m_lStoragesUser ()
{}; {};
virtual ~TSharedStorages() {}; virtual ~TSharedStorages() {};
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace framework namespace framework
{ {
...@@ -71,9 +69,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas ...@@ -71,9 +69,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
// member // member
private: private:
/** @short TODO */
css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
/** @short TODO */ /** @short TODO */
css::uno::Reference< css::embed::XStorage > m_xRoot; css::uno::Reference< css::embed::XStorage > m_xRoot;
...@@ -89,11 +84,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas ...@@ -89,11 +84,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
*/ */
StorageHolder(); StorageHolder();
//---------------------------------------
/** @short TODO
*/
StorageHolder(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
//--------------------------------------- //---------------------------------------
/** @short TODO /** @short TODO
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment