diff options
64 files changed, 4 insertions, 106 deletions
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index f182f15ba311..e82202a00768 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -26,7 +26,6 @@ #include "iderdll2.hxx" #include <basic/basmgr.hxx> -#include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> #include <sfx2/dispatch.hxx> #include <sfx2/passwd.hxx> diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 3f799fcdf106..ae09f3cecc0c 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -30,8 +30,6 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> -#include <com/sun/star/script/XLibraryContainer.hpp> - #include <memory> class Printer; diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 4e65c7a289fb..ada6d09d0bf9 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -35,11 +35,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/resource/XStringResourceSupplier.hpp> #include <com/sun/star/resource/XStringResourceManager.hpp> -#include <com/sun/star/script/XEventAttacher.hpp> -#include <com/sun/star/script/XAllListener.hpp> -#include <com/sun/star/script/XScriptEventsSupplier.hpp> -#include <com/sun/star/script/XScriptEventsAttacher.hpp> -#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 50528d4d1be3..f0da35932f92 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -57,7 +57,6 @@ #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/XDefaultMethod.hpp> #include <com/sun/star/script/XDirectInvocation.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 5222e6c9be90..c637478f7cd9 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -62,7 +62,6 @@ #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/script/XInvocation.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/awt/DialogProvider.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index cecbdcfbe1fa..a0617d498330 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -57,7 +57,6 @@ #include <xmlscript/xmlmod_imexp.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/util/VetoException.hpp> -#include <com/sun/star/script/XLibraryQueryExecutable.hpp> #include <memory> namespace basic diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 19328a73e498..e9341410a21d 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/reflection/XIdlMethod.hpp> #include <com/sun/star/script/CannotConvertException.hpp> #include <com/sun/star/script/Converter.hpp> -#include <com/sun/star/script/XEngineListener.hpp> #include <com/sun/star/script/XEventAttacher2.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/script/XScriptListener.hpp> diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 93e86d1bb437..64b9a3ee117b 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/theBrowseNodeFactory.hpp> #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp> -#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/ui/theUICategoryDescription.hpp> diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 3fb2fd68cb62..307b1093c20e 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 1bf5694c2d5d..3557e7a118ba 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/script/XTypeConverter.hpp> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/basemutex.hxx> #include <connectivity/sqliterator.hxx> diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 42c35400fd3f..85eb867d9eeb 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <boost/optional.hpp> using namespace ::dp_misc; diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index 06eb41823ef7..dae716a28d13 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/bridge/XBridgeSupplier2.hpp> #include <com/sun/star/bridge/ModelDependent.hpp> @@ -48,7 +47,6 @@ #define UNO_2_OLE_EXCEPTIONCODE 1001 using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::script; using namespace com::sun::star::registry; using namespace com::sun::star::reflection; using namespace com::sun::star::beans; diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 43fc37670a53..e074a238756c 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -29,17 +29,7 @@ #include <com/sun/star/script/CannotConvertException.hpp> #include <com/sun/star/script/FailReason.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> -#include <com/sun/star/script/XTypeConverter.hpp> -#include <com/sun/star/script/FinishEngineEvent.hpp> -#include <com/sun/star/script/InterruptReason.hpp> -#include <com/sun/star/script/XEngineListener.hpp> -#include <com/sun/star/script/XDebugging.hpp> #include <com/sun/star/script/XInvocation.hpp> -#include <com/sun/star/script/ContextInformation.hpp> -#include <com/sun/star/script/FinishReason.hpp> -#include <com/sun/star/script/XEngine.hpp> -#include <com/sun/star/script/InterruptEngineEvent.hpp> -#include <com/sun/star/script/XLibraryAccess.hpp> #include <com/sun/star/bridge/ModelDependent.hpp> #include "com/sun/star/bridge/oleautomation/NamedArgument.hpp" diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index d74d3e915bf6..12b5c30f833d 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -36,7 +36,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/form/XForm.hpp> -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/frame/XController.hpp> diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index edff69b3c286..192523d3412c 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/bridge/ModelDependent.hpp> #include <com/sun/star/bridge/XBridgeSupplier2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <oletest/XCallback.hpp> #include <rtl/process.h> #include <cppuhelper/servicefactory.hxx> @@ -37,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; -using namespace com::sun::star::script; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::ModelDependent; using namespace cppu; diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 4f46a2dd3ce7..58cfa088b24d 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -45,7 +45,6 @@ #include <com/sun/star/form/XLoadListener.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index db074cb54d86..97ebcdddc056 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -22,7 +22,7 @@ #include <vcl/errinf.hxx> #include <svl/SfxBroadcaster.hxx> #include <basic/sbstar.hxx> -#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> +#include <com/sun/star/script/XPersistentLibraryContainer.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <basic/basicdllapi.h> #include <memory> diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 14abb9ba76b3..f3c916c28b1e 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 2a330a2cc6e4..754408ba94f7 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -44,7 +44,6 @@ #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index f322098e35de..55ea2a32781c 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -22,7 +22,6 @@ #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> diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 33727621a9ee..163f4a1078e7 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -27,7 +27,6 @@ #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> diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 458cbb9e13a8..eee4523d6989 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -20,7 +20,6 @@ #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> diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index c70876891a18..e933cc57da59 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -22,7 +22,6 @@ #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> diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 95744d0a67bf..ce5f6656ef4c 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -26,9 +26,6 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> -#include <com/sun/star/script/ScriptEvent.hpp> -#include <com/sun/star/script/XScriptListener.hpp> -#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/ContainerEvent.hpp> #include <com/sun/star/report/XReportComponent.hpp> diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index b3dd2f550f2d..be3651aba776 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -50,7 +50,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/embed/XComponentSupplier.hpp> -#include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/report/XShape.hpp> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index aedab260613f..528eeb0a8172 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -30,7 +30,6 @@ #include "RptResId.hrc" #include "RptModel.hxx" -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 5f31cf8105ed..2a15451094a1 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -29,7 +29,6 @@ #include "RptResId.hrc" #include "RptModel.hxx" -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/theIntrospection.hpp> diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 5318401923a9..20c14353f4b1 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -39,7 +39,6 @@ namespace rptui using namespace ::com::sun::star; using namespace uno; using namespace lang; - using namespace script; using namespace beans; using namespace awt; using namespace util; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 050f59ea4f93..d5fb00c995ed 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -95,7 +95,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/script/ModuleInfo.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <cppuhelper/component_context.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 6d46da3922b8..edf0e6c803e3 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -52,7 +52,6 @@ #include <svx/xmlgrhlp.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/document/XCodeNameQuery.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 2223c804cbfe..170cc581d7ae 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/script/vba/VBAEventId.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/util/VetoException.hpp> #include <com/sun/star/view/DocumentZoomType.hpp> diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 98d928686f66..9bb86ab308c0 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <tools/color.hxx> diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index e86c799b050d..4d6f847a0491 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -24,7 +24,6 @@ #include <ooo/vba/excel/XVPageBreak.hpp> #include <ooo/vba/excel/XRange.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/sheet/TablePageBreakData.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <vbahelper/vbahelperinterface.hxx> diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index cf656d074128..58c217ada3d0 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -25,7 +25,6 @@ #include <ooo/vba/excel/XVPageBreak.hpp> #include <ooo/vba/excel/XRange.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/sheet/XSheetPageBreak.hpp> #include <com/sun/star/sheet/TablePageBreakData.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 73cd9de39ea5..cc63ead27f9a 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -34,8 +34,6 @@ #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> -#include <com/sun/star/script/XDefaultProperty.hpp> #include <com/sun/star/sheet/FillDateMode.hpp> #include <com/sun/star/sheet/FillMode.hpp> #include <com/sun/star/sheet/FillDirection.hpp> diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index a0cefaeb7982..6683265fdaf8 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -35,12 +35,6 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> -#include <com/sun/star/script/vba/VBAEventId.hpp> -#include <com/sun/star/script/vba/XVBACompatibility.hpp> -#include <com/sun/star/script/vba/XVBAEventProcessor.hpp> -#include <com/sun/star/script/vba/XVBAModuleInfo.hpp> -#include <com/sun/star/script/ModuleInfo.hpp> -#include <com/sun/star/script/ModuleType.hpp> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 3c7e8a3c2c76..9da55235419c 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -64,13 +64,6 @@ #include <comphelper/servicehelper.hxx> #include <vbahelper/vbashapes.hxx> -#include <com/sun/star/script/vba/VBAEventId.hpp> -#include <com/sun/star/script/vba/XVBACompatibility.hpp> -#include <com/sun/star/script/vba/XVBAEventProcessor.hpp> -#include <com/sun/star/script/vba/XVBAModuleInfo.hpp> -#include <com/sun/star/script/ModuleInfo.hpp> -#include <com/sun/star/script/ModuleType.hpp> - //zhangyun showdataform #include <sfx2/sfxdlg.hxx> #include "scabstdlg.hxx" diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index a1d8fa11f9ec..4b7ded3cc680 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -22,7 +22,6 @@ #include <comphelper/unwrapargs.hxx> #include <com/sun/star/sheet/XSpreadsheet.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <ooo/vba/excel/XWorksheet.hpp> #include <ooo/vba/excel/XComments.hpp> #include <ooo/vba/excel/XRange.hpp> diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 9a4aea9ef7b1..b1b89f1d563d 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -40,7 +40,6 @@ #include <basic/sbstar.hxx> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> #include "viewfunc.hxx" diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 6277bba85b3e..f6288debde61 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/resource/XStringResourceManager.hpp> -#include <com/sun/star/script/XScriptEventsAttacher.hpp> +#include <com/sun/star/script/XScriptListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index c107d287219f..b5d083353f0f 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/script/browse/BrowseNodeTypes.hpp> - #include "MasterScriptProvider.hxx" #include "ActiveMSPList.hxx" diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 0ce042baac07..1adbb7fe0d77 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> -#include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <comphelper/stl_types.hxx> diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 33b8dd538e89..773c210a7412 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp> +#include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <tools/diagnose_ex.h> diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index 45d0832f807c..d05e1094d97c 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> -#include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp> namespace browsenodefactory diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index adb8deeae931..7b29b4c98759 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 6e5cff3f70b2..2cbce59a353b 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 0d1f9cdc35d6..2631a1d7897e 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index e8cf1de1b547..db480caec1da 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::script; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index c3a44f524523..9c949ebfea9f 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::view; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::script; UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame ) : mxContext( rxContext ), diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 5c4179768d50..76db2f8d8fd6 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d6424c2d06ef..e81105991149 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -86,7 +86,6 @@ #include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <com/sun/star/script/provider/XScriptProviderFactory.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index ddb8cfb7098f..74a419b93c7f 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -37,17 +37,6 @@ #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> -#include <com/sun/star/script/XTypeConverter.hpp> -#include <com/sun/star/script/FinishEngineEvent.hpp> -#include <com/sun/star/script/InterruptReason.hpp> -#include <com/sun/star/script/XEngineListener.hpp> -#include <com/sun/star/script/XDebugging.hpp> -#include <com/sun/star/script/XInvocation.hpp> -#include <com/sun/star/script/ContextInformation.hpp> -#include <com/sun/star/script/FinishReason.hpp> -#include <com/sun/star/script/XEngine.hpp> -#include <com/sun/star/script/InterruptEngineEvent.hpp> -#include <com/sun/star/script/XLibraryAccess.hpp> #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index b2db04095cac..64dc24f9dfb1 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -27,7 +27,6 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/script/CannotConvertException.hpp> -#include <com/sun/star/script/FailReason.hpp> #include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/XInvocation2.hpp> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 00f6157064c2..c95c39856b8c 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -54,7 +54,6 @@ #include "fmshimp.hxx" #include <svx/fmpage.hxx> #include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 674c86ab04c8..c3064351a618 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -76,7 +76,6 @@ #include <com/sun/star/form/XFormsSupplier.hpp> #include <com/sun/star/script/ModuleInfo.hpp> #include <com/sun/star/script/ModuleType.hpp> -#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <vbahelper/vbaaccesshelper.hxx> #include <basic/basmgr.hxx> diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index d9376ed79d07..5385f8986b66 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexReplace.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/ColorMode.hpp> #include <com/sun/star/drawing/FillStyle.hpp> @@ -75,7 +76,6 @@ #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> #include <swtypes.hxx> #include <unomap.hxx> diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index afd4958e2aa6..da94a1097fe4 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -20,7 +20,6 @@ #include "vbalistbox.hxx" #include "vbanewfont.hxx" #include <comphelper/anytostring.hxx> -#include <com/sun/star/script/ArrayWrapper.hpp> #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> #include <ooo/vba/msforms/fmMultiSelect.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 846131ebdc79..23928cc91a83 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -52,7 +52,6 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/awt/XToolkit.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 996d9042c753..84f0d74092c5 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/i18n/Transliteration.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <helpcompiler/HelpSearch.hxx> diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index d14bce91d659..250f8204b5e6 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/form/XGridColumnFactory.hpp> -#include <com/sun/star/script/XEventAttacherManager.hpp> #include <osl/diagnose.h> class XMLTextStyleContext; diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 99350b79e9b6..e3384abaef84 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/xml/input/XRoot.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <osl/diagnose.h> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 70d0a492b415..c7045c391210 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/document/XGraphicObjectResolver.hpp> -#include <com/sun/star/script/vba/XVBACompatibility.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <sal/log.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index f5606ffe2d90..30fa4dbcaa9d 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -55,8 +55,6 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> -#include <com/sun/star/script/vba/XVBACompatibility.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> using namespace ::com::sun::star; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index f920903ce2cc..4cf57195c8d1 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -26,7 +26,6 @@ #include <xmlscript/xml_helper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/script/XLibraryContainerPassword.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <cppuhelper/implementationentry.hxx> |