[Libreoffice-commits] .: sw/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Jan 30 12:40:05 PST 2011


 sw/source/core/draw/dcontact.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0b7c27d1176c5ea9036a40291474e97bede9bc4d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 30 20:38:54 2011 +0000

    Resolves: rhbz#673819 crash in changing header/footer object position

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 04c6443..ceb0c9f 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2581,7 +2581,9 @@ SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const
 SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const
 {
     SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum);
-    pHdl->SetPos(pHdl->GetPos() + GetOffset());
+
+    if (pHdl)
+        pHdl->SetPos(pHdl->GetPos() + GetOffset());
 
     return pHdl;
 }


More information about the Libreoffice-commits mailing list