diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 14:43:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 22:03:20 +0200 |
| commit | bfc54ba3d2ac7f7ff40f8b3e95a6bd9b74bcd0c5 (patch) | |
| tree | 77c53f9a88205c47af444b018f4682e539c2c09d /rsc | |
| parent | 11aef9734973dfcacc124205c51e14923c5579fb (diff) | |
cut top layer of detecting used bitmap resources in .src/.res files
Change-Id: I476ff9f55c264983419d5410035c1dfe6e07d5a3
Reviewed-on: https://gerrit.libreoffice.org/37035
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/erscerr.cxx | 1 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index ce67dfd9c60b..a6dcb46cf227 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -151,7 +151,6 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) StdLstOut( "-fs=<filename> Name of the .res file.\n" ); StdLstOut( "-lip=<path> additional search path for system dependent files\n" ); StdLstOut( "-fp=<filename> Renaming of the .srs file.\n" ); - StdLstOut( "-oil=<dir> Output directory for image list files\n" ); StdLstOut( "-sub<ENV>=<path> replace <path> by <ENV> in image list files\n" ); StdLstOut( "-BIGENDIAN Format of number values.\n" ); StdLstOut( "-LITTLEENDIAN Format of number values.\n" ); diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index d1f19b7b103f..e736e618f8af 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -197,10 +197,6 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) aOutputSrs = (*ppStr) + 4; bOutputSrsIsSet = true; } - else if( !rsc_strnicmp( (*ppStr) + 1, "oil=", 4 ) ) - { - aILDir = (*ppStr) + 5; - } else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) ) { // don't check Bitmap, Pointers, Icons nCommands |= CommandFlags::NoSysResTest; @@ -588,11 +584,7 @@ ERRTYPE RscCompiler::Link() aRcTmp = lcl_getTempFile(sTempDirUrl); - OUString sOilDirUrl; - if(!pCL->aILDir.isEmpty()) - sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir); - else - sOilDirUrl = sTempDirUrl; + OUString sOilDirUrl = sTempDirUrl; aSysListTmp = lcl_getTempFile(sOilDirUrl); |