diff options
| author | Justin Luth <justin_luth@sil.org> | 2020-07-03 11:45:24 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-07-07 22:21:26 +0200 |
| commit | 1e602c9c3f8dafd1e47d50c9670846fc1172700d (patch) | |
| tree | c53f06d3c2374900b474b1f41299ee73ca30a823 /sd | |
| parent | 71227e2306987cb8aa5fbda2943e73237674e9ba (diff) | |
tdf#100772 sd: add uno:DeleteTable to non-NB menus
Delete Row and Delete Column were there, but no option to delete table,
so that major omission was fixed for Draw and Impress.
The notebookbar looks very incomplete. Also, I didn't really
understand the pop-out menu configuration, and at least in the
one case there didn't seem to be a good space to add delete table.
So I left the notebookbar completely alone.
Change-Id: I5d6c98e3238bc545a02325edfd62f5d937ac6371
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97821
Tested-by: Jenkins
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/sdi/tables.sdi | 5 | ||||
| -rw-r--r-- | sd/source/ui/table/tableobjectbar.cxx | 2 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/tableobjectbar.xml | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/tableobjectbar.xml | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi index a5918af490db..9943ce719e29 100644 --- a/sd/sdi/tables.sdi +++ b/sd/sdi/tables.sdi @@ -113,6 +113,11 @@ shell TableObjectBar ExecMethod = Execute; StateMethod = GetState; ] + SID_TABLE_DELETE_TABLE + [ + ExecMethod = Execute; + StateMethod = GetState; + ] SID_TABLE_SELECT_ALL [ ExecMethod = Execute; diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 3c4c59ce2b3d..846d5fb6bbfc 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -180,6 +180,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) case SID_OPTIMIZE_TABLE: case SID_TABLE_DELETE_ROW: case SID_TABLE_DELETE_COL: + case SID_TABLE_DELETE_TABLE: case SID_FORMAT_TABLE_DLG: case SID_TABLE_INSERT_ROW: case SID_TABLE_INSERT_COL: @@ -187,6 +188,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) pView->AdjustMarkHdl(); pBindings->Invalidate( SID_TABLE_DELETE_ROW ); pBindings->Invalidate( SID_TABLE_DELETE_COL ); + pBindings->Invalidate( SID_TABLE_DELETE_TABLE ); pBindings->Invalidate( SID_FRAME_LINESTYLE ); pBindings->Invalidate( SID_FRAME_LINECOLOR ); pBindings->Invalidate( SID_ATTR_BORDER ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index d65e75e60fc7..8f20bbbb1348 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -384,6 +384,7 @@ <menu:menuitem menu:id=".uno:MergeCells"/> <menu:menuitem menu:id=".uno:SplitCell"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:DeleteTable"/> <menu:menuitem menu:id=".uno:SelectTable"/> <menu:menuitem menu:id=".uno:TableDialog"/> </menu:menupopup> diff --git a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml index af2c3e6bcb45..87655aafe2f5 100644 --- a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml @@ -40,6 +40,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/> <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/> <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/> + <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index e45735b2f667..00485727dd82 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -415,6 +415,7 @@ <menu:menuitem menu:id=".uno:MergeCells"/> <menu:menuitem menu:id=".uno:SplitCell"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:DeleteTable"/> <menu:menuitem menu:id=".uno:SelectTable"/> <menu:menuitem menu:id=".uno:TableDialog"/> </menu:menupopup> diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml index af2c3e6bcb45..87655aafe2f5 100644 --- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml @@ -40,6 +40,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/> <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/> <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/> + <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/> |