diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-03-06 10:47:39 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-03-08 08:57:23 +0100 |
| commit | b1cbc2e27a5a5434ca8097fa7586912cf0b857c4 (patch) | |
| tree | b2a2c7a273f5d4c9a0992225dfb7a610eda006e4 /sw/source/core/text | |
| parent | 486258be7950e06cacbb3ae403129b57e3625995 (diff) | |
tdf#140796: Wrong English string for U+2060 character
Rename "No-width No ~Break" to "Word ~Joiner"
+ replace pattern "ZWNBSP" variable names by "WJ"
Change-Id: I95a874a9d2d20a30d2c4c3add6041adbe72d872c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112055
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw/source/core/text')
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/porfld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/porrst.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 33ff09ea339a..bb63a36ae157 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1664,7 +1664,7 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, case CH_TAB: case CH_BREAK: case CHAR_ZWSP : - case CHAR_ZWNBSP : + case CHAR_WJ : m_cHookChar = cPos; return i; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 2d2ec84a1eed..d35159f12d84 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1407,7 +1407,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf ) pPor = new SwBlankPortion( '-' ); break; case CHAR_ZWSP: // zero width space - case CHAR_ZWNBSP : // word joiner + case CHAR_WJ : // word joiner pPor = new SwControlCharPortion( cChar ); break; case CH_TXTATR_BREAKWORD: diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 6348ea44fbf9..fdb2e4442916 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -391,7 +391,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf ) case CHAR_SOFTHYPHEN: case CHAR_HARDBLANK: case CHAR_ZWSP : - case CHAR_ZWNBSP : + case CHAR_WJ : case CH_TXTATR_BREAKWORD: case CH_TXTATR_INWORD: { diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index ed2a46ff528a..7097bcd90f9d 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -552,7 +552,7 @@ bool SwHiddenTextPortion::Format( SwTextFormatInfo &rInf ) bool SwControlCharPortion::DoPaint(SwTextPaintInfo const&, OUString & rOutString, SwFont & rTmpFont, int &) const { - if (mcChar == CHAR_ZWNBSP || !SwViewOption::IsFieldShadings()) + if (mcChar == CHAR_WJ || !SwViewOption::IsFieldShadings()) { return false; } |