odk/Package_autodoc.mk | 1 offapi/UnoApi_offapi.mk | 3 -- offapi/com/sun/star/oox/PowerPointExport.idl | 37 --------------------------- oox/source/ppt/pptimport.cxx | 30 ++++++++++----------- sd/source/filter/eppt/pptx-epptooxml.cxx | 5 +-- sd/util/sdfilt.component | 1 6 files changed, 17 insertions(+), 60 deletions(-)
New commits: commit 3505f0e46c2e0a743ab5de9adfbec3044a4573a6 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Jun 3 15:06:11 2013 +0200 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 diff --git a/odk/Package_autodoc.mk b/odk/Package_autodoc.mk index b73e7ba..bd1117b 100644 --- a/odk/Package_autodoc.mk +++ b/odk/Package_autodoc.mk @@ -107,7 +107,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME) com/sun/star/media \ com/sun/star/mozilla \ com/sun/star/office \ - com/sun/star/oox \ com/sun/star/packages \ com/sun/star/packages/manifest \ com/sun/star/packages/zip \ diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4aee919..90b05ef 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 14f84eb..0000000 --- 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 <com/sun/star/document/XExporter.idl> - - -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: */ diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index e9008b3..285ac2a 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -24,12 +24,10 @@ #include "oox/helper/graphichelper.hxx" #include "oox/ole/vbaproject.hxx" -#include "com/sun/star/oox/PowerPointExport.hpp" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using namespace ::oox::core; +using namespace oox::core; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::lang::XComponent; @@ -98,7 +96,7 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const if ( mpActualSlidePersist ) { sal_Bool bColorMapped = sal_False; - ::oox::drawingml::ClrMapPtr pClrMapPtr( mpActualSlidePersist->getClrMap() ); + oox::drawingml::ClrMapPtr pClrMapPtr( mpActualSlidePersist->getClrMap() ); if ( pClrMapPtr ) bColorMapped = pClrMapPtr->getColorMap( nToken ); @@ -112,7 +110,7 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const bColorMapped = pClrMapPtr->getColorMap( nToken ); } } - ::oox::drawingml::ClrSchemePtr pClrSchemePtr( mpActualSlidePersist->getClrScheme() ); + oox::drawingml::ClrSchemePtr pClrSchemePtr( mpActualSlidePersist->getClrScheme() ); if ( pClrSchemePtr ) pClrSchemePtr->getColor( nToken, nColor ); else @@ -142,15 +140,17 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe return true; if( isExportFilter() ) { - Reference< XExporter > xExporter = css::oox::PowerPointExport::create( getComponentContext() ); + Reference< XExporter > xExporter( Reference<css::lang::XMultiServiceFactory>(getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance( "com.sun.star.comp.Impress.oox.PowerPointExport" ), UNO_QUERY );; - Reference< XComponent > xDocument( getModel(), UNO_QUERY ); - Reference< XFilter > xFilter( xExporter, UNO_QUERY ); + if( xExporter.is() ) { + Reference< XComponent > xDocument( getModel(), UNO_QUERY ); + Reference< XFilter > xFilter( xExporter, UNO_QUERY ); - if( xFilter.is() ) { - xExporter->setSourceDocument( xDocument ); - if( xFilter->filter( rDescriptor ) ) - return true; + if( xFilter.is() ) { + xExporter->setSourceDocument( xDocument ); + if( xFilter->filter( rDescriptor ) ) + return true; + } } } @@ -162,12 +162,12 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe return mpActualSlidePersist ? mpActualSlidePersist->getDrawing() : 0; } -const ::oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles() +const oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles() { if ( !mpTableStyleList && !maTableStyleListPath.isEmpty() ) { - mpTableStyleList = ::oox::drawingml::table::TableStyleListPtr( new ::oox::drawingml::table::TableStyleList() ); - importFragment( new ::oox::drawingml::table::TableStyleListFragmentHandler( + mpTableStyleList = oox::drawingml::table::TableStyleListPtr( new oox::drawingml::table::TableStyleList() ); + importFragment( new oox::drawingml::table::TableStyleListFragmentHandler( *this, maTableStyleListPath, *mpTableStyleList ) ); } return mpTableStyleList; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 084fa787..ba04809 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2141,9 +2141,8 @@ OUString SAL_CALL PowerPointExport_getImplementationName() throw() uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() throw() { - Sequence< OUString > aSeq( 2 ); - aSeq[0] = "com.sun.star.comp.ooxpptx"; - aSeq[1] = "com.sun.star.oox.PowerPointExport"; + const OUString aServiceName( "com.sun.star.comp.ooxpptx" ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component index 349ea8b..3b1d3b0 100644 --- a/sd/util/sdfilt.component +++ b/sd/util/sdfilt.component @@ -11,6 +11,5 @@ xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"> <service name="com.sun.star.comp.ooxpptx"/> - <service name="com.sun.star.oox.PowerPointExport"/> </implementation> </component> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits