1 files changed, 6 insertions, 31 deletions

diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 0b96792963a4..e858c089fbbe 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -229,24 +229,11 @@ void Outliner::Init( sal_uInt16 nMode )
     EnableUndo(bWasUndoEnabled);
 }
 
-void Outliner::SetMaxDepth( sal_Int16 nDepth, bool bCheckParagraphs )
+void Outliner::SetMaxDepth( sal_Int16 nDepth )
 {
     if( nMaxDepth != nDepth )
     {
         nMaxDepth = std::min( nDepth, (sal_Int16)(SVX_MAX_NUM-1) );
-
-        if( bCheckParagraphs )
-        {
-            sal_Int32 nParagraphs = pParaList->GetParagraphCount();
-            for ( sal_Int32 nPara = 0; nPara < nParagraphs; nPara++ )
-            {
-                Paragraph* pPara = pParaList->GetParagraph( nPara );
-                if( pPara && pPara->GetDepth() > nMaxDepth )
-                {
-                    SetDepth( pPara, nMaxDepth );
-                }
-            }
-        }
     }
 }
 
@@ -506,7 +493,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara )
 
 // pView == 0 -> Ignore tabs
 
-bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
+bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara )
 {
 
     bool bConverted = false;
@@ -565,13 +552,7 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView)
 
     if ( aDelSel.HasRange() )
     {
-        if ( pView )
-        {
-            pView->SetSelection( aDelSel );
-            pView->DeleteSelected();
-        }
-        else
-            pEditEngine->QuickDelete( aDelSel );
+        pEditEngine->QuickDelete( aDelSel );
     }
 
     const SfxInt16Item& rLevel = static_cast<const SfxInt16Item&>( pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL ) );
@@ -709,14 +690,12 @@ void Outliner::ImplCheckNumBulletItem( sal_Int32 nPara )
             pPara->aBulSize.Width() = -1;
 }
 
-void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle )
+void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara )
 {
 
     DBG_ASSERT( ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) || ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ), "SetLevelDependendStyleSheet: Wrong Mode!" );
 
-    SfxStyleSheet* pStyle = pLevelStyle;
-    if ( !pStyle )
-        pStyle = GetStyleSheet( nPara );
+    SfxStyleSheet* pStyle = GetStyleSheet( nPara );
 
     if ( pStyle )
     {
@@ -743,7 +722,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet*
     }
 }
 
-void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction )
+void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo )
 {
 
     DBG_ASSERT( ( nDepth >= nMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" );
@@ -762,8 +741,6 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd
         pEditEngine->SetUpdateMode( false );
 
         bool bUndo = bCreateUndo && IsUndoEnabled();
-        if ( bUndo && bUndoAction )
-            UndoActionStart( OLUNDO_DEPTH );
 
         SfxItemSet aAttrs( pEditEngine->GetParaAttribs( nPara ) );
         aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) );
@@ -774,8 +751,6 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd
         if ( bUndo )
         {
             InsertUndo( new OutlinerUndoChangeDepth( this, nPara, nOldDepth, nDepth ) );
-            if ( bUndoAction )
-                UndoActionEnd( OLUNDO_DEPTH );
         }
 
         pEditEngine->SetUpdateMode( bUpdate );