mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#124983 In calc make printable page borders also initially visible

Browse Source 
If option "LibreOfficeDev Calc/View/Page breaks"
is enabled, breaks should be visible. But if the document
is opened the first time, the breaks are not calculated yet
and therefore not visible.

Change-Id: I651e4df4a9c292aa953888498a5c9d0fb5b8c8d2
Reviewed-on: https://gerrit.libreoffice.org/75355
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Ilhan Yesil
2019-07-10 15:41:27 +02:00
committed by Eike Rathke
parent 32f28dfa4c
commit caeb7b1412
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sc/source/ui/view/gridwin4.cxx
View File

@@ -69,6 +69,7 @@
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpaintwindow.hxx>
#include <drwlayer.hxx> #include <drwlayer.hxx>
#include <printfun.hxx>
static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible ) static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible )
{ {
@@ -560,6 +561,23 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP ); bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP );
bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS ); 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(); bool bPageMode = pViewData->IsPagebreakMode();
if (bPageMode) // after FindChanged if (bPageMode) // after FindChanged