diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-27 16:44:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:11 +0200 |
| commit | 25994daa3a186a504c4f1b88bc251a89b96f0d47 (patch) | |
| tree | 94777dcf63f5e88485112a3b6271a20343fd74d2 /sw/source | |
| parent | fc8f0f12805522504642a68af76b495d588883e4 (diff) | |
convert include/sfx2/childwin.hxx from String to OUString
Change-Id: Ide6e1751879c9702299df37c8f14ebed22d31a34
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 26 | ||||
| -rw-r--r-- | sw/source/ui/inc/redlndlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index d6ca744acfe8..8929bb968906 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -71,16 +71,16 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, const OUString sFindNm = OUString::createFromAscii( pStream ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); - if( STRING_NOTFOUND != nStt ) + sal_Int32 nEnd, nStt = GetExtraData().indexOf( sFindNm ); + if( -1 != nStt ) { nStt += nDialogExtraDataLen; - nEnd = GetExtraData().Search( cDialogExtraDataClose, nStt ); - if( STRING_NOTFOUND != nEnd ) + nEnd = GetExtraData().indexOf( cDialogExtraDataClose, nStt ); + if( -1 != nEnd ) { - aOpt.ReadUserData( GetExtraData().Copy( nStt, nEnd - nStt )); + aOpt.ReadUserData( GetExtraData().copy( nStt, nEnd - nStt )); nStt -= nDialogExtraDataLen; - GetExtraData().Erase( nStt, nEnd - nStt + 1 ); + GetExtraData() = GetExtraData().replaceAt( nStt, nEnd - nStt + 1, "" ); } } } @@ -266,19 +266,19 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) const OUString sFindNm = OUString::createFromAscii( m_pFontLB->IsVisible() ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); - if( STRING_NOTFOUND != nStt ) + sal_Int32 nEnd, nStt = GetExtraData().indexOf( sFindNm ); + if( -1 != nStt ) { // called twice, so remove "old" settings - nEnd = GetExtraData().Search( cDialogExtraDataClose, + nEnd = GetExtraData().indexOf( cDialogExtraDataClose, nStt + nDialogExtraDataLen ); - if( STRING_NOTFOUND != nEnd ) - GetExtraData().Erase( nStt, nEnd - nStt + 1 ); + if( -1 != nEnd ) + GetExtraData() = GetExtraData().replaceAt( nStt, nEnd - nStt + 1, "" ); } - String sTmp(GetExtraData()); + OUString sTmp(GetExtraData()); sTmp += sFindNm; sTmp += sData; - sTmp += cDialogExtraDataClose; + sTmp += OUString(cDialogExtraDataClose); GetExtraData() = sTmp; } } diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index f7e14079a13f..41671a60b0c2 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -127,7 +127,7 @@ public: void CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ); void Initialize(const String &rExtraData); - void FillInfo(String &rExtraData) const; + void FillInfo(OUString &rExtraData) const; virtual void Activate(); }; diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index c5c556d8039e..870ca9ace524 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1196,20 +1196,20 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData) } } -void SwRedlineAcceptDlg::FillInfo(String &rExtraData) const +void SwRedlineAcceptDlg::FillInfo(OUString &rExtraData) const { - rExtraData.AppendAscii("AcceptChgDat:("); + rExtraData += "AcceptChgDat:("; sal_uInt16 nCount = pTable->TabCount(); rExtraData += OUString::number(nCount); - rExtraData += ';'; + rExtraData += ";"; for(sal_uInt16 i = 0; i < nCount; i++) { rExtraData += OUString::number( pTable->GetTab(i) ); - rExtraData += ';'; + rExtraData += ";"; } - rExtraData += ')'; + rExtraData += ")"; } |