diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:58 +0200 |
| commit | 62ee548b8c1b2005ceee7360378289dd31a0ae72 (patch) | |
| tree | 00a60ed92f7ff3b5ad6d2587b5d9b48df4037fd4 /jvmfwk | |
| parent | 950f7c31ea0ae8a724787f05f23d1fabe59a91b7 (diff) | |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I62a6714749eba8226ba3a5416ee81f2d76cf0afc
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 1b9c9862c49e..901a4bdbd3f5 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -484,7 +484,7 @@ void NodeJava::write() const xmlNode * nodeEnabled = pathObj->nodesetval->nodeTab[0]; xmlSetNsProp(nodeEnabled, nsXsi, reinterpret_cast<xmlChar const *>("nil"),reinterpret_cast<xmlChar const *>("false")); - xmlNodeSetContent(nodeEnabled,(xmlChar*) CXmlCharPtr(*m_userClassPath)); + xmlNodeSetContent(nodeEnabled,static_cast<xmlChar*>(CXmlCharPtr(*m_userClassPath))); } //set <javaInfo> element @@ -852,7 +852,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) CXmlCharPtr xmlData; xmlData = xmlNodeListGetString( pDoc, cur->children, 1); - xmlChar* _data = (xmlChar*) xmlData; + xmlChar* _data = static_cast<xmlChar*>(xmlData); if (_data) { rtl::ByteSequence seq(reinterpret_cast<sal_Int8*>(_data), strlen(reinterpret_cast<char*>(_data))); diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index a4bbc2e97ab7..eff92ecb2713 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -451,7 +451,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) aCurrentInfo = pJInfo; bInfoFound = true; } - else if ((JavaInfo*) aCurrentInfo == NULL) + else if (static_cast<JavaInfo*>(aCurrentInfo) == NULL) { // current Java installation does not provide all features // but no Java installation has been detected before @@ -537,7 +537,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) //All Java installations found by the current plug-in lib //do not provide the required features. Try the next plug-in } - if ((JavaInfo*) aCurrentInfo == NULL) + if (static_cast<JavaInfo*>(aCurrentInfo) == NULL) {//The plug-ins did not find a suitable Java. Now try the paths which have been //added manually. //get the list of paths to jre locations which have been added manually @@ -595,7 +595,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) }// end iterate plug-ins } } - if ((JavaInfo*) aCurrentInfo) + if (static_cast<JavaInfo*>(aCurrentInfo)) { jfw::NodeJava javaNode(jfw::NodeJava::USER); javaNode.setJavaInfo(aCurrentInfo,true); |