sc/source/ui/view/gridwin.cxx | 55 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 26 deletions(-)
New commits: commit 65fa3d18ce28c609ead1ac81c93d0fbb38ce9658 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jun 7 12:11:22 2024 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jun 10 08:10:04 2024 +0200 prep AutoFill menu in kit mode only Change-Id: Id533d78e1433b616ce661e855dad0d571d24cf8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168533 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index b5cd268e4cc4..85816c5636b9 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2369,32 +2369,35 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) { mrViewData.GetDispatcher().Execute( FID_FILL_AUTO, SfxCallMode::SLOT | SfxCallMode::RECORD ); - // prepare AutoFill menu items for "Copy Cells" and "Fill Series" - ScTabViewShell* pViewShell = mrViewData.GetViewShell(); - boost::property_tree::ptree aMenu; - boost::property_tree::ptree aItemTree; - - aItemTree.put("text", "~Copy Cells"); - aItemTree.put("type", "command"); - aItemTree.put("command", ".uno:AutoFill?Copy:bool=true"); - aItemTree.put("enabled", "true"); - aMenu.push_back(std::make_pair("", aItemTree)); - - aItemTree.put("text", "~Fill Series"); - aItemTree.put("type", "command"); - aItemTree.put("command", ".uno:AutoFill?Copy:bool=false"); - aItemTree.put("enabled", "true"); - aMenu.push_back(std::make_pair("", aItemTree)); - aItemTree.clear(); - - boost::property_tree::ptree aRoot; - aRoot.add_child("menu", aMenu); - - std::stringstream aStream; - boost::property_tree::write_json(aStream, aRoot, true); - - pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CONTEXT_MENU, - OString(aStream.str())); + if (comphelper::LibreOfficeKit::isActive()) + { + // prepare AutoFill menu items for "Copy Cells" and "Fill Series" + ScTabViewShell* pViewShell = mrViewData.GetViewShell(); + boost::property_tree::ptree aMenu; + boost::property_tree::ptree aItemTree; + + aItemTree.put("text", "~Copy Cells"); + aItemTree.put("type", "command"); + aItemTree.put("command", ".uno:AutoFill?Copy:bool=true"); + aItemTree.put("enabled", "true"); + aMenu.push_back(std::make_pair("", aItemTree)); + + aItemTree.put("text", "~Fill Series"); + aItemTree.put("type", "command"); + aItemTree.put("command", ".uno:AutoFill?Copy:bool=false"); + aItemTree.put("enabled", "true"); + aMenu.push_back(std::make_pair("", aItemTree)); + aItemTree.clear(); + + boost::property_tree::ptree aRoot; + aRoot.add_child("menu", aMenu); + + std::stringstream aStream; + boost::property_tree::write_json(aStream, aRoot, true); + + pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CONTEXT_MENU, + OString(aStream.str())); + } } } else if (mrViewData.GetFillMode() == ScFillMode::MATRIX)
