loplugin:checkunusedparams in editeng

Change-Id: I2b770d40ac2339cd2b04a765a6d970675d2ea1c1
Reviewed-on: https://gerrit.libreoffice.org/37133
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

25 files changed, 115 insertions, 126 deletions

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 670253270f11..99d605788a80 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1250,7 +1250,7 @@ namespace accessibility
         }
         if( bSupplementalMode )
         {
-            _correctValues( nIndex, aRes );
+            _correctValues( aRes );
             // NumberingPrefix
             nRes = aRes.getLength();
             aRes.realloc( nRes + 1 );
@@ -1467,8 +1467,7 @@ namespace accessibility
         return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
     }
 
-    void AccessibleEditableTextPara::_correctValues( const sal_Int32 /* nIndex */,
-                                           uno::Sequence< PropertyValue >& rValues)
+    void AccessibleEditableTextPara::_correctValues( uno::Sequence< PropertyValue >& rValues)
     {
         SvxTextForwarder& rCacheTF = GetTextForwarder();
         sal_Int32 nRes = rValues.getLength();
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 1ba99bf61fd5..01c6cab35811 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -605,17 +605,15 @@ void ParaPortion::MarkInvalid( sal_Int32 nStart, sal_Int32 nDiff )
     aWritingDirectionInfos.clear();
 }
 
-void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 /* nEnd */ )
+void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart )
 {
     if ( !bInvalid )
     {
         nInvalidPosStart = nStart;
-//      nInvalidPosEnd = nEnd;
     }
     else
     {
         nInvalidPosStart = std::min( nInvalidPosStart, nStart );
-//      nInvalidPosEnd = pNode->Len();
     }
     nInvalidDiff = 0;
     bInvalid = true;
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index d1c921d74d49..0984a6ffe9fa 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -620,7 +620,7 @@ public:
     void                SetBulletX( sal_Int32 n )   { nBulletX = n; }
 
     void                MarkInvalid( sal_Int32 nStart, sal_Int32 nDiff);
-    void                MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 nEnd );
+    void                MarkSelectionInvalid( sal_Int32 nStart );
 
     void                SetVisible( bool bVisible );
     bool                IsVisible() const { return bVisible; }
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 94074d786d18..556cbaa8eace 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -139,11 +139,11 @@ void EditEngine::UndoActionStart(sal_uInt16 nId, const ESelection& rSel)
     pImpEditEngine->UndoActionStart(nId, rSel);
 }
 
-void EditEngine::UndoActionEnd( sal_uInt16 nId )
+void EditEngine::UndoActionEnd()
 {
     DBG_ASSERT( !pImpEditEngine->IsInUndo(), "Calling UndoActionEnd in Undomode!" );
     if ( !pImpEditEngine->IsInUndo() )
-        pImpEditEngine->UndoActionEnd( nId );
+        pImpEditEngine->UndoActionEnd();
 }
 
 bool EditEngine::HasTriedMergeOnLastAddUndo() const
@@ -1084,7 +1084,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
             {
                 if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
                 {
-                    if ( pImpEditEngine->DoVisualCursorTraveling( aCurSel.Max().GetNode() ) && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
+                    if ( pImpEditEngine->DoVisualCursorTraveling() && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
                         bSetCursorFlags = false;    // Will be manipulated within visual cursor move
 
                     aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView );
@@ -1176,7 +1176,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
                     pEditView->pImpEditView->DrawSelection();
                     pImpEditEngine->UndoActionStart( EDITUNDO_DELETE );
                     aCurSel = pImpEditEngine->DeleteLeftOrRight( aCurSel, nDel, nMode );
-                    pImpEditEngine->UndoActionEnd( EDITUNDO_DELETE );
+                    pImpEditEngine->UndoActionEnd();
                     bModified = true;
                     bAllowIdle = false;
                 }
@@ -1201,7 +1201,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
                             aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
                         aCurSel = pImpEditEngine->InsertTab( aCurSel );
                         if ( bSel )
-                            pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+                            pImpEditEngine->UndoActionEnd();
                         bModified = true;
                     }
                 }
@@ -1239,7 +1239,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
                                 pImpEditEngine->SetAutoCompleteText( OUString(), true );
                             }
                         }
-                        pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+                        pImpEditEngine->UndoActionEnd();
                         bModified = true;
                     }
                 }
@@ -1682,7 +1682,7 @@ void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj
     pImpEditEngine->RemoveCharAttribs( nPara );
     pImpEditEngine->InsertText( rTxtObj, EditSelection( aPaM, aPaM ) );
 
-    pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+    pImpEditEngine->UndoActionEnd();
 
     pImpEditEngine->FormatAndUpdate();
 }
@@ -1700,7 +1700,7 @@ void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt)
     // When InsertParagraph from the outside, no hard attributes
     // should be taken over!
     pImpEditEngine->RemoveCharAttribs( nPara );
-    pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+    pImpEditEngine->UndoActionEnd();
     pImpEditEngine->ImpInsertText( EditSelection( aPaM, aPaM ), rTxt );
     pImpEditEngine->FormatAndUpdate();
 }
@@ -1712,7 +1712,7 @@ void EditEngine::SetText(sal_Int32 nPara, const OUString& rTxt)
     {
         pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
         pImpEditEngine->ImpInsertText( *pSel, rTxt );
-        pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+        pImpEditEngine->UndoActionEnd();
         pImpEditEngine->FormatAndUpdate();
         delete pSel;
     }
