diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-20 10:34:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-04-21 08:32:47 +0200 |
commit | 5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch) | |
tree | 2407c6fc040a795e6ffc69de02ba940285c04c7f /connectivity | |
parent | 5bb308a9ad16f6002486a60e4a753693818580b6 (diff) |
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/flat/ETable.cxx | 8 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 48 |
2 files changed, 28 insertions, 28 deletions
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 3cd005bd3fe2..0626560da9ca 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -128,8 +128,8 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) const sal_Unicode cThousandDelimiter = pConnection->getThousandDelimiter(); ::comphelper::UStringMixEqual aCase(bCase); vector<OUString> aColumnNames; - vector<OUString> m_aTypeNames; - m_aTypeNames.resize(nFieldCount); + vector<OUString> aTypeNames; + aTypeNames.resize(nFieldCount); const sal_Int32 nMaxRowsToScan = pConnection->getMaxRowsToScan(); sal_Int32 nRowCount = 0; @@ -156,7 +156,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) if(bRead) { impl_fillColumnInfo_nothrow(m_aCurrentLine, nStartPosFirstLine, nStartPosFirstLine2, - m_aTypes[i], m_aPrecisions[i], m_aScales[i], m_aTypeNames[i], + m_aTypes[i], m_aPrecisions[i], m_aScales[i], aTypeNames[i], cDecimalDelimiter, cThousandDelimiter, aCharClass); } } @@ -179,7 +179,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } - sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],OUString(),OUString(), + sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeNames[i],OUString(),OUString(), ColumnValue::NULLABLE, m_aPrecisions[i], m_aScales[i], diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 0655e528bd4d..695564f91b96 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -65,15 +65,15 @@ namespace connectivity sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; + ProductStruct &rProduct = m_ProductProfileList[index]; OUString regDir = getRegistryDir(product); OUString profilesIni = regDir + "profiles.ini"; IniParser parser( profilesIni ); - IniSectionMap &mAllSection = parser.getAllSection(); + IniSectionMap &rAllSection = parser.getAllSection(); - IniSectionMap::iterator iBegin = mAllSection.begin(); - IniSectionMap::const_iterator iEnd = mAllSection.end(); + IniSectionMap::iterator iBegin = rAllSection.begin(); + IniSectionMap::const_iterator iEnd = rAllSection.end(); for(;iBegin != iEnd;++iBegin) { ini_Section *aSection = &(*iBegin).second; @@ -125,7 +125,7 @@ namespace connectivity ProfileStruct* profileItem = new ProfileStruct(product,profileName, fullProfilePath ); - m_Product.mProfileList[profileName] = profileItem; + rProduct.mProfileList[profileName] = profileItem; sal_Int32 isDefault = 0; if (!sIsDefault.isEmpty()) @@ -133,41 +133,41 @@ namespace connectivity isDefault = sIsDefault.toInt32(); } if (isDefault) - m_Product.mCurrentProfileName = profileName; + rProduct.mCurrentProfileName = profileName; } } - return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); + return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - if (m_Product.mProfileList.empty() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + ProductStruct &rProduct = m_ProductProfileList[index]; + if (rProduct.mProfileList.empty() || rProduct.mProfileList.find(profileName) == rProduct.mProfileList.end()) { //Profile not found return OUString(); } else - return m_Product.mProfileList[profileName]->getProfilePath(); + return rProduct.mProfileList[profileName]->getProfilePath(); } ::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); + ProductStruct &rProduct = m_ProductProfileList[index]; + return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - list.realloc(static_cast<sal_Int32>(m_Product.mProfileList.size())); + ProductStruct &rProduct = m_ProductProfileList[index]; + list.realloc(static_cast<sal_Int32>(rProduct.mProfileList.size())); sal_Int32 i=0; - for(ProfileList::const_iterator itor=m_Product.mProfileList.begin(); - itor != m_Product.mProfileList.end(); + for(ProfileList::const_iterator itor=rProduct.mProfileList.begin(); + itor != rProduct.mProfileList.end(); ++itor) { ProfileStruct * aProfile = (*itor).second; @@ -175,24 +175,24 @@ namespace connectivity i++; } - return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); + return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mCurrentProfileName.isEmpty()) + ProductStruct &rProduct = m_ProductProfileList[index]; + if (!rProduct.mCurrentProfileName.isEmpty()) { //default profile setted in mozilla registry - return m_Product.mCurrentProfileName; + return rProduct.mCurrentProfileName; } - if (m_Product.mProfileList.empty()) + if (rProduct.mProfileList.empty()) { //there are not any profiles return OUString(); } - ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; + ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second; return aProfile->getProfileName(); } bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) @@ -205,8 +205,8 @@ namespace connectivity bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - if (m_Product.mProfileList.empty() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + ProductStruct &rProduct = m_ProductProfileList[index]; + if (rProduct.mProfileList.empty() || rProduct.mProfileList.find(profileName) == rProduct.mProfileList.end()) { return false; } |