Kaydet (Commit) 0cba5e5d authored tarafından Christophe JAILLET's avatar Christophe JAILLET Kaydeden (comit) Eike Rathke

This look like the same as rLibName.endsWithIgnoreAsciiCase so kill it. Add missing { }

Untested as I don't have a working build environment yet.

Change-Id: I1988da8c07729eb99d3f53f71b8f950df29a7361
üst 06b6a1da
...@@ -209,19 +209,6 @@ static bool checkAccessPath( OUString * pComp ) throw () ...@@ -209,19 +209,6 @@ static bool checkAccessPath( OUString * pComp ) throw ()
} }
} }
//------------------------------------------------------------------------------
static inline sal_Int32 endsWith(
const OUString & rText, const OUString & rEnd ) SAL_THROW(())
{
if (rText.getLength() >= rEnd.getLength() &&
rEnd.equalsIgnoreAsciiCase(
rText.copy( rText.getLength() - rEnd.getLength() ) ))
{
return rText.getLength() - rEnd.getLength();
}
return -1;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static OUString makeComponentPath( static OUString makeComponentPath(
const OUString & rLibName, const OUString & rPath ) const OUString & rLibName, const OUString & rPath )
...@@ -247,13 +234,13 @@ static OUString makeComponentPath( ...@@ -247,13 +234,13 @@ static OUString makeComponentPath(
if (rPath[ rPath.getLength() -1 ] != '/') if (rPath[ rPath.getLength() -1 ] != '/')
buf.append( (sal_Unicode) '/' ); buf.append( (sal_Unicode) '/' );
} }
sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) ); if (! rLibName.endsWithIgnoreAsciiCase( OUSTR(SAL_DLLEXTENSION) ))
if (nEnd < 0) // !endsWith
{ {
#if defined SAL_DLLPREFIX #if defined SAL_DLLPREFIX
nEnd = endsWith( rLibName, OUSTR(".uno") ); if (! rLibName.endsWithIgnoreAsciiCase( OUSTR(".uno") ))
if (nEnd < 0) // !endsWith {
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) );
}
#endif #endif
buf.append( rLibName ); buf.append( rLibName );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) );
......
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