@@ -1762,7 +1762,7 @@ void EditEngine::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAt
     pImpEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
     EditSelection aSel( pImpEditEngine->ConvertSelection( rSelection.nStartPara, rSelection.nStartPos, rSelection.nEndPara, rSelection.nEndPos ) );
     pImpEditEngine->RemoveCharAttribs( aSel, bRemoveParaAttribs, nWhich  );
-    pImpEditEngine->UndoActionEnd( EDITUNDO_RESETATTRIBS );
+    pImpEditEngine->UndoActionEnd();
     pImpEditEngine->FormatAndUpdate();
 }
 
@@ -2047,7 +2047,7 @@ void EditEngine::QuickMarkInvalid( const ESelection& rSel )
     {
         ParaPortion* pPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nPara );
         if ( pPortion )
-            pPortion->MarkSelectionInvalid( 0, pPortion->GetNode()->Len() );
+            pPortion->MarkSelectionInvalid( 0 );
     }
 }
 
@@ -2210,9 +2210,9 @@ void EditEngine::ClearSpellErrors()
     pImpEditEngine->ClearSpellErrors();
 }
 
-bool EditEngine::SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking )
+bool EditEngine::SpellSentence(EditView& rView, svx::SpellPortions& rToFill )
 {
-    return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking );
+    return pImpEditEngine->SpellSentence( rView, rToFill );
 }
 
 void EditEngine::PutSpellingToSentenceStart( EditView& rEditView )
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 5df5f9c6c185..271a29cd62f4 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -558,7 +558,7 @@ void EditUndoSetAttribs::Undo()
     }
     if ( bFields )
         pEE->UpdateFieldsOnly();
-    ImpSetSelection(pEE->GetActiveView());
+    ImpSetSelection();
 }
 
 void EditUndoSetAttribs::Redo()
@@ -572,7 +572,7 @@ void EditUndoSetAttribs::Redo()
     else
         pEE->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
 
-    ImpSetSelection( GetEditEngine()->GetActiveView() );
+    ImpSetSelection();
 }
 
 void EditUndoSetAttribs::AppendContentInfo(ContentAttribsInfo* pNew)
@@ -580,7 +580,7 @@ void EditUndoSetAttribs::AppendContentInfo(ContentAttribsInfo* pNew)
     aPrevAttribs.push_back(std::unique_ptr<ContentAttribsInfo>(pNew));
 }
 
-void EditUndoSetAttribs::ImpSetSelection( EditView* /*pView*/ )
+void EditUndoSetAttribs::ImpSetSelection()
 {
     EditEngine* pEE = GetEditEngine();
     EditSelection aSel = pEE->CreateSelection(aESel);
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 30566f68d84f..c239c5a5cefb 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -223,7 +223,7 @@ private:
     bool                bRemoveParaAttribs;
     sal_uInt16          nRemoveWhich;
 
-    void                ImpSetSelection( EditView* pView );
+    void                ImpSetSelection();
 
 
 public:
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 5ce07a2f7680..c89573dc6e80 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -393,7 +393,7 @@ void EditView::InsertText( const OUString& rStr, bool bSelect )
 
     pEE->UndoActionStart( EDITUNDO_INSERT );
     EditPaM aPaM2( pEE->InsertText( pImpEditView->GetEditSelection(), rStr ) );
-    pEE->UndoActionEnd( EDITUNDO_INSERT );
+    pEE->UndoActionEnd();
 
     if ( bSelect )
     {
@@ -501,7 +501,7 @@ void EditView::RemoveAttribsKeepLanguages( bool bRemoveParaAttribs )
             pImpEditView->pEditEngine->RemoveCharAttribs( aSelection, bRemoveParaAttribs, nWID );
     }
 
-    pImpEditView->pEditEngine->UndoActionEnd( EDITUNDO_RESETATTRIBS );
+    pImpEditView->pEditEngine->UndoActionEnd();
     pImpEditView->pEditEngine->FormatAndUpdate( this );
 }
 
@@ -511,7 +511,7 @@ void EditView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich )
     pImpEditView->DrawSelection();
     pImpEditView->pEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
     pImpEditView->pEditEngine->RemoveCharAttribs( pImpEditView->GetEditSelection(), bRemoveParaAttribs, nWhich  );
-    pImpEditView->pEditEngine->UndoActionEnd( EDITUNDO_RESETATTRIBS );
+    pImpEditView->pEditEngine->UndoActionEnd();
     pImpEditView->pEditEngine->FormatAndUpdate( this );
 }
 
@@ -519,7 +519,7 @@ void EditView::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
 {
     pImpEditView->pEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
     pImpEditView->pEditEngine->RemoveCharAttribs( nPara, nWhich );
-    pImpEditView->pEditEngine->UndoActionEnd( EDITUNDO_RESETATTRIBS );
+    pImpEditView->pEditEngine->UndoActionEnd();
     pImpEditView->pEditEngine->FormatAndUpdate( this );
 }
 
@@ -545,7 +545,7 @@ sal_uInt32 EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFor
     pImpEditView->DrawSelection();
     pImpEditView->pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_READ );
     EditPaM aEndPaM = pImpEditView->pEditEngine->pImpEditEngine->Read( rInput, rBaseURL, eFormat, aOldSel, pHTTPHeaderAttrs );
-    pImpEditView->pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_READ );
+    pImpEditView->pEditEngine->pImpEditEngine->UndoActionEnd();
     EditSelection aNewSel( aEndPaM, aEndPaM );
 
     pImpEditView->SetEditSelection( aNewSel );
