rsc/source/rsc/rsc.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 3b00a7f87b8d428dc8c3d1d0ddb84b74bb2343d4
Author: Miklos Vajna <vmik...@suse.cz>
Date: Thu Mar 21 16:10:06 2013 +0100
RscCmdLine: don't use obsolete DirEntry
Change-Id: I49b2ca742da96ced5326b3e31f3cec35bfaabcc2
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 7489218..3d16351 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" ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
