[Libreoffice-commits] online.git: kit/Kit.cpp

[Ashod Nakashian]

 kit/Kit.cpp |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit b4c4b29ecc06dd7461f88c865e336a9ca484f114
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Dec 23 17:34:46 2016 -0500

    wsd: remove unnecessary checks of _loKitDocument
    
    Since load() returns _loKitDocument, there is no
    point in checking it again.
    
    Change-Id: Ice511ba3f42cf9411918397a73497d3a07bbdfe5
    Reviewed-on: https://gerrit.libreoffice.org/32607
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 4a1ae08..f654b34 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -901,8 +901,7 @@ private:
 
         try
         {
-            load(session, uri, userName, docPassword, renderOpts, haveDocPassword);
-            if (!_loKitDocument || !_loKitDocument->get())
+            if (!load(session, uri, userName, docPassword, renderOpts, haveDocPassword))
             {
                 return false;
             }
@@ -916,10 +915,6 @@ private:
 
         // Retake the lock (technically, not needed).
         lock.lock();
-
-        // Done loading, let the next one in (if any).
-        LOG_CHECK_RET(_loKitDocument && _loKitDocument->get() && "Uninitialized lok::Document instance", false);
-
         --_isLoading;
         _cvLoading.notify_one();