[API CHANGE] drop ShapeContextHandler service and interface

There is zero chance an extension is using this, because it is so
intimately tired together with the oox and writerfilter interactions.

I'm removing this so I can expose the ShapeContextHandler and then
override it's implementation in a more fashion without jumping through
UNO hoops.

Change-Id: I79ef30247f4642303dfdb92bbf8f6e6226234829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117996
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 17 insertions, 212 deletions

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 7cd7251c4aaf..4eb20ad36cda 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
 
-#include "ShapeContextHandler.hxx"
+#include <oox/shape/ShapeContextHandler.hxx>
 #include "ShapeDrawingFragmentHandler.hxx"
 #include "LockedCanvasContext.hxx"
 #include "WpsContext.hxx"
@@ -389,8 +389,7 @@ void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
         xContextHandler->characters(aChars);
 }
 
-// css::xml::sax::XFastShapeContextHandler:
-uno::Reference< drawing::XShape > SAL_CALL
+uno::Reference< drawing::XShape >
 ShapeContextHandler::getShape()
 {
     uno::Reference< drawing::XShape > xResult;
@@ -520,28 +519,24 @@ ShapeContextHandler::getShape()
     return xResult;
 }
 
-css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-ShapeContextHandler::getDrawPage()
+css::uno::Reference< css::drawing::XDrawPage > ShapeContextHandler::getDrawPage()
 {
     return mxDrawPage;
 }
 
-void SAL_CALL ShapeContextHandler::setDrawPage
-(const css::uno::Reference< css::drawing::XDrawPage > & the_value)
+void ShapeContextHandler::setDrawPage(const css::uno::Reference< css::drawing::XDrawPage > & the_value)
 {
     mxDrawPage = the_value;
 }
 
-css::uno::Reference< css::frame::XModel > SAL_CALL
-ShapeContextHandler::getModel()
+css::uno::Reference< css::frame::XModel > ShapeContextHandler::getModel()
 {
     if( !mxShapeFilterBase.is() )
         throw uno::RuntimeException();
     return mxShapeFilterBase->getModel();
 }
 
-void SAL_CALL ShapeContextHandler::setModel
-(const css::uno::Reference< css::frame::XModel > & the_value)
+void ShapeContextHandler::setModel(const css::uno::Reference< css::frame::XModel > & the_value)
 {
     if( !mxShapeFilterBase.is() )
         throw uno::RuntimeException();
@@ -549,84 +544,62 @@ void SAL_CALL ShapeContextHandler::setModel
     mxShapeFilterBase->setTargetDocument(xComp);
 }
 
-OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
+OUString ShapeContextHandler::getRelationFragmentPath()
 {
     return msRelationFragmentPath;
 }
 
-void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_value)
+void ShapeContextHandler::setRelationFragmentPath(const OUString & the_value)
 {
     msRelationFragmentPath = the_value;
 }
 
-::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken()
+sal_Int32 ShapeContextHandler::getStartToken()
 {
     return mnStartToken;
 }
 
-void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken )
+void ShapeContextHandler::setStartToken( sal_Int32 _starttoken )
 {
     mnStartToken = _starttoken;
 }
 
-awt::Point SAL_CALL ShapeContextHandler::getPosition()
+awt::Point ShapeContextHandler::getPosition()
 {
     return maPosition;
 }
 
-void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition)
+void ShapeContextHandler::setPosition(const awt::Point& rPosition)
 {
     maPosition = rPosition;
 }
 
-void SAL_CALL ShapeContextHandler::setDocumentProperties(const uno::Reference<document::XDocumentProperties>& xDocProps)
+void ShapeContextHandler::setDocumentProperties(const uno::Reference<document::XDocumentProperties>& xDocProps)
 {
     mxDocumentProperties = xDocProps;
     mxShapeFilterBase->checkDocumentProperties(mxDocumentProperties);
 }
 
-uno::Reference<document::XDocumentProperties> SAL_CALL ShapeContextHandler::getDocumentProperties()
+uno::Reference<document::XDocumentProperties> ShapeContextHandler::getDocumentProperties()
 {
     return mxDocumentProperties;
 }
 
-uno::Sequence<beans::PropertyValue> SAL_CALL ShapeContextHandler::getMediaDescriptor()
+uno::Sequence<beans::PropertyValue> ShapeContextHandler::getMediaDescriptor()
 {
     return maMediaDescriptor;
 }
 
-void SAL_CALL ShapeContextHandler::setMediaDescriptor(const uno::Sequence<beans::PropertyValue>& rMediaDescriptor)
+void ShapeContextHandler::setMediaDescriptor(const uno::Sequence<beans::PropertyValue>& rMediaDescriptor)
 {
     maMediaDescriptor = rMediaDescriptor;
 }
 
-void SAL_CALL ShapeContextHandler::setGraphicMapper(css::uno::Reference<css::graphic::XGraphicMapper> const & rxGraphicMapper)
+void ShapeContextHandler::setGraphicMapper(css::uno::Reference<css::graphic::XGraphicMapper> const & rxGraphicMapper)
 {
     mxShapeFilterBase->setGraphicMapper(rxGraphicMapper);
 }
 
