core.git: Branch 'distro/collabora/co-25.04' - 2 commits - vcl/source

[Mike Kaganski (via logerrit)]

 vcl/source/gdi/embeddedfontshelper.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b74b8cd6f9c2d3b16c9a4d8e9a8461e8a78bbbee
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Aug 9 15:34:17 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Aug 12 19:13:07 2025 +0200

    Percent-encode temp font filename in the file URL
    
    Change-Id: Ia88bd0c61c39da33911cd0aae4e805bc0e11cea7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189254
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189341
    Reviewed-by: Michael Stahl <michael.st...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index e18bd575e4b2..b18ba402e3d7 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -18,6 +18,7 @@
 
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
+#include <rtl/uri.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/embeddedfontshelper.hxx>
@@ -248,7 +249,9 @@ OUString EmbeddedFontsHelper::fileUrlForTemporaryFont( 
const OUString& fontName,
 
     OUString path = GetEmbeddedFontsRoot() + "fromdocs/";
     osl::Directory::createPath( path );
-    return path + filename;
+    return path
+           + rtl::Uri::encode(filename, rtl_UriCharClassPchar, 
rtl_UriEncodeIgnoreEscapes,
+                              RTL_TEXTENCODING_UTF8);
 }
 
 // Check if it's (legally) allowed to embed the font file into a document
commit 939cfb8cf0cf953ca268af2a37b3d0129ef1f667
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Aug 8 18:35:12 2025 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Aug 12 19:12:54 2025 +0200

    Simplify iteration in clearDir a bit
    
    Change-Id: I19e5ac3dbc65b5778a8ed5e3bbdfa0766162fca7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189213
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189340
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Michael Stahl <michael.st...@collabora.com>

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index e50e641b7edc..e18bd575e4b2 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -57,11 +57,8 @@ static void clearDir( const OUString& path )
     osl::Directory dir( path );
     if( dir.reset() == osl::Directory::E_None )
     {
-        for(;;)
+        for (osl::DirectoryItem item; dir.getNextItem(item) == 
osl::Directory::E_None;)
         {
-            osl::DirectoryItem item;
-            if( dir.getNextItem( item ) != osl::Directory::E_None )
-                break;
             osl::FileStatus status( osl_FileStatus_Mask_FileURL );
             if( item.getFileStatus( status ) == osl::File::E_None )
                 osl::File::remove( status.getFileURL());