diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-03-02 15:40:14 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-07 19:50:37 +0000 |
| commit | 3bc29af446fd1d9bd267ade1b1a5fca725ca8166 (patch) | |
| tree | 2bde3b590111a78b5020f419f9f8471029f12fdc /svl | |
| parent | e6288a5d889da7db5bf23174f85c29ccfcaa44d5 (diff) | |
fdo#38838 Replaced some use of (Uni)String with OUString.
Change-Id: Iad623c9300919fbae34279268a5a720f978c6434
Reviewed-on: https://gerrit.libreoffice.org/2514
Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/style.hxx | 8 | ||||
| -rw-r--r-- | svl/source/items/style.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 18c0cebcf0fb..e1c1b554ee36 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -83,8 +83,8 @@ protected: SfxStyleFamily nFamily; // Familie UniString aName, aParent, aFollow; - rtl::OUString maDisplayName; - String aHelpFile; // Name der Hilfedatei + OUString maDisplayName; + OUString aHelpFile; // Name der Hilfedatei SfxItemSet* pSet; // ItemSet sal_uInt16 nMask; // Flags @@ -138,8 +138,8 @@ public: virtual sal_Bool IsHidden() const { return bHidden; } virtual void SetHidden( sal_Bool bValue ); - virtual sal_uLong GetHelpId( String& rFile ); - virtual void SetHelpId( const String& r, sal_uLong nId ); + virtual sal_uLong GetHelpId( OUString& rFile ); + virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); virtual sal_uInt16 GetVersion() const; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 614bee831e68..eec3036b22fe 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -284,13 +284,13 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet() // Hilfe-Datei und -ID setzen und abfragen -sal_uLong SfxStyleSheetBase::GetHelpId( String& rFile ) +sal_uLong SfxStyleSheetBase::GetHelpId( OUString& rFile ) { rFile = aHelpFile; return nHelpId; } -void SfxStyleSheetBase::SetHelpId( const String& rFile, sal_uLong nId ) +void SfxStyleSheetBase::SetHelpId( const OUString& rFile, sal_uLong nId ) { aHelpFile = rFile; nHelpId = nId; |