[Libreoffice-commits] core.git: 3 commits - basic/source chart2/source editeng/source filter/source include/tools sc/qa sc/source sd/inc sd/qa sd/source sfx2/source slideshow/source sot/source starmath/qa starmath/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source tools/source vcl/qa vcl/source xmloff/source
Michael Stahl
mstahl at redhat.com
Wed Dec 13 21:21:44 UTC 2017
basic/source/uno/dlgcont.cxx | 1 +
chart2/source/view/main/AbstractShapeFactory.cxx | 1 +
chart2/source/view/main/ChartView.cxx | 1 +
editeng/source/items/frmitems.cxx | 1 +
editeng/source/items/numitem.cxx | 1 +
editeng/source/items/paraitem.cxx | 1 +
editeng/source/items/textitem.cxx | 1 +
filter/source/msfilter/msoleexp.cxx | 1 +
include/tools/solar.h | 11 -----------
include/tools/svlibrary.h | 15 +++++++++++++++
sc/qa/unit/helper/qahelper.hxx | 1 +
sc/source/core/data/documen8.cxx | 1 +
sc/source/core/tool/autoform.cxx | 1 +
sc/source/core/tool/ddelink.cxx | 1 +
sc/source/filter/xml/xmlwrap.cxx | 1 +
sc/source/ui/app/drwtrans.cxx | 1 +
sc/source/ui/app/transobj.cxx | 1 +
sc/source/ui/attrdlg/scabstdlg.cxx | 1 +
sc/source/ui/docshell/docsh.cxx | 1 +
sc/source/ui/docshell/impex.cxx | 1 +
sd/inc/sdxmlwrp.hxx | 1 +
sd/qa/unit/sdmodeltestbase.hxx | 1 +
sd/source/filter/sdfilter.cxx | 1 +
sd/source/ui/app/sdxfer.cxx | 1 +
sfx2/source/appl/app.cxx | 1 +
sfx2/source/appl/appinit.cxx | 1 +
sfx2/source/appl/appserv.cxx | 1 +
sfx2/source/appl/fileobj.cxx | 1 +
sfx2/source/doc/SfxDocumentMetaData.cxx | 1 +
sfx2/source/doc/docfilt.cxx | 1 +
sfx2/source/doc/objembed.cxx | 1 +
sfx2/source/doc/objserv.cxx | 1 +
sfx2/source/doc/objstor.cxx | 1 +
sfx2/source/doc/sfxbasemodel.cxx | 1 +
slideshow/source/engine/shapes/gdimtftools.cxx | 1 +
sot/source/base/formats.cxx | 1 +
sot/source/sdstor/storage.cxx | 1 +
starmath/qa/extras/mmlimport-test.cxx | 2 ++
starmath/source/document.cxx | 1 +
starmath/source/mathmlexport.cxx | 1 +
starmath/source/mathmlimport.cxx | 1 +
svl/source/items/macitem.cxx | 1 +
svtools/source/graphic/provider.cxx | 1 +
svtools/source/misc/embedhlp.cxx | 1 +
svtools/source/misc/embedtransfer.cxx | 1 +
svtools/source/misc/svtaccessiblefactory.cxx | 2 ++
svtools/source/misc/transfer.cxx | 1 +
svtools/source/misc/transfer2.cxx | 1 +
svx/source/dialog/compressgraphicdialog.cxx | 1 +
svx/source/gallery2/galobj.cxx | 1 +
svx/source/gallery2/galtheme.cxx | 1 +
svx/source/items/chrtitem.cxx | 1 +
svx/source/items/e3ditem.cxx | 1 +
svx/source/xml/xmleohlp.cxx | 1 +
svx/source/xml/xmlgrhlp.cxx | 1 +
sw/qa/core/filters-test.cxx | 1 +
sw/qa/unit/sw-dialogs-test.cxx | 1 +
sw/qa/unit/sw-dialogs-test_2.cxx | 1 +
sw/source/core/doc/tblafmt.cxx | 1 +
sw/source/core/swg/SwXMLTextBlocks1.cxx | 1 +
sw/source/filter/basflt/fltini.cxx | 1 +
sw/source/filter/xml/swxml.cxx | 1 +
sw/source/filter/xml/wrtxml.cxx | 2 ++
sw/source/uibase/app/docsh2.cxx | 1 +
sw/source/uibase/dochdl/swdtflvr.cxx | 1 +
sw/source/uibase/globdoc/globdoc.cxx | 1 +
sw/source/uibase/web/wdocsh.cxx | 1 +
toolkit/source/helper/accessibilityclient.cxx | 2 +-
tools/source/stream/stream.cxx | 1 +
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 2 ++
vcl/source/filter/FilterConfigCache.cxx | 1 +
vcl/source/gdi/dibtools.cxx | 1 +
vcl/source/gdi/gdimtf.cxx | 1 +
vcl/source/gdi/impgraph.cxx | 1 +
vcl/source/gdi/pdfwriter_impl2.cxx | 1 +
xmloff/source/core/xmlimp.cxx | 1 +
xmloff/source/text/XMLSectionExport.cxx | 5 ++++-
77 files changed, 97 insertions(+), 13 deletions(-)
New commits:
commit 68eb27e3bd5d536e7b00b7dc145ae4943b95bec9
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 13 21:50:15 2017 +0100
tools: reimplement SVLIBRARY macro & remove it from solar.h
Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index b340869bddc6..87a09efa1810 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -30,6 +30,7 @@
#include <editeng/unoprnms.hxx>
#include <rtl/math.hxx>
+#include <tools/svlibrary.h>
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
diff --git a/include/tools/solar.h b/include/tools/solar.h
index d53b20f0e58a..a1b10d6e9f01 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -105,16 +105,6 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<s
#endif
#endif
-#if defined(_WIN32)
-#define SVLIBRARY( Base ) Base "lo.dll"
-#elif defined MACOSX
-#define SVLIBRARY( Base ) "lib" Base "lo.dylib"
-#elif defined UNX
-#define SVLIBRARY( Base ) "lib" Base "lo.so"
-#else
- #error unknown platform
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/svlibrary.h b/include/tools/svlibrary.h
new file mode 100644
index 000000000000..2a46d8c88412
--- /dev/null
+++ b/include/tools/svlibrary.h
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SVLIBRARY
+#define SVLIBRARY( Base ) SAL_MODULENAME( Base "lo" )
+#include <osl/module.h>
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 1f268b1af5c4..2829cbf5a833 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -22,6 +22,7 @@
#include <scabstdlg.hxx>
#include <osl/module.hxx>
+#include <tools/svlibrary.h>
#include <rtl/ustrbuf.hxx>
typedef ScAbstractDialogFactory* (*ScFuncPtrCreateDialogFactory)();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index d2e2899454b7..26208259099d 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -54,6 +54,7 @@
#include <globstr.hrc>
#include <o3tl/safeint.hxx>
+#include <tools/svlibrary.h>
#include <vcl/svapp.hxx>
#include <memory>
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index aeb1aec40853..fbcc65e1d6e9 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -22,6 +22,7 @@
#include <memory>
#include <osl/module.hxx>
+#include <tools/svlibrary.h>
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/progress.hxx>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d227a942b3ca..82e1d6394f7b 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -24,6 +24,7 @@
#include <basic/basrdll.hxx>
#include <basic/sbmeth.hxx>
#include <basic/sbmod.hxx>
+#include <tools/svlibrary.h>
#include <svtools/asynclink.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 89c5570a42b8..e190d594d897 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <basic/sbdef.hxx>
+#include <tools/svlibrary.h>
#include <svtools/soerr.hxx>
#include <svtools/strings.hrc>
#include <unotools/resmgr.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index abb52252ce8b..78f39b318b6b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -57,6 +57,7 @@
#include <unotools/intlwrapper.hxx>
#include <unotools/configmgr.hxx>
+#include <tools/svlibrary.h>
#include <tools/diagnose_ex.h>
#include <vcl/layout.hxx>
#include <svl/intitem.hxx>
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index a20177785d66..b97384d29866 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -21,6 +21,8 @@
#include <svtaccessiblefactory.hxx>
+#include <tools/svlibrary.h>
+
#include <osl/module.h>
namespace svt
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index 22c7f4f740d8..f5968d36b7e7 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-dialogs-test.cxx
@@ -12,6 +12,7 @@
#include <rtl/bootstrap.hxx>
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
+#include <tools/svlibrary.h>
#include <sfx2/app.hxx>
#include <vcl/abstdlg.hxx>
diff --git a/sw/qa/unit/sw-dialogs-test_2.cxx b/sw/qa/unit/sw-dialogs-test_2.cxx
index 261735c9405c..fe59616aace7 100644
--- a/sw/qa/unit/sw-dialogs-test_2.cxx
+++ b/sw/qa/unit/sw-dialogs-test_2.cxx
@@ -12,6 +12,7 @@
#include <rtl/bootstrap.hxx>
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
+#include <tools/svlibrary.h>
#include <sfx2/app.hxx>
#include <vcl/abstdlg.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index e99b643480d4..c0c3d992eff0 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -22,6 +22,7 @@
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/any.hxx>
+#include <tools/svlibrary.h>
#include <vcl/msgbox.hxx>
#include <svtools/parhtml.hxx>
#include <sot/storage.hxx>
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 59044160eac0..ec866fbc6a93 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -25,7 +25,7 @@
#include <osl/module.h>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-#include <tools/solar.h>
+#include <tools/svlibrary.h>
#include <helper/accessibilityclient.hxx>
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index d652093285e5..3f1914cd4a57 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -21,6 +21,7 @@
#include <vcl/graphicfilter.hxx>
#include <unotools/configmgr.hxx>
+#include <tools/svlibrary.h>
#include <com/sun/star/uno/Any.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Exception.hpp>
commit 29baa05bb9c62ef1e4c759f7c4744d11dd40a385
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 13 21:49:20 2017 +0100
tools: remove unused #include from solar.h
Change-Id: I214e13add371380701ae39403d90a574a63e495d
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index a6eab0fdcaba..1faac70c0fe1 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/resource/StringResourceWithLocation.hpp>
#include <com/sun/star/document/GraphicObjectResolver.hpp>
#include <dlgcont.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 2fb8a1f67c20..80b728103902 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -56,6 +56,7 @@
#include <editeng/frmdiritem.hxx>
#include <rtl/uuid.h>
#include <tools/globname.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/scopeguard.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index bb61ccaccc86..3237029caa93 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -51,6 +51,7 @@
#include <comphelper/processfactory.hxx>
#include <svtools/grfmgr.hxx>
#include <tools/urlobj.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/types.hxx>
#include <svl/memberid.h>
#include <svtools/borderhelper.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index fbf89dceaef0..98b0b8a72646 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <tools/mapunit.hxx>
#include <unotools/configmgr.hxx>
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index e6689d434b57..141bd4649e2c 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/extract.hxx>
#include <osl/diagnose.h>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 5642f002f7e6..69055c2b0ade 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -41,6 +41,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <svl/itemset.hxx>
+#include <comphelper/fileformat.h>
#include <svtools/langtab.hxx>
#include <svl/itempool.hxx>
#include <svtools/ctrltool.hxx>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 3fdaad0e2e81..f527012bce07 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -37,6 +37,7 @@
#include <sfx2/fcontnr.hxx>
#include <sot/formats.hxx>
#include <sot/storage.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 2c4793b95f38..d53b20f0e58a 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <osl/endian.h>
-#include <comphelper/fileformat.h>
/** Intermediate type to solve type clash with Windows headers.
Should be removed as soon as all code parts have been reviewed
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 1dc8e50a6b2e..92c91b37564f 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -23,6 +23,7 @@
#include <osl/detail/android-bootstrap.h>
#include <unotools/tempfile.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/storagehelper.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 9f637eb53046..c474f068c49e 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -20,6 +20,7 @@
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <o3tl/make_unique.hxx>
+#include <comphelper/fileformat.h>
#include <tools/urlobj.hxx>
#include <editeng/editobj.hxx>
#include <editeng/editstat.hxx>
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 0153760e846d..fa9f20ff229f 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -31,6 +31,7 @@
#include <svx/strings.hrc>
#include <editeng/langitem.hxx>
#include <tools/urlobj.hxx>
+#include <comphelper/fileformat.h>
#include <unotools/transliterationwrapper.hxx>
#include <tools/tenccvt.hxx>
#include <o3tl/make_unique.hxx>
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 570d8c26580d..1cad27649a6c 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/fileformat.h>
#include <comphelper/string.hxx>
#include <osl/thread.h>
#include <sfx2/linkmgr.hxx>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 9bb58f52b01a..d24c2ba1f3bd 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -23,6 +23,7 @@
#include <sfx2/objsh.hxx>
#include <sot/storage.hxx>
#include <osl/diagnose.h>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index d661d1711a0d..2a63c4c367ee 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -30,6 +30,7 @@
#include <svx/unomodel.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/storagehelper.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index b3b17e420cca..69e1c442846b 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -26,6 +26,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/storagehelper.hxx>
#include <comphelper/servicehelper.hxx>
#include <sot/storage.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d69c7d6fd0cd..98e3e5b51eaa 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -22,6 +22,7 @@
#include <scitems.hxx>
#include <vcl/errinf.hxx>
#include <editeng/justifyitem.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <formula/errorcodes.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index e1c590e39ebb..d884a4f8e21f 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SD_INC_SDXMLWRP_HXX
#define INCLUDED_SD_INC_SDXMLWRP_HXX
+#include <comphelper/fileformat.h>
#include <vcl/errcode.hxx>
#include "sdfilter.hxx"
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index cacd3d676f49..19b7b0ac6bf2 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -23,6 +23,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <tools/color.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <rtl/strbuf.hxx>
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index d2d52f9c8ac6..aca1a5e2647e 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/lang/XComponent.hpp>
+#include <comphelper/fileformat.h>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/tempfile.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 46c860e2fcbe..670d59a35cd6 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -34,6 +34,7 @@
#include <sfx2/docfac.hxx>
#include <com/sun/star/document/XTypeDetection.hpp>
#include <unotools/mediadescriptor.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/opengrf.hxx>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 369735ff79f3..9f50689b0c9e 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -65,6 +65,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/datetime.hxx>
#include <osl/mutex.hxx>
+#include <comphelper/fileformat.h>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index a71c45412e0a..7dddb700e60d 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -24,6 +24,7 @@
#include <string>
#include <sot/exchange.hxx>
#include <sot/storage.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index e4164e63a010..3c0f660b74a5 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -29,6 +29,7 @@
#include <objshimp.hxx>
#include <sfx2/event.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/seqstream.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index e104116f1d17..50fa6bc2b5f1 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -60,6 +60,7 @@
#include <unotools/useroptions.hxx>
#include <unotools/saveopt.hxx>
#include <svtools/asynclink.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/documentconstants.hxx>
#include <tools/link.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index da74a0a5d075..5547c7ac51cc 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -69,6 +69,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/interaction.hxx>
#include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 49f00f46e4ab..1cb5ff308c37 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -75,6 +75,7 @@
#include <vcl/salctype.hxx>
#include <comphelper/classids.hxx>
#include <sot/storinfo.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/storagehelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/transfer.hxx>
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 4e358df4b9d0..86ebae1a6358 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -31,6 +31,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/uno3.hxx>
#include <tools/stream.hxx>
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 522063972782..afdb25674f0c 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -24,6 +24,7 @@
#include <sot/filelist.hxx>
#include <sysformats.hxx>
#include <comphelper/classids.hxx>
+#include <comphelper/fileformat.h>
#include <tools/globname.hxx>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 520de0629577..340b3202b342 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -34,6 +34,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbhelper.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx
index 927efc7dc05c..3e9ca5e93150 100644
--- a/starmath/qa/extras/mmlimport-test.cxx
+++ b/starmath/qa/extras/mmlimport-test.cxx
@@ -10,6 +10,8 @@
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
+#include <comphelper/fileformat.h>
+
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/sfxmodelfactory.hxx>
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 64beff94ec16..6a5417d823de 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/uno/Any.h>
+#include <comphelper/fileformat.h>
#include <comphelper/accessibletexthelper.hxx>
#include <o3tl/make_unique.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index c25e7396d4ca..86b8ae5806b4 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -38,6 +38,7 @@
#include <unotools/saveopt.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <sax/tools/converter.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index c69f6b501ae7..8daaa2c653e7 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -33,6 +33,7 @@ one go*/
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/uno/Any.h>
+#include <comphelper/fileformat.h>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 01f30ee45522..fc065ed64156 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
#include <svl/macitem.hxx>
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index accc367a0cf1..0c4a481021dd 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/text/GraphicCrop.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index b4132230b468..bf61fe1cb8ac 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -24,6 +24,7 @@
#include <bitmaps.hlst>
#include <svtools/svtresid.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/embeddedobjectcontainer.hxx>
#include <comphelper/seqstream.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 1f265ea705d7..dc168ce5dfed 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -28,6 +28,7 @@
#include <svtools/embedtransfer.hxx>
#include <tools/mapunit.hxx>
#include <vcl/outdev.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/propertysequence.hxx>
#include <comphelper/storagehelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 7941133c717b..15510d87bc58 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -35,6 +35,7 @@
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/sequence.hxx>
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 6f8902785b3b..5fdb1a226e10 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -26,6 +26,7 @@
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <svl/urlbmk.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 9142d3c42186..b70192628aad 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -32,6 +32,7 @@
#include <svx/dialmgr.hxx>
#include <svx/compressgraphicdialog.hxx>
#include <sfx2/dispatch.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 52ec75aafea0..a6ff2402b531 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <comphelper/string.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 3c0800493f79..54cbf46abb7c 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -23,6 +23,7 @@
#include <algorithm>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <osl/file.hxx>
#include <tools/urlobj.hxx>
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 9fa9e59e5b8c..b20982811fd9 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
#include <basic/sbxvar.hxx>
#include <rtl/math.hxx>
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 50a8f89d44b8..ade306fa32a7 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -18,6 +18,7 @@
*/
#include <com/sun/star/drawing/Direction3D.hpp>
+#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
#include <rtl/math.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index e53823b47fda..7074b498f91f 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -41,6 +41,7 @@
#include <comphelper/storagehelper.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <cppuhelper/implbase.hxx>
#include <svx/xmleohlp.hxx>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 4c0272084a40..6ab409bfa03c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/io/NotConnectedException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/graphicmimetype.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index dce7e18a1a27..2a0a7db7a3fe 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -10,6 +10,7 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 885a93a6350f..7ec2a4374449 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -18,6 +18,7 @@
*/
#include <o3tl/make_unique.hxx>
+#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 867a98129381..66c13b4a5e39 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -23,6 +23,7 @@
#include <svtools/unoevent.hxx>
#include <sfx2/docfile.hxx>
#include <unotools/streamwrap.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/io/IOException.hpp>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 7387986bb892..700bad46ba96 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -44,6 +44,7 @@
#include <svx/strings.hrc>
#include <svx/xmlgrhlp.hxx>
#include <svx/xmleohlp.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/genericpropertyset.hxx>
#include <rtl/strbuf.hxx>
#include <sfx2/frame.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index b0afdaf0baa1..269b2cc22e6f 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -25,6 +25,8 @@
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/frame/XModule.hpp>
+
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <vcl/errinf.hxx>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 97982108de3a..488157eeb32a 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/drawing/ModuleDispatcher.hpp>
#include <com/sun/star/frame/DispatchHelper.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 8618a05ca217..5154491973a6 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -28,6 +28,7 @@
#include <svtools/embedtransfer.hxx>
#include <svtools/insdlg.hxx>
#include <unotools/tempfile.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 1126822b1894..e33aa1e0c099 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index bd4e9cf47e14..80ddc0d32933 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -21,6 +21,7 @@
#include <sfx2/app.hxx>
#include <svx/svxids.hrc>
+#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <sfx2/objface.hxx>
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 4c363dc67484..516cfd18a51a 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -30,6 +30,7 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/string.hxx>
#define SWAPNIBBLES(c) \
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index b6a36c141e63..e9e3817cd161 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -13,6 +13,8 @@
#include <osl/file.hxx>
#include <osl/process.h>
+#include <comphelper/fileformat.h>
+
#include <vcl/graphicfilter.hxx>
using namespace ::com::sun::star;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 6a5aa9f4dc30..ff08f629caaa 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -23,6 +23,7 @@
#include <vcl/salbtype.hxx>
#include <vcl/dibtools.hxx>
+#include <comphelper/fileformat.h>
#include <tools/zcodec.hxx>
#include <tools/stream.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 6bdea38bcb3e..ea589c02d64d 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -31,6 +31,7 @@
#include <vcl/svapp.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/graphictools.hxx>
+#include <comphelper/fileformat.h>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <vcl/canvastools.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index a9772a2fd379..f14e830d2eef 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -19,6 +19,7 @@
#include <sal/config.h>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <tools/fract.hxx>
#include <tools/vcompat.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 18ff07afc556..9f9cbc712ef3 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -33,6 +33,7 @@
#include <tools/fract.hxx>
#include <tools/stream.hxx>
+#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 676d6be7d071..a95ba7061983 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/xml/sax/FastParser.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
+#include <comphelper/fileformat.h>
#include <comphelper/namecontainer.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
commit f6c08dca7d950e583cfc4454a74ed9806eda0609
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 13 17:42:37 2017 +0100
Related: tdf#71737 xmloff: adapt XMLSectionExport
6ca6d6ac912588a8f62d7e6b668ebec333752ebc enabled hyperlinks on 3 more
index types.
Change-Id: I6be99443965541183d531ad7dca57ab5d4c73a9b
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 899cb51bc068..1249b773e2fa 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1310,7 +1310,10 @@ void XMLSectionExport::ExportIndexTemplateElement(
case TOK_TTYPE_HYPERLINK_END:
if (SvtSaveOptions::ODFVER_012 < aODFVersion)
{
- assert(eType == TEXT_SECTION_TYPE_ILLUSTRATION);
+ assert(eType == TEXT_SECTION_TYPE_ILLUSTRATION
+ || eType == TEXT_SECTION_TYPE_OBJECT
+ || eType == TEXT_SECTION_TYPE_TABLE
+ || eType == TEXT_SECTION_TYPE_USER);
nNamespace = XML_NAMESPACE_LO_EXT;
}
else
More information about the Libreoffice-commits
mailing list