diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-07-14 15:21:18 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-16 13:55:41 +0000 |
| commit | 263153842741d7ce21cc0bf1c5296a55a1138024 (patch) | |
| tree | 6fd3dd47fe08b5caa18e894cd4cb3a55576ff4a6 /sw/inc/usrfld.hxx | |
| parent | 6ef38bf1c04de2a0733e5bfd88c483416541d098 (diff) | |
String to OUString
Change-Id: I64f31d8a0bb02a2ecd8fcc993c90ca76923b35fb
Reviewed-on: https://gerrit.libreoffice.org/4924
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc/usrfld.hxx')
| -rw-r--r-- | sw/inc/usrfld.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 85fe469775a7..f529c32f2b2c 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -33,19 +33,19 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType bool bDeleted : 1; double nValue; OUString aName; - String aContent; + OUString aContent; sal_uInt16 nType; public: - SwUserFieldType( SwDoc* pDocPtr, const String& ); + SwUserFieldType( SwDoc* pDocPtr, const OUString& ); - virtual const OUString& GetName() const; + virtual OUString GetName() const; virtual SwFieldType* Copy() const; - String Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); + OUString Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); - String GetContent( sal_uInt32 nFmt = 0 ); - void SetContent( const String& rStr, sal_uInt32 nFmt = 0 ); + OUString GetContent( sal_uInt32 nFmt = 0 ); + void SetContent( const OUString& rStr, sal_uInt32 nFmt = 0 ); inline bool IsValid() const; inline void ChgValid( bool bNew ); @@ -93,7 +93,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField { sal_uInt16 nSubType; - virtual String Expand() const; + virtual OUString Expand() const; virtual SwField* Copy() const; public: @@ -105,10 +105,10 @@ public: virtual double GetValue() const; virtual void SetValue( const double& rVal ); - virtual String GetFieldName() const; + virtual OUString GetFieldName() const; // Name cannot be changed. - virtual const OUString& GetPar1() const; + virtual OUString GetPar1() const; // Content. virtual OUString GetPar2() const; |