| 1 |
From f0ec7af75b7c3566a0e8e71735b5cc237eb505d5 Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Wed, 2 Mar 2011 13:00:18 +0000 |
| 4 |
Subject: [PATCH] Resolves: rhbz#672818 bandaid for crash in SwTxtNode::GetTxtAttrForCharAt |
| 5 |
|
| 6 |
--- |
| 7 |
sw/source/core/unocore/unorefmk.cxx | 6 ++++-- |
| 8 |
1 files changed, 4 insertions(+), 2 deletions(-) |
| 9 |
|
| 10 |
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx |
| 11 |
index 436a2bb..e461f71 100644 |
| 12 |
--- a/sw/source/core/unocore/unorefmk.cxx |
| 13 |
+++ b/sw/source/core/unocore/unorefmk.cxx |
| 14 |
@@ -261,8 +261,10 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, |
| 15 |
} |
| 16 |
else |
| 17 |
{ |
| 18 |
- pTxtAttr = rPam.GetNode()->GetTxtNode()->GetTxtAttrForCharAt( |
| 19 |
- rPam.GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_REFMARK); |
| 20 |
+ SwTxtNode *pTxtNd = rPam.GetNode()->GetTxtNode(); |
| 21 |
+ OSL_ASSERT(pTxtNd); |
| 22 |
+ pTxtAttr = pTxtNd ? rPam.GetNode()->GetTxtNode()->GetTxtAttrForCharAt( |
| 23 |
+ rPam.GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_REFMARK) : NULL; |
| 24 |
} |
| 25 |
|
| 26 |
if (!pTxtAttr) |
| 27 |
-- |
| 28 |
1.7.4.1 |
| 29 |
|
| 30 |
|
Parent Directory
| 
Revision Log