[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
Caolán McNamara
caolanm at redhat.com
Thu Jun 4 06:06:36 PDT 2015
sw/source/core/view/vprint.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 84c9d54eb3c007066908794a1443dca6670a3922
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 4 11:41:30 2015 +0100
Resolves: tdf#84483 postit layout not available in print preview mode
for the moment don't crash anyway, maybe we can rearrange matters
to make this possible.
Change-Id: I2dc9831e5b026004b2f7603e618330154dbd6d1b
(cherry picked from commit eea5ac7910d61796d77fe2cc03681dd24bb7dd95)
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index b674f92..f2997ce 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -537,9 +537,10 @@ bool SwViewShell::PrintOrPDFExport(
SwPaintQueue::Repaint();
- if (nPostItMode == POSTITS_INMARGINS)
+ SwPostItMgr *pPostItManager = (nPostItMode == POSTITS_INMARGINS) ?
+ pShell->GetPostItMgr() : NULL;
+ if (pPostItManager)
{
- SwPostItMgr *pPostItManager = pShell->GetPostItMgr();
pPostItManager->CalcRects();
pPostItManager->LayoutPostIts();
pPostItManager->DrawNotesForPage(pOutDev, nPage-1);
More information about the Libreoffice-commits
mailing list