summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--formula/source/core/api/token.cxx2
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx4
-rw-r--r--formula/source/ui/dlg/funcpage.cxx6
-rw-r--r--formula/source/ui/dlg/funcpage.hxx8
-rw-r--r--formula/source/ui/dlg/funcutl.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.hxx6
-rw-r--r--formula/source/ui/dlg/structpg.cxx6
-rw-r--r--formula/source/ui/dlg/structpg.hxx10
-rw-r--r--include/formula/tokenarray.hxx6
10 files changed, 28 insertions, 28 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 8069863ca503..3d466feef5ea 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -888,7 +888,7 @@ void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits )
}
-bool FormulaTokenArray::HasMatrixDoubleRefOps()
+bool FormulaTokenArray::HasMatrixDoubleRefOps() const
{
if ( pRPN && nRPN )
{
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 5e3811f90fa6..fbc7e49cfda6 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -79,11 +79,11 @@ public:
RefButton* prefBtn);
void SetArgName(const OUString &aArg);
- OUString GetArgName();
+ OUString GetArgName() const;
void SetArgNameFont(const vcl::Font&);
void SetArgVal(const OUString &aVal);
- OUString GetArgVal();
+ OUString GetArgVal() const;
void SelectAll();
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 8b12e82e2707..92cb584fc99c 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -240,17 +240,17 @@ void FuncPage::SetFocus()
m_xLbFunction->grab_focus();
}
-sal_Int32 FuncPage::GetCategory()
+sal_Int32 FuncPage::GetCategory() const
{
return m_xLbCategory->get_active();
}
-sal_Int32 FuncPage::GetFunction()
+sal_Int32 FuncPage::GetFunction() const
{
return m_xLbFunction->get_selected_index();
}
-sal_Int32 FuncPage::GetFunctionEntryCount()
+sal_Int32 FuncPage::GetFunctionEntryCount() const
{
return m_xLbFunction->n_children();
}
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 71aba3e1a324..41dfae60a6a4 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -67,9 +67,9 @@ public:
void SetCategory(sal_Int32 nCat);
void SetFunction(sal_Int32 nFunc);
void SetFocus();
- sal_Int32 GetCategory();
- sal_Int32 GetFunction();
- sal_Int32 GetFunctionEntryCount();
+ sal_Int32 GetCategory() const;
+ sal_Int32 GetFunction() const;
+ sal_Int32 GetFunctionEntryCount() const;
sal_Int32 GetFuncPos(const IFunctionDescription* _pDesc);
const IFunctionDescription* GetFuncDesc( sal_Int32 nPos ) const;
@@ -79,7 +79,7 @@ public:
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
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index b1a37292728f..0d8a8656afd4 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -167,7 +167,7 @@ void ArgInput::SetArgName(const OUString &aArg)
}
// Returns the Name for the Argument
-OUString ArgInput::GetArgName()
+OUString ArgInput::GetArgName() const
{
OUString aPrivArgName;
if (pFtArg)
@@ -197,7 +197,7 @@ void ArgInput::SetArgVal(const OUString &rVal)
}
//Returns the Value for the Argument
-OUString ArgInput::GetArgVal()
+OUString ArgInput::GetArgVal() const
{
OUString aResult;
if (pEdArg)
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index a255041abca8..4cc3597c4f99 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -276,7 +276,7 @@ OUString ParaWin::GetArgument(sal_uInt16 no)
return aStr;
}
-OUString ParaWin::GetActiveArgName()
+OUString ParaWin::GetActiveArgName() const
{
OUString aStr;
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());
}
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index a4dfa71e9c3e..bcd836c221dc 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -118,17 +118,17 @@ public:
void UpdateParas();
void ClearAll();
- sal_uInt16 GetActiveLine() { return nActiveLine;}
+ sal_uInt16 GetActiveLine() const { return nActiveLine;}
void SetActiveLine(sal_uInt16 no);
RefEdit* GetActiveEdit();
- OUString GetActiveArgName();
+ OUString GetActiveArgName() const;
OUString GetArgument(sal_uInt16 no);
void SetArgument(sal_uInt16 no, const OUString& aString);
void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont);
void SetEdFocus(); // visible edit lines
- sal_uInt16 GetSliderPos();
+ sal_uInt16 GetSliderPos() const;
void SetSliderPos(sal_uInt16 nSliderPos);
void SetArgModifiedHdl( const Link<ParaWin&,void>& rLink ) { aArgModifiedLink = rLink; }
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 76d2f51fe0ad..f35d34a5a336 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -61,7 +61,7 @@ void StructPage::ClearStruct()
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,
const FormulaToken* pIFormulaToken,
weld::TreeIter& rRet)
@@ -98,7 +98,7 @@ bool StructPage::InsertEntry(const OUString& rText, weld::TreeIter* pParent,
return bEntry;
}
-OUString StructPage::GetEntryText(weld::TreeIter* pEntry) const
+OUString StructPage::GetEntryText(const weld::TreeIter* pEntry) const
{
OUString aString;
if (pEntry)
@@ -106,7 +106,7 @@ OUString StructPage::GetEntryText(weld::TreeIter* pEntry) const
return aString;
}
-const FormulaToken* StructPage::GetFunctionEntry(weld::TreeIter* pEntry)
+const FormulaToken* StructPage::GetFunctionEntry(const weld::TreeIter* pEntry)
{
if (pEntry)
{
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 38afd7172d24..1765254ccfe7 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -46,10 +46,10 @@ private:
DECL_LINK(SelectHdl, weld::TreeView&, void);
- const FormulaToken* GetFunctionEntry(weld::TreeIter* pEntry);
+ const FormulaToken* GetFunctionEntry(const weld::TreeIter* pEntry);
void SetActiveFlag(bool bFlag);
- bool GetActiveFlag() { return bActiveFlag;}
+ bool GetActiveFlag() const { return bActiveFlag;}
public:
@@ -57,18 +57,18 @@ public:
~StructPage();
void ClearStruct();
- bool InsertEntry(const OUString& rText, weld::TreeIter* pParent,
+ bool InsertEntry(const OUString& rText, const weld::TreeIter* pParent,
sal_uInt16 nFlag, int nPos,
const FormulaToken* pIFormulaToken,
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; }
weld::TreeView& GetTlbStruct() const { return *m_xTlbStruct; }
- bool IsVisible() { return m_xContainer->get_visible(); }
+ bool IsVisible() const { return m_xContainer->get_visible(); }
};
} // formula
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index df82ceb1cb22..635e5c1f3907 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -429,11 +429,11 @@ public:
{ return (nMode & ScRecalcMode::EMask) <= ScRecalcMode::ONLOAD_ONCE; }
/** Get OpCode of the most outer function */
- inline OpCode GetOuterFuncOpCode();
+ inline OpCode GetOuterFuncOpCode() const;
/** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
with DoubleRef in Formula? */
- bool HasMatrixDoubleRefOps();
+ bool HasMatrixDoubleRefOps() const;
virtual FormulaToken* AddOpCode(OpCode e);
@@ -505,7 +505,7 @@ public:
void ReinternStrings( svl::SharedStringPool& rPool );
};
-inline OpCode FormulaTokenArray::GetOuterFuncOpCode()
+inline OpCode FormulaTokenArray::GetOuterFuncOpCode() const
{
if ( pRPN && nRPN )
return pRPN[nRPN-1]->GetOpCode();