Kaydet (Commit) 6fc5a800 authored tarafından Caolán McNamara's avatar Caolán McNamara

aSearchPath is write only

Change-Id: I2dd8c4b9db53ed2c575500d2b00e90d5a99ac6e4
üst 87bd657a
......@@ -62,7 +62,6 @@ class RscTypCont
RSCBYTEORDER_TYPE nByteOrder; // Intel or
OString aLanguage; // output language
std::vector< sal_uInt32 > aLangFallbacks; // language fallback list (entry 0 is language itself)
OString aSearchPath; // search path for bitmap, icon and pointer
sal_uInt32 nUniqueId; // unique id for system resources
sal_uLong nFilePos; // position in file (MTF)
sal_uInt32 nPMId; // unique id for PR-resource file
......@@ -97,7 +96,7 @@ public:
CommandFlags nFlags;
std::map<sal_uInt64, sal_uLong> aIdTranslator; // map resources types and ids to an id (under PM9 or to a file position (MTF)
RscTypCont( RscError *, RSCBYTEORDER_TYPE, const OString& rSearchPath, CommandFlags nFlags );
RscTypCont( RscError *, RSCBYTEORDER_TYPE, CommandFlags nFlags );
~RscTypCont();
Atom AddLanguage( const char* );
......@@ -113,7 +112,6 @@ public:
{
nSourceCharSet = aCharSet;
}
const OString& GetSearchPath() const { return aSearchPath; }
// deletes all resource objects of this file
void Delete( RscFileTab::Index lFileKey );
sal_uInt32 PutSysName( RESOURCE_TYPE nRscTyp, char * pName );
......
......@@ -36,11 +36,9 @@
RscTypCont::RscTypCont( RscError * pErrHdl,
RSCBYTEORDER_TYPE nOrder,
const OString& rSearchPath,
CommandFlags nFlagsP )
: nSourceCharSet( RTL_TEXTENCODING_UTF8 )
, nByteOrder( nOrder )
, aSearchPath( rSearchPath )
, nUniqueId(256)
, nFilePos( 0 )
, nPMId(RSC_VERSIONCONTROL + RESOURCE_TYPE(1)) // at least one more
......
......@@ -53,7 +53,6 @@ int rsc2_main( int argc, char **argv )
std::unique_ptr<RscCmdLine> pCmdLine(new RscCmdLine( argc, argv, pErrHdl.get() ));
std::unique_ptr<RscTypCont> pTypCont(new RscTypCont( pErrHdl.get(),
pCmdLine->nByteOrder,
pCmdLine->aPath,
pCmdLine->nCommands ));
if( pErrHdl->nErrors )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment