tdf#42949: clean up includes in include/vbahelper with iwyu

Change-Id: Iaf93ff58229e9362b03b3e810611e969ef8baf38
Reviewed-on: https://gerrit.libreoffice.org/26206
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

32 files changed, 40 insertions, 1 deletions

diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 7d7e804b7d08..cbeb87de8a43 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -18,6 +18,7 @@
  */
 #include "vbaaddins.hxx"
 #include "vbaaddin.hxx"
+#include <osl/diagnose.h>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 5394fc5dcf52..0b5a1e3cbbd3 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -19,6 +19,7 @@
 #include "vbabookmarks.hxx"
 #include "vbabookmark.hxx"
 #include <com/sun/star/container/XNamed.hpp>
+#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>
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index cf471b0c625c..705437028f73 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -47,6 +47,7 @@
 #include <vbahelper/vbahelper.hxx>
 #include "vbarevisions.hxx"
 #include "vbaframes.hxx"
+#include <basic/sberrors.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 71e2f99c8a31..3af50f7b4087 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -24,7 +24,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::script::vba::VBAEventId;
-using namespace ::ooo::vba;
 
 SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) :
     VbaEventsHelperBase( aArgs, xContext )
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index d5546ae1b8cf..2859c6882321 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -28,7 +28,9 @@
 #include <comphelper/string.hxx>
 #include <ooo/vba/word/WdFieldType.hpp>
 #include <swtypes.hxx>
+#include <basic/sberrors.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 2d447446f4ec..af3c53172228 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAFIELD_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAFIELD_HXX
 #include <vbahelper/vbahelperinterface.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 #include <ooo/vba/word/XField.hpp>
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 8c050290f8dc..3bb5b37a0d23 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -22,6 +22,7 @@
 #include "vbareplacement.hxx"
 #include <ooo/vba/word/WdFindWrap.hpp>
 #include <ooo/vba/word/WdReplace.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include "wordvbahelper.hxx"
 
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 0975862fb4e5..ee9ff86b2e7a 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -19,6 +19,8 @@
 
 #include "vbafont.hxx"
 #include <com/sun/star/awt/FontUnderline.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
 #include <ooo/vba/word/WdUnderline.hpp>
 #include <sal/macros.h>
 #include <ooo/vba/word/WdColorIndex.hpp>
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index d60115d42564..c7d719e69adc 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -18,11 +18,14 @@
  */
 #include <vbahelper/helperdecl.hxx>
 #include "vbaglobals.hxx"
+#include <osl/diagnose.h>
 #include <sal/macros.h>
 #include <comphelper/unwrapargs.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"
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 73d35f6e0716..d5c13db775e6 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -19,6 +19,8 @@
 #include "vbalisthelper.hxx"
 #include <tools/diagnose_ex.h>
 #include <ooo/vba/word/WdListGalleryType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index 00e1860b1325..3052745647f5 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -20,6 +20,7 @@
 #include <vbahelper/vbahelper.hxx>
 #include <tools/diagnose_ex.h>
 #include "vbalistlevels.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 5d455abe5220..aceca9346e6d 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
+#include <basic/sberrors.hxx>
 #include <osl/file.hxx>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index d348b7d082bd..bf2f975625fb 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #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>
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 212c4510afc8..919feea94b8e 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -20,6 +20,7 @@
 #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>
diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx
index a699681e02c5..989415c7f8cb 100644
--- a/sw/source/ui/vba/vbapalette.hxx
+++ b/sw/source/ui/vba/vbapalette.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAPALETTE_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAPALETTE_HXX
 #include <vbahelper/vbahelper.hxx>
+#include <com/sun/star/container/XIndexAccess.hpp>
 
 class VbaPalette
 {
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index eb53c2c6c2af..e60acecf8e0d 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -18,6 +18,7 @@
  */
 #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>
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 78491153d226..3ee72935845d 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -18,9 +18,11 @@
  */
 #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>
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 4d5c5344ac27..0a818389a280 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -19,6 +19,7 @@
 #include "vbarevisions.hxx"
 #include "vbarevision.hxx"
 #include <cppuhelper/implbase.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XRedlinesSupplier.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 21537b2820d9..7e3716e12bf2 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -19,6 +19,7 @@
 #include "vbarow.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <ooo/vba/word/WdRowHeightRule.hpp>
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index b0d338384650..182ef99f65a9 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -23,6 +23,7 @@
 #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/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 610ee72658b4..bd942fa0d396 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -26,6 +26,7 @@
 #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 <comphelper/string.hxx>
 #include <ooo/vba/word/WdUnits.hpp>
 #include <ooo/vba/word/WdMovementType.hpp>
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index a9718a4fba39..ad9c8de36811 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -20,6 +20,7 @@
 #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/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 8d9de39f2743..f371f31082ca 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -18,7 +18,9 @@
  */
 #include "vbastyles.hxx"
 #include "vbastyle.hxx"
+#include <basic/sberrors.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx
index 07897774a887..80a645ebbc83 100644
--- a/sw/source/ui/vba/vbastyles.hxx
+++ b/sw/source/ui/vba/vbastyles.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBASTYLES_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBASTYLES_HXX
 
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <ooo/vba/word/XStyles.hpp>
 #include <vbahelper/vbacollectionimpl.hxx>
 
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 2f0c69e35d6c..34c177b10b07 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -18,6 +18,7 @@
  */
 #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>
 
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index a84b1565743b..ea80422a5d8f 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 920af89574ea..dd716ae9e0ed 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -19,6 +19,7 @@
 #include "vbatablesofcontents.hxx"
 #include "vbatableofcontents.hxx"
 #include "vbarange.hxx"
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 0590e9c38d38..dbf1f4e2caea 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -18,10 +18,12 @@
  */
 #include "vbatabstops.hxx"
 #include "vbatabstop.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <ooo/vba/word/WdTabLeader.hpp>
 #include <ooo/vba/word/WdTabAlignment.hpp>
+#include <basic/sberrors.hxx>
 #include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index a663db5c03ca..6d8d1dd45276 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <tools/urlobj.hxx>
+#include <rtl/character.hxx>
 #include <osl/file.hxx>
 
 using namespace ::ooo::vba;
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index c8ab58ff007b..c8c9524de83c 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -18,6 +18,7 @@
  */
 #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>
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index fb78e725f3c5..270abb71eb19 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -18,6 +18,7 @@
  */
 #include <vbahelper/helperdecl.hxx>
 #include <ooo/vba/word/WdWindowState.hpp>
+#include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 
 #include "vbawindow.hxx"
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index d31f5fd332ee..0481f4053e80 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -19,7 +19,9 @@
 #include "vbawrapformat.hxx"
 #include <ooo/vba/word/WdWrapSideType.hpp>
 #include <ooo/vba/word/WdWrapType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
+#include <basic/sberrors.hxx>
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/helperdecl.hxx>