Commits

Anonymous committed dd3f29e

jl155 #i111592# fix warnings

  • Participants
  • Parent commits 9e4b578

Comments (0)

Files changed (2)

File desktop/source/deployment/gui/dp_gui_updatedialog.cxx

 struct FindUpdateData
 {
     const rtl::OUString m_identifier;
-    const bool bShared;
+    const bool m_bShared;
     FindUpdateData(dp_misc::UpdateData const & data);
     FindUpdateData( ::rtl::OUString const & identifier, bool bShared);
     bool operator () (dp_misc::UpdateData const & addedData);
 };
 
 FindUpdateData::FindUpdateData(dp_misc::UpdateData const & data):
-    m_identifier(data.identifier), bShared(data.bIsShared)
+    m_identifier(data.identifier), m_bShared(data.bIsShared)
 {
 }
 
 FindUpdateData::FindUpdateData(::rtl::OUString const & identifier, bool bShared):
-    m_identifier(identifier), bShared(bShared)
+    m_identifier(identifier), m_bShared(bShared)
 {
 }
 
 bool FindUpdateData::operator () (dp_misc::UpdateData const & addedData)
 {
     if (addedData.identifier.equals(m_identifier)
-        && addedData.bIsShared == bShared)
+        && addedData.bIsShared == m_bShared)
         return true;
     return false;
 }

File desktop/source/deployment/misc/dp_update.cxx

 struct FindUpdateData
 {
     const ::rtl::OUString m_identifier;
-    const bool bShared;
+    const bool m_bShared;
     FindUpdateData(UpdateData const & data);
     FindUpdateData( ::rtl::OUString const & identifier, bool bShared);
     bool operator () (UpdateData const & addedData);
 };
 
 FindUpdateData::FindUpdateData(UpdateData const & data):
-    m_identifier(data.identifier), bShared(data.bIsShared)
+    m_identifier(data.identifier), m_bShared(data.bIsShared)
 {
 }
 
 FindUpdateData::FindUpdateData(::rtl::OUString const & identifier, bool bShared):
-    m_identifier(identifier), bShared(bShared)
+    m_identifier(identifier), m_bShared(bShared)
 {
 }
 
 bool FindUpdateData::operator () (UpdateData const & addedData)
 {
     if (addedData.identifier.equals(m_identifier)
-        && addedData.bIsShared == bShared)
+        && addedData.bIsShared == m_bShared)
         return true;
     return false;
 }
         infoset.getDependencies());
     ::sal_Int32 n = deps->getLength();
 
-    ::sal_Int32 unsat = 0;
     ::std::vector<uno::Reference<xml::dom::XElement> > vecDeps;
     for (::sal_Int32 i = 0; i < n; ++i)
     {
     ::rtl::OUString const & displayName,
     uno::Reference<xml::dom::XNode> const & updateInformation,
     bool bShared, bool bRequired):
-    name(displayName), aUpdateInfo(updateInformation), bIsShared(bShared),
-    bReadOnlyShared(false), bIsRequired(bRequired)
+    name(displayName), bIsShared(bShared),
+    bReadOnlyShared(false), bIsRequired(bRequired),
+    aUpdateInfo(updateInformation)
 {
     dp_misc::DescriptionInfoset info(context, updateInformation);
     ::boost::optional< ::rtl::OUString > optVersion = info.getIdentifier();
                                                            FindUpdateData(*id, false));
                                         if (iupdataShared == vecUpData.end())
                                         {
-                                            UpdateData data(context, i_req->second.m_displayName,
+                                            UpdateData dataUser(context, i_req->second.m_displayName,
                                                             i_req->second.m_updateInformation, false, true);
-                                            vecUpData.push_back(data);
+                                            vecUpData.push_back(dataUser);
                                         }
                                     }
                                 }