[Libreoffice-commits] core.git: Branch 'feature/table_panel' - 465 commits - accessibility/inc accessibility/IwyuFilter_accessibility.yaml accessibility/source android/Bootstrap android/source basctl/source basegfx/source basic/source bin/check-elf-dynamic-objects bin/find-can-be-private-symbols.py bin/lo-xlate-lang canvas/IwyuFilter_canvas.yaml canvas/source chart2/qa chart2/source chart2/uiconfig codemaker/source comphelper/qa comphelper/source compilerplugins/clang config_host/config_folders.h.in configmgr/source configure.ac connectivity/source cppcanvas/IwyuFilter_cppcanvas.yaml cppcanvas/qa cppcanvas/source cppu/source cui/source cui/uiconfig dbaccess/source desktop/source desktop/uiconfig dictionaries distro-configs/Jenkins download.lst editeng/inc editeng/source extensions/source external/boost external/breakpad external/coinmp external/expat external/firebird external/glm external/harfbuzz external/icu external/libfreehand external/libstaroffice external/libwps external/libxml2 external/ lpsolve external/redland extras/source filter/source forms/source formula/source fpicker/inc fpicker/IwyuFilter_fpicker.yaml fpicker/Library_fps_office.mk fpicker/qa fpicker/source fpicker/uiconfig fpicker/UIConfig_fps.mk framework/inc framework/Library_fwk.mk framework/source helpcontent2 hwpfilter/source i18nlangtag/source i18npool/qa i18npool/source i18nutil/source icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg idlc/source idl/source include/avmedia include/basegfx include/basic include/codemaker include/comphelper include/connectivity include/cui include/dbaccess include/drawinglayer include/editeng include/filter include/formula include/framework include/jvmaccess include/linguistic include/o3tl include/oox include/rtl include/sal include/sax include/sfx2 include/sot include/svl include/svtools include/svx include/toolkit include/tools include/ucbhelper inc lude/unoidl include/unotools include/vbahelper include/vcl include/xmloff io/source jvmfwk/plugins libreofficekit/qa libreofficekit/source lotuswordpro/source odk/examples odk/settings offapi/com offapi/UnoApi_offapi.mk officecfg/registry oox/source package/source qadevOOo/objdsc readlicense_oo/docs readlicense_oo/license README.md registry/source RepositoryExternal.mk sal/Module_sal.mk sal/osl sal/qa sal/rtl sal/util sax/qa sax/source sc/CppunitTest_sc_screenshots.mk sc/CppunitTest_sc_styleobj.mk sc/inc sc/Module_sc.mk sc/qa scripting/source sc/source sc/uiconfig sdext/source sd/inc sd/qa sd/sdi sd/source sfx2/inc sfx2/source sfx2/uiconfig shell/source slideshow/source solenv/bin solenv/clang-format solenv/gbuild solenv/sanitizers soltools/mkdepend sot/source starmath/uiconfig stoc/source svl/qa svl/source svtools/CppunitTest_svtools_dialogs_test.mk svtools/inc svtools/Library_svt.mk svtools/qa svtools/source svx/inc svx/sdi svx/source svx/uiconfig sw/inc sw/Library_sw.mk sw/qa sw/ sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk toolkit/source tools/source translations ucb/IwyuFilter_ucb.yaml ucb/qa ucb/source unoxml/source vcl/headless vcl/inc vcl/IwyuFilter_vcl.yaml vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/osx vcl/qa vcl/source vcl/uiconfig vcl/unx vcl/win vcl/workben writerfilter/source writerperfect/uiconfig xmlhelp/source xmloff/inc xmloff/source xmloff/util xmlscript/source xmlsecurity/source
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 1 15:04:50 UTC 2019
Rebased ref, commits from common ancestor:
commit 2b609da2efbae4ee1277cb0101c1d8609fdae0ac
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Oct 31 17:11:13 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Table panel: Make sure all toolbox buttons has the right initial state
For this we need to add a ControllerItem for all toolbox buttons.
See SfxStateCache::SetCachedState().
Change-Id: Id69a92fe5748617e3cd98c3007afbff2885a5d3b
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index b803845547a6..a657feb8718c 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -18,6 +18,7 @@
#include <svtools/unitconv.hxx>
#include <swmodule.hxx>
#include <usrpref.hxx>
+#include <svx/svxids.hrc>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -98,6 +99,20 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
, m_pBindings(pBindings)
, 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)
+ , m_aInsertRowsAfterController(FN_TABLE_INSERT_ROW_AFTER, *pBindings, *this)
+ , m_aInsertColumnsBeforeController(FN_TABLE_INSERT_COL_BEFORE, *pBindings, *this)
+ , m_aInsertColumnsAfterController(FN_TABLE_INSERT_COL_AFTER, *pBindings, *this)
+ , m_aDeleteRowsController(FN_TABLE_DELETE_ROW, *pBindings, *this)
+ , m_aDeleteColumnsController(FN_TABLE_DELETE_COL, *pBindings, *this)
+ , m_aDeleteTableController(FN_TABLE_DELETE_TABLE, *pBindings, *this)
+ , m_aSetMinimalRowHeightController(SID_TABLE_MINIMAL_ROW_HEIGHT, *pBindings, *this)
+ , m_aSetOptimalRowHeightController(FN_TABLE_OPTIMAL_HEIGHT, *pBindings, *this)
+ , m_aDistributeRowsController(FN_TABLE_BALANCE_ROWS, *pBindings, *this)
+ , m_aSetMinimalColumnWidthController(SID_TABLE_MINIMAL_COLUMN_WIDTH, *pBindings, *this)
+ , m_aSetOptimalColumnWidthController(FN_TABLE_ADJUST_CELLS, *pBindings, *this)
+ , m_aDistributeColumnsController(FN_TABLE_BALANCE_CELLS, *pBindings, *this)
+ , m_aMergeCellsController(FN_TABLE_MERGE_CELLS, *pBindings, *this)
{
get(m_pRowHeightEdit, "rowheight");
get(m_pColumnWidthEdit, "columnwidth");
@@ -138,6 +153,20 @@ void TableEditPanel::dispose()
m_pColumnWidthEdit.clear();
m_aRowHeightController.dispose();
m_aColumnWidthController.dispose();
+ m_aInsertRowsBeforeController.dispose();
+ m_aInsertRowsAfterController.dispose();
+ m_aInsertColumnsBeforeController.dispose();
+ m_aInsertColumnsAfterController.dispose();
+ m_aDeleteRowsController.dispose();
+ m_aDeleteColumnsController.dispose();
+ m_aDeleteTableController.dispose();
+ m_aSetMinimalRowHeightController.dispose();
+ m_aSetOptimalRowHeightController.dispose();
+ m_aDistributeRowsController.dispose();
+ m_aSetMinimalColumnWidthController.dispose();
+ m_aSetOptimalColumnWidthController.dispose();
+ m_aDistributeColumnsController.dispose();
+ m_aMergeCellsController.dispose();
PanelLayout::dispose();
}
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index a0ce4e6f14d2..a825bc01cc38 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -48,6 +48,20 @@ private:
VclPtr<SvxRelativeField> m_pColumnWidthEdit;
::sfx2::sidebar::ControllerItem m_aRowHeightController;
::sfx2::sidebar::ControllerItem m_aColumnWidthController;
+ ::sfx2::sidebar::ControllerItem m_aInsertRowsBeforeController;
+ ::sfx2::sidebar::ControllerItem m_aInsertRowsAfterController;
+ ::sfx2::sidebar::ControllerItem m_aInsertColumnsBeforeController;
+ ::sfx2::sidebar::ControllerItem m_aInsertColumnsAfterController;
+ ::sfx2::sidebar::ControllerItem m_aDeleteRowsController;
+ ::sfx2::sidebar::ControllerItem m_aDeleteColumnsController;
+ ::sfx2::sidebar::ControllerItem m_aDeleteTableController;
+ ::sfx2::sidebar::ControllerItem m_aSetMinimalRowHeightController;
+ ::sfx2::sidebar::ControllerItem m_aSetOptimalRowHeightController;
+ ::sfx2::sidebar::ControllerItem m_aDistributeRowsController;
+ ::sfx2::sidebar::ControllerItem m_aSetMinimalColumnWidthController;
+ ::sfx2::sidebar::ControllerItem m_aSetOptimalColumnWidthController;
+ ::sfx2::sidebar::ControllerItem m_aDistributeColumnsController;
+ ::sfx2::sidebar::ControllerItem m_aMergeCellsController;
DECL_LINK(RowHeightMofiyHdl, Edit&, void);
DECL_LINK(ColumnWidthMofiyHdl, Edit&, void);
commit 04a3ec229c95c26037611538e1ce7327a3e2fe6d
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Oct 31 15:12:40 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Remove useless bool manipulation.
Must be a left over of sal_Bool -> bool conversion.
Change-Id: I8b37e513dc1f36b015b29ce3dad4ade2df7807d9
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 201e44213d49..3cd3ed85a5ed 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1252,8 +1252,6 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable )
if ( nPos != ITEM_NOTFOUND )
{
ImplToolItem* pItem = &mpData->m_aItems[nPos];
- if ( bEnable )
- bEnable = true;
if ( pItem->mbEnabled != bEnable )
{
pItem->mbEnabled = bEnable;
commit 30e72b62d3c99340bc8d3b9f8c088d585b3a0972
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Oct 30 14:17:37 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Table panel: Make sure Row Height spin button works with the default size type
SwFormatFrameSize() object has ATT_VAR_SIZE size type by default, before
we change it to anything else. We will change ATT_VAR_SIZE to ATT_MIN_SIZE
when changing the row height on the sidebar panel, similar to the
row height dialog.
Change-Id: I2520340e023b910549ff2a4b011e9ae3da2b7b11
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 57e6f99b59ec..df63915ce961 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1123,6 +1123,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
std::unique_ptr<SwFormatFrameSize> pHeight = rSh.GetRowHeight();
if ( pHeight )
{
+ if (pHeight->GetHeightSizeType() == ATT_VAR_SIZE)
+ pHeight->SetHeightSizeType(ATT_MIN_SIZE);
pHeight->SetHeight(nNewHeight);
rSh.SetRowHeight(*pHeight);
}
commit b352d777570ef165d4d032df228132eb14fb9d2d
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 29 13:39:00 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Table panel: Redesign the panel a bit
* Remove some labels.
* Move 'Merge Cells' button next to the insert / delete buttons.
Change-Id: Ibe0acc8e8825dbaa84464bc7347f7711f8185680
diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui
index e48865b0f8a8..6f9c477bffd6 100644
--- a/sw/uiconfig/swriter/ui/sidebartableedit.ui
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -18,84 +18,57 @@
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="sfxlo-SidebarToolBox" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="insertlabel">
+ <object class="GtkToolButton" id="insertrowsbefore">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes" context="sidebatableedit|insertlabel">Insert:</property>
+ <property name="action_name">.uno:InsertRowsBefore</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">insert</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="insert">
+ <object class="GtkToolButton" id="insertrowsafter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="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>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="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>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="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>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="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>
- </packing>
- </child>
+ <property name="action_name">.uno:InsertRowsAfter</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
</packing>
</child>
</object>
@@ -106,81 +79,75 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box7">
+ <object class="sfxlo-SidebarToolBox" id="delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="deletelabel">
+ <object class="GtkToolButton" id="deleterows">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Delete:</property>
+ <property name="action_name">.uno:DeleteRows</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">delete</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="delete">
+ <object class="GtkToolButton" id="deletecolumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="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>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="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>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="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>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:DeleteColumns</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <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="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <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">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -192,7 +159,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Size:</property>
+ <property name="label" translatable="yes" context="sidebatableedit|sizelabel">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">box3</property>
<property name="xalign">0</property>
@@ -235,7 +202,7 @@
<property name="text">0</property>
<child internal-child="accessible">
<object class="AtkObject" id="rowheight-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes" context="sidebatableedit|rowheight-atkobject">Row Height</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="rowheight-atkobject">Row Height</property>
</object>
</child>
</object>
@@ -281,7 +248,7 @@
<property name="text">0</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>
+ <property name="AtkObject::accessible-name" translatable="yes" context="columnwidth-atkobject">Column Width</property>
</object>
</child>
</object>
@@ -411,43 +378,6 @@
<property name="top_attach">3</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="layoutlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Layout:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">layouting</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-SidebarToolBox" id="layouting">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="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>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
commit 46ff865bb1b1b4c55c11f9e7f96837f5d5bc8d0e
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Oct 28 17:11:21 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Table panel: Implement functionality of Column Width spinbutton
Change-Id: I809cfe4af82cebabe80c171cdd488ff43d749a86
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b9db78c21b81..838091eb82a7 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -412,6 +412,7 @@
#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
#define FN_TABLE_BOX_TEXTORIENTATION (FN_FORMAT + 192) /* text orientation of table cells */
#define SID_ATTR_TABLE_ROW_HEIGHT (FN_FORMAT + 193)
+#define SID_ATTR_TABLE_COLUMN_WIDTH (FN_FORMAT2 + 194)
#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 948d6e5476f6..e39edc61c3c0 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -444,5 +444,12 @@ interface BaseTextTable
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+
+ SID_ATTR_TABLE_COLUMN_WIDTH
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
}
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index bdae66ae91d5..ae8e4a37b44a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7808,3 +7808,21 @@ SfxUInt32Item TableRowHeight SID_ATTR_TABLE_ROW_HEIGHT
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Table;
]
+
+SfxUInt32Item TableColumWidth SID_ATTR_TABLE_COLUMN_WIDTH
+
+[
+ AutoUpdate = TRUE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::Table;
+]
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 8dd1fbf65297..57e6f99b59ec 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1129,6 +1129,18 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
return;
}
+ case SID_ATTR_TABLE_COLUMN_WIDTH:
+ {
+ const SfxUInt32Item* pItem2 = rReq.GetArg<SfxUInt32Item>(SID_ATTR_TABLE_COLUMN_WIDTH);
+ if (pItem2)
+ {
+ long nNewWidth = pItem2->GetValue();
+ SwTableFUNC aFunc( &rSh );
+ aFunc.InitTabCols();
+ aFunc.SetColWidth(aFunc.GetCurColNum(), nNewWidth);
+ }
+ return;
+ }
default:
bMore = true;
}
@@ -1416,6 +1428,16 @@ void SwTableShell::GetState(SfxItemSet &rSet)
}
break;
}
+ case SID_ATTR_TABLE_COLUMN_WIDTH:
+ {
+ SfxUInt32Item aColumnWidth(SID_ATTR_TABLE_COLUMN_WIDTH);
+ SwTableFUNC aFunc( &rSh );
+ aFunc.InitTabCols();
+ SwTwips nWidth = aFunc.GetColWidth(aFunc.GetCurColNum());
+ aColumnWidth.SetValue(nWidth);
+ rSet.Put(aColumnWidth);
+ break;
+ }
}
nSlot = aIter.NextWhich();
}
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 54395b8863b8..b803845547a6 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -52,17 +52,39 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID, const SfxItemState
if (pItem)
{
long nNewHeight = pItem->GetValue();
- nNewHeight = m_pHeightEdit->Normalize(nNewHeight);
- m_pHeightEdit->SetValue(nNewHeight, FieldUnit::TWIP);
+ nNewHeight = m_pRowHeightEdit->Normalize(nNewHeight);
+ m_pRowHeightEdit->SetValue(nNewHeight, FieldUnit::TWIP);
}
}
else if (eState == SfxItemState::DISABLED)
{
- m_pHeightEdit->Disable();
+ m_pRowHeightEdit->Disable();
}
else
{
- m_pHeightEdit->SetEmptyFieldValue();
+ m_pRowHeightEdit->SetEmptyFieldValue();
+ }
+ break;
+ }
+ case SID_ATTR_TABLE_COLUMN_WIDTH:
+ {
+ if (pState && eState >= SfxItemState::DEFAULT)
+ {
+ const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
+ if (pItem)
+ {
+ long nNewWidth = pItem->GetValue();
+ nNewWidth = m_pColumnWidthEdit->Normalize(nNewWidth);
+ m_pColumnWidthEdit->SetValue(nNewWidth, FieldUnit::TWIP);
+ }
+ }
+ else if (eState == SfxItemState::DISABLED)
+ {
+ m_pColumnWidthEdit->Disable();
+ }
+ else
+ {
+ m_pColumnWidthEdit->SetEmptyFieldValue();
}
break;
}
@@ -75,9 +97,13 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
: PanelLayout(pParent, "TableEditPanel", "modules/swriter/ui/sidebartableedit.ui", rxFrame)
, m_pBindings(pBindings)
, m_aRowHeightController(SID_ATTR_TABLE_ROW_HEIGHT, *pBindings, *this)
+ , m_aColumnWidthController(SID_ATTR_TABLE_COLUMN_WIDTH, *pBindings, *this)
{
- get(m_pHeightEdit, "rowheight");
+ get(m_pRowHeightEdit, "rowheight");
+ get(m_pColumnWidthEdit, "columnwidth");
+
InitRowHeightToolitem();
+ InitColumnWidthToolitem();
}
TableEditPanel::~TableEditPanel() { disposeOnce(); }
@@ -85,19 +111,33 @@ TableEditPanel::~TableEditPanel() { disposeOnce(); }
void TableEditPanel::InitRowHeightToolitem()
{
Link<Edit&, void> aLink = LINK(this, TableEditPanel, RowHeightMofiyHdl);
- m_pHeightEdit->SetModifyHdl(aLink);
+ m_pRowHeightEdit->SetModifyHdl(aLink);
FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric();
- SetFieldUnit(*m_pHeightEdit, eFieldUnit);
+ SetFieldUnit(*m_pRowHeightEdit, eFieldUnit);
- m_pHeightEdit->SetMin(MINLAY, FieldUnit::TWIP);
- m_pHeightEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
+ m_pRowHeightEdit->SetMin(MINLAY, FieldUnit::TWIP);
+ m_pRowHeightEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
+}
+
+void TableEditPanel::InitColumnWidthToolitem()
+{
+ Link<Edit&, void> aLink = LINK(this, TableEditPanel, ColumnWidthMofiyHdl);
+ m_pColumnWidthEdit->SetModifyHdl(aLink);
+
+ FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric();
+ SetFieldUnit(*m_pColumnWidthEdit, eFieldUnit);
+
+ m_pColumnWidthEdit->SetMin(MINLAY, FieldUnit::TWIP);
+ m_pColumnWidthEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
}
void TableEditPanel::dispose()
{
- m_pHeightEdit.clear();
+ m_pRowHeightEdit.clear();
+ m_pColumnWidthEdit.clear();
m_aRowHeightController.dispose();
+ m_aColumnWidthController.dispose();
PanelLayout::dispose();
}
@@ -105,13 +145,24 @@ void TableEditPanel::dispose()
IMPL_LINK_NOARG(TableEditPanel, RowHeightMofiyHdl, Edit&, void)
{
SwTwips nNewHeight = static_cast<SwTwips>(
- m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FieldUnit::TWIP)));
+ m_pRowHeightEdit->Denormalize(m_pRowHeightEdit->GetValue(FieldUnit::TWIP)));
SfxUInt32Item aRowHeight(SID_ATTR_TABLE_ROW_HEIGHT);
aRowHeight.SetValue(nNewHeight);
m_pBindings->GetDispatcher()->ExecuteList(SID_ATTR_TABLE_ROW_HEIGHT, SfxCallMode::RECORD,
{ &aRowHeight });
}
+
+IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, Edit&, void)
+{
+ SwTwips nNewWidth = static_cast<SwTwips>(
+ m_pColumnWidthEdit->Denormalize(m_pColumnWidthEdit->GetValue(FieldUnit::TWIP)));
+ SfxUInt32Item aColumnWidth(SID_ATTR_TABLE_COLUMN_WIDTH);
+ aColumnWidth.SetValue(nNewWidth);
+
+ m_pBindings->GetDispatcher()->ExecuteList(SID_ATTR_TABLE_COLUMN_WIDTH, SfxCallMode::RECORD,
+ { &aColumnWidth });
+}
}
} // end of namespace ::sw::sidebar
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index 10044d582138..a0ce4e6f14d2 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -40,13 +40,17 @@ private:
virtual void dispose() override;
void InitRowHeightToolitem();
+ void InitColumnWidthToolitem();
SfxBindings* m_pBindings;
- VclPtr<SvxRelativeField> m_pHeightEdit;
+ VclPtr<SvxRelativeField> m_pRowHeightEdit;
+ VclPtr<SvxRelativeField> m_pColumnWidthEdit;
::sfx2::sidebar::ControllerItem m_aRowHeightController;
+ ::sfx2::sidebar::ControllerItem m_aColumnWidthController;
DECL_LINK(RowHeightMofiyHdl, Edit&, void);
+ DECL_LINK(ColumnWidthMofiyHdl, Edit&, void);
};
}
} // end of namespace sw::sidebar
commit 2f6f5b484cd392acd3992a27d8ea02ed1288d757
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sat Oct 26 16:15:58 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Table panel: Implement functionality of Row Height spinbutton
Change-Id: Ic3e3ce31fdc74c9cb4c41e1243f10f5977d5bb0c
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 491b18228167..b9db78c21b81 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -411,6 +411,7 @@
#define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */
#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
#define FN_TABLE_BOX_TEXTORIENTATION (FN_FORMAT + 192) /* text orientation of table cells */
+#define SID_ATTR_TABLE_ROW_HEIGHT (FN_FORMAT + 193)
#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 9cb65cd4d276..948d6e5476f6 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -437,5 +437,12 @@ interface BaseTextTable
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+
+ SID_ATTR_TABLE_ROW_HEIGHT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
}
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 8316bd9c8bd5..bdae66ae91d5 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7790,3 +7790,21 @@ SfxVoidItem DatePickerFormField FN_INSERT_DATE_FORMFIELD
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Controls;
]
+
+SfxUInt32Item TableRowHeight SID_ATTR_TABLE_ROW_HEIGHT
+
+[
+ AutoUpdate = TRUE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::Table;
+]
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 3555f79b8217..8dd1fbf65297 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1114,6 +1114,21 @@ void SwTableShell::Execute(SfxRequest &rReq)
//'this' is already destroyed
return;
}
+ case SID_ATTR_TABLE_ROW_HEIGHT:
+ {
+ const SfxUInt32Item* pItem2 = rReq.GetArg<SfxUInt32Item>(SID_ATTR_TABLE_ROW_HEIGHT);
+ if (pItem2)
+ {
+ long nNewHeight = pItem2->GetValue();
+ std::unique_ptr<SwFormatFrameSize> pHeight = rSh.GetRowHeight();
+ if ( pHeight )
+ {
+ pHeight->SetHeight(nNewHeight);
+ rSh.SetRowHeight(*pHeight);
+ }
+ }
+ return;
+ }
default:
bMore = true;
}
@@ -1389,6 +1404,18 @@ void SwTableShell::GetState(SfxItemSet &rSet)
if(rSh.HasBoxSelection())
rSet.DisableItem( nSlot );
break;
+ case SID_ATTR_TABLE_ROW_HEIGHT:
+ {
+ SfxUInt32Item aRowHeight(SID_ATTR_TABLE_ROW_HEIGHT);
+ std::unique_ptr<SwFormatFrameSize> pHeight = rSh.GetRowHeight();
+ if (pHeight)
+ {
+ long nHeight = pHeight->GetHeight();
+ aRowHeight.SetValue(nHeight);
+ rSet.Put(aRowHeight);
+ }
+ break;
+ }
}
nSlot = aIter.NextWhich();
}
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index e602093d966a..4c7f28e1753e 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -185,7 +185,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/TableEditPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::TableEditPanel::Create(pParentWindow, xFrame);
+ VclPtr<vcl::Window> pPanel = sw::sidebar::TableEditPanel::Create(pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL, xFrame, pPanel, ui::LayoutSize(-1,-1,-1));
}
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 3eaa79c98208..54395b8863b8 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -8,8 +8,16 @@
*
*/
-#include <sal/config.h>
#include "TableEditPanel.hxx"
+#include <sal/config.h>
+#include <swtypes.hxx>
+#include <cmdid.h>
+#include <svl/intitem.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+#include <svtools/unitconv.hxx>
+#include <swmodule.hxx>
+#include <usrpref.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -18,7 +26,8 @@ namespace sw
namespace sidebar
{
VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
- const css::uno::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ SfxBindings* pBindings)
{
if (pParent == nullptr)
throw css::lang::IllegalArgumentException(
@@ -27,23 +36,82 @@ VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
throw css::lang::IllegalArgumentException("no XFrame given to TableEditPanel::Create",
nullptr, 1);
- return VclPtr<TableEditPanel>::Create(pParent, rxFrame);
+ return VclPtr<TableEditPanel>::Create(pParent, rxFrame, pBindings);
}
-void TableEditPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/, const SfxItemState /*eState*/,
- const SfxPoolItem* /*pState*/)
+void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID, const SfxItemState eState,
+ const SfxPoolItem* pState)
{
+ switch (nSID)
+ {
+ case SID_ATTR_TABLE_ROW_HEIGHT:
+ {
+ if (pState && eState >= SfxItemState::DEFAULT)
+ {
+ const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
+ if (pItem)
+ {
+ long nNewHeight = pItem->GetValue();
+ nNewHeight = m_pHeightEdit->Normalize(nNewHeight);
+ m_pHeightEdit->SetValue(nNewHeight, FieldUnit::TWIP);
+ }
+ }
+ else if (eState == SfxItemState::DISABLED)
+ {
+ m_pHeightEdit->Disable();
+ }
+ else
+ {
+ m_pHeightEdit->SetEmptyFieldValue();
+ }
+ break;
+ }
+ }
}
TableEditPanel::TableEditPanel(vcl::Window* pParent,
- const css::uno::Reference<css::frame::XFrame>& rxFrame)
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ SfxBindings* pBindings)
: PanelLayout(pParent, "TableEditPanel", "modules/swriter/ui/sidebartableedit.ui", rxFrame)
+ , m_pBindings(pBindings)
+ , m_aRowHeightController(SID_ATTR_TABLE_ROW_HEIGHT, *pBindings, *this)
{
+ get(m_pHeightEdit, "rowheight");
+ InitRowHeightToolitem();
}
TableEditPanel::~TableEditPanel() { disposeOnce(); }
-void TableEditPanel::dispose() { PanelLayout::dispose(); }
+void TableEditPanel::InitRowHeightToolitem()
+{
+ Link<Edit&, void> aLink = LINK(this, TableEditPanel, RowHeightMofiyHdl);
+ m_pHeightEdit->SetModifyHdl(aLink);
+
+ FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric();
+ SetFieldUnit(*m_pHeightEdit, eFieldUnit);
+
+ m_pHeightEdit->SetMin(MINLAY, FieldUnit::TWIP);
+ m_pHeightEdit->SetMax(SAL_MAX_INT32, FieldUnit::TWIP);
+}
+
+void TableEditPanel::dispose()
+{
+ m_pHeightEdit.clear();
+ m_aRowHeightController.dispose();
+
+ PanelLayout::dispose();
+}
+
+IMPL_LINK_NOARG(TableEditPanel, RowHeightMofiyHdl, Edit&, void)
+{
+ SwTwips nNewHeight = static_cast<SwTwips>(
+ m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FieldUnit::TWIP)));
+ SfxUInt32Item aRowHeight(SID_ATTR_TABLE_ROW_HEIGHT);
+ aRowHeight.SetValue(nNewHeight);
+
+ m_pBindings->GetDispatcher()->ExecuteList(SID_ATTR_TABLE_ROW_HEIGHT, SfxCallMode::RECORD,
+ { &aRowHeight });
+}
}
} // end of namespace ::sw::sidebar
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index bdbfe6ff236e..10044d582138 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 <svx/relfld.hxx>
namespace sw
{
@@ -26,15 +27,26 @@ class TableEditPanel : public PanelLayout,
public:
static VclPtr<vcl::Window> Create(vcl::Window* pParent,
- const css::uno::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ SfxBindings* pBindings);
virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState eState,
const SfxPoolItem* pState) override;
private:
- TableEditPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame);
+ TableEditPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ SfxBindings* pBindings);
virtual ~TableEditPanel() override;
virtual void dispose() override;
+
+ void InitRowHeightToolitem();
+
+ SfxBindings* m_pBindings;
+
+ VclPtr<SvxRelativeField> m_pHeightEdit;
+ ::sfx2::sidebar::ControllerItem m_aRowHeightController;
+
+ DECL_LINK(RowHeightMofiyHdl, Edit&, void);
};
}
} // end of namespace sw::sidebar
commit 8b212d63b3795ecc04cc4dae14d4f634f8701f08
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Oct 23 18:19:23 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Nov 1 12:46:31 2019 +0100
Add new 'Table' sidebar panel to Writer
This is the initial layout of the panel. It does not
functional yet.
Change-Id: Idd67ed921b71559bb704ef50cbfa97013fb80d6b
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 5d3c698d975c..2f530db6beca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1570,6 +1570,32 @@
<value>8</value>
</prop>
</node>
+
+ <node oor:name="TableEditPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Table</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>TableEditPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ WriterVariants, Table, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SwPanelFactory/TableEditPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 7cf93d55e36e..7999ece93c3d 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -704,6 +704,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/sidebar/PageFooterPanel \
sw/source/uibase/sidebar/PageStylesPanel \
sw/source/uibase/sidebar/WrapPropertyPanel \
+ sw/source/uibase/sidebar/TableEditPanel \
sw/source/uibase/sidebar/ThemePanel \
sw/source/uibase/sidebar/SwPanelFactory \
sw/source/uibase/table/chartins \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 0ddb67a241a0..65de527c3b89 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -258,6 +258,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/pagefooterpanel \
sw/uiconfig/swriter/ui/sidebarwrap \
sw/uiconfig/swriter/ui/sidebarstylepresets \
+ sw/uiconfig/swriter/ui/sidebartableedit \
sw/uiconfig/swriter/ui/sidebartheme \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/spellmenu \
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 08ea0ce274eb..e602093d966a 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -26,6 +26,7 @@
#include "PageHeaderPanel.hxx"
#include "PageFooterPanel.hxx"
#include "WrapPropertyPanel.hxx"
+#include "TableEditPanel.hxx"
#include <navipi.hxx>
#include <redlndlg.hxx>
@@ -182,6 +183,12 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL, xFrame, pPanel, ui::LayoutSize(-1,-1,-1));
}
+ else if (rsResourceURL.endsWith("/TableEditPanel"))
+ {
+ VclPtr<vcl::Window> pPanel = sw::sidebar::TableEditPanel::Create(pParentWindow, xFrame);
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL, xFrame, pPanel, ui::LayoutSize(-1,-1,-1));
+ }
return xElement;
}
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
new file mode 100644
index 000000000000..3eaa79c98208
--- /dev/null
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <sal/config.h>
+#include "TableEditPanel.hxx"
+
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
+namespace sw
+{
+namespace sidebar
+{
+VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
+{
+ if (pParent == nullptr)
+ throw css::lang::IllegalArgumentException(
+ "no parent Window given to TableEditPanel::Create", nullptr, 0);
+ if (!rxFrame.is())
+ throw css::lang::IllegalArgumentException("no XFrame given to TableEditPanel::Create",
+ nullptr, 1);
+
+ return VclPtr<TableEditPanel>::Create(pParent, rxFrame);
+}
+
+void TableEditPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/, const SfxItemState /*eState*/,
+ const SfxPoolItem* /*pState*/)
+{
+}
+
+TableEditPanel::TableEditPanel(vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame)
+ : PanelLayout(pParent, "TableEditPanel", "modules/swriter/ui/sidebartableedit.ui", rxFrame)
+{
+}
+
+TableEditPanel::~TableEditPanel() { disposeOnce(); }
+
+void TableEditPanel::dispose() { PanelLayout::dispose(); }
+}
+} // end of namespace ::sw::sidebar
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
new file mode 100644
index 000000000000..bdbfe6ff236e
--- /dev/null
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_TABLEEDITPANEL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_TABLEEDITPANEL_HXX
+
+#include <com/sun/star/frame/XFrame.hpp>
+#include <svx/sidebar/PanelLayout.hxx>
+#include <sfx2/sidebar/ControllerItem.hxx>
+
+namespace sw
+{
+namespace sidebar
+{
+class TableEditPanel : public PanelLayout,
+ public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
+{
+ friend class VclPtr<TableEditPanel>;
+
+public:
+ static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
+
+ virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState eState,
+ const SfxPoolItem* pState) override;
+
+private:
+ TableEditPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame);
+ virtual ~TableEditPanel() override;
+ virtual void dispose() override;
+};
+}
+} // 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
diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui
new file mode 100644
index 000000000000..e48865b0f8a8
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.4 -->
+<interface domain="svx">
+ <requires lib="gtk+" version="3.18"/>
+ <requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkGrid" id="TableEditPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="insertlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes" context="sidebatableedit|insertlabel">Insert:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">insert</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="insert">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="deletelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Delete:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">delete</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sizelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">box3</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">cmd/sc_rowheight.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-SvxRelativeField" id="rowheight">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes" context="sidebatableedit|rowheight|tooltip_text">Row Height</property>
+ <property name="hexpand">True</property>
+ <property name="text">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="rowheight-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebatableedit|rowheight-atkobject">Row Height</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">cmd/sc_columnwidth.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-SvxRelativeField" id="columnwidth">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes" context="sidebatableedit|columnwidth|tooltip_text">Column Width</property>
+ <property name="hexpand">True</property>
+ <property name="text">0</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>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="rowsizing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="minimalrowheight">
+ <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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="optimalrowheight">
+ <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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="columnsizing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="minimalcolumnwidth">
+ <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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="optimalcolumnwidth">
+ <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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <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="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="layoutlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes" context="sidebatableedit|deletelabel">Layout:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">layouting</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="layouting">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit e7536ee31df2279c6730fd629bd4b6d94b02dcd1
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Nov 1 11:33:44 2019 +0100
Commit: Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Fri Nov 1 11:33:56 2019 +0100
Update git submodules
* Update translations from branch 'master'
- Updated Slovenian translations
Change-Id: I205dc5dbdc62bba2c9ac650902d1a8ac1e80db4e
diff --git a/translations b/translations
index 4960b59e9c3b..93e4c126a91f 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4960b59e9c3b897c61e24548ef13a8883cc8b781
+Subproject commit 93e4c126a91f83015a1c4bd801a5f4adb0a900e4
commit faff2437d83b437766d1c59dc473cc8b6ad9a548
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 1 11:28:02 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 1 11:27:20 2019 +0100
loplugin:finalclasses in sd/inc
Change-Id: I29c7656d532fc0c8bcf1379a2f54d052aa4253e8
Reviewed-on: https://gerrit.libreoffice.org/81877
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f60e350ba3cf..cf2cfe7cb7a4 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -345,7 +345,7 @@ protected:
class MainSequence;
-class InteractiveSequence : public EffectSequenceHelper
+class InteractiveSequence final : public EffectSequenceHelper
{
friend class MainSequence;
friend class MainSequenceChangeGuard;
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index dbd13720ec29..08224994a2ce 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -28,7 +28,7 @@
#include <tools/color.hxx>
#include "sddllapi.h"
-class SD_DLLPUBLIC SdAnimationInfo : public SdrObjUserData
+class SD_DLLPUBLIC SdAnimationInfo final : public SdrObjUserData
{
public:
PresObjKind mePresObjKind;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 304d4e282c78..b5b6e574ca0c 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -128,7 +128,7 @@ namespace sd
}
// SdDrawDocument
-class SD_DLLPUBLIC SdDrawDocument : public FmFormModel
+class SD_DLLPUBLIC SdDrawDocument final : public FmFormModel
{
public:
SAL_DLLPRIVATE void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
@@ -200,8 +200,6 @@ private:
bool mbEmbedFontScriptAsian : 1;
bool mbEmbedFontScriptComplex : 1;
-protected:
-
SAL_DLLPRIVATE virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override;
public:
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index a6344ca3ef7c..c36b2afcda3a 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -24,7 +24,7 @@
class SdPage;
-class SdPageLink : public ::sfx2::SvBaseLink
+class SdPageLink final : public ::sfx2::SvBaseLink
{
SdPage* pPage;
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index 44ba359aab17..000a50bde63d 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -23,7 +23,7 @@
#include "sdfilter.hxx"
// SdCGMFilter
-class SdCGMFilter : public SdFilter
+class SdCGMFilter final : public SdFilter
{
public:
SdCGMFilter (
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 2b34ecf93e52..2ec180a52bf3 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -24,7 +24,7 @@
class ErrCode;
// SdCGMFilter
-class SdGRFFilter : public SdFilter
+class SdGRFFilter final : public SdFilter
{
public:
SdGRFFilter ( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell );
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 86a7eb157fe8..c55d24150b71 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -23,8 +23,7 @@
#include "sdfilter.hxx"
// SdHTMLFilter
-class SdHTMLFilter
- : public SdFilter
+class SdHTMLFilter final : public SdFilter
{
public:
SdHTMLFilter (
diff --git a/sd/inc/sdpdffilter.hxx b/sd/inc/sdpdffilter.hxx
index ce085a7036b3..44cae287d19f 100644
--- a/sd/inc/sdpdffilter.hxx
+++ b/sd/inc/sdpdffilter.hxx
@@ -28,7 +28,7 @@ namespace sd
class DrawDocShell;
}
-class SdPdfFilter : public SdFilter
+class SdPdfFilter final : public SdFilter
{
public:
SdPdfFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell);
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index 6414226d4596..9126f814d585 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -25,7 +25,7 @@
#include <tools/stream.hxx>
// SdPPTFilter
-class SdPPTFilter : public SdFilter
+class SdPPTFilter final : public SdFilter
{
public:
SdPPTFilter (
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index a73ce57d22f7..9fe46506b9a0 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -32,7 +32,7 @@ enum SdXMLFilterMode
SDXMLMODE_Organizer ///< only for import, only the styles are loaded
};
-class SdXMLFilter : public SdFilter
+class SdXMLFilter final : public SdFilter
{
public:
SdXMLFilter(
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index beef8211c9bb..c151fa6d2fcd 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -27,7 +27,7 @@
namespace sd
{
- class ShapeList : public sdr::ObjectUser
+ class ShapeList final : public sdr::ObjectUser
{
public:
ShapeList();
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index fbaa825505cc..aff19d1f1739 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -40,7 +40,7 @@ class SdStyleSheet;
class SdPage;
struct SdStyleFamilyImpl;
-class SdStyleFamily : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet >
+class SdStyleFamily final : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet >
{
public:
/// creates the style family for the given SfxStyleFamily
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 2141c3bfc6ff..40449c2f0cc2 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -30,7 +30,7 @@ namespace sd {
class TextAPIEditSource;
-class TextApiObject : public SvxUnoText
+class TextApiObject final : public SvxUnoText
{
public:
static rtl::Reference< TextApiObject > create( SdDrawDocument* pDoc );
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index 379349e37312..6341b006a568 100644
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
@@ -25,7 +25,7 @@
namespace sd
{
-class UndoFactory : public SdrUndoFactory
+class UndoFactory final : public SdrUndoFactory
{
public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject(SdrObject& rObject) override;
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 84a0e5394a4a..bed4f0f798f0 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -26,7 +26,7 @@
namespace sd
{
-class SD_DLLPUBLIC UndoManager : public SdrUndoManager
+class SD_DLLPUBLIC UndoManager final : public SdrUndoManager
{
public:
UndoManager();
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 61edc1bbf4c5..53b81b61d911 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -46,7 +46,7 @@ private:
std::unique_ptr<SfxUndoAction> mpUndoPresObj;
};
-class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
+class UndoRemoveObject final : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
{
public:
UndoRemoveObject(SdrObject& rObject);
@@ -58,7 +58,7 @@ private:
::tools::WeakReference<SdrObject> mxSdrObject;
};
-class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl
+class UndoDeleteObject final : public SdrUndoDelObj, public UndoRemovePresObjectImpl
{
public:
UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect );
@@ -70,7 +70,7 @@ private:
::tools::WeakReference<SdrObject> mxSdrObject;
};
-class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
+class UndoReplaceObject final : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
{
public:
UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject );
@@ -82,7 +82,7 @@ private:
::tools::WeakReference<SdrObject> mxSdrObject;
};
-class UndoObjectSetText : public SdrUndoObjSetText
+class UndoObjectSetText final : public SdrUndoObjSetText
{
public:
UndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText );
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 6270ad97c385..68169b686a5c 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -33,7 +33,7 @@ namespace sd
struct UndoAnimationImpl;
-class UndoAnimation : public SdrUndoAction
+class UndoAnimation final : public SdrUndoAction
{
public:
UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage );
@@ -49,7 +49,7 @@ private:
};
struct UndoAnimationPathImpl;
-class UndoAnimationPath : public SdrUndoAction
+class UndoAnimationPath final : public SdrUndoAction
{
public:
UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
@@ -66,7 +66,7 @@ private:
struct UndoTransitionImpl;
-class UndoTransition : public SdUndoAction
+class UndoTransition final : public SdUndoAction
{
public:
UndoTransition( SdDrawDocument* pDoc, SdPage* pThePage );
commit 202a49a5831fbfcf057350ef949c13e75b3b7446
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 31 13:40:57 2019 +0000
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Fri Nov 1 10:51:51 2019 +0100
crashtesting: out of bounds on importing tdf90224-2.odt
Change-Id: I5697cefd0859f007023fcd356d69db0e2176d67f
Reviewed-on: https://gerrit.libreoffice.org/81850
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index ea99495edc24..d9dd6cc35e42 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -668,7 +668,7 @@ void SdrObjList::sort( std::vector<sal_Int32>& sortOrder)
for (size_t i = 0; i < aNewSortOrder.size(); ++i)
{
- aNewList[i] = maList[ sortOrder[i] ];
+ aNewList[i] = maList[ aNewSortOrder[i] ];
aNewList[i]->SetOrdNum(i);
}
commit bbc0d20310a7031649628a62186b53d96c013891
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 31 09:38:16 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 10:44:34 2019 +0100
Bin code that has been commented-out for ten years.
Change-Id: I315e22ce296418799b6f51618cb6276c461b537b
Reviewed-on: https://gerrit.libreoffice.org/81873
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 18d76e2de465..ffd6ca9f1e90 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -504,12 +504,6 @@ void SvxTableController::GetState( SfxItemSet& rSet )
break;
}
- case SID_AUTOFORMAT:
- case SID_TABLE_SORT_DIALOG:
- case SID_TABLE_AUTOSUM:
-// if( !mxTable.is() )
-// rSet.DisableItem( nWhich );
- break;
default:
break;
}
commit 4a98ceceae4bbe06b99d75ffd7c714ffdfe77e39
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 1 10:20:53 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 10:34:28 2019 +0100
Workaround for crash on macOS Catalina at least when built with Xcode 11
For some unclear reason, for me at least, when I have built with Xcode
11.1 or 11.2 and run on macOS Cataline, I run into a crash caused by
boundless recursion related to the progress bar in the recovery
dialog. Not setting mbProgressNeedsErase to true for the "NWF" seems
to help.
Whether this has some unintended visually bad side effect I don't
know, but hey, it's just a progress bar, who cares if it in some
circumstances doesn't look perfect?
Change-Id: I6c990adde7689633b2c4b5aa42a4a07966565af2
Reviewed-on: https://gerrit.libreoffice.org/81874
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 4a23166a0fdc..45f9ba3546f3 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -324,7 +324,6 @@ VCLPLUG_OSX_PUBLIC SalInstance* create_SalInstance()
ImplGetSVData()->maNWFData.mbNoFocusRects = true;
ImplGetSVData()->maNWFData.mbNoActiveTabTextRaise = true;
ImplGetSVData()->maNWFData.mbCenteredTabs = true;
- ImplGetSVData()->maNWFData.mbProgressNeedsErase = true;
ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset = 10;
return pInst;
commit 713d2ec43710b8ff36cf43ae1f9eab686a296ca7
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Oct 31 21:09:00 2019 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 1 10:32:30 2019 +0100
check-elf-dynamic-objects: GTK3 drags in libharfbuzz.so.0
... now on Fedora 31; it looks quite stable ABI-wise so we can allow it.
Change-Id: Ic24fa9bdac0d0ce765e3d3844ce4ddcc59c6c9da
Reviewed-on: https://gerrit.libreoffice.org/81864
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index f64044dd1e49..640c80a7f079 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -93,7 +93,7 @@ x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 l
openglwhitelist="libGL.so.1"
giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
-gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
+gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3 libharfbuzz.so.0"
qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 libgobject-2.0.so.0 libxcb.so.1"
kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 libKF5WindowSystem.so.5"
avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
commit 82c20b5b1aa76e57a173e0c857ec7f3d02bdda29
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Oct 31 20:59:46 2019 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 1 10:32:22 2019 +0100
coinmp: disable "glpk", whatever that is
On Fedora 31, this happens in CppunitTest_sccomp_solver:
- loading component library <file:///work/lo/master/instdir/program/libsolverlo.so> failed
> nm -D instdir/program/libCbcSolver.so.3 | grep cbc_glp_prob
U cbc_glp_prob
> grep -r COIN_HAS_GLPK workdir/UnpackedTarball/coinmp | grep config.h
workdir/UnpackedTarball/coinmp/Osi/src/Osi/config.h:/* #undef COIN_HAS_GLPK */
workdir/UnpackedTarball/coinmp/Clp/src/config.h.in:#undef COIN_HAS_GLPK
workdir/UnpackedTarball/coinmp/Cbc/src/config.h:#define COIN_HAS_GLPK 1
workdir/UnpackedTarball/coinmp/CoinUtils/src/config.h.in:#undef COIN_HAS_GLPK
Somehow 2 different configures in coinmp got different ideas about
whether something named "glpk" is available.... no idea what that is,
it looks like there's a "glpk-devel" package installed on the system,
and i doubt that a dependency on that would be desirable.
Change-Id: Ief01b6aedc692197c1a8fd6351aef4281e530e70
Reviewed-on: https://gerrit.libreoffice.org/81863
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index f7362f6a1e1a..e2eeaf93ed8f 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
$(if $(DISABLE_DYNLOADING),--disable-shared) \
--disable-bzlib \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ --without-glpk \
--enable-dependency-linking F77=unavailable \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
commit 5727f7262d48864ec27aa190631284af7d2a7ce8
Author: Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed Oct 30 14:32:17 2019 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 1 10:30:09 2019 +0100
crashtesting: fix creating increments array in tdf106848-1.odt
else duplicate indexes happen and sort algorithm falls flat on
its face
Change-Id: I2b79e8df0f0a8e68117029630c0e026b8c202b02
Reviewed-on: https://gerrit.libreoffice.org/81775
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index a6cef0633542..ea99495edc24 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -627,29 +627,25 @@ void SdrObjList::sort( std::vector<sal_Int32>& sortOrder)
// example aShapesWithTextbox [0 2]
}
- aIncrements.push_back(0);
- aDuplicates.push_back(sortOrder[0]);
+ for (size_t i = 0; i< sortOrder.size(); ++i)
+ {
- // corner case: 1st shape is a textbox, add it twice
- // otherwise sortOrder loop below will skip it
- if (aShapesWithTextbox.count(sortOrder[0]) > 0)
- aDuplicates.push_back(sortOrder[0]);
+ if (aShapesWithTextbox.count(sortOrder[i]) > 0)
+ aDuplicates.push_back(sortOrder[i]);
- for (size_t i = 1; i< sortOrder.size(); ++i)
- {
aDuplicates.push_back(sortOrder[i]);
- if (aShapesWithTextbox.count(sortOrder[i]) > 0)
- {
+ // example aDuplicates [2 2 0 0 1]
+ }
+
+ aIncrements.push_back(0);
+ for (size_t i = 1; i< sortOrder.size(); ++i)
+ {
+ if (aShapesWithTextbox.count(i))
aIncrements.push_back(aIncrements[i-1] + 1 );
- aDuplicates.push_back(sortOrder[i]);
- }
else
- {
aIncrements.push_back(aIncrements[i-1]);
- }
- // example aDuplicates [2 2 0 0 1]
// example aIncrements [0 1 1]
}
commit ab3ec039bf5ffc1fb6f6948c1a1a7da2acad30eb
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 1 09:57:08 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 09:43:51 2019 +0100
Accept iOS SDK 13.2
Change-Id: I5d42a60a257661f39d1c9af6299ca3278f783d2b
Reviewed-on: https://gerrit.libreoffice.org/81870
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/configure.ac b/configure.ac
index ebd4f785c202..464129d6cc95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3019,8 +3019,8 @@ dnl ===================================================================
if test $_os = iOS; then
AC_MSG_CHECKING([what iOS SDK to use])
- current_sdk_ver=13.1
- older_sdk_vers="13.0 12.4 12.2"
+ current_sdk_ver=13.2
+ older_sdk_vers="13.1 13.0 12.4 12.2"
if test "$enable_ios_simulator" = "yes"; then
platform=iPhoneSimulator
versionmin=-mios-simulator-version-min=12.2
commit 8eba06afac375db28022d320d19943d8a129c436
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Oct 31 11:53:00 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Nov 1 09:01:15 2019 +0100
tdf#127921 Don't change slides when clicking in Slide sorter view
Change-Id: I21dfe232234d29dd110771a9edf9d4b9b0f6d53b
Reviewed-on: https://gerrit.libreoffice.org/81833
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index f9d22ca0a548..5f04037c04a5 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -273,7 +273,8 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent
void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent&)
{
- mbIsMouseClickPending = true;
+ if (!mbIsSlideSorterActive) // tdf#127921
+ mbIsMouseClickPending = true;
}
void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent)
commit a71edbd296c640fb62b99d057ee0142e2a84a8a9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 31 16:16:24 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 1 08:53:23 2019 +0100
loplugin:finalclasses in sc/inc
Change-Id: I6a08a86262deae4bed3a05f77d3041a568f23595
Reviewed-on: https://gerrit.libreoffice.org/81853
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index 6e8784b8f535..20003ed13444 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -31,7 +31,7 @@ class ScMenuFloatingWindow;
typedef ::cppu::ImplHelper1<
css::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE;
-class ScAccessibleFilterMenuItem :
+class ScAccessibleFilterMenuItem final :
public ScAccessibleContextBase,
public ScAccessibleFilterMenuItem_BASE
{
@@ -75,17 +75,15 @@ public:
/// Non-UNO Methods
-protected:
+private:
virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
virtual tools::Rectangle GetBoundingBox() const override;
-private:
bool isSelected() const;
void updateStateSet();
-private:
css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
VclPtr<ScMenuFloatingWindow> mpWindow;
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 8ef5af28fa81..90dd9bbbfd30 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -24,7 +24,7 @@
class ScCheckListMenuWindow;
-class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu
+class ScAccessibleFilterTopWindow final : public ScAccessibleFilterMenu
{
public:
ScAccessibleFilterTopWindow(
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index 9cc670e4df7c..df699e462937 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -26,7 +26,7 @@
#include <set>
/// Generic XAccessibleStateSet implementation.
-class ScAccessibleStateSet : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet >
+class ScAccessibleStateSet final : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet >
{
public:
ScAccessibleStateSet();
diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx
index a0c1b49adba4..84db53607090 100644
--- a/sc/inc/NumberFormatControl.hxx
+++ b/sc/inc/NumberFormatControl.hxx
@@ -25,7 +25,7 @@
namespace sc {
-class SC_DLLPUBLIC ScNumberFormatControl : public SfxToolBoxControl
+class SC_DLLPUBLIC ScNumberFormatControl final : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sc/inc/PivotTableDataProvider.hxx b/sc/inc/PivotTableDataProvider.hxx
index 4f803e204e27..90c98fc2f056 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -44,7 +44,7 @@ typedef cppu::WeakImplHelper<css::chart2::data::XDataProvider,
css::util::XModifyBroadcaster>
PivotTableDataProvider_Base;
-class PivotTableDataProvider : public PivotTableDataProvider_Base, public SfxListener
+class PivotTableDataProvider final : public PivotTableDataProvider_Base, public SfxListener
{
public:
diff --git a/sc/inc/PivotTableDataSequence.hxx b/sc/inc/PivotTableDataSequence.hxx
index b834e4ae81c5..7d6d04d4c3f1 100644
--- a/sc/inc/PivotTableDataSequence.hxx
+++ b/sc/inc/PivotTableDataSequence.hxx
@@ -79,7 +79,7 @@ typedef cppu::WeakImplHelper<css::chart2::data::XDataSequence,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list