sw/source/core/edit/edattr.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
New commits: commit f9fb24e17fcf72b08e90b4b243f1aa927fd97689 Author: Norbert Thiebaud <[email protected]> Date: Sun Jun 17 14:59:46 2012 -0500 writer: crash(i119959) paste of multi-line draw-text into bullet list Change-Id: I82da331b478cd258e5f9803dfac4cb203d2dc9f6 diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 30dc76d..76a61c2 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(); + } } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
