Kaydet (Commit) 3b5497f2 authored tarafından Michael Stahl's avatar Michael Stahl

Revert "RscCmdLine: don't use obsolete DirEntry"

This reverts commit 3b00a7f8.

Breaks the build on windows, requires adapting
RscCompiler::GetImageFilePath() to match.
üst c49d0ba3
...@@ -167,10 +167,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) ...@@ -167,10 +167,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
; ;
if( *pEqual ) if( *pEqual )
{ {
OString aSPath(pEqual + 1); const rtl::OString aSPath( pEqual + 1 );
if (aSPath.endsWith(OString(SAL_PATHDELIMITER))) DirEntry aSDir(rtl::OStringToOUString(aSPath, RTL_TEXTENCODING_ASCII_US));
aSPath = aSPath.copy(0, aSPath.getLength()-1);
m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), aSPath) ); m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
rtl::OUStringToOString(aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US) ) );
} }
} }
else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) ) else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
......
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