summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-09-15 12:43:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-15 13:02:24 +0200
commit27be81819064cb96d98c881f45d6e3fbdf7a33d0 (patch)
treef182a2979a2c0df28f21c1fa0634d56bc772500f /rsc
parentf7ae11ce60c0d1d63e09041e621f9e95bb952847 (diff)
loplugin:singlevalfields in l10ntools..sax
and ignore URE headers in the plugin Change-Id: I939df744c1173cf0f67d515f6c3fb4ac4cb25588
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscpar.hxx2
-rw-r--r--rsc/inc/rscrsc.hxx1
-rw-r--r--rsc/source/parser/rscpar.cxx2
-rw-r--r--rsc/source/rsc/rsc.cxx6
4 files changed, 3 insertions, 8 deletions
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 41d83fd9e3d8..695ea6e3e988 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -37,7 +37,7 @@ class RscFileInst
sal_uLong lSrcIndex; // Index auf Basisdatei
FILE * fInputFile; // Eingabedatei
char * pInput; // Lesepuffer
- sal_uInt32 nInputBufLen; // Laenge des Lesepuffers
+ static const sal_uInt32 nInputBufLen = READBUFFER_MAX; // Laenge des Lesepuffers
sal_uInt32 nInputPos; // Position im Lesepuffer
sal_uInt32 nInputEndPos;// Ende im Lesepuffer
char * pLine; // Zeile
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 2be76161f46f..7e8349701fec 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -80,7 +80,6 @@ private:
public:
RscTypCont* pTC; // string and id manager
RscCmdLine* pCL; // command line
- FILE * fListing; // output file for listings
FILE * fExitFile; // when deconstructed, this file must be deleted
RscCompiler( RscCmdLine *, RscTypCont * );
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 23ce975d7168..d81d3aae9c57 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -45,7 +45,7 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
fInputFile = fFile;
// state: pointer at the end of the input buffer
- nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX;
+ nInputPos = nInputEndPos = READBUFFER_MAX;
pInput = static_cast<char *>(rtl_allocateMemory( nInputBufLen ));
}
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 049d1b70f510..23e7debaf24e 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -296,7 +296,6 @@ OString RscCmdLine::substitutePaths( const OString& rIn )
RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
{
- fListing = nullptr;
fExitFile = nullptr;
//Set Command Line, set Type Container
@@ -308,9 +307,6 @@ RscCompiler::~RscCompiler()
{
pTC->pEH->SetListFile( nullptr );
- if( fListing )
- fclose( fListing );
-
if( fExitFile )
fclose( fExitFile );
}
@@ -346,7 +342,7 @@ ERRTYPE RscCompiler::Start()
aIndex = pTC->aFileTab.NextIndex( aIndex );
}
- pTC->pEH->SetListFile( fListing );
+ pTC->pEH->SetListFile( nullptr );
}
}