diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:26:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:26:04 +0000 |
| commit | 3c42f5bae1ff9771fbbf474b3c7d4f61a0eca2f1 (patch) | |
| tree | f85c2535f3af0f796937622abfe2bdf3fabb2c70 /cppuhelper | |
| parent | f953850b122fb4c5b96b3ef7074d4ce16c5c1298 (diff) | |
INTEGRATION: CWS os2port01 (1.23.16); FILE MERGED
2007/09/05 07:06:28 obr 1.23.16.3: RESYNC: (1.27-1.28); FILE MERGED
2007/07/13 14:15:14 obr 1.23.16.2: RESYNC: (1.23-1.27); FILE MERGED
2006/12/28 14:53:53 ydario 1.23.16.1: OS/2 initial import.
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 1f82f0b32..c7f292040 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shlib.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: obo $ $Date: 2007-07-18 12:18:14 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:26:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -246,15 +246,18 @@ static OUString makeComponentPath( if (rPath[ rPath.getLength() -1 ] != '/') buf.append( (sal_Unicode) '/' ); } - sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) ); if (nEnd < 0) // !endsWith { +#ifndef OS2 +//this is always triggered with .uno components #if (OSL_DEBUG_LEVEL >= 2) OSL_ENSURE( !"### library name has no proper extension!", OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif +#endif // OS2 + #if defined SAL_DLLPREFIX nEnd = endsWith( rLibName, OUSTR(".uno") ); if (nEnd < 0) // !endsWith |