diff options
| author | Philippe Jung <phil.jung@free.fr> | 2015-05-17 17:42:54 +0200 |
|---|---|---|
| committer | Yousuf Philips <philipz85@hotmail.com> | 2015-05-20 10:31:33 +0000 |
| commit | 447783a97777b2053acd74d265af3ed2a6c5c93a (patch) | |
| tree | ad1915b5842e4db9e3d22cd20f0e1c3b7bbcd089 /sw/source/uibase | |
| parent | f8b4c783c6269e108ade08cd9896b845e3b7ae3a (diff) | |
tdf#90882 Writer: insert row/col before/after
From the contextual menu, it is now possible to insert rows or cols
before the current position.
Number of rows/cols inserted is based on current selection.
Change-Id: Ie1a718fbb1b8caf67716f9c8fad21f90d182ca79
Reviewed-on: https://gerrit.libreoffice.org/15773
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/shells/tabsh.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 586261803f11..7f0028122917 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -820,10 +820,13 @@ void SwTableShell::Execute(SfxRequest &rReq) OSL_ENSURE( false, "function may not be called now." ); break; - case FN_TABLE_INSERT_COL: - case FN_TABLE_INSERT_ROW: + case FN_TABLE_INSERT_COL_BEFORE: + case FN_TABLE_INSERT_ROW_BEFORE: + case FN_TABLE_INSERT_COL_AFTER: + case FN_TABLE_INSERT_ROW_AFTER: { - bool bColumn = rReq.GetSlot() == FN_TABLE_INSERT_COL; + bool bColumn = rReq.GetSlot() == FN_TABLE_INSERT_COL_BEFORE + || rReq.GetSlot() == FN_TABLE_INSERT_COL_AFTER; sal_uInt16 nCount = 0; bool bAfter = true; if (pItem) @@ -855,7 +858,9 @@ void SwTableShell::Execute(SfxRequest &rReq) nCount = maxX - minX + 1; else nCount = maxY - minY + 1; - } + } + bAfter = rReq.GetSlot() == FN_TABLE_INSERT_COL_AFTER + || rReq.GetSlot() == FN_TABLE_INSERT_ROW_AFTER; } if( nCount ) @@ -914,7 +919,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if( pDlg.get() && (pDlg->Execute() == 1) ) { const sal_uInt16 nDispatchSlot = (nSlot == FN_TABLE_INSERT_COL_DLG) - ? FN_TABLE_INSERT_COL : FN_TABLE_INSERT_ROW; + ? FN_TABLE_INSERT_COL_AFTER : FN_TABLE_INSERT_ROW_AFTER; SfxUInt16Item aCountItem( nDispatchSlot, static_cast< sal_uInt16 >(pDlg->getInsertCount()) ); SfxBoolItem aAfter( FN_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ); SfxViewFrame* pVFrame = GetView().GetViewFrame(); @@ -1246,7 +1251,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) } break; } - case FN_TABLE_INSERT_ROW: + case FN_TABLE_INSERT_ROW_AFTER: case FN_TABLE_INSERT_ROW_DLG: if ( rSh.IsInRepeatedHeadline() ) rSet.DisableItem( nSlot ); |