diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2018-01-14 19:12:30 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-16 14:46:42 +0200 |
| commit | f2dd38e8aeb7501a5855950d40ddc1818725ff92 (patch) | |
| tree | 65ecb78a4c50423606751c018c7f8b9d0e6fba9b | |
| parent | 1e6f6234ff9a6d8473549b2d6f08cca8f19a9dcd (diff) | |
Return correct length for Authority token
Regression from f4fd558ac9d61fe06aa0f56d829916ef9e5ee7b9
Take the chance to calculate token prefix just once.
Change-Id: I19ce5cb037198cb918e79c760a92b285f9b725f1
(cherry picked from commit 34b98af8e5a4e568d8316700bea1ce604d825ce8)
Reviewed-on: https://gerrit.libreoffice.org/52621
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit c6e8460a5b47fa6fa971dde2a89e80662b6e97ae)
Reviewed-on: https://gerrit.libreoffice.org/52626
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit df041d902eafb1e273eb360103252994bbd2cde2)
| -rw-r--r-- | sw/source/core/tox/tox.cxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index a0fd74689201..4536e02c59b1 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -659,30 +659,29 @@ static FormTokenType lcl_GetTokenType(const OUString & sToken, { static struct { - OUString sNm; - sal_uInt16 nOffset; - FormTokenType eToken; + OUString sTokenStart; + sal_Int16 nTokenLength; + FormTokenType eTokenType; } const aTokenArr[] = { - { SwForm::GetFormTab(), 1, TOKEN_TAB_STOP }, - { SwForm::GetFormPageNums(), 1, TOKEN_PAGE_NUMS }, - { SwForm::GetFormLinkStt(), 1, TOKEN_LINK_START }, - { SwForm::GetFormLinkEnd(), 1, TOKEN_LINK_END }, - { SwForm::GetFormEntryNum(), 1, TOKEN_ENTRY_NO }, - { SwForm::GetFormEntryText(), 1, TOKEN_ENTRY_TEXT }, - { SwForm::GetFormChapterMark(), 1, TOKEN_CHAPTER_INFO }, - { SwForm::GetFormText(), 1, TOKEN_TEXT }, - { SwForm::GetFormEntry(), 1, TOKEN_ENTRY }, - { SwForm::GetFormAuth(), 3, TOKEN_AUTHORITY } + { SwForm::GetFormTab().copy(0, 2), 3, TOKEN_TAB_STOP }, + { SwForm::GetFormPageNums().copy(0, 2), 3, TOKEN_PAGE_NUMS }, + { SwForm::GetFormLinkStt().copy(0, 3), 4, TOKEN_LINK_START }, + { SwForm::GetFormLinkEnd().copy(0, 3), 4, TOKEN_LINK_END }, + { SwForm::GetFormEntryNum().copy(0, 3), 4, TOKEN_ENTRY_NO }, + { SwForm::GetFormEntryText().copy(0, 3), 4, TOKEN_ENTRY_TEXT }, + { SwForm::GetFormChapterMark().copy(0, 2), 3, TOKEN_CHAPTER_INFO }, + { SwForm::GetFormText().copy(0, 2), 3, TOKEN_TEXT }, + { SwForm::GetFormEntry().copy(0, 2), 3, TOKEN_ENTRY }, + { SwForm::GetFormAuth().copy(0, 2), 5, TOKEN_AUTHORITY } }; for(const auto & i : aTokenArr) { - const sal_Int32 nLen(i.sNm.getLength()); - if( sToken.startsWith( i.sNm.copy(0, nLen - i.nOffset) )) + if( sToken.startsWith( i.sTokenStart ) ) { if (pTokenLen) - *pTokenLen = nLen; - return i.eToken; + *pTokenLen = i.nTokenLength; + return i.eTokenType; } } |