summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-07-27 22:33:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-30 16:26:31 +0200
commitc6e5d55171b295149a5e93fa8ee23c9c9908c6dd (patch)
treef8b2be3f9b44495514cfb96671a0108541d21ee4 /oox
parent5ea91ed27342766f2b6103ddb64f07e35af54e50 (diff)
Add missing sal/log.hxx headers
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes. This commit adds missing headers to every file found by: grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG') to directories from l10ntools to reportdesign Change-Id: Ia2dc93dd848c2dc0b6a8cb6e19849c614ec55198 Reviewed-on: https://gerrit.libreoffice.org/58205 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/relationshandler.cxx1
-rw-r--r--oox/source/core/xmlfilterbase.cxx1
-rw-r--r--oox/source/docprop/docprophandler.cxx1
-rw-r--r--oox/source/drawingml/color.cxx1
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx1
-rw-r--r--oox/source/drawingml/customshapepresetdata.cxx1
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx1
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx1
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx1
-rw-r--r--oox/source/drawingml/diagram/layoutatomvisitors.cxx2
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx1
-rw-r--r--oox/source/drawingml/fillproperties.cxx1
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx1
-rw-r--r--oox/source/drawingml/shape.cxx1
-rw-r--r--oox/source/drawingml/shape3dproperties.cxx1
-rw-r--r--oox/source/drawingml/shapecontext.cxx1
-rw-r--r--oox/source/drawingml/shapegroupcontext.cxx1
-rw-r--r--oox/source/drawingml/textbodycontext.cxx2
-rw-r--r--oox/source/drawingml/textcharacterpropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/textfield.cxx1
-rw-r--r--oox/source/drawingml/textliststyle.cxx1
-rw-r--r--oox/source/drawingml/textparagraph.cxx1
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx1
-rw-r--r--oox/source/drawingml/textrun.cxx1
-rw-r--r--oox/source/export/chartexport.cxx1
-rw-r--r--oox/source/export/drawingml.cxx1
-rw-r--r--oox/source/export/shapes.cxx1
-rw-r--r--oox/source/export/vmlexport.cxx1
-rw-r--r--oox/source/helper/graphichelper.cxx1
-rw-r--r--oox/source/helper/progressbar.cxx2
-rw-r--r--oox/source/helper/propertymap.cxx1
-rw-r--r--oox/source/helper/propertyset.cxx1
-rw-r--r--oox/source/helper/zipstorage.cxx1
-rw-r--r--oox/source/mathml/importutils.cxx1
-rw-r--r--oox/source/ole/axcontrol.cxx1
-rw-r--r--oox/source/ole/vbacontrol.cxx1
-rw-r--r--oox/source/ole/vbaproject.cxx1
-rw-r--r--oox/source/ppt/animationspersist.cxx1
-rw-r--r--oox/source/ppt/commonbehaviorcontext.cxx1
-rw-r--r--oox/source/ppt/pptimport.cxx1
-rw-r--r--oox/source/ppt/pptshape.cxx1
-rw-r--r--oox/source/ppt/pptshapecontext.cxx2
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx1
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx1
-rw-r--r--oox/source/ppt/slidetransition.cxx1
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx1
-rw-r--r--oox/source/ppt/timetargetelementcontext.cxx1
-rw-r--r--oox/source/shape/LockedCanvasContext.cxx2
-rw-r--r--oox/source/shape/WpgContext.cxx2
-rw-r--r--oox/source/shape/WpsContext.cxx1
-rw-r--r--oox/source/token/relationship.cxx1
-rw-r--r--oox/source/vml/vmldrawing.cxx1
-rw-r--r--oox/source/vml/vmlformatting.cxx1
-rw-r--r--oox/source/vml/vmlshape.cxx1
-rw-r--r--oox/source/vml/vmltextboxcontext.cxx1
55 files changed, 62 insertions, 0 deletions
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index 602205c5bbe5..7308f41ec9ad 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -20,6 +20,7 @@
#include <oox/core/relationshandler.hxx>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 2121716dad4e..0a9ad85582e3 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -41,6 +41,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <oox/core/fastparser.hxx>
#include <oox/core/fragmenthandler.hxx>
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 26d7e32443f7..cf3ce7b5d48e 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -29,6 +29,7 @@
#include <o3tl/safeint.hxx>
#include <osl/time.h>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vector>
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index f0ca6f509404..625adf5fca78 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -21,6 +21,7 @@
#include <algorithm>
#include <math.h>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 5b3b04a4a58f..5726ab425cff 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertymap.hxx>
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 48c93614dc86..2e392f19f91a 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -9,6 +9,7 @@
#include <config_folders.h>
#include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <comphelper/sequence.hxx>
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 7e87ea8d5248..80a3c2a3e036 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <comphelper/sequence.hxx>
+#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index e7a2df78bd5e..7dbd454f1595 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <editeng/unoprnms.hxx>
#include <drawingml/textbody.hxx>
#include <drawingml/textparagraph.hxx>
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index e0fd7d246c60..d3c006dc447a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -20,6 +20,7 @@
#include "diagramlayoutatoms.hxx"
#include <basegfx/numeric/ftools.hxx>
+#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/properties.hxx>
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index ce8e6ab72b9e..bf8747f0995d 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -21,6 +21,8 @@
#include <drawingml/customshapeproperties.hxx>
+#include <sal/log.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 9bbe8b31421c..682348172f87 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -27,6 +27,7 @@
#include "constraintlistcontext.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sal/log.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index d7a87d2735ea..b255116b4a7b 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -44,6 +44,7 @@
#include <oox/token/tokens.hxx>
#include <rtl/math.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index f8cfc0d40b0a..9047b0beebd1 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -21,6 +21,7 @@
#include <oox/drawingml/graphicshapecontext.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <drawingml/embeddedwavaudiofile.hxx>
#include <drawingml/misccontexts.hxx>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5c2e44a38fa3..d2966435779d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -87,6 +87,7 @@
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/svapp.hxx>
+#include <sal/log.hxx>
#include <vcl/wmf.hxx>
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index 09cbff171006..3002e1462c53 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -31,6 +31,7 @@
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/tokens.hxx>
+#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 03ae290cc1ea..22fa1671be31 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -36,6 +36,7 @@
#include "hyperlinkcontext.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sal/log.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index 0e1408aafd86..695cce70bb8f 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -32,6 +32,7 @@
#include <drawingml/textbodycontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sal/log.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index ea985f6b78a0..fdf3d62f5a6c 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -30,6 +30,8 @@
#include <oox/mathml/import.hxx>
+#include <sal/log.hxx>
+
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 8ab160755531..2b63f9f5237b 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -30,6 +30,8 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sal/log.hxx>
+
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 76c5939157e3..a3e2bf4948c6 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -23,6 +23,7 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
+#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextField.hpp>
diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx
index bd2599335a32..879fdea363d2 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -18,6 +18,7 @@
*/
#include <drawingml/textliststyle.hxx>
+#include <sal/log.hxx>
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index e1fe50b31f1b..a4348d8ce13f 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -23,6 +23,7 @@
#include <svtools/unitconv.hxx>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include <oox/mathml/importutils.hxx>
#include <oox/helper/propertyset.hxx>
#include <com/sun/star/text/XText.hpp>
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 8b7cdae07805..fde4b686c11e 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <svx/unopage.hxx>
+#include <sal/log.hxx>
#include <drawingml/colorchoicecontext.hxx>
#include <drawingml/textcharacterpropertiescontext.hxx>
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index d580cc48a7f6..5bcdd262390b 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextField.hpp>
+#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/propertyset.hxx>
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 5af781a8ae26..f39756d94b19 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -99,6 +99,7 @@
#include <svl/zforlist.hxx>
#include <svl/numuno.hxx>
#include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
#include <set>
#include <unordered_set>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 9d42b41fd14c..b42ddf8ab901 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -21,6 +21,7 @@
#include <config_folders.h>
#include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/export/drawingml.hxx>
#include <oox/export/utils.hxx>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 410ef022fb28..6d6b8a24c6fa 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <config_global.h>
+#include <sal/log.hxx>
#include <unotools/mediadescriptor.hxx>
#include <filter/msfilter/util.hxx>
#include <oox/core/xmlfilterbase.hxx>
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 3b314b603364..a071c6d4ff12 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -27,6 +27,7 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 6500f82e9a44..63f0ec24f8e9 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <comphelper/seqstream.hxx>
#include <vcl/wmf.hxx>
#include <vcl/wmfexternal.hxx>
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index ada6f7ecd4be..5158b3188c1f 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -22,6 +22,8 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <oox/helper/helper.hxx>
+#include <sal/log.hxx>
+
namespace oox {
using namespace ::com::sun::star::task;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 56b598a031df..6b5635d8023e 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -48,6 +48,7 @@ using ::com::sun::star::text::WritingMode;
#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
+#include <sal/log.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/propertynames.hxx>
using ::com::sun::star::uno::Any;
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 48635e54d43e..02abed12cd5f 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
#include <oox/helper/propertymap.hxx>
namespace oox {
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index bec903cedb21..0c455bc8948f 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <comphelper/storagehelper.hxx>
#include <oox/helper/helper.hxx>
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index d7beecf414ec..20decf4e7d45 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -18,6 +18,7 @@
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#define OPENING( token ) XML_STREAM_OPENING( token )
#define CLOSING( token ) XML_STREAM_CLOSING( token )
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index fe1c36d1fb17..3525e4f4d9a7 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -50,6 +50,7 @@
#include <comphelper/string.hxx>
#include <rtl/tencinfo.h>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 36b9278c079d..ada01ab5f022 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 3a9d237b05fa..bba778658ae5 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -35,6 +35,7 @@
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
#include <rtl/ustrbuf.h>
+#include <sal/log.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 6841c7ff2558..3ff3f3cdfe0e 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -20,6 +20,7 @@
#include <oox/ppt/animationspersist.hxx>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/text/XText.hpp>
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index 8de59ce06728..b94710777731 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -19,6 +19,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <oox/core/fragmenthandler.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 41733e1f2825..634cd877f66f 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
+#include <sal/log.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index e0cea6729fc2..037bb60e3c4e 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XText.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <sal/log.hxx>
#include <oox/ppt/slidepersist.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 304fdb933860..c6807575d49a 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/log.hxx>
+
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 9b6a35c804ee..bb939fbaf70d 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -21,6 +21,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <tools/multisel.hxx>
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index b04cbdb3cd90..b12298829052 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 7c1555b7dc80..b835b0f1ebb1 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/animations/XTransitionFilter.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/propertymap.hxx>
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 7518d5599fda..ee61e3b8d137 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -21,6 +21,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/math.hxx>
+#include <sal/log.hxx>
#include <com/sun/star/animations/AnimationTransformType.hpp>
#include <com/sun/star/animations/AnimationCalcMode.hpp>
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 07ae4fa31379..60ad3af407c1 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -21,6 +21,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <drawingml/embeddedwavaudiofile.hxx>
diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index 3d4603f47355..277a11fdd262 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/log.hxx>
+
#include "LockedCanvasContext.hxx"
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/shapecontext.hxx>
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index c709fe314475..26a54c41d2ac 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/log.hxx>
+
#include "WpgContext.hxx"
#include <drawingml/shapepropertiescontext.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 67b3b1b60353..d0d021cd1dd4 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -24,6 +24,7 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <oox/drawingml/shape.hxx>
+#include <sal/log.hxx>
#include <boost/optional.hpp>
diff --git a/oox/source/token/relationship.cxx b/oox/source/token/relationship.cxx
index 8c51332164ef..cfe1dedc508d 100644
--- a/oox/source/token/relationship.cxx
+++ b/oox/source/token/relationship.cxx
@@ -9,6 +9,7 @@
#include <oox/token/relationship.hxx>
+#include <sal/log.hxx>
#include <map>
namespace oox {
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 57c099c0745d..ab2a9f8a42d5 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/ole/axcontrol.hxx>
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 17a730a2f8d8..c48b386394e9 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <oox/drawingml/color.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d304e63ca1d3..7b94a158a204 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <svx/svdtrans.hxx>
#include <oox/drawingml/shapepropertymap.hxx>
#include <oox/helper/graphichelper.hxx>
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index cef2e1037d0e..7f5072536983 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -25,6 +25,7 @@
#include <oox/token/tokens.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
namespace oox {
namespace vml {