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 <m.weghorn@posteo.de>
Tested-by: Jenkins
(cherry picked from commit c4281cb41e6b76cabd5fe42fc707877e864dfb82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88646
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit b3e302b98dd7b992b7aa5a7f6756980d3edafc83)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88692
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 72926fd..9426c88 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -69,7 +69,6 @@
#include <vcl/virdev.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <drwlayer.hxx>
#include <printfun.hxx>
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<SCCOL> aColBreaks;
std::set<SCROW> 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
