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 /offapi | |
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 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl | 39 |
2 files changed, 0 insertions, 40 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index c4261384f660..def1b3a7a716 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -94,7 +94,6 @@ $(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 deleted file mode 100644 index aa1cfb4357bc..000000000000 --- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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: */ |