Kaydet (Commit) 48f2d4e5 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in helpcompiler..jvmfwk

Change-Id: Ic10c521de310e0f0ac1f79a1ae169252c20075b2
Reviewed-on: https://gerrit.libreoffice.org/68226
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 11c13789
...@@ -158,7 +158,6 @@ typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable; ...@@ -158,7 +158,6 @@ typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
class StreamTable class StreamTable
{ {
public: public:
std::string document_id;
std::string document_path; std::string document_path;
std::string document_module; std::string document_module;
std::string document_title; std::string document_title;
......
...@@ -488,7 +488,6 @@ void HelpCompiler::compile() ...@@ -488,7 +488,6 @@ void HelpCompiler::compile()
streamTable.appl_helptexts = std::move(aparser.helptexts); streamTable.appl_helptexts = std::move(aparser.helptexts);
streamTable.appl_keywords = std::move(aparser.keywords); streamTable.appl_keywords = std::move(aparser.keywords);
streamTable.document_id = documentId;
streamTable.document_path = fileName; streamTable.document_path = fileName;
streamTable.document_title = title; streamTable.document_title = title;
std::string actMod = module; std::string actMod = module;
......
...@@ -117,16 +117,12 @@ public: ...@@ -117,16 +117,12 @@ public:
OString toString(); OString toString();
private: private:
// Fill out the lineno, filename and definition scope details
void fillDefinitionDetails();
// Evaluate different sets of operators // Evaluate different sets of operators
std::unique_ptr<AstExprValue> eval_bin_op(); std::unique_ptr<AstExprValue> eval_bin_op();
std::unique_ptr<AstExprValue> eval_bit_op(); std::unique_ptr<AstExprValue> eval_bit_op();
std::unique_ptr<AstExprValue> eval_un_op(); std::unique_ptr<AstExprValue> eval_un_op();
std::unique_ptr<AstExprValue> eval_symbol(); std::unique_ptr<AstExprValue> eval_symbol();
OString m_fileName; // fileName defined in
ExprComb m_combOperator; ExprComb m_combOperator;
std::unique_ptr<AstExpression> std::unique_ptr<AstExpression>
m_subExpr1; m_subExpr1;
......
...@@ -34,15 +34,11 @@ AstExpression::AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *p ...@@ -34,15 +34,11 @@ AstExpression::AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *p
, m_subExpr1(pExpr1) , m_subExpr1(pExpr1)
, m_subExpr2(pExpr2) , m_subExpr2(pExpr2)
{ {
fillDefinitionDetails();
} }
AstExpression::AstExpression(sal_Int32 l) AstExpression::AstExpression(sal_Int32 l)
: m_combOperator(ExprComb::NONE) : m_combOperator(ExprComb::NONE)
{ {
fillDefinitionDetails();
m_exprValue.reset( new AstExprValue ); m_exprValue.reset( new AstExprValue );
m_exprValue->et = ET_long; m_exprValue->et = ET_long;
m_exprValue->u.lval = l; m_exprValue->u.lval = l;
...@@ -51,8 +47,6 @@ AstExpression::AstExpression(sal_Int32 l) ...@@ -51,8 +47,6 @@ AstExpression::AstExpression(sal_Int32 l)
AstExpression::AstExpression(sal_Int32 l, ExprType et) AstExpression::AstExpression(sal_Int32 l, ExprType et)
: m_combOperator(ExprComb::NONE) : m_combOperator(ExprComb::NONE)
{ {
fillDefinitionDetails();
m_exprValue.reset( new AstExprValue ); m_exprValue.reset( new AstExprValue );
m_exprValue->et = et; m_exprValue->et = et;
m_exprValue->u.lval = l; m_exprValue->u.lval = l;
...@@ -61,8 +55,6 @@ AstExpression::AstExpression(sal_Int32 l, ExprType et) ...@@ -61,8 +55,6 @@ AstExpression::AstExpression(sal_Int32 l, ExprType et)
AstExpression::AstExpression(sal_Int64 h) AstExpression::AstExpression(sal_Int64 h)
: m_combOperator(ExprComb::NONE) : m_combOperator(ExprComb::NONE)
{ {
fillDefinitionDetails();
m_exprValue.reset( new AstExprValue ); m_exprValue.reset( new AstExprValue );
m_exprValue->et = ET_hyper; m_exprValue->et = ET_hyper;
m_exprValue->u.hval = h; m_exprValue->u.hval = h;
...@@ -71,8 +63,6 @@ AstExpression::AstExpression(sal_Int64 h) ...@@ -71,8 +63,6 @@ AstExpression::AstExpression(sal_Int64 h)
AstExpression::AstExpression(sal_uInt64 uh) AstExpression::AstExpression(sal_uInt64 uh)
: m_combOperator(ExprComb::NONE) : m_combOperator(ExprComb::NONE)
{ {
fillDefinitionDetails();
m_exprValue.reset( new AstExprValue ); m_exprValue.reset( new AstExprValue );
m_exprValue->et = ET_uhyper; m_exprValue->et = ET_uhyper;
m_exprValue->u.uhval = uh; m_exprValue->u.uhval = uh;
...@@ -81,8 +71,6 @@ AstExpression::AstExpression(sal_uInt64 uh) ...@@ -81,8 +71,6 @@ AstExpression::AstExpression(sal_uInt64 uh)
AstExpression::AstExpression(double d) AstExpression::AstExpression(double d)
: m_combOperator(ExprComb::NONE) : m_combOperator(ExprComb::NONE)
{ {
fillDefinitionDetails();
m_exprValue.reset( new AstExprValue ); m_exprValue.reset( new AstExprValue );
m_exprValue->et = ET_double; m_exprValue->et = ET_double;
m_exprValue->u.dval = d; m_exprValue->u.dval = d;
...@@ -93,7 +81,6 @@ AstExpression::AstExpression(OString* scopedName) ...@@ -93,7 +81,6 @@ AstExpression::AstExpression(OString* scopedName)
{ {
if (scopedName) if (scopedName)
m_xSymbolicName = *scopedName; m_xSymbolicName = *scopedName;
fillDefinitionDetails();
} }
AstExpression::~AstExpression() AstExpression::~AstExpression()
...@@ -704,11 +691,6 @@ bool AstExpression::compareLong(AstExpression *pExpr) ...@@ -704,11 +691,6 @@ bool AstExpression::compareLong(AstExpression *pExpr)
return bRet; return bRet;
} }
void AstExpression::fillDefinitionDetails()
{
m_fileName = idlc()->getFileName();
}
void AstExpression::evaluate() void AstExpression::evaluate()
{ {
/* /*
......
...@@ -62,7 +62,6 @@ class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo ...@@ -62,7 +62,6 @@ class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo
Reference< XInputStream > mxStream; Reference< XInputStream > mxStream;
// Encoding // Encoding
OUString mEncoding;
bool mbEncodingInitialized; bool mbEncodingInitialized;
rtl_TextToUnicodeConverter mConvText2Unicode; rtl_TextToUnicodeConverter mConvText2Unicode;
rtl_TextToUnicodeContext mContextText2Unicode; rtl_TextToUnicodeContext mContextText2Unicode;
...@@ -344,7 +343,6 @@ void OTextInputStream::setEncoding( const OUString& Encoding ) ...@@ -344,7 +343,6 @@ void OTextInputStream::setEncoding( const OUString& Encoding )
mbEncodingInitialized = true; mbEncodingInitialized = true;
mConvText2Unicode = rtl_createTextToUnicodeConverter( encoding ); mConvText2Unicode = rtl_createTextToUnicodeConverter( encoding );
mContextText2Unicode = rtl_createTextToUnicodeContext( mConvText2Unicode ); mContextText2Unicode = rtl_createTextToUnicodeContext( mConvText2Unicode );
mEncoding = Encoding;
} }
......
...@@ -55,7 +55,6 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf ...@@ -55,7 +55,6 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf
Reference< XOutputStream > mxStream; Reference< XOutputStream > mxStream;
// Encoding // Encoding
OUString mEncoding;
bool mbEncodingInitialized; bool mbEncodingInitialized;
rtl_UnicodeToTextConverter mConvUnicode2Text; rtl_UnicodeToTextConverter mConvUnicode2Text;
rtl_UnicodeToTextContext mContextUnicode2Text; rtl_UnicodeToTextContext mContextUnicode2Text;
...@@ -178,7 +177,6 @@ void OTextOutputStream::setEncoding( const OUString& Encoding ) ...@@ -178,7 +177,6 @@ void OTextOutputStream::setEncoding( const OUString& Encoding )
mbEncodingInitialized = true; mbEncodingInitialized = true;
mConvUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); mConvUnicode2Text = rtl_createUnicodeToTextConverter( encoding );
mContextUnicode2Text = rtl_createUnicodeToTextContext( mConvUnicode2Text ); mContextUnicode2Text = rtl_createUnicodeToTextContext( mConvUnicode2Text );
mEncoding = Encoding;
} }
......
...@@ -40,8 +40,7 @@ public: ...@@ -40,8 +40,7 @@ public:
#endif #endif
SunVersion::SunVersion(const OUString &usVer): SunVersion::SunVersion(const OUString &usVer):
m_nUpdateSpecial(0), m_preRelease(Rel_NONE), m_nUpdateSpecial(0), m_preRelease(Rel_NONE)
usVersion(usVer)
{ {
memset(m_arVersionParts, 0, sizeof(m_arVersionParts)); memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding()); OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding());
...@@ -52,7 +51,6 @@ SunVersion::SunVersion(const char * szVer): ...@@ -52,7 +51,6 @@ SunVersion::SunVersion(const char * szVer):
{ {
memset(m_arVersionParts, 0, sizeof(m_arVersionParts)); memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
m_bValid = init(szVer); m_bValid = init(szVer);
usVersion= OUString(szVer,strlen(szVer),osl_getThreadTextEncoding());
} }
......
...@@ -96,11 +96,6 @@ public: ...@@ -96,11 +96,6 @@ public:
*/ */
operator bool () { return m_bValid;} operator bool () { return m_bValid;}
/** Will always contain a value if the object has been constructed with
a version string.
*/
OUString usVersion;
private: private:
bool init(const char * szVer); bool init(const char * szVer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment