mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ByteString->rtl::OString[Buffer]

Browse Source
This commit is contained in:
Caolán McNamara
2011-09-18 23:12:50 +01:00
parent 2d4db01597
commit 8004d2d6f5
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rsc/inc/rscall.h
View File

@@ -45,12 +45,12 @@ class RscTypCont;
class RscIncList;
/******************* G l o b a l V a r i a b l e s *********************/
extern ByteString* pStdParType;
extern ByteString* pStdPar1;
extern ByteString* pStdPar2;
extern ByteString* pWinParType;
extern ByteString* pWinPar1;
extern ByteString* pWinPar2;
extern rtl::OString* pStdParType;
extern rtl::OString* pStdPar1;
extern rtl::OString* pStdPar2;
extern rtl::OString* pWinParType;
extern rtl::OString* pWinPar1;
extern rtl::OString* pWinPar2;
extern sal_uInt32 nRefDeep;
extern sal_uInt32 nRsc_XYMAPMODEId;
extern sal_uInt32 nRsc_WHMAPMODEId;

7
rsc/source/prj/start.cxx
View File

@@ -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;

16
rsc/source/res/rscall.cxx
View File

@@ -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;

12
rsc/source/rsc/rsc.cxx
View File

@@ -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;