summaryrefslogtreecommitdiff
path: root/rsc/source/parser
diff options
context:
space:
mode:
authorPhilipp Lohmann <pl@openoffice.org>2001-11-05 13:44:05 +0000
committerPhilipp Lohmann <pl@openoffice.org>2001-11-05 13:44:05 +0000
commit0e5f97c8966054d8f8e8a637a464cf76f42c09a0 (patch)
treecc25342ac79212aaa9630566d9299f8dce95b780 /rsc/source/parser
parentf16282300c1dc099e9e86e4600ebab3a76c7afc3 (diff)
#94297# write multiple .res files in one pass
Diffstat (limited to 'rsc/source/parser')
-rw-r--r--rsc/source/parser/rsclex.cxx6
-rw-r--r--rsc/source/parser/rscpar.cxx16
2 files changed, 6 insertions, 16 deletions
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 1c73549a0608..1b96a6b339c6 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rsclex.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: pl $ $Date: 2001-10-10 11:51:23 $
+ * last change: $Author: pl $ $Date: 2001-11-05 14:44:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -261,9 +261,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
pBuf[i++] = c;
}
pBuf[i++] = '\0';
- //pStr = pTokenVal->string = RscChar::MakeUTF8( pBuf, pFI->GetCharSet() );
pStr = pTokenVal->string = pBuf;
- //PutStringBack( pBuf );
return( STRING );
}
if (isdigit (c)){
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index c79b86dc7e19..ab933b2728ef 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rscpar.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: pl $ $Date: 2001-10-10 11:51:23 $
+ * last change: $Author: pl $ $Date: 2001-11-05 14:44:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,8 +84,6 @@
*************************************************************************/
void RscFileInst::Init()
{
- SetCharSet( RTL_TEXTENCODING_MS_1252 );
-
nLineNo = 0;
nLineBufLen = 256;
pLine = (char *)RscMem::Malloc( nLineBufLen );
@@ -105,8 +103,7 @@ void RscFileInst::Init()
|*
*************************************************************************/
RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, FILE * fFile,
- rtl_TextEncoding nSourceCharSet )
+ ULONG lFIndex, FILE * fFile )
{
pTypCont = pTC;
Init();
@@ -115,16 +112,13 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
lSrcIndex = lIndexSrc;
fInputFile = fFile;
- SetCharSet( nSourceCharSet );
-
//Status: Zeiger am Ende des Lesepuffers
nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX;
pInput = (char *)RscMem::Malloc( nInputBufLen );
}
RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, const ByteString& rBuf,
- rtl_TextEncoding nSourceCharSet )
+ ULONG lFIndex, const ByteString& rBuf )
{
pTypCont = pTC;
Init();
@@ -134,8 +128,6 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
nInputPos = 0;
nInputEndPos = rBuf.Len();
- SetCharSet( nSourceCharSet );
-
// Muss groesser sein wegen Eingabeende bei nInputBufLen < nInputEndPos
nInputBufLen = nInputEndPos +1;
pInput = (char *)RscMem::Malloc( nInputBufLen +100 );