[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/core/view/vprint.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 01f77389b473a37a7b8e0e46a1e49a56dac478c3
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)
    (cherry picked from commit 84c9d54eb3c007066908794a1443dca6670a3922)
    Reviewed-on: https://gerrit.libreoffice.org/16084
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 7f2b520..321b1f5 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -535,9 +535,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);