diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-18 22:29:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-19 13:38:46 +0000 |
| commit | c251139ca22e10f21cf5e4f23df2a1d10fc3925f (patch) | |
| tree | 9f1d4ab35048c2ba2a1c4e078675aa2496db8cb8 /tools | |
| parent | 25ee58aeafc85412a727d6d816e914e5fa83ac17 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootstrp/mkunroll/mkunroll.cxx | 5 | ||||
| -rw-r--r-- | tools/source/fsys/unx.cxx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/bootstrp/mkunroll/mkunroll.cxx b/tools/bootstrp/mkunroll/mkunroll.cxx index d315af5b6305..9068ee240088 100644 --- a/tools/bootstrp/mkunroll/mkunroll.cxx +++ b/tools/bootstrp/mkunroll/mkunroll.cxx @@ -210,9 +210,8 @@ void MkFilter::Filter() for ( size_t i=0; i<nCount; i++ ) { MkLine *pMkLine = (*pLine->pPrivateTnrLst)[ i ]; - ByteString aLine = pMkLine->aLine; - while( aLine.SearchAndReplace( aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n)) ) != (sal_uInt16)-1 ) ; - fputs( aLine.GetBuffer(), pOut ); + rtl::OString aLine = pMkLine->aLine.replaceAll(aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n))); + fputs( aLine.getStr(), pOut ); fprintf( stderr, "o" ); } } diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 007dc81d951c..1e3f408260c3 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -75,9 +75,9 @@ struct mnttab struct mymnttab { dev_t mountdevice; - ByteString mountspecial; - ByteString mountpoint; - ByteString mymnttab_filesystem; + rtl::OString mountspecial; + rtl::OString mountpoint; + rtl::OString mymnttab_filesystem; mymnttab() { mountdevice = (dev_t) -1; } }; |