include/svx/svxids.hrc | 2 +-
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 4
++--
sc/inc/global.hxx | 2 +-
sc/sdi/editsh.sdi | 2 +-
sc/source/ui/view/editsh.cxx | 4
++--
sc/source/ui/view/output2.cxx | 2 +-
sc/uiconfig/scalc/menubar/menubar.xml | 2 +-
sc/uiconfig/scalc/ui/notebookbar.ui | 4
++--
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 4
++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 4
++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 4
++--
sd/sdi/ViewShellBase.sdi | 2 +-
sd/sdi/_drvwsh.sdi | 2 +-
sd/sdi/outlnvsh.sdi | 2 +-
sd/source/ui/func/fubullet.cxx | 8
++++----
sd/source/ui/view/drviews2.cxx | 2 +-
sd/source/ui/view/outlnvs2.cxx | 2 +-
sd/uiconfig/sdraw/menubar/menubar.xml | 2 +-
sd/uiconfig/sdraw/ui/notebookbar.ui | 4
++--
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 4
++--
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 4
++--
sd/uiconfig/simpress/menubar/menubar.xml | 2 +-
sd/uiconfig/simpress/ui/notebookbar.ui | 4
++--
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 8
++++----
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 4
++--
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 4
++--
svx/sdi/svx.sdi | 2 +-
sw/inc/swtypes.hxx | 2 +-
sw/sdi/_textsh.sdi | 2 +-
sw/sdi/annotsh.sdi | 2 +-
sw/sdi/drwtxtsh.sdi | 2 +-
sw/source/core/text/inftxt.cxx | 2 +-
sw/source/core/text/itrform2.cxx | 2 +-
sw/source/core/text/porfld.cxx | 2 +-
sw/source/core/text/porrst.cxx | 2 +-
sw/source/uibase/shells/annotsh.cxx | 4
++--
sw/source/uibase/shells/drwtxtsh.cxx | 4
++--
sw/source/uibase/shells/textsh.cxx | 4
++--
sw/uiconfig/sglobal/menubar/menubar.xml | 2 +-
sw/uiconfig/sweb/menubar/menubar.xml | 2 +-
sw/uiconfig/swform/menubar/menubar.xml | 2 +-
sw/uiconfig/swreport/menubar/menubar.xml | 2 +-
sw/uiconfig/swriter/menubar/menubar.xml | 2 +-
sw/uiconfig/swriter/ui/notebookbar.ui | 4
++--
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 4
++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4
++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 4
++--
sw/uiconfig/swxform/menubar/menubar.xml | 2 +-
48 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit b1cbc2e27a5a5434ca8097fa7586912cf0b857c4
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Mar 6 10:47:39 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Mar 8 08:57:23 2021 +0100
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.tie...@documentfoundation.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 7b2b802bf8f1..0627c29e1500 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -876,7 +876,7 @@ class SdrAngleItem;
#define SID_INSERT_RLM ( SID_SVX_START + 1056
) /* insert RLM - right to left mark */
#define SID_INSERT_LRM ( SID_SVX_START + 1057
) /* insert LRM - left to right mark */
#define SID_INSERT_ZWSP ( SID_SVX_START + 1058
) /* insert ZWJ - invisible space, keep words together*/
-#define SID_INSERT_ZWNBSP ( SID_SVX_START + 1059
) /* insert ZWNJ - invisible space, forces linebreak*/
+#define SID_INSERT_WJ ( SID_SVX_START + 1059
) /* insert WJ - Word Joiner */
#define SID_OPTIONS_DATABASES ( SID_SVX_START + 1060
)
#define SID_OPEN_SMARTTAGMENU ( SID_SVX_START + 1061
)
// (SID_SVX_START + 1062) is in include/sfx2/sfxsids.hrc
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 36388e2c100b..6165cd8d0b61 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6946,9 +6946,9 @@ bit 3 (0x8): #define
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:InsertZWNBSP" oor:op="replace">
+ <node oor:name=".uno:InsertWJ" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">No-width No ~Break</value>
+ <value xml:lang="en-US">Word ~Joiner</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 0a510bf0aad6..62deb7afbec9 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -68,7 +68,7 @@ const sal_Unicode CHAR_ZWSP = 0x200B;
const sal_Unicode CHAR_LRM = 0x200E;
const sal_Unicode CHAR_RLM = 0x200F;
const sal_Unicode CHAR_NBHY = 0x2011;
-const sal_Unicode CHAR_ZWNBSP = 0x2060;
+const sal_Unicode CHAR_WJ = 0x2060;
const sal_Unicode CHAR_NNBSP = 0x202F; //NARROW NO-BREAK SPACE
#define MINDOUBLE 1.7e-307
diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi
index ee9cf7a87c5e..2b755aac6ba0 100644
--- a/sc/sdi/editsh.sdi
+++ b/sc/sdi/editsh.sdi
@@ -97,7 +97,7 @@ interface TableText
SID_INSERT_RLM [ ExecMethod = Execute; StateMethod =
GetState; ]
SID_INSERT_LRM [ ExecMethod = Execute; StateMethod =
GetState; ]
SID_INSERT_ZWSP [ ExecMethod = Execute; StateMethod =
GetState; ]
- SID_INSERT_ZWNBSP [ ExecMethod = Execute; StateMethod =
GetState; ]
+ SID_INSERT_WJ [ ExecMethod = Execute; StateMethod =
GetState; ]
SID_INSERT_FIELD_SHEET [ ExecMethod = Execute; StateMethod = GetState; ]
SID_INSERT_FIELD_TITLE [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7e22423f28a5..4a7ed8e09415 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -670,8 +670,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
case SID_INSERT_ZWSP:
lclInsertCharacter( pTableView, pTopView, CHAR_ZWSP );
break;
- case SID_INSERT_ZWNBSP:
- lclInsertCharacter( pTableView, pTopView, CHAR_ZWNBSP );
+ case SID_INSERT_WJ:
+ lclInsertCharacter( pTableView, pTopView, CHAR_WJ );
break;
case SID_INSERT_FIELD_SHEET:
{
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b3da99ca3d35..46f4bc0b3e0e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -831,7 +831,7 @@ bool ScDrawStringsVars::HasEditCharacters() const
case CHAR_LRM:
case CHAR_RLM:
case CHAR_NBHY:
- case CHAR_ZWNBSP:
+ case CHAR_WJ:
return true;
default:
break;
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index ee6527266192..e89e2b9836c9 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -264,7 +264,7 @@
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertNarrowNobreakSpace"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index e26a7aabb45e..798319c27bb0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -936,10 +936,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 3bbd0ca3d504..cd73177d0a91 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1164,10 +1164,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="InsertZWNBSPD">
+ <object class="GtkMenuItem" id="InsertWJD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index b598458ebfd5..069fa117ce7b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -1129,10 +1129,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuFormat-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuFormat-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index cc36b1f1b751..f841037fc426 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -1543,10 +1543,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuFormat-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuFormat-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 49cd28c51e88..f39368368f1d 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -132,7 +132,7 @@ interface ViewShellBaseView
ExecMethod = Execute ;
StateMethod = GetState ;
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 90e37f7f52fe..2307906426da 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -342,7 +342,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 8604eb725a26..3b34d20f1c76 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -181,7 +181,7 @@ interface OutlineView
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
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);
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 85feaa826954..950fdf5f15cc 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1555,7 +1555,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
- case SID_INSERT_ZWNBSP :
+ case SID_INSERT_WJ :
case SID_INSERT_ZWSP:
case SID_CHARMAP:
{
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 4acabdf2dbf7..5e9caef9e395 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -377,7 +377,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
- case SID_INSERT_ZWNBSP :
+ case SID_INSERT_WJ :
case SID_INSERT_ZWSP:
case SID_CHARMAP:
{
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index ae7b985daa47..d29f81fff0ff 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -222,7 +222,7 @@
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertNarrowNobreakSpace"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index c59fb2fb57e9..e7f25d54bc7b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1880,10 +1880,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP1">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index 4df8052634d3..03e251b2732a 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -1929,10 +1929,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuText-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuText-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 37b28c4e4cc9..f0578d2b4a5b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -1163,10 +1163,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="InsertZWNBSPD">
+ <object class="GtkMenuItem" id="InsertWJD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 3913327c3833..5d3ddfb34bf9 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -254,7 +254,7 @@
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertNarrowNobreakSpace"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 5bd5e5efb38e..38f12655a9bd 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -914,10 +914,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 01644d022cb1..2018bbab98f5 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -1033,10 +1033,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
@@ -2236,10 +2236,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuText-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuText-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 228bd49a6483..8dcb751b106e 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -1163,10 +1163,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="InsertZWNBSPD">
+ <object class="GtkMenuItem" id="InsertWJD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index a670850fcf6a..b2552361a699 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -1049,10 +1049,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="InsertZWNBSPD">
+ <object class="GtkMenuItem" id="InsertWJD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 028e9bdee170..8e580d5977c1 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -10998,7 +10998,7 @@ SfxVoidItem InsertZWSP SID_INSERT_ZWSP
GroupId = SfxGroupId::Insert;
]
-SfxVoidItem InsertZWNBSP SID_INSERT_ZWNBSP
+SfxVoidItem InsertWJ SID_INSERT_WJ
()
[
AutoUpdate = FALSE,
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index c45ce1a5a216..519229e2f230 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -169,7 +169,7 @@ constexpr bool SW_ISPRINTABLE(sal_Unicode c) { return c >=
' ' && 127 != c; }
#define CHAR_RLM u'\x200F'
#define CHAR_LRM u'\x200E'
#define CHAR_ZWSP u'\x200B'
-#define CHAR_ZWNBSP u'\x2060'
+#define CHAR_WJ u'\x2060'
#define CHAR_NNBSP u'\x202F' //NARROW NO-BREAK SPACE
// Returns the APP - CharClass instance - used for all ToUpper/ToLower/...
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 4a201b62c7e1..2a4a8bb69b64 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -247,7 +247,7 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = ExecInsert ;
StateMethod = GetState ;
diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi
index 9e5014d1678d..3d11cd67a60e 100644
--- a/sw/sdi/annotsh.sdi
+++ b/sw/sdi/annotsh.sdi
@@ -120,7 +120,7 @@ interface Annotation : _Annotation
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = Exec ;
StateMethod = GetState ;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 5e3f4ed3fa19..13105b0fdf12 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -171,7 +171,7 @@ interface TextDrawText
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- SID_INSERT_ZWNBSP
+ SID_INSERT_WJ
[
ExecMethod = ExecDraw ;
StateMethod = GetState ;
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;
}
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index cce25927afbc..258e073de0f9 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -383,7 +383,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
- case SID_INSERT_ZWNBSP :
+ case SID_INSERT_WJ :
case SID_INSERT_ZWSP:
{
sal_Unicode cIns = 0;
@@ -396,7 +396,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_INSERT_RLM : cIns = CHAR_RLM ; break;
case SID_INSERT_LRM : cIns = CHAR_LRM ; break;
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
- case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
+ case SID_INSERT_WJ: cIns = CHAR_WJ; break;
}
pOLV->InsertText( OUString(cIns));
rReq.Done();
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx
b/sw/source/uibase/shells/drwtxtsh.cxx
index f8e34eabde29..172d04fd2cc2 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -363,7 +363,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
- case SID_INSERT_ZWNBSP :
+ case SID_INSERT_WJ :
case SID_INSERT_ZWSP:
{
sal_Unicode cIns = 0;
@@ -376,7 +376,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
case SID_INSERT_RLM : cIns = CHAR_RLM ; break;
case SID_INSERT_LRM : cIns = CHAR_LRM ; break;
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
- case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
+ case SID_INSERT_WJ: cIns = CHAR_WJ; break;
}
pOLV->InsertText( OUString(cIns));
rReq.Done();
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index daa913816a63..50d8171c90f6 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -177,7 +177,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case FN_INSERT_NNBSP: // shift+mod2/alt+space inserts some other character
w/o going through SwEditWin::KeyInput(), at least on macOS
case SID_INSERT_RLM :
case SID_INSERT_LRM :
- case SID_INSERT_ZWNBSP :
+ case SID_INSERT_WJ :
case SID_INSERT_ZWSP:
{
sal_Unicode cIns = 0;
@@ -186,7 +186,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case SID_INSERT_RLM : cIns = CHAR_RLM ; break;
case SID_INSERT_LRM : cIns = CHAR_LRM ; break;
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
- case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
+ case SID_INSERT_WJ: cIns = CHAR_WJ; break;
case FN_INSERT_NNBSP: cIns = CHAR_NNBSP; break;
}
rSh.Insert( OUString( cIns ) );
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 4fdd94d99894..7f1bfe99a7bd 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -315,7 +315,7 @@
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index 7f0452bdb4d9..eed675d241d4 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -204,7 +204,7 @@
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
index aaea61d9b1da..c2aee67dafad 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -266,7 +266,7 @@
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
index 77dee9dd8245..0862618e0b5f 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -260,7 +260,7 @@
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index 42a7160734c7..060561d68a53 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -325,7 +325,7 @@
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertNarrowNobreakSpace"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index dd40d01eb5d7..8a17b1cf2a9c 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -751,10 +751,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 60e90e033193..41f0ba387565 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -775,10 +775,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuHome-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index bd4f9e79fb86..9f39bbce2f1c 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1439,10 +1439,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuFormat-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuFormat-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index b8e9bb67c0f8..8387574da1d8 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1418,10 +1418,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuFormat-InsertZWNBSP">
+ <object class="GtkMenuItem" id="MenuFormat-InsertWJ">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertZWNBSP</property>
+ <property name="action_name">.uno:InsertWJ</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
index af07279d30f4..315e9a389e7e 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -314,7 +314,7 @@
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
<menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+ <menu:menuitem menu:id=".uno:InsertWJ"/>
<menu:menuitem menu:id=".uno:InsertLRM"/>
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
