From 668cb9794ffb2cab5bad9ea0174c03adc7f88f8b Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 13 Feb 2020 17:06:58 +0100 Subject: tdf#130640: Revert "tdf#124983 In calc make printable page... ...borders also initially visible" This reverts commit caeb7b141280a65e60525f11a7e6514b76e12e11. Change-Id: I691934db79982c16bf0f43e7e38b00f3ab440a38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88616 Reviewed-by: Michael Weghorn Tested-by: Jenkins (cherry picked from commit c4281cb41e6b76cabd5fe42fc707877e864dfb82) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88646 Reviewed-by: Eike Rathke (cherry picked from commit b3e302b98dd7b992b7aa5a7f6756980d3edafc83) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88692 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos --- sc/source/ui/view/gridwin4.cxx | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 72926fd372a1..9426c8842bf0 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -69,7 +69,6 @@ #include #include #include -#include static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible ) { @@ -561,28 +560,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP ); bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS ) && !bIsTiledRendering; - // tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks - // is enabled, breaks should be visible. If the document is opened the first - // time, the breaks are not calculated yet, so this initialization is - // done here. - if (bPage) - { - std::set aColBreaks; - std::set aRowBreaks; - rDoc.GetAllColBreaks(aColBreaks, nTab, true, false); - rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false); - if (aColBreaks.size() == 0 || aRowBreaks.size() == 0) - { - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScPrintFunc aPrintFunc(pDocSh, pDocSh->GetPrinter(), nTab); - if (aPrintFunc.HasPrintRange()) - { - // We have a non-empty print range, so we can assume that calling UpdatePages() will - // result in non-empty col/row breaks next time we get here. - aPrintFunc.UpdatePages(); - } - } - } bool bPageMode = pViewData->IsPagebreakMode(); if (bPageMode) // after FindChanged -- cgit v1.2.3