diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 16:05:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 16:09:07 +0200 |
| commit | 690a5546138cb94100868d9303ef7b702b421b8e (patch) | |
| tree | d2b485719143f361071adc7fd18b2bb49523326f /vcl/source/window/window.cxx | |
| parent | 5bff7f52075eb3ffe931d1779681262e1820a859 (diff) | |
Revert "fdo#46808, Convert SystemClipboardExt service to new style"
This reverts commit 135d20caa4178c3a6d7682b547c5da6d58310f01.
Conflicts:
vcl/source/window/window.cxx
There is no implementation of the SystemClipboardExt service, so Window::GetClipboard
would now always fail with catching an Exception, instead of trying to create a
SystemClipboard if SystemClipboardExt is unavailable. (I'll clean up the unused
SystemClipboardExt in a follow-up commit.)
Change-Id: Ic3c45b148057e174d3487aedb4176549cb28f3c0
Diffstat (limited to 'vcl/source/window/window.cxx')
| -rw-r--r-- | vcl/source/window/window.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6822698da334..279caf80b6d2 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -85,7 +85,6 @@ #include "com/sun/star/datatransfer/dnd/XDropTarget.hpp" #include "com/sun/star/datatransfer/clipboard/XClipboard.hpp" #include "com/sun/star/datatransfer/clipboard/SystemClipboard.hpp" -#include "com/sun/star/datatransfer/clipboard/SystemClipboardExt.hpp" #include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/lang/XServiceName.hpp" @@ -8409,9 +8408,10 @@ uno::Reference< XClipboard > Window::GetClipboard() { try { + uno::Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); uno::Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - mpWindowImpl->mpFrameData->mxClipboard = SystemClipboardExt::create( xContext );; + mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboardExt") ), UNO_QUERY ); if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) { |