[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOKitHelper.hpp

Henry Castro hcastro at collabora.com
Tue May 31 14:44:26 UTC 2016


 loolwsd/LOKitHelper.hpp |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 2123ac2147f8150b12da5f78a49135c3bb10e888
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon May 30 20:17:08 2016 -0400

    loolwsd: bccu#1748, status: message send both ...
    
    the partnames and hashes (for presentations)

diff --git a/loolwsd/LOKitHelper.hpp b/loolwsd/LOKitHelper.hpp
index 46d40b1..00e13b9 100644
--- a/loolwsd/LOKitHelper.hpp
+++ b/loolwsd/LOKitHelper.hpp
@@ -127,18 +127,20 @@ namespace LOKitHelper
             for (auto i = 0; i < parts; ++i)
             {
                 oss << "\n";
-                if (type == LOK_DOCTYPE_PRESENTATION)
+                ptrValue = loKitDocument->pClass->getPartName(loKitDocument, i);
+                oss << ptrValue;
+                std::free(ptrValue);
+            }
+
+            if (type == LOK_DOCTYPE_PRESENTATION)
+            {
+                for (auto i = 0; i < parts; ++i)
                 {
+                    oss << "\n";
                     ptrValue = loKitDocument->pClass->getPartHash(loKitDocument, i);
                     oss << ptrValue;
                     std::free(ptrValue);
                 }
-                else
-                {
-                    ptrValue = loKitDocument->pClass->getPartName(loKitDocument, i);
-                    oss << ptrValue;
-                    std::free(ptrValue);
-                }
             }
         }
 


More information about the Libreoffice-commits mailing list