[Libreoffice-commits] core.git: desktop/source sfx2/source

[Mihai Varga]

 desktop/source/lib/init.cxx      |   26 +++++++++++++++-----------
 sfx2/source/control/unoctitm.cxx |   14 +++++++++-----
 2 files changed, 24 insertions(+), 16 deletions(-)

New commits:
commit b8627ad4db379bfa5b9411aaccb1663d7c66c933
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Nov 30 14:45:27 2015 +0200

    LOK: get state change feedback for more uno commands
    
    I've also ordered them alphabetically so we can read them easier.
    
    Change-Id: Ia332f1662a91de4a4068f0056a3d969fe978a744

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2f14de..49a1ef1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -661,23 +661,27 @@ static void doc_iniUnoCommands ()
 {
     OUString sUnoCommands[] =
     {
+        OUString(".uno:BackColor"),
         OUString(".uno:Bold"),
-        OUString(".uno:Italic"),
-        OUString(".uno:Underline"),
-        OUString(".uno:Strikeout"),
+        OUString(".uno:CenterPara"),
+        OUString(".uno:CharFontName"),
+        OUString(".uno:DecrementIndent"),
         OUString(".uno:DefaultBullet"),
         OUString(".uno:DefaultNumbering"),
+        OUString(".uno:FontColor"),
+        OUString(".uno:FontHeight"),
+        OUString(".uno:IncrementIndent"),
+        OUString(".uno:Italic"),
+        OUString(".uno:JustifyPara"),
+        OUString(".uno:OutlineFont"),
         OUString(".uno:LeftPara"),
-        OUString(".uno:CenterPara"),
         OUString(".uno:RightPara"),
-        OUString(".uno:JustifyPara"),
-        OUString(".uno:IncrementIndent"),
-        OUString(".uno:DecrementIndent"),
-        OUString(".uno:CharFontName"),
-        OUString(".uno:FontHeight"),
+        OUString(".uno:Shadowed"),
+        OUString(".uno:SubScript"),
+        OUString(".uno:SuperScript"),
+        OUString(".uno:Strikeout"),
         OUString(".uno:StyleApply"),
-        OUString(".uno:FontColor"),
-        OUString(".uno:BackColor")
+        OUString(".uno:Underline")
     };
 
     util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index cb3050a..efb7026 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1064,15 +1064,19 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
     aBuffer.append("=");
 
     if (aEvent.FeatureURL.Path == "Bold" ||
-        aEvent.FeatureURL.Path == "Italic" ||
-        aEvent.FeatureURL.Path == "Underline" ||
-        aEvent.FeatureURL.Path == "Strikeout" ||
+        aEvent.FeatureURL.Path == "CenterPara" ||
         aEvent.FeatureURL.Path == "DefaultBullet" ||
         aEvent.FeatureURL.Path == "DefaultNumbering" ||
+        aEvent.FeatureURL.Path == "Italic" ||
+        aEvent.FeatureURL.Path == "JustifyPara" ||
         aEvent.FeatureURL.Path == "LeftPara" ||
-        aEvent.FeatureURL.Path == "CenterPara" ||
+        aEvent.FeatureURL.Path == "OutlineFont" ||
         aEvent.FeatureURL.Path == "RightPara" ||
-        aEvent.FeatureURL.Path == "JustifyPara")
+        aEvent.FeatureURL.Path == "Shadowed" ||
+        aEvent.FeatureURL.Path == "SubScript" ||
+        aEvent.FeatureURL.Path == "SuperScript" ||
+        aEvent.FeatureURL.Path == "Strikeout" ||
+        aEvent.FeatureURL.Path == "Underline")
     {
         bool bTemp = false;
         aEvent.State >>= bTemp;