[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/source
Xisco Fauli (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 16 11:26:46 UTC 2020
sc/source/ui/view/gridwin4.cxx | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
New commits:
commit 8ec2427a984c815db6764e2ef7bb5ed97f8a5fff
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Feb 13 17:06:58 2020 +0100
Commit: Juergen Funk <juergen.funk_ml at cib.de>
CommitDate: Wed Sep 16 13:26:10 2020 +0200
tdf#130640: Revert "tdf#124983 In calc make printable page...
...borders also initially visible"
This reverts commit caeb7b141280a65e60525f11a7e6514b76e12e11.
trac#33270
Change-Id: I691934db79982c16bf0f43e7e38b00f3ab440a38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88616
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
Tested-by: Jenkins
(cherry picked from commit c4281cb41e6b76cabd5fe42fc707877e864dfb82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102847
Tested-by: Juergen Funk <juergen.funk_ml at cib.de>
Reviewed-by: Juergen Funk <juergen.funk_ml at cib.de>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7be9555961fb..853f56f12b33 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -68,7 +68,7 @@
#include <sc.hrc>
#include <vcl/virdev.hxx>
#include <svx/sdrpaintwindow.hxx>
-#include <printfun.hxx>
+#include <drwlayer.hxx>
static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible )
{
@@ -558,23 +558,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP );
bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
- // 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);
- aPrintFunc.UpdatePages();
- }
- }
bool bPageMode = pViewData->IsPagebreakMode();
if (bPageMode) // after FindChanged
More information about the Libreoffice-commits
mailing list