From 3505f0e46c2e0a743ab5de9adfbec3044a4573a6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 3 Jun 2013 15:06:11 +0200 Subject: Revert "fdo#46808, Convert oox::PowerPointExport service to new style" This reverts commit 02021163dbbcc8904da0b2138c8b53684dcc8ab4. The filter appears to be split in two (com.sun.star.comp.oox.ppt.PowerPointImport implementation oox::ppt::PowerPointImport from include/oox/ppt/pptimport.hxx for im-/export, for export calling com.sun.star.comp.Impress.oox.PowerPointExport implementation PowerPointExport from sd/source/filter/eppt/epptooxml.hxx) for no good reason, so the com.sun.star.oox.PowerPointExport new-style service is supporting a hack that should rather be cleaned up. Conflicts: offapi/UnoApi_offapi.mk Change-Id: I875192a68a8e3458dbfd74b4981a6a2e86ce44d7 --- offapi/UnoApi_offapi.mk | 3 --- offapi/com/sun/star/oox/PowerPointExport.idl | 37 ---------------------------- 2 files changed, 40 deletions(-) delete mode 100644 offapi/com/sun/star/oox/PowerPointExport.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4aee919198a4..90b05ef81e40 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -265,9 +265,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/office,\ Quickstart \ )) -$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/oox,\ - PowerPointExport \ -)) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\ ManifestReader \ ManifestWriter \ diff --git a/offapi/com/sun/star/oox/PowerPointExport.idl b/offapi/com/sun/star/oox/PowerPointExport.idl deleted file mode 100644 index 14f84ebc015f..000000000000 --- a/offapi/com/sun/star/oox/PowerPointExport.idl +++ /dev/null @@ -1,37 +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_oox_PowerPointExport_idl__ -#define __com_sun_star_oox_PowerPointExport_idl__ - -#include - - -module com { module sun { module star { module oox { - -/** - @since LibreOffice 4.2 -*/ -service PowerPointExport : com::sun::star::document::XExporter; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit