diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-23 09:34:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-24 09:48:16 +0100 |
commit | 48f2d4e58004796884ececcccd46bd83f0752c3e (patch) | |
tree | 903c8936d10ffbc30b5bac548e87a7a7495dcc1c | |
parent | Fix typo (diff) | |
download | core-48f2d4e58004796884ececcccd46bd83f0752c3e.tar.gz core-48f2d4e58004796884ececcccd46bd83f0752c3e.zip |
loplugin:unusedfields in helpcompiler..jvmfwk
Change-Id: Ic10c521de310e0f0ac1f79a1ae169252c20075b2
Reviewed-on: https://gerrit.libreoffice.org/68226
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 1 | ||||
-rw-r--r-- | helpcompiler/source/HelpCompiler.cxx | 1 | ||||
-rw-r--r-- | idlc/inc/astexpression.hxx | 4 | ||||
-rw-r--r-- | idlc/source/astexpression.cxx | 18 | ||||
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 2 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 5 |
8 files changed, 1 insertions, 36 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 31ef2c0c2076..06521c97256e 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -158,7 +158,6 @@ typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable; class StreamTable { public: - std::string document_id; std::string document_path; std::string document_module; std::string document_title; diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 2ec197fe4bd1..b612071aba18 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -488,7 +488,6 @@ void HelpCompiler::compile() streamTable.appl_helptexts = std::move(aparser.helptexts); streamTable.appl_keywords = std::move(aparser.keywords); - streamTable.document_id = documentId; streamTable.document_path = fileName; streamTable.document_title = title; std::string actMod = module; diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index 03e47004c232..527746245bff 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -117,16 +117,12 @@ public: OString toString(); private: - // Fill out the lineno, filename and definition scope details - void fillDefinitionDetails(); // Evaluate different sets of operators std::unique_ptr<AstExprValue> eval_bin_op(); std::unique_ptr<AstExprValue> eval_bit_op(); std::unique_ptr<AstExprValue> eval_un_op(); std::unique_ptr<AstExprValue> eval_symbol(); - OString m_fileName; // fileName defined in - ExprComb m_combOperator; std::unique_ptr<AstExpression> m_subExpr1; diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 486c74977864..48963d43a0ac 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -34,15 +34,11 @@ AstExpression::AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *p , m_subExpr1(pExpr1) , m_subExpr2(pExpr2) { - fillDefinitionDetails(); - } AstExpression::AstExpression(sal_Int32 l) : m_combOperator(ExprComb::NONE) { - fillDefinitionDetails(); - m_exprValue.reset( new AstExprValue ); m_exprValue->et = ET_long; m_exprValue->u.lval = l; @@ -51,8 +47,6 @@ AstExpression::AstExpression(sal_Int32 l) AstExpression::AstExpression(sal_Int32 l, ExprType et) : m_combOperator(ExprComb::NONE) { - fillDefinitionDetails(); - m_exprValue.reset( new AstExprValue ); m_exprValue->et = et; m_exprValue->u.lval = l; @@ -61,8 +55,6 @@ AstExpression::AstExpression(sal_Int32 l, ExprType et) AstExpression::AstExpression(sal_Int64 h) : m_combOperator(ExprComb::NONE) { - fillDefinitionDetails(); - m_exprValue.reset( new AstExprValue ); m_exprValue->et = ET_hyper; m_exprValue->u.hval = h; @@ -71,8 +63,6 @@ AstExpression::AstExpression(sal_Int64 h) AstExpression::AstExpression(sal_uInt64 uh) : m_combOperator(ExprComb::NONE) { - fillDefinitionDetails(); - m_exprValue.reset( new AstExprValue ); m_exprValue->et = ET_uhyper; m_exprValue->u.uhval = uh; @@ -81,8 +71,6 @@ AstExpression::AstExpression(sal_uInt64 uh) AstExpression::AstExpression(double d) : m_combOperator(ExprComb::NONE) { - fillDefinitionDetails(); - m_exprValue.reset( new AstExprValue ); m_exprValue->et = ET_double; m_exprValue->u.dval = d; @@ -93,7 +81,6 @@ AstExpression::AstExpression(OString* scopedName) { if (scopedName) m_xSymbolicName = *scopedName; - fillDefinitionDetails(); } AstExpression::~AstExpression() @@ -704,11 +691,6 @@ bool AstExpression::compareLong(AstExpression *pExpr) return bRet; } -void AstExpression::fillDefinitionDetails() -{ - m_fileName = idlc()->getFileName(); -} - void AstExpression::evaluate() { /* diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 66ff058f5037..3594d0008119 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -62,7 +62,6 @@ class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo Reference< XInputStream > mxStream; // Encoding - OUString mEncoding; bool mbEncodingInitialized; rtl_TextToUnicodeConverter mConvText2Unicode; rtl_TextToUnicodeContext mContextText2Unicode; @@ -344,7 +343,6 @@ void OTextInputStream::setEncoding( const OUString& Encoding ) mbEncodingInitialized = true; mConvText2Unicode = rtl_createTextToUnicodeConverter( encoding ); mContextText2Unicode = rtl_createTextToUnicodeContext( mConvText2Unicode ); - mEncoding = Encoding; } diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 1f859720f8ae..4caef34cd5c2 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -55,7 +55,6 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf Reference< XOutputStream > mxStream; // Encoding - OUString mEncoding; bool mbEncodingInitialized; rtl_UnicodeToTextConverter mConvUnicode2Text; rtl_UnicodeToTextContext mContextUnicode2Text; @@ -178,7 +177,6 @@ void OTextOutputStream::setEncoding( const OUString& Encoding ) mbEncodingInitialized = true; mConvUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); mContextUnicode2Text = rtl_createUnicodeToTextContext( mConvUnicode2Text ); - mEncoding = Encoding; } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 7711a9e79907..9a5c7c28a25c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -40,8 +40,7 @@ public: #endif SunVersion::SunVersion(const OUString &usVer): - m_nUpdateSpecial(0), m_preRelease(Rel_NONE), - usVersion(usVer) + m_nUpdateSpecial(0), m_preRelease(Rel_NONE) { memset(m_arVersionParts, 0, sizeof(m_arVersionParts)); OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding()); @@ -52,7 +51,6 @@ SunVersion::SunVersion(const char * szVer): { memset(m_arVersionParts, 0, sizeof(m_arVersionParts)); m_bValid = init(szVer); - usVersion= OUString(szVer,strlen(szVer),osl_getThreadTextEncoding()); } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx index 5e86612897f9..9da8e44a510e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx @@ -96,11 +96,6 @@ public: */ operator bool () { return m_bValid;} - /** Will always contain a value if the object has been constructed with - a version string. - */ - OUString usVersion; - private: bool init(const char * szVer); |