diff options
Diffstat (limited to 'vcl/aqua/source')
-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); |