19 files changed, 13 insertions, 110 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 1075588797ce..82a3636f85fa 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -36,9 +36,7 @@
 #include <unoredline.hxx>
 #include <DocumentRedlineManager.hxx>
 #include "xmlimp.hxx"
-#include <officecfg/Office/Common.hxx>
 #include <o3tl/any.hxx>
-#include <unotools/configmgr.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index ee3f75373dae..7123d61ab190 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/style.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <comphelper/processfactory.hxx>
@@ -28,22 +27,18 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <officecfg/Office/Common.hxx>
 #include <o3tl/any.hxx>
 #include <vcl/errinf.hxx>
 #include <sfx2/docfile.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svl/stritem.hxx>
-#include <unotools/streamwrap.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <svx/xmlgrhlp.hxx>
@@ -51,7 +46,6 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <sfx2/frame.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -67,7 +61,6 @@
 #include <docary.hxx>
 #include <docsh.hxx>
 #include <unotextrange.hxx>
-#include <swmodule.hxx>
 #include <SwXMLSectionList.hxx>
 
 #include <SwStyleNameMapper.hxx>
@@ -76,7 +69,6 @@
 #include <paratr.hxx>
 #include <fmtrowsplt.hxx>
 
-#include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index e4cef6663a15..d101d613219e 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -27,16 +27,12 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/frame/XModule.hpp>
 
-#include <officecfg/Office/Common.hxx>
-
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <vcl/errinf.hxx>
-#include <o3tl/any.hxx>
 #include <sal/log.hxx>
-#include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
 #include <unotools/saveopt.hxx>
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index e55e60ea9155..47d1ba3d2bdd 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -17,16 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <editeng/memberids.h>
+#include <vcl/graph.hxx>
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
-#include <vcl/GraphicObject.hxx>
-#include <svx/unomid.hxx>
 #include <editeng/brushitem.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 28745ab2f023..4a8be86cea70 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -22,14 +22,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <o3tl/any.hxx>
-#include <officecfg/Office/Common.hxx>
 #include <sax/tools/converter.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xmleohlp.hxx>
 #include <svx/xmlgrhlp.hxx>
@@ -42,8 +39,6 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xformsexport.hxx>
 #include <drawdoc.hxx>
-#include <pam.hxx>
-#include <unofreg.hxx>
 #include <doc.hxx>
 #include <swmodule.hxx>
 #include <docsh.hxx>
@@ -55,14 +50,10 @@
 #include "xmltexte.hxx"
 #include "xmlexp.hxx"
 #include "xmlexpit.hxx"
-#include <sfx2/viewsh.hxx>
 #include <comphelper/processfactory.hxx>
 #include <docary.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentRedlineAccess.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 0017ea7e0076..ba94cdcd9ffe 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -22,7 +22,6 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
-#include <svl/itempool.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itemset.hxx>
 #include <utility>
@@ -51,7 +50,6 @@
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
 
-#include <fmtlsplt.hxx>
 #include "xmlithlp.hxx"
 
 #include <fmtrowsplt.hxx>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index fd6f957be4a1..0150700d17a2 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -22,23 +22,15 @@
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <xmloff/nmspmap.hxx>
-#include <format.hxx>
 #include <fmtcol.hxx>
 #include <hints.hxx>
-#include <poolfmt.hxx>
-#include <charfmt.hxx>
-#include <paratr.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include <unostyle.hxx>
 #include <unoprnms.hxx>
 #include <fmtpdsc.hxx>
 #include <pagedesc.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/i18nmap.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include "xmlitem.hxx"
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/txtstyli.hxx>
 #include <xmloff/txtimp.hxx>
@@ -48,13 +40,11 @@
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include <xmloff/table/XMLTableImport.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "xmlimp.hxx"
-#include "xmltbli.hxx"
 #include <cellatr.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <xmloff/attrlist.hxx>
-#include <unotxdoc.hxx>
-#include <docsh.hxx>
 #include <ccoll.hxx>
 
 #include <memory>
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 1f910e60944e..9b90f94fd419 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -20,7 +20,6 @@
 #include <hintids.hxx>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <editeng/fontitem.hxx>
-#include <unotext.hxx>
 #include <doc.hxx>
 #include "xmlexp.hxx"
 #include "xmlimp.hxx"
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 9c983b882db5..ebbd220e65a1 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -25,20 +25,14 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 
 #include <o3tl/any.hxx>
-#include <o3tl/safeint.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/txtimp.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLTextShapeImportHelper.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
@@ -49,11 +43,9 @@
 #include <IDocumentListsAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include <unofreg.hxx>
 #include <TextCursorHelper.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
-#include <unocrsr.hxx>
 #include <poolfmt.hxx>
 #include <ndtxt.hxx>
 #include <editsh.hxx>
@@ -66,19 +58,13 @@
 #include <swdll.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <docsh.hxx>
-#include <editeng/unolingu.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/frame.hxx>
 #include <sfx2/printer.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <unotools/saveopt.hxx>
 #include <unotools/streamwrap.hxx>
 #include <tools/helpers.hxx>
-#include <tools/diagnose_ex.h>
 
 #include <vcl/svapp.hxx>
 #include <unotxdoc.hxx>
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index c1b550596e8b..ee5641691518 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -25,9 +25,7 @@
 #include <svl/itempool.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itemset.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmloff/xmlnmspe.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <editeng/memberids.h>
 #include <osl/diagnose.h>
