INTEGRATION: CWS impressodf12 (1.15.350); FILE MERGED

2008/05/29 12:12:44 cl 1.15.350.5: #i75927# bullet rework
2008/05/26 11:37:24 cl 1.15.350.4: #i35937# code cleanup after bullet rework
2008/04/25 09:01:21 cl 1.15.350.3: RESYNC: (1.15-1.16); FILE MERGED
2008/04/22 19:58:52 cl 1.15.350.2: added paint first line hdl
2008/04/21 15:31:49 tl 1.15.350.1: #i35937# EditEngine/outliner changes regarding number format and bullets

1 files changed, 36 insertions, 14 deletions

diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx
index 5f4acb4973ca..b0089c242f46 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/svx/source/outliner/outleeng.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: outleeng.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,6 +39,7 @@
 #include <outliner.hrc>
 #include <svtools/itemset.hxx>
 #include <svx/eeitem.hxx>
+#include "editstat.hxx"
 
 OutlinerEditEng::OutlinerEditEng( Outliner* pEngOwner, SfxItemPool* pPool )
  : EditEngine( pPool )
@@ -50,11 +51,25 @@ OutlinerEditEng::~OutlinerEditEng()
 {
 }
 
-void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, long /*nBaseLineY*/, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
+    if( GetControlWord() && EE_CNTRL_OUTLINER )
+    {
+        PaintFirstLineInfo aInfo( nPara, rStartPos, nBaseLineY, rOrigin, nOrientation, pOutDev );
+        pOwner->maPaintFirstLineHdl.Call( &aInfo );
+    }
     pOwner->PaintBullet( nPara, rStartPos, rOrigin, nOrientation, pOutDev );
 }
 
+const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
+{
+    const SvxNumberFormat* pFmt = NULL;
+    if (pOwner)
+        pFmt = pOwner->GetNumberFormat( nPara );
+    return pFmt;
+}
+
+
 Rectangle OutlinerEditEng::GetBulletArea( USHORT nPara )
 {
     Rectangle aBulletArea = Rectangle( Point(), Point() );
@@ -90,13 +105,6 @@ void OutlinerEditEng::ParaAttribsChanged( USHORT nPara )
     pOwner->ParaAttribsChanged( nPara );
 }
 
-void OutlinerEditEng::ParagraphHeightChanged( USHORT nPara )
-{
-    pOwner->ParagraphHeightChanged( nPara );
-
-    EditEngine::ParagraphHeightChanged( nPara );
-}
-
 BOOL OutlinerEditEng::SpellNextDocument()
 {
     return pOwner->SpellNextDocument();
@@ -109,7 +117,6 @@ BOOL OutlinerEditEng::ConvertNextDocument()
 
 XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
 {
-#ifndef SVX_LIGHT
     switch( nUndoId )
     {
         case OLUNDO_DEPTH:
@@ -130,10 +137,6 @@ XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
         default:
             return EditEngine::GetUndoComment( nUndoId );
     }
-#else // SVX_LIGHT
-    XubString aString;
-    return aString;
-#endif
 }
 
 // #101498#
@@ -170,3 +173,22 @@ XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, USHORT nP
 {
     return pOwner->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
+
+void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+{
+    Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+    if( pPara )
+    {
+        if ( !IsInUndo() && IsUndoEnabled() )
+            pOwner->UndoActionStart( OLUNDO_ATTR );
+
+        EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
+
+        pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
+        pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()-1) );
+
+        if ( !IsInUndo() && IsUndoEnabled() )
+            pOwner->UndoActionEnd( OLUNDO_ATTR );
+    }
+}
+