diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-02-20 16:16:40 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-02-21 04:30:34 +0000 |
| commit | ccd0ef98f76011f108f8ea1d282b96386dba0a6a (patch) | |
| tree | b5122e4ee7e6eba503b3e65632de2ee299ee5905 /include/basic | |
| parent | 1a022fcbc8bf256eccccb04319aa3ecfc4a3c1b5 (diff) | |
tdf#153752: SbxObject::Execute: extra characters in Option Compatible mode
Change-Id: Ib3e4bd9eb9a249123a686f2434ded7b529fb050f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147345
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/basic')
| -rw-r--r-- | include/basic/sbmod.hxx | 10 | ||||
| -rw-r--r-- | include/basic/sbxobj.hxx | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index a71f7253a451..fac7f9e50121 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -66,7 +66,8 @@ protected: std::unique_ptr<SbiImage> pImage; // the Image SbiBreakpoints* pBreaks; // Breakpoints std::unique_ptr<SbClassData> pClassData; - bool mbVBACompat; + bool mbVBASupport; // Option VBASupport + bool mbCompat; // Option Compatible sal_Int32 mnType; SbxObjectRef pDocObject; // an impl object ( used by Document Modules ) bool bIsProxyModule; @@ -95,7 +96,7 @@ protected: virtual ~SbModule() override; public: SBX_DECL_PERSIST_NODATA(SBXID_BASICMOD,2); - SbModule( const OUString&, bool bCompat = false ); + SbModule( const OUString&, bool bVBASupport = false ); SAL_DLLPRIVATE virtual void SetParent( SbxObject* ) override; SAL_DLLPRIVATE virtual void Clear() override; @@ -120,8 +121,9 @@ public: SAL_DLLPRIVATE bool ExceedsLegacyModuleSize(); SAL_DLLPRIVATE void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = nullptr ) const; SAL_DLLPRIVATE bool HasExeCode(); - bool IsVBACompat() const { return mbVBACompat;} - SAL_DLLPRIVATE void SetVBACompat( bool bCompat ); + bool IsVBASupport() const { return mbVBASupport; } + SAL_DLLPRIVATE void SetVBASupport( bool bSupport ); + bool IsCompatible() const { return mbCompat; } sal_Int32 GetModuleType() const { return mnType; } void SetModuleType( sal_Int32 nType ) { mnType = nType; } bool isProxyModule() const { return bIsProxyModule; } diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 10d4c074c423..34c117d33853 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -78,6 +78,9 @@ public: SbxArray* GetObjects() { return pObjs.get(); } // Debugging void Dump( SvStream&, bool bDumpAll ); + +private: + bool IsModuleCompatible() const; // Module's Option Compatible }; #endif // INCLUDED_BASIC_SBXOBJ_HXX |