diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-11-27 16:58:38 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-11 16:02:25 +0100 |
| commit | a99897ad210b04e2039a3aafb3edc7a733f43ce4 (patch) | |
| tree | 1caac0cc2bf7fb799835c993b5a56ee1c3b1ed27 /oox | |
| parent | b0cbb1dcb1a48e32efb6e124f47c83e863c2454d (diff) | |
oox: make effectpropertiescontext available to everyone in oox/
I plan to use this from oox/source/drawingml/table/tablecontext.cxx for
tdf#129961.
(cherry picked from commit f2e1685e489c054ea10afc0df52451c74da10cc0)
Conflicts:
solenv/clang-format/excludelist
Change-Id: Id5177467341f9ddf73c6043796ad35e9cc655d37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107592
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/drawingml/effectpropertiescontext.hxx (renamed from oox/source/drawingml/effectpropertiescontext.hxx) | 5 | ||||
| -rw-r--r-- | oox/source/drawingml/effectpropertiescontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/shapepropertiescontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/themeelementscontext.cxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/inc/drawingml/effectpropertiescontext.hxx index 540dd0187639..660eb14eb0e8 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 40c132f3fb2c..73adfafa3469 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 <oox/drawingml/drawingmltypes.hxx> #include <drawingml/misccontexts.hxx> diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index eedc338a25e4..506ad64cdcad 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -30,7 +30,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 8c94a9bf74db..a387adab1618 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> |