summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-03-06 10:47:39 +0100
committerJulien Nabet <serval2412@yahoo.fr>2021-03-08 08:57:23 +0100
commitb1cbc2e27a5a5434ca8097fa7586912cf0b857c4 (patch)
treeb2a2c7a273f5d4c9a0992225dfb7a610eda006e4 /sw
parent486258be7950e06cacbb3ae403129b57e3625995 (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')
-rw-r--r--sw/inc/swtypes.hxx2
-rw-r--r--sw/sdi/_textsh.sdi2
-rw-r--r--sw/sdi/annotsh.sdi2
-rw-r--r--sw/sdi/drwtxtsh.sdi2
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/porfld.cxx2
-rw-r--r--sw/source/core/text/porrst.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx4
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/uibase/shells/textsh.cxx4
-rw-r--r--sw/uiconfig/sglobal/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/sweb/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar.ui4
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_compact.ui4
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui4
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui4
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml2
21 files changed, 28 insertions, 28 deletions
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>
generated by cgit (git 2.34.1) at 2024-06-06 09:34:35 +0000