offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl | 39
----------
vcl/source/window/window.cxx | 4 -
3 files changed, 2 insertions(+), 42 deletions(-)
New commits:
commit 690a5546138cb94100868d9303ef7b702b421b8e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 6 16:05:42 2013 +0200
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
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c426138..def1b3a 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 aa1cfb4..0000000
--- 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: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6822698..279caf8 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() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
