tdf#42949 Fix IWYU warnings in sw/source/ui/vba/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Iafc34cffc3257d785d61f60fc37dc95e5250435c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87308
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

55 files changed, 47 insertions, 121 deletions

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 1e2488091f90..c0596000c2f2 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -701,3 +701,41 @@ blacklist:
     sw/source/ui/fldui/flddinf.cxx:
     # Needed for direct member access
     - com/sun/star/beans/XPropertySet.hpp
+    sw/source/ui/vba/vbacolumn.cxx:
+    # Actually needed
+    - com/sun/star/frame/XModel.hpp
+    sw/source/ui/vba/vbafield.cxx:
+    # Actually needed
+    - com/sun/star/frame/XModel.hpp
+    sw/source/ui/vba/vbafind.cxx:
+    # Actually needed
+    - com/sun/star/frame/XModel.hpp
+    sw/source/ui/vba/vbaframe.cxx:
+    # Actually needed
+    - com/sun/star/frame/XModel.hpp
+    sw/source/ui/vba/vbafont.cxx:
+    # Actually needed
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/container/XIndexAccess.hpp
+    sw/source/ui/vba/vbaheaderfooter.cxx:
+    # Actually needed
+    - com/sun/star/beans/XPropertySet.hpp
+    sw/source/ui/vba/vbaglobals.cxx:
+    # Needed for extern functions
+    - service.hxx
+    sw/source/ui/vba/vbalisttemplate.cxx:
+    # Actually needed
+    - com/sun/star/beans/XPropertySet.hpp
+    sw/source/ui/vba/vbaparagraphformat.cxx:
+    # Actually needed
+    - com/sun/star/style/ParagraphAdjust.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    sw/source/ui/vba/vbasystem.cxx:
+    # Needed on WIN
+    - o3tl/char16_t2wchar_t.hxx
+    sw/source/ui/vba/vbarow.cxx:
+    # Actually needed
+    - com/sun/star/frame/XModel.hpp
+    sw/source/ui/vba/vbatabstops.cxx:
+    # Actually needed
+    - com/sun/star/beans/XPropertySet.hpp
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 39421b941d51..43345e302eb1 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <cppuhelper/implementationentry.hxx>
+
 #include <comphelper/servicedecl.hxx>
 #include <sal/log.hxx>
 
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 0d7286631c67..b3a424d6a01b 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbaaddin.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index dc0ae39bb33c..c2e01d75f48d 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -42,10 +42,7 @@
 #include <ooo/vba/word/XApplicationOutgoing.hpp>
 #include <ooo/vba/word/XBookmarks.hpp>
 #include <comphelper/processfactory.hxx>
-#include <basic/sbuno.hxx>
 #include <editeng/acorrcfg.hxx>
-#include "wordvbahelper.hxx"
-#include <docsh.hxx>
 #include <swdll.hxx>
 #include <swmodule.hxx>
 #include "vbalistgalleries.hxx"
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index 808742570178..89165585c014 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -19,7 +19,6 @@
 #include "vbaautotextentry.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/text/XParagraphCursor.hpp>
-#include <tools/diagnose_ex.h>
 #include "wordvbahelper.hxx"
 #include "vbarange.hxx"
 
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index af8d211fa439..6c156973058c 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -18,16 +18,12 @@
  */
 #include "vbabookmark.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <com/sun/star/text/XBookmarksSupplier.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include "vbarange.hxx"
-#include "wordvbahelper.hxx"
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 53c23f85e38d..4da9fc1e79ca 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <ooo/vba/word/WdBookmarkSortBy.hpp>
 #include "vbarange.hxx"
 #include "wordvbahelper.hxx"
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index aaea6f5c6486..687a32594154 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -24,8 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
-#include <com/sun/star/table/ShadowFormat.hpp>
-#include <com/sun/star/table/ShadowLocation.hpp>
 #include "vbapalette.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index aa6a8d432f9b..e4a573b2c72a 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -18,12 +18,6 @@
  */
 #include "vbacell.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
-#include "vbatable.hxx"
-#include <com/sun/star/table/XCellRange.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <rtl/ustrbuf.hxx>
-#include "wordvbahelper.hxx"
 #include "vbatablehelper.hxx"
 #include "vbarow.hxx"
 
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index e8c5f558e284..9bb2a145aa72 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -18,8 +18,6 @@
  */
 #include "vbacells.hxx"
 #include "vbacell.hxx"