@@ -606,7 +606,7 @@ void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos )
 {
     pImpEditView->pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_MOVEPARAS );
     pImpEditView->pEditEngine->pImpEditEngine->MoveParagraphs( aParagraphs, nNewPos, this );
-    pImpEditView->pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_MOVEPARAS );
+    pImpEditView->pEditEngine->pImpEditEngine->UndoActionEnd();
 }
 
 void EditView::MoveParagraphs( long nDiff )
@@ -662,7 +662,7 @@ void EditView::InsertText( const EditTextObject& rTextObject )
 
     pImpEditView->pEditEngine->UndoActionStart( EDITUNDO_INSERT );
     EditSelection aTextSel( pImpEditView->pEditEngine->InsertText( rTextObject, pImpEditView->GetEditSelection() ) );
-    pImpEditView->pEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+    pImpEditView->pEditEngine->UndoActionEnd();
 
     aTextSel.Min() = aTextSel.Max();    // Selection not retained.
     pImpEditView->SetEditSelection( aTextSel );
@@ -675,7 +675,7 @@ void EditView::InsertText( css::uno::Reference< css::datatransfer::XTransferable
     pImpEditView->DeleteSelected();
     EditSelection aTextSel =
         pImpEditView->pEditEngine->InsertText(xDataObj, rBaseURL, pImpEditView->GetEditSelection().Max(), bUseSpecial);
-    pImpEditView->pEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+    pImpEditView->pEditEngine->UndoActionEnd();
 
     aTextSel.Min() = aTextSel.Max();    // Selection not retained.
     pImpEditView->SetEditSelection( aTextSel );
@@ -1125,7 +1125,7 @@ void EditView::InsertField( const SvxFieldItem& rFld )
     pImpEditView->DrawSelection();
     pEE->UndoActionStart( EDITUNDO_INSERT );
     EditPaM aPaM( pEE->InsertField( pImpEditView->GetEditSelection(), rFld ) );
-    pEE->UndoActionEnd( EDITUNDO_INSERT );
+    pEE->UndoActionEnd();
     pImpEditView->SetEditSelection( EditSelection( aPaM, aPaM ) );
     pEE->UpdateFields();
     pEE->FormatAndUpdate( this );
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index cc4095f981e1..aae0719e73d7 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -546,7 +546,7 @@ EdtAutoCorrDoc::EdtAutoCorrDoc(
 EdtAutoCorrDoc::~EdtAutoCorrDoc()
 {
     if ( bUndoAction )
-        mpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+        mpEditEngine->UndoActionEnd();
 }
 
 bool EdtAutoCorrDoc::Delete(sal_Int32 nStt, sal_Int32 nEnd)
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 46ead623654c..8831e472569e 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -229,13 +229,13 @@ void EditHTMLParser::NextToken( int nToken )
 
     case HTML_PARABREAK_ON:
         if( bInPara && HasTextInCurrentPara() )
-            EndPara( true );
+            EndPara();
         StartPara( true );
         break;
 
     case HTML_PARABREAK_OFF:
         if( bInPara )
-            EndPara( true );
+            EndPara();
         break;
 
     case HTML_HEAD1_ON:
@@ -256,7 +256,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_HEAD5_OFF:
     case HTML_HEAD6_OFF:
     {
-        HeadingEnd( nToken );
+        HeadingEnd();
     }
     break;
 
@@ -322,7 +322,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_DD_OFF:
     case HTML_DT_OFF:
     case HTML_ORDERLIST_OFF:
-    case HTML_UNORDERLIST_OFF:  EndPara( false );
+    case HTML_UNORDERLIST_OFF:  EndPara();
                                 break;
 
     case HTML_TABLEROW_ON:
@@ -721,7 +721,7 @@ void EditHTMLParser::StartPara( bool bReal )
     bInPara = true;
 }
 
-void EditHTMLParser::EndPara( bool )
+void EditHTMLParser::EndPara()
 {
     if ( bInPara )
     {
@@ -807,9 +807,9 @@ void EditHTMLParser::HeadingStart( int nToken )
     ImpSetStyleSheet( nId );
 }
 
-void EditHTMLParser::HeadingEnd( int )
+void EditHTMLParser::HeadingEnd()
 {
-    EndPara( false );
+    EndPara();
     ImpSetStyleSheet( 0 );
 
     if ( bWasInPara )
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 69a69e74aeea..8b611b019857 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -53,11 +53,11 @@ private:
     sal_uInt8               nDefListLevel;
 
     void                    StartPara( bool bReal );
-    void                    EndPara( bool bReal );
+    void                    EndPara();
     void                    AnchorStart();
     void                    AnchorEnd();
     void                    HeadingStart( int nToken );
-    void                    HeadingEnd( int nToken );
+    void                    HeadingEnd();
     void                    SkipGroup( int nEndToken );
     bool                    ThrowAwayBlank();
     bool                    HasTextInCurrentPara();
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0ab43a383e22..382daf5c1a22 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1254,7 +1254,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWi
                     pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE );
                     Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                     Paste( aClipBoard, pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
-                    pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE );
+                    pEditEngine->pImpEditEngine->UndoActionEnd();
                     bDone = true;
                 }
             }
@@ -1396,7 +1396,7 @@ void ImpEditView::DeleteSelected()
 
     EditPaM aPaM = pEditEngine->pImpEditEngine->DeleteSelected( GetEditSelection() );
 
-    pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_DELETE );
+    pEditEngine->pImpEditEngine->UndoActionEnd();
 
     SetEditSelection( EditSelection( aPaM, aPaM ) );
     pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
@@ -1499,7 +1499,7 @@ void ImpEditView::CutCopy( css::uno::Reference< css::datatransfer::clipboard::XC
             pEditEngine->pImpEditEngine->EnterBlockNotifications();
             pEditEngine->pImpEditEngine->UndoActionStart(EDITUNDO_CUT);
             DeleteSelected();
-            pEditEngine->pImpEditEngine->UndoActionEnd(EDITUNDO_CUT);
+            pEditEngine->pImpEditEngine->UndoActionEnd();
             pEditEngine->pImpEditEngine->LeaveBlockNotifications();
         }
     }
@@ -1573,7 +1573,7 @@ void ImpEditView::Paste( css::uno::Reference< css::datatransfer::clipboard::XCli
     aPasteOrDropInfos.nEndPara = pEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
     pEditEngine->HandleEndPasteOrDrop(aPasteOrDropInfos);
 
-    pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE );
+    pEditEngine->pImpEditEngine->UndoActionEnd();
     SetEditSelection( aSel );
     pEditEngine->pImpEditEngine->UpdateSelections();
     pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
@@ -1924,7 +1924,7 @@ void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent
         }
 
         if ( pDragAndDropInfo->bUndoAction )
-            pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_DRAGANDDROP );
+            pEditEngine->pImpEditEngine->UndoActionEnd();
 
         HideDDCursor();
         ShowCursor( DoAutoScroll(), true );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 651441ab8fab..c755ebb348b4 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -556,7 +556,7 @@ private:
     void                Clear();
     EditPaM             RemoveText();
     bool                CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY );
-    void                CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY );
+    void                CreateAndInsertEmptyLine( ParaPortion* pParaPortion );
     bool                FinishCreateLines( ParaPortion* pParaPortion );
     void                CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rStartPos /*, sal_Bool bCreateBlockPortions */ );
     void                RecalcTextPortion( ParaPortion* pParaPortion, sal_Int32 nStartPos, sal_Int32 nNewChars );
@@ -868,7 +868,7 @@ public:
 
     svtools::ColorConfig& GetColorConfig();
     bool            IsVisualCursorTravelingEnabled();
-    bool            DoVisualCursorTraveling( const ContentNode* pNode );
+    bool            DoVisualCursorTraveling();
 
     EditSelection         ConvertSelection( sal_Int32 nStartPara, sal_Int32 nStartPos, sal_Int32 nEndPara, sal_Int32 nEndPos );
     inline EPaM           CreateEPaM( const EditPaM& rPaM );
@@ -903,7 +903,7 @@ public:
 
     void                UndoActionStart( sal_uInt16 nId );
     void                UndoActionStart( sal_uInt16 nId, const ESelection& rSel );
-    void                UndoActionEnd( sal_uInt16 nId );
+    void                UndoActionEnd();
 
     EditView*           GetActiveView() const   { return pActiveView; }
     void                SetActiveView( EditView* pView );
@@ -953,7 +953,7 @@ public:
     css::uno::Reference< css::linguistic2::XSpellAlternatives >
                         ImpFindNextError(EditSelection& rSelection);
     //spell and return a sentence
-    bool                SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking );
+    bool                SpellSentence(EditView& rView, svx::SpellPortions& rToFill );
     //put spelling back to start of current sentence - needed after switch of grammar support
     void                PutSpellingToSentenceStart( EditView& rEditView );
     //applies a changed sentence
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 0d53cbf3e3a8..6a2a6f950bb6 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -393,7 +393,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             }
 
             ParaPortion* pPortion = FindParaPortion( mpIMEInfos->aPos.GetNode() );
-            pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex(), 0 );
+            pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex() );
 
             bool bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
 
@@ -404,7 +404,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
 
             pView->SetInsertMode( !bWasCursorOverwrite );
         }
-        UndoActionEnd( EDITUNDO_INSERT );
+        UndoActionEnd();
     }
     else if ( rCEvt.GetCommand() == CommandEventId::ExtTextInput )
     {
@@ -461,7 +461,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
                 }
 
                 ParaPortion* pPortion = FindParaPortion( mpIMEInfos->aPos.GetNode() );
-                pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex(), 0 );
+                pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex() );
                 FormatAndUpdate( pView );
             }
 
@@ -737,7 +737,7 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode )
 
     ParaPortion* pPortion = FindParaPortion( pNode );
     OSL_ENSURE( pPortion, "ParaAttribsChanged: Portion?" );
-    pPortion->MarkSelectionInvalid( 0, pNode->Len() );
+    pPortion->MarkSelectionInvalid( 0 );
 
     sal_Int32 nPara = aEditDoc.GetPos( pNode );
     pEditEngine->ParaAttribsChanged( nPara );
@@ -774,7 +774,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
     bool bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1();
     sal_uInt16 nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
 
-    if ( DoVisualCursorTraveling( aPaM.GetNode() ) )
+    if ( DoVisualCursorTraveling() )
     {
         // Only for simple cursor movement...
         if ( !bCtrl && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) )
@@ -2287,7 +2287,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
     EditPaM aPaM = aEditDoc.ConnectParagraphs( pLeft, pRight );
     GetParaPortions().Remove( nParagraphTobeDeleted );
 
-    pLeftPortion->MarkSelectionInvalid( aPaM.GetIndex(), pLeft->Len() );
+    pLeftPortion->MarkSelectionInvalid( aPaM.GetIndex() );
 
     // the right node is deleted by EditDoc:ConnectParagraphs().
     if ( GetTextRanger() )
@@ -2298,7 +2298,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
         for ( sal_Int32 n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
         {
             ParaPortion* pPP = GetParaPortions()[n];
-            pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
+            pPP->MarkSelectionInvalid( 0 );
             pPP->GetLines().Reset();
         }
     }
@@ -2443,7 +2443,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel)
         ImpRemoveChars( aStartPaM, aStartPaM.GetNode()->Len() - aStartPaM.GetIndex() );
         ParaPortion* pPortion = FindParaPortion( aStartPaM.GetNode() );
         OSL_ENSURE( pPortion, "Blind Portion in ImpDeleteSelection(3)" );
-        pPortion->MarkSelectionInvalid( aStartPaM.GetIndex(), aStartPaM.GetNode()->Len() );
+        pPortion->MarkSelectionInvalid( aStartPaM.GetIndex() );
 
         // The beginning of the EndNodes....
         const sal_Int32 nChars = aEndPaM.GetIndex();
@@ -2451,7 +2451,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel)
         ImpRemoveChars( aEndPaM, nChars );
         pPortion = FindParaPortion( aEndPaM.GetNode() );
         OSL_ENSURE( pPortion, "Blind Portion in ImpDeleteSelection(4)" );
-        pPortion->MarkSelectionInvalid( 0, aEndPaM.GetNode()->Len() );
+        pPortion->MarkSelectionInvalid( 0 );
         // Join together....
         aStartPaM = ImpConnectParagraphs( aStartPaM.GetNode(), aEndPaM.GetNode() );
     }
@@ -2674,7 +2674,7 @@ EditPaM ImpEditEngine::InsertTextUserInput( const EditSelection& rCurSel,
     TextModified();
 
     if ( bUndoAction )
-        UndoActionEnd( EDITUNDO_INSERT );
+        UndoActionEnd();
 
     return aPaM;
 }
@@ -2768,7 +2768,7 @@ EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const OUStrin
         nStart = nEnd+1;
     }
 
-    UndoActionEnd( EDITUNDO_INSERT );
+    UndoActionEnd();
 
     TextModified();
     return aPaM;
@@ -2997,7 +2997,7 @@ bool ImpEditEngine::UpdateFields()
             // If possible be more precise when invalidate.
             ParaPortion* pPortion = GetParaPortions()[nPara];
             OSL_ENSURE( pPortion, "NULL-Pointer in Doc" );
-            pPortion->MarkSelectionInvalid( 0, pNode->Len() );
+            pPortion->MarkSelectionInvalid( 0 );
         }
     }
     return bChanges;
@@ -4317,7 +4317,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, bool bRight )
             }
         }
 
-        UndoActionEnd( bRight ? EDITUNDO_INDENTBLOCK : EDITUNDO_UNINDENTBLOCK );
+        UndoActionEnd();
         UpdateSelections();
         FormatAndUpdate( pEditView );
 
@@ -4367,7 +4367,7 @@ bool ImpEditEngine::IsVisualCursorTravelingEnabled()
 
 }
 
-bool ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
+bool ImpEditEngine::DoVisualCursorTraveling()
 {
     // Don't check if it's necessary, because we also need it when leaving the paragraph
     return IsVisualCursorTravelingEnabled();
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index b9808e3c4a5f..85360b100f1a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -347,7 +347,7 @@ bool ImpEditEngine::IsPageOverflow( ) const
 void ImpEditEngine::FormatFullDoc()
 {
     for ( sal_Int32 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
-        GetParaPortions()[nPortion]->MarkSelectionInvalid( 0, GetParaPortions()[nPortion]->GetNode()->Len() );
+        GetParaPortions()[nPortion]->MarkSelectionInvalid( 0 );
     FormatDoc();
 }
 
@@ -388,7 +388,7 @@ void ImpEditEngine::FormatDoc()
                     for ( sal_Int32 n = nPara+1; n < GetParaPortions().Count(); n++ )
                     {
                         ParaPortion* pPP = GetParaPortions()[n];
-                        pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
+                        pPP->MarkSelectionInvalid( 0 );
                         pPP->GetLines().Reset();
                     }
                 }
@@ -523,11 +523,10 @@ void ImpEditEngine::CheckAutoPageSize()
                 // Only paragraphs which are not aligned to the left need to be
                 // reformatted, the height can not be changed here anymore.
                 ParaPortion* pParaPortion = GetParaPortions()[nPara];
-                ContentNode* pNode = pParaPortion->GetNode();
                 SvxAdjust eJustification = GetJustification( nPara );
                 if ( eJustification != SvxAdjust::Left )
                 {
-                    pParaPortion->MarkSelectionInvalid( 0, pNode->Len() );
+                    pParaPortion->MarkSelectionInvalid( 0 );
                     CreateLines( nPara, 0 );  // 0: For AutoPageSize no TextRange!
                 }
             }
@@ -613,7 +612,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
             pParaPortion->GetTextPortions().Reset();
         if ( pParaPortion->GetLines().Count() )
             pParaPortion->GetLines().Reset();
-        CreateAndInsertEmptyLine( pParaPortion, nStartPosY );
+        CreateAndInsertEmptyLine( pParaPortion );
         return FinishCreateLines( pParaPortion );
     }
 
@@ -1615,7 +1614,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
     DBG_ASSERT( pParaPortion->GetLines().Count(), "No line after CreateLines!" );
 
     if ( bLineBreak )
-        CreateAndInsertEmptyLine( pParaPortion, nStartPosY );
+        CreateAndInsertEmptyLine( pParaPortion );
 
     pBuf.reset();
 
