diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 22:38:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-02 09:58:52 +0000 |
| commit | 057d3225203543f6d0f2d658d884ed11241e88ee (patch) | |
| tree | d9788cfb7ccc6236f107eac63c695337883489bb /sw/source/ui/dbui | |
| parent | c6189de19431869eafcba64428858ff5410f2a98 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 2bdd83ce6f4f..a732303b06f2 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1207,7 +1207,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if(pInStream) { pInStream->SetStreamCharSet( eEncoding ); - ByteString sLine; + rtl::OString sLine; sal_Bool bDone = pInStream->ReadLine( sLine ); while ( bDone ) { diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 1c6917b1d568..6e2e5099c1b3 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1248,7 +1248,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) OSL_FAIL("no output file created?"); continue; } - ByteString sLine; + rtl::OString sLine; sal_Bool bDone = pInStream->ReadLine( sLine ); while ( bDone ) { |