diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-15 13:51:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:23 +0200 |
| commit | 018785fb6634b88da03eaddee53faf5adf4107f5 (patch) | |
| tree | 3e743da96e73b896a1a537b0a959a8ccb1c8b88d | |
| parent | 7e2742b00910b981f23c4cfa26d7e025a8dc786a (diff) | |
convert include/svtools/imagemgr.hxx from String to OUString
Change-Id: Ie28bc106080b495364162133bd86ff5c618cdb77
| -rw-r--r-- | include/svtools/imagemgr.hxx | 12 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 860190f835a3..a46fbae58153 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -24,7 +24,9 @@ #include "sal/types.h" class Image; -class String; +namespace rtl { + class OUString; +}; class INetURLObject; namespace svtools { @@ -61,7 +63,7 @@ struct VolumeInfo class SvFileInformationManager { private: - SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); + SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); public: SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); @@ -69,9 +71,9 @@ public: SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False ); SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False ); - SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo ); + SVT_DLLPUBLIC static rtl::OUString GetDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static rtl::OUString GetFileDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static rtl::OUString GetFolderDescription( const svtools::VolumeInfo& rInfo ); }; #endif diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 6a828f4125f7..0eea288eac17 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -522,7 +522,7 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig ) return Image(); } -String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ) +OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ) { OUString sExtension(rObject.getExtension()); String sDescription, sURL( rObject.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -631,17 +631,17 @@ Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo return GetImageFromList_Impl( nImage, bBig ); } -String SvFileInformationManager::GetDescription( const INetURLObject& rObject ) +OUString SvFileInformationManager::GetDescription( const INetURLObject& rObject ) { return SvFileInformationManager::GetDescription_Impl( rObject, sal_True ); } -String SvFileInformationManager::GetFileDescription( const INetURLObject& rObject ) +OUString SvFileInformationManager::GetFileDescription( const INetURLObject& rObject ) { return SvFileInformationManager::GetDescription_Impl( rObject, sal_False ); } -String SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo ) +OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo ) { sal_uInt16 nResId = STR_DESCRIPTION_FOLDER; if ( rInfo.m_bIsRemote ) |