@@ -1629,7 +1628,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
     return bHeightChanged;
 }
 
-void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 )
+void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion )
 {
     DBG_ASSERT( !GetTextRanger(), "Don't use CreateAndInsertEmptyLine with a polygon!" );
 
@@ -2569,7 +2568,7 @@ void ImpEditEngine::SetTextRanger( TextRanger* pRanger )
         for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
         {
             ParaPortion* pParaPortion = GetParaPortions()[nPara];
-            pParaPortion->MarkSelectionInvalid( 0, pParaPortion->GetNode()->Len() );
+            pParaPortion->MarkSelectionInvalid( 0 );
             pParaPortion->GetLines().Reset();
         }
 
@@ -4014,7 +4013,7 @@ void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara )
     else
     {
         pTmpPortion = GetParaPortions()[0];
-        pTmpPortion->MarkSelectionInvalid( 0, pTmpPortion->GetNode()->Len() );
+        pTmpPortion->MarkSelectionInvalid( 0 );
     }
     pTmpPortion->ResetHeight();
 }
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 217b190e2786..4f1114c756cc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1295,7 +1295,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject
                 UpdateFields();
 
             // Otherwise, quick format => no attributes!
-            pPortion->MarkSelectionInvalid( nStartPos, pC->GetText().getLength() );
+            pPortion->MarkSelectionInvalid( nStartPos );
         }
 
 #if OSL_DEBUG_LEVEL > 0
@@ -1952,8 +1952,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r
 }
 
 bool ImpEditEngine::SpellSentence(EditView& rEditView,
-    svx::SpellPortions& rToFill,
-    bool /*bIsGrammarChecking*/ )
+    svx::SpellPortions& rToFill )
 {
     bool bRet = false;
     EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
@@ -2210,7 +2209,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
                 ++aCurrentNewPortion;
             }
         }
-        UndoActionEnd( EDITUNDO_INSERT );
+        UndoActionEnd();
 
         EditPaM aNext;
         if (bRecheck)
@@ -2555,7 +2554,7 @@ sal_Int32 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxSe
                 aNewPaM.SetIndex( aNewPaM.GetNode()->Len() );
             pEditView->pImpEditView->SetEditSelection( aNewPaM );
             FormatAndUpdate( pEditView );
-            UndoActionEnd( EDITUNDO_REPLACEALL );
+            UndoActionEnd();
         }
         else
         {
@@ -2991,9 +2990,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
                 sal_Int32 nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
                 ParaPortion* pParaPortion = GetParaPortions()[nSelNode];
-                pParaPortion->MarkSelectionInvalid( rData.nStart,
-                        std::max< sal_Int32 >( rData.nStart + rData.nLen,
-                                            rData.nStart + rData.aNewText.getLength() ) );
+                pParaPortion->MarkSelectionInvalid( rData.nStart );
             }
         }
     }
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 2dbebccfe6c5..057f72423da5 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -256,7 +256,7 @@ void ImpEditEngine::UndoActionStart( sal_uInt16 nId )
     }
 }
 
-void ImpEditEngine::UndoActionEnd( sal_uInt16 )
+void ImpEditEngine::UndoActionEnd()
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -579,7 +579,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, SetA
             bFormatted = false;
             if ( !pNode->Len() || ( nStartPos != nEndPos  ) )
             {
-                pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
+                pPortion->MarkSelectionInvalid( nStartPos );
                 if ( bCheckLanguage )
                     pNode->GetWrongList()->SetInvalidRange(nStartPos, nEndPos);
             }
@@ -644,7 +644,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, bool bRemoveParaAttri
         if ( bChanged && !bRemoveParaAttribs )
         {
             bFormatted = false;
-            pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
+            pPortion->MarkSelectionInvalid( nStartPos );
         }
     }
 }
@@ -679,7 +679,7 @@ void ImpEditEngine::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich, bool
     CharAttribList::DbgCheckAttribs(pNode->GetCharAttribs());
 #endif
 
-    pPortion->MarkSelectionInvalid( 0, pNode->Len() );
+    pPortion->MarkSelectionInvalid( 0 );
 }
 
 void ImpEditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 7a8d6dbc752d..7d12af156cc1 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -393,7 +393,7 @@ void TextConvWrapper::ReplaceUnit(
         }
     }
 
-    pImpEditEng->UndoActionEnd( EDITUNDO_INSERT );
+    pImpEditEng->UndoActionEnd();
 
     // adjust ConvContinue / ConvTo if necessary
     ImpEditEngine* pImpEE = m_pEditView->GetImpEditEngine();
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index d9f52b236e90..c5b47020a4fe 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -43,14 +43,13 @@ SvXMLImportContext *SvXMLAutoCorrectImport::CreateFastContext( sal_Int32 Element
         const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if( Element == SvXMLAutoCorrectToken::BLOCKLIST )
-        return new SvXMLWordListContext( *this, Element, xAttrList );
+        return new SvXMLWordListContext( *this, xAttrList );
     else
         return SvXMLImport::CreateFastContext( Element, xAttrList );
 }
 
 SvXMLWordListContext::SvXMLWordListContext(
    SvXMLAutoCorrectImport& rImport,
-   sal_Int32 /*Element*/,
    const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
@@ -62,7 +61,7 @@ css::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFa
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if ( Element == SvXMLAutoCorrectToken::BLOCK )
-        return new SvXMLWordContext (rLocalRef, Element, xAttrList);
+        return new SvXMLWordContext (rLocalRef, xAttrList);
     else
         return new SvXMLImportContext( rLocalRef );
 }
