diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2015-12-19 15:18:01 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-07 12:18:40 +0000 |
| commit | 5e0d36adc3f7f245edfc79230d0871017ba15d5d (patch) | |
| tree | b26f52373a20adb65041a79da23803503abad030 /include | |
| parent | a8b10c2841bf38e0f4393594de9b61d9bd3cd842 (diff) | |
BASIC : use std::vector instead of SbArray for Modules.
Change-Id: I9594efb13b3dccc637ccd61eea4b42255c2a775c
Reviewed-on: https://gerrit.libreoffice.org/20817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basic/sbmod.hxx | 1 | ||||
| -rw-r--r-- | include/basic/sbstar.hxx | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index 5dfe5f0e0c4b..95e1bdb043e3 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -136,6 +136,7 @@ public: }; typedef tools::SvRef<SbModule> SbModuleRef; +typedef std::vector<SbModuleRef> SbModules; // Object class for instances of class modules class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 8c02be3a8e01..0f59a5c8272b 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -22,6 +22,7 @@ #include <basic/sbx.hxx> #include <basic/sbxobj.hxx> +#include <basic/sbmod.hxx> #include <rtl/ustring.hxx> #include <osl/mutex.hxx> #include <tools/link.hxx> @@ -32,7 +33,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <basic/basicdllapi.h> -class SbModule; // completed module class SbiInstance; // runtime instance class SbiRuntime; // currently running procedure class SbiImage; // compiled image @@ -49,7 +49,7 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject friend class SbiRuntime; friend class DocBasicItem; - SbxArrayRef pModules; // List of all modules + SbModules pModules; // List of all modules SbxObjectRef pRtl; // Runtime Library SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener @@ -117,7 +117,7 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) override; virtual bool Call( const OUString&, SbxArray* = nullptr ) override; - SbxArray* GetModules() { return pModules; } + SbModules& GetModules() { return pModules; } SbxObject* GetRtl() { return pRtl; } SbModule* FindModule( const OUString& ); // Run init code of all modules (including the inserted Doc-Basics) |