diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2023-03-03 14:02:40 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-03-23 07:01:35 +0000 |
commit | ae71f11d2861f7c49f9f75435f85c01907a6029e (patch) | |
tree | a6e01ccb1b6769a212aa8b8d9566d2fe1ab8751a /formula | |
parent | 83bde658dd538b8cb66df9bf0ce1e1c959052f59 (diff) |
jsdialog: enable function wizard
Change-Id: I534556e87cda3239bff51f1e7d83355922f8af7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148245
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149327
Tested-by: Jenkins
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 20 | ||||
-rw-r--r-- | formula/uiconfig/ui/formuladialog.ui | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 038fc2b63cf9..2e4ffaf512dc 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> |