[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - test/httpwstest.cpp

[Tor Lillqvist]

 test/httpwstest.cpp |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9a8d9f1531a2e73581f42fb3a7a093b5a6a159fd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 27 12:10:17 2016 +0200

    Drop the .uno:MergeCells= thing from HTTPWSTest::testStateUnoCommand
    
    It always failed. No idea why, or what this stuff is. See also
    6bd899f3fa44f2d78092333a399e141889b43dca in cp-5.1 which might be
    related, or not.
    
    Change-Id: I95f964e3f99c681ec9eefd092e523babd919a5c0
    (cherry picked from commit 023bde69dc905d07aa12c95f0e32988285347c9f)

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index d180820..d04724e 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1513,7 +1513,6 @@ void HTTPWSTest::testStateUnoCommand()
         ".uno:InsertColumnsAfter=",
         ".uno:DeleteRows=",
         ".uno:DeleteColumns=",
-        ".uno:MergeCells=",
         ".uno:StatusDocPos=",
         ".uno:RowColSelCount=",
         ".uno:StatusPageStyle=",
@@ -1572,7 +1571,6 @@ void HTTPWSTest::testStateUnoCommand()
         ".uno:EntireRow=",
         ".uno:EntireColumn=",
         ".uno:EntireCell=",
-        ".uno:MergeCells=",
         ".uno:InsertMode=",
         ".uno:StateTableCell=",
         ".uno:StatePageNumber=",
@@ -1624,7 +1622,6 @@ void HTTPWSTest::testStateUnoCommand()
         ".uno:SelectTable=",
         ".uno:EntireRow=",
         ".uno:EntireColumn=",
-        ".uno:MergeCells=",
         ".uno:AssignLayout=",
         ".uno:PageStatus=",
         ".uno:LayoutStatus=",