summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-11-27 16:58:38 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-11-27 21:33:33 +0100
commitf2e1685e489c054ea10afc0df52451c74da10cc0 (patch)
treeed59bf9013edf1d82c754d80e636f1ecfd032604 /oox/source/drawingml
parent364e440e024a4af6a0bdd354ae2bd4bcdd9536c6 (diff)
oox: make effectpropertiescontext available to everyone in oox/
I plan to use this from oox/source/drawingml/table/tablecontext.cxx for tdf#129961. Change-Id: Id5177467341f9ddf73c6043796ad35e9cc655d37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106781 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/effectpropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/effectpropertiescontext.hxx40
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx2
4 files changed, 3 insertions, 43 deletions
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index f287c897d891..b7cb03bc08b6 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "effectpropertiescontext.hxx"
+#include <drawingml/effectpropertiescontext.hxx>
#include "effectproperties.hxx"
#include <drawingml/colorchoicecontext.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
deleted file mode 100644
index ce7b5b3ef363..000000000000
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ /dev/null
@@ -1,40 +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/.
- */
-
-#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-
-#include <oox/core/contexthandler2.hxx>
-
-namespace oox::drawingml {
-
-struct EffectProperties;
-struct Effect;
-
-class EffectPropertiesContext final : public ::oox::core::ContextHandler2
-{
-public:
- EffectPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
- EffectProperties& rEffectProperties ) throw();
- virtual ~EffectPropertiesContext() override;
-
- virtual ::oox::core::ContextHandlerRef
- onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
-
-private:
- static void saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs );
-
- EffectProperties& mrEffectProperties;
-};
-
-}
-
-#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index 4591cb834489..574e0793c89a 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -24,7 +24,7 @@
#include <drawingml/misccontexts.hxx>
#include <drawingml/transform2dcontext.hxx>
#include <drawingml/customshapegeometry.hxx>
-#include "effectpropertiescontext.hxx"
+#include <drawingml/effectpropertiescontext.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index e5f84e5a02a0..6fbd62e91d18 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -27,7 +27,7 @@
#include <oox/drawingml/theme.hxx>
#include <oox/helper/attributelist.hxx>
#include "effectproperties.hxx"
-#include "effectpropertiescontext.hxx"
+#include <drawingml/effectpropertiescontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>