[Libreoffice-commits] core.git: include/oox oox/Library_oox.mk oox/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 26 07:03:49 UTC 2018
include/oox/ppt/dgmimport.hxx | 71 -------------------------
oox/Library_oox.mk | 1
oox/source/ppt/dgmimport.cxx | 118 ------------------------------------------
3 files changed, 190 deletions(-)
New commits:
commit 8a678b1f51e5dcd0961f21a8ea4cfb43bae5ec07
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Thu Oct 25 21:37:27 2018 +0200
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Fri Oct 26 09:03:23 2018 +0200
oox: remove dead QuickDiagrammingImport
This would create a com.sun.star.drawing.DiagramShape, and work with
that, but nobody implements such a service.
Change-Id: I32a63dd258a5f168e37c5926a832dadd45c2b179
Reviewed-on: https://gerrit.libreoffice.org/62371
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
deleted file mode 100644
index 2fca42918d1a..000000000000
--- a/include/oox/ppt/dgmimport.hxx
+++ /dev/null
@@ -1,71 +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 INCLUDED_OOX_PPT_DGMIMPORT_HXX
-#define INCLUDED_OOX_PPT_DGMIMPORT_HXX
-
-#include <exception>
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <oox/core/filterbase.hxx>
-#include <oox/core/xmlfilterbase.hxx>
-#include <oox/drawingml/theme.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star {
- namespace uno { class XComponentContext; }
-} } }
-
-namespace oox {
- namespace drawingml { namespace chart { class ChartConverter; } }
- namespace ole { class VbaProject; }
- namespace vml { class Drawing; }
-}
-
-namespace oox { namespace ppt {
-
-
-class QuickDiagrammingImport : public oox::core::XmlFilterBase
-{
-public:
-
- QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-
- // from FilterBase
- virtual bool importDocument() override;
- virtual bool exportDocument() throw() override;
-
- virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override;
-
- virtual oox::vml::Drawing* getVmlDrawing() override;
- virtual oox::drawingml::chart::ChartConverter* getChartConverter() override;
-
-private:
- virtual OUString SAL_CALL getImplementationName() override;
- virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
-};
-
-} }
-
-#endif // INCLUDED_OOX_PPT_DGMIMPORT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 941b3a1d270a..66705fdc1611 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -256,7 +256,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/ppt/commontimenodecontext \
oox/source/ppt/conditioncontext \
oox/source/ppt/customshowlistcontext \
- oox/source/ppt/dgmimport \
oox/source/ppt/dgmlayout \
oox/source/ppt/headerfootercontext \
oox/source/ppt/layoutfragmenthandler \
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
deleted file mode 100644
index 2a06c4b66011..000000000000
--- a/oox/source/ppt/dgmimport.cxx
+++ /dev/null
@@ -1,118 +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 .
- */
-
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <oox/ppt/dgmimport.hxx>
-#include <oox/drawingml/theme.hxx>
-#include <drawingml/diagram/diagram.hxx>
-#include <oox/dump/pptxdumper.hxx>
-
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-using namespace oox::core;
-
-namespace oox { namespace ppt {
-
-QuickDiagrammingImport::QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
- : XmlFilterBase( rxContext )
-{}
-
-bool QuickDiagrammingImport::importDocument()
-{
- /* to activate the PPTX dumper, define the environment variable
- OOO_PPTXDUMPER and insert the full path to the file
- file:///<path-to-oox-module>/source/dump/pptxdumper.ini. */
- OOX_DUMP_FILE( ::oox::dump::pptx::Dumper );
-
- OUString aFragmentPath = getFragmentPathFromFirstTypeFromOfficeDoc( "diagramLayout" );
-
- Reference<drawing::XShapes> xParentShape(getParentShape(),
- UNO_QUERY_THROW);
- oox::core::Relations aRelations("");
- oox::drawingml::ShapePtr pShape(
- new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) );
- drawingml::loadDiagram(pShape,
- *this,
- "",
- aFragmentPath,
- "",
- "",
- aRelations);
- oox::drawingml::ThemePtr pTheme(
- new oox::drawingml::Theme());
- basegfx::B2DHomMatrix aMatrix;
- pShape->addShape( *this,
- pTheme.get(),
- xParentShape,
- aMatrix, pShape->getFillProperties() );
-
- return true;
-}
-
-bool QuickDiagrammingImport::exportDocument() throw()
-{
- return false;
-}
-
-const ::oox::drawingml::Theme* QuickDiagrammingImport::getCurrentTheme() const
-{
- // TODO
- return nullptr;
-}
-
-const oox::drawingml::table::TableStyleListPtr QuickDiagrammingImport::getTableStyles()
-{
- return oox::drawingml::table::TableStyleListPtr();
-}
-
-oox::vml::Drawing* QuickDiagrammingImport::getVmlDrawing()
-{
- return nullptr;
-}
-
-oox::drawingml::chart::ChartConverter* QuickDiagrammingImport::getChartConverter()
-{
- return nullptr;
-}
-
-OUString QuickDiagrammingImport::getImplementationName()
-{
- return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
-}
-
-::oox::ole::VbaProject* QuickDiagrammingImport::implCreateVbaProject() const
-{
- return nullptr;
-}
-
-}}
-
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_oox_ppt_QuickDiagrammingImport_get_implementation(
- uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
-{
- return cppu::acquire(new oox::ppt::QuickDiagrammingImport(pCtx));
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list