diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-20 09:49:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
| commit | 9dc41e228dd60c60a4364d26270c9769d2939ded (patch) | |
| tree | 960bad38180b7cc8d185e392fc67df8975eecf00 /include/svx | |
| parent | fd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff) | |
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/gallery.hxx | 5 | ||||
| -rw-r--r-- | include/svx/galmisc.hxx | 10 | ||||
| -rw-r--r-- | include/svx/nbdtmg.hxx | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index 2f6f40b01af3..bae89c2e4931 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -52,11 +52,10 @@ class SVX_DLLPUBLIC GalleryExplorer { public: - static bool FillThemeList( std::vector<String>& rThemeList ); + static bool FillThemeList( std::vector<OUString>& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL - static sal_Bool FillObjList( const OUString& rThemeName, std::vector<String> &rObjList ); - static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); + static sal_Bool FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList ); static bool FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index eb71af77ab2f..7411f0c49aee 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -84,18 +84,20 @@ class FmFormModel; class ImageMap; class Gallery; -SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); +SVX_DLLPUBLIC ResMgr* + GetGalleryResMgr(); 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 OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ); -String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); +SVX_DLLPUBLIC OUString + GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ); +OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); sal_Bool FileExists( const INetURLObject& rURL ); sal_Bool CreateDir( const INetURLObject& rURL ); sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); sal_Bool KillFile( const INetURLObject& rURL ); -BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); +BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); class SgaIMapInfo : public SdrObjUserData, public SfxListener { diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 3ee4a84af154..4ce8af4445de 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -196,14 +196,14 @@ class SVX_DLLPUBLIC NBOTypeMgrBase : eType(aType) , pSet(0) , eCoreUnit(SFX_MAPUNIT_TWIP) - , aNumCharFmtName(String()) + , aNumCharFmtName(OUString()) , bIsLoading(false) {} NBOTypeMgrBase(const NBOType aType,const SfxItemSet* pArg) : eType(aType) , pSet(pArg) , eCoreUnit(SFX_MAPUNIT_TWIP) - , aNumCharFmtName(String()) + , aNumCharFmtName(OUString()) , bIsLoading(false) {} NBOTypeMgrBase(const NBOTypeMgrBase& aTypeMgr) @@ -230,8 +230,8 @@ class SVX_DLLPUBLIC NBOTypeMgrBase SfxMapUnit GetMapUnit(); protected: bool bIsLoading; - void ImplLoad(String filename); - void ImplStore(String filename); + void ImplLoad(OUString filename); + void ImplStore(OUString filename); }; |