summaryrefslogtreecommitdiff
path: root/svx/source/outliner/outleeng.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-03-16 11:00:17 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-03-16 11:00:17 +0000
commit60fd827d609b85387d28b010bf08f0eee91f8f4d (patch)
treedc81f25cb89eb264c00adf6e8c9efb31288f67d5 /svx/source/outliner/outleeng.cxx
parentb096225ab1bb97f666dc2cbf1de804121a5c7ba6 (diff)
CWS-TOOLING: integrate CWS sw31bf07
2009-03-10 12:55:42 +0100 od r269266 : #i100014# - adjust <Outliner::ImplCheckParagraphs(..)> and its usage to avoid endless loop 2009-03-10 10:24:45 +0100 od r269250 : #i100035# method <SwView::~SwView()> - set member variable <mpPostItMgr> to 0 after its destruction to suppress further access on it. 2009-03-10 10:10:05 +0100 od r269247 : #i100043# method <OutWW8_SwTxtNode(..)> - if paragraph is numbered via set list style at paragraph style and list level indent values of LABEL_ALIGNMENT list level style not applicable, put indent values into temporary itemset for export NOTE: This is a correction of fix for issue i94187
Diffstat (limited to 'svx/source/outliner/outleeng.cxx')
-rw-r--r--svx/source/outliner/outleeng.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx
index 3ee790dc44..43fea6e316 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/svx/source/outliner/outleeng.cxx
@@ -228,7 +228,11 @@ void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
- pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()-1) );
+ // --> OD 2009-03-10 #i100014#
+ // It is not a good idea to substract 1 from a count and cast the result
+ // to USHORT without check, if the count is 0.
+ pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()) );
+ // <--
if ( !IsInUndo() && IsUndoEnabled() )
pOwner->UndoActionEnd( OLUNDO_ATTR );