@@ -73,7 +72,6 @@ SvXMLWordListContext::~SvXMLWordListContext()
 
 SvXMLWordContext::SvXMLWordContext(
    SvXMLAutoCorrectImport& rImport,
-   sal_Int32 /*Element*/,
    const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
@@ -122,14 +120,13 @@ SvXMLImportContext *SvXMLExceptionListImport::CreateFastContext(sal_Int32 Elemen
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if( Element == SvXMLAutoCorrectToken::BLOCKLIST )
-        return new SvXMLExceptionListContext( *this, Element, xAttrList );
+        return new SvXMLExceptionListContext( *this, xAttrList );
     else
         return SvXMLImport::CreateFastContext( Element, xAttrList );
 }
 
 SvXMLExceptionListContext::SvXMLExceptionListContext(
    SvXMLExceptionListImport& rImport,
-   sal_Int32 /*Element*/,
    const css::uno::Reference< css::xml::sax::XFastAttributeList > & /* xAttrList */ ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
@@ -140,7 +137,7 @@ css::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListCo
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if ( Element == SvXMLAutoCorrectToken::BLOCK )
-        return new SvXMLExceptionContext (rLocalRef, Element, xAttrList);
+        return new SvXMLExceptionContext (rLocalRef, xAttrList);
     else
         return new SvXMLImportContext( rLocalRef );
 }
@@ -151,7 +148,6 @@ SvXMLExceptionListContext::~SvXMLExceptionListContext()
 
 SvXMLExceptionContext::SvXMLExceptionContext(
    SvXMLExceptionListImport& rImport,
-   sal_Int32 /*Element*/,
    const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
    SvXMLImportContext ( rImport ),
    rLocalRef(rImport)
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 043fe7c048f9..4fe97f37de47 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -52,7 +52,7 @@ class SvXMLWordListContext : public SvXMLImportContext
 private:
     SvXMLAutoCorrectImport & rLocalRef;
 public:
-    SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element,
+    SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
@@ -66,7 +66,7 @@ class SvXMLWordContext : public SvXMLImportContext
 private:
     SvXMLAutoCorrectImport & rLocalRef;
 public:
-    SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element,
+    SvXMLWordContext ( SvXMLAutoCorrectImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual ~SvXMLWordContext() override;
@@ -96,7 +96,7 @@ class SvXMLExceptionListContext : public SvXMLImportContext
 private:
     SvXMLExceptionListImport & rLocalRef;
 public:
-    SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element,
+    SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
@@ -110,7 +110,7 @@ class SvXMLExceptionContext : public SvXMLImportContext
 private:
     SvXMLExceptionListImport & rLocalRef;
 public:
-    SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element,
+    SvXMLExceptionContext ( SvXMLExceptionListImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual ~SvXMLExceptionContext() override;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 720a23bda34a..ba9da47e63d6 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -629,7 +629,7 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
 
 bool SvxAutoCorrect::FnAddNonBrkSpace(
                                 SvxAutoCorrDoc& rDoc, const OUString& rTxt,
-                                sal_Int32, sal_Int32 nEndPos,
+                                sal_Int32 nEndPos,
                                 LanguageType eLang )
 {
     bool bRet = false;
@@ -727,7 +727,7 @@ bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
 
 
 bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
-                                        sal_Int32 , sal_Int32 nEndPos )
+                                        sal_Int32 nEndPos )
 {
     // Condition:
     //  at the beginning:   _, *, / or ~ after Space with the following !Space
@@ -1276,7 +1276,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
             if ( IsAutoCorrFlag( AddNonBrkSpace ) )
             {
                 if ( NeedsHardspaceAutocorr( cChar ) &&
-                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos ) ) )
+                    FnAddNonBrkSpace( rDoc, rTxt, nInsPos, rDoc.GetLanguage( nInsPos ) ) )
                 {
                     ;
                 }
@@ -1319,7 +1319,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
         {
             if( IsAutoCorrFlag( ChgWeightUnderl ) )
             {
-                FnChgWeightUnderl( rDoc, rTxt, 0, nPos+1 );
+                FnChgWeightUnderl( rDoc, rTxt, nPos+1 );
             }
             break;
         }
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 571196e24b74..f9333e0c6857 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -197,7 +197,7 @@ void OutlinerEditEng::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
         pOwner->ImplCheckParagraphs( nPara, pOwner->pParaList->GetParagraphCount() );
 
         if ( !IsInUndo() && IsUndoEnabled() )
-            pOwner->UndoActionEnd( OLUNDO_ATTR );
+            pOwner->UndoActionEnd();
     }
 }
 
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 45efe99362ed..5f8cadb512ed 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -303,9 +303,9 @@ void Outliner::UndoActionStart( sal_uInt16 nId )
     pEditEngine->UndoActionStart( nId );
 }
 
-void Outliner::UndoActionEnd( sal_uInt16 nId )
+void Outliner::UndoActionEnd()
 {
-    pEditEngine->UndoActionEnd( nId );
+    pEditEngine->UndoActionEnd();
 }
 
 void Outliner::InsertUndo( EditUndo* pUndo )
@@ -581,9 +581,9 @@ bool Outliner::IsForceAutoColor() const
     return pEditEngine->IsForceAutoColor();
 }
 