@@ -47,13 +45,11 @@
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
 
-#include <fmtlsplt.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmlprhdl.hxx>
 #include "xmlithlp.hxx"
 #include <com/sun/star/uno/Any.hxx>
-#include <sal/log.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 433eb1fc2397..3df09efc1c1b 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -26,21 +26,13 @@
 #include <xmloff/xmluconv.hxx>
 #include "xmlexpit.hxx"
 #include <xmloff/nmspmap.hxx>
-#include <xmloff/xmltabe.hxx>
 #include "xmlbrshe.hxx"
-#include <editeng/tstpitem.hxx>
 #include <editeng/brushitem.hxx>
-#include <tools/fldunit.hxx>
-#include <swmodule.hxx>
-#include <doc.hxx>
 #include <fmtornt.hxx>
 #include <unomid.h>
 #include <frmfmt.hxx>
-#include <fmtfsize.hxx>
-#include <swrect.hxx>
 #include "xmlexp.hxx"
 #include <editeng/memberids.h>
-#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 7708985d0adc..f2314a13b9bf 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -22,26 +22,19 @@
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 
-#include <svl/style.hxx>
-
-#include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include <editeng/boxitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/tstpitem.hxx>
 #include <editeng/brushitem.hxx>
-#include <editeng/langitem.hxx>
 #include <editeng/memberids.h>
+#include <editeng/ulspitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 
-#include <svx/unomid.hxx>
-
+#include <fmtfsize.hxx>
 #include <hintids.hxx>
-#include <paratr.hxx>
-#include <doc.hxx>
 #include <unomid.h>
 #include "xmlbrshi.hxx"
 #include "xmlimp.hxx"
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 6dc8f3830e77..fe07be27ec50 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -17,26 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <limits.h>
+
 #include "xmlithlp.hxx"
-#include <hintids.hxx>
-#include <unomid.h>
 #include <sax/tools/converter.hxx>
-#include <svx/unomid.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/shaditem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/formatbreakitem.hxx>
-#include <editeng/keepitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/brushitem.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtornt.hxx>
-#include <fmtfsize.hxx>
 
-#include <fmtlsplt.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <osl/diagnose.h>
 
+#include <com/sun/star/table/BorderLineStyle.hpp>
+#include <com/sun/star/text/HoriOrientation.hpp>
+#include <com/sun/star/text/VertOrientation.hpp>
+
 using ::editeng::SvxBorderLine;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index c8739eeafa14..5834ae020250 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -17,19 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <osl/diagnose.h>
-#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlmetai.hxx>
-#include <xmloff/xmlmetae.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
-#include <editeng/langitem.hxx>
 #include <o3tl/safeint.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <docstat.hxx>
-#include <docsh.hxx>
 #include <doc.hxx>
 #include <IDocumentStatistics.hxx>
 #include "xmlimp.hxx"
diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx
index aebdf094d562..57e46fd1a66a 100644
--- a/sw/source/filter/xml/xmlscript.cxx
+++ b/sw/source/filter/xml/xmlscript.cxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
 #include <xmloff/xmlscripti.hxx>
 #include "xmlimp.hxx"
-#include "xmlexp.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 1778c4cb42db..fc1602e982b2 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -26,16 +26,13 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/numehelp.hxx>
-#include <svl/zforlist.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <fmtrowsplt.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <list>
 #include <swtable.hxx>
 #include <doc.hxx>
-#include <pam.hxx>
 #include <frmfmt.hxx>
 #include <wrtswtbl.hxx>
 #include <fmtfsize.hxx>
@@ -43,7 +40,6 @@
 #include <cellatr.hxx>
 #include <ddefld.hxx>
 #include <swddetbl.hxx>
-#include <ndole.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <unotbl.hxx>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index cf3932c63726..1b882317804a 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -52,7 +52,6 @@
 #include <pam.hxx>
 #include <unotbl.hxx>
 #include <unotextrange.hxx>
-#include <unocrsr.hxx>
 #include <cellatr.hxx>
 #include <swddetbl.hxx>
 #include <ddefld.hxx>
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 284b48c94c4b..13f41c7b45f9 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -32,13 +32,9 @@
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlexppr.hxx>
 
-#include <svx/svdobj.hxx>
-#include <doc.hxx>
 #include <ndole.hxx>
 #include <fmtcntnt.hxx>
-#include <unostyle.hxx>
 #include <unoframe.hxx>
-#include <ndgrf.hxx>
 #include "xmlexp.hxx"
 #include "xmltexte.hxx"
 #include <SwAppletImpl.hxx>
@@ -47,7 +43,6 @@
 #include <sot/exchange.hxx>
 #include <svl/urihelper.hxx>
 #include <sfx2/frmdescr.hxx>
-#include <SwStyleNameMapper.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 383ab6f256ad..00a6537e43d6 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -36,13 +36,11 @@
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/i18nmap.hxx>
 #include <xmloff/xmlimppr.hxx>
-#include <unocrsr.hxx>
 #include <TextCursorHelper.hxx>
 #include <unoframe.hxx>
 #include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentContentOperations.hxx>
-#include <unocoll.hxx>
 #include <fmtfsize.hxx>
 #include <fmtanchr.hxx>
 #include <fmtcntnt.hxx>