diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-14 09:29:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-14 10:44:52 +0200 |
| commit | d296a0a271bcce56e15c4d8a577d4e0d368f7533 (patch) | |
| tree | 72ac6031e9fd32a35efd8618dbfd9330a66b63a4 /editeng/source | |
| parent | 900ba7d24e1bfa7e9a2abcb7cb410261f680155a (diff) | |
Use more appropriate return type for some editeng functions
...whose return values are OUString-length related:
* ContentNode::GetExpandedLen from sal_uLong to sal_Int32
* EditDoc::GetTextLen from sal_uLong to sal_Int32
* EditEngine::GetTextLen from sal_uInt32 to sal_Int32
Change-Id: Ia5156e247906728e2130b321af15cda7669108ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123576
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 10 | ||||
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index f04edc314abb..4539b3cd44dc 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1584,9 +1584,9 @@ sal_Int32 ContentNode::Len() const return maString.getLength(); } -sal_uLong ContentNode::GetExpandedLen() const +sal_Int32 ContentNode::GetExpandedLen() const { - sal_uLong nLen = maString.getLength(); + sal_Int32 nLen = maString.getLength(); // Fields can be longer than the placeholder in the Node const CharAttribList::AttribsType& rAttrs = GetCharAttribs().GetAttribs(); @@ -2127,7 +2127,7 @@ OUString EditDoc::GetText( LineEnd eEnd ) const const OUString aSep = EditDoc::GetSepStr( eEnd ); const sal_Int32 nSepSize = aSep.getLength(); - const sal_uInt32 nLen = GetTextLen() + (nNodes - 1)*nSepSize; + const sal_Int32 nLen = GetTextLen() + (nNodes - 1)*nSepSize; OUStringBuffer aBuffer(nLen + 16); // leave some slack @@ -2166,9 +2166,9 @@ EditPaM EditDoc::GetEndPaM() const return EditPaM( pLastNode, pLastNode->Len() ); } -sal_uLong EditDoc::GetTextLen() const +sal_Int32 EditDoc::GetTextLen() const { - sal_uLong nLen = 0; + sal_Int32 nLen = 0; for ( sal_Int32 nNode = 0; nNode < Count(); nNode++ ) { const ContentNode* pNode = GetObject( nNode ); diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index c2a1537c6bbe..f7c125cc2bca 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -580,7 +580,7 @@ OUString EditEngine::GetText( const ESelection& rESelection ) const return pImpEditEngine->GetSelected( aSel ); } -sal_uInt32 EditEngine::GetTextLen() const +sal_Int32 EditEngine::GetTextLen() const { return pImpEditEngine->GetEditDoc().GetTextLen(); } |