formula/source/ui/dlg/formula.cxx | 20 ++++++++++----------
formula/uiconfig/ui/formuladialog.ui | 8 ++++----
vcl/jsdialog/enabled.cxx | 5 +++++
3 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 24e67e179aa6efddfcf8cae800c80ec0c1524680
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Mar 3 14:02:40 2023 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Mar 15 11:03:46 2023 +0000
jsdialog: enable function wizard
Change-Id: I534556e87cda3239bff51f1e7d83355922f8af7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148245
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index c73543603158..c05f75286a27 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -281,9 +281,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
m_xParaWin->SetArgModifiedHdl( LINK( this, FormulaDlg_Impl, ModifyHdl ) );
m_xParaWin->SetFxHdl( LINK( this, FormulaDlg_Impl, FxHdl ) );
- m_xFuncPage.reset(new FuncPage(m_xTabCtrl->get_page("function"),
_pFunctionMgr));
- m_xStructPage.reset(new StructPage(m_xTabCtrl->get_page("struct")));
- m_xTabCtrl->set_current_page("function");
+ m_xFuncPage.reset(new FuncPage(m_xTabCtrl->get_page("functiontab"),
_pFunctionMgr));
+ m_xStructPage.reset(new StructPage(m_xTabCtrl->get_page("structtab")));
+ m_xTabCtrl->set_current_page("functiontab");
m_aOldHelp = m_rDialog.get_help_id(); // HelpId from
resource always for "Page 1"
@@ -318,8 +318,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
FormulaDlg_Impl::~FormulaDlg_Impl()
{
- m_xTabCtrl->remove_page("function");
- m_xTabCtrl->remove_page("struct");
+ m_xTabCtrl->remove_page("functiontab");
+ m_xTabCtrl->remove_page("structtab");
DeleteArgs();
}
@@ -337,7 +337,7 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
pData->SetFStart(nStartPos);
pData->SetSelection(Selection(nStartPos, nEndPos));
- if (m_xTabCtrl->get_current_page_ident() == "function")
+ if (m_xTabCtrl->get_current_page_ident() == "functiontab")
pData->SetMode( FormulaDlgMode::Formula );
else
pData->SetMode( FormulaDlgMode::Edit );
@@ -1254,7 +1254,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
return;
m_xBtnForward->set_sensitive(true); //@ In order to be able to input
another function.
- m_xTabCtrl->set_current_page("function");
+ m_xTabCtrl->set_current_page("functiontab");
OUString aUndoStr = m_pHelper->getCurrentFormula(); // it will be
added before a ";"
FormEditData* pData = m_pHelper->getFormEditData();
@@ -1580,9 +1580,9 @@ void FormulaDlg_Impl::Update()
FormulaCursor();
CalcStruct(sExpression);
if (pData->GetMode() == FormulaDlgMode::Formula)
- m_xTabCtrl->set_current_page("function");
+ m_xTabCtrl->set_current_page("functiontab");
else
- m_xTabCtrl->set_current_page("struct");
+ m_xTabCtrl->set_current_page("structtab");
m_xBtnMatrix->set_active(pData->GetMatrixFlag());
}
@@ -1640,7 +1640,7 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
m_xBtnMatrix->set_sensitive(false);
} // if ( bMatrix )
- m_xTabCtrl->set_current_page("struct");
+ m_xTabCtrl->set_current_page("structtab");
return bMatrix;
}
diff --git a/formula/uiconfig/ui/formuladialog.ui
b/formula/uiconfig/ui/formuladialog.ui
index 1e7a9751f0d7..65768b390732 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -177,10 +177,10 @@
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="function">
+ <object class="GtkLabel" id="functiontab">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="formuladialog|function">Functions</property>
+ <property name="label" translatable="yes"
context="formuladialog|functiontab">Functions</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -224,10 +224,10 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="struct">
+ <object class="GtkLabel" id="structtab">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="formuladialog|struct">Structure</property>
+ <property name="label" translatable="yes"
context="formuladialog|structtab">Structure</property>
</object>
<packing>
<property name="position">1</property>
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 459877a6afd6..1504f0eccd38 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -57,6 +57,11 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/transparencytabpage.ui"
|| rUIFile == u"cui/ui/twolinespage.ui"
|| rUIFile == u"cui/ui/widgettestdialog.ui"
+ // formula
+ || rUIFile == u"formula/ui/formuladialog.ui"
+ || rUIFile == u"formula/ui/functionpage.ui"
+ || rUIFile == u"formula/ui/parameter.ui"
+ || rUIFile == u"formula/ui/structpage.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/advancedfilterdialog.ui"
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
