[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sw/source

[Oliver Specht]

 sw/source/uibase/uno/unomod.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9c771cb1cfb7f9c821ad0dfe94c4fc0218eb9898
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Thu Sep 3 08:30:52 2015 +0200

    tdf#93719: handle 'HideWhitespace' in SwXViewSettings
    
    Added missing part from tdf#39080 to SwXViewSettings
    to handle 'HideWhitespace' property
    
    Change-Id: I8d8098810ba36b6ade6e4476464a72348ef4db8d
    Reviewed-on: https://gerrit.libreoffice.org/18291
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit a1fd97308d7fc7a35a5def1e15a05099dba90f91)

diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 483c2a4..726166c 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -58,6 +58,7 @@ enum SwViewSettingsPropertyHandles
     HANDLE_VIEWSET_HIDDEN_CHARACTERS,
     HANDLE_VIEWSET_HIDDEN_PARAGRAPHS,
     HANDLE_VIEWSET_HIDDEN_TEXT,
+    HANDLE_VIEWSET_HIDE_WHITESPACE,
     HANDLE_VIEWSET_HRULER,
     HANDLE_VIEWSET_HSCROLL,
     HANDLE_VIEWSET_INDEX_MARK_BACKGROUND,
@@ -137,6 +138,7 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
         { OUString( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS    , cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
         { OUString( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS    , cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
         { OUString( "ShowHiddenText"),       HANDLE_VIEWSET_HIDDEN_TEXT          , cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+        { OUString( "HideWhitespace"),       HANDLE_VIEWSET_HIDE_WHITESPACE,       cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
         { OUString( "ShowHoriRuler"),        HANDLE_VIEWSET_HRULER               , cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
         { OUString( "ShowHoriScrollBar"),    HANDLE_VIEWSET_HSCROLL              , cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
         { OUString( "ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, cppu::UnoType<bool>::get(),PROPERTY_NONE, 0},
@@ -617,6 +619,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         case  HANDLE_VIEWSET_TABSTOPS              :   mpViewOption->SetTab(bVal);  break;
         case  HANDLE_VIEWSET_BREAKS                :   mpViewOption->SetLineBreak(bVal); break;
         case  HANDLE_VIEWSET_HIDDEN_TEXT           :   mpViewOption->SetShowHiddenField(bVal);  break;
+        case  HANDLE_VIEWSET_HIDE_WHITESPACE:          mpViewOption->SetHideWhitespaceMode(bVal); break;
         case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   mpViewOption->SetShowHiddenChar(bVal); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   mpViewOption->SetShowHiddenPara(bVal);   break;
         case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true);    break;
@@ -847,6 +850,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
         case  HANDLE_VIEWSET_TABSTOPS              :   bBoolVal = mpConstViewOption->IsTab(true);   break;
         case  HANDLE_VIEWSET_BREAKS                :   bBoolVal = mpConstViewOption->IsLineBreak(true); break;
         case  HANDLE_VIEWSET_HIDDEN_TEXT           :   bBoolVal = mpConstViewOption->IsShowHiddenField();   break;
+        case  HANDLE_VIEWSET_HIDE_WHITESPACE:          bBoolVal = mpConstViewOption->IsHideWhitespaceMode(); break;
         case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   bBoolVal = mpConstViewOption->IsShowHiddenChar(true); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   bBoolVal = mpConstViewOption->IsShowHiddenPara();    break;
         case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   bBoolVal = SwViewOption::IsTableBoundaries(); break;