-bool Outliner::SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking )
+bool Outliner::SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill )
 {
-    return pEditEngine->SpellSentence(rEditView, rToFill, bIsGrammarChecking );
+    return pEditEngine->SpellSentence(rEditView, rToFill );
 }
 
 void Outliner::PutSpellingToSentenceStart( EditView& rEditView )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 6ffaf540edfe..0a63ff17fbb3 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -775,7 +775,7 @@ bool Outliner::Expand( Paragraph* pPara )
         if( bUndo )
         {
             InsertUndo( pUndo );
-            UndoActionEnd( OLUNDO_EXPAND );
+            UndoActionEnd();
         }
         return true;
     }
@@ -803,7 +803,7 @@ bool Outliner::Collapse( Paragraph* pPara )
         if( bUndo )
         {
             InsertUndo( pUndo );
-            UndoActionEnd( OLUNDO_COLLAPSE );
+            UndoActionEnd();
         }
         return true;
     }
@@ -1771,7 +1771,7 @@ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void )
     bPasting = false;
     ImpTextPasted( rInfos.nStartPara, rInfos.nEndPara - rInfos.nStartPara + 1 );
     maEndPasteOrDropHdl.Call( &rInfos );
-    UndoActionEnd( EDITUNDO_DRAGANDDROP );
+    UndoActionEnd();
 }
 
 IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void )
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index bbfee79f2e68..4f0775d72aca 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -210,7 +210,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin )
                                     pEditView->SetSelection( aTmpSel );
                                 }
                                 pEditView->ShowCursor();
-                                pOwner->UndoActionEnd( OLUNDO_INSERT );
+                                pOwner->UndoActionEnd();
                                 bKeyProcessed = true;
                             }
                         }
@@ -228,7 +228,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin )
                         ESelection aTmpSel(nTemp,0,nTemp,0);
                         pEditView->SetSelection( aTmpSel );
                         pEditView->ShowCursor();
-                        pOwner->UndoActionEnd( OLUNDO_INSERT );
+                        pOwner->UndoActionEnd();
                         bKeyProcessed = true;
                     }
                 }
@@ -410,7 +410,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
     }
 
     if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
-        pOwner->UndoActionEnd( OLUNDO_ATTR );
+        pOwner->UndoActionEnd();
 
     pEditView->SetEditEngineUpdateMode( bUpdate );
 }
@@ -565,7 +565,7 @@ void OutlinerView::Indent( short nDiff )
     }
 
     if( bUndo )
-        pOwner->UndoActionEnd( OLUNDO_DEPTH );
+        pOwner->UndoActionEnd();
 }
 
 void OutlinerView::AdjustHeight( long nDY )
@@ -624,7 +624,7 @@ void OutlinerView::ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara
     }
 
     if( bUndo )
-        pOwner->UndoActionEnd( bExpand ? OLUNDO_EXPAND : OLUNDO_COLLAPSE );
+        pOwner->UndoActionEnd();
 
     if ( bUpdate )
     {
@@ -657,7 +657,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
     ImpPasted( nStart, nParaCount, nSize);
     pEditView->SetEditEngineUpdateMode( true );
 
-    pOwner->UndoActionEnd( OLUNDO_INSERT );
+    pOwner->UndoActionEnd();
 
     pEditView->ShowCursor();
 }
@@ -696,7 +696,7 @@ void OutlinerView::PasteSpecial()
         }
 
         pEditView->SetEditEngineUpdateMode( true );
-        pOwner->UndoActionEnd( OLUNDO_INSERT );
+        pOwner->UndoActionEnd();
         pEditView->ShowCursor();
 
         // Chaining handling
@@ -894,7 +894,7 @@ void OutlinerView::ToggleBullets()
 
     pOwner->pEditEngine->SetUpdateMode( bUpdate );
 
-    pOwner->UndoActionEnd( OLUNDO_DEPTH );
+    pOwner->UndoActionEnd();
 }
 
 
@@ -966,7 +966,7 @@ void OutlinerView::EnableBullets()
 
     pOwner->pEditEngine->SetUpdateMode( bUpdate );
 
-    pOwner->UndoActionEnd( OLUNDO_DEPTH );
+    pOwner->UndoActionEnd();
 }
 
 
@@ -1098,7 +1098,7 @@ void OutlinerView::ApplyBulletsNumbering(
 
     pOwner->pEditEngine->SetUpdateMode( bUpdate );
 
-    pOwner->UndoActionEnd( OLUNDO_DEPTH );
+    pOwner->UndoActionEnd();
 
     return;
 }
@@ -1150,7 +1150,7 @@ void OutlinerView::SwitchOffBulletsNumbering(
     pOwner->pEditEngine->QuickMarkInvalid( ESelection( nStartPara, 0, nParaCount, 0 ) );
 
     pOwner->pEditEngine->SetUpdateMode( bUpdate );
-    pOwner->UndoActionEnd( OLUNDO_DEPTH );
+    pOwner->UndoActionEnd();
 }
 
 
@@ -1179,7 +1179,7 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, bool bKeepLanguages )
             pOwner->ImplInitDepth( nPara, pPara->GetDepth(), false );
         }
     }
-    pOwner->UndoActionEnd( OLUNDO_ATTR );
+    pOwner->UndoActionEnd();
     pOwner->SetUpdateMode( bUpdate );
 }
 
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index f2e5cbac548f..155d93412bac 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -483,7 +483,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
 
 void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet )
 {
-    if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() ))
+    if(!SetPropertyValueHelper( pMap, rValue, rNewSet, &rSelection, GetEditSource() ))
     {
         // For parts of composite items with multiple properties (eg background)
         // must be taken from the document before the old item.
@@ -492,7 +492,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM
     }
 }
 
-bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ )
+bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ )
 {
     switch( pMap->nWID )
     {