diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-06 17:14:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:46 +0200 |
| commit | 851067c2684c68758afeaa7da23bb6dd69c51358 (patch) | |
| tree | 2d20baf149274f6e5f2345ab757aafc9799dbb8f /vcl/aqua/source/dtrans | |
| parent | 2969846c29402baec792e43cfd4524366fb05613 (diff) | |
fdo#46808, use constructor for datatransfer::MimeContentTypeFactory
Change-Id: I576a472e22ad0e3798f4b34d808ac320f13d3e6d
Diffstat (limited to 'vcl/aqua/source/dtrans')
| -rw-r--r-- | vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 10 | ||||
| -rw-r--r-- | vcl/aqua/source/dtrans/aqua_clipboard.cxx | 14 |
2 files changed, 6 insertions, 18 deletions
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index 01dbde52a52c..a338bd2dfee9 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -22,7 +22,7 @@ #include "PictToBmpFlt.hxx" #include "com/sun/star/datatransfer/UnsupportedFlavorException.hpp" #include "com/sun/star/datatransfer/XMimeContentType.hpp" -#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/datatransfer/MimeContentTypeFactory.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "comphelper/processfactory.hxx" @@ -498,12 +498,8 @@ Any FileListDataProvider::getOOoData() DataFlavorMapper::DataFlavorMapper() { - Reference<XMultiServiceFactory> mrServiceManager = comphelper::getProcessServiceFactory(); - mrXMimeCntFactory = Reference<XMimeContentTypeFactory>(mrServiceManager->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"))), UNO_QUERY); - - if (!mrXMimeCntFactory.is()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create com.sun.star.datatransfer.MimeContentTypeFactory")), NULL); + Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); + mrXMimeCntFactory = MimeContentTypeFactory::create( xContext ); } DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor) const diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 06b4e487debe..87a7b6d10f74 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -21,7 +21,7 @@ #include "DataFlavorMapping.hxx" #include "OSXTransferable.hxx" - +#include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp> #include "comphelper/makesequence.hxx" #include "comphelper/processfactory.hxx" @@ -85,17 +85,9 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard WeakComponentImplHelper3<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex), mIsSystemPasteboard(bUseSystemPasteboard) { - Reference<XMultiServiceFactory> mrServiceMgr = comphelper::getProcessServiceFactory(); - - mrXMimeCntFactory = Reference<XMimeContentTypeFactory>(mrServiceMgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"))), UNO_QUERY); + Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); - if (!mrXMimeCntFactory.is()) - { - throw RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create com.sun.star.datatransfer.MimeContentTypeFactory")), - static_cast<XClipboardEx*>(this)); - } + mrXMimeCntFactory = MimeContentTypeFactory::create(xContext); mpDataFlavorMapper = DataFlavorMapperPtr_t(new DataFlavorMapper()); |