[Libreoffice-commits] core.git: sw/source sw/uiconfig
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 30 12:17:26 UTC 2019
sw/source/uibase/sidebar/TableEditPanel.cxx | 96 +++++++++++++++++-------
sw/source/uibase/sidebar/TableEditPanel.hxx | 26 +++++-
sw/uiconfig/swriter/ui/sidebartableedit.ui | 110 ++++++++++++----------------
3 files changed, 138 insertions(+), 94 deletions(-)
New commits:
commit 76be71b2afa00ab66a543771c2c1a0894fa3a1ae
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Dec 21 14:50:10 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 30 13:16:54 2019 +0100
weld TableEditPanel
Change-Id: I380ed08e43e10a5d78e73436b6668abbce1ea23d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85696
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index a657feb8718c..c8c0bf0cec55 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -53,17 +53,17 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID, const SfxItemState
if (pItem)
{
long nNewHeight = pItem->GetValue();
- nNewHeight = m_pRowHeightEdit->Normalize(nNewHeight);
- m_pRowHeightEdit->SetValue(nNewHeight, FieldUnit::TWIP);
+ nNewHeight = m_xRowHeightEdit->normalize(nNewHeight);
+ m_xRowHeightEdit->set_value(nNewHeight, FieldUnit::TWIP);
}
}
else if (eState == SfxItemState::DISABLED)
{
- m_pRowHeightEdit->Disable();
+ m_xRowHeightEdit->set_sensitive(false);
}
else
{
- m_pRowHeightEdit->SetEmptyFieldValue();
+ m_xRowHeightEdit->set_text("");
}
break;
}
@@ -75,17 +75,17 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID, const SfxItemState
if (pItem)
{
long nNewWidth = pItem->GetValue();
- nNewWidth = m_pColumnWidthEdit->Normalize(nNewWidth);
- m_pColumnWidthEdit->SetValue(nNewWidth, FieldUnit::TWIP);
+ nNewWidth = m_xColumnWidthEdit->normalize(nNewWidth);
+ m_xColumnWidthEdit->set_value(nNewWidth, FieldUnit::TWIP);
}
}
else if (eState == SfxItemState::DISABLED)
{
- m_pColumnWidthEdit->Disable();
+ m_xColumnWidthEdit->set_sensitive(false);
}
else
{
- m_pColumnWidthEdit->SetEmptyFieldValue();
+ m_xColumnWidthEdit->set_text("");
}
break;
}
@@ -95,8 +95,27 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID, const SfxItemState
TableEditPanel::TableEditPanel(vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
- : PanelLayout(pParent, "TableEditPanel", "modules/swriter/ui/sidebartableedit.ui", rxFrame)
+ : PanelLayout(pParent, "TableEditPanel", "modules/swriter/ui/sidebartableedit.ui", rxFrame,
+ true)
, m_pBindings(pBindings)
+ , m_xRowHeightEdit(
+ new RelativeField(m_xBuilder->weld_metric_spin_button("rowheight", FieldUnit::CM)))
+ , m_xColumnWidthEdit(
+ new RelativeField(m_xBuilder->weld_metric_spin_button("columnwidth", FieldUnit::CM)))
+ , m_xInsert(m_xBuilder->weld_toolbar("insert"))
+ , m_xInsertDispatch(new ToolbarUnoDispatcher(*m_xInsert, rxFrame))
+ , m_xSelect(m_xBuilder->weld_toolbar("select"))
+ , m_xSelectDispatch(new ToolbarUnoDispatcher(*m_xSelect, rxFrame))
+ , m_xRowSizing(m_xBuilder->weld_toolbar("rowsizing"))
+ , m_xRowSizingDispatch(new ToolbarUnoDispatcher(*m_xRowSizing, rxFrame))
+ , m_xColumnSizing(m_xBuilder->weld_toolbar("columnsizing"))
+ , m_xColumnSizingDispatch(new ToolbarUnoDispatcher(*m_xColumnSizing, rxFrame))
+ , m_xDelete(m_xBuilder->weld_toolbar("delete"))
+ , m_xDeleteDispatch(new ToolbarUnoDispatcher(*m_xDelete, rxFrame))
+ , m_xSplitMerge(m_xBuilder->weld_toolbar("split_merge"))
+ , m_xSplitMergeDispatch(new ToolbarUnoDispatcher(*m_xSplitMerge, rxFrame))
+ , m_xMisc(m_xBuilder->weld_toolbar("misc"))
+ , m_xMiscDispatch(new ToolbarUnoDispatcher(*m_xMisc, rxFrame))
, m_aRowHeightController(SID_ATTR_TABLE_ROW_HEIGHT, *pBindings, *this)
, m_aColumnWidthController(SID_ATTR_TABLE_COLUMN_WIDTH, *pBindings, *this)
, m_aInsertRowsBeforeController(FN_TABLE_INSERT_ROW_BEFORE, *pBindings, *this)
@@ -114,9 +133,6 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
, m_aDistributeColumnsController(FN_TABLE_BALANCE_CELLS, *pBindings, *this)
, m_aMergeCellsController(FN_TABLE_MERGE_CELLS, *pBindings, *this)
{
- get(m_pRowHeightEdit, "rowheight");
- get(m_pColumnWidthEdit, "columnwidth");
-
InitRowHeightToolitem();
InitColumnWidthToolitem();
}
@@ -125,32 +141,54 @@ TableEditPanel::~TableEditPanel() { disposeOnce(); }
void TableEditPanel::InitRowHeightToolitem()
{
- Link<Edit&, void> aLink = LINK(this, TableEditPanel, RowHeightMofiyHdl);
- m_pRowHeightEdit->SetModifyHdl(aLink);
+ Link<weld::MetricSpinButton&, void> aLink = LINK(this, TableEditPanel, RowHeightMofiyHdl);
+ m_xRowHeightEdit->connect_value_changed(aLink);
FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric();
- SetFieldUnit(*m_pRowHeightEdit, eFieldUnit);
+ m_xRowHeightEdit->SetFieldUnit(eFieldUnit);
- m_pRowHeightEdit->SetMin(MINLAY, FieldUnit::TWIP);
- m_pRowHeightEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
+ m_xRowHeightEdit->set_min(MINLAY, FieldUnit::TWIP);
+ m_xRowHeightEdit->set_max(SAL_MAX_INT32, FieldUnit::TWIP);
}
void TableEditPanel::InitColumnWidthToolitem()
{
- Link<Edit&, void> aLink = LINK(this, TableEditPanel, ColumnWidthMofiyHdl);
- m_pColumnWidthEdit->SetModifyHdl(aLink);
+ Link<weld::MetricSpinButton&, void> aLink = LINK(this, TableEditPanel, ColumnWidthMofiyHdl);
+ m_xColumnWidthEdit->connect_value_changed(aLink);
FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric();
- SetFieldUnit(*m_pColumnWidthEdit, eFieldUnit);
+ m_xColumnWidthEdit->SetFieldUnit(eFieldUnit);
- m_pColumnWidthEdit->SetMin(MINLAY, FieldUnit::TWIP);
- m_pColumnWidthEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
+ m_xColumnWidthEdit->set_min(MINLAY, FieldUnit::TWIP);
+ m_xColumnWidthEdit->set_max(SAL_MAX_INT32, FieldUnit::TWIP);
}
void TableEditPanel::dispose()
{
- m_pRowHeightEdit.clear();
- m_pColumnWidthEdit.clear();
+ m_xRowHeightEdit.reset();
+ m_xColumnWidthEdit.reset();
+
+ m_xMiscDispatch.reset();
+ m_xMisc.reset();
+
+ m_xSplitMergeDispatch.reset();
+ m_xSplitMerge.reset();
+
+ m_xDeleteDispatch.reset();
+ m_xDelete.reset();
+
+ m_xColumnSizingDispatch.reset();
+ m_xColumnSizing.reset();
+
+ m_xRowSizingDispatch.reset();
+ m_xRowSizing.reset();
+
+ m_xSelectDispatch.reset();
+ m_xSelect.reset();
+
+ m_xInsertDispatch.reset();
+ m_xInsert.reset();
+
m_aRowHeightController.dispose();
m_aColumnWidthController.dispose();
m_aInsertRowsBeforeController.dispose();
@@ -171,10 +209,10 @@ void TableEditPanel::dispose()
PanelLayout::dispose();
}
-IMPL_LINK_NOARG(TableEditPanel, RowHeightMofiyHdl, Edit&, void)
+IMPL_LINK_NOARG(TableEditPanel, RowHeightMofiyHdl, weld::MetricSpinButton&, void)
{
SwTwips nNewHeight = static_cast<SwTwips>(
- m_pRowHeightEdit->Denormalize(m_pRowHeightEdit->GetValue(FieldUnit::TWIP)));
+ m_xRowHeightEdit->denormalize(m_xRowHeightEdit->get_value(FieldUnit::TWIP)));
SfxUInt32Item aRowHeight(SID_ATTR_TABLE_ROW_HEIGHT);
aRowHeight.SetValue(nNewHeight);
@@ -182,10 +220,10 @@ IMPL_LINK_NOARG(TableEditPanel, RowHeightMofiyHdl, Edit&, void)
{ &aRowHeight });
}
-IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, Edit&, void)
+IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, weld::MetricSpinButton&, void)
{
SwTwips nNewWidth = static_cast<SwTwips>(
- m_pColumnWidthEdit->Denormalize(m_pColumnWidthEdit->GetValue(FieldUnit::TWIP)));
+ m_xColumnWidthEdit->denormalize(m_xColumnWidthEdit->get_value(FieldUnit::TWIP)));
SfxUInt32Item aColumnWidth(SID_ATTR_TABLE_COLUMN_WIDTH);
aColumnWidth.SetValue(nNewWidth);
@@ -195,4 +233,4 @@ IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, Edit&, void)
}
} // end of namespace ::sw::sidebar
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index a825bc01cc38..d04d192001e9 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -14,6 +14,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <svx/sidebar/PanelLayout.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
+#include <sfx2/weldutils.hxx>
#include <svx/relfld.hxx>
namespace sw
@@ -44,8 +45,23 @@ private:
SfxBindings* m_pBindings;
- VclPtr<SvxRelativeField> m_pRowHeightEdit;
- VclPtr<SvxRelativeField> m_pColumnWidthEdit;
+ std::unique_ptr<RelativeField> m_xRowHeightEdit;
+ std::unique_ptr<RelativeField> m_xColumnWidthEdit;
+ std::unique_ptr<weld::Toolbar> m_xInsert;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xInsertDispatch;
+ std::unique_ptr<weld::Toolbar> m_xSelect;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xSelectDispatch;
+ std::unique_ptr<weld::Toolbar> m_xRowSizing;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xRowSizingDispatch;
+ std::unique_ptr<weld::Toolbar> m_xColumnSizing;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xColumnSizingDispatch;
+ std::unique_ptr<weld::Toolbar> m_xDelete;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xDeleteDispatch;
+ std::unique_ptr<weld::Toolbar> m_xSplitMerge;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xSplitMergeDispatch;
+ std::unique_ptr<weld::Toolbar> m_xMisc;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xMiscDispatch;
+
::sfx2::sidebar::ControllerItem m_aRowHeightController;
::sfx2::sidebar::ControllerItem m_aColumnWidthController;
::sfx2::sidebar::ControllerItem m_aInsertRowsBeforeController;
@@ -63,12 +79,12 @@ private:
::sfx2::sidebar::ControllerItem m_aDistributeColumnsController;
::sfx2::sidebar::ControllerItem m_aMergeCellsController;
- DECL_LINK(RowHeightMofiyHdl, Edit&, void);
- DECL_LINK(ColumnWidthMofiyHdl, Edit&, void);
+ DECL_LINK(RowHeightMofiyHdl, weld::MetricSpinButton&, void);
+ DECL_LINK(ColumnWidthMofiyHdl, weld::MetricSpinButton&, void);
};
}
} // end of namespace sw::sidebar
#endif // INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_TABLEEDITPANEL_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui
index 43634b4a34fe..f6e6d9ad2e2f 100644
--- a/sw/uiconfig/swriter/ui/sidebartableedit.ui
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -2,7 +2,16 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="TableEditPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -16,7 +25,7 @@
<property name="column_spacing">3</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="svxlo-SvxRelativeField" id="rowheight">
+ <object class="GtkSpinButton" id="rowheight">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -24,6 +33,7 @@
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="text">0</property>
+ <property name="adjustment">adjustment1</property>
<child internal-child="accessible">
<object class="AtkObject" id="rowheight-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="sidebartableedit|rowheight-atkobject">Row Height</property>
@@ -48,55 +58,53 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="insert">
+ <object class="GtkToolbar" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="insertrowsbefore">
+ <object class="GtkToolButton" id=".uno:InsertRowsBefore">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertRowsBefore</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="insertrowsafter">
+ <object class="GtkToolButton" id=".uno:InsertRowsAfter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertRowsAfter</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="insertcolumnsbefore">
+ <object class="GtkToolButton" id=".uno:InsertColumnsBefore">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertColumnsBefore</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="insertcolumnsafter">
+ <object class="GtkToolButton" id=".uno:InsertColumnsAfter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertColumnsAfter</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -118,14 +126,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="select">
+ <object class="GtkToolbar" id="select">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="selectcell">
+ <object class="GtkToolButton" id=".uno:EntireCell">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:EntireCell</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -134,10 +141,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="selectrow">
+ <object class="GtkToolButton" id=".uno:EntireRow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:EntireRow</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -146,10 +152,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="selectcolumn">
+ <object class="GtkToolButton" id=".uno:EntireColumn">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:EntireColumn</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -158,10 +163,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="selecttable">
+ <object class="GtkToolButton" id=".uno:SelectTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SelectTable</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -187,7 +191,7 @@
</packing>
</child>
<child>
- <object class="svxlo-SvxRelativeField" id="columnwidth">
+ <object class="GtkSpinButton" id="columnwidth">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -195,6 +199,7 @@
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="text">0</property>
+ <property name="adjustment">adjustment2</property>
<child internal-child="accessible">
<object class="AtkObject" id="columnwidth-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="sidebatableedit|columnwidth-atkobject">Column Width</property>
@@ -259,14 +264,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="rowsizing">
+ <object class="GtkToolbar" id="rowsizing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="minimalrowheight">
+ <object class="GtkToolButton" id=".uno:SetMinimalRowHeight">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetMinimalRowHeight</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -275,10 +279,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="optimalrowheight">
+ <object class="GtkToolButton" id=".uno:SetOptimalRowHeight">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetOptimalRowHeight</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -287,10 +290,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="distributerows">
+ <object class="GtkToolButton" id=".uno:DistributeRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DistributeRows</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -305,14 +307,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="columnsizing">
+ <object class="GtkToolbar" id="columnsizing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="minimalcolumnwidth">
+ <object class="GtkToolButton" id=".uno:SetMinimalColumnWidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetMinimalColumnWidth</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -321,10 +322,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="optimalcolumnwidth">
+ <object class="GtkToolButton" id=".uno:SetOptimalColumnWidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetOptimalColumnWidth</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -333,10 +333,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="distributecolumns">
+ <object class="GtkToolButton" id=".uno:DistributeColumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DistributeColumns</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -363,14 +362,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="delete">
+ <object class="GtkToolbar" id="delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="deleterows">
+ <object class="GtkToolButton" id=".uno:DeleteRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteRows</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -379,10 +377,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="deletecolumns">
+ <object class="GtkToolButton" id=".uno:DeleteColumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteColumns</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -391,10 +388,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="deletetable">
+ <object class="GtkToolButton" id=".uno:DeleteTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteTable</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -421,14 +417,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="split_merge">
+ <object class="GtkToolbar" id="split_merge">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="mergecells">
+ <object class="GtkToolButton" id=".uno:MergeCells">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MergeCells</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -437,10 +432,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="splitcells">
+ <object class="GtkToolButton" id=".uno:SplitCell">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SplitCell</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -449,10 +443,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="splittable">
+ <object class="GtkToolButton" id=".uno:SplitTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SplitTable</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -477,15 +470,14 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="misc">
+ <object class="GtkToolbar" id="misc">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<child>
- <object class="GtkToolButton" id="cellcolor1">
+ <object class="GtkToolButton" id=".uno:TableCellBackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TableCellBackgroundColor</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -494,10 +486,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="cellborders1">
+ <object class="GtkToolButton" id=".uno:SetBorderStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetBorderStyle</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -506,10 +497,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="formula">
+ <object class="GtkToolButton" id=".uno:InsertFormula">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertFormula</property>
<property name="use_underline">True</property>
</object>
<packing>
More information about the Libreoffice-commits
mailing list