SdrMarkView tiled rendering: partially disable SdrTableObj graphic selection

If one or more cells are selected in an Impress table, then the shape
already provides its own text selection, don't overwrite it with the
generic graphic selection in this case.

Change-Id: I4f84a220df6cd9d225ed67d6f70ba2df6eff38af

2 files changed, 16 insertions, 0 deletions

diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx
index 800d694c1686..a2ff8758b009 100644
--- a/svx/source/svdraw/selectioncontroller.cxx
+++ b/svx/source/svdraw/selectioncontroller.cxx
@@ -100,6 +100,11 @@ bool SelectionController::ApplyFormatPaintBrush( SfxItemSet& /*rFormatSet*/, boo
     return false;
 }
 
+bool SelectionController::hasSelectedCells() const
+{
+    return false;
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 66a2a323b2bf..28629e55cf50 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -703,6 +703,17 @@ void SdrMarkView::SetMarkHandles()
             {
                 return;
             }
+
+            if (bTiledRendering && pMarkedObj->GetObjIdentifier() == OBJ_TABLE)
+            {
+                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.
+                    GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "EMPTY");
+                    return;
+                }
+            }
         }
 
         Rectangle aRect(GetMarkedObjRect());