summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorheiko tietze <tietze.heiko@gmail.com>2019-01-23 10:20:23 +0100
committerHeiko Tietze <tietze.heiko@gmail.com>2019-02-18 12:27:20 +0100
commit16bd9c99b8116f36e4f0825860e699d79cdf0d58 (patch)
treede7d4e3c183571d73a01bf7c0a5864ccb52b9e49 /sd
parent47819ba0534ce1893d5cb835c98147feacdf9faf (diff)
Resolves tdf#121596 - Include a key combination to insert thin spaces
uno:InsertNarrowNobreakSpace/ FN_INSERT_NNBSP added and asigned to shift+alt+space Change-Id: I20dd4159bc35ee378bee75af9734b1f25dfd8b1a Reviewed-on: https://gerrit.libreoffice.org/66776 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/sdi/ViewShellBase.sdi5
-rw-r--r--sd/sdi/_drvwsh.sdi5
-rw-r--r--sd/sdi/outlnvsh.sdi5
-rw-r--r--sd/source/ui/func/fubullet.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx1
-rw-r--r--sd/source/ui/view/outlnvs2.cxx1
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml1
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml1
8 files changed, 23 insertions, 0 deletions
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index cc60732b7178..49cd28c51e88 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -112,6 +112,11 @@ interface ViewShellBaseView
ExecMethod = Execute ;
StateMethod = GetState ;
]
+ FN_INSERT_NNBSP // status(final|play)
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
SID_INSERT_RLM
[
ExecMethod = Execute ;
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index e0638004ec9f..25332e7f4487 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -323,6 +323,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+ FN_INSERT_NNBSP // status(final|play)
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetMenuState ;
+ ]
SID_INSERT_RLM
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 16458f5db190..a804e5296618 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -161,6 +161,11 @@ interface OutlineView
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
]
+ FN_INSERT_NNBSP // status(final|play)
+ [
+ ExecMethod = FuTemporaryModify ;
+ StateMethod = GetMenuState ;
+ ]
SID_INSERT_RLM
[
ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 3f9527f92200..bb29428130d6 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -52,6 +52,7 @@ 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_NNBSP = u'\x202F'; //NARROW NO-BREAK SPACE
FuBullet::FuBullet (
@@ -83,6 +84,7 @@ void FuBullet::DoExecute( SfxRequest& rReq )
case FN_INSERT_SOFT_HYPHEN: cMark = CHAR_SOFTHYPHEN ; break;
case FN_INSERT_HARDHYPHEN: cMark = CHAR_HARDHYPHEN ; break;
case FN_INSERT_HARD_SPACE: cMark = CHAR_HARDBLANK ; break;
+ case FN_INSERT_NNBSP: cMark = CHAR_NNBSP ; break;
case SID_INSERT_RLM : cMark = CHAR_RLM ; break;
case SID_INSERT_LRM : cMark = CHAR_LRM ; break;
case SID_INSERT_ZWSP : cMark = CHAR_ZWSP ; break;
@@ -281,6 +283,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, Sfx
SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_HARDHYPHEN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_HARD_SPACE ) ||
+ 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 ) ||
@@ -300,6 +303,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, Sfx
rSet.DisableItem(FN_INSERT_SOFT_HYPHEN);
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_ZWSP);
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d7bf382f5ec3..58297a8bc942 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1448,6 +1448,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case FN_INSERT_SOFT_HYPHEN:
case FN_INSERT_HARDHYPHEN:
case FN_INSERT_HARD_SPACE:
+ case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
case SID_INSERT_ZWNBSP :
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 867ebe45bc4f..4fd762de736a 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -384,6 +384,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case FN_INSERT_SOFT_HYPHEN:
case FN_INSERT_HARDHYPHEN:
case FN_INSERT_HARD_SPACE:
+ case FN_INSERT_NNBSP:
case SID_INSERT_RLM :
case SID_INSERT_LRM :
case SID_INSERT_ZWNBSP :
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 4ebc5cf917fa..6283b9a357dc 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -210,6 +210,7 @@
<menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<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:InsertLRM"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 0e8b2f0ccbf3..47b7de880344 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -240,6 +240,7 @@
<menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
<menu:menuitem menu:id=".uno:InsertHardHyphen"/>
<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:InsertLRM"/>