summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-23 19:37:45 +0100
committerLuboš Luňák <l.lunak@collabora.com>2014-04-29 17:04:54 +0200
commit7bc6faf2187e36c4ebb267f83ed6a8ef4057cd44 (patch)
tree06ae1d131b1f0449ff2f2b7c3bf9fd6faa5941a2
parentae31ea9df5b5d6b84843ac618a102547c4700c68 (diff)
mpTextRangeOverlay might not exist
if there is no range for the comment (cherry picked from commit dc3b3e129955856012df78acb1e8e2bbbec0df51) Conflicts: sw/source/core/uibase/docvw/SidebarWin.cxx Change-Id: I34b9ca9f0974f1d614268fd2df2ded704cd543d2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 866bc861e10e..54bc16d0dcc9 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -262,8 +262,10 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*pDev, aNewViewInfos );
- pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence());
- pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence());
+ if (mpAnchor)
+ pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence());
+ if (mpTextRangeOverlay)
+ pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence());
delete pProcessor;
}