From 2fe852386c9450014f84910b0a282d684f40b56a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 14 Jan 2013 16:05:07 +0200 Subject: fdo#46808, Adapt SystemClipboard UNO service to new style this is the datatransfer::clipboard::SystemClipboard service Change-Id: I00227a2d84e2f1eaf9ca1ebb4fbe1f1548a6621d --- offapi/UnoApi_offapi.mk | 5 +- .../datatransfer/clipboard/SystemClipboard.idl | 37 +++--------- .../datatransfer/clipboard/XSystemClipboard.idl | 63 +++++++++++++++++++++ offapi/type_reference/types.rdb | Bin 7440384 -> 7440384 bytes 4 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 2b133498317d..8a5266157ab6 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -73,6 +73,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransf DataFormatTranslator \ MimeContentTypeFactory \ )) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\ + SystemClipboard \ +)) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ ExtensionManager \ PackageInformationProvider \ @@ -615,7 +618,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configu $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardManager \ GenericClipboard \ - SystemClipboard \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\ OleDragSource \ @@ -2049,6 +2051,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/cli XClipboardNotifier \ XClipboardOwner \ XFlushableClipboard \ + XSystemClipboard \ )) $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ DNDConstants \ diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl index 35707087efa6..319dd373eedb 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl @@ -20,17 +20,14 @@ #ifndef __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__ #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__ -#include -#include +#include +#include +#include module com { module sun { module star { module datatransfer { module clipboard { - published interface XClipboardEx; - published interface XClipboardNotifier; - published interface XFlushableClipboard; - /** The system clipboard service builds a bridge to the OS specific clipboard interfaces. @@ -42,30 +39,14 @@ module com { module sun { module star { module datatransfer { module clipboard { It is possible to use clipboards for different selections simultaneously.

*/ -published service SystemClipboard +published service SystemClipboard : XSystemClipboard { - /** Provides access to the clipboard content. - */ - interface XClipboardEx; - - /** Provides the ability to request notifications on content changes. - */ - interface XClipboardNotifier; - - /** Provides the ability to render the complete clipboard content. This - interface is only available if the method - XClipboardEx::getRenderingCapabilities() - returns Persistant - */ - [optional] interface XFlushableClipboard; - - /** Provides the ability to initialize the clipboard - */ - [optional] interface com::sun::star::lang::XInitialization; + createDefault(); - /** For shutdown and listener support. - */ - interface com::sun::star::lang::XComponent; + /** This method is only valid for unix systems (excluding MacOS) */ + createUnix([in] com::sun::star::awt::XDisplayConnection DisplayConnection, + [in] string ClipboardName, + [in] com::sun::star::script::XInvocation BmpConverter); }; diff --git a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl new file mode 100644 index 000000000000..a3c054fa402f --- /dev/null +++ b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl @@ -0,0 +1,63 @@ +/* -*- 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_XSystemClipboard_idl__ +#define __com_sun_star_datatransfer_clipboard_XSystemClipboard_idl__ + +#include +#include +#include +#include + +module com { module sun { module star { module datatransfer { module clipboard { + + +/** + Provides a unified interface for new-style service SystemClipboard. + + @since LibreOffice 4.1 +*/ +published interface XSystemClipboard +{ + /** Provides access to the clipboard content. + */ + interface XClipboardEx; + + /** Provides the ability to request notifications on content changes. + */ + interface XClipboardNotifier; + + /** Provides the ability to render the complete clipboard content. This + interface is only available if the method + XClipboardEx::getRenderingCapabilities() + returns Persistant + */ + [optional] interface XFlushableClipboard; + + /** For shutdown and listener support. + */ + interface com::sun::star::lang::XComponent; +}; + + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 0987584e1edf..75de5a2cff35 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ -- cgit