diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 15:25:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 15:25:04 +0000 |
| commit | 9eb23bb50e0863cc9ac7f683ebc657adde53bb7d (patch) | |
| tree | 685a53329068449ee1e505892ee6f3c308e58273 /cppuhelper | |
| parent | 69f3d1b9e6f833fad6af0ac4768e5441542b5f5b (diff) | |
INTEGRATION: CWS uno2 (1.18.2); FILE MERGED
2003/04/08 09:50:12 dbo 1.18.2.1: #107991# UNO shared library component renaming
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 02966f26ac32..6d629a3a5dbc 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shlib.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:35:26 $ + * last change: $Author: rt $ $Date: 2003-04-23 16:25:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,8 +258,15 @@ static OUString makeComponentPath( sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) ); if (nEnd < 0) // !endsWith { +#if (OSL_DEBUG_LEVEL >= 2) + OSL_ENSURE( + !"### library name has no proper extension!", + OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); +#endif #if defined SAL_DLLPREFIX - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) ); + nEnd = endsWith( rLibName, OUSTR(".uno") ); + if (nEnd < 0) // !endsWith + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) ); #endif buf.append( rLibName ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) ); |