diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-08 10:06:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-08 14:05:58 +0100 |
| commit | 832e5aadbff006ec24959162c29756fe2b1982be (patch) | |
| tree | 9c258056fec29b0defaf012f8cb0945efed2b2e0 /sw/source/ui/dbui | |
| parent | c811c0706f0ecf3400e8fcc510ca283dd593237f (diff) | |
Related: fdo#38838 remove UniString::SearchAndReplaceAll
Change-Id: I093c95b8700b628375d69293022f7d4b8da2af9c
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbui.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 09b235731120..f1b58e2975e7 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -66,9 +66,9 @@ CreateMonitor::CreateMonitor( Window *pParent ) void CreateMonitor::UpdateCountingText() { - String sText(m_sCountingPattern); - sText.SearchAndReplaceAll( m_sVariable_Total, OUString::number( m_nTotalCount ) ); - sText.SearchAndReplaceAll( m_sVariable_Position, OUString::number( m_nCurrentPosition ) ); + OUString sText(m_sCountingPattern); + sText = sText.replaceAll( m_sVariable_Total, OUString::number( m_nTotalCount ) ); + sText = sText.replaceAll( m_sVariable_Position, OUString::number( m_nCurrentPosition ) ); m_aCounting.SetText(sText); } diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 34fafc218039..e213d70d8dfd 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -319,8 +319,8 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( sDBName += DB_DELIM; sDBName += String(rData.sCommand); sDBName += DB_DELIM; - String sDatabaseConditionPrefix(sDBName); - sDatabaseConditionPrefix.SearchAndReplaceAll(DB_DELIM, '.'); + OUString sDatabaseConditionPrefix(sDBName); + sDatabaseConditionPrefix = sDatabaseConditionPrefix.replace(DB_DELIM, '.'); sDBName += OUString::number(rData.nCommandType); sDBName += DB_DELIM; |