9 files changed, 12 insertions, 14 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 6b0eb35b0c45..4813cfcbd9b7 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1866,11 +1866,10 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
     }
 }
 
-const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& rFormula, const FormulaToken* pTokenP,
-        bool bAllowArrAdvance )
+const FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& rFormula, const FormulaToken* pTokenP )
 {
     OUStringBuffer aBuffer;
-    const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
+    const FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP );
     rFormula += aBuffer.makeStringAndClear();
     return p;
 }
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 00e76faa45d7..24956d69c279 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -237,8 +237,7 @@ public:
 
     void CreateStringFromTokenArray( OUString& rFormula );
     void CreateStringFromTokenArray( OUStringBuffer& rBuffer );
-    const FormulaToken* CreateStringFromToken( OUString& rFormula, const FormulaToken* pToken,
-                                    bool bAllowArrAdvance = false );
+    const FormulaToken* CreateStringFromToken( OUString& rFormula, const FormulaToken* pToken );
     const FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, const FormulaToken* pToken,
                                     bool bAllowArrAdvance = false );
 
diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx
index 9dbde6cfa57d..595eb13e05de 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -31,7 +31,7 @@ namespace formula
     public:
         virtual void ShowReference(const OUString& _sRef) = 0;
         virtual void HideReference( bool bDoneRefMode = true ) = 0;
-        virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = nullptr ) = 0;
+        virtual void ReleaseFocus( RefEdit* pEdit ) = 0;
         virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = nullptr ) = 0;
 
     protected:
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 03f4a7a04a17..4fbd9a3f6769 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -189,7 +189,7 @@ void FormulaDialog::HideReference( bool /*bDoneRefMode*/)
 {
 }
 
-void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/, RefButton* /*pButton*/)
+void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/)
 {
 }
 
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index 60b1d5683433..3df43615d1f1 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -99,7 +99,7 @@ public:
     // IControlReferenceHandler
     virtual void ShowReference(const OUString& _sRef) override;
     virtual void HideReference( bool bDoneRefMode = true ) override;
-    virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
+    virtual void ReleaseFocus( formula::RefEdit* pEdit ) override;
     virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
 };
 
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 9e15801c699e..943e38614c41 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -510,9 +510,9 @@ void ScFormulaDlg::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
 {
     m_aHelper.ToggleCollapsed(pEdit,pButton);
 }
-void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton)
+void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit)
 {
-    m_aHelper.ReleaseFocus(pEdit,pButton);
+    m_aHelper.ReleaseFocus(pEdit);
 }
 void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked)
 {
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index d84d00043da4..7ef76adcf926 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -149,7 +149,7 @@ public:
     virtual void        HideReference( bool bDoneRefMode = true ) override;
 
     virtual void        ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
-    virtual void        ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
+    virtual void        ReleaseFocus( formula::RefEdit* pEdit ) override;
 
     virtual void        ViewShellChanged() override;
     void                SwitchToDocument();
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 60613b70d7c7..fc72393b8020 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -88,7 +88,7 @@ public:
     virtual void HideReference( bool bDoneRefMode = true ) override;
     virtual void SetReference( const ScRange& rRef, ScDocument* pD ) override;
 
-    virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
+    virtual void ReleaseFocus( formula::RefEdit* pEdit ) override;
     virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
     virtual void RefInputDone( bool bForced = false ) override;
     virtual bool IsTableLocked() const override;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 1814f5e3d2ea..c44ec1bedbc7 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -962,9 +962,9 @@ void ScRefHandler::ShowReference(const OUString& rStr)
     m_aHelper.ShowReference(rStr);
 }
 
-void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton )
+void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit )
 {
-    m_aHelper.ReleaseFocus( pEdit,pButton );
+    m_aHelper.ReleaseFocus( pEdit );
 }
 
 void ScRefHandler::RefInputDone( bool bForced )