sc/source/ui/view/gridwin.cxx | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
New commits:
commit 4d599b5a9702863be8c5927ab657d4a3805570e7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jun 7 12:11:22 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jun 7 15:55:49 2024 +0200
prep AutoFill menu in kit mode only
Change-Id: Id533d78e1433b616ce661e855dad0d571d24cf8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168524
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index dcc4361a313f..5d298458cb75 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2370,32 +2370,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)
commit e2128b2ea88460bd33ec9b70974366699ef5ccae
Author: Bayram Çiçek <bayram.ci...@collabora.com>
AuthorDate: Mon May 27 12:14:56 2024 +0300
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jun 7 15:55:42 2024 +0200
add AutoFill menu items - LOK_CALLBACK_CONTEXT_MENU
- added AutoFill menu items "Copy cells" and "Fill series"
- send information with LOK_CALLBACK_CONTEXT_MENU
Signed-off-by: Bayram Çiçek <bayram.ci...@collabora.com>
Change-Id: I3118f5535f74cfa4ab049e643930df83512b6850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168086
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
(cherry picked from commit a3f4d31783721f61b8436c5f8032321b4c97de1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168531
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d73701241e7c..dcc4361a313f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2367,7 +2367,36 @@ void ScGridWindow::MouseButtonUp( const MouseEvent&
rMEvt )
}
}
else
+ {
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()));
+ }
}
else if (mrViewData.GetFillMode() == ScFillMode::MATRIX)
{
