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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 15a6c2559b5d19a51534841c05bf478a11dc74fb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 30 17:30:14 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 09:27:43 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.)
    
    (The change is only for the LibreOfficeKit use case, but maybe it
    should be in all cases.)
    
    Change-Id: If9221d248d59e515a110ff94cfb96fdd76aecafb
    Reviewed-on: https://gerrit.libreoffice.org/81801
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit f4594ae70f3bcde7a87ec606030ec5217ba53788)
    Reviewed-on: https://gerrit.libreoffice.org/81869
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index a07a90ac1bb5..d119367632a6 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -461,11 +461,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: