diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 13:45:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:43 +0200 |
| commit | 892acc2cde181d082820d2e3af5e7f3b8be7964f (patch) | |
| tree | 41201064590930dcf0eda92c129fd2eb7699c4de /include/svx | |
| parent | 6b8a2089f9fe1a74f697982d64cb9deed9ec0a46 (diff) | |
convert include/svx/galmisc.hxx from String to OUString
Change-Id: If0677c6b38ddbac4f039c0e2e5a6db59491d454c
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/galmisc.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 16f84cbe907b..eb71af77ab2f 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -37,7 +37,7 @@ class GalleryTheme; struct ExchangeData { GalleryTheme* pTheme; - String aEditedTitle; + OUString aEditedTitle; Date aThemeChangeDate; Time aThemeChangeTime; @@ -78,7 +78,6 @@ enum SgaObjKind #define GALLERY_DLG_COLOR Application::GetSettings().GetStyleSettings().GetDialogColor() class ResMgr; -class String; class SvStream; class Graphic; class FmFormModel; @@ -86,10 +85,10 @@ class ImageMap; class Gallery; SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); -sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False ); +sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, sal_Bool bShowProgress = sal_False ); sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); -SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen ); +SVX_DLLPUBLIC OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ); String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); sal_Bool FileExists( const INetURLObject& rURL ); @@ -205,10 +204,10 @@ private: public: - GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const OUString& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {} - GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const OUString& rThemeName, const OUString& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} sal_uIntPtr GetType() const { return mnType; } |