diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:19:33 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:19:33 +0000 |
| commit | 07c2b8aac2227cf428771a42d1f092186b450e8f (patch) | |
| tree | b0c95514138f5427d209ecd38982cf689361e679 /shell/source/unix/sysshell/systemshell.cxx | |
| parent | 89660d253fb187e47145e473e4bfaf4b37f4773f (diff) | |
INTEGRATION: CWS ooo20031110 (1.2.4); FILE MERGED
2003/11/03 22:43:53 waratah 1.2.4.1: #i22046# convert C++ castes to standard casts to allow no permissive compile to continue
Diffstat (limited to 'shell/source/unix/sysshell/systemshell.cxx')
| -rw-r--r-- | shell/source/unix/sysshell/systemshell.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/shell/source/unix/sysshell/systemshell.cxx b/shell/source/unix/sysshell/systemshell.cxx index 4d283cd0981f..87385a985eb4 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2003-09-29 14:55:23 $ + * last change: $Author: rt $ $Date: 2003-12-01 16:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,9 @@ namespace SystemShell { rtl::OUString get_absolute_library_url(const rtl::OUString& lib_name) { rtl::OUString url; - if (osl::Module::getUrlFromAddress(reinterpret_cast<void*>(AddToRecentDocumentList), url)) + // Convert from reinterpret_cast<void*> + // not allowed in gcc3.3 without permissive + if (osl::Module::getUrlFromAddress((void*)(AddToRecentDocumentList), url)) { sal_Int32 index = url.lastIndexOf('/'); url = url.copy(0, index + 1); @@ -96,8 +98,10 @@ namespace SystemShell { if (module.is()) { + // 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 = - reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); + (PFUNC_ADD_TO_RECENTLY_USED_LIST)(module.getSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); if (add_to_recently_used_file_list) add_to_recently_used_file_list(aFileUrl, aMimeType); |