summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d32beff86104..ab5153dd033f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -678,7 +678,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// all versions below 1.5.1
int n = 0;
options[n].optionString= (char *) "abort";
- options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
+ options[n].extraInfo= reinterpret_cast<void*>(abort_handler);
++n;
OString sClassPathOption;
for (int i = 0; i < cOptions; i++)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 0815ea83a704..eb840b6207e7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -139,7 +139,7 @@ namespace
OUString getLibraryLocation()
{
OUString libraryFileUrl;
- OSL_VERIFY(osl::Module::getUrlFromAddress((void *)(sal_IntPtr)getLibraryLocation, libraryFileUrl));
+ OSL_VERIFY(osl::Module::getUrlFromAddress(reinterpret_cast<void *>(getLibraryLocation), libraryFileUrl));
return getDirFromFile(libraryFileUrl);
}
@@ -388,7 +388,7 @@ bool getJavaProps(const OUString & exePath,
//next to the plugin, except on OS X where it is in ../Resources/java relative
//to the plugin.
OUString sThisLib;
- if (osl_getModuleURLFromAddress((void *) (sal_IntPtr)& getJavaProps,
+ if (osl_getModuleURLFromAddress(reinterpret_cast<void *>(&getJavaProps),
& sThisLib.pData) == sal_False)
{
return false;