-#include "wordvbahelper.hxx"
-#include "vbatablehelper.hxx"
 #include "vbarow.hxx"
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index d5c7f949e508..3e2d380f63cb 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -18,12 +18,9 @@
  */
 #include "vbacolumn.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
-#include "vbatable.hxx"
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <rtl/ustrbuf.hxx>
-#include "wordvbahelper.hxx"
 #include "vbatablehelper.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 04131262046d..9d9c32db8db1 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -18,11 +18,6 @@
  */
 #include "vbacolumns.hxx"
 #include "vbacolumn.hxx"
-#include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
-#include <ooo/vba/word/WdConstants.hpp>
-#include <ooo/vba/word/WdRulerStyle.hpp>
-#include "wordvbahelper.hxx"
 #include "vbatablehelper.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index c49adef7fad0..3e001d70e9ea 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -42,7 +42,6 @@
 #include <ooo/vba/XControlProvider.hpp>
 #include <ooo/vba/word/WdProtectionType.hpp>
 #include <ooo/vba/word/WdSaveFormat.hpp>
-#include <ooo/vba/word/XApplication.hpp>
 #include <ooo/vba/word/XDocumentOutgoing.hpp>
 
 #include <vbahelper/helperdecl.hxx>
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 057b25a519ce..5274a614c7b8 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -19,22 +19,12 @@
 
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/document/XTypeDetection.hpp>
-
-#include <sfx2/objsh.hxx>
+
 #include <tools/urlobj.hxx>
 
-#include "vbaglobals.hxx"
 #include "vbadocument.hxx"
 #include "vbadocuments.hxx"
-#include <vbahelper/vbahelper.hxx>
 
 #include <osl/file.hxx>
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 956bcfc5365f..5b53c6fc9950 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -23,7 +23,7 @@
 #include "vbaeventshelper.hxx"
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
-#include <vbahelper/helperdecl.hxx>
+#include <comphelper/servicedecl.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::script::vba::VBAEventId;
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 2c5495cf4224..056d7cee42ae 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -20,14 +20,11 @@
 #include "vbarange.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <ooo/vba/word/WdFieldType.hpp>
-#include <swtypes.hxx>
 #include <basic/sberrors.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <sal/log.hxx>
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index db81af2cd064..bb8f457fdafb 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbafind.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbareplacement.hxx"
 #include <ooo/vba/word/WdFindWrap.hpp>
 #include <ooo/vba/word/WdReplace.hpp>
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 2c0b7ac09e3b..01b15bd06b29 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <ooo/vba/word/WdUnderline.hpp>
 #include <sal/macros.h>
-#include <ooo/vba/word/WdColorIndex.hpp>
 #include <unordered_map>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx
index eb77d5ffa8e6..4aec19444be9 100644
--- a/sw/source/ui/vba/vbaframe.cxx
+++ b/sw/source/ui/vba/vbaframe.cxx
@@ -18,11 +18,7 @@
  */
 #include "vbaframe.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index f16c028698f2..0c1cfe890a31 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -18,10 +18,6 @@
  */
 #include "vbaframes.hxx"
 #include "vbaframe.hxx"
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include "wordvbahelper.hxx"
 #include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 27b33a743d70..527d6c61e787 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -19,15 +19,10 @@
 #include <vbahelper/helperdecl.hxx>
 #include "service.hxx"
 #include "vbaglobals.hxx"
-#include <sal/macros.h>
 #include <sal/log.hxx>
 
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <cppuhelper/bootstrap.hxx>
 #include "vbaapplication.hxx"
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index 477b03564b95..9a9df62acaa8 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbaheaderfooter.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <ooo/vba/word/WdHeaderFooterIndex.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XText.hpp>
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 8dd48c8f2f36..3e9f937a1e67 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -18,12 +18,9 @@
  */
 #include "vbaheaderfooterhelper.hxx"
 #include "wordvbahelper.hxx"
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 9eaafac3205c..246b408ac6e2 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbaheadersfooters.hxx"
 #include "vbaheaderfooter.hxx"
-#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
 #include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx
