diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
| commit | ced1151a1ad00fb2913a4c0f54e4544f4e566c05 (patch) | |
| tree | 416403e0c91acc4cbfe6219f1930ea0273a856e0 /vcl/aqua | |
| parent | 6bc62f4f43c7458399169ddb2cba30ae4188b1bd (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/aqua')
| -rw-r--r-- | vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 4 | ||||
| -rw-r--r-- | vcl/aqua/source/dtrans/aqua_clipboard.cxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index ee9a02016e61..4ad67404bd4a 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include "vcl/unohelp.hxx" #include <DataFlavorMapping.hxx> #include "HtmlFmtFlt.hxx" #include "PictToBmpFlt.hxx" @@ -34,6 +33,7 @@ #include "com/sun/star/datatransfer/XMimeContentType.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/uno/Sequence.hxx" +#include "comphelper/processfactory.hxx" #include <rtl/ustring.hxx> #include <osl/endian.h> @@ -510,7 +510,7 @@ Any FileListDataProvider::getOOoData() DataFlavorMapper::DataFlavorMapper() { - Reference<XMultiServiceFactory> mrServiceManager = vcl::unohelper::GetMultiServiceFactory(); + Reference<XMultiServiceFactory> mrServiceManager = comphelper::getProcessServiceFactory(); mrXMimeCntFactory = Reference<XMimeContentTypeFactory>(mrServiceManager->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"))), UNO_QUERY); diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index a33e1564d51c..2fa1ddfd3eda 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -31,9 +31,8 @@ #include "DataFlavorMapping.hxx" #include "OSXTransferable.hxx" -#include "vcl/unohelp.hxx" - #include "comphelper/makesequence.hxx" +#include "comphelper/processfactory.hxx" #include <boost/assert.hpp> @@ -95,7 +94,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard WeakComponentImplHelper4<XClipboardEx, XClipboardNotifier, XFlushableClipboard, XServiceInfo>(m_aMutex), mIsSystemPasteboard(bUseSystemPasteboard) { - Reference<XMultiServiceFactory> mrServiceMgr = vcl::unohelper::GetMultiServiceFactory(); + Reference<XMultiServiceFactory> mrServiceMgr = comphelper::getProcessServiceFactory(); mrXMimeCntFactory = Reference<XMimeContentTypeFactory>(mrServiceMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"))), UNO_QUERY); |