[Libreoffice-commits] online.git: common/Unit.cpp wsd/LOOLWSD.cpp

Noel Grandin noel.grandin at collabora.co.uk
Tue Dec 27 10:43:51 UTC 2016


 common/Unit.cpp |    2 +-
 wsd/LOOLWSD.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0bb8ba83072ec93cde8c51c45ee081208aefde89
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Dec 23 08:56:56 2016 +0200

    loplugin:staticaccess
    
    Change-Id: I1abd6c2a28d3a8e4fb0cda2d35be94d787ff67b7
    Reviewed-on: https://gerrit.libreoffice.org/32368
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/common/Unit.cpp b/common/Unit.cpp
index 8d31f44..5be5f5a 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -71,7 +71,7 @@ bool UnitBase::init(UnitType type, const std::string &unitLibPath)
         if (Global)
         {
             TimeoutThread.startFunc([](){
-                    TimeoutThread.trySleep(Global->_timeoutMilliSeconds);
+                    Poco::Thread::trySleep(Global->_timeoutMilliSeconds);
                     if (!Global->_timeoutShutdown)
                     {
                         LOG_ERR("Unit test timeout");
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index bb8d4e1..3bc007f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -479,7 +479,7 @@ public:
         if (!params.has("filename"))
             return;
 
-        Path tempPath = Path::forDirectory(TemporaryFile().tempName() + "/");
+        Path tempPath = Path::forDirectory(Poco::TemporaryFile::tempName() + "/");
         File(tempPath).createDirectories();
         // Prevent user inputting anything funny here.
         // A "filename" should always be a filename, not a path


More information about the Libreoffice-commits mailing list