diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 16:18:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 17:17:39 +0200 |
| commit | fb24a49d76edfe3cc7c9aeb7e9c293bee8a3d371 (patch) | |
| tree | 612e5a123f9e4f757cb35d13e2e29eefe23a7d87 | |
| parent | bc20557b9ffa774d98846097bb2e4b93e518c4b3 (diff) | |
Drop unused SystemClipboardExt and GenericClipboardExt services
...uses of which had been introduced with
2fab32e831fc02e7efd4069aa0dfc7779d97a9cf "mtclip01: #i112022# Allow extended
clipboard creation" but which did not introduce any implementations of those
services, so this might have been a hook for StarOffice-only functionality.
Change-Id: I4d3c977547147aaca78b6079d1df8fbf6b196650
| -rw-r--r-- | vcl/source/window/window.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 279caf80b6d2..fc692d21405e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8408,21 +8408,14 @@ uno::Reference< XClipboard > Window::GetClipboard() { try { - uno::Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); uno::Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - - mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboardExt") ), UNO_QUERY ); - - if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) - { - Reference<XSystemClipboard> xSystemClipboard; + Reference<XSystemClipboard> xSystemClipboard; #if defined(UNX) && !defined(MACOSX) // unix clipboard needs to be initialized - xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), "CLIPBOARD", vcl::createBmpConverter() ); + xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), "CLIPBOARD", vcl::createBmpConverter() ); #else - xSystemClipboard = SystemClipboard::createDefault(xContext); + xSystemClipboard = SystemClipboard::createDefault(xContext); #endif - mpWindowImpl->mpFrameData->mxClipboard.set( xSystemClipboard, UNO_QUERY ); - } + mpWindowImpl->mpFrameData->mxClipboard.set( xSystemClipboard, UNO_QUERY ); } // createInstance can throw any exception catch (const Exception&) @@ -8456,13 +8449,8 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() Reference<XSystemClipboard> xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), "PRIMARY", vcl::createBmpConverter() ); mpWindowImpl->mpFrameData->mxSelection = uno::Reference< XClipboard >( xSystemClipboard, UNO_QUERY ); # else - static uno::Reference< XClipboard > s_xSelection; - - if ( !s_xSelection.is() ) - s_xSelection.set( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.datatransfer.clipboard.GenericClipboardExt", xContext ), UNO_QUERY ); - - if ( !s_xSelection.is() ) - s_xSelection.set( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.datatransfer.clipboard.GenericClipboard", xContext ), UNO_QUERY ); + static uno::Reference< XClipboard > s_xSelection( + xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.datatransfer.clipboard.GenericClipboard", xContext ), UNO_QUERY ); mpWindowImpl->mpFrameData->mxSelection = s_xSelection; # endif |