1 files changed, 12 insertions, 24 deletions

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 4a9477c41db1..64373f31c8b0 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -66,8 +66,7 @@ static OString getElement(OString const & docPath,
             JFW_E_ERROR,
             "[Java framework] Error in function getElement (elements.cxx)");
 
-    CXPathObjectPtr pathObj;
-    pathObj = xmlXPathEvalExpression(pathExpression, context);
+    CXPathObjectPtr pathObj = xmlXPathEvalExpression(pathExpression, context);
     OString sValue;
     if (xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
     {
@@ -288,8 +287,7 @@ void NodeJava::load()
                 {
                     if (xmlStrcmp(pOpt->name, reinterpret_cast<xmlChar const *>("param")) == 0)
                     {
-                        CXmlCharPtr sOpt;
-                        sOpt = xmlNodeListGetString(
+                        CXmlCharPtr sOpt = xmlNodeListGetString(
                             docUser, pOpt->children, 1);
                         m_vmParameters->push_back(sOpt);
                     }
@@ -314,8 +312,7 @@ void NodeJava::load()
                 {
                     if (xmlStrcmp(pLoc->name, reinterpret_cast<xmlChar const *>("location")) == 0)
                     {
-                        CXmlCharPtr sLoc;
-                        sLoc = xmlNodeListGetString(
+                        CXmlCharPtr sLoc = xmlNodeListGetString(
                             docUser, pLoc->children, 1);
                         m_JRELocations->push_back(sLoc);
                     }
@@ -704,8 +701,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
     if (pJavaInfo->children == nullptr)
         return;
     //Get the xsi:nil attribute;
-    CXmlCharPtr sNil;
-    sNil = xmlGetNsProp(
+    CXmlCharPtr sNil = xmlGetNsProp(
         pJavaInfo, reinterpret_cast<xmlChar const *>("nil"), reinterpret_cast<xmlChar const *>(NS_SCHEMA_INSTANCE));
     if ( ! sNil)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
@@ -720,8 +716,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
         return;
 
     //Get javaInfo@manuallySelected attribute
-    CXmlCharPtr sAutoSelect;
-    sAutoSelect = xmlGetProp(
+    CXmlCharPtr sAutoSelect = xmlGetProp(
         pJavaInfo, reinterpret_cast<xmlChar const *>("autoSelect"));
     if ( ! sAutoSelect)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
@@ -739,8 +734,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
     {
         if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("vendor")) == 0)
         {
-            CXmlCharPtr xmlVendor;
-            xmlVendor = xmlNodeListGetString(
+            CXmlCharPtr xmlVendor = xmlNodeListGetString(
                 pDoc, cur->children, 1);
             if (! xmlVendor)
                 return;
@@ -748,30 +742,26 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("location")) == 0)
         {
-            CXmlCharPtr xmlLocation;
-            xmlLocation = xmlNodeListGetString(
+            CXmlCharPtr xmlLocation = xmlNodeListGetString(
                 pDoc, cur->children, 1);
             sLocation = xmlLocation;
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("version")) == 0)
         {
-            CXmlCharPtr xmlVersion;
-            xmlVersion = xmlNodeListGetString(
+            CXmlCharPtr xmlVersion = xmlNodeListGetString(
                 pDoc, cur->children, 1);
             sVersion = xmlVersion;
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("features"))== 0)
         {
-            CXmlCharPtr xmlFeatures;
-            xmlFeatures = xmlNodeListGetString(
+            CXmlCharPtr xmlFeatures = xmlNodeListGetString(
                     pDoc, cur->children, 1);
             OUString sFeatures = xmlFeatures;
             nFeatures = sFeatures.toInt64(16);
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("requirements")) == 0)
         {
-            CXmlCharPtr xmlRequire;
-            xmlRequire = xmlNodeListGetString(
+            CXmlCharPtr xmlRequire = xmlNodeListGetString(
                 pDoc, cur->children, 1);
             OUString sRequire = xmlRequire;
             nRequirements = sRequire.toInt64(16);
@@ -788,8 +778,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("vendorData")) == 0)
         {
-            CXmlCharPtr xmlData;
-            xmlData = xmlNodeListGetString(
+            CXmlCharPtr xmlData = xmlNodeListGetString(
                 pDoc, cur->children, 1);
             xmlChar* _data = static_cast<xmlChar*>(xmlData);
             if (_data)
@@ -804,8 +793,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
     if (sVendor.isEmpty())
         m_bEmptyNode = true;
     //Get the javainfo attributes
-    CXmlCharPtr sVendorUpdate;
-    sVendorUpdate = xmlGetProp(pJavaInfo,
+    CXmlCharPtr sVendorUpdate = xmlGetProp(pJavaInfo,
                                reinterpret_cast<xmlChar const *>("vendorUpdate"));
     if ( ! sVendorUpdate)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);