diff options
| -rw-r--r-- | framework/source/uielement/recentfilesmenucontroller.cxx | 2 | ||||
| -rw-r--r-- | include/svtools/imagemgr.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 38 |
3 files changed, 37 insertions, 9 deletions
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 343d719c1741..b25c84256cc2 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -204,7 +204,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aMenuShortCut.makeStringAndClear() ); if ( bIsIconsAllowed ) { - Image aThumbnail = SvFileInformationManager::GetImage(aURL); + Image aThumbnail = SvFileInformationManager::GetImage(aURL, false, {}); pVCLPopupMenu->SetItemImage(sal_uInt16 ( i+1 ), aThumbnail); } diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 707fa5eda587..6abe56b08bb0 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include <svtools/svtdllapi.h> +#include <unotools/ucbhelper.hxx> #include <vcl/vclenum.hxx> enum class SvImageId { @@ -119,7 +120,10 @@ private: public: SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL, bool bBig = false ); - SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, bool bBig = false); + SVT_DLLPUBLIC static Image GetImage( + const INetURLObject& rURL, bool bBig = false, + css::uno::Reference<css::ucb::XCommandEnvironment> const & env + = utl::UCBContentHelper::getDefaultCommandEnvironment()); SVT_DLLPUBLIC static OUString GetFileImageId( const INetURLObject& rURL ); SVT_DLLPUBLIC static Image GetImageNoDefault(const INetURLObject& rURL, vcl::ImageType eImageType = vcl::ImageType::Small); SVT_DLLPUBLIC static OUString GetFolderImageId( const svtools::VolumeInfo& rInfo ); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 2a3932ac86a5..ff7fe554d869 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XTypeDetection.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -350,7 +351,25 @@ static SvImageId GetFolderImageId_Impl( const OUString& rURL ) return nRet; } -static SvImageId GetImageId_Impl( const INetURLObject& rObject, bool bDetectFolder ) +static bool isFolder( + OUString const & url, css::uno::Reference<css::ucb::XCommandEnvironment> const & env) +{ + try { + return ucbhelper::Content(url, env, comphelper::getProcessComponentContext()).isFolder(); + } catch (css::uno::RuntimeException &) { + throw; + } catch (css::ucb::CommandAbortedException &) { + assert(false); // this cannot happen + throw; + } catch (css::uno::Exception &) { + TOOLS_INFO_EXCEPTION("svtools.misc", "isFolder(" << url << ")"); + return false; + } +} + +static SvImageId GetImageId_Impl( + const INetURLObject& rObject, bool bDetectFolder, + css::uno::Reference<css::ucb::XCommandEnvironment> const & env ) { OUString aExt, sURL = rObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ); SvImageId nImage = SvImageId::File; @@ -404,7 +423,7 @@ static SvImageId GetImageId_Impl( const INetURLObject& rObject, bool bDetectFold if ( nImage == SvImageId::File && !sURL.isEmpty() ) { - if ( bDetectFolder && CONTENT_HELPER::IsFolder( sURL ) ) + if ( bDetectFolder && isFolder( sURL, env ) ) nImage = GetFolderImageId_Impl( sURL ); else if ( !aExt.isEmpty() ) nImage = GetImageId_Impl( aExt ); @@ -783,28 +802,33 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb OUString SvFileInformationManager::GetImageId(const INetURLObject& rObject, bool bBig) { - SvImageId nImage = GetImageId_Impl( rObject, true ); + SvImageId nImage = GetImageId_Impl( + rObject, true, utl::UCBContentHelper::getDefaultCommandEnvironment() ); DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" ); return GetImageNameFromList_Impl(nImage, bBig ? vcl::ImageType::Size26 : vcl::ImageType::Size16); } -Image SvFileInformationManager::GetImage(const INetURLObject& rObject, bool bBig) +Image SvFileInformationManager::GetImage( + const INetURLObject& rObject, bool bBig, + css::uno::Reference<css::ucb::XCommandEnvironment> const & env) { - SvImageId nImage = GetImageId_Impl( rObject, true ); + SvImageId nImage = GetImageId_Impl( rObject, true, env ); DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" ); return GetImageFromList_Impl(nImage, bBig ? vcl::ImageType::Size26 : vcl::ImageType::Size16); } OUString SvFileInformationManager::GetFileImageId(const INetURLObject& rObject) { - SvImageId nImage = GetImageId_Impl( rObject, false ); + SvImageId nImage = GetImageId_Impl( + rObject, false, utl::UCBContentHelper::getDefaultCommandEnvironment() ); DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" ); return GetImageNameFromList_Impl(nImage, vcl::ImageType::Size16); } Image SvFileInformationManager::GetImageNoDefault(const INetURLObject& rObject, vcl::ImageType eImageType) { - SvImageId nImage = GetImageId_Impl(rObject, true); + SvImageId nImage = GetImageId_Impl( + rObject, true, utl::UCBContentHelper::getDefaultCommandEnvironment()); DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" ); if ( nImage == SvImageId::File ) |