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

[Tomaž Vajngerl (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx        |   16 +++-------------
 svx/source/table/tablecontroller.cxx |    3 ---
 2 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 77c08d12a35edf1a9c18c159afac2ced595ea7db
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Oct 2 14:32:07 2019 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Oct 3 10:42:03 2019 +0200

    tdf#125565 always send the graphic selection for the table
    
    Reviewed-on: https://gerrit.libreoffice.org/80034
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit c9336bfb6bbf6d73d3f23c124262ade30133448d)
    
    Change-Id: I7085b2f1ddcfd83eccbbcaba4892cde95b6bd85c
    Reviewed-on: https://gerrit.libreoffice.org/80091
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0db55b20b8cd..5f4d4fe2c56f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -760,7 +760,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
     Point aGridOff = GetGridOffset();
 
     SfxViewShell* pViewShell = GetSfxViewShell();
-    bool bIsInTextEditMode = false;
+
     // check if text edit or ole is active and handles need to be suppressed. This may be the case
     // when a single object is selected
     // Using a strict return statement is okay here; no handles means *no* handles.
@@ -778,9 +778,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 
             if (pSdrTextObj && pSdrTextObj->IsInEditMode())
             {
-                if (bTiledRendering)
-                    bIsInTextEditMode = true;
-                else
+                if (!bTiledRendering)
                     return;
             }
         }
@@ -843,19 +841,11 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
             OString sSelectionText;
             boost::property_tree::ptree aTableJsonTree;
             bool bTableSelection = false;
-            bool bCellsAreSelected = false;
 
             if (mpMarkedObj && mpMarkedObj->GetObjIdentifier() == OBJ_TABLE)
             {
                 auto* pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(mpMarkedObj);
                 bTableSelection = pTableObject->createTableEdgesJson(aTableJsonTree);
-
-                rtl::Reference<sdr::SelectionController> xController = static_cast<SdrView*>(this)->getSelectionController();
-                if (xController.is() && xController->hasSelectedCells())
-                {
-                    // The table shape has selected cells, which provide text selection already -> no graphic selection.
-                    bCellsAreSelected = true;
-                }
             }
             if (GetMarkedObjectCount())
             {
@@ -1013,7 +1003,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
                 }
             }
 
-            if (sSelectionText.isEmpty() || bCellsAreSelected || bIsInTextEditMode)
+            if (sSelectionText.isEmpty())
                 sSelectionText = "EMPTY";
 
             if (bTableSelection)
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index caf0d321fc41..f3b35b0a80c0 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2248,9 +2248,6 @@ void SvxTableController::updateSelectionOverlay()
                 {
                     pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_SELECTION_AREA, aSelection.toString().getStr());
                     pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, aSelection.toString().getStr());
-                    OString sSelection("EMPTY");
-                    pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sSelection.getStr());
-                    SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", sSelection);
                 }
             }
         }