diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-11-08 17:23:15 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-12 09:20:55 +0100 |
| commit | 7ddedd2594ddcaeed21f46709fdb44601ff641bf (patch) | |
| tree | 2b0e198ba30392a6f140f046b87a67b91f00aa32 /basic | |
| parent | c465d920f4fe15c6e614beffb80b53d24a3dc5c7 (diff) | |
tdf#42949 Fix IWYU warnings in basic/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I325149be2ea7697b5b4a2ce4a662edd2f8be6e50
Reviewed-on: https://gerrit.libreoffice.org/82312
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'basic')
84 files changed, 95 insertions, 180 deletions
diff --git a/basic/IwyuFilter_basic.yaml b/basic/IwyuFilter_basic.yaml new file mode 100644 index 000000000000..215692ada141 --- /dev/null +++ b/basic/IwyuFilter_basic.yaml @@ -0,0 +1,22 @@ +--- +assumeFilename: basic/source/classes/global.cxx +blacklist: + basic/source/runtime/methods.cxx: + # Needed on WIN + - o3tl/char16_t2wchar_t.hxx + - rtl/character.hxx + basic/source/sbx/sbxdec.cxx: + # Needed on WIN + - o3tl/char16_t2wchar_t.hxx + basic/source/sbx/sbxbyte.cxx: + # math::round is used + - rtl/math.hxx + basic/source/sbx/sbxchar.cxx: + # math::round is used + - rtl/math.hxx + basic/source/sbx/sbxint.cxx: + # math::round is used + - rtl/math.hxx + basic/source/sbx/sbxlng.cxx: + # math::round is used + - rtl/math.hxx diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx index ce78553c8071..bfac343fb5d6 100644 --- a/basic/inc/sb.hxx +++ b/basic/inc/sb.hxx @@ -20,13 +20,7 @@ #ifndef INCLUDED_BASIC_INC_SB_HXX #define INCLUDED_BASIC_INC_SB_HXX -#include <basic/sberrors.hxx> -#include <basic/sbdef.hxx> -#include <basic/sbmeth.hxx> -#include <basic/sbmod.hxx> -#include <basic/sbstar.hxx> - -#include "sbprop.hxx" +#include <basic/sbxobj.hxx> // create object from user-type (+StringID+StringID) SbxObject* createUserTypeImpl( const OUString& rClassName ); diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 5d2561fd84df..b87892f52323 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -22,9 +22,7 @@ #include <rtl/ref.hxx> #include <basic/sbmod.hxx> -#include <basic/sbstar.hxx> #include <com/sun/star/script/ModuleInfo.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/frame/XModel.hpp> #include <basic/basicdllapi.h> diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx index 30ab7357d686..638ddfbb255c 100644 --- a/basic/inc/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -21,8 +21,6 @@ #define INCLUDED_BASIC_INC_SBXBASE_HXX #include <i18nlangtag/lang.h> -#include <basic/sbxdef.hxx> -#include <basic/basicdllapi.h> #include <vcl/errcode.hxx> #include <memory> diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index d78d322addbd..0dfc7d94e780 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -9,8 +9,6 @@ #include "basictest.hxx" #include <osl/file.hxx> -#include <basic/sbmod.hxx> -#include <basic/sbmeth.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx index 8b0670d41dad..9a414b7f5e1a 100644 --- a/basic/qa/cppunit/basictest.cxx +++ b/basic/qa/cppunit/basictest.cxx @@ -8,11 +8,8 @@ */ #include "basictest.hxx" -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <basic/sbstar.hxx> -#include <basic/basrdll.hxx> #include <basic/sbmod.hxx> #include <basic/sbmeth.hxx> #include <basic/sbuno.hxx> diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx index 242d16fa0b46..7ff58012b28f 100644 --- a/basic/qa/cppunit/test_append.cxx +++ b/basic/qa/cppunit/test_append.cxx @@ -8,11 +8,7 @@ */ #include "basictest.hxx" -#include <osl/file.hxx> -#include <osl/process.h> -#include <basic/sbmod.hxx> -#include <basic/sbmeth.hxx> namespace { class EnableTest : public test::BootstrapFixture diff --git a/basic/qa/cppunit/test_language_conditionals.cxx b/basic/qa/cppunit/test_language_conditionals.cxx index 1723a98bae5c..53d6b6ec4cdd 100644 --- a/basic/qa/cppunit/test_language_conditionals.cxx +++ b/basic/qa/cppunit/test_language_conditionals.cxx @@ -13,7 +13,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> namespace { diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx index b1f060d8f152..009d832b1ce6 100644 --- a/basic/qa/cppunit/test_nested_struct.cxx +++ b/basic/qa/cppunit/test_nested_struct.cxx @@ -7,11 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "basictest.hxx" -#include <osl/file.hxx> -#include <osl/process.h> -#include <basic/sbmod.hxx> -#include <basic/sbmeth.hxx> #include <com/sun/star/awt/WindowDescriptor.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <basic/sbuno.hxx> diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index 511be7b486e0..42cd637cbd44 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -13,8 +13,6 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <osl/file.hxx> -#include <osl/process.h> #include <rtl/math.hxx> #include <scanner.hxx> diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 5466afc5a536..fb93f5812712 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -7,12 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "basictest.hxx" -#include <comphelper/processfactory.hxx> #include <unotools/syslocaleoptions.hxx> -#include <o3tl/char16_t2wchar_t.hxx> #ifdef _WIN32 #include <string.h> +#include <o3tl/char16_t2wchar_t.hxx> #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index b725f0563a3c..9e3aecc249e0 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -21,7 +21,6 @@ #include <basic/basmgr.hxx> #include <scriptcont.hxx> #include <dlgcont.hxx> -#include <basic/sbuno.hxx> #include <sbintern.hxx> #include <com/sun/star/document/XStorageBasedDocument.hpp> @@ -41,7 +40,7 @@ #include <osl/getglobalmutex.hxx> #include <rtl/instance.hxx> -#include <rtl/strbuf.hxx> +#include <sot/storage.hxx> #include <map> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index a2e59d8b4213..46fa3740777a 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -22,22 +22,20 @@ #include <sot/storage.hxx> #include <tools/urlobj.hxx> #include <svl/hint.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> #include <basic/sbx.hxx> +#include <basic/sbmeth.hxx> #include <sot/storinfo.hxx> #include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <basic/sbmod.hxx> -#include <unotools/intlwrapper.hxx> +#include <unotools/transliterationwrapper.hxx> #include <sal/log.hxx> +#include <basic/sberrors.hxx> #include <basic/sbuno.hxx> #include <basic/basmgr.hxx> #include <global.hxx> -#include <sbunoobj.hxx> -#include <sbintern.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XPersistentLibraryContainer.hpp> diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index ec8f57026f3b..93b401bf9ed0 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <rtl/instance.hxx> diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 457a3d570378..35582a0c25be 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -22,10 +22,7 @@ #include <comphelper/string.hxx> #include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XDialog.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/DialogProvider.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -44,8 +41,8 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <xmlscript/xmldlg_imexp.hxx> #include <sbunoobj.hxx> +#include <basic/sberrors.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> #include <basic/sbuno.hxx> diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 6d177755b671..90cdaa7b7ed9 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -23,6 +23,7 @@ #include <sal/log.hxx> #include <basic/sbx.hxx> #include <sb.hxx> +#include <basic/sbxprop.hxx> #include <string.h> #include <image.hxx> #include <codegen.hxx> diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index f3e8e88f6446..fbceb81ad7b1 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -30,7 +30,6 @@ #include <o3tl/any.hxx> #include <algorithm> -#include <limits.h> using com::sun::star::uno::Reference; using namespace com::sun::star; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 8cce1979c6ec..3ee34bc7e2fb 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -31,10 +31,11 @@ #include <sbjsmod.hxx> #include <sbintern.hxx> #include <runtime.hxx> +#include <basic/sberrors.hxx> #include <basic/sbuno.hxx> +#include <sbprop.hxx> #include <sbobjmod.hxx> #include <stdobj.hxx> -#include <filefmt.hxx> #include <basic.hrc> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -47,7 +48,7 @@ #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/ModuleInfo.hpp> -#include <svtools/miscopt.hxx> + using namespace ::com::sun::star::script; diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx index 1c4af0f5fa9b..77bfc64e030b 100644 --- a/basic/source/classes/sbintern.cxx +++ b/basic/source/classes/sbintern.cxx @@ -19,10 +19,6 @@ #include <sbintern.hxx> #include <sbunoobj.hxx> -#include <token.hxx> -#include <symtbl.hxx> -#include <parser.hxx> -#include <codegen.hxx> #include <basic/basmgr.hxx> SbiGlobals* SbiGlobals::pGlobals = nullptr; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index af5a3aab3da2..26aedddd3a40 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -27,14 +27,12 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/instance.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/script/ArrayWrapper.hpp> @@ -55,7 +53,6 @@ #include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/script/InvocationAdapterFactory.hpp> #include <com/sun/star/script/XAllListener.hpp> -#include <com/sun/star/script/XInvocationAdapterFactory.hpp> #include <com/sun/star/script/Converter.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> #include <com/sun/star/script/XDirectInvocation.hpp> @@ -64,6 +61,7 @@ #include <com/sun/star/reflection/XIdlArray.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> #include <com/sun/star/reflection/XServiceConstructorDescription.hpp> +#include <com/sun/star/reflection/XSingletonTypeDescription.hpp> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <com/sun/star/bridge/oleautomation/NamedArgument.hpp> #include <com/sun/star/bridge/oleautomation/Date.hpp> @@ -71,7 +69,6 @@ #include <com/sun/star/bridge/oleautomation/Currency.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <com/sun/star/script/XAutomationInvocation.hpp> -#include <basic/codecompletecache.hxx> #include <rtlproto.hxx> @@ -79,8 +76,6 @@ #include <basic/sbuno.hxx> #include <basic/sberrors.hxx> #include <sbunoobj.hxx> -#include <sbjsmod.hxx> -#include <basic/basmgr.hxx> #include <sbintern.hxx> #include <runtime.hxx> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 1df211a3f8b3..3e88a3fb4bff 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -22,12 +22,13 @@ #include <tools/stream.hxx> #include <tools/diagnose_ex.h> #include <svl/SfxBroadcaster.hxx> +#include <basic/codecompletecache.hxx> #include <basic/sbx.hxx> #include <basic/sbuno.hxx> -#include <sb.hxx> #include <sbjsmeth.hxx> #include <sbjsmod.hxx> #include <sbintern.hxx> +#include <sbprop.hxx> #include <image.hxx> #include <opcodes.hxx> #include <runtime.hxx> @@ -36,13 +37,12 @@ #include <sal/log.hxx> -#include <basic/basrdll.hxx> +#include <basic/sberrors.hxx> #include <sbobjmod.hxx> #include <basic/vbahelper.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <unotools/eventcfg.hxx> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> @@ -66,9 +66,7 @@ #include <com/sun/star/awt/DialogProvider.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XControl.hpp> #include <ooo/vba/VbQueryClose.hpp> -#include <list> #include <memory> #include <sbxmod.hxx> #include <parser.hxx> diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx index 4e28d3c8a00b..a7dca978b27a 100644 --- a/basic/source/comp/buffer.cxx +++ b/basic/source/comp/buffer.cxx @@ -20,6 +20,8 @@ #include <buffer.hxx> #include <parser.hxx> +#include <basic/sberrors.hxx> + const static sal_uInt32 UP_LIMIT=0xFFFFFF00; // The SbiBuffer will be expanded in increments of at least 16 Bytes. diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index f22f98135277..bebedd8f852d 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -18,10 +18,14 @@ */ +#include <basic/sberrors.hxx> #include <basic/sbx.hxx> +#include <basic/sbmeth.hxx> +#include <basic/sbmod.hxx> #include <image.hxx> #include <codegen.hxx> #include <parser.hxx> +#include <sbintern.hxx> #include <cstddef> #include <limits> #include <algorithm> diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 9e3124697794..bfe8b3184b36 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> +#include <basic/sbstar.hxx> #include <basic/sbx.hxx> #include <sbunoobj.hxx> #include <parser.hxx> -#include <svtools/miscopt.hxx> +#include <sb.hxx> #include <osl/diagnose.h> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <comphelper/processfactory.hxx> -#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp> -#include <com/sun/star/reflection/XIdlMethod.hpp> #include <com/sun/star/uno/Exception.hpp> #include <basic/codecompletecache.hxx> #include <memory> diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index a00bfc0f6945..01da0420fd5e 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> #include <codegen.hxx> #include <expr.hxx> diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index 6b712a639046..3d2cee0d20fc 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -19,14 +19,13 @@ #include <math.h> -#include <algorithm> #include <o3tl/temporary.hxx> #include <rtl/math.hxx> -#include <codegen.hxx> #include <parser.hxx> #include <expr.hxx> +#include <basic/sberrors.hxx> SbiExprNode::SbiExprNode( std::unique_ptr<SbiExprNode> l, SbiToken t, std::unique_ptr<SbiExprNode> r ) : pLeft(std::move(l)), diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index a5d149a6c0ef..4fe389983d28 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -20,7 +20,8 @@ #include <memory> #include <parser.hxx> -#include <basic/sbx.hxx> +#include <basic/sberrors.hxx> +#include <basic/sbmod.hxx> #include <expr.hxx> #include <uno/current_context.hxx> diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 3a24d4141027..45581c70e9f2 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> #include <parser.hxx> #include <iosys.hxx> #include <memory> diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx index daf7182fc3db..2d174efa2a4a 100644 --- a/basic/source/comp/loops.cxx +++ b/basic/source/comp/loops.cxx @@ -21,6 +21,8 @@ #include <parser.hxx> #include <memory> +#include <basic/sberrors.hxx> + // Single-line IF and Multiline IF void SbiParser::If() diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index b7a09c7ce739..1de38c9c8541 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> +#include <basic/sbxmeth.hxx> +#include <basic/sbmod.hxx> +#include <basic/sbstar.hxx> #include <basic/sbx.hxx> #include <parser.hxx> #include <com/sun/star/script/ModuleType.hpp> -#include <svtools/miscopt.hxx> #include <rtl/character.hxx> struct SbiParseStack { // "Stack" for statement-blocks diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index a13b85fdd2ab..b0cc2840a5d6 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -18,12 +18,13 @@ */ +#include <basic/sbmeth.hxx> +#include <basic/sbstar.hxx> #include <basic/sbx.hxx> #include <parser.hxx> #include <image.hxx> +#include <sbintern.hxx> #include <sbobjmod.hxx> -#include <svtools/miscopt.hxx> -#include <rtl/character.hxx> #include <memory> // This routine is defined here, so that the diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index eee3764ab995..7c192b3a0107 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -22,9 +22,9 @@ #include <sbintern.hxx> #include <runtime.hxx> +#include <basic/sberrors.hxx> #include <i18nlangtag/lang.h> #include <svl/zforlist.hxx> -#include <vcl/svapp.hxx> #include <rtl/character.hxx> SbiScanner::SbiScanner( const OUString& rBuf, StarBASIC* p ) : aBuf( rBuf ) diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index aa7ce59e949f..5de6be744e6a 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -24,8 +24,8 @@ #include <osl/diagnose.h> #include <stdio.h> -#include <string.h> #include <rtl/character.hxx> +#include <basic/sberrors.hxx> // All symbol names are laid down int the symbol-pool's stringpool, so that // all symbols are handled in the same case. On saving the code-image, the diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index cad82280b216..2e0141827858 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -21,6 +21,7 @@ #include <array> #include <basic/sberrors.hxx> +#include <rtl/instance.hxx> #include <sal/macros.h> #include <basiccharclass.hxx> #include <token.hxx> diff --git a/basic/source/inc/basiccharclass.hxx b/basic/source/inc/basiccharclass.hxx index fd3862d848e3..3b8109b89192 100644 --- a/basic/source/inc/basiccharclass.hxx +++ b/basic/source/inc/basiccharclass.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX #define INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX -#include <unotools/charclass.hxx> -#include <rtl/instance.hxx> - -#include <vcl/svapp.hxx> +#include <sal/types.h> namespace BasicCharClass { diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx index 2291e8d0bea8..89d664453cef 100644 --- a/basic/source/inc/buffer.hxx +++ b/basic/source/inc/buffer.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX #define INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX -#include <rtl/ustring.hxx> +#include <sal/types.h> #include <memory> class SbiParser; diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index 4abf53504295..857968e26e15 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -24,7 +24,6 @@ class SbiParser; class SbModule; #include "opcodes.hxx" #include "buffer.hxx" -#include <basic/codecompletecache.hxx> class SbiCodeGen { SbiParser* pParser; // for error messages, line, column etc. diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx index c0cfd66a5cf7..1a994ca3fa0c 100644 --- a/basic/source/inc/date.hxx +++ b/basic/source/inc/date.hxx @@ -24,6 +24,8 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <basic/sbxvar.hxx> + enum class SbDateCorrection { None, diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx index bc64dc6730d6..ee1aaa4168b6 100644 --- a/basic/source/inc/image.hxx +++ b/basic/source/inc/image.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX #define INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX -#include "sbintern.hxx" +#include <basic/sbx.hxx> #include <rtl/ustring.hxx> #include "filefmt.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 9e1b4fe80778..4931b86a3e94 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -22,7 +22,6 @@ #include <memory> #include <tools/stream.hxx> -#include <basic/sberrors.hxx> #include <o3tl/typed_flags_set.hxx> class SvStream; diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index cc8d80a8f483..d07bfafbfbaf 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -21,7 +21,6 @@ #define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX #include <unordered_map> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> @@ -47,13 +46,10 @@ #include <unotools/eventlisteneradapter.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/component.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> -#include <sot/storage.hxx> #include <comphelper/listenernotification.hxx> #include <xmlscript/xmllib_imexp.hxx> diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx index 859ad388aed2..cb97110369f4 100644 --- a/basic/source/inc/opcodes.hxx +++ b/basic/source/inc/opcodes.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX #define INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX -#include "sbintern.hxx" - // An opcode can have a length of 1, 3 or 5 bytes, // depending on its numeric value (see below). diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index bee2a188c1fc..88f4f34b2b33 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -23,7 +23,7 @@ #include "expr.hxx" #include "codegen.hxx" #include "symtbl.hxx" - +#include <basic/sbx.hxx> #include <vector> diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 0e174b2ef713..c00673055c8c 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> -#include <com/sun/star/beans/XPropertyContainer.hpp> #include <cppuhelper/implbase.hxx> #include <vector> diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 532f0d9a4b17..b56f87288753 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX #define INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX +#include <basic/sberrors.hxx> +#include <basic/sbmeth.hxx> +#include <basic/sbstar.hxx> #include <basic/sbx.hxx> -#include <sb.hxx> - #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <osl/file.hxx> diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 4a1eda136f69..61b2953486ed 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -21,9 +21,10 @@ #define INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX #include <basic/basicdllapi.h> +#include <basic/sbstar.hxx> #include <basic/sbxfac.hxx> #include <unotools/transliterationwrapper.hxx> -#include <sb.hxx> +#include <vcl/errcode.hxx> namespace utl { diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 2c38ed5542f4..17440c70649d 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -27,12 +27,10 @@ #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/beans/XExactName.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> -#include <com/sun/star/beans/XIntrospection.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/reflection/XIdlClass.hpp> #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> -#include <com/sun/star/reflection/XSingletonTypeDescription.hpp> #include <rtl/ustring.hxx> #include <unordered_map> #include <vector> diff --git a/basic/source/inc/sbxmod.hxx b/basic/source/inc/sbxmod.hxx index 3784c7fe045d..9ada1861ae6f 100644 --- a/basic/source/inc/sbxmod.hxx +++ b/basic/source/inc/sbxmod.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX #define INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX +#include <com/sun/star/frame/XModel.hpp> +#include <basic/sbstar.hxx> + css::uno::Reference< css::frame::XModel > getDocumentModel( StarBASIC* ); #endif // INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index cecfb797da22..629bd6728297 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -22,6 +22,7 @@ #include <memory> #include <vector> +#include <basic/sbdef.hxx> class SbiConstDef; class SbiParser; diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index 5178013172b3..34abfce82a7f 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -21,7 +21,6 @@ #define INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX #include "scanner.hxx" -#include <basic/sbdef.hxx> // The tokenizer is stand-alone, i. e. he can be used from everywhere. // A BASIC-instance is necessary for error messages. Without BASIC the diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index af5b7a2403aa..a3145f404979 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -19,14 +19,11 @@ #include <memory> #include <vcl/svapp.hxx> -#include <svl/solar.hrc> #include <tools/debug.hxx> #include <vcl/weld.hxx> -#include <vcl/settings.hxx> #include <basic/sbstar.hxx> #include <basic/basrdll.hxx> -#include <unotools/resmgr.hxx> #include <strings.hrc> #include <sbxbase.hxx> #include <config_features.h> diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index ea4557d4d02e..dc172d1143f0 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -21,7 +21,10 @@ #define INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX #include <tools/link.hxx> -#include <basic/sberrors.hxx> +#include <vcl/errcode.hxx> + +#include <memory> +#include <vector> class DdeConnection; class DdeData; diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx index c299a4dcdfd0..5b4c24003b3b 100644 --- a/basic/source/runtime/dllmgr-none.cxx +++ b/basic/source/runtime/dllmgr-none.cxx @@ -24,12 +24,10 @@ #include <postwin.h> #endif +#include <basic/sberrors.hxx> #include <basic/sbx.hxx> #include <basic/sbxvar.hxx> -#include <rtl/ref.hxx> -#include <rtl/string.hxx> #include <rtl/ustring.hxx> -#include <salhelper/simplereferenceobject.hxx> #include <osl/time.h> #include "dllmgr.hxx" diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 9bd2e9c95424..461375467ad1 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -21,7 +21,7 @@ #define INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX #include <sal/config.h> -#include <basic/sberrors.hxx> +#include <vcl/errcode.hxx> #include <memory> class SbxArray; diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index d38ca3670836..24a71850607b 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> #include <tools/lineend.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <runtime.hxx> -#include <stdobj.hxx> #include <rtlproto.hxx> #include <memory> diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 6797b41f7758..e58c0a060df2 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -22,27 +22,18 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <osl/file.hxx> -#include <tools/urlobj.hxx> #include <runtime.hxx> -#include <rtl/byteseq.hxx> -#include <rtl/textenc.h> #include <rtl/strbuf.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <com/sun/star/bridge/BridgeFactory.hpp> -#include <com/sun/star/bridge/XBridge.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XContentProvider.hpp> -#include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XStream.hpp> @@ -55,7 +46,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::bridge; #include <iosys.hxx> -#include <sbintern.hxx> class SbiInputDialog : public weld::GenericDialogController diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 8cb2b33436d1..95057cb854c5 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -42,7 +42,6 @@ #include <tools/wldcrd.hxx> #include <i18nlangtag/lang.h> #include <rtl/string.hxx> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <runtime.hxx> @@ -52,16 +51,13 @@ #include <comphelper/string.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/script/XErrorQuery.hpp> -#include <ooo/vba/XHelperInterface.hpp> #include <ooo/vba/VbTriState.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <memory> @@ -75,7 +71,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; #include <date.hxx> -#include <stdobj.hxx> #include <sbstdobj.hxx> #include <rtlproto.hxx> #include <image.hxx> diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 281b23ec3243..19f0acaa8c0a 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -37,14 +37,12 @@ #include <tools/fract.hxx> #include <o3tl/temporary.hxx> #include <osl/file.hxx> -#include <vcl/jobset.hxx> #include <sbobjmod.hxx> #include <basic/sbuno.hxx> #include <date.hxx> #include <sbintern.hxx> #include <runtime.hxx> -#include <stdobj.hxx> #include <rtlproto.hxx> #include "dllmgr.hxx" #include <iosys.hxx> diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx index 8822aefba8f3..28bd71a31bd6 100644 --- a/basic/source/runtime/props.cxx +++ b/basic/source/runtime/props.cxx @@ -19,7 +19,6 @@ #include <runtime.hxx> -#include <stdobj.hxx> #include <rtlproto.hxx> #include <errobject.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 52f7c645c640..033285d8f7fe 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -65,6 +65,7 @@ #include <runtime.hxx> #include <sb.hxx> #include <sbintern.hxx> +#include <sbprop.hxx> #include <sbunoobj.hxx> #include <basic/codecompletecache.hxx> #include <memory> diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index a2f3be73b308..234deed57ea0 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -21,7 +21,6 @@ #include <runtime.hxx> #include <stdobj.hxx> #include <sbstdobj.hxx> -#include <sal/macros.h> #include <rtlproto.hxx> #include <sbintern.hxx> // The nArgs-field of a table entry is encrypted as follows: diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 039be508aef9..d6ae5d5dc35a 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basic/sberrors.hxx> +#include <basic/sbstar.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#include <vcl/transfer.hxx> -#include <runtime.hxx> #include <sbstdobj.hxx> #define ATTR_IMP_TYPE 1 diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 22dbb951c145..7f147e81e27f 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -29,7 +29,6 @@ #include <basic/sbxprop.hxx> #include <sbxbase.hxx> -#include <rtl/instance.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index a8b4df040673..950fb168d01c 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -18,7 +18,6 @@ */ #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" #include "sbxres.hxx" diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index b518782d4c1f..ab078157b60b 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -18,7 +18,7 @@ */ #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> +//#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index aba2d47cb48f..ef2b13423ee2 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -18,7 +18,6 @@ */ #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx index 378c752b88d9..e053e7e028be 100644 --- a/basic/source/sbx/sbxconv.hxx +++ b/basic/source/sbx/sbxconv.hxx @@ -21,6 +21,7 @@ #define INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX #include "sbxdec.hxx" +#include <basic/sbx.hxx> class SbxArray; diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index b8df44d9fa26..50b530cda193 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -18,10 +18,7 @@ */ #include <rtl/ustrbuf.hxx> -#include <vcl/errcode.hxx> -#include <vcl/svapp.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include <basic/sbxvar.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 9d9a56d2d359..e716b57eeac8 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -20,10 +20,8 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <svl/zforlist.hxx> -#include <vcl/errcode.hxx> #include <tools/color.hxx> #include <i18nlangtag/lang.h> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" #include <runtime.hxx> diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index 968dc837edb8..c68d2909304b 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include "sbxconv.hxx" #include <runtime.hxx> diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index cd4566b105b7..81685f7744e2 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/errcode.hxx> #include <o3tl/char16_t2wchar_t.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" #include <com/sun/star/bridge/oleautomation/Decimal.hpp> -#include <memory> // Implementation SbxDecimal SbxDecimal::SbxDecimal() diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index cfd2290aa517..85a85557d8df 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -28,8 +28,6 @@ #include <oleauto.h> #endif -#include <basic/sbx.hxx> - #include <com/sun/star/bridge/oleautomation/Decimal.hpp> diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index 9153d8904ff8..d5f46f06ac46 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/errcode.hxx> -#include <vcl/svapp.hxx> #include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include <rtl/character.hxx> diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 78fc5756b0bf..90f68bfaefb5 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 3a2a860dfdca..2b08a27017dc 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index f0c75478c6a5..0c5c9a77222a 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -21,31 +21,24 @@ #include <vcl/errcode.hxx> #include <unotools/resmgr.hxx> -#include <basic/sbx.hxx> #include "sbxconv.hxx" #include <unotools/syslocale.hxx> #include <unotools/charclass.hxx> -#include <stdlib.h> - #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <math.h> -#include <string.h> -#include "sbxres.hxx" #include <sbxbase.hxx> #include <sbintern.hxx> -#include <basic/sbxfac.hxx> #include <basic/sbxform.hxx> #include <date.hxx> #include <runtime.hxx> #include <strings.hrc> -#include <rtl/strbuf.hxx> #include <rtl/character.hxx> #include <sal/log.hxx> #include <svl/zforlist.hxx> diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index 2e74a672bd8a..357b9cd10f5d 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index 196faaea558c..65fdb906daf9 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <vcl/errcode.hxx> #include <basic/sbx.hxx> #include "sbxconv.hxx" #include "sbxres.hxx" diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index 8a1aa458bc9c..f1c916bb1a58 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 23699ed3c2b7..14b37958bba2 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -21,7 +21,6 @@ #include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> -#include <basic/sbx.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 85aa19816af0..d18ada85791d 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <tools/debug.hxx> #include <tools/stream.hxx> #include <svl/SfxBroadcaster.hxx> @@ -28,7 +27,6 @@ #include "sbxres.hxx" #include "sbxconv.hxx" #include <sbunoobj.hxx> -#include <math.h> #include <rtl/character.hxx> #include <sal/log.hxx> diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index b9cbbcd42b9a..e066b000a078 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -25,10 +25,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStreamProvider.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/resource/StringResourceWithStorage.hpp> #include <com/sun/star/resource/StringResourceWithLocation.hpp> #include <com/sun/star/document/GraphicStorageHandler.hpp> @@ -36,13 +33,11 @@ #include <dlgcont.hxx> #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> -#include <unotools/streamwrap.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <unotools/pathoptions.hxx> #include <xmlscript/xmldlg_imexp.hxx> -#include <cppuhelper/factory.hxx> +#include <sot/storage.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <vcl/GraphicObject.hxx> diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 3f5840b51b06..179df9b3d009 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -33,29 +33,25 @@ #include <osl/mutex.hxx> #include <vcl/errinf.hxx> #include <rtl/ustring.hxx> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> +#include <sot/storage.hxx> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/sequence.hxx> #include <namecont.hxx> #include <basic/basicmanagerrepository.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> -#include <unotools/streamwrap.hxx> #include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/DeploymentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -68,7 +64,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> -#include <basic/sbmod.hxx> +#include <cppuhelper/typeprovider.hxx> #include <memory> namespace basic diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index e57909ea82f1..18f2dfd3baa0 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -18,16 +18,11 @@ */ #include <scriptcont.hxx> -#include <filefmt.hxx> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Writer.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess3.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEncryptionProtectedSource.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -36,26 +31,20 @@ #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/storagehelper.hxx> -#include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <osl/thread.h> -#include <rtl/digest.h> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> +#include <sot/storage.hxx> // For password functionality #include <tools/urlobj.hxx> -#include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> -#include <basic/basicmanagerrepository.hxx> #include <basic/modsizeexceeded.hxx> #include <xmlscript/xmlmod_imexp.hxx> -#include <cppuhelper/factory.hxx> #include <com/sun/star/util/VetoException.hpp> #include <memory> |