diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-09 13:06:03 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-09 14:18:25 +0100 |
| commit | 62f3f3d92aa204eaaa063b30d7ade44df501b997 (patch) | |
| tree | b241ad744abad62cf898947757e88617811b309c /include | |
| parent | 6303f8ac291233b1f6888a8d71e769debe0f9fb0 (diff) | |
SbxArray: drop 16-bit indices
Change-Id: I43b478187636b9bb53fdf7ab938436ae364bd7a7
Reviewed-on: https://gerrit.libreoffice.org/84733
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basic/sbx.hxx | 31 | ||||
| -rw-r--r-- | include/basic/sbxobj.hxx | 2 |
2 files changed, 8 insertions, 25 deletions
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 2cdf24117001..51cd516b53e0 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -113,25 +113,18 @@ public: SbxArray( const SbxArray& ) = delete; SbxArray& operator=( const SbxArray& ); virtual void Clear() override; - sal_uInt16 Count() const; - virtual SbxDataType GetType() const override; - SbxVariableRef& GetRef( sal_uInt16 ); - SbxVariable* Get( sal_uInt16 ); - void Put( SbxVariable*, sal_uInt16 ); - void Insert( SbxVariable*, sal_uInt16 ); - void Remove( SbxVariable const * ); - void Merge( SbxArray* ); - OUString GetAlias( sal_uInt16 ); - void PutAlias( const OUString&, sal_uInt16 ); - SbxVariable* Find( const OUString&, SbxClassType ); - - // Additional methods for 32-bit indices sal_uInt32 Count32() const; + virtual SbxDataType GetType() const override; SbxVariableRef& GetRef32( sal_uInt32 ); SbxVariable* Get32( sal_uInt32 ); void Put32( SbxVariable*, sal_uInt32 ); void Insert32( SbxVariable*, sal_uInt32 ); void Remove( sal_uInt32 ); + void Remove( SbxVariable const * ); + void Merge( SbxArray* ); + OUString GetAlias32( sal_uInt32 ); + void PutAlias32( const OUString&, sal_uInt32 ); + SbxVariable* Find( const OUString&, SbxClassType ); }; // SbxDimArray is an array that can dimensioned using BASIC conventions. @@ -146,7 +139,6 @@ class BASIC_DLLPUBLIC SbxDimArray final : public SbxArray BASIC_DLLPRIVATE void AddDimImpl32( sal_Int32, sal_Int32, bool bAllowSize0 ); bool mbHasFixedSize; - sal_uInt16 Offset( const short* ); sal_uInt32 Offset32( const sal_Int32* ); sal_uInt32 Offset32( SbxArray* ); virtual bool LoadData( SvStream&, sal_uInt16 ) override; @@ -158,23 +150,14 @@ public: SbxDimArray( const SbxDimArray& ) = delete; SbxDimArray& operator=( const SbxDimArray& ); virtual void Clear() override; - using SbxArray::GetRef; - using SbxArray::Get; - SbxVariable* Get( const short* ); - using SbxArray::Put; - void Put( SbxVariable*, const short* ); SbxVariable* Get( SbxArray* ); - short GetDims() const { return m_vDimensions.size();} - void AddDim( short, short ); - void unoAddDim( short, short ); - bool GetDim( short, short&, short& ) const; - using SbxArray::GetRef32; using SbxArray::Get32; SbxVariable* Get32( const sal_Int32* ); using SbxArray::Put32; void Put32( SbxVariable*, const sal_Int32* ); + sal_Int32 GetDims32() const { return m_vDimensions.size(); } void AddDim32( sal_Int32, sal_Int32 ); void unoAddDim32( sal_Int32, sal_Int32 ); bool GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const; diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 7ad0953ae500..10d4c074c423 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -29,7 +29,7 @@ class SbxProperty; class BASIC_DLLPUBLIC SbxObject : public SbxVariable, public SfxListener { - BASIC_DLLPRIVATE SbxArray* FindVar( SbxVariable const *, sal_uInt16& ); + BASIC_DLLPRIVATE SbxArray* FindVar( SbxVariable const *, sal_uInt32& ); protected: SbxArrayRef pMethods; // Methods SbxArrayRef pProps; // Properties |