strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ooo20031110 (1.2.4); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2003-12-01 15:19:33 +00:00
parent 89660d253f
commit 07c2b8aac2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shell/source/unix/sysshell/systemshell.cxx
View file

@ -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);