[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sc/uiconfig vcl/source
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 10 15:34:16 UTC 2020
sc/uiconfig/scalc/ui/notebookbar.ui | 82 ++++++++++++++++++++++++++++++++++++
vcl/source/window/dialog.cxx | 6 ++
2 files changed, 88 insertions(+)
New commits:
commit 9d3b73d47bb17378f57b18c8dd4a94ce61571c7b
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 10 14:39:58 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 10 16:33:49 2020 +0100
notebookbar: add named ranges management
Change-Id: I63c2589cd9ab7bfa3a10ea7f2d4729e1f715c92f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107531
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index fbdd66c61761..462a00788298 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -8366,6 +8366,88 @@
<property name="position">14</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Data-Section-NamedRanges">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="GroupB561">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin161">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Data-AddName">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AddName</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing181">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Data-DefineName">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DefineName</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">14</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-OptionalBox" id="Data-Section-TextToColumn">
<property name="visible">True</property>
commit 5c6a765b5091540b76659671935ea9434b2961dc
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 10 15:35:53 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 10 16:33:41 2020 +0100
jsdialog: export dialog id
Change-Id: I406d64ec8e19661ab258908e29245bc7da245b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107558
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index dadcc34718c8..df9135f43058 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1616,6 +1616,12 @@ boost::property_tree::ptree Dialog::DumpAsPropertyTree()
if (!pActionArea->IsVisible())
aTree.put("collapsed", "true");
}
+
+ OUString sDialogId = OStringToOUString(GetHelpId(), RTL_TEXTENCODING_ASCII_US);
+ sal_Int32 nStartPos = sDialogId.lastIndexOf('/');
+ nStartPos = nStartPos >= 0 ? nStartPos + 1 : 0;
+ aTree.put("dialogid", sDialogId.copy(nStartPos));
+
return aTree;
}
More information about the Libreoffice-commits
mailing list