[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source

Andreas Heinisch (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 30 18:59:19 UTC 2021


 sc/source/ui/unoobj/filtuno.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8b496beb74255d619a8de72a07860d1a77c4f79a
Author:     Andreas Heinisch <andreas.heinisch at yahoo.de>
AuthorDate: Wed Jun 30 10:37:08 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Jun 30 20:58:42 2021 +0200

    tdf#132421 - don't URL encode filename for the import ASCII dialog title
    
    Change-Id: Ia2cb7b6b355f640a525c41606da25ba35771499b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118148
    Tested-by: Jenkins
    Reviewed-by: Andreas Heinisch <andreas.heinisch at yahoo.de>
    (cherry picked from commit 6e8c9047f4bf6194bd1423422bd2dc9f92c50725)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118109
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 1e6119ecb36d..fbea6e78aa19 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -182,7 +182,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
         //  ascii import is special...
 
         INetURLObject aURL( aFileName );
-        OUString aPrivDatName(aURL.getName());
+        // tdf#132421 - don't URL encode filename for the import ASCII dialog title
+        OUString aPrivDatName(aURL.GetLastName(INetURLObject::DecodeMechanism::Unambiguous));
         std::unique_ptr<SvStream> pInStream;
         if ( xInputStream.is() )
             pInStream = utl::UcbStreamHelper::CreateStream( xInputStream );


More information about the Libreoffice-commits mailing list