diff options
-rw-r--r-- | sw/inc/redline.hxx | 22 | ||||
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index e6d0d9948709..df7a92b18562 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -51,11 +51,11 @@ public: class SwRedlineExtraData_FmtColl : public SwRedlineExtraData { - String sFmtNm; + OUString sFmtNm; SfxItemSet* pSet; sal_uInt16 nPoolId; public: - SwRedlineExtraData_FmtColl( const String& rColl, sal_uInt16 nPoolFmtId, + SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId, const SfxItemSet* pSet = 0 ); virtual ~SwRedlineExtraData_FmtColl(); virtual SwRedlineExtraData* CreateNew() const; @@ -86,7 +86,7 @@ class SW_DLLPUBLIC SwRedlineData SwRedlineData* pNext; // Points to other data. SwRedlineExtraData* pExtraData; - String sComment; + OUString sComment; DateTime aStamp; RedlineType_t eType; sal_uInt16 nAuthor, nSeqNo; @@ -97,7 +97,7 @@ public: // For sw3io: pNext/pExtraData are taken over. SwRedlineData( RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, - const String& rCmnt, SwRedlineData* pNxt, + const OUString& rCmnt, SwRedlineData* pNxt, SwRedlineExtraData* pExtraData = 0 ); ~SwRedlineData(); @@ -120,11 +120,11 @@ public: { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } RedlineType_t GetRealType() const { return eType; } sal_uInt16 GetAuthor() const { return nAuthor; } - const String& GetComment() const { return sComment; } + const OUString& GetComment() const { return sComment; } const DateTime& GetTimeStamp() const { return aStamp; } inline const SwRedlineData* Next() const{ return pNext; } - void SetComment( const String& rS ) { sComment = rS; } + void SetComment( const OUString& rS ) { sComment = rS; } void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; } void SetAutoFmtFlag() @@ -154,7 +154,7 @@ public: sal_uInt16 GetSeqNo() const { return nSeqNo; } void SetSeqNo( sal_uInt16 nNo ) { nSeqNo = nNo; } - String GetDescr() const; + OUString GetDescr() const; }; @@ -219,10 +219,10 @@ public: const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const; RedlineType_t GetRealType( sal_uInt16 nPos = 0 ) const; RedlineType_t GetType( sal_uInt16 nPos = 0) const - { return ( (RedlineType_t)(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } - const String& GetComment( sal_uInt16 nPos = 0 ) const; + { return ( (RedlineType_t)(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } + const OUString& GetComment( sal_uInt16 nPos = 0 ) const; - void SetComment( const String& rS ) { pRedlineData->SetComment( rS ); } + void SetComment( const OUString& rS ) { pRedlineData->SetComment( rS ); } /** ExtraData gets copied, the pointer is therefor not taken over by * the RedLineObject.*/ @@ -270,7 +270,7 @@ public: @return textual description of the selected redline data element */ - String GetDescr(sal_uInt16 nPos = 0); + OUString GetDescr(sal_uInt16 nPos = 0); int operator==( const SwRedline& ) const; int operator<( const SwRedline& ) const; diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 85225cc28c39..7b394252d523 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2841,7 +2841,7 @@ int SwRedlineExtraData::operator == ( const SwRedlineExtraData& ) const return sal_False; } -SwRedlineExtraData_FmtColl::SwRedlineExtraData_FmtColl( const String& rColl, +SwRedlineExtraData_FmtColl::SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId, const SfxItemSet* pItemSet ) : sFmtNm(rColl), pSet(0), nPoolId(nPoolFmtId) @@ -2997,7 +2997,7 @@ SwRedlineData::SwRedlineData( const SwRedlineData& rCpy, sal_Bool bCpyNext ) // For sw3io: We now own pNext! SwRedlineData::SwRedlineData(RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, - const String& rCmnt, SwRedlineData *pNxt, SwRedlineExtraData* pData) + const OUString& rCmnt, SwRedlineData *pNxt, SwRedlineExtraData* pData) : pNext(pNxt), pExtraData(pData), sComment(rCmnt), aStamp(rDT), eType(eT), nAuthor(nAut), nSeqNo(0) { @@ -3021,9 +3021,9 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData ) pExtraData = 0; } -String SwRedlineData::GetDescr() const +OUString SwRedlineData::GetDescr() const { - String aResult; + OUString aResult; aResult += String(SW_RES(STR_REDLINE_INSERT + GetType())); @@ -3726,7 +3726,7 @@ RedlineType_t SwRedline::GetRealType( sal_uInt16 nPos ) const return GetRedlineData(nPos).eType; } -const String& SwRedline::GetComment( sal_uInt16 nPos ) const +const OUString& SwRedline::GetComment( sal_uInt16 nPos ) const { return GetRedlineData(nPos).sComment; } @@ -3765,9 +3765,9 @@ const SwRedlineData & SwRedline::GetRedlineData(sal_uInt16 nPos) const return *pCur; } -String SwRedline::GetDescr(sal_uInt16 nPos) +OUString SwRedline::GetDescr(sal_uInt16 nPos) { - String aResult; + OUString aResult; // get description of redline data (e.g.: "insert $1") aResult = GetRedlineData(nPos).GetDescr(); diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 6261bf32250f..2068ebd037ae 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -89,7 +89,7 @@ static OUString lcl_GetRedlineHelp( const SwRedline& rRedl, sal_Bool bBalloon ) sBuf.append(rRedl.GetAuthorString()); sBuf.append(" - "); sBuf.append(GetAppLangDateTimeString(rRedl.GetTimeStamp())); - if( bBalloon && rRedl.GetComment().Len() ) + if( bBalloon && !rRedl.GetComment().isEmpty() ) sBuf.append('\n').append(rRedl.GetComment()); } return sBuf.makeStringAndClear(); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index cc25c9606fa3..557687f3eabb 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -433,7 +433,7 @@ void SwRedlineAcceptDlg::Activate() const SwRedline& rRedln = pSh->GetRedline(i); pParent = &aRedlineParents[i]; - if(!rRedln.GetComment().Equals(pParent->sComment)) + if(rRedln.GetComment() != pParent->sComment) { if (pParent->pTLBParent) { |