From 269cad6f5da53600d11157c29f234175bc06e91c Mon Sep 17 00:00:00 2001
From: Andrzej Hunt <andrzej@ahunt.org>
Date: Thu, 12 Nov 2015 13:50:52 +0100
Subject: [PATCH 310/398] lok: send list of commands instead of ClearStyles

We currently send just one command, but this could be expanded
server side in future.

Change-Id: Id8f14196158f3a7fe9c54595d094603efd5e2ce3
(cherry picked from commit fbc3965dc117967d2b5f51aa3902823da7c69d12)
---
 desktop/qa/desktop_lib/test_desktop_lib.cxx |  2 +-
 desktop/source/lib/init.cxx                 | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index c0ba1599f48b..7d94daea0fbc 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -192,7 +192,7 @@ void DesktopLOKTest::testGetStyles()
             rPair.first != "NumberingStyles" &&
             rPair.first != "CellStyles" &&
             rPair.first != "ShapeStyles" &&
-            rPair.first != "ClearStyle")
+            rPair.first != "Commands")
         {
             CPPUNIT_FAIL("Unknown style family: " + rPair.first);
         }
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e09ad171678e..dbe30a640ecb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1301,10 +1301,27 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
         aValues.add_child(sStyleFam.toUtf8().getStr(), aChildren);
     }
 
-    boost::property_tree::ptree aChildClearFormat;
-    OUString sClearFormat = SVX_RESSTR( RID_SVXSTR_CLEARFORM );
-    aChildClearFormat.put("", sClearFormat.toUtf8());
-    aValues.add_child("ClearStyle", aChildClearFormat);
+    {
+        boost::property_tree::ptree aCommandList;
+
+        {
+            boost::property_tree::ptree aChild;
+
+            OUString sClearFormat = SVX_RESSTR( RID_SVXSTR_CLEARFORM );
+
+            boost::property_tree::ptree aName;
+            aName.put("", sClearFormat.toUtf8());
+            aChild.push_back(std::make_pair("text", aName));
+
+            boost::property_tree::ptree aCommand;
+            aCommand.put("", ".uno:ResetAttributes");
+            aChild.push_back(std::make_pair("id", aCommand));
+
+            aCommandList.push_back(std::make_pair("", aChild));
+        }
+
+        aValues.add_child("Commands", aCommandList);
+    }
 
     aTree.add_child("commandValues", aValues);
     std::stringstream aStream;
-- 
2.12.0