diff options
20 files changed, 22 insertions, 22 deletions
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 392f6c60d427..cffc1e3c50dd 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -312,7 +312,7 @@ BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effectpropertiescontext.cxx; path = ../../../oox/source/drawingml/effectpropertiescontext.cxx; sourceTree = SOURCE_ROOT; }; BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedwavaudiofile.cxx; path = ../../../oox/source/drawingml/embeddedwavaudiofile.cxx; sourceTree = SOURCE_ROOT; }; BE55B11E18DB67A900950228 /* fillproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillproperties.cxx; path = ../../../oox/source/drawingml/fillproperties.cxx; sourceTree = SOURCE_ROOT; }; - BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillpropertiesgroupcontext.cxx; path = ../../../oox/source/drawingml/fillpropertiesgroupcontext.cxx; sourceTree = SOURCE_ROOT; }; + BE55B11F18DB67A900950228 /* misccontexts.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = misccontexts.cxx; path = ../../../oox/source/drawingml/misccontexts.cxx; sourceTree = SOURCE_ROOT; }; BE55B12018DB67A900950228 /* graphicshapecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicshapecontext.cxx; path = ../../../oox/source/drawingml/graphicshapecontext.cxx; sourceTree = SOURCE_ROOT; }; BE55B12118DB67A900950228 /* guidcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = guidcontext.cxx; path = ../../../oox/source/drawingml/guidcontext.cxx; sourceTree = SOURCE_ROOT; }; BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkcontext.cxx; path = ../../../oox/source/drawingml/hyperlinkcontext.cxx; sourceTree = SOURCE_ROOT; }; @@ -1316,7 +1316,7 @@ BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */, BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */, BE55B11E18DB67A900950228 /* fillproperties.cxx */, - BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */, + BE55B11F18DB67A900950228 /* misccontexts.cxx */, BE55B12018DB67A900950228 /* graphicshapecontext.cxx */, BE55B12118DB67A900950228 /* guidcontext.cxx */, BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */, diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index e6765f405d04..3d6c684d3fc4 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -151,7 +151,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\ oox/source/drawingml/effectpropertiescontext \ oox/source/drawingml/embeddedwavaudiofile \ oox/source/drawingml/fillproperties \ - oox/source/drawingml/fillpropertiesgroupcontext \ + oox/source/drawingml/misccontexts \ oox/source/drawingml/graphicshapecontext \ oox/source/drawingml/guidcontext \ oox/source/drawingml/hyperlinkcontext \ diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/misccontexts.hxx index 4c40ff371db1..67d2d0e1666f 100644 --- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX +#ifndef INCLUDED_OOX_DRAWINGML_MISCCONTEXTS_HXX +#define INCLUDED_OOX_DRAWINGML_MISCCONTEXTS_HXX #include <drawingml/colorchoicecontext.hxx> diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index fb9f3ccf2acb..4b869f5929cd 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX #include <com/sun/star/beans/XPropertySet.hpp> -#include <drawingml/fillpropertiesgroupcontext.hxx> +#include <drawingml/misccontexts.hxx> #include <drawingml/textcharacterproperties.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <drawingml/textfont.hxx> diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 1bfc94757806..5949c9f9ec18 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -163,7 +163,7 @@ #include <drawingml/customshapegeometry.hxx> #include <drawingml/customshapeproperties.hxx> #include <drawingml/fillproperties.hxx> -#include <drawingml/fillpropertiesgroupcontext.hxx> +#include <drawingml/misccontexts.hxx> #include <drawingml/lineproperties.hxx> #include <drawingml/shapepropertiescontext.hxx> #include <drawingml/shapestylecontext.hxx> diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index 55627c4c0ec2..a48e2c292e4b 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -19,7 +19,7 @@ #include "datamodelcontext.hxx" #include "oox/helper/attributelist.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/shapepropertiescontext.hxx" #include "drawingml/textbodycontext.hxx" #include <oox/token/namespaces.hxx> diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 63faada8e3bd..fd4eadc3cfaf 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -10,7 +10,7 @@ #include "effectpropertiescontext.hxx" #include "effectproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 7bfcbe9a8b53..fa59e0a3c046 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -23,7 +23,7 @@ #include <osl/diagnose.h> #include <drawingml/embeddedwavaudiofile.hxx> -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/graphicproperties.hxx" #include "drawingml/customshapeproperties.hxx" #include "drawingml/diagram/diagram.hxx" diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index b77d66f66814..2d3bfd6863f6 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -19,7 +19,7 @@ #include "drawingml/linepropertiescontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/lineproperties.hxx" #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/misccontexts.cxx index 805184e6cf3d..06c20131b6ef 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/misccontexts.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index 686de1743838..75db4852c201 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -27,7 +27,7 @@ #include "oox/drawingml/shapecontext.hxx" #include <drawingml/shapepropertiescontext.hxx> #include "drawingml/shapestylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/customshapegeometry.hxx" diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index d3c4ed9f276d..82f5207d91e4 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -27,7 +27,7 @@ #include "drawingml/scene3dcontext.hxx" #include "drawingml/linepropertiescontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/transform2dcontext.hxx" #include "drawingml/customshapegeometry.hxx" #include "effectpropertiescontext.hxx" diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index b376cab17d19..4a9cf3ae65bc 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablebackgroundstylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index e7bffe3c83bc..0d738d4fd59b 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -22,7 +22,7 @@ #include "drawingml/table/tablecellcontext.hxx" #include "drawingml/textbodycontext.hxx" #include "drawingml/linepropertiescontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index cc4d381e0528..e2dc4b596824 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablestylecellstylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/linepropertiescontext.hxx" #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index 2ed435d59c7e..a936c36678a9 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -22,7 +22,7 @@ #include "drawingml/lineproperties.hxx" #include "drawingml/linepropertiescontext.hxx" #include "drawingml/fillproperties.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/textcharacterproperties.hxx" #include "oox/drawingml/theme.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index c77370971881..29ffe622500c 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -18,7 +18,7 @@ */ #include "oox/ppt/backgroundproperties.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/core/contexthandler2.hxx" #include <oox/token/namespaces.hxx> diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index 29011d52aa58..152872ffbdc8 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -28,7 +28,7 @@ #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" #include "drawingml/shapestylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/customshapegeometry.hxx" diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 16c0eb2c70fb..81e0cbb71fa8 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -29,7 +29,7 @@ #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" #include "drawingml/shapestylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/customshapegeometry.hxx" diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index c5ff7af04c29..4fca73a3d9a7 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -27,7 +27,7 @@ #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" #include "drawingml/shapestylecontext.hxx" -#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/misccontexts.hxx" #include "drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "drawingml/customshapegeometry.hxx" |