From b1cbc2e27a5a5434ca8097fa7586912cf0b857c4 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Mar 2021 10:47:39 +0100 Subject: 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 Reviewed-by: Julien Nabet --- sd/source/ui/func/fubullet.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 02997740e067..296a09ce3298 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -50,7 +50,7 @@ const sal_Unicode CHAR_SOFTHYPHEN = u'\x00AD'; const sal_Unicode CHAR_RLM = u'\x200F'; const sal_Unicode CHAR_LRM = u'\x200E'; const sal_Unicode CHAR_ZWSP = u'\x200B'; -const sal_Unicode CHAR_ZWNBSP = u'\x2060'; +const sal_Unicode CHAR_WJ = u'\x2060'; const sal_Unicode CHAR_NNBSP = u'\x202F'; //NARROW NO-BREAK SPACE @@ -87,7 +87,7 @@ void FuBullet::DoExecute( SfxRequest& rReq ) case SID_INSERT_RLM : cMark = CHAR_RLM ; break; case SID_INSERT_LRM : cMark = CHAR_LRM ; break; case SID_INSERT_ZWSP : cMark = CHAR_ZWSP ; break; - case SID_INSERT_ZWNBSP: cMark = CHAR_ZWNBSP; break; + case SID_INSERT_WJ: cMark = CHAR_WJ; break; } DBG_ASSERT( cMark != 0, "FuBullet::FuBullet(), illegal slot used!" ); @@ -286,7 +286,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, Sfx SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_NNBSP ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_INSERT_RLM ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_INSERT_LRM ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_INSERT_ZWNBSP ) || + SfxItemState::DEFAULT == rSet.GetItemState( SID_INSERT_WJ ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_INSERT_ZWSP ))) return; @@ -304,7 +304,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, Sfx rSet.DisableItem(FN_INSERT_HARDHYPHEN); rSet.DisableItem(FN_INSERT_HARD_SPACE); rSet.DisableItem(FN_INSERT_NNBSP); - rSet.DisableItem(SID_INSERT_ZWNBSP); + rSet.DisableItem(SID_INSERT_WJ); rSet.DisableItem(SID_INSERT_ZWSP); } -- cgit