summaryrefslogtreecommitdiffstats
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
parentimpress/draw notebookbar update for 7.1 (diff)
downloadcore-f2e1685e489c054ea10afc0df52451c74da10cc0.tar.gz
core-f2e1685e489c054ea10afc0df52451c74da10cc0.zip
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
-rw-r--r--oox/inc/drawingml/effectpropertiescontext.hxx (renamed from oox/source/drawingml/effectpropertiescontext.hxx)5
-rw-r--r--oox/source/drawingml/effectpropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx2
-rw-r--r--solenv/clang-format/excludelist2
5 files changed, 5 insertions, 8 deletions
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/inc/drawingml/effectpropertiescontext.hxx
index ce7b5b3ef363..09ec2f02ec80 100644
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ b/oox/inc/drawingml/effectpropertiescontext.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#pragma once
#include <oox/core/contexthandler2.hxx>
@@ -35,6 +34,4 @@ private:
}
-#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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/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>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index c7eee25f0f8c..5249848a75d8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7185,6 +7185,7 @@ oox/inc/drawingml/clrschemecontext.hxx
oox/inc/drawingml/colorchoicecontext.hxx
oox/inc/drawingml/customshapegeometry.hxx
oox/inc/drawingml/customshapeproperties.hxx
+oox/inc/drawingml/effectpropertiescontext.hxx
oox/inc/drawingml/embeddedwavaudiofile.hxx
oox/inc/drawingml/fillproperties.hxx
oox/inc/drawingml/graphicproperties.hxx
@@ -7303,7 +7304,6 @@ oox/source/drawingml/drawingmltypes.cxx
oox/source/drawingml/effectproperties.cxx
oox/source/drawingml/effectproperties.hxx
oox/source/drawingml/effectpropertiescontext.cxx
-oox/source/drawingml/effectpropertiescontext.hxx
oox/source/drawingml/fillproperties.cxx
oox/source/drawingml/graphicshapecontext.cxx
oox/source/drawingml/guidcontext.cxx