mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constmethod in formula

Browse Source 
Change-Id: Iae40405e7805b7c7ce3ce7f4b3653094fd49f396
Reviewed-on: https://gerrit.libreoffice.org/78564
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-09-03 16:16:30 +02:00
parent dcf7792da2
commit 00b8b9e5c4
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formula/source/core/api/token.cxx
View File

@@ -888,7 +888,7 @@ void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits )
} }
bool FormulaTokenArray::HasMatrixDoubleRefOps() bool FormulaTokenArray::HasMatrixDoubleRefOps() const
{ {
if ( pRPN && nRPN ) if ( pRPN && nRPN )
{ {

4
formula/source/ui/dlg/ControlHelper.hxx
View File

@@ -79,11 +79,11 @@ public:
RefButton* prefBtn); RefButton* prefBtn);
void SetArgName(const OUString &aArg); void SetArgName(const OUString &aArg);
OUString GetArgName(); OUString GetArgName() const;
void SetArgNameFont(const vcl::Font&); void SetArgNameFont(const vcl::Font&);
void SetArgVal(const OUString &aVal); void SetArgVal(const OUString &aVal);
OUString GetArgVal(); OUString GetArgVal() const;
void SelectAll(); void SelectAll();

6
formula/source/ui/dlg/funcpage.cxx
View File

@@ -240,17 +240,17 @@ void FuncPage::SetFocus()
m_xLbFunction->grab_focus(); m_xLbFunction->grab_focus();
} }
sal_Int32 FuncPage::GetCategory() sal_Int32 FuncPage::GetCategory() const
{ {
return m_xLbCategory->get_active(); return m_xLbCategory->get_active();
} }
sal_Int32 FuncPage::GetFunction() sal_Int32 FuncPage::GetFunction() const
{ {
return m_xLbFunction->get_selected_index(); return m_xLbFunction->get_selected_index();
} }
sal_Int32 FuncPage::GetFunctionEntryCount() sal_Int32 FuncPage::GetFunctionEntryCount() const
{ {
return m_xLbFunction->n_children(); return m_xLbFunction->n_children();
} }

8
formula/source/ui/dlg/funcpage.hxx
View File

@@ -67,9 +67,9 @@ public:
void SetCategory(sal_Int32 nCat); void SetCategory(sal_Int32 nCat);
void SetFunction(sal_Int32 nFunc); void SetFunction(sal_Int32 nFunc);
void SetFocus(); void SetFocus();
sal_Int32 GetCategory(); sal_Int32 GetCategory() const;
sal_Int32 GetFunction(); sal_Int32 GetFunction() const;
sal_Int32 GetFunctionEntryCount(); sal_Int32 GetFunctionEntryCount() const;
sal_Int32 GetFuncPos(const IFunctionDescription* _pDesc); sal_Int32 GetFuncPos(const IFunctionDescription* _pDesc);
const IFunctionDescription* GetFuncDesc( sal_Int32 nPos ) const; const IFunctionDescription* GetFuncDesc( sal_Int32 nPos ) const;
@@ -79,7 +79,7 @@ public:
void SetSelectHdl( const Link<FuncPage&,void>& rLink ) { aSelectionLink = rLink; } void SetSelectHdl( const Link<FuncPage&,void>& rLink ) { aSelectionLink = rLink; }
bool IsVisible() { return m_xContainer->get_visible(); } bool IsVisible() const { return m_xContainer->get_visible(); }
}; };
} // formula } // formula

4
formula/source/ui/dlg/funcutl.cxx
View File

@@ -167,7 +167,7 @@ void ArgInput::SetArgName(const OUString &aArg)
} }
// Returns the Name for the Argument // Returns the Name for the Argument
OUString ArgInput::GetArgName() OUString ArgInput::GetArgName() const
{ {
OUString aPrivArgName; OUString aPrivArgName;
if (pFtArg) if (pFtArg)
@@ -197,7 +197,7 @@ void ArgInput::SetArgVal(const OUString &rVal)
} }
//Returns the Value for the Argument //Returns the Value for the Argument
OUString ArgInput::GetArgVal() OUString ArgInput::GetArgVal() const
{ {
OUString aResult; OUString aResult;
if (pEdArg) if (pEdArg)

4
formula/source/ui/dlg/parawin.cxx
View File

@@ -276,7 +276,7 @@ OUString ParaWin::GetArgument(sal_uInt16 no)
return aStr; return aStr;
} }
OUString ParaWin::GetActiveArgName() OUString ParaWin::GetActiveArgName() const
{ {
OUString aStr; OUString aStr;
if(nArgs>0 && nEdFocus!=NOT_FOUND) if(nArgs>0 && nEdFocus!=NOT_FOUND)
@@ -448,7 +448,7 @@ void ParaWin::UpdateParas()
} }
sal_uInt16 ParaWin::GetSliderPos() sal_uInt16 ParaWin::GetSliderPos() const
{ {
return static_cast<sal_uInt16>(m_xSlider->vadjustment_get_value()); return static_cast<sal_uInt16>(m_xSlider->vadjustment_get_value());
} }

6
formula/source/ui/dlg/parawin.hxx
View File

@@ -118,17 +118,17 @@ public:
void UpdateParas(); void UpdateParas();
void ClearAll(); void ClearAll();
sal_uInt16 GetActiveLine() { return nActiveLine;} sal_uInt16 GetActiveLine() const { return nActiveLine;}
void SetActiveLine(sal_uInt16 no); void SetActiveLine(sal_uInt16 no);
RefEdit* GetActiveEdit(); RefEdit* GetActiveEdit();
OUString GetActiveArgName(); OUString GetActiveArgName() const;
OUString GetArgument(sal_uInt16 no); OUString GetArgument(sal_uInt16 no);
void SetArgument(sal_uInt16 no, const OUString& aString); void SetArgument(sal_uInt16 no, const OUString& aString);
void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont); void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont);
void SetEdFocus(); // visible edit lines void SetEdFocus(); // visible edit lines
sal_uInt16 GetSliderPos(); sal_uInt16 GetSliderPos() const;
void SetSliderPos(sal_uInt16 nSliderPos); void SetSliderPos(sal_uInt16 nSliderPos);
void SetArgModifiedHdl( const Link<ParaWin&,void>& rLink ) { aArgModifiedLink = rLink; } void SetArgModifiedHdl( const Link<ParaWin&,void>& rLink ) { aArgModifiedLink = rLink; }

6
formula/source/ui/dlg/structpg.cxx
View File

@@ -61,7 +61,7 @@ void StructPage::ClearStruct()
m_xTlbStruct->clear(); m_xTlbStruct->clear();
} }
bool StructPage::InsertEntry(const OUString& rText, weld::TreeIter* pParent, bool StructPage::InsertEntry(const OUString& rText, const weld::TreeIter* pParent,
sal_uInt16 nFlag, int nPos, sal_uInt16 nFlag, int nPos,
const FormulaToken* pIFormulaToken, const FormulaToken* pIFormulaToken,
weld::TreeIter& rRet) weld::TreeIter& rRet)
@@ -98,7 +98,7 @@ bool StructPage::InsertEntry(const OUString& rText, weld::TreeIter* pParent,
return bEntry; return bEntry;
} }
OUString StructPage::GetEntryText(weld::TreeIter* pEntry) const OUString StructPage::GetEntryText(const weld::TreeIter* pEntry) const
{ {
OUString aString; OUString aString;
if (pEntry) if (pEntry)
@@ -106,7 +106,7 @@ OUString StructPage::GetEntryText(weld::TreeIter* pEntry) const
return aString; return aString;
} }
const FormulaToken* StructPage::GetFunctionEntry(weld::TreeIter* pEntry) const FormulaToken* StructPage::GetFunctionEntry(const weld::TreeIter* pEntry)
{ {
if (pEntry) if (pEntry)
{ {

10
formula/source/ui/dlg/structpg.hxx
View File

@@ -46,10 +46,10 @@ private:
DECL_LINK(SelectHdl, weld::TreeView&, void); DECL_LINK(SelectHdl, weld::TreeView&, void);
const FormulaToken* GetFunctionEntry(weld::TreeIter* pEntry); const FormulaToken* GetFunctionEntry(const weld::TreeIter* pEntry);
void SetActiveFlag(bool bFlag); void SetActiveFlag(bool bFlag);
bool GetActiveFlag() { return bActiveFlag;} bool GetActiveFlag() const { return bActiveFlag;}
public: public:
@@ -57,18 +57,18 @@ public:
~StructPage(); ~StructPage();
void ClearStruct(); void ClearStruct();
bool InsertEntry(const OUString& rText, weld::TreeIter* pParent, bool InsertEntry(const OUString& rText, const weld::TreeIter* pParent,
sal_uInt16 nFlag, int nPos, sal_uInt16 nFlag, int nPos,
const FormulaToken* pIFormulaToken, const FormulaToken* pIFormulaToken,
weld::TreeIter& rRet); weld::TreeIter& rRet);
OUString GetEntryText(weld::TreeIter* pEntry) const; OUString GetEntryText(const weld::TreeIter* pEntry) const;
void SetSelectionHdl( const Link<StructPage&,void>& rLink ) { aSelLink = rLink; } void SetSelectionHdl( const Link<StructPage&,void>& rLink ) { aSelLink = rLink; }
weld::TreeView& GetTlbStruct() const { return *m_xTlbStruct; } weld::TreeView& GetTlbStruct() const { return *m_xTlbStruct; }
bool IsVisible() { return m_xContainer->get_visible(); } bool IsVisible() const { return m_xContainer->get_visible(); }
}; };
} // formula } // formula

6
include/formula/tokenarray.hxx
View File

@@ -429,11 +429,11 @@ public:
{ return (nMode & ScRecalcMode::EMask) <= ScRecalcMode::ONLOAD_ONCE; } { return (nMode & ScRecalcMode::EMask) <= ScRecalcMode::ONLOAD_ONCE; }
/** Get OpCode of the most outer function */ /** Get OpCode of the most outer function */
inline OpCode GetOuterFuncOpCode(); inline OpCode GetOuterFuncOpCode() const;
/** Operators +,-,*,/,^,&,=,<>,<,>,<=,>= /** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
with DoubleRef in Formula? */ with DoubleRef in Formula? */
bool HasMatrixDoubleRefOps(); bool HasMatrixDoubleRefOps() const;
virtual FormulaToken* AddOpCode(OpCode e); virtual FormulaToken* AddOpCode(OpCode e);
@@ -505,7 +505,7 @@ public:
void ReinternStrings( svl::SharedStringPool& rPool ); void ReinternStrings( svl::SharedStringPool& rPool );
}; };
inline OpCode FormulaTokenArray::GetOuterFuncOpCode() inline OpCode FormulaTokenArray::GetOuterFuncOpCode() const
{ {
if ( pRPN && nRPN ) if ( pRPN && nRPN )
return pRPN[nRPN-1]->GetOpCode(); return pRPN[nRPN-1]->GetOpCode();