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

[Henry Castro]

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

New commits:
commit b0c0d4eff911a1d2619c0cac5a0e86220d9747ab
Author: Henry Castro <hcastro at collabora.com>
Date:   Fri May 27 16:38:47 2016 -0400

    lok: add uno command AssignLayout
    
    Change-Id: I959d1a57945a3b5aa3f2c273c4b885ed5f628f6e

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6660268..8caa011 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -792,7 +792,8 @@ static void doc_iniUnoCommands ()
         OUString(".uno:EntireRow"),
         OUString(".uno:EntireColumn"),
         OUString(".uno:EntireCell"),
-        OUString(".uno:MergeCells")
+        OUString(".uno:MergeCells"),
+        OUString(".uno:AssignLayout")
     };
 
     util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 35508ae..e317ae4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1143,6 +1143,12 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
     {
         aBuffer.append(OUString::boolean(aEvent.IsEnabled));
     }
+    else if (aEvent.FeatureURL.Path == "AssignLayout")
+    {
+        sal_Int32 nLayout = 0;
+        aEvent.State >>= nLayout;
+        aBuffer.append(nLayout);
+    }
     else
     {
         return;