diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:10:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:10:08 +0000 |
| commit | 97ec73f27963947cd15349c3a603fb0dda4b44d2 (patch) | |
| tree | 3f9d339f22c8dd9f8a6700552af23fac9f32d134 | |
| parent | 700621fd6731d0f39d2342e2276b8c605d5cc8cd (diff) | |
INTEGRATION: CWS sal05 (1.2.12); FILE MERGED
2004/01/05 10:34:58 tra 1.2.12.2: merge conflicts resolved
2003/12/18 10:57:10 tra 1.2.12.1: #i22046#use new osl function Module::getFunctionSymbol and the now correct reinterpret_cast to avoid warnings when compiling with wall
| -rw-r--r-- | shell/source/unix/sysshell/systemshell.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/shell/source/unix/sysshell/systemshell.cxx b/shell/source/unix/sysshell/systemshell.cxx index 87385a985eb4..18aa7ffa205e 100644 --- a/shell/source/unix/sysshell/systemshell.cxx +++ b/shell/source/unix/sysshell/systemshell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: systemshell.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2003-12-01 16:19:33 $ + * last change: $Author: hr $ $Date: 2004-02-03 13:10:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,9 +76,7 @@ namespace SystemShell { rtl::OUString get_absolute_library_url(const rtl::OUString& lib_name) { rtl::OUString url; - // Convert from reinterpret_cast<void*> - // not allowed in gcc3.3 without permissive - if (osl::Module::getUrlFromAddress((void*)(AddToRecentDocumentList), url)) + if (osl::Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(AddToRecentDocumentList), url)) { sal_Int32 index = url.lastIndexOf('/'); url = url.copy(0, index + 1); @@ -101,7 +99,7 @@ namespace SystemShell { // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST> // not allowed in gcc 3.3 without permissive. PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = - (PFUNC_ADD_TO_RECENTLY_USED_LIST)(module.getSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); + reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); if (add_to_recently_used_file_list) add_to_recently_used_file_list(aFileUrl, aMimeType); |