fdo#62699 Remove pass-through headers

Change-Id: I84a88238f6cdc485530ffb76f9444179a22abb92
Reviewed-on: https://gerrit.libreoffice.org/3491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

65 files changed, 62 insertions, 135 deletions

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 4769db07ec71..3039d21d9c85 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -51,7 +51,7 @@
 #include "optinet2.hrc"
 #include "helpid.hrc"
 #include <svx/ofaitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc> // slot ids, mostly for changetracking
 
 // for security TP
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8f134be3192c..3cc1f4559c5b 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -46,7 +46,7 @@
 #include <svx/svxerr.hxx>
 #include <svx/drawitem.hxx>
 #include <dialmgr.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svtools/controldims.hrc>
 #include <svx/flagsdef.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0772e5da7a5d..26f3a0c49b0d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -34,7 +34,7 @@
 #include "border.hxx"
 #include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 #include <vcl/msgbox.hxx>
 #include "svx/flagsdef.hxx"
 #include <sfx2/request.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 02817b602f44..fff36104197e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -56,7 +56,7 @@
 #include "svx/drawitem.hxx"
 #include "svx/dlgutil.hxx"
 #include <dialmgr.hxx>
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 #include "cuicharmap.hxx"
 #include "chardlg.h"
 #include <editeng/emphasismarkitem.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index f0a6e2d24d8d..d8c7e76db897 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -44,7 +44,7 @@
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/numvset.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 63ea530487c5..9986056bdcac 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -26,7 +26,7 @@
 #include <svl/languageoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/configitem.hxx>
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 #include <sal/macros.h>
 
 #define _SVX_PAGE_CXX
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7296972740eb..6271cc0c67dc 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -47,7 +47,7 @@
 #include <editeng/keepitem.hxx>
 #include "svx/dlgutil.hxx"
 #include <dialmgr.hxx>
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 #include <editeng/paravertalignitem.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 95b0be90d8b7..24ce240f3850 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -26,7 +26,7 @@
 #include <svx/swframevalidation.hxx>
 #include <cuires.hrc>
 #include <swpossizetabpage.hrc>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/rectenum.hxx>
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 5b25ac3ee813..acb4e25a052f 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -170,7 +170,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlncapit.hxx,svx/xlncapit.hxx)
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/volume3d.hxx,svx/volume3d.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx))
@@ -339,7 +338,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/htmlmode.hxx,svx/htmlmode.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx))
diff --git a/svx/inc/svx/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx
deleted file mode 100644
index 8230d9f186e9..000000000000
--- a/svx/inc/svx/htmlmode.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_HTMLMODE_HXX
-#define _SVX_HTMLMODE_HXX
-
-#include <sfx2/htmlmode.hxx>
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 4743fe01399d..1074fbccb256 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/svdoattr.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/volume3d.hxx>
 #include <svx/def3d.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/deflt3d.hxx>
@@ -30,6 +29,7 @@
 #include <svx/svx3ditems.hxx>
 #include <svx/xflclit.hxx>
 #include <svl/itemset.hxx>
+#include <basegfx/range/b3drange.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx
deleted file mode 100644
index 44514efe719b..000000000000
--- a/svx/inc/svx/volume3d.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _VOLUME3D_HXX
-#define _VOLUME3D_HXX
-
-#include <basegfx/range/b3drange.hxx>
-
-#endif          // _VOLUME3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index e0097e671f4c..639afffea6a9 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -38,7 +38,7 @@
 
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 
 #include <editeng/brushitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index a135586b947f..e90932139342 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -39,7 +39,7 @@
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/numvset.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 4408fb1c4fa5..084f6550d1a9 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/viewpt3d.hxx>
-#include <svx/volume3d.hxx>
+#include <basegfx/range/b3drange.hxx>
 
 Viewport3D::Viewport3D() :
     aVRP(0, 0, 5),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b0d4aadc14bb..ec3af2bd7424 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -56,7 +56,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
 #include "helpid.hrc"
