From 0e0eff2309583ea25b81006b5bc6879b86081a15 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Thu, 4 Jan 2018 00:06:58 -0500 Subject: lok: send modified status when applying cell-formula before saving Without this, the modified status resulting from applying the cell-formula immediately before saving is lost, since it is clobbered after the save. Change-Id: Ie402812d0fc0528020161fffe57e8220c5abfeb5 Reviewed-on: https://gerrit.libreoffice.org/47366 Tested-by: Jenkins Reviewed-by: Ashod Nakashian --- include/sfx2/lokhelper.hxx | 2 ++ sc/source/ui/inc/inputhdl.hxx | 1 + sc/source/ui/view/tabvwsha.cxx | 18 ++++++++++++++++++ sfx2/source/view/lokhelper.cxx | 11 +++++++++++ 4 files changed, 32 insertions(+) diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index b2b6f9f09977..b2307eb428a6 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -50,6 +50,8 @@ public: const std::vector& rPayload = std::vector()); /// Emits a LOK_CALLBACK_INVALIDATE_TILES, but tweaks it according to setOptionalFeatures() if needed. static void notifyInvalidation(SfxViewShell const* pThisView, const OString& rPayload); + /// Notifies all views with the given type and payload. + static void notifyAllViews(int nType, const OString& rPayload); /// A special value to signify 'infinity'. /// This value is chosen such that sal_Int32 will not overflow when manipulated. static const long MaxTwips = 1e9; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 3bc760446b02..96450a842bc9 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -233,6 +233,7 @@ public: bool TakesReturn() const { return ( nTipVisible != nullptr ); } + bool GetModified() const { return bModified; } void SetModified() { bModified = true; } bool GetSelIsRef() const { return bSelIsRef; } diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 64aee60e6b09..844eecb01f3a 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -56,6 +56,9 @@ #include #include #include +#include +#include +#include #include @@ -718,7 +721,22 @@ void ScTabViewShell::ExecuteSave( SfxRequest& rReq ) // Finish entering unless 'DontTerminateEdit' is specified, even if a formula is being processed if (bCommitChanges) + { + if (comphelper::LibreOfficeKit::isActive()) + { + // Normally this isn't needed, but in Calc when editing a cell formula + // and manually saving (without changing cells or hitting enter), while + // InputEnterHandler will mark the doc as modified (when it is), because + // we will save the doc immediately afterwards, the modified state event + // is clobbered. To avoid that, we notify all views immediately of the + // modified state, apply the modification, then save the document. + ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); + if (pHdl != nullptr && pHdl->GetModified()) + SfxLokHelper::notifyAllViews(LOK_CALLBACK_STATE_CHANGED, ".uno:ModifiedStatus=true"); + } + SC_MOD()->InputEnterHandler(); + } if ( GetViewData().GetDocShell()->IsDocShared() ) { diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index cd672aaf91e1..6fd6a7699038 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -199,4 +199,15 @@ void SfxLokHelper::notifyInvalidation(SfxViewShell const* pThisView, const OStri pThisView->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, aBuf.makeStringAndClear().getStr()); } +void SfxLokHelper::notifyAllViews(int nType, const OString& rPayload) +{ + const auto payload = rPayload.getStr(); + SfxViewShell* pViewShell = SfxViewShell::GetFirst(); + while (pViewShell) + { + pViewShell->libreOfficeKitViewCallback(nType, payload); + pViewShell = SfxViewShell::GetNext(*pViewShell); + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit