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

[Mihai Varga]

 desktop/source/lib/init.cxx      |    3 +++
 sfx2/source/control/unoctitm.cxx |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 3efce450f669417f14cee5610f1e9614f1315d0f
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Fri Dec 18 16:55:25 2015 +0200

    LOK: get feedback for all of the font/back color commands
    
    Change-Id: Id4aac707666420752b985bcfd03b5b9bb99f79f1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index efd5d10..f8d37ef 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -670,9 +670,12 @@ static void doc_iniUnoCommands ()
     OUString sUnoCommands[] =
     {
         OUString(".uno:BackColor"),
+        OUString(".uno:BackgroundColor"),
         OUString(".uno:Bold"),
         OUString(".uno:CenterPara"),
+        OUString(".uno:CharBackColor"),
         OUString(".uno:CharFontName"),
+        OUString(".uno:Color"),
         OUString(".uno:DecrementIndent"),
         OUString(".uno:DefaultBullet"),
         OUString(".uno:DefaultNumbering"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f0e9bc1..ddc1596 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1104,8 +1104,11 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
         aEvent.State >>= aTemplate;
         aBuffer.append(aTemplate.StyleName);
     }
-    else if (aEvent.FeatureURL.Path == "FontColor" ||
-             aEvent.FeatureURL.Path == "BackColor")
+    else if (aEvent.FeatureURL.Path == "BackColor" ||
+             aEvent.FeatureURL.Path == "BackgroundColor" ||
+             aEvent.FeatureURL.Path == "CharBackColor" ||
+             aEvent.FeatureURL.Path == "Color" ||
+             aEvent.FeatureURL.Path == "FontColor")
     {
         sal_Int32 nColor = -1;
         aEvent.State >>= nColor;