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/authfld.hxx | |
| parent | avoid unused warning in non-debug build (diff) | |
| download | core-263153842741d7ce21cc0bf1c5296a55a1138024.tar.gz core-263153842741d7ce21cc0bf1c5296a55a1138024.zip | |
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/authfld.hxx')
| -rw-r--r-- | sw/inc/authfld.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 7df89db5f97f..516120b0b4ef 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -27,16 +27,16 @@ class SwAuthEntry { - String aAuthFields[AUTH_FIELD_END]; + OUString aAuthFields[AUTH_FIELD_END]; sal_uInt16 nRefCount; public: SwAuthEntry() : nRefCount(0){} SwAuthEntry( const SwAuthEntry& rCopy ); sal_Bool operator==(const SwAuthEntry& rComp); - inline const String& GetAuthorField(ToxAuthorityField ePos)const; + inline OUString GetAuthorField(ToxAuthorityField ePos) const; inline void SetAuthorField(ToxAuthorityField ePos, - const String& rField); + const OUString& rField); void AddRef() { ++nRefCount; } void RemoveRef() { --nRefCount; } @@ -67,7 +67,7 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType sal_Bool m_bIsSequence :1; sal_Bool m_bSortByDocument :1; LanguageType m_eLanguage; - String m_sSortAlgorithm; + OUString m_sSortAlgorithm; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); @@ -84,7 +84,7 @@ public: inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } void RemoveField(sal_IntPtr nHandle); - sal_IntPtr AddField(const String& rFieldContents); + sal_IntPtr AddField(const OUString& rFieldContents); sal_Bool AddField(sal_IntPtr nHandle); void DelSequenceArray() { @@ -93,8 +93,8 @@ public: const SwAuthEntry* GetEntryByHandle(sal_IntPtr nHandle) const; - void GetAllEntryIdentifiers( std::vector<String>& rToFill )const; - const SwAuthEntry* GetEntryByIdentifier(const String& rIdentifier)const; + void GetAllEntryIdentifiers( std::vector<OUString>& rToFill ) const; + const SwAuthEntry* GetEntryByIdentifier(const OUString& rIdentifier) const; bool ChangeEntryContent(const SwAuthEntry* pNewEntry); // import interface @@ -130,14 +130,14 @@ public: void SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey nKeys[]); //initui.cxx - static const String& GetAuthFieldName(ToxAuthorityField eType); - static const String& GetAuthTypeName(ToxAuthorityType eType); + static OUString GetAuthFieldName(ToxAuthorityField eType); + static OUString GetAuthTypeName(ToxAuthorityType eType); LanguageType GetLanguage() const {return m_eLanguage;} void SetLanguage(LanguageType nLang) {m_eLanguage = nLang;} - const String& GetSortAlgorithm()const {return m_sSortAlgorithm;} - void SetSortAlgorithm(const String& rSet) {m_sSortAlgorithm = rSet;} + OUString GetSortAlgorithm() const {return m_sSortAlgorithm;} + void SetSortAlgorithm(const OUString& rSet) {m_sSortAlgorithm = rSet;} }; @@ -146,15 +146,15 @@ class SwAuthorityField : public SwField sal_IntPtr m_nHandle; mutable sal_IntPtr m_nTempSequencePos; - virtual String Expand() const; + virtual OUString Expand() const; virtual SwField* Copy() const; public: - SwAuthorityField(SwAuthorityFieldType* pType, const String& rFieldContents); + SwAuthorityField(SwAuthorityFieldType* pType, const OUString& rFieldContents); SwAuthorityField(SwAuthorityFieldType* pType, sal_IntPtr nHandle); ~SwAuthorityField(); - const String& GetFieldText(ToxAuthorityField eField) const; + OUString GetFieldText(ToxAuthorityField eField) const; virtual void SetPar1(const OUString& rStr); virtual SwFieldType* ChgTyp( SwFieldType* ); @@ -164,16 +164,16 @@ public: sal_IntPtr GetHandle() const { return m_nHandle; } - virtual String GetDescription() const; + virtual OUString GetDescription() const; }; // --- inlines ----------------------------------------------------------- -inline const String& SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const +inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const { OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index"); return aAuthFields[ePos]; } -inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const String& rField) +inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const OUString& rField) { OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index"); if(AUTH_FIELD_END > ePos) |