[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
Fri Dec 4 13:00:43 UTC 2020
sc/uiconfig/scalc/ui/notebookbar.ui | 133 ++++++++++++++++++++++++++++--------
vcl/source/window/dockmgr.cxx | 4 +
2 files changed, 110 insertions(+), 27 deletions(-)
New commits:
commit 922c1f7e41503abaefe4b65441526c1ddca731e0
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Dec 4 12:24:27 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Dec 4 14:00:12 2020 +0100
Avoid crash on closing docking window
Change-Id: I9f5ac4fae9e37e3eece8ad8bd2d6505514517d9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107215
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 746e957b6fd0..a0825e616467 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -383,6 +383,10 @@ void DockingManager::RemoveWindow( const vcl::Window *pWindow )
{
if( (*it)->mpDockingWindow == pWindow )
{
+ // deleting wrappers calls set of actions which may want to use
+ // wrapper we want to delete - avoid crash using temporary owner
+ // while erasing
+ auto pTemporaryOwner = std::move(*it);
mvDockingWindows.erase( it );
break;
}
commit fe6f19ecf320b45878f8394dd67cbcd178300ae7
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Dec 4 11:02:11 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Dec 4 14:00:05 2020 +0100
notebookbar: add pivot table section to tab data
Change-Id: If770155d5246c8697bb72db957b2b13e1501263f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107193
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 863f0ea416df..fbdd66c61761 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7399,6 +7399,46 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Data-Section-ManageXMLSource1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionManageXMLSource95">
+ <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</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
+ <child>
+ <object class="GtkToolButton" id="Data-ManageXMLSource">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ManageXMLSource</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">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-OptionalBox" id="Data-Section-Source2">
<property name="visible">True</property>
@@ -7439,7 +7479,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing12">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -7447,10 +7487,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Data-ManageXMLSource">
+ <object class="GtkToolButton" id="Data-DataProviderRefresh">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ManageXMLSource</property>
+ <property name="action_name">.uno:DataProviderRefresh</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7478,7 +7518,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -7533,24 +7573,66 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Data-Section-Calculate1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-PivotTable">
<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="GroupB49">
+ <object class="GtkSeparator" id="separator377">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionPivotTable1">
+ <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</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
+ <child>
+ <object class="GtkToolButton" id="Data-PivotTable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DataDataPilotRun</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">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="GroupPivotTable1">
<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="LeftParaMargin11">
+ <object class="sfxlo-NotebookbarToolBox" id="ToolBoxPivotTable1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -7576,7 +7658,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing12">
+ <object class="sfxlo-NotebookbarToolBox" id="ToolBoxPivotTable2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -7584,10 +7666,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Data-DataProviderRefresh">
+ <object class="GtkToolButton" id="Data-DeletePivotTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DataProviderRefresh</property>
+ <property name="action_name">.uno:DeletePivotTable</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7608,14 +7690,11 @@
<property name="position">2</property>
</packing>
</child>
- <style>
- <class name="priority-13"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -7670,7 +7749,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -7752,7 +7831,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -7846,7 +7925,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -7928,7 +8007,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -7983,7 +8062,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -8065,7 +8144,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -8147,7 +8226,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -8202,7 +8281,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -8284,7 +8363,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -8339,7 +8418,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -8421,7 +8500,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -8470,7 +8549,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">17</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list