diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-02-03 12:19:25 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-02-03 12:19:25 +0100 |
| commit | 7ce87234ca470fe1dc6668ff221300c703b535d8 (patch) | |
| tree | 40c18479f7ca90514c779f6d1b2efa9a7ed87457 /sfx2/source/appl/app.cxx | |
| parent | 38bb869fa8db331b62853f2b2759ac4b8bedf781 (diff) | |
| parent | a1a2a5a68046e75aba3dfd6ba06083a314f12182 (diff) | |
merge from master
Diffstat (limited to 'sfx2/source/appl/app.cxx')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 727d9f17c493..303586762ac2 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -41,6 +41,8 @@ #include <tools/simplerm.hxx> #include <tools/config.hxx> #include <basic/basrdll.hxx> +#include <basic/sbmeth.hxx> +#include <basic/sbmod.hxx> #include <svtools/asynclink.hxx> #include <svl/stritem.hxx> #include <vcl/sound.hxx> @@ -375,6 +377,8 @@ SfxApplication::SfxApplication() SfxApplication::~SfxApplication() { + OSL_ENSURE( GetObjectShells_Impl().Count() == 0, "Memory leak: some object shells were not removed!" ); + Broadcast( SfxSimpleHint(SFX_HINT_DYING) ); SfxModule::DestroyModules_Impl(); @@ -829,3 +833,7 @@ void SfxApplication::MacroOrganizer( INT16 nTabId ) pSymbol( nTabId ); } +ErrCode SfxApplication::CallBasic( const String& rCode, BasicManager* pMgr, SbxArray* pArgs, SbxValue* pRet ) +{ + return pMgr->ExecuteMacro( rCode, pArgs, pRet); +} |