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

[Mike Kaganski (via logerrit)]

 framework/source/uielement/recentfilesmenucontroller.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 37c617af996bf5f9c4be08a1245940d00668a64b
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Dec 16 16:51:12 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Dec 17 23:07:02 2021 +0100

    tdf#146219: don't try to detect if a recent file is a directory
    
    This avoids accessing (possibly unavailable) remote URLs,
    when we already know that MRU items are files.
    
    Change-Id: I97e07f007d4129b93b4939311c67cf95de6ff836
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126943
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127004
    (cherry picked from commit c247023dfd10bef22b9ff5a85cc44febfc90e951)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126974

diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx 
b/framework/source/uielement/recentfilesmenucontroller.cxx
index b25c84256cc2..6bf9c1f99858 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -204,8 +204,10 @@ void RecentFilesMenuController::fillPopupMenu( Reference< 
css::awt::XPopupMenu >
             pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), 
aMenuShortCut.makeStringAndClear() );
 
             if ( bIsIconsAllowed ) {
-                Image aThumbnail = SvFileInformationManager::GetImage(aURL, 
false, {});
-                pVCLPopupMenu->SetItemImage(sal_uInt16 ( i+1 ), aThumbnail);
+                // tdf#146219: don't use SvFileInformationManager::GetImageId,
+                // which needs to access the URL to detect if it's a directory
+                BitmapEx 
aThumbnail(SvFileInformationManager::GetFileImageId(aURL));
+                pVCLPopupMenu->SetItemImage(sal_uInt16 ( i+1 ), 
Image(aThumbnail));
             }
 
             pVCLPopupMenu->SetTipHelpText( sal_uInt16( i+1 ), aTipHelpText );