[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svx/source

[Tor Lillqvist (via logerrit)]

 svx/source/table/tablecontroller.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1a903a72675ffd1c63018c023e9d81352ec9e4aa
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 30 17:30:14 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 30 19:35:54 2019 +0100

    tdf#128454: Make it possible to delete a table's single row or column
    
    It is already possible to delete all rows or all columns when there
    are multiple ones. So why it should be impossible to delete the single
    row or column when there is just one I can't understand.
    
    (This change is just one way to provide a workaround for the bug; the
    ideal would be if it was possible to specifically delete a whole table
    also in Impress documents, not just Writer ones.)
    
    Change-Id: If9221d248d59e515a110ff94cfb96fdd76aecafb
    Reviewed-on: https://gerrit.libreoffice.org/81789
    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 f3b35b0a80c0..46a638cc7f8f 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -458,11 +458,11 @@ void SvxTableController::GetState( SfxItemSet& rSet )
                     break;
                 }
             case SID_TABLE_DELETE_ROW:
-                if( !mxTable.is() || !hasSelectedCells() || (mxTable->getRowCount() <= 1) )
+                if( !mxTable.is() || !hasSelectedCells() || (!comphelper::LibreOfficeKit::isActive() && mxTable->getRowCount() <= 1) )
                     rSet.DisableItem(SID_TABLE_DELETE_ROW);
                 break;
             case SID_TABLE_DELETE_COL:
-                if( !mxTable.is() || !hasSelectedCells() || (mxTable->getColumnCount() <= 1) )
+                if( !mxTable.is() || !hasSelectedCells() || (!comphelper::LibreOfficeKit::isActive() && mxTable->getColumnCount() <= 1) )
                     rSet.DisableItem(SID_TABLE_DELETE_COL);
                 break;
             case SID_TABLE_MERGE_CELLS: