diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2022-12-07 22:21:09 +0200 |
|---|---|---|
| committer | خالد حسني <khaled@aliftype.com> | 2022-12-07 23:30:55 +0000 |
| commit | f6935ce552ed625281104a10695de977a131b477 (patch) | |
| tree | f6fb8905c0ae016c7db2686fe66e55225a6f6d31 /sw/source | |
| parent | d327a3bf45808fc7575b7fffa681314e50b0adf8 (diff) | |
tdf#152413: Revert "tdf#67669 - Make narrow no-break space visible by drawing
... a gray background"
This is breaking text layout involving Narrow No-Break Space because now
it goes into a portion of its own and gets laid out independent of the
surrounding text.
Lets revert this until we have a way to highlight text without breaking
text layout (e.g. tdf#61444).
This reverts:
commit bbb57e8198863ee7bdadd3f2aac4420c08da94a3
Author: Andreas Heinisch <andreas.heinisch@yahoo.de>
Date: Wed Jul 27 08:53:11 2022 +0200
tdf#67669 - Make narrow no-break space visible by drawing a gray background
and its followup commit:
commit 01e3c998e63fbf456e7f624adb1cae3d89ed7bb2
Author: Andreas Heinisch <andreas.heinisch@yahoo.de>
Date: Mon Aug 22 23:02:48 2022 +0200
tdf#67669 - Make narrow no-break space visible by drawing a gray background
Change-Id: I040a4f17d51cfea4f1e9bdcd3bc14a3bfc56b245
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143802
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/porfld.cxx | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index bdb40ac74d01..737b6b3b2700 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1678,7 +1678,6 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, case CHAR_SOFTHYPHEN: case CHAR_HARDHYPHEN: - case CHAR_NNBSP: case CHAR_HARDBLANK: case CH_TAB: case CH_BREAK: diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index db66d59913d5..9f075014fd9a 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1699,8 +1699,6 @@ SwLinePortion *SwTextFormatter::NewPortion(SwTextFormatInfo &rInf, case CHAR_SOFTHYPHEN: // soft hyphen pPor = new SwSoftHyphPortion; break; - // tdf#67669 - make narrow no-break space visible by drawing a gray background - case CHAR_NNBSP: // narrow no-break space case CHAR_HARDBLANK: // no-break space // Please check tdf#115067 if you want to edit the char pPor = new SwBlankPortion( cChar ); break; diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 146d0b9f76df..5b266b3308e6 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -398,7 +398,6 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf ) case CH_TAB : case CHAR_HARDHYPHEN: // non-breaking hyphen case CHAR_SOFTHYPHEN: - case CHAR_NNBSP: case CHAR_HARDBLANK: case CHAR_ZWSP : case CHAR_WJ : |