From 2847d445595f725ce4e269c53f15d4f274951fb7 Mon Sep 17 00:00:00 2001
From: Oliver-Rainer Wittmann <od@openoffice.org>
Date: Thu, 3 Jun 2010 10:54:44 +0200
Subject: sw33bf05: #i111964# - provide default sidebar position at <SwPageFrm>
 instance and include access guards for the anchor overlay object of
 annotations.

---
 sw/source/ui/docvw/PostItMgr.cxx | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'sw/source/ui/docvw/PostItMgr.cxx')

diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index c6b0ad4a136f..025f275779b1 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1669,28 +1669,36 @@ void SwPostItMgr::CorrectPositions()
    if (!pFirstPostIt)
        return;
 
-   // yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
-   const long aAnchorX = mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X();
-   const long aAnchorY = mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1;
-   if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
-   {
-       long aAnchorPosX = 0;
-       long aAnchorPosY = 0;
-       for (unsigned long n=0;n<mPages.size();n++)
-       {
-           for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
-           {
-               if ((*i)->bShow && (*i)->pPostIt)
-               {
+    // yeah, I know,    if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
+    // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+    const long aAnchorX = pFirstPostIt->Anchor()
+                          ? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X()
+                          : 0;
+    const long aAnchorY = pFirstPostIt->Anchor()
+                          ? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1
+                          : 0;
+    // <--
+    if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
+    {
+        long aAnchorPosX = 0;
+        long aAnchorPosY = 0;
+        for (unsigned long n=0;n<mPages.size();n++)
+        {
+            for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
+            {
+                // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+                if ( (*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Anchor() )
+                // <--
+                {
                     aAnchorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
                         ? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X()
                         : mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSixthPosition().getX()),0)).X();
                     aAnchorPosY = mpEditWin->LogicToPixel( Point(0,(long)((*i)->pPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1;
                     (*i)->pPostIt->SetPosPixel(Point(aAnchorPosX,aAnchorPosY));
                }
-           }
-       }
-   }
+            }
+        }
+    }
 }
 
 
-- 
cgit