[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/inc oox/source solenv/clang-format

[Miklos Vajna (via logerrit)]

 oox/inc/drawingml/effectpropertiescontext.hxx    |    5 +----
 oox/source/drawingml/effectpropertiescontext.cxx |    2 +-
 oox/source/drawingml/shapepropertiescontext.cxx  |    2 +-
 oox/source/drawingml/themeelementscontext.cxx    |    2 +-
 solenv/clang-format/blacklist                    |    2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit a99897ad210b04e2039a3aafb3edc7a733f43ce4
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Nov 27 16:58:38 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Dec 11 16:02:25 2020 +0100

    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 at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/inc/drawingml/effectpropertiescontext.hxx
similarity index 85%
rename from oox/source/drawingml/effectpropertiescontext.hxx
rename to 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>
 
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index d6441687d8c4..521ff3e43683 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -8907,7 +8907,7 @@ 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/inc/drawingml/effectpropertiescontext.hxx
 oox/source/drawingml/embeddedwavaudiofile.cxx
 oox/source/drawingml/fillproperties.cxx
 oox/source/drawingml/graphicshapecontext.cxx