Kaydet (Commit) 894dac7b authored tarafından Caolán McNamara's avatar Caolán McNamara

CID736196 out of bounds

Change-Id: Iaf9774c84f9ffe1a3d8fcd64c9ce950aacb317ba
üst 9692c7d2
...@@ -2707,8 +2707,16 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings, ...@@ -2707,8 +2707,16 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
if ( pRule && if ( pRule &&
IsCountedInList() ) IsCountedInList() )
{ {
int nLevel = GetActualListLevel();
if (nLevel < 0)
nLevel = 0;
if (nLevel >= MAXLEVEL)
nLevel = MAXLEVEL - 1;
SvxNumberType const& rNumberType( SvxNumberType const& rNumberType(
pRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) ) ); pRule->Get( static_cast<sal_uInt16>(nLevel) ) );
if (rNumberType.IsTxtFmt() || if (rNumberType.IsTxtFmt() ||
// //
(style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType())) (style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType()))
...@@ -2797,7 +2805,7 @@ sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const ...@@ -2797,7 +2805,7 @@ sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
const SwNumFmt& rFmt = pRule->Get(static_cast<sal_uInt16>(nLevel)); const SwNumFmt& rFmt = pRule->Get(static_cast<sal_uInt16>(nLevel));
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{ {
rFLOffset = pRule->Get( static_cast<sal_uInt16>(GetActualListLevel() )).GetFirstLineOffset(); rFLOffset = rFmt.GetFirstLineOffset();
if (!getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)) if (!getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment