diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-03 16:54:29 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-06 11:27:49 +0200 |
commit | 135d20caa4178c3a6d7682b547c5da6d58310f01 (patch) | |
tree | ff3c2ab2cf8ac119665ee908e04d29c02c41d5ad | |
parent | e4f37435a0fdd66b2d58633c991c6df720790f39 (diff) |
fdo#46808, Convert SystemClipboardExt service to new style
Service already existed, just needed an IDL file
Change-Id: Icde7c41e48b8c511976c2a65a87dca064546fa95
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl | 39 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 4 |
3 files changed, 42 insertions, 2 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0bc067671fac..1e5b21125ef9 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -94,6 +94,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransf )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\ SystemClipboard \ + SystemClipboardExt \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ ExtensionManager \ diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl new file mode 100644 index 000000000000..aa1cfb4357bc --- /dev/null +++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef __com_sun_star_datatransfer_clipboard_SystemClipboardExt_idl__ +#define __com_sun_star_datatransfer_clipboard_SystemClipboardExt_idl__ + +#include <com/sun/star/datatransfer/clipboard/XClipboard.idl> + + +module com { module sun { module star { module datatransfer { module clipboard { + + +/** + @since LibreOffice 4.1 +*/ +published service SystemClipboardExt : XClipboard; + + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index bc59719e026c..4201c39fa260 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -84,6 +84,7 @@ #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/awt/XTopWindow.hpp" #include "com/sun/star/awt/XDisplayConnection.hpp" #include "com/sun/star/lang/XInitialization.hpp" @@ -8403,10 +8404,9 @@ 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 ); + mpWindowImpl->mpFrameData->mxClipboard = SystemClipboardExt::create( xContext );; if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) { |