index 9a4ed016e07c..f6aeacee75ea 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -23,7 +23,6 @@
 #include <docsh.hxx>
 #include <doc.hxx>
 #include <vbahelper/vbahelper.hxx>
-#include <swtypes.hxx>
 #include <viewsh.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 11198df15fb3..9ad18ebfcf33 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbalistformat.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <ooo/vba/word/WdListApplyTo.hpp>
 #include <ooo/vba/word/WdDefaultListBehavior.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx
index 49bed332064e..d07e96c4e55e 100644
--- a/sw/source/ui/vba/vbalistgallery.cxx
+++ b/sw/source/ui/vba/vbalistgallery.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbalistgallery.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbalisttemplates.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 4c8712c9a3a0..ee92f31f9a02 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbalisthelper.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <ooo/vba/word/WdListGalleryType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx
index 17e7deaebd8a..07374bd9fe72 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -18,10 +18,8 @@
  */
 #include "vbalistlevel.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <ooo/vba/word/WdListNumberStyle.hpp>
-#include <ooo/vba/word/WdTrailingCharacter.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <ooo/vba/word/WdListLevelAlignment.hpp>
 
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index 36bf1f5913c4..43f3ac1294aa 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbalisttemplate.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbalistlevels.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 33a03eae4b48..7fd79bd6ca80 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -22,8 +22,6 @@
 #include <ooo/vba/word/WdLineStyle.hpp>
 #include <ooo/vba/word/WdLineWidth.hpp>
 #include <ooo/vba/word/WdColorIndex.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <comphelper/processfactory.hxx>
 #include <basic/sberrors.hxx>
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 98af6a494903..45e4ca87477b 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -18,10 +18,7 @@
  */
 #include "vbapagesetup.hxx"
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <ooo/vba/word/WdSectionStart.hpp>
 #include <ooo/vba/word/WdOrientation.hpp>
 #include "wordvbahelper.hxx"
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index ad67525d7be2..f5ed233bb6bc 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -19,10 +19,8 @@
 
 #include "vbapalette.hxx"
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <ooo/vba/word/WdColor.hpp>
-#include <ooo/vba/word/WdColorIndex.hpp>
 #include <sal/macros.h>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx
index eb0c3274be92..3ced1a8441f3 100644
--- a/sw/source/ui/vba/vbapane.cxx
+++ b/sw/source/ui/vba/vbapane.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbapane.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbaview.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index b9bfe036be6d..30ad4fd51f1f 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbaparagraph.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbarange.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index f14f9a190499..0a8c8566382f 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -19,14 +19,13 @@
 #include "vbaparagraphformat.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <basic/sberrors.hxx>
-#include <tools/diagnose_ex.h>
-#include "wordvbahelper.hxx"
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <ooo/vba/word/WdLineSpacing.hpp>
 #include <ooo/vba/word/WdParagraphAlignment.hpp>
 #include <ooo/vba/word/WdOutlineLevel.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/BreakType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include "vbatabstops.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index bf9dde5cca12..42668fb591e5 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -19,19 +19,13 @@
 #include "vbarange.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <basic/sberrors.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbarangehelper.hxx"
 #include <ooo/vba/word/WdBreakType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
-#include <com/sun/star/text/XWordCursor.hpp>
-#include <com/sun/star/text/XParagraphCursor.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
-#include <ooo/vba/word/WdUnits.hpp>
-#include <ooo/vba/word/WdMovementType.hpp>
 #include "vbaparagraphformat.hxx"
 #include "vbastyle.hxx"
 #include "vbafont.hxx"
diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx
index b0b1d4d95224..6aab38b59e0e 100644
--- a/sw/source/ui/vba/vbareplacement.cxx
+++ b/sw/source/ui/vba/vbareplacement.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbareplacement.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx
index 7925706f2fc1..c40091a2d8ac 100644
--- a/sw/source/ui/vba/vbarevision.cxx
+++ b/sw/source/ui/vba/vbarevision.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbarevision.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <com/sun/star/document/XRedlinesSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 8cf0c5b811fd..4ce00b71616d 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -18,14 +18,12 @@
  */
 #include "vbarow.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <ooo/vba/word/WdRowHeightRule.hpp>
 #include <ooo/vba/word/WdConstants.hpp>
