diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-21 16:10:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-21 16:11:03 +0100 |
| commit | 3b00a7f87b8d428dc8c3d1d0ddb84b74bb2343d4 (patch) | |
| tree | fe5cca1fa9f2ec4f991ade340f3d83b8809b34c1 /rsc | |
| parent | 4e69b35674882d8d675a677940805b187cad0bc3 (diff) | |
RscCmdLine: don't use obsolete DirEntry
Change-Id: I49b2ca742da96ced5326b3e31f3cec35bfaabcc2
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 74892184c296..3d163514c9ac 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -167,11 +167,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) ; if( *pEqual ) { - const rtl::OString aSPath( pEqual + 1 ); - DirEntry aSDir(rtl::OStringToOUString(aSPath, RTL_TEXTENCODING_ASCII_US)); - - m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), - rtl::OUStringToOString(aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US) ) ); + OString aSPath(pEqual + 1); + if (aSPath.endsWith(OString(SAL_PATHDELIMITER))) + aSPath = aSPath.copy(0, aSPath.getLength()-1); + m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), aSPath) ); } } else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) ) |