[Libreoffice-commits] core.git: sc/sdi sc/source sd/source sw/source

[Yousuf Philips]

 sc/sdi/app.sdi                       |    2 --
 sc/source/ui/view/editsh.cxx         |    2 --
 sc/source/ui/view/viewutil.cxx       |    2 --
 sd/source/ui/func/fubullet.cxx       |    6 ++----
 sw/source/uibase/shells/annotsh.cxx  |    2 --
 sw/source/uibase/shells/drwtxtex.cxx |    2 --
 sw/source/uibase/shells/textsh1.cxx  |    2 --
 7 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit f586c7ec352b3b7b23dba0e1e774d85b1c14e2b7
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sat Apr 22 01:09:24 2017 +0400

    tdf#104610 Always enabled no-width break formatting marks
    
    Change-Id: I0708a61d43bfa44dac19683b200975e3a6da788a
    Reviewed-on: https://gerrit.libreoffice.org/36807
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi
index d8f2dcea4fdb..7787a5956efe 100644
--- a/sc/sdi/app.sdi
+++ b/sc/sdi/app.sdi
@@ -67,8 +67,6 @@ interface StarCalc
 
     SID_INSERT_RLM              [ StateMethod = HideDisabledSlots; Export = FALSE; ]
     SID_INSERT_LRM              [ StateMethod = HideDisabledSlots; Export = FALSE; ]
-    SID_INSERT_ZWSP             [ StateMethod = HideDisabledSlots; Export = FALSE; ]
-    SID_INSERT_ZWNBSP           [ StateMethod = HideDisabledSlots; Export = FALSE; ]
 
 }
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 73ff7b3b5082..0d9465603aca 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -751,8 +751,6 @@ void ScEditShell::GetState( SfxItemSet& rSet )
             case SID_TRANSLITERATE_KATAGANA:
             case SID_INSERT_RLM:
             case SID_INSERT_LRM:
-            case SID_INSERT_ZWNBSP:
-            case SID_INSERT_ZWSP:
                 ScViewUtil::HideDisabledSlot( rSet, pViewData->GetBindings(), nWhich );
             break;
 
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index bd4afc6e47e3..8c00d51c6028 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -323,8 +323,6 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal
 
         case SID_INSERT_RLM:
         case SID_INSERT_LRM:
-        case SID_INSERT_ZWNBSP:
-        case SID_INSERT_ZWSP:
             bEnabled = aCTLOptions.IsCTLFontEnabled();
         break;
 
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index fa1c343f45b0..b0c24ddc925b 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -315,6 +315,8 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra
             rSet.DisableItem(FN_INSERT_SOFT_HYPHEN);
             rSet.DisableItem(FN_INSERT_HARDHYPHEN);
             rSet.DisableItem(FN_INSERT_HARD_SPACE);
+            rSet.DisableItem(SID_INSERT_ZWNBSP);
+            rSet.DisableItem(SID_INSERT_ZWSP);
         }
 
         if( !bTextEdit && (dynamic_cast<OutlineViewShell*>( pViewShell ) == nullptr) )
@@ -324,8 +326,6 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra
         {
             rSet.DisableItem(SID_INSERT_RLM);
             rSet.DisableItem(SID_INSERT_LRM);
-            rSet.DisableItem(SID_INSERT_ZWNBSP);
-            rSet.DisableItem(SID_INSERT_ZWSP);
         }
 
         if( pViewFrame )
@@ -334,8 +334,6 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra
 
             rBindings.SetVisibleState( SID_INSERT_RLM, bCtlEnabled );
             rBindings.SetVisibleState( SID_INSERT_LRM, bCtlEnabled );
-            rBindings.SetVisibleState( SID_INSERT_ZWNBSP, bCtlEnabled );
-            rBindings.SetVisibleState( SID_INSERT_ZWSP, bCtlEnabled );
         }
     }
 }
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index c51072f5695c..a4a3c8f78204 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -851,8 +851,6 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
             break;
             case SID_INSERT_RLM :
             case SID_INSERT_LRM :
-            case SID_INSERT_ZWNBSP :
-            case SID_INSERT_ZWSP:
             {
                 SvtCTLOptions aCTLOptions;
                 bool bEnabled = aCTLOptions.IsCTLFontEnabled();
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 186ab8fcc0e1..b875b49d721f 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -872,8 +872,6 @@ ASK_ESCAPE:
         break;
         case SID_INSERT_RLM :
         case SID_INSERT_LRM :
-        case SID_INSERT_ZWNBSP :
-        case SID_INSERT_ZWSP:
         {
             SvtCTLOptions aCTLOptions;
             bool bEnabled = aCTLOptions.IsCTLFontEnabled();
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c4fd2b696f8d..a01601192167 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1847,8 +1847,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             break;
             case SID_INSERT_RLM :
             case SID_INSERT_LRM :
-            case SID_INSERT_ZWNBSP :
-            case SID_INSERT_ZWSP:
             {
                 SvtCTLOptions aCTLOptions;
                 bool bEnabled = aCTLOptions.IsCTLFontEnabled();