-#include <rtl/ustrbuf.hxx>
-#include "wordvbahelper.hxx"
 #include "vbatablehelper.hxx"
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 6159b076a676..08afc401ef7c 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -18,13 +18,13 @@
  */
 #include "vbarows.hxx"
 #include "vbarow.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <ooo/vba/word/WdRowAlignment.hpp>
 #include <ooo/vba/word/WdConstants.hpp>
 #include <ooo/vba/word/WdRulerStyle.hpp>
 #include <basic/sberrors.hxx>
-#include "wordvbahelper.hxx"
 #include "vbacolumns.hxx"
 #include "vbatablehelper.hxx"
 
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 7c6bb712f1cc..53be97c3b6b0 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbasection.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbapagesetup.hxx"
 #include "vbaheadersfooters.hxx"
 
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index 78f4b9c1d296..3ed412bee04a 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -20,8 +20,6 @@
 #include "vbasection.hxx"
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <docsh.hxx>
-#include <doc.hxx>
 #include "wordvbahelper.hxx"
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 5d7d3395331c..a0c5a02f5aee 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -18,13 +18,11 @@
  */
 #include "vbaselection.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include "vbarange.hxx"
 #include "vbafind.hxx"
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTableCursor.hpp>
-#include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/table/XCell.hpp>
 #include <basic/sberrors.hxx>
 #include <ooo/vba/word/WdUnits.hpp>
@@ -38,7 +36,6 @@
 #include <unotbl.hxx>
 #include <unocoll.hxx>
 #include "vbatable.hxx"
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XViewCursor.hpp>
 #include <com/sun/star/view/XLineCursor.hpp>
 #include <com/sun/star/text/XWordCursor.hpp>
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index cb5951a8a781..5565575f342a 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -20,7 +20,6 @@
 #include "vbastyle.hxx"
 #include <ooo/vba/word/WdStyleType.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include "vbafont.hxx"
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 5fa92cc4dcdd..f072e5c0dba9 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -19,7 +19,6 @@
 #include "vbasystem.hxx"
 
 #include <ooo/vba/word/WdCursorType.hpp>
-#include <tools/diagnose_ex.h>
 #include <tools/config.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index 822c6c28a2cf..501168abfcdb 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/table/XTableRows.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include "vbaborders.hxx"
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index a106668f0c39..b0b88ae2fd16 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -21,7 +21,6 @@
 #include "vbatablehelper.hxx"
 #include <swtable.hxx>
 #include <unotbl.hxx>
-#include <docsh.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index c308e314d42d..2afceac20e3a 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -19,7 +19,6 @@
 #include "vbatableofcontents.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <tools/diagnose_ex.h>
 #include <ooo/vba/word/WdTabLeader.hpp>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx
index 6fdf2c811a44..44574bab0a39 100644
--- a/sw/source/ui/vba/vbatabstop.cxx
+++ b/sw/source/ui/vba/vbatabstop.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbatabstop.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 985b80608fa6..58059da512de 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -17,12 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "vbatemplate.hxx"
-#include <vbahelper/vbahelper.hxx>
-#include "wordvbahelper.hxx"
 #include "vbaautotextentry.hxx"
 #include <com/sun/star/text/AutoTextContainer.hpp>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/character.hxx>
 #include <osl/file.hxx>
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 5b6425e8c7ef..c2dd26dbd110 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -18,7 +18,6 @@
  */
 #include "vbavariable.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <tools/diagnose_ex.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index ed8fc3a8565c..e7012f4b13b6 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -19,20 +19,15 @@
 #include "vbaview.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <basic/sberrors.hxx>
-#include <tools/diagnose_ex.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XFootnotesSupplier.hpp>
 #include <com/sun/star/text/XEndnotesSupplier.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <ooo/vba/word/WdSpecialPane.hpp>
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index fef92971218d..f4014ffbac8c 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -16,13 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <vbahelper/helperdecl.hxx>
+
 #include <ooo/vba/word/WdWindowState.hpp>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 
 #include "vbawindow.hxx"
-#include "vbaglobals.hxx"
 #include "vbadocument.hxx"
 #include "vbaview.hxx"
 #include "vbapanes.hxx"
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index add4b3ab778a..6587502073e3 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -20,7 +20,6 @@
 #include "wordvbahelper.hxx"
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>