sc/source/ui/view/gridwin.cxx | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 34c77d4bf3d2924c4ad26728d4c491b393fa0fc8
Author: Henry Castro <hcas...@collabora.com>
Date: Sat Jul 1 11:31:24 2017 -0400
sc lok: disable items of the overlay manager
They consume unnecessary CPU idle task in the tiled
redenring case
Change-Id: I477d17479ee83b31474675ef0d2317163d4fcee7
Reviewed-on: https://gerrit.libreoffice.org/39437
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bc79b8c87af4..a7a9e9b72ac7 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5626,6 +5626,8 @@ void ScGridWindow::UpdateCopySourceOverlay()
DeleteCopySourceOverlay();
+ if (comphelper::LibreOfficeKit::isActive())
+ return;
if (!pViewData->ShowPasteSource())
return;
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
@@ -5886,9 +5888,6 @@ void ScGridWindow::UpdateCursorOverlay()
xOverlayManager->add(*pOverlay);
mpOOCursors.reset(new sdr::overlay::OverlayObjectList);
mpOOCursors->append(pOverlay);
-
- // notify the LibreOfficeKit too
- updateLibreOfficeKitSelection(pViewData, aPixelRects);
}
}
}
@@ -5924,8 +5923,12 @@ void ScGridWindow::UpdateSelectionOverlay()
{
// #i70788# get the OverlayManager safely
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
-
- if (xOverlayManager.is())
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ // notify the LibreOfficeKit too
+ updateLibreOfficeKitSelection(pViewData, aPixelRects);
+ }
+ else if (xOverlayManager.is())
{
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix
aTransform(GetInverseViewTransformation());
@@ -5962,9 +5965,6 @@ void ScGridWindow::UpdateSelectionOverlay()
xOverlayManager->add(*pOverlay);
mpOOSelection.reset(new sdr::overlay::OverlayObjectList);
mpOOSelection->append(pOverlay);
-
- // notify the LibreOfficeKit too
- updateLibreOfficeKitSelection(pViewData, aPixelRects);
}
}
else
@@ -6037,7 +6037,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
// #i70788# get the OverlayManager safely
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
- if (xOverlayManager.is())
+ if (xOverlayManager.is() && !comphelper::LibreOfficeKit::isActive())
{
Color aHandleColor(
SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
if (pViewData->GetActivePart() != eWhich)
@@ -6165,7 +6165,7 @@ void ScGridWindow::UpdateDragRectOverlay()
// #i70788# get the OverlayManager safely
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
- if (xOverlayManager.is())
+ if (xOverlayManager.is() && !comphelper::LibreOfficeKit::isActive())
{
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix
aTransform(GetInverseViewTransformation());
@@ -6213,7 +6213,7 @@ void ScGridWindow::UpdateHeaderOverlay()
// #i70788# get the OverlayManager safely
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
- if (xOverlayManager.is())
+ if (xOverlayManager.is() && !comphelper::LibreOfficeKit::isActive())
{
// Color aHighlight =
GetSettings().GetStyleSettings().GetHighlightColor();
std::vector< basegfx::B2DRange > aRanges;
@@ -6281,7 +6281,7 @@ void ScGridWindow::UpdateShrinkOverlay()
// #i70788# get the OverlayManager safely
rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
- if (xOverlayManager.is())
+ if (xOverlayManager.is() && !comphelper::LibreOfficeKit::isActive())
{
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix
aTransform(GetInverseViewTransformation());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