-OUString ShapeContextHandler::getImplementationName()
-{
-    return "com.sun.star.comp.oox.ShapeContextHandler";
-}
-
-uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
-{
-    return { "com.sun.star.xml.sax.FastShapeContextHandler" };
-}
-
-sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName)
-{
-    return cppu::supportsService(this, ServiceName);
-}
-
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_oox_ShapeContextHandler_get_implementation(
-    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(new oox::shape::ShapeContextHandler(pCtx));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
deleted file mode 100644
index d9b171f045b0..000000000000
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ /dev/null
@@ -1,168 +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_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
-#define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
-
-#include <memory>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
-#include <oox/drawingml/graphicshapecontext.hxx>
-#include <oox/core/fragmenthandler2.hxx>
-#include <oox/core/xmlfilterbase.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
-
-namespace oox::shape {
-
-class ShapeFilterBase;
-
-class ShapeFragmentHandler : public core::FragmentHandler2
-{
-public:
-    typedef rtl::Reference<ShapeFragmentHandler> Pointer_t;
-
-    explicit ShapeFragmentHandler(core::XmlFilterBase& rFilter,
-                                  const OUString& rFragmentPath )
-    : FragmentHandler2(rFilter, rFragmentPath)
-    {
-    }
-};
-
-class ShapeContextHandler:
-    public ::cppu::WeakImplHelper< css::xml::sax::XFastShapeContextHandler,
-                                    css::lang::XServiceInfo >
-{
-public:
-    explicit ShapeContextHandler
-    (css::uno::Reference< css::uno::XComponentContext > const & context);
-
-    virtual ~ShapeContextHandler() override;
-
-    // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() override;
-
-    virtual sal_Bool SAL_CALL supportsService
-    (const OUString & ServiceName) override;
-
-    virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() override;
-
-    // css::xml::sax::XFastContextHandler:
-    virtual void SAL_CALL startFastElement
-    (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
-
-    virtual void SAL_CALL startUnknownElement
-    (const OUString & Namespace,
-     const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
-
-    virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
-
-    virtual void SAL_CALL endUnknownElement
-    (const OUString & Namespace,
-     const OUString & Name) override;
-
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
-    createFastChildContext
-    (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
-
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
-    createUnknownChildContext
-    (const OUString & Namespace,
-     const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
-
-    virtual void SAL_CALL characters(const OUString & aChars) override;
-
-    // css::xml::sax::XFastShapeContextHandler:
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() override;
-
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override;
-
-    virtual void SAL_CALL setDrawPage
-    (const css::uno::Reference< css::drawing::XDrawPage > & the_value) override;
-
-    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override;
-
-    virtual void SAL_CALL setModel
-    (const css::uno::Reference< css::frame::XModel > & the_value) override;
-
-    virtual OUString SAL_CALL getRelationFragmentPath() override;
-    virtual void SAL_CALL setRelationFragmentPath
-    (const OUString & the_value) override;
-
-    virtual ::sal_Int32 SAL_CALL getStartToken() override;
-    virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) override;
-
-    virtual css::awt::Point SAL_CALL getPosition() override;
-    virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) override;
-
-    virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps) override;
-    virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties() override;
-    virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getMediaDescriptor() override;
-    virtual void SAL_CALL setMediaDescriptor(const css::uno::Sequence<css::beans::PropertyValue>& rMediaDescriptor) override;
-
-    void SAL_CALL setGraphicMapper(css::uno::Reference<css::graphic::XGraphicMapper> const & rGraphicMapper) override;
-
-private:
-    ShapeContextHandler(ShapeContextHandler const &) = delete;
-    void operator =(ShapeContextHandler const &) = delete;
-
-    ::sal_uInt32 mnStartToken;
-    css::awt::Point maPosition;
-
-    drawingml::ShapePtr mpShape;
-    std::shared_ptr< vml::Drawing > mpDrawing;
-
-    typedef rtl::Reference<drawingml::GraphicShapeContext>
-    GraphicShapeContextPtr;
-    css::uno::Reference<XFastContextHandler> mxDrawingFragmentHandler;
-    css::uno::Reference<XFastContextHandler> mxGraphicShapeContext;
-    css::uno::Reference<XFastContextHandler> mxDiagramShapeContext;
-    css::uno::Reference<XFastContextHandler> mxLockedCanvasContext;
-    css::uno::Reference<XFastContextHandler> mxWpsContext;
-    css::uno::Reference<css::drawing::XShape> mxSavedShape;
-    css::uno::Reference<XFastContextHandler> mxWpgContext;
-    css::uno::Reference<XFastContextHandler> mxChartShapeContext;
-    css::uno::Reference<css::document::XDocumentProperties> mxDocumentProperties;
-    css::uno::Sequence<css::beans::PropertyValue> maMediaDescriptor;
-
-    ::rtl::Reference< ShapeFilterBase > mxShapeFilterBase;
-    drawingml::ThemePtr mpThemePtr;
-    css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
-    OUString msRelationFragmentPath;
-
-    css::uno::Reference<XFastContextHandler> const & getGraphicShapeContext(::sal_Int32 Element);
-    css::uno::Reference<XFastContextHandler> const & getChartShapeContext(::sal_Int32 Element);
-    css::uno::Reference<XFastContextHandler> const & getDrawingShapeContext();
-    css::uno::Reference<XFastContextHandler> const & getDiagramShapeContext();
-    css::uno::Reference<XFastContextHandler> const & getLockedCanvasContext(sal_Int32 nElement);
-    css::uno::Reference<XFastContextHandler> const & getWpsContext(sal_Int32 nStartElement, sal_Int32 nElement);
-    css::uno::Reference<XFastContextHandler> const & getWpgContext(sal_Int32 nElement);
-    css::uno::Reference<XFastContextHandler> getContextHandler(sal_Int32 nElement = 0);
-};
-
-}
-
-#endif // INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */