Kaydet (Commit) 62ee548b authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:cstylecast: deal with remaining pointer casts

Change-Id: I62a6714749eba8226ba3a5416ee81f2d76cf0afc
üst 950f7c31
...@@ -484,7 +484,7 @@ void NodeJava::write() const ...@@ -484,7 +484,7 @@ void NodeJava::write() const
xmlNode * nodeEnabled = pathObj->nodesetval->nodeTab[0]; xmlNode * nodeEnabled = pathObj->nodesetval->nodeTab[0];
xmlSetNsProp(nodeEnabled, nsXsi, reinterpret_cast<xmlChar const *>("nil"),reinterpret_cast<xmlChar const *>("false")); 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 //set <javaInfo> element
...@@ -852,7 +852,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) ...@@ -852,7 +852,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
CXmlCharPtr xmlData; CXmlCharPtr xmlData;
xmlData = xmlNodeListGetString( xmlData = xmlNodeListGetString(
pDoc, cur->children, 1); pDoc, cur->children, 1);
xmlChar* _data = (xmlChar*) xmlData; xmlChar* _data = static_cast<xmlChar*>(xmlData);
if (_data) if (_data)
{ {
rtl::ByteSequence seq(reinterpret_cast<sal_Int8*>(_data), strlen(reinterpret_cast<char*>(_data))); rtl::ByteSequence seq(reinterpret_cast<sal_Int8*>(_data), strlen(reinterpret_cast<char*>(_data)));
......
...@@ -451,7 +451,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) ...@@ -451,7 +451,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
aCurrentInfo = pJInfo; aCurrentInfo = pJInfo;
bInfoFound = true; bInfoFound = true;
} }
else if ((JavaInfo*) aCurrentInfo == NULL) else if (static_cast<JavaInfo*>(aCurrentInfo) == NULL)
{ {
// current Java installation does not provide all features // current Java installation does not provide all features
// but no Java installation has been detected before // but no Java installation has been detected before
...@@ -537,7 +537,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) ...@@ -537,7 +537,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
//All Java installations found by the current plug-in lib //All Java installations found by the current plug-in lib
//do not provide the required features. Try the next plug-in //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 {//The plug-ins did not find a suitable Java. Now try the paths which have been
//added manually. //added manually.
//get the list of paths to jre locations 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) ...@@ -595,7 +595,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
}// end iterate plug-ins }// end iterate plug-ins
} }
} }
if ((JavaInfo*) aCurrentInfo) if (static_cast<JavaInfo*>(aCurrentInfo))
{ {
jfw::NodeJava javaNode(jfw::NodeJava::USER); jfw::NodeJava javaNode(jfw::NodeJava::USER);
javaNode.setJavaInfo(aCurrentInfo,true); javaNode.setJavaInfo(aCurrentInfo,true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment