diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-18 23:12:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-19 09:59:24 +0100 |
| commit | 8004d2d6f516e4dfb1b0b37e257c90249b77f08d (patch) | |
| tree | e69cedd692270f7fdb5b37137b972521a6c8863a /rsc/source | |
| parent | 2d4db01597c2b2df64aaa7ccbe42ed587faba838 (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'rsc/source')
| -rw-r--r-- | rsc/source/prj/start.cxx | 7 | ||||
| -rw-r--r-- | rsc/source/res/rscall.cxx | 16 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 12 |
3 files changed, 20 insertions, 15 deletions
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index be085254354f..78911399faf9 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -47,6 +47,7 @@ #include <rsctools.hxx> #include <rscerror.h> #include <sal/main.h> +#include <rtl/strbuf.hxx> #include <tools/fsys.hxx> /*************** C O D E ************************************************/ @@ -119,9 +120,9 @@ static sal_Bool CallPrePro( const ByteString& rInput, if( fRspFile ) { aRespCmdL.Append( rsc_strdup( "rscpp" ) ); - ByteString aTmpStr( '@' ); - aTmpStr += aRspFileName; - aRespCmdL.Append( rsc_strdup( aTmpStr.GetBuffer() ) ); + rtl::OStringBuffer aTmpStr; + aTmpStr.append('@').append(aRspFileName); + aRespCmdL.Append( rsc_strdup( aTmpStr.getStr() ) ); aRespCmdL.Append( (void *)0 ); pCmdL = &aRespCmdL; diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index 26193d4cae51..62ff12548e12 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -50,13 +50,17 @@ Atom nRsc_EXTRADATA = InvalidAtom; void InitRscCompiler() { - pStdParType = new ByteString( "( const ResId & rResId, sal_Bool" ); - pStdPar1 = new ByteString( '(' ); - pStdPar2 = new ByteString( '(' ); + pStdParType = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + "( const ResId & rResId, sal_Bool")); + pStdPar1 = new rtl::OString('('); + pStdPar2 = new rtl::OString('('); - pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, sal_Bool" ); - pWinPar1 = new ByteString( "( pParent," ); - pWinPar2 = new ByteString( "( this," ); + pWinParType = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + "( Window * pParent, const ResId & rResId, sal_Bool")); + pWinPar1 = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + "( pParent,")); + pWinPar2 = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + "( this,")); nRefDeep = 10; nRsc_XYMAPMODEId = InvalidAtom; nRsc_WHMAPMODEId = InvalidAtom; diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index fc972c4bc2d5..e026b04bdc63 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -79,12 +79,12 @@ using comphelper::string::getToken; /*************** F o r w a r d s *****************************************/ /*************** G l o b a l e V a r i a b l e n **********************/ -ByteString* pStdParType = NULL; -ByteString* pStdPar1 = NULL; -ByteString* pStdPar2 = NULL; -ByteString* pWinParType = NULL; -ByteString* pWinPar1 = NULL; -ByteString* pWinPar2 = NULL; +rtl::OString* pStdParType = NULL; +rtl::OString* pStdPar1 = NULL; +rtl::OString* pStdPar2 = NULL; +rtl::OString* pWinParType = NULL; +rtl::OString* pWinPar1 = NULL; +rtl::OString* pWinPar2 = NULL; sal_uInt32 nRefDeep = 10; AtomContainer* pHS = NULL; |