diff options
| author | Arnaud Versini <arnaud.versini@libreoffice.org> | 2020-12-31 16:05:46 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-02 15:29:53 +0100 |
| commit | 60ac2acd4cd1722fe12c3a7753db9b0519a8b7db (patch) | |
| tree | 80bacac95986dae0db78641a962e91c0cbfb7efc /include/basic | |
| parent | edc7a8a372a689802a583092ff0da0f60b6dbf97 (diff) | |
BASIC : simplify SbxVariable constructors and remove impl class
Change-Id: Iff37e71389594b313a3a3d12998dbbdbf0c85d05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108539
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/basic')
| -rw-r--r-- | include/basic/sbxvar.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 487b910aac84..342ba8c33583 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -24,6 +24,8 @@ #include <rtl/ustring.hxx> #include <basic/sbxcore.hxx> #include <basic/basicdllapi.h> +#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <algorithm> #include <cstddef> @@ -32,8 +34,6 @@ namespace com::sun::star::bridge::oleautomation { struct Decimal; } -namespace com::sun::star::uno { class XInterface; } -namespace com::sun::star::uno { template <typename > class Reference; } class SbxDecimal; enum class SfxHintId; @@ -243,18 +243,18 @@ class BASIC_DLLPUBLIC SbxVariable : public SbxValue { friend class SbMethod; - std::unique_ptr<SbxVariableImpl> mpImpl; // Impl data + OUString m_aDeclareClassName; + css::uno::Reference< css::uno::XInterface > m_xComListener; + StarBASIC* m_pComListenerParentBasic = nullptr; std::unique_ptr<SfxBroadcaster> mpBroadcaster; // Broadcaster, if needed OUString maName; // Name, if available SbxArrayRef mpPar; // Parameter-Array, if set - sal_uInt16 nHash; // Hash-ID for search - - BASIC_DLLPRIVATE SbxVariableImpl* getImpl(); + sal_uInt16 nHash = 0; // Hash-ID for search protected: SbxInfoRef pInfo; // Probably called information - sal_uInt32 nUserData; // User data for Call() - SbxObject* pParent; // Currently attached object + sal_uInt32 nUserData= 0; // User data for Call() + SbxObject* pParent = nullptr; // Currently attached object virtual ~SbxVariable() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; |