diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-04 09:30:10 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-04 11:26:09 +0200 |
commit | 469076317d27e545449ea5a5688a468d02558451 (patch) | |
tree | 21bca3de53d7ef299c35d57b2d1267e22f7c9c6b | |
parent | 8237a77245227e434ce8a988aa164a67850281e2 (diff) |
loplugin:unusedfields l10ntools..rsc
Change-Id: I78785eeab436910c9e8733924a7c43fa998ba36f
Reviewed-on: https://gerrit.libreoffice.org/39491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | compilerplugins/clang/unusedfields.writeonly.results | 8 | ||||
-rw-r--r-- | l10ntools/inc/xmlparse.hxx | 4 | ||||
-rw-r--r-- | l10ntools/source/xmlparse.cxx | 10 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 1 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_connection.hxx | 1 | ||||
-rw-r--r-- | rsc/inc/rscall.h | 3 | ||||
-rw-r--r-- | rsc/source/res/rsccont.cxx | 2 |
7 files changed, 4 insertions, 25 deletions
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 3ed17c51fcec..ccb576839eb0 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -1224,8 +1224,6 @@ include/xmloff/shapeimport.hxx:181 SdXML3DSceneAttributesHelper mbVPNUsed _Bool include/xmloff/shapeimport.hxx:182 SdXML3DSceneAttributesHelper mbVUPUsed _Bool -l10ntools/inc/xmlparse.hxx:207 - XMLElement m_nPos int lingucomponent/source/languageguessing/simpleguesser.cxx:79 textcat_t maxsize uint4 lingucomponent/source/languageguessing/simpleguesser.cxx:81 @@ -1900,8 +1898,6 @@ lotuswordpro/source/filter/lwpuidoc.hxx:134 LwpUIDocument m_nFlags sal_uInt16 lotuswordpro/source/filter/lwpuidoc.hxx:135 LwpUIDocument m_InitialSaveAsType class LwpAtomHolder -mysqlc/source/mysqlc_connection.hxx:74 - connectivity::mysqlc::ConnectionSettings quoteIdentifier rtl::OUString oox/inc/drawingml/chart/axismodel.hxx:42 oox::drawingml::chart::AxisDispUnitsModel mfCustomUnit double oox/inc/drawingml/chart/axismodel.hxx:72 @@ -2098,10 +2094,6 @@ registry/source/reflread.cxx:867 MethodList m_pCP class ConstantPool * reportdesign/source/ui/inc/ReportWindow.hxx:54 rptui::OReportWindow m_pObjFac ::std::unique_ptr<DlgEdFactory> -rsc/inc/rscall.h:85 - SUBINFO_STRUCT nPos sal_uInt32 -rsc/inc/rscall.h:86 - SUBINFO_STRUCT pClass class RscTop * rsc/inc/rscdef.hxx:55 RscExpType cUnused _Bool rsc/inc/rsctools.hxx:108 diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 037a3843326a..3a057f421c96 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -155,7 +155,7 @@ public: virtual ~XMLFile() override; void Print( XMLNode *pCur, sal_uInt16 nLevel = 0 ); - void SearchL10NElements( XMLChildNode *pCur, int pos = 0 ); + void SearchL10NElements( XMLChildNode *pCur ); void Extract(); XMLHashMap* GetStrings(){ return m_pXMLStrings.get(); } @@ -204,7 +204,6 @@ private: std::unique_ptr<XMLAttributeList> m_pAttributes; OString m_sId; OString m_sLanguageId; - int m_nPos; protected: void Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement) const; @@ -237,7 +236,6 @@ public: void SetId ( OString const & sTheId ) { m_sId = sTheId; } void SetLanguageId ( OString const & sLangId ) { m_sLanguageId = sLangId; } - void SetPos ( int nPos ) { m_nPos = nPos; } }; /** Holds character data diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index ae93b44437f9..c8f670508f20 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -419,7 +419,7 @@ XMLFile& XMLFile::operator=(const XMLFile& rObj) return *this; } -void XMLFile::SearchL10NElements( XMLChildNode *pCur, int nPos ) +void XMLFile::SearchL10NElements( XMLChildNode *pCur ) { if ( !pCur ) SearchL10NElements( this ); @@ -435,7 +435,7 @@ void XMLFile::SearchL10NElements( XMLChildNode *pCur, int nPos ) { XMLChildNode* pElement = (*GetChildList())[ i ]; if( pElement->GetNodeType() == XMLNodeType::ELEMENT ) - SearchL10NElements( pElement , i); + SearchL10NElements( pElement ); } } } @@ -466,7 +466,6 @@ void XMLFile::SearchL10NElements( XMLChildNode *pCur, int nPos ) } pElement->SetLanguageId( sLanguage ); pElement->SetId( sTmpStrVal ); - pElement->SetPos( nPos ); } if ( bInsert && ( m_aNodes_localize.find( sName ) != m_aNodes_localize.end() ) ) @@ -474,7 +473,7 @@ void XMLFile::SearchL10NElements( XMLChildNode *pCur, int nPos ) else if ( bInsert && pElement->GetChildList() ) { for ( size_t k = 0; k < pElement->GetChildList()->size(); k++ ) - SearchL10NElements( (*pElement->GetChildList())[ k ], k); + SearchL10NElements( (*pElement->GetChildList())[ k ] ); } } break; @@ -550,7 +549,6 @@ XMLElement::XMLElement( , m_sElementName( rName ) , m_sId(OString()) , m_sLanguageId(OString()) - , m_nPos(0) { } @@ -559,7 +557,6 @@ XMLElement::XMLElement(const XMLElement& rObj) , m_sElementName( rObj.m_sElementName ) , m_sId( rObj.m_sId ) , m_sLanguageId( rObj.m_sLanguageId ) - , m_nPos( rObj.m_nPos ) { if ( rObj.m_pAttributes ) { @@ -577,7 +574,6 @@ XMLElement& XMLElement::operator=(const XMLElement& rObj) m_sElementName = rObj.m_sElementName; m_sId = rObj.m_sId; m_sLanguageId = rObj.m_sLanguageId; - m_nPos = rObj.m_nPos; if ( m_pAttributes ) { diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 42dbe1a65af3..aa6ef46e66b1 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -97,7 +97,6 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa rtl::OUString aDbName; m_settings.encoding = MysqlCDriver::getDefaultEncoding(); - m_settings.quoteIdentifier.clear(); // parse url. Url has the following format: // external server: sdbc:mysqlc:[hostname]:[port]/[dbname] diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 82887251d340..5e62eff048d0 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -71,7 +71,6 @@ namespace connectivity rtl_TextEncoding encoding; std::unique_ptr<sql::Connection> cppConnection; rtl::OUString schema; - rtl::OUString quoteIdentifier; rtl::OUString connectionURL; bool readOnly; }; diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h index d8222b7c1d31..e141b50340f4 100644 --- a/rsc/inc/rscall.h +++ b/rsc/inc/rscall.h @@ -80,10 +80,7 @@ struct RSCINST /********************** S U B I N F O S T R U C T ************************/ struct SUBINFO_STRUCT { - SUBINFO_STRUCT(){ nPos = 0; pClass = nullptr; }; RscId aId; // resource identifier - sal_uInt32 nPos; // position of resource - RscTop * pClass; // class of entry }; /******************* F u n c t i o n *************************************/ diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index dad3aa9db830..60e7064efe49 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -315,8 +315,6 @@ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) if( nPos < pClassData->nEntries ) { aInfo.aId = pClassData->pEntries[ nPos ].aName; - aInfo.nPos = nPos; - aInfo.pClass = pClassData->pEntries[ nPos ].aInst.pClass; } return aInfo; } |