-#include "svx/htmlmode.hxx"
+#include <sfx2/htmlmode.hxx>
 #include <svx/xtable.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 37614687d21e..c7e74e33d441 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -823,7 +823,7 @@
 #include <svx/grfflt.hxx>
 #include <svx/hdft.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/hyperdlg.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/insctrl.hxx>
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 80b46e2eed00..5a348e40d1d1 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -50,7 +50,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/urihelper.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/bigint.hxx>
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 63df9da03d2f..34514eba3a91 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -27,7 +27,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
 #include <svl/whiter.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/boxitem.hxx>
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 5eff6f95db1d..3f3368dccaf6 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -30,7 +30,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <sfx2/frmhtmlw.hxx>
 #include <svx/xoutbmp.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index fe93d9f87704..4cb564cf899d 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -29,7 +29,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/printer.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <sfx2/bindings.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/tstpitem.hxx>
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 203dfe69164d..4a1aa27a03bf 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -43,7 +43,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <svl/srchitem.hxx>
 #include <editeng/flstitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svtools/soerr.hxx>
 #include <comphelper/classids.hxx>
 #include <basic/basmgr.hxx>
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8b546240dcc8..90867fe9fddf 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -38,7 +38,7 @@
 #include <svl/stritem.hxx>
 #include <svl/languageoptions.hxx>
 #include <editeng/eeitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <swmodule.hxx>
 #include <wdocsh.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index cfa6741b1820..ac6df95324c2 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -23,7 +23,7 @@
 #include <svl/urihelper.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/flstitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/cjkoptions.hxx>
 
 #include <cmdid.h>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index a2fc397e4026..1a11874d33f2 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -28,7 +28,7 @@
 #include <vcl/metric.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <sfx2/objsh.hxx>
 #include <editeng/svxfont.hxx>
 #include <vcl/print.hxx>
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 96a528025a53..81a8805d4582 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -23,7 +23,7 @@
 #include "globals.hrc"
 #include "helpid.h"
 #include <sfx2/objsh.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index e083812a624d..f07337e80587 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "hintids.hxx"
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/style.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3551a6d78fdf..ebbd90dfd221 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -37,7 +37,7 @@
 #include "optload.hrc"
 #include "optload.hxx"
 #include <svx/dlgutil.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <fldmgr.hxx>
 #include <poolfmt.hxx>
 #include <expfld.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 055150e7d0cf..6afe7d314e31 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -58,7 +58,7 @@
 #include <svl/eitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/strarray.hxx>
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index a365e47091e5..0356031a2a06 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svtools/htmlcfg.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index f8679f4dd170..8de8676fd7e2 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -49,7 +49,7 @@
 #include <vcl/mnemonic.hxx>
 #include <svl/style.hxx>
 #include <svl/zformat.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/unolingu.hxx>
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 6aeb1beb8325..034ea0c58d74 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -19,7 +19,7 @@
 
 #include "hintids.hxx"
 
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index 7ede33eece2b..38727ad5d13a 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -50,7 +50,7 @@
 #include <comcore.hrc>
 #include <globals.hrc>
 #include <sfx2/bindings.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/dlgutil.hxx>
 #include "swabstdlg.hxx"
 #include <boost/scoped_ptr.hpp>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index cce674b46011..b3659214ae3d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -58,7 +58,7 @@
 #include <comcore.hrc>
 #include <globals.hrc>
 #include <sfx2/bindings.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxdlg.hxx>
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e9bab71243e0..1797b1ae5ea5 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -48,7 +48,7 @@
 #include <svl/ptitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/langitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index c5a8ee62a938..6c54aa5434a8 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -20,7 +20,7 @@
 #include <vcl/lstbox.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <dbfld.hxx>
 #include <flddat.hxx>
 #include <fmtfld.hxx>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 237693183894..176a91b51b05 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
 #include <docsh.hxx>
 #include <fldwrap.hxx>
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx
index f0e3e065c9ab..c1c5f77aa6a8 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/ui/fldui/fldwrap.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
 #include <docsh.hxx>
 #include <fldwrap.hxx>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 8003ed5f907d..34cad31241c0 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/hdft.hxx>
 #include <editeng/flstitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svl/cjkoptions.hxx>
 #include <numpara.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d889388b0e7b..ed4b42b39002 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -22,7 +22,7 @@
 #include "hintids.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/borderline.hxx>
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index aaccdf499874..3b328d8ab5d3 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -20,7 +20,7 @@
 #include <svx/dialogs.hrc>
 #include <hintids.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <fmtfsize.hxx>
 #include <wrtsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index de107cd426a0..8ad29a916404 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -27,7 +27,7 @@
 #include <vcl/mnemonic.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/stritem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/opaqitem.hxx>
 #include <editeng/protitem.hxx>
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 35842327cd93..b22ea10b3467 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -19,7 +19,7 @@
 
 #include "hintids.hxx"
 #include <vcl/graph.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/opaqitem.hxx>
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx
index 20e75b067364..31b48854e08b 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/bindings.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/sdtacitm.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/sdtagitm.hxx>
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx
index b5f61868b1d0..a09fd2de2f46 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/ui/ribbar/conrect.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/bindings.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/sdtacitm.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/sdtagitm.hxx>
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index 17c46028c8ae..055318378f1d 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -20,7 +20,7 @@
 #include <string>
 #include <vcl/timer.hxx>
 #include <sfx2/app.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 39db4ccc7362..8c3920345904 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -20,7 +20,7 @@
 #include <string>
 #include <comphelper/string.hxx>
 #include <svl/eitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/imagemgr.hxx>
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 55cda295dd94..3c7db4f431f7 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -64,7 +64,7 @@
 #include <editeng/flditem.hxx>
 #include <editeng/editstat.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/scripttypeitem.hxx>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 2f200e0568b9..773ac36c64e7 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -25,7 +25,7 @@
 
 #include <svx/svxids.hrc>
 #include <sfx2/linkmgr.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/imapdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index f2c6a79195a1..1e7b3a7849de 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -30,7 +30,7 @@
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <com/sun/star/form/FormButtonType.hpp>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <tools/urlobj.hxx>
 
 #include "viewopt.hxx"
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 16fa1b653fc3..3a2a6340e65a 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -31,7 +31,7 @@
 #include <svl/whiter.hxx>
 #include <svx/swframevalidation.hxx>
 #include <svx/anchorid.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <uitool.hxx>
 #include <fmtornt.hxx>
 #include <cmdid.h>
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 735b7b56e6b7..8f29349f9166 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -57,7 +57,7 @@
 #include <editeng/flditem.hxx>
 #include <editeng/editstat.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/slstitm.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 555cad4a2d51..ea883279d227 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -32,7 +32,7 @@
 #include <editeng/protitem.hxx>
 #include <sfx2/request.hxx>
 #include <svl/srchitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/sdgluitm.hxx>
 #include <svx/sdgcoitm.hxx>
 #include <svx/sdggaitm.hxx>
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index d00ec0e89a2c..1c7ea14300ca 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -27,7 +27,7 @@
 #include <shells.hrc>
 #include <caption.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <doc.hxx>
 #include <docsh.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 5de6dfee7030..047c9ba976ca 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -28,7 +28,7 @@
 #include <editeng/protitem.hxx>
 #include <sfx2/request.hxx>
 #include <svl/srchitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/sdgluitm.hxx>
 #include <svx/sdgcoitm.hxx>
 #include <svx/sdggaitm.hxx>
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 3ba91472e165..0a63d1cd9a6f 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -48,7 +48,7 @@
 #include <editeng/svxacorr.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svx/pfiledlg.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index b5e01bd3c8eb..7a05da52ac37 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -33,7 +33,7 @@
 #include <svl/slstitm.hxx>
 #include <string.h>
 #include <svl/stritem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <svl/whiter.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 3f769db5a95e..7fc50a647943 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -32,7 +32,7 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/escapementitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include "paratr.hxx"
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index b05a588ab92e..96cf83db5867 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -21,7 +21,7 @@
 #include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <modcfg.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
 #include "swmodule.hxx"
 #include "cmdid.h"
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 440323b9ba28..6b00aac8ec72 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -27,7 +27,7 @@
 #include "tblafmt.hxx"
 #include "modcfg.hxx"
 #include "swmodule.hxx"
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
 
 #include "table.hrc"
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 578dd6d41306..9eae380e0ad8 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -34,7 +34,7 @@
 
 #include <svtools/htmlcfg.hxx>
 #include <fmtrowsplt.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 
 #include <docsh.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0ad320473729..e833ba80676a 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -34,7 +34,7 @@
 
 #include <svtools/htmlcfg.hxx>
 #include <fmtrowsplt.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 
 #include "access.hrc"
 
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 3033e2afcce0..dbc1dae10c0a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -46,7 +46,7 @@
 #include <svx/zoomslideritem.hxx>
 #include <svtools/xwindowitem.hxx>
 #include <svx/linkwarn.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/app.hxx>
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 248afd7ed559..295df22effc9 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -33,7 +33,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/brushitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include <editeng/unolingu.hxx>
 #include <sfx2/msgpool.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 16e20f4573fe..010d7f3a6bdf 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -27,7 +27,7 @@
 #include <svx/svdouno.hxx>
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svx/htmlmode.hxx>
+#include <sfx2/htmlmode.hxx>
 #include "wrtsh.hxx"
 #include "view.hxx"
 #include "IMark.hxx"