diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 11:15:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 13:29:58 +0100 |
| commit | 87bd657a2653eadc09d97f2897121947c8ebe5a3 (patch) | |
| tree | a5da357745a829f38e49cc589e37560334255841 /rsc | |
| parent | 18120258b3e4c5e93e5d4ca8d6bfb1a8a3e9a7b8 (diff) | |
aSysSearchPath is write only
Change-Id: Ic88f12c1e6cb379150cb9521a9468244d6ce0cc5
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 088ffed16a65..e45d4a778aa6 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -63,7 +63,6 @@ class RscTypCont 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 - OString aSysSearchPath; // aSearchPath plus language specific paths sal_uInt32 nUniqueId; // unique id for system resources sal_uLong nFilePos; // position in file (MTF) sal_uInt32 nPMId; // unique id for PR-resource file @@ -115,7 +114,6 @@ public: nSourceCharSet = aCharSet; } const OString& GetSearchPath() const { return aSearchPath; } - void SetSysSearchPath( const OString& rStr ) { aSysSearchPath = rStr; } // 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/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 9b5e44aef736..d1f19b7b103f 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -616,27 +616,9 @@ ERRTYPE RscCompiler::Link() pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); // write file - sal_Char cSearchDelim = SAL_PATHSEPARATOR; - sal_Char cAccessDelim = SAL_PATHDELIMITER; pTC->ChangeLanguage( it->aLangName ); pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); pTC->ClearSysNames(); - OStringBuffer aSysSearchPath(it->aLangSearchPath); - sal_Int32 nIndex = 0; - OString aSearchPath = pTC->GetSearchPath(); - do - { - OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex ); - if (!aSysSearchPath.isEmpty()) - aSysSearchPath.append(cSearchDelim); - aSysSearchPath.append(aToken); - aSysSearchPath.append(cAccessDelim); - aSysSearchPath.append(it->aLangName); - aSysSearchPath.append(cSearchDelim); - aSysSearchPath.append(aToken); - } - while ( nIndex >= 0 ); - pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear()); WriteRcContext aContext; |