diff options
| author | August Sodora <augsod@gmail.com> | 2012-01-20 15:20:55 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2012-01-20 15:21:37 -0500 |
| commit | 81605eaafa4cd645ca92013120f8da0c753cdf42 (patch) | |
| tree | dc1509542da6e2c19423c74712470f31a128a95d /basic/inc | |
| parent | cce52394e979d02941e7f9f15f6706502a056800 (diff) | |
Replace BasicErrorManager with std::vector
Diffstat (limited to 'basic/inc')
| -rw-r--r-- | basic/inc/basic/basmgr.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index f5ac0aa968c4..04820ad5c8e3 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include "basicdllapi.h" +#include <vector> // Basic XML Import/Export BASIC_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::script::XStarBasicAccess > @@ -72,12 +73,10 @@ public: void SetErrorStr( const String& rStr) { aErrStr = rStr; } }; - - class BasicLibs; class ErrorManager; class BasicLibInfo; -class BasicErrorManager; + namespace basic { class BasicManagerCleaner; } // Library password handling for 5.0 documents @@ -127,7 +126,7 @@ class BASIC_DLLPUBLIC BasicManager : public SfxBroadcaster private: BasicLibs* pLibs; - BasicErrorManager* pErrorMgr; + std::vector<BasicError> aErrors; String aName; String maStorageName; @@ -140,7 +139,7 @@ private: protected: sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo ) const; - sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ) const; + sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ); void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); void ImpMgrNotLoaded( const String& rStorageName ); BasicLibInfo* CreateLibInfo(); @@ -198,9 +197,7 @@ public: sal_Bool IsModified() const; sal_Bool IsBasicModified() const; - sal_Bool HasErrors(); - BasicError* GetFirstError(); - BasicError* GetNextError(); + std::vector<BasicError>& GetErrors(); /** sets a global constant in the basic library, referring to some UNO object, to a new value. |