sc/source/ui/app/inputhdl.cxx | 8 ++++++++ vcl/jsdialog/executor.cxx | 12 ++++++++++++ 2 files changed, 20 insertions(+)
New commits: commit a66c2f55118aac03ee3a06ebdd97d48a93a6da9a Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Wed Jul 6 18:08:16 2022 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Tue Jul 26 10:27:32 2022 +0200 jsdialog: formulabar: dont send huge paragraph id when not found Change-Id: Ia5586023f639815e54628bfad1a8df11c295c741 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136848 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137450 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 5cae17a057df..56ba5cfd9e72 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -4241,6 +4241,14 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, { EditView* pActiveView = pTopView ? pTopView : pTableView; ESelection aSel = pActiveView ? pActiveView->GetSelection() : ESelection(); + + // if we switched content completly - don't send huge numbers + if (aSel.nStartPara == EE_PARA_NOT_FOUND) + aSel.nStartPara = 0; + + if (aSel.nEndPara == EE_PARA_NOT_FOUND) + aSel.nEndPara = 0; + ScInputHandler::LOKSendFormulabarUpdate(pActiveViewSh, aString, aSel); // TODO: deprecated? pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr()); commit c2a52693770c7db4741dedfdb7222b93f045b101 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Tue Jun 28 13:11:42 2022 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Tue Jul 26 10:27:25 2022 +0200 jsdialog: add open/close instead of toggle menu from dropdown it will make us sure we don't reopen popup when we just toggle so we will be in sync Change-Id: I014e824a29d91d5972a6840246bcd4c31d24ae48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136570 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Rashesh Padia <rashesh.pa...@collabora.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137449 Tested-by: Jenkins diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 24a5f9ba596d..0f8a2722bdac 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -319,6 +319,18 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM pToolbar->set_menu_item_active(sId, !bIsActive); return true; } + else if (sAction == "closemenu") + { + OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + pToolbar->set_menu_item_active(sId, false); + return true; + } + else if (sAction == "openmenu") + { + OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + pToolbar->set_menu_item_active(sId, true); + return true; + } } } else if (sControlType == "edit")