diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-21 09:57:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-21 13:53:17 +0100 |
| commit | 585328a7136aaa4b98b9cac0355a2cd7e9078dec (patch) | |
| tree | 28fd94cd6ecaf484de8deec5cb404149666e1654 /starmath/inc | |
| parent | 10e73684468a811acae56dfeafc8ecb5876a7960 (diff) | |
ofz#4703 Direct-leak
Change-Id: I5f3385d87aa5a48a8df3b6774dd1166cec60ebf8
Reviewed-on: https://gerrit.libreoffice.org/46893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/node.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 0abc3736111a..260eec9e8943 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -122,9 +122,9 @@ public: */ virtual bool IsVisible() const = 0; - virtual sal_uInt16 GetNumSubNodes() const = 0; - virtual SmNode * GetSubNode(sal_uInt16 nIndex) = 0; - const SmNode * GetSubNode(sal_uInt16 nIndex) const + virtual size_t GetNumSubNodes() const = 0; + virtual SmNode * GetSubNode(size_t nIndex) = 0; + const SmNode * GetSubNode(size_t nIndex) const { return const_cast<SmNode *>(this)->GetSubNode(nIndex); } @@ -231,10 +231,10 @@ public: virtual bool IsVisible() const override; - virtual sal_uInt16 GetNumSubNodes() const override; + virtual size_t GetNumSubNodes() const override; using SmNode::GetSubNode; - virtual SmNode * GetSubNode(sal_uInt16 nIndex) override; + virtual SmNode * GetSubNode(size_t nIndex) override; void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = nullptr); void SetSubNodes(const SmNodeArray &rNodeArray); @@ -251,9 +251,9 @@ public: */ int IndexOfSubNode(SmNode const * pSubNode) { - sal_uInt16 nSize = GetNumSubNodes(); - for(sal_uInt16 i = 0; i < nSize; i++) - if(pSubNode == GetSubNode(i)) + size_t nSize = GetNumSubNodes(); + for (size_t i = 0; i < nSize; i++) + if (pSubNode == GetSubNode(i)) return i; return -1; } @@ -294,9 +294,9 @@ protected: public: virtual bool IsVisible() const override; - virtual sal_uInt16 GetNumSubNodes() const override; + virtual size_t GetNumSubNodes() const override; using SmNode::GetSubNode; - virtual SmNode * GetSubNode(sal_uInt16 nIndex) override; + virtual SmNode * GetSubNode(size_t nIndex) override; }; @@ -859,7 +859,7 @@ public: /** Get super- or subscript * @remarks this method may return NULL. */ - SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode( sal::static_int_cast< sal_uInt16 >(1 + eSubSup) ); }; + SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode(1 + eSubSup); }; const SmNode * GetSubSup(SmSubSup eSubSup) const { return const_cast< SmSubSupNode* >( this )->GetSubSup( eSubSup ); } /** Set the body */ |