[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/sd-ruler-fix.diff |   38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 8545fb0ea88ee20d5b8026fce58b4613002f3178
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Jun 16 12:34:44 2009 +0200

    Fixed Impress' way of numbering paragraphs
    
    With 3.0, Impress numbering was modified because of the odf 12
    changes in list level handling; we differ in the way we
    consider paragraphs to belong to the 'same' numbering group,
    compared to ppt. now, as long as the para has the same outline
    level (and no 'restart numbering' flag), it is considered to
    belong to the same numbering group, i.e. numbering will mono-
    tonically increase. Compares favorable to PPT. Additionally,
    fixed a repaint bug that prevented following paragraph's numbers
    to change, when certain modifications were made on the current one.
    
    * patches/dev300/sd-ruler-fix.diff: updated as outlined above

diff --git a/patches/dev300/sd-ruler-fix.diff b/patches/dev300/sd-ruler-fix.diff
index 874c222..9665f69 100644
--- a/patches/dev300/sd-ruler-fix.diff
+++ b/patches/dev300/sd-ruler-fix.diff
@@ -5,8 +5,10 @@ From: Thorsten Behrens <thb at openoffice.org>
 
 ---
 
- sd/source/ui/view/drviews3.cxx |   82 +++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 79 insertions(+), 3 deletions(-)
+ sd/source/ui/view/drviews3.cxx   |   82 +++++++++++++++++++++++++++++++++++++-
+ svx/source/outliner/outliner.cxx |    6 ++-
+ svx/source/outliner/outlvw.cxx   |    4 +-
+ 3 files changed, 86 insertions(+), 6 deletions(-)
 
 
 diff --git sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews3.cxx
@@ -121,3 +123,35 @@ index 1491ee0..90ee1fc 100644
  					rSet.Put( aLRSpaceItem );
  
  					Point aPos( aPagePos + maMarkRect.TopLeft() );
+diff --git svx/source/outliner/outliner.cxx svx/source/outliner/outliner.cxx
+index 73aa6f0..5c0a1a6 100644
+--- svx/source/outliner/outliner.cxx
++++ svx/source/outliner/outliner.cxx
+@@ -1897,8 +1897,10 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar
+             break;
+ 
+         const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
+-        if( pFmt == 0 || (*pFmt != *pParaFmt) )
+-            break; // change in number format, stop here
++        if( pFmt == 0 || 
++            pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL ||
++            pFmt->GetNumberingType() == SVX_NUM_NUMBER_NONE )
++            break; // no number format, or no numbering - stop here
+ 
+         const SfxBoolItem& rBulletState = (const SfxBoolItem&) pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE );
+ 
+diff --git svx/source/outliner/outlvw.cxx svx/source/outliner/outlvw.cxx
+index 0be153e..7aadc39 100644
+--- svx/source/outliner/outlvw.cxx
++++ svx/source/outliner/outlvw.cxx
+@@ -530,7 +530,9 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
+ 	for( USHORT nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ 	{
+ 		pOwner->ImplCheckNumBulletItem( nPara );
+-		pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
++        // update following paras as well, numbering depends on
++        // previous paras
++		pOwner->ImplCalcBulletText( nPara, TRUE, FALSE );
+ 
+ 		if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
+ 			pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) );