[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/test

[Miklos Vajna]

 loolwsd/ChildProcessSession.cpp |    2 +-
 loolwsd/test/httpposttest.cpp   |    3 +--
 loolwsd/test/httpwstest.cpp     |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit e3cc05ddcd8650f268645d202a0ede434078d6b7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 19 08:37:29 2016 +0100

    loolwsd: fix indentation

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 6102a16..dfef7b7 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -906,7 +906,7 @@ void ChildProcessSession::sendCombinedTiles(const char* /*buffer*/, int /*length
 
 bool ChildProcessSession::clientZoom(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
-   int tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight;
+    int tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight;
 
     if (tokens.count() != 5 ||
         !getTokenInteger(tokens[1], "tilepixelwidth", tilePixelWidth) ||
diff --git a/loolwsd/test/httpposttest.cpp b/loolwsd/test/httpposttest.cpp
index 3094281..a36f91c 100644
--- a/loolwsd/test/httpposttest.cpp
+++ b/loolwsd/test/httpposttest.cpp
@@ -56,8 +56,7 @@ void HTTPPostTest::testConvertTo()
     // In some cases the result is prefixed with (the UTF-8 encoding of) the Unicode BOM
     // (U+FEFF). Skip that.
     std::string actualString = actualStream.str();
-    if (actualString.size() > 3 &&
-        actualString[0] == '\xEF' && actualString[1] == '\xBB' && actualString[2] == '\xBF')
+    if (actualString.size() > 3 && actualString[0] == '\xEF' && actualString[1] == '\xBB' && actualString[2] == '\xBF')
         actualString = actualString.substr(3);
     CPPUNIT_ASSERT_EQUAL(expectedStream.str(), actualString);
 }
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index b104765..e17702d 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -109,7 +109,7 @@ void HTTPWSTest::testPaste()
         socket.shutdown();
         CPPUNIT_ASSERT_EQUAL(std::string("aaa bbb ccc"), selection);
     }
-    catch(const Poco::Exception& exc)
+    catch (const Poco::Exception& exc)
     {
         CPPUNIT_ASSERT_MESSAGE(exc.displayText(), false);
     }
@@ -159,7 +159,7 @@ void HTTPWSTest::testLargePaste()
         sendTextFrame(socket, "disconnect");
         socket.shutdown();
     }
-    catch(const Poco::Exception& exc)
+    catch (const Poco::Exception& exc)
     {
         CPPUNIT_ASSERT_MESSAGE(exc.displayText(), false);
     }
@@ -210,7 +210,7 @@ void HTTPWSTest::testRenderingOptions()
         // HideWhitespace was ignored, this was 32532, should be around 16706.
         CPPUNIT_ASSERT(height < 20000);
     }
-    catch(const Poco::Exception& exc)
+    catch (const Poco::Exception& exc)
     {
         CPPUNIT_ASSERT_MESSAGE(exc.displayText(), false);
     }