diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-17 14:59:46 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-17 14:59:46 -0500 |
| commit | f9fb24e17fcf72b08e90b4b243f1aa927fd97689 (patch) | |
| tree | 57a0b87b4616a6dbc2445e1c76d55fe84e79b8ef | |
| parent | de1c42d9f552bc57b28d50f4313bc982c63b84d4 (diff) | |
writer: crash(i119959) paste of multi-line draw-text into bullet list
Change-Id: I82da331b478cd258e5f9803dfac4cb203d2dc9f6
| -rw-r--r-- | sw/source/core/edit/edattr.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 30dc76d854b4..76a61c29d548 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -479,13 +479,16 @@ sal_Bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos, OSL_ENSURE( rTNd.GetNumRule(), "<lcl_IsNoEndTxtAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." ); const SwNumRule* pNumRule = rTNd.GetNumRule(); - const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<sal_uInt16>(rTNd.GetActualListLevel()) ); - if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() ) + if(pNumRule) { - if ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() ) - sExp = rNumFmt.GetBulletChar(); - else - sExp = rTNd.GetNumString(); + const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<sal_uInt16>(rTNd.GetActualListLevel()) ); + if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() ) + { + if ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() ) + sExp = rNumFmt.GetBulletChar(); + else + sExp = rTNd.GetNumString(); + } } } } |