[Libreoffice-commits] online.git: 2 commits - kit/Kit.cpp wsd/TileDesc.hpp

[Tor Lillqvist]

 kit/Kit.cpp      |    1 -
 wsd/TileDesc.hpp |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 51c697a4739615d352f75a49a0d292d27c5986c2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jan 5 14:59:12 2017 +0200

    No need for these default values of parameters
    
    Change-Id: Idc369d8cfb5eb7719d378d871f5e1b589ba1d922

diff --git a/wsd/TileDesc.hpp b/wsd/TileDesc.hpp
index 9721deb..3b4a46e 100644
--- a/wsd/TileDesc.hpp
+++ b/wsd/TileDesc.hpp
@@ -219,8 +219,8 @@ class TileCombined
 private:
     TileCombined(int part, int width, int height,
                  const std::string& tilePositionsX, const std::string& tilePositionsY,
-                 int tileWidth, int tileHeight, int ver = -1,
-                 const std::string& imgSizes = "", int id = -1) :
+                 int tileWidth, int tileHeight, int ver,
+                 const std::string& imgSizes, int id) :
         _part(part),
         _width(width),
         _height(height),
commit 3f948ab333a09b51868e05ce4cc6083a1066b1ee
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 4 22:17:42 2017 +0200

    Bin duplicate #include
    
    Change-Id: Ic1bf34549b2ee081534aef5f0a77a1bd6023e36e

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 82a5783..2b6eac1 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -27,7 +27,6 @@
 #include <memory>
 #include <sstream>
 #include <thread>
-#include <thread>
 
 #define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKitInit.h>