diff options
| author | Henry Castro <hcastro@collabora.com> | 2017-07-01 11:31:24 -0400 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2017-07-05 21:18:27 +0200 |
| commit | 6733094d72df98b03837a22d9a0d8f3f376b350f (patch) | |
| tree | 30078e167779dc9a3f61cb92f9ee0ea64ec02d9d /sc | |
| parent | 970a2517d27336deb8b140f31371f37ea1c890f6 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/39439
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 039066db0387..630400b94c5b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5844,6 +5844,8 @@ void ScGridWindow::UpdateCopySourceOverlay() DeleteCopySourceOverlay(); + if (comphelper::LibreOfficeKit::isActive()) + return; if (!pViewData->ShowPasteSource()) return; rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); @@ -6104,9 +6106,6 @@ void ScGridWindow::UpdateCursorOverlay() xOverlayManager->add(*pOverlay); mpOOCursors.reset(new sdr::overlay::OverlayObjectList); mpOOCursors->append(*pOverlay); - - // notify the LibreOfficeKit too - updateLibreOfficeKitSelection(pViewData, aPixelRects); } } } @@ -6142,8 +6141,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()); @@ -6180,9 +6183,6 @@ void ScGridWindow::UpdateSelectionOverlay() xOverlayManager->add(*pOverlay); mpOOSelection.reset(new sdr::overlay::OverlayObjectList); mpOOSelection->append(*pOverlay); - - // notify the LibreOfficeKit too - updateLibreOfficeKitSelection(pViewData, aPixelRects); } } else @@ -6255,7 +6255,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) @@ -6383,7 +6383,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()); @@ -6431,7 +6431,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; @@ -6499,7 +6499,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()); |