diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:13:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:13:07 +0000 |
| commit | 493dc3cb9516208b5bd5b1ad2290bc01d885f934 (patch) | |
| tree | 7f22e4a0af5a1469f1a867a5454335671cc2169a /cppuhelper/source | |
| parent | e6f38d6ce805f18519aa003ecf47442c4c3dac26 (diff) | |
INTEGRATION: CWS krmisc (1.26.6); FILE MERGED
2006/10/10 11:43:14 kr 1.26.6.2: fixed warning sols: use oslGenericFunction
2006/10/09 14:57:59 kr 1.26.6.1: fixed: issue 54902
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 47061f41b9b5..42fc82d221e4 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:39:21 $ + * last change: $Author: rt $ $Date: 2006-10-27 12:13:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,14 +85,13 @@ using namespace ::com::sun::star::uno; namespace cppu { -extern "C" { static void SAL_CALL MyDummySymbolWithinLibrary(){} } OUString const & get_this_libpath() { static OUString s_path; if (0 == s_path.getLength()) { OUString path; - Module::getUrlFromAddress( MyDummySymbolWithinLibrary, path ); + Module::getUrlFromAddress( reinterpret_cast<oslGenericFunction>(get_this_libpath), path ); path = path.copy( 0, path.lastIndexOf( '/' ) ); MutexGuard guard( Mutex::getGlobalMutex() ); if (0 == s_path.getLength()) |