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

[Jan Holesovsky]

 desktop/source/lib/init.cxx      |    1 +
 sfx2/source/control/unoctitm.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e6a2b10b7a01cbb1d7b2148c37e73cee2d78c10e
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Feb 5 12:20:11 2016 +0100

    lok: Notify also about the states of .uno:CharBackgroundExt.
    
    .uno:CharBackgroundExt is supplementary to .uno:BackColor.
    
    When .uno:BackColor is set, Writer turns into a 'watercan' mode, where the
    user directly marks parts of the text with the wanted background color.
    
    .uno:CharBackgroundExt then controls this watercan mode - dispatching it
    toggles the watercan mode on/off, and also the StateChanged events reflect the
    on/off mode accordingly.
    
    Change-Id: I6472eb39129d1b1517fba14bad584cbd125e826a

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 72fef83..ccde8f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -700,6 +700,7 @@ static void doc_iniUnoCommands ()
         OUString(".uno:Bold"),
         OUString(".uno:CenterPara"),
         OUString(".uno:CharBackColor"),
+        OUString(".uno:CharBackgroundExt"),
         OUString(".uno:CharFontName"),
         OUString(".uno:Color"),
         OUString(".uno:DecrementIndent"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a189a5f..8a2a866 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1068,6 +1068,7 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 
     if (aEvent.FeatureURL.Path == "Bold" ||
         aEvent.FeatureURL.Path == "CenterPara" ||
+        aEvent.FeatureURL.Path == "CharBackgroundExt" ||
         aEvent.FeatureURL.Path == "DefaultBullet" ||
         aEvent.FeatureURL.Path == "DefaultNumbering" ||
         aEvent.FeatureURL.Path == "Italic" ||
@@ -1085,7 +1086,6 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
         bool bTemp = false;
         aEvent.State >>= bTemp;
         aBuffer.append(bTemp);
-
     }
     else if (aEvent.FeatureURL.Path == "CharFontName")
     {