diff options
44 files changed, 78 insertions, 49 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index ecd7b2be0be4..a178268fea0e 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <comphelper/string.hxx> #include <svl/srchdefs.hxx> +#include <svtools/ehdl.hxx> #include <sfx2/dinfdlg.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 7de114b17ced..aa5e355d29e6 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -33,6 +33,7 @@ #include <managelang.hxx> #include <basic/basmgr.hxx> +#include <com/sun/star/script/XLibraryContainer2.hpp> #include <com/sun/star/resource/StringResourceWithLocation.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 25dc3e5a4e17..dfcf5af28643 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -33,6 +33,7 @@ #include <basic/sbmeth.hxx> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> +#include <com/sun/star/script/XLibraryContainer2.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <svl/srchdefs.hxx> #include <sal/log.hxx> diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 4b4391bbcf95..ca2356fa8d7a 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -35,6 +35,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sal/log.hxx> +#include <svtools/ehdl.hxx> namespace basctl { diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index d961c9afcda7..ea1c467b2e5b 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -29,6 +29,7 @@ #include <basic/basmgr.hxx> #include <basic/sbmeth.hxx> #include <basic/sbmod.hxx> +#include <com/sun/star/script/XLibraryContainer2.hpp> #include <sfx2/dispatch.hxx> #include <sfx2/minfitem.hxx> diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 012651228308..4aa659697d4e 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -28,6 +28,7 @@ #include <basic/basmgr.hxx> #include <com/sun/star/script/XLibraryContainerPassword.hpp> +#include <com/sun/star/script/XLibraryContainer2.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx index 561bc77121c9..8271214f45b4 100644 --- a/basic/inc/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -23,6 +23,7 @@ #include <i18nlangtag/lang.h> #include <basic/sbxdef.hxx> #include <basic/basicdllapi.h> +#include <vcl/errcode.hxx> #include <memory> #include <vector> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index e39655abaf9d..31a799eb9191 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -39,6 +39,8 @@ #include <global.hxx> #include <sbunoobj.hxx> #include <sbintern.hxx> +#include <com/sun/star/script/XLibraryContainer.hpp> +#include <com/sun/star/script/XPersistentLibraryContainer.hpp> #include <memory> #include <vector> diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index e951c82973ea..f3e8e88f6446 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -20,6 +20,7 @@ #include <propacc.hxx> +#include <basic/sberrors.hxx> #include <basic/sbstar.hxx> #include <basic/sbuno.hxx> #include <sbunoobj.hxx> diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index eeb610bbed99..dbed7a50ac0b 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -27,6 +27,7 @@ #include <algorithm> #include <string_view> #include <osl/diagnose.h> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/script/ModuleType.hpp> // nInc is the increment size of the buffers diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 55345348cff4..ae976c8eb679 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -35,6 +35,7 @@ class SbOLEFactory; class SbFormFactory; class SbiInstance; class SbModule; +class BasicManager; class SbiFactory : public SbxFactory { diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 6090643955d0..80508a155826 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -24,6 +24,9 @@ #include <basic/sbx.hxx> #include <basic/sbxfac.hxx> +#include <basic/sbxform.hxx> +#include <basic/sbxmeth.hxx> +#include <basic/sbxprop.hxx> #include <sbxbase.hxx> #include <rtl/instance.hxx> diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 2bbf15d8d353..a1d274a0bdfd 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include <rtl/ustrbuf.hxx> #include <vcl/errcode.hxx> #include <vcl/svapp.hxx> diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index ae1d35671a36..3b831b6a9c2c 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -22,6 +22,7 @@ #include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include <rtl/character.hxx> +#include <rtl/ustrbuf.hxx> static SbxVariableRef Element diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index d35b2aa0dc16..ece0921f8bc6 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -26,6 +26,8 @@ #include <tools/stream.hxx> #include <basic/sbx.hxx> #include <basic/sberrors.hxx> +#include <basic/sbxmeth.hxx> +#include <basic/sbxprop.hxx> #include <svl/SfxBroadcaster.hxx> #include "sbxres.hxx" diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 6c92cdbc2c81..3f2140512c76 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -578,3 +578,9 @@ blacklist: include/cppcanvas/renderer.hxx: # Used in boost::optional type - basegfx/matrix/b2dhommatrix.hxx + include/basic/modsizeexceeded.hxx: + # base class has to be a complete type + - com/sun/star/task/XInteractionRequest.hpp + include/basic/sberrors.hxx: + # Needed for macro defines + - vcl/errcode.hxx diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx index 4104a4e1e12b..e9e906685ed6 100644 --- a/include/basic/basicmanagerrepository.hxx +++ b/include/basic/basicmanagerrepository.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX #define INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/embed/XStorage.hpp> #include <basic/basicdllapi.h> +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { template <typename > class Reference; } + class BasicManager; diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index 3229155c6ede..fd94a6aa477f 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -19,15 +19,19 @@ #ifndef INCLUDED_BASIC_BASMGR_HXX #define INCLUDED_BASIC_BASMGR_HXX -#include <vcl/errinf.hxx> +#include <vcl/errcode.hxx> #include <svl/SfxBroadcaster.hxx> #include <basic/sbstar.hxx> -#include <com/sun/star/script/XPersistentLibraryContainer.hpp> -#include <com/sun/star/script/XStarBasicAccess.hpp> #include <basic/basicdllapi.h> #include <memory> #include <vector> +namespace com::sun::star::script { class XLibraryContainer; } +namespace com::sun::star::script { class XPersistentLibraryContainer; } +namespace com::sun::star::script { class XStarBasicAccess; } + +class BasicManager; + // Basic XML Import/Export BASIC_DLLPUBLIC css::uno::Reference< css::script::XStarBasicAccess > getStarBasicAccess( BasicManager* pMgr ); @@ -58,7 +62,6 @@ public: ErrCode const & GetErrorId() const { return nErrorId; } }; -class ErrorManager; class BasicLibInfo; namespace basic { class ImplRepository; } diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index c2b6502e1d55..d7ce0f69f0d4 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_BASIC_CODECOMPLETECACHE_HXX #define INCLUDED_BASIC_CODECOMPLETECACHE_HXX -#include <basic/sbdef.hxx> -#include <basic/sbxobj.hxx> -#include <basic/sbxdef.hxx> +#include <basic/basicdllapi.h> #include <rtl/ustring.hxx> #include <svtools/miscopt.hxx> #include <unordered_map> -#include <vector> typedef std::unordered_map< OUString, OUString > CodeCompleteVarTypes; /* variable name, type */ diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx index 0aee5d237c0f..3c1ffba97f3b 100644 --- a/include/basic/modsizeexceeded.hxx +++ b/include/basic/modsizeexceeded.hxx @@ -20,11 +20,13 @@ #ifndef INCLUDED_BASIC_MODSIZEEXCEEDED_HXX #define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX -#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <cppuhelper/implbase.hxx> #include <basic/basicdllapi.h> #include <vector> +namespace com::sun::star::task { class XInteractionContinuation; } + class BASIC_DLLPUBLIC ModuleSizeExceeded : public cppu::WeakImplHelper< css::task::XInteractionRequest > { // C++ interface diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx index 7d677f1c9be6..201a9de37b37 100644 --- a/include/basic/sbdef.hxx +++ b/include/basic/sbdef.hxx @@ -23,9 +23,10 @@ #include <basic/sbxdef.hxx> #include <rtl/ustring.hxx> #include <basic/basicdllapi.h> -#include <svtools/ehdl.hxx> #include <o3tl/typed_flags_set.hxx> +class ErrCode; + // Returns type name for Basic type, array flag is ignored // implementation: basic/source/runtime/methods.cxx BASIC_DLLPUBLIC OUString getBasicTypeName( SbxDataType eType ); diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index c38c7435ccef..8b9b78e9a07f 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_BASIC_SBMOD_HXX #define INCLUDED_BASIC_SBMOD_HXX -#include <com/sun/star/script/XInvocation.hpp> #include <basic/sbdef.hxx> #include <basic/sbxobj.hxx> #include <basic/sbxdef.hxx> @@ -30,15 +29,16 @@ #include <deque> #include <memory> #include <basic/basicdllapi.h> -#include <basic/codecompletecache.hxx> +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::script { class XInvocation; } class SbMethod; class SbProperty; -class SbiRuntime; typedef std::deque< sal_uInt16 > SbiBreakpoints; class SbiImage; -class SbIfaceMapperMethod; class SbClassModuleObject; +class CodeCompleteDataCache; class ModuleInitDependencyMap; diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 884974597388..9275701137be 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -27,25 +27,19 @@ #include <tools/link.hxx> #include <basic/sbdef.hxx> -#include <basic/sberrors.hxx> -#include <com/sun/star/script/ModuleInfo.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <basic/basicdllapi.h> -class SbiInstance; // runtime instance -class SbiRuntime; // currently running procedure -class SbiImage; // compiled image -class BasicLibInfo; // info block for basic manager +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::script { struct ModuleInfo; } + class SbMethod; -class BasicManager; -class DocBasicItem; class BASIC_DLLPUBLIC StarBASIC : public SbxObject { friend class SbiScanner; friend class SbiExpression; // Access to RTL - friend class SbiInstance; - friend class SbiRuntime; + friend class SbiInstance; // runtime instance + friend class SbiRuntime; // currently running procedure friend class DocBasicItem; SbModules pModules; // List of all modules diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx index d690a35ce01a..29a9e68c8d6e 100644 --- a/include/basic/sbuno.hxx +++ b/include/basic/sbuno.hxx @@ -20,13 +20,14 @@ #ifndef INCLUDED_BASIC_SBUNO_HXX #define INCLUDED_BASIC_SBUNO_HXX -#include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Type.hxx> -#include <basic/sbxobj.hxx> +#include <basic/sbxvar.hxx> #include <basic/basicdllapi.h> -namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::beans { struct Property; } + +class SbxObject; // Returns a SbxObject that wraps an Uno Interface // Implementation in basic/source/classes/sbunoobj.cxx diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 97014fc6fdef..55b7fcaae8c3 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -22,27 +22,15 @@ #include <tools/ref.hxx> #include <svl/hint.hxx> -#include <svl/lstner.hxx> #include <basic/sbxdef.hxx> -#include <basic/sbxform.hxx> #include <basic/sbxobj.hxx> -#include <basic/sbxprop.hxx> -#include <basic/sbxmeth.hxx> #include <basic/basicdllapi.h> #include <vector> #include <memory> class SvStream; -class SbxBase; -class SbxVariable; -class SbxProperty; -class SbxMethod; -class SbxObject; -class SbxArray; -class SbxDimArray; -class SbxFactory; class SfxBroadcaster; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 9d6b45652a16..aee3b428d29c 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -24,9 +24,9 @@ #include <basic/sbxdef.hxx> #include <rtl/ustring.hxx> #include <tools/ref.hxx> -#include <vcl/errcode.hxx> class SvStream; +class ErrCode; // The following Macro defines four (five) necessary methods within a // SBX object. LoadPrivateData() and StorePrivateData() must be implemented. diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx index 04358d899425..5192cc858fd8 100644 --- a/include/basic/sbxfac.hxx +++ b/include/basic/sbxfac.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_BASIC_SBXFAC_HXX #define INCLUDED_BASIC_SBXFAC_HXX -#include <basic/sbxdef.hxx> #include <rtl/ustring.hxx> #include <basic/basicdllapi.h> diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index ae41a2b069a1..b0add15b4f47 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -21,7 +21,6 @@ #define INCLUDED_BASIC_SBXVAR_HXX #include <rtl/ustring.hxx> -#include <com/sun/star/bridge/oleautomation/Decimal.hpp> #include <basic/sbxcore.hxx> #include <basic/basicdllapi.h> @@ -30,6 +29,10 @@ #include <memory> +namespace com::sun::star::bridge::oleautomation { struct Decimal; } +namespace com::sun::star::uno { class XInterface; } +namespace com::sun::star::uno { template <typename > class Reference; } + class SbxDecimal; enum class SfxHintId; diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx index ce0d689e730e..10372abf392b 100644 --- a/include/basic/vbahelper.hxx +++ b/include/basic/vbahelper.hxx @@ -20,10 +20,12 @@ #ifndef INCLUDED_BASIC_VBAHELPER_HXX #define INCLUDED_BASIC_VBAHELPER_HXX -#include <com/sun/star/frame/XModel.hpp> #include <rtl/ustring.hxx> #include <basic/basicdllapi.h> +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace basic { namespace vba { diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 69bc69b45668..f225aefb5efc 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -27,6 +27,7 @@ #include <basic/sbmeth.hxx> #include <basic/sbmod.hxx> #include <basic/sbstar.hxx> +#include <basic/sberrors.hxx> #include <basic/sbx.hxx> #include <svl/zforlist.hxx> diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index b8b8228afe36..36414ed178a3 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -82,6 +82,7 @@ #include <basic/sbstar.hxx> #include <basic/sbuno.hxx> #include <basic/sbmeth.hxx> +#include <basic/sberrors.hxx> #include <convuno.hxx> #include <cellsuno.hxx> diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index afd197f0f2d6..d614bda2b2f9 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -26,6 +26,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <basic/sbstar.hxx> +#include <basic/sberrors.hxx> #include <svl/languageoptions.hxx> #include <svl/stritem.hxx> #include <svl/whiter.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index ee8177df7110..8239545d21d9 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/frame/theAutoRecovery.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/container/XNameReplace.hpp> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index c5dd15eb9922..60de7fba6c72 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -48,6 +48,7 @@ #include <svl/aeitem.hxx> #include <svx/imapdlg.hxx> #include <basic/sbstar.hxx> +#include <basic/sberrors.hxx> #include <xmloff/autolayout.hxx> #include <undo/undoobjects.hxx> diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 2fbdaf83c0c7..8b5b494595b8 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -46,6 +46,7 @@ #include <sot/storage.hxx> #include <svl/whiter.hxx> #include <basic/sbstar.hxx> +#include <basic/sberrors.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index e3b2284c702a..c09b539a34cf 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -77,6 +77,7 @@ #include <sfx2/templdlg.hxx> #include <svl/aeitem.hxx> #include <basic/sbstar.hxx> +#include <basic/sberrors.hxx> #include <xmloff/autolayout.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 314a9587a69f..e72bb8a888d2 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -67,6 +67,7 @@ #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> #include <basic/basrdll.hxx> +#include <basic/sberrors.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <vcl/help.hxx> diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 267b6d803608..970ff56b5083 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> +#include <basic/sberrors.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index bb5553d4991c..1a13ff4d60e7 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -63,6 +63,7 @@ #include <basic/sbuno.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> +#include <basic/sberrors.hxx> #include <vcl/weld.hxx> #include <basic/sbx.hxx> #include <svtools/sfxecode.hxx> diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 73d6cbc391a7..25c5c67d86e9 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -59,7 +59,6 @@ namespace svxform using ::com::sun::star::script::XScriptListener; using ::com::sun::star::script::ScriptEvent; using ::com::sun::star::lang::EventObject; - using ::com::sun::star::reflection::InvocationTargetException; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::lang::DisposedException; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 1fbe1308e26a..9e9db5ec8ebb 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -75,6 +75,7 @@ #include <com/sun/star/script/ModuleInfo.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vbahelper/vbaaccesshelper.hxx> #include <basic/basmgr.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index e9ebabc6a912..32e337393ac3 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -51,6 +51,7 @@ #include <sfx2/printer.hxx> #include <sfx2/evntconf.hxx> #include <svtools/sfxecode.hxx> +#include <svtools/ehdl.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <svx/dialogs.hrc> diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 0b5c2d2140d9..871630c9dd40 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -26,6 +26,8 @@ #include <com/sun/star/beans/PropertyConcept.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <basic/sbx.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 34f320b3578b..0c15bb670561 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -60,6 +60,7 @@ #include <basic/sbmod.hxx> #include <basic/sbmeth.hxx> #include <basic/sbuno.hxx> +#include <basic/sberrors.hxx> #include <rtl/math.hxx> #include <sfx2/viewsh.hxx> #include <math.h> |