[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sfx2/source uui/source

[Mike Kaganski]

 sfx2/source/doc/docfile.cxx   |    2 +-
 uui/source/iahndl-locking.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a5f15d2b35a5a6e3ae0a1fa534facfe7e92bb3c
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date:   Mon Mar 12 19:22:28 2018 +0100

    Build fix after ea0a6c66e8ae2002953a458c1a8cc8fd54ccc297
    
    Also contains e93a48a3e290022213a90c58e057907b8ee2907f
    
    Reviewed-on: https://gerrit.libreoffice.org/51162
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>
    Tested-by: Aron Budea <aron.bu...@collabora.com>
    (cherry picked from commit db585162fdc8dcd804a99338d0c2c3c5e9d8088d)
    
    Change-Id: I5aa972e6c9b5f9c24f69350171b9ac570a866003
    Reviewed-on: https://gerrit.libreoffice.org/51179
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>
    Tested-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b80374fa39f7..dfcf9d94d09f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1261,7 +1261,7 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
                     if (!bLoading && bUseSystemLock && pImpl->pTempFile)
                     {
                         INetURLObject aDest(GetURLObject());
-                        OUString 
aDestURL(aDest.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+                        OUString 
aDestURL(aDest.GetMainURL(INetURLObject::DecodeMechanism::NO_DECODE));
 
                         if (comphelper::isFileUrl(aDestURL) || 
!aDest.removeSegment())
                         {
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index f4a14ef9bc3f..3f82480cdb35 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -116,7 +116,7 @@ handleLockedDocumentRequest_(
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, 
xManager.get(), aMessage );
+            ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, 
xManager.get(), aMessage, xRetry.is() );
             nResult = xDialog->Execute();
         }
         else if ( nMode == UUI_DOC_OWN_LOAD_LOCK ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits