[Libreoffice-commits] core.git: rsc/source

[Michael Stahl]

 rsc/source/rsc/rsc.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3b5497f258fce37eebfc33536bfabb9016575cb5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 21 20:35:45 2013 +0100

    Revert "RscCmdLine: don't use obsolete DirEntry"
    
    This reverts commit 3b00a7f87b8d428dc8c3d1d0ddb84b74bb2343d4.
    
    Breaks the build on windows, requires adapting
    RscCompiler::GetImageFilePath() to match.

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 3d16351..7489218 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -167,10 +167,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
                     ;
                 if( *pEqual )
                 {
-                    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) );
+                    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) ) );
                 }
             }
             else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )