summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-10-31 09:22:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-10-31 09:22:53 +0100
commitced1151a1ad00fb2913a4c0f54e4544f4e566c05 (patch)
tree416403e0c91acc4cbfe6219f1930ea0273a856e0 /vcl/inc
parent6bc62f4f43c7458399169ddb2cba30ae4188b1bd (diff)
Get rid of vcl::unohelper::GetMultiServiceFactory
...which effectively is just a glorious wrapper around comphelper::getProcessServiceFactory. In turn gets also rid of ImplSVAppData's mxMSF and mpMSFTempFileName and the rSMgr parameter to InitVCL. All the VCL users "soffice", "spadmin", and "unopkg gui" appear to still work fine. Change-Id: I797d48f7d0d8c35bb82124c9ab0ee63850c4d863
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/svdata.hxx6
-rw-r--r--vcl/inc/vcl/svapp.hxx2
-rw-r--r--vcl/inc/vcl/unohelp.hxx7
3 files changed, 2 insertions, 13 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 76c465021234..015e44545a59 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -53,10 +53,6 @@
#include <boost/unordered_map.hpp>
-namespace com { namespace sun { namespace star { namespace lang {
- class XMultiServiceFactory;
-} } } }
-
struct ImplTimerData;
struct ImplConfigData;
class ImplDirectFontSubstitution;
@@ -124,8 +120,6 @@ struct ImplSVAppData
ImeStatusWindowMode_SHOW
};
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
- String* mpMSFTempFileName;
AllSettings* mpSettings; // Application settings
LocaleConfigurationListener* mpCfgListener;
VclEventListeners* mpEventListeners; // listeners for vcl events (eg, extended toolkit)
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 2083250b9757..9f1c7aa19f6e 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -551,7 +551,7 @@ public:
VCL_DLLPUBLIC Application* GetpApp();
-VCL_DLLPUBLIC sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
+VCL_DLLPUBLIC sal_Bool InitVCL();
VCL_DLLPUBLIC void DeInitVCL();
VCL_DLLPUBLIC bool InitAccessBridge( bool bAllowCancel, bool &rCancelled );
diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx
index 823ee477355a..f95e1d9d9b63 100644
--- a/vcl/inc/vcl/unohelp.hxx
+++ b/vcl/inc/vcl/unohelp.hxx
@@ -40,11 +40,7 @@ namespace i18n {
class XBreakIterator;
class XCharacterClassification;
class XCollator;
-}
-namespace lang {
- class XMultiServiceFactory;
-}
-}}}
+}}}}
namespace com {
namespace sun {
@@ -63,7 +59,6 @@ namespace vcl
{
namespace unohelper
{
-VCL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > GetMultiServiceFactory();
VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > CreateBreakIterator();
VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification();
//Get access to singleton Natural String Sorter collating for Application::GetLocale