[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Julien Nabet]

 sc/source/ui/docshell/docsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 611299a16f9b21914d37788b700af0e0ba9a5aa0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jun 24 16:02:51 2017 +0200

    Related tdf#40713, use DecodeMechanism::Unambiguous
    
    Change-Id: I73221fb6c127903398a7faae48d5247339ec8d7f
    Reviewed-on: https://gerrit.libreoffice.org/39215
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 69a724d44b55..69b399a0c355 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2382,7 +2382,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
 
                 // tdf#40713: don't lose dbt file
                 // if aDbtFile corresponds exactly to aTmpFile, we just have to return
-                if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) == aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ))
+                if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) == aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ))
                     return bRet;
 
                 if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) )