diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 11:16:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 13:29:58 +0100 |
| commit | 6fc5a80009d7426c30d2b9656f76549536b45bb0 (patch) | |
| tree | 6980ee1f9d4320b68b2ae8f516d6aebc9f852dbd /rsc | |
| parent | 87bd657a2653eadc09d97f2897121947c8ebe5a3 (diff) | |
aSearchPath is write only
Change-Id: I2dd8c4b9db53ed2c575500d2b00e90d5a99ac6e4
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rscdb.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/prj/gui.cxx | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index e45d4a778aa6..40147318a0df 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -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 ); diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index e61532613769..8ff1da5acf1e 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -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 diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index 3a0f0609ca19..10b3565dcaac 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -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 ) |