include/vbahelper/helperdecl.hxx | 1 include/vbahelper/vbaaccesshelper.hxx | 18 +++++- include/vbahelper/vbaapplicationbase.hxx | 25 ++++++++- include/vbahelper/vbacollectionimpl.hxx | 32 ++++++++++- include/vbahelper/vbadialogbase.hxx | 19 ++++++- include/vbahelper/vbadialogsbase.hxx | 20 ++++++- include/vbahelper/vbadocumentbase.hxx | 22 +++++++- include/vbahelper/vbadocumentsbase.hxx | 24 ++++++++ include/vbahelper/vbaeventshelperbase.hxx | 18 ++++++ include/vbahelper/vbafontbase.hxx | 19 ++++++- include/vbahelper/vbaglobalbase.hxx | 23 ++++++++ include/vbahelper/vbahelper.hxx | 51 +++++++++++-------- include/vbahelper/vbahelperinterface.hxx | 14 ++++- include/vbahelper/vbapagesetupbase.hxx | 19 ++++++- include/vbahelper/vbapropvalue.hxx | 11 +++- include/vbahelper/vbareturntypes.hxx | 10 +-- include/vbahelper/vbashape.hxx | 37 +++++++++++-- include/vbahelper/vbashaperange.hxx | 31 ++++++++++- include/vbahelper/vbashapes.hxx | 32 ++++++++++- include/vbahelper/vbatextframe.hxx | 23 +++++++- include/vbahelper/vbawindowbase.hxx | 25 ++++++++- sc/source/ui/vba/excelvbahelper.cxx | 1 sc/source/ui/vba/vbaapplication.cxx | 2 sc/source/ui/vba/vbaaxes.cxx | 1 sc/source/ui/vba/vbacomment.cxx | 1 sc/source/ui/vba/vbacondition.cxx | 1 sc/source/ui/vba/vbaeventshelper.cxx | 1 sc/source/ui/vba/vbaformat.cxx | 1 sc/source/ui/vba/vbaformat.hxx | 1 sc/source/ui/vba/vbaformatcondition.cxx | 1 sc/source/ui/vba/vbaformatconditions.cxx | 1 sc/source/ui/vba/vbapagebreak.cxx | 1 sc/source/ui/vba/vbapagebreaks.cxx | 1 sc/source/ui/vba/vbapagesetup.cxx | 1 sc/source/ui/vba/vbarange.cxx | 2 sc/source/ui/vba/vbarange.hxx | 2 sc/source/ui/vba/vbasheetobjects.cxx | 2 sc/source/ui/vba/vbastyle.cxx | 1 sc/source/ui/vba/vbastyles.cxx | 1 sc/source/ui/vba/vbastyles.hxx | 1 sc/source/ui/vba/vbatextframe.cxx | 2 sc/source/ui/vba/vbawindow.cxx | 1 sc/source/ui/vba/vbaworksheet.cxx | 1 sc/source/ui/vba/vbaworksheet.hxx | 1 sc/source/ui/vba/vbaworksheets.cxx | 1 sw/source/ui/vba/vbaaddins.cxx | 1 sw/source/ui/vba/vbabookmarks.cxx | 1 sw/source/ui/vba/vbadocument.cxx | 1 sw/source/ui/vba/vbaeventshelper.cxx | 1 sw/source/ui/vba/vbafield.cxx | 2 sw/source/ui/vba/vbafield.hxx | 1 sw/source/ui/vba/vbafind.cxx | 1 sw/source/ui/vba/vbafont.cxx | 2 sw/source/ui/vba/vbaglobals.cxx | 3 + sw/source/ui/vba/vbalisthelper.cxx | 2 sw/source/ui/vba/vbalisttemplate.cxx | 1 sw/source/ui/vba/vbaoptions.cxx | 1 sw/source/ui/vba/vbapagesetup.cxx | 1 sw/source/ui/vba/vbapalette.cxx | 1 sw/source/ui/vba/vbapalette.hxx | 1 sw/source/ui/vba/vbaparagraphformat.cxx | 1 sw/source/ui/vba/vbarange.cxx | 2 sw/source/ui/vba/vbarevisions.cxx | 1 sw/source/ui/vba/vbarow.cxx | 1 sw/source/ui/vba/vbarows.cxx | 1 sw/source/ui/vba/vbaselection.cxx | 1 sw/source/ui/vba/vbastyle.cxx | 1 sw/source/ui/vba/vbastyles.cxx | 2 sw/source/ui/vba/vbastyles.hxx | 1 sw/source/ui/vba/vbatableofcontents.cxx | 1 sw/source/ui/vba/vbatables.cxx | 1 sw/source/ui/vba/vbatablesofcontents.cxx | 1 sw/source/ui/vba/vbatabstops.cxx | 2 sw/source/ui/vba/vbatemplate.cxx | 1 sw/source/ui/vba/vbaview.cxx | 1 sw/source/ui/vba/vbawindow.cxx | 1 sw/source/ui/vba/vbawrapformat.cxx | 2 vbahelper/source/msforms/vbacontrol.cxx | 1 vbahelper/source/msforms/vbacontrols.cxx | 1 vbahelper/source/msforms/vbalistcontrolhelper.cxx | 1 vbahelper/source/msforms/vbanewfont.cxx | 1 vbahelper/source/vbahelper/vbaapplicationbase.cxx | 1 vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 1 vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 1 vbahelper/source/vbahelper/vbadialogbase.cxx | 1 vbahelper/source/vbahelper/vbadocumentbase.cxx | 1 vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 1 vbahelper/source/vbahelper/vbafontbase.cxx | 2 vbahelper/source/vbahelper/vbaglobalbase.cxx | 2 vbahelper/source/vbahelper/vbahelper.cxx | 2 vbahelper/source/vbahelper/vbapagesetupbase.cxx | 2 vbahelper/source/vbahelper/vbashape.cxx | 2 vbahelper/source/vbahelper/vbashaperange.cxx | 2 vbahelper/source/vbahelper/vbashapes.cxx | 8 ++ vbahelper/source/vbahelper/vbatextframe.cxx | 1 vbahelper/source/vbahelper/vbawindowbase.cxx | 4 + 96 files changed, 504 insertions(+), 75 deletions(-)
New commits: commit 1812a6467defa244c2002dec6b055ad3983e5883 Author: Jorenz Paragas <[email protected]> Date: Sun Jun 12 16:57:39 2016 -0700 tdf#42949: clean up includes in include/vbahelper with iwyu Change-Id: Iaf93ff58229e9362b03b3e810611e969ef8baf38 Reviewed-on: https://gerrit.libreoffice.org/26206 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/include/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx index 3f1c534..7ee9f27 100644 --- a/include/vbahelper/helperdecl.hxx +++ b/include/vbahelper/helperdecl.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VBAHELPER_HELPERDECL_HXX #include <comphelper/servicedecl.hxx> -#include <ooo/vba/XHelperInterface.hpp> namespace comphelper { namespace service_decl { diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 3d14a39..50516f4 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -19,14 +19,24 @@ #ifndef INCLUDED_VBAHELPER_VBAACCESSHELPER_HXX #define INCLUDED_VBAHELPER_VBAACCESSHELPER_HXX -#include <com/sun/star/beans/XPropertySet.hpp> +#include <memory> + #include <basic/basmgr.hxx> +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Exception.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XInterface.hpp> +#include <osl/diagnose.h> +//#define VBAHELPER_DLLIMPLEMENTATION +#include <vbahelper/vbadllapi.h> +#include <rtl/ustring.hxx> +#include <sal/types.h> #include <sfx2/objsh.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -//#define VBAHELPER_DLLIMPLEMENTATION -#include <vbahelper/vbadllapi.h> -#include <memory> namespace ooo { diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index 52fe03d..2bc2ba0 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -19,11 +19,30 @@ #ifndef INCLUDED_VBAHELPER_VBAAPPLICATIONBASE_HXX #define INCLUDED_VBAHELPER_VBAAPPLICATIONBASE_HXX -#include <ooo/vba/XHelperInterface.hpp> +#include <exception> +#include <memory> + +#include <com/sun/star/script/BasicErrorException.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <ooo/vba/XApplicationBase.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -#include <sfx2/objsh.hxx> -#include <memory> + +namespace com { namespace sun { namespace star { + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XApplicationBase; + class XHelperInterface; +} } typedef InheritedHelperInterfaceWeakImpl< ov::XApplicationBase > ApplicationBase_BASE; diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 3b3fc02..4877c64 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -20,19 +20,41 @@ #ifndef INCLUDED_VBAHELPER_VBACOLLECTIONIMPL_HXX #define INCLUDED_VBAHELPER_VBACOLLECTIONIMPL_HXX +#include <exception> +#include <vector> + +#include <com/sun/star/container/NoSuchElementException.hpp> +#include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/WrappedTargetException.hpp> +#include <com/sun/star/script/BasicErrorException.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Type.hxx> +#include <com/sun/star/uno/TypeClass.hpp> +#include <cppu/unotype.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <ooo/vba/XCollection.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/script/XDefaultMethod.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> - +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -#include <vector> +namespace com { namespace sun { namespace star { + namespace container { class XEnumerationAccess; } + namespace uno { class XComponentContext; } +} } } +namespace ooo { namespace vba { + class XHelperInterface; +} } typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumerationHelper_BASE; diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index 424d04e..d118122 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -19,9 +19,26 @@ #ifndef INCLUDED_VBAHELPER_VBADIALOGBASE_HXX #define INCLUDED_VBAHELPER_VBADIALOGBASE_HXX +#include <exception> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> #include <ooo/vba/XDialogBase.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -#include <com/sun/star/frame/XModel.hpp> + +namespace com { namespace sun { namespace star { + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XDialogBase; + class XHelperInterface; +} } typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE; diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx index 1881901..c18801b 100644 --- a/include/vbahelper/vbadialogsbase.hxx +++ b/include/vbahelper/vbadialogsbase.hxx @@ -19,10 +19,26 @@ #ifndef INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX #define INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX -#include <ooo/vba/XHelperInterface.hpp> +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> #include <ooo/vba/XDialogsBase.hpp> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -#include <com/sun/star/frame/XModel.hpp> + +namespace com { namespace sun { namespace star { + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XDialogsBase; + class XHelperInterface; +} } typedef InheritedHelperInterfaceWeakImpl< ov::XDialogsBase > VbaDialogsBase_BASE; diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index 37fdc14..1667c88 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.hxx @@ -19,10 +19,30 @@ #ifndef INCLUDED_VBAHELPER_VBADOCUMENTBASE_HXX #define INCLUDED_VBAHELPER_VBADOCUMENTBASE_HXX -#include <com/sun/star/frame/XModel.hpp> +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XInterface.hpp> #include <ooo/vba/XDocumentBase.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XDocumentBase; + class XHelperInterface; +} } + typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XDocumentBase > VbaDocumentBase_BASE; class VBAHELPER_DLLPUBLIC VbaDocumentBase : public VbaDocumentBase_BASE diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index a47f5a7..9a47a92 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.hxx @@ -19,10 +19,30 @@ #ifndef INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX #define INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX +#include <exception> -#include <vbahelper/vbacollectionimpl.hxx> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Type.hxx> #include <ooo/vba/XDocumentsBase.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbacollectionimpl.hxx> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> + +namespace com { namespace sun { namespace star { + namespace beans { struct PropertyValue; } + namespace container { class XEnumeration; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XDocumentsBase; + class XHelperInterface; +} } typedef CollTestImplHelper< ooo::vba::XDocumentsBase > VbaDocumentsBase_BASE; diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 6bfb8fd..5bfd874 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -21,19 +21,35 @@ #define INCLUDED_VBAHELPER_VBAEVENTSHELPERBASE_HXX #include <deque> +#include <exception> #include <map> #include <unordered_map> + #include <com/sun/star/document/XEventListener.hpp> +#include <com/sun/star/lang/EventObject.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/util/VetoException.hpp> #include <com/sun/star/util/XChangesListener.hpp> #include <cppuhelper/implbase.hxx> -#include <vbahelper/vbahelper.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> namespace com { namespace sun { namespace star { + namespace document { struct EventObject; } + namespace frame { class XModel; } namespace script { namespace vba { class XVBAModuleInfo; } } namespace uno { class XComponentContext; } + namespace util { struct ChangesEvent; } } } } +class SfxObjectShell; typedef ::cppu::WeakImplHelper< css::script::vba::XVBAEventProcessor, diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 51c8c15..1835554 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -19,10 +19,27 @@ #ifndef INCLUDED_VBAHELPER_VBAFONTBASE_HXX #define INCLUDED_VBAHELPER_VBAFONTBASE_HXX +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> #include <ooo/vba/XFontBase.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace beans { class XPropertySet; } + namespace container { class XIndexAccess; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; +} } + typedef InheritedHelperInterfaceWeakImpl< ov::XFontBase > VbaFontBase_BASE; class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx index a5d2c23..5bbf9fa 100644 --- a/include/vbahelper/vbaglobalbase.hxx +++ b/include/vbahelper/vbaglobalbase.hxx @@ -19,8 +19,29 @@ #ifndef INCLUDED_VBAHELPER_VBAGLOBALBASE_HXX #define INCLUDED_VBAHELPER_VBAGLOBALBASE_HXX -#include <vbahelper/vbahelperinterface.hxx> +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Exception.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <ooo/vba/XGlobalsBase.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> +#include <vbahelper/vbahelperinterface.hxx> + +namespace com { namespace sun { namespace star { + namespace beans { struct PropertyValue; } + namespace uno { class XComponentContext; } + namespace uno { class XInterface; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; +} } typedef InheritedHelperInterfaceWeakImpl< ov::XGlobalsBase > Globals_BASE; class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index c3ca394..d78932e 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -19,25 +19,38 @@ #ifndef INCLUDED_VBAHELPER_VBAHELPER_HXX #define INCLUDED_VBAHELPER_VBAHELPER_HXX -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/beans/XIntrospectionAccess.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/script/BasicErrorException.hpp> -#include <com/sun/star/script/XTypeConverter.hpp> +#include <memory> + #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/awt/XUnitConversion.hpp> -#include <basic/basmgr.hxx> -#include <basic/sberrors.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/docfilt.hxx> -#include <sfx2/docfile.hxx> +#include <com/sun/star/script/BasicErrorException.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> #include <vcl/pointr.hxx> -#include <memory> -#include <vbahelper/vbaaccesshelper.hxx> +#include <vcl/ptrstyle.hxx> + +namespace com { namespace sun { namespace star { + namespace awt { class XControl; } + namespace awt { class XDevice; } + namespace awt { class XUnitConversion; } + namespace awt { class XWindow; } + namespace beans { class XIntrospectionAccess; } + namespace beans { class XPropertySet; } + namespace beans { struct PropertyValue; } + namespace drawing { class XShape; } + namespace frame { class XModel; } + namespace script { class XTypeConverter; } + namespace uno { class Exception; } + namespace uno { class XComponentContext; } +} } } + +class SfxObjectShell; +class SfxViewFrame; +class SfxViewShell; namespace ooo { @@ -148,10 +161,6 @@ public: virtual double getOffsetY() const { return 0.0; } }; -namespace msforms { - class XShape; -} - class VBAHELPER_DLLPUBLIC ShapeHelper { protected: diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 35f5146..39a460b 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -19,10 +19,22 @@ #ifndef INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX #define INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/script/BasicErrorException.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <ooo/vba/XHelperInterface.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> #include <vbahelper/vbahelper.hxx> -#include <com/sun/star/container/XNameAccess.hpp> + +namespace com { namespace sun { namespace star { + namespace uno { class XComponentContext; } } +} } // use this class when you have an a object like // interface XAnInterface which contains XHelperInterface in its inheritance hierarchy diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx index 97be903..c2a8af6 100644 --- a/include/vbahelper/vbapagesetupbase.hxx +++ b/include/vbahelper/vbapagesetupbase.hxx @@ -19,11 +19,26 @@ #ifndef INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX #define INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX +#include <exception> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> #include <ooo/vba/XPageSetupBase.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace beans { class XPropertySet; } + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; +} } + typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE; class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE diff --git a/include/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx index ec55e39..d420c77 100644 --- a/include/vbahelper/vbapropvalue.hxx +++ b/include/vbahelper/vbapropvalue.hxx @@ -18,9 +18,16 @@ */ #ifndef SC_VBA_PROPVALULE_HXX #define SC_VBA_PROPVALULE_HXX -#include <ooo/vba/XPropValue.hpp> -#include <cppuhelper/implbase.hxx> +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <cppuhelper/implbase.hxx> +#include <ooo/vba/XPropValue.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE; diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 7da0808..b98e829 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -19,15 +19,13 @@ #ifndef INCLUDED_VBAHELPER_VBARETURNTYPES_HXX #define INCLUDED_VBAHELPER_VBARETURNTYPES_HXX -#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XDefaultProperty.hpp> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XReturnInteger.hpp> -#include <ooo/vba/msforms/XReturnBoolean.hpp> -#include <ooo/vba/msforms/XReturnSingle.hpp> -#include <ooo/vba/msforms/XReturnEffect.hpp> - +#include <rtl/ustring.hxx> +#include <sal/types.h> #include <vbahelper/vbahelper.hxx> -#include <vbahelper/vbahelperinterface.hxx> namespace ooo { diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 7bbf945..7c53dee 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -19,17 +19,40 @@ #ifndef INCLUDED_VBAHELPER_VBASHAPE_HXX #define INCLUDED_VBAHELPER_VBASHAPE_HXX -#include <ooo/vba/office/MsoShapeType.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XShapes.hpp> +#include <exception> +#include <memory> + +#include <cppuhelper/implbase.hxx> +#include <com/sun/star/lang/EventObject.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <ooo/vba/msforms/XShape.hpp> -#include <ooo/vba/msforms/XLineFormat.hpp> -#include <cppuhelper/implbase.hxx> - +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace beans { class XPropertySet; } + namespace drawing { class XShape; } + namespace drawing { class XShapes; } + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class ShapeHelper; + class XHelperInterface; + namespace msforms { class XFillFormat; } + namespace msforms { class XLineFormat; } + namespace msforms { class XPictureFormat; } +} } + typedef ::cppu::WeakImplHelper< ov::msforms::XShape, css::lang::XEventListener > ListeningShape; typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE; diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index 08fdc15..ee9ec7c6 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -19,12 +19,35 @@ #ifndef INCLUDED_VBAHELPER_VBASHAPERANGE_HXX #define INCLUDED_VBAHELPER_VBASHAPERANGE_HXX -#include <com/sun/star/drawing/XShapes.hpp> +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Type.hxx> #include <ooo/vba/msforms/XShapeRange.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> #include <vbahelper/vbacollectionimpl.hxx> -#include <ooo/vba/msforms/XLineFormat.hpp> -#include <ooo/vba/msforms/XFillFormat.hpp> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> + +namespace com { namespace sun { namespace star { + namespace container { class XEnumeration; } + namespace container { class XIndexAccess; } + namespace drawing { class XDrawPage; } + namespace drawing { class XShapes; } + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; + namespace msforms { class XFillFormat; } + namespace msforms { class XLineFormat; } + namespace msforms { class XShape; } +} } typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE; diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 78bdc33..7f48993 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -19,14 +19,36 @@ #ifndef INCLUDED_VBAHELPER_VBASHAPES_HXX #define INCLUDED_VBAHELPER_VBASHAPES_HXX -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> +#include <exception> + +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/script/BasicErrorException.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Type.hxx> #include <ooo/vba/msforms/XShapes.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbacollectionimpl.hxx> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> -#include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace container { class XEnumeration; } + namespace container { class XIndexAccess; } + namespace drawing { class XDrawPage; } + namespace drawing { class XShape; } + namespace drawing { class XShapes; } + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } -#include <vbahelper/vbacollectionimpl.hxx> +namespace ooo { namespace vba { + class XHelperInterface; + namespace msforms { class XShapeRange; } +} } typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE; diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index acc6162..5e2239a 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.hxx @@ -18,11 +18,30 @@ */ #ifndef INCLUDED_VBAHELPER_VBATEXTFRAME_HXX #define INCLUDED_VBAHELPER_VBATEXTFRAME_HXX + +#include <exception> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <ooo/vba/msforms/XTextFrame.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace beans { class XPropertySet; } + namespace drawing { class XShape; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; +} } + typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XTextFrame > VbaTextFrame_BASE; class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx index 32f1b1d..4f3c62c 100644 --- a/include/vbahelper/vbawindowbase.hxx +++ b/include/vbahelper/vbawindowbase.hxx @@ -20,11 +20,32 @@ #ifndef INCLUDED_VBAHELPER_VBAWINDOWBASE_HXX #define INCLUDED_VBAHELPER_VBAWINDOWBASE_HXX +#include <exception> + +#include <cppuhelper/weakref.hxx> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <ooo/vba/XWindowBase.hpp> -#include <com/sun/star/awt/XWindow2.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <rtl/ustring.hxx> +#include <sal/types.h> +#include <vbahelper/vbadllapi.h> +#include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> +namespace com { namespace sun { namespace star { + namespace awt { class XWindow2; } + namespace awt { class XWindow; } + namespace frame { class XController; } + namespace frame { class XModel; } + namespace uno { class XComponentContext; } +} } } + +namespace ooo { namespace vba { + class XHelperInterface; +} } + typedef InheritedHelperInterfaceWeakImpl< ov::XWindowBase > WindowBaseImpl_BASE; class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 044668e..e381c39 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -19,6 +19,7 @@ #include "excelvbahelper.hxx" +#include <basic/basmgr.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/sheet/XSheetCellRange.hpp> #include <com/sun/star/sheet/GlobalSheetSettings.hpp> diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 2ea30e5..5f3d852 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -33,6 +33,7 @@ #include <ooo/vba/XExecutableDialog.hpp> #include <ooo/vba/excel/XlCalculation.hpp> #include <ooo/vba/excel/XlMousePointer.hpp> +#include <ooo/vba/office/MsoShapeType.hpp> #include "vbaapplication.hxx" #include "vbaworkbooks.hxx" @@ -58,6 +59,7 @@ #include <osl/file.hxx> #include <rtl/instance.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index b157730..061f698 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -20,6 +20,7 @@ #include "vbaaxes.hxx" #include "vbaaxis.hxx" #include "vbachart.hxx" +#include <basic/sberrors.hxx> #include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XlAxisType.hpp> #include <ooo/vba/excel/XlAxisGroup.hpp> diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 130ed99..411a15a 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/XCell.hpp> #include <com/sun/star/text/XText.hpp> +#include <ooo/vba/office/MsoShapeType.hpp> #include <vbahelper/vbashape.hxx> #include "vbaglobals.hxx" diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 68a5c7d..2fe0188 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -22,6 +22,7 @@ #include <ooo/vba/excel/XFormatCondition.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/sheet/XCellRangeAddressable.hpp> +#include <basic/sberrors.hxx> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index c37b1d6..da68267 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -37,6 +37,7 @@ #include <unotools/eventcfg.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vbahelper/vbaaccesshelper.hxx> #include "cellsuno.hxx" #include "convuno.hxx" diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 88c29ba..ba2db50 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/util/CellProtection.hpp> +#include <basic/sberrors.hxx> #include <rtl/math.hxx> #include "excelvbahelper.hxx" diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index b02bd69..1489ec6 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <svl/itemset.hxx> #include <vbahelper/vbahelperinterface.hxx> class ScCellRangesBase; diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 792818c..80bff98 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -20,6 +20,7 @@ #include "vbaformatconditions.hxx" #include "unonames.hxx" #include <ooo/vba/excel/XlFormatConditionType.hpp> +#include <basic/sberrors.hxx> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 9b0a6d7..c01b186 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -20,6 +20,7 @@ #include <ooo/vba/excel/XRange.hpp> #include <com/sun/star/sheet/XCellRangeAddressable.hpp> #include <com/sun/star/sheet/XSheetConditionalEntry.hpp> +#include <basic/sberrors.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> #include <vector> diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index bc7942c..2f29060 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -18,6 +18,7 @@ */ #include "vbapagebreak.hxx" #include "vbarange.hxx" +#include <basic/sberrors.hxx> #include <ooo/vba/excel/XlPageBreak.hpp> using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 047e7ca..cfa42eb 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -18,6 +18,7 @@ */ #include "vbapagebreaks.hxx" #include "vbapagebreak.hxx" +#include <basic/sberrors.hxx> #include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XWorksheet.hpp> using namespace ::com::sun::star; diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 50e6e09..d39af79 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -30,6 +30,7 @@ #include <ooo/vba/excel/XlPageOrientation.hpp> #include <ooo/vba/excel/XlOrder.hpp> #include <ooo/vba/excel/Constants.hpp> +#include <basic/sberrors.hxx> #include <i18nutil/paper.hxx> #include <sal/macros.h> #include <algorithm> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 40921ee..48524fd 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -27,6 +27,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/script/ArrayWrapper.hpp> +#include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/script/vba/VBAEventId.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> @@ -156,6 +157,7 @@ #include "transobj.hxx" #include "queryentry.hxx" #include "markdata.hxx" +#include <basic/sberrors.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 444ff62..cc65a90 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -31,6 +31,7 @@ #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> +#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/script/XDefaultMethod.hpp> @@ -44,6 +45,7 @@ #include "vbaformat.hxx" #include "address.hxx" #include <formula/grammar.hxx> +#include <svl/itemset.hxx> class ScCellRangesBase; class ScCellRangeObj; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index cdb1463..a677a0e 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -30,6 +30,8 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "vbasheetobject.hxx" #include <cppuhelper/implbase.hxx> diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 0f651b4..950639d 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -18,6 +18,7 @@ */ #include "vbastyle.hxx" +#include <basic/sberrors.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index f51a495..a4a1457 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -18,6 +18,7 @@ */ #include "vbastyles.hxx" #include "vbastyle.hxx" +#include <basic/sberrors.hxx> #include <cppuhelper/exc_hlp.hxx> #include <ooo/vba/excel/XRange.hpp> diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index ea60d0a..271ea1d 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SC_SOURCE_UI_VBA_VBASTYLES_HXX #include <ooo/vba/excel/XStyles.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vbahelper/vbacollectionimpl.hxx> typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE; diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 6dd70ba..3c270d1 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -18,7 +18,9 @@ */ #include <vbahelper/helperdecl.hxx> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/text/XText.hpp> +#include <sfx2/objsh.hxx> #include "vbatextframe.hxx" #include "vbacharacters.hxx" diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 8e46e0a..b1a3635 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/PosSize.hpp> +#include <basic/sberrors.hxx> #include <cppuhelper/implbase.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 207a9ec..415c0ea 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -59,6 +59,7 @@ #include <ooo/vba/excel/XWorkbook.hpp> #include <ooo/vba/XControlProvider.hpp> +#include <basic/sberrors.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <vbahelper/vbashapes.hxx> diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index bfbd4c5..cb670d8 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -34,6 +34,7 @@ #include <ooo/vba/excel/XHPageBreaks.hpp> #include <ooo/vba/excel/XVPageBreaks.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <rtl/ref.hxx> #include <vbahelper/vbahelperinterface.hxx> #include "address.hxx" diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index d7d8435..86c4f1fc 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/script/XTypeConverter.hpp> #include <ooo/vba/excel/XApplication.hpp> #include "tabvwsh.hxx" diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 7d7e804..cbeb87d 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 5394fc5..0b5a1e3 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 cf471b0..7054370 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 71e2f99..3af50f7 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 d5546ae1..2859c68 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 2d44744..af3c531 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 8c05029..3bb5b37 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 0975862..ee9ff86 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 d60115d..c7d719e 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 73d35f6..d5c13db 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 00e1860..3052745 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 5d455ab..aceca93 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 d348b7d..bf2f975 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 212c451..919feea 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 a699681..989415c 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 eb53c2c..e60acec 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 7849115..3ee7293 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 4d5c534..0a81838 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 21537b2..7e3716e 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 b0d3383..182ef99 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 610ee72..bd942fa 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 a9718a4..ad9c8de 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 8d9de39..f371f31 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 0789777..80a645eb 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 2f0c69e..34c177b 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 a84b156..ea80422 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 920af89..dd716ae 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 0590e9c..dbf1f4e 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 a663db5..6d8d1dd 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 c8ab58f..c8c9524 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 fb78e72..270abb7 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 d31f5fd..0481f40 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> diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index a687bff..da09536 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/lang/XEventListener.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index ecce57d..87241b5 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "vbacontrols.hxx" #include "vbacontrol.hxx" diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index 80a52ac..6166154 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -20,6 +20,7 @@ #include <vbalistcontrolhelper.hxx> #include <vector> #include <vbahelper/vbapropvalue.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> using namespace com::sun::star; using namespace ooo::vba; diff --git a/vbahelper/source/msforms/vbanewfont.cxx b/vbahelper/source/msforms/vbanewfont.cxx index e9639b4..39293ad 100644 --- a/vbahelper/source/msforms/vbanewfont.cxx +++ b/vbahelper/source/msforms/vbanewfont.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/awt/FontUnderline.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index aa6af2f..1b6fa4c 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -35,6 +35,7 @@ #include <filter/msfilter/msvbahelper.hxx> #include <tools/datetime.hxx> +#include <vcl/timer.hxx> #include <basic/sbx.hxx> #include <basic/sbstar.hxx> diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index ae45972..3cf133a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -18,6 +18,7 @@ */ #include "vbacommandbarcontrols.hxx" #include "vbacommandbarcontrol.hxx" +#include <com/sun/star/lang/XSingleComponentFactory.hpp> using namespace com::sun::star; using namespace ooo::vba; diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 551adc1..fe65272 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "vbacommandbarhelper.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index b988c67..e5af3b3 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -18,6 +18,7 @@ */ #include <vbahelper/vbadialogbase.hxx> #include <vbahelper/vbahelper.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 6814e67..f2c2a9b 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XTitle.hpp> diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 974afc5..074f524 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <filter/msfilter/msvbahelper.hxx> #include <unotools/eventcfg.hxx> +#include <vbahelper/vbahelper.hxx> using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index 94ae3be..d9f908b 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <com/sun/star/beans/XProperty.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index d0a6175..177aa1c 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -22,6 +22,8 @@ #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/processfactory.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index e0456ea..b2d52fd 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -33,9 +33,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/theIntrospection.hpp> #include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <ooo/vba/msforms/XShape.hpp> diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx index 85ce43b..d3f86d0 100644 --- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx +++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <vbahelper/vbapagesetupbase.hxx> +#include <basic/sberrors.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 6e9f3f6..a7dcee0 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -28,9 +28,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/RelOrientation.hpp> +#include <ooo/vba/office/MsoShapeType.hpp> #include <ooo/vba/word/WdRelativeHorizontalPosition.hpp> #include <ooo/vba/word/WdRelativeVerticalPosition.hpp> +#include <basic/sberrors.hxx> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index ae95cd4..39fa9cb 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -19,7 +19,9 @@ #include <com/sun/star/drawing/ShapeCollection.hpp> #include <com/sun/star/drawing/XShapeGrouper.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <ooo/vba/office/MsoShapeType.hpp> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbashaperange.hxx> diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index fc66a17..91f9b37 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -22,7 +22,12 @@ #include <ooo/vba/msforms/XShapeRange.hpp> #include <ooo/vba/office/MsoAutoShapeType.hpp> #include <ooo/vba/office/MsoTextOrientation.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextContent.hpp> @@ -33,6 +38,9 @@ #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/drawing/XShapes.hpp> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbashape.hxx> diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index d86d263..59bf6dd 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <vbahelper/helperdecl.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/text/XText.hpp> #include <vbahelper/vbatextframe.hxx> diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index edb1350..19b7aab 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -20,6 +20,10 @@ #include "vbahelper/vbawindowbase.hxx" #include "vbahelper/helperdecl.hxx" #include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindow2.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XModel.hpp> using namespace ::com::sun::star; using namespace ::ooo::vba; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
