loplugin: defaultparams

Change-Id: I4c6b966a54e18cdbb0c64b6e93804a306b5d2638

31 files changed, 87 insertions, 88 deletions

diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index ed704662a03c..2ab8fdbd1faf 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -82,7 +82,7 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >&  rStg,
     {
         rDShell.GetEditShell()->_CopySelToDoc( pDoc );
         nRet = aBlk.PutDoc();
-        aBlk.AddName ( rShort, rShort, false );
+        aBlk.AddName ( rShort, rShort );
         if( !IsError( nRet ) )
             nRet = aBlk.GetText( rShort, rLong );
     }
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 9f2febddb611..c1d678eca5f6 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -243,7 +243,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort,
                                                     const OUString& rLong)
 {
     sal_uLong nError = 0;
-    OpenFile(true);
+    OpenFile();
     rDestImp.OpenFile(false);
     const OUString aGroup( rShort );
     bool bTextOnly = IsOnlyTextBlock ( rShort ) ;//pImp->pBlkRoot->IsStream( aGroup );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index f6fc59973d26..d264bbeff80c 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -171,7 +171,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
     if( !bFileAlreadyOpen )
     {
         CloseFile();
-        nRet = OpenFile ( true );
+        nRet = OpenFile();
     }
     if ( 0 == nRet )
     {
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 190887aa53d8..2b595c1f00a3 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -397,7 +397,7 @@ bool SwTextBlocks::BeginGetDoc( sal_uInt16 n )
     {
         if( pImp->IsFileChanged() )
             nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
-        else if( 0 == ( nErr = pImp->OpenFile( true )))
+        else if( 0 == ( nErr = pImp->OpenFile()))
         {
             pImp->ClearDoc();
             nErr = pImp->GetDoc( n );
@@ -546,7 +546,7 @@ bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
     {
         SwBlockName* pBlkNm = pImp->aNames[ nIdx ];
         if( !pBlkNm->bIsOnlyTextFlagInit &&
-            !pImp->IsFileChanged() && !pImp->OpenFile( true ) )
+            !pImp->IsFileChanged() && !pImp->OpenFile() )
         {
             pBlkNm->bIsOnlyText = pImp->IsOnlyTextBlock( pBlkNm->aShort );
             pBlkNm->bIsOnlyTextFlagInit = true;
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 152e35854801..4024b09c51b0 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -500,7 +500,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
                             if( nOutSpan < 0 )
                             {
                                 const SwTableBox& rBox =
-                                    pOuterBox->FindStartOfRowSpan( *this, USHRT_MAX );
+                                    pOuterBox->FindStartOfRowSpan( *this );
                                 nOutSpan = rBox.getRowSpan();
                                 const SwTableLine* pTmpL = rBox.GetUpper();
                                 nCheck = GetTabLines().GetPos( pTmpL );
@@ -1067,7 +1067,7 @@ SwTableBox& SwTableBox::FindEndOfRowSpan( const SwTable& rTable, sal_uInt16 nMax
 static void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBox& rBox )
 {
     SwTableBox* pBox = &rBox;
-    OSL_ENSURE( pBox == &rBox.FindStartOfRowSpan( rTable, USHRT_MAX ), "Not a master box" );
+    OSL_ENSURE( pBox == &rBox.FindStartOfRowSpan( rTable ), "Not a master box" );
     rBoxes.insert( pBox );
     if( pBox->getRowSpan() == 1 )
         return;
@@ -1634,7 +1634,7 @@ static void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nM
                 if( bColumn && nRowSpan != 1 && nOldCnt < rBoxes.size() )
                 {
                     SwTableBox *pMasterBox = pBox->getRowSpan() > 0 ? pBox
-                        : &pBox->FindStartOfRowSpan( rTable, USHRT_MAX );
+                        : &pBox->FindStartOfRowSpan( rTable );
                     lcl_getAllMergedBoxes( rTable, rBoxes, *pMasterBox );
                 }
             }
@@ -1901,7 +1901,7 @@ void SwTable::ExpandSelection( SwSelBoxes& rBoxes ) const
         if( nRowSpan != 1 )
         {
             SwTableBox *pMasterBox = nRowSpan > 0 ? pBox
-                    : &pBox->FindStartOfRowSpan( *this, USHRT_MAX );
+                    : &pBox->FindStartOfRowSpan( *this );
             lcl_getAllMergedBoxes( *this, rBoxes, *pMasterBox );
         }
     }
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 9000baa76c0a..9422b1c4dcc9 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -637,7 +637,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
                 ::lcl_ProcessLineGet( aLines[i], rToFill, pTabFormat );
         }
 
-        rToFill.Remove( 0, 1 );
+        rToFill.Remove( 0 );
     }
 
     // Now the coordinates are relative to the left table border - i.e.
@@ -1990,7 +1990,7 @@ void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p )
 void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
                     bool bChgAlign )
 {
-    sal_uLong nNdPos = rBox.IsValidNumTextNd( true );
+    sal_uLong nNdPos = rBox.IsValidNumTextNd();
     ChgTextToNum( rBox,rText,pCol,bChgAlign,nNdPos);
 }
 void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
@@ -2295,7 +2295,7 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
                             RES_BOXATR_VALUE, false, reinterpret_cast<const SfxPoolItem**>(&pNewVal) ))
                         {
                             // so far, no value has been set, so try to evaluate the content
-                            sal_uLong nNdPos = pBox->IsValidNumTextNd( true );
+                            sal_uLong nNdPos = pBox->IsValidNumTextNd();
                             if( ULONG_MAX != nNdPos )
                             {
                                 sal_uInt32 nTmpFormatIdx = nNewFormat;
@@ -2398,7 +2398,7 @@ bool SwTableBox::HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
                             bool& rIsEmptyTextNd ) const
 {
     bool bRet = false;
-    sal_uLong nNdPos = IsValidNumTextNd( true );
+    sal_uLong nNdPos = IsValidNumTextNd();
     if( ULONG_MAX != nNdPos )
     {
         OUString aText( pSttNd->GetNodes()[ nNdPos ]->GetTextNode()->GetRedlineText() );
@@ -2447,7 +2447,7 @@ bool SwTableBox::IsNumberChanged() const
             pNumFormat = 0;
 
         sal_uLong nNdPos;
-        if( pNumFormat && pValue && ULONG_MAX != ( nNdPos = IsValidNumTextNd( true ) ) )
+        if( pNumFormat && pValue && ULONG_MAX != ( nNdPos = IsValidNumTextNd() ) )
         {
             OUString sNewText, sOldText( pSttNd->GetNodes()[ nNdPos ]->
                                     GetTextNode()->GetRedlineText() );
@@ -2575,7 +2575,7 @@ void SwTableBox::ActualiseValueBox()
         SvNumberFormatter* pNumFormatr = pFormat->GetDoc()->GetNumberFormatter();
 
         if( !pNumFormatr->IsTextFormat( nFormatId ) &&
-            ULONG_MAX != (nNdPos = IsValidNumTextNd( true )) )
+            ULONG_MAX != (nNdPos = IsValidNumTextNd()) )
         {
             double fVal = static_cast<const SwTableBoxValue*>(pValItem)->GetValue();
             Color* pCol = 0;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 41afd1586320..4b0d0155912d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1647,8 +1647,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                     // than one link to this destination:
                     OUString aURL( INetURLObject::decode(
                         p->rINetAttr.GetINetFormat().GetValue(),
-                        INetURLObject::DECODE_UNAMBIGUOUS,
-                        RTL_TEXTENCODING_UTF8 ) );
+                        INetURLObject::DECODE_UNAMBIGUOUS ) );
 
                     // We have to distinguish between intern and real URLs
                     const bool bIntern = '#' == aURL[0];
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 6853c1afe1f6..a91ff2baa71a 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -364,7 +364,7 @@ void SwAttrHandler::Init( const SwAttrSet& rAttrSet,
     mpShell = pSh;
 
     for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++ )
-        pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true );
+        pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i );
 }
 
 void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS,
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index d5ee4eec2121..282c6db673a4 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -756,7 +756,7 @@ bool SwTextFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
     SwSetToRightMargin aSet;
 
     if( IsInTab() &&
-        pPam->GetNode( true ).StartOfSectionNode() !=
+        pPam->GetNode().StartOfSectionNode() !=
         pPam->GetNode( false ).StartOfSectionNode() )
     {
         // If the PaM is located within different boxes, we have a table selection,
@@ -1143,7 +1143,7 @@ bool SwTextFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
 {
 
     if ( IsInTab() &&
-        pPam->GetNode( true ).StartOfSectionNode() !=
+        pPam->GetNode().StartOfSectionNode() !=
         pPam->GetNode( false ).StartOfSectionNode() )
     {
         // If the PaM is located within different boxes, we have a table selection,
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 1ad212baec7d..0c78977912de 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -121,7 +121,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& rInf,
     // total number of kashida positions, or the number of kashida positions after some positions
     // have been dropped.
     // Here we want the clean total, which is OK: We have called ClearKashidaInvalid() before.
-    rKashidas = rSI.KashidaJustify ( 0, 0, rItr.GetStart(), rItr.GetLength(), 0 );
+    rKashidas = rSI.KashidaJustify ( 0, 0, rItr.GetStart(), rItr.GetLength() );
 
     if (rKashidas <= 0) // nothing to do
         return true;
@@ -410,7 +410,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
     bool bNoCompression = false;
 
     // Do not forget: CalcRightMargin() sets pCurrent->Width() to the line width!
-    CalcRightMargin( pCurrent, 0 );
+    CalcRightMargin( pCurrent );
 
     SwLinePortion* pPos = pCurrent->GetPortion();
 
@@ -718,7 +718,7 @@ SwFlyPortion *SwTextAdjuster::CalcFlyPortion( const long nRealWidth,
         const long nLocalWidth = aLocal.Left() + aLocal.Width();
         if( nRealWidth < nLocalWidth )
             aLocal.Width( nRealWidth - aLocal.Left() );
-        GetInfo().GetParaPortion()->SetFly( true );
+        GetInfo().GetParaPortion()->SetFly();
         pFlyPortion = new SwFlyPortion( aLocal );
         pFlyPortion->Height( sal_uInt16( rCurrRect.Height() ) );
         // The Width could be smaller than the FixWidth, thus:
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index b2368da36480..a6c7b1fe4ad9 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2375,7 +2375,7 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo &rInf )
         SwFlyPortion *pFly = new SwFlyPortion( aInter );
         if( bForced )
         {
-            pCurr->SetForcedLeftMargin( true );
+            pCurr->SetForcedLeftMargin();
             rInf.ForcedLeftMargin( (sal_uInt16)aInter.Width() );
         }
 
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index e211d2d50759..8f4f709250b9 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -354,7 +354,7 @@ void SwTextIter::TruncLines( bool bNoteFollow )
                         const sal_uInt16 nTmpPos = pHt->GetStart();
                         if ( nEnd <= nTmpPos && nTmpPos < nRangeEnd )
                             pFollow->_InvalidateRange(
-                                SwCharRange( nTmpPos, nTmpPos ), 0 );
+                                SwCharRange( nTmpPos, nTmpPos ) );
                     }
                 }
             }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 161117ed334a..e4fc38442301 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -88,7 +88,7 @@ void SwExpandPortion::Paint( const SwTextPaintInfo &rInf ) const
         rInf.DrawMarkedText( *this, rInf.GetLen(), false, false,
             0 != rInf.GetSmartTags(), 0 != rInf.GetGrammarCheckList() );
     else
-        rInf.DrawText( *this, rInf.GetLen(), false );
+        rInf.DrawText( *this, rInf.GetLen() );
 
     if( GetJoinBorderWithPrev() || GetJoinBorderWithNext() )
         *const_cast<SwTextPaintInfo&>(rInf).GetFont() = aOldFont;
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index ed21ab827124..bd626427b77f 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -69,7 +69,7 @@ bool SwFlyPortion::Format( SwTextFormatInfo &rInf )
     // resetting
     rInf.SetFly( 0 );
     rInf.Width( rInf.RealWidth() );
-    rInf.GetParaPortion()->SetFly( true );
+    rInf.GetParaPortion()->SetFly();
 
     // trailing blank:
     if( rInf.GetIdx() < rInf.GetText().getLength() &&  1 < rInf.GetIdx()
@@ -134,7 +134,7 @@ bool SwFlyCntPortion::Format( SwTextFormatInfo &rInf )
         }
     }
 
-    rInf.GetParaPortion()->SetFly( true );
+    rInf.GetParaPortion()->SetFly();
     return bFull;
 }
 
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 9ab83c568509..d5cca569ae2b 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -521,14 +521,14 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf ) const
         assert(false); // this is some debugging only code
         rInf.DrawBackBrush( *this );
         const OUString aText(CH_TXT_ATR_SUBST_FIELDEND);
-        rInf.DrawText( aText, *this, 0, aText.getLength(), false );
+        rInf.DrawText( aText, *this, 0, aText.getLength() );
     }
     else if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDSTART==rInf.GetText()[rInf.GetIdx()])
     {
         assert(false); // this is some debugging only code
         rInf.DrawBackBrush( *this );
         const OUString aText(CH_TXT_ATR_SUBST_FIELDSTART);
-        rInf.DrawText( aText, *this, 0, aText.getLength(), false );
+        rInf.DrawText( aText, *this, 0, aText.getLength() );
     }
     else if( GetLen() )
     {
@@ -550,7 +550,7 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf ) const
         if ( bWrong || bSmartTags || bGrammarCheck )
             rInf.DrawMarkedText( *this, rInf.GetLen(), false, bWrong, bSmartTags, bGrammarCheck );
         else
-            rInf.DrawText( *this, rInf.GetLen(), false );
+            rInf.DrawText( *this, rInf.GetLen() );
     }
 }
 
@@ -806,7 +806,7 @@ void SwHolePortion::Paint( const SwTextPaintInfo &rInf ) const
     }
 
     const OUString aText( ' ' );
-    rInf.DrawText( aText, *this, 0, 1, false );
+    rInf.DrawText( aText, *this, 0, 1 );
 
     delete pFontSave;
     delete pHoleFont;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 5171fe6718ff..e931f5ae6afb 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1603,9 +1603,9 @@ bool SwTextFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             {
                 sal_Int32 nPos;
                 if( lcl_ErgoVadis( this, nPos, PREP_QUOVADIS ) )
-                    InvalidateRange( SwCharRange( nPos, 1 ), 0 );
+                    InvalidateRange( SwCharRange( nPos, 1 ) );
                 if( lcl_ErgoVadis( this, nPos, PREP_ERGOSUM ) )
-                    InvalidateRange( SwCharRange( nPos, 1 ), 0 );
+                    InvalidateRange( SwCharRange( nPos, 1 ) );
             }
             // If we have a page number field, we must invalidate those spots
             SwpHints *pHints = GetTextNode()->GetpSwpHints();
@@ -1763,7 +1763,7 @@ bool SwTextFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                     FindMaster()->Prepare( PREP_FTN_GONE ); // Master's Prepare
                 if( nPos )
                     --nPos; // The char preceding our Follow
-                InvalidateRange( SwCharRange( nPos, 1 ), 0 );
+                InvalidateRange( SwCharRange( nPos, 1 ) );
                 return bParaPossiblyInvalid;
             }
         case PREP_ERGOSUM:
@@ -1771,7 +1771,7 @@ bool SwTextFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             {
                 sal_Int32 nPos;
                 if( lcl_ErgoVadis( this, nPos, ePrep ) )
-                    InvalidateRange( SwCharRange( nPos, 1 ), 0 );
+                    InvalidateRange( SwCharRange( nPos, 1 ) );
             }
             break;
         case PREP_FLY_ATTR_CHG:
@@ -1794,7 +1794,7 @@ bool SwTextFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                 {
                     sal_Int32 nLen = ( GetFollow() ? GetFollow()->GetOfst() :
                                       COMPLETE_STRING ) - GetOfst();
-                    InvalidateRange( SwCharRange( GetOfst(), nLen ), 0 );
+                    InvalidateRange( SwCharRange( GetOfst(), nLen ) );
                 }
             }
             else
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index fbcc176690f5..70b283865c72 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -48,7 +48,7 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken(
 
     // check whether a tab adjustment has been specified.
     if (SVX_TAB_ADJUST_END > aToken.eTabAlign) {
-        const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( targetNode.SwContentNode::GetAttr(RES_LR_SPACE, true) );
+        const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( targetNode.SwContentNode::GetAttr(RES_LR_SPACE) );
 
         long nTabPosition = aToken.nTabStopPosition;
         if (!mTabPositionIsRelativeToParagraphIndent && rLR.GetTextLeft()) {
@@ -106,7 +106,7 @@ DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTextNode& targetNod
     if (!pageDescription) {
         return false;
     }
-    const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout, 0, 0, true);
+    const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout, 0, 0);
     if (!pFrm) {
         return false;
     }
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index d1895dcf60df..1613c62567ab 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -72,7 +72,7 @@ IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void )
         pTimer->Stop();
         if( GetRegisteredIn() )
         {   //Replace the old wrong list by the proxy list and repaint all frames
-            getMyTextNode()->SetGrammarCheck( mpProxyList, true );
+            getMyTextNode()->SetGrammarCheck( mpProxyList );
             mpProxyList = 0;
             SwTextFrm::repaintTextFrames( *getMyTextNode() );
         }
@@ -90,7 +90,7 @@ void SwGrammarContact::updateCursorPosition( const SwPosition& rNewPos )
         {
             if( mpProxyList )
             {   // replace old list by the proxy list and repaint
-                getMyTextNode()->SetGrammarCheck( mpProxyList, true );
+                getMyTextNode()->SetGrammarCheck( mpProxyList );
                 SwTextFrm::repaintTextFrames( *getMyTextNode() );
             }
             GetRegisteredInNonConst()->Remove( this ); // good bye old paragraph
@@ -170,7 +170,7 @@ void SwGrammarContact::finishGrammarCheck( SwTextNode& rTextNode )
         }
         else if( getMyTextNode()->GetGrammarCheck() )
         {   // all grammar problems seems to be gone, no delay needed
-            getMyTextNode()->SetGrammarCheck( 0, true );
+            getMyTextNode()->SetGrammarCheck( 0 );
             SwTextFrm::repaintTextFrames( *getMyTextNode() );
         }
     }
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 3087212818ac..d8e8698030c9 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1061,7 +1061,7 @@ void SwTextNode::Update(
                     rIdx.Assign( &aTmpIdxReg, rIdx.GetIndex() );
                 }
                 // the unused position must not be on a SwTextNode
-                bool const isOneUsed(&pRedl->GetBound(true) == pRedl->GetPoint());
+                bool const isOneUsed(&pRedl->GetBound() == pRedl->GetPoint());
                 assert(!pRedl->GetBound(!isOneUsed).nNode.GetNode().IsTextNode());
                 assert(!pRedl->GetBound(!isOneUsed).nContent.GetIdxReg()); (void)isOneUsed;
             }
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index a21ca2414b38..a44915973ac0 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -36,7 +36,7 @@ SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) :
     aSwFont.GoMagic( pSh, aSwFont.GetActual() );
     const SwAttrSet& rAttrSet = static_cast<SwTextFormatColl const *>(pOwn)->GetAttrSet();
     for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
-        pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true );
+        pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i );
 }
 
 SwFontObj::~SwFontObj()
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 0c42a7662cb8..ac22a84c1025 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -780,7 +780,7 @@ namespace
             sal_uInt16 nCurrScript = rxBreak->getScriptType( rText, nBegin );
 
             sal_Int32 indexUtf16 = nBegin;
-            rText.iterateCodePoints(&indexUtf16, 1);
+            rText.iterateCodePoints(&indexUtf16);
 
             //First character is Asian, consider it a word :-(
             if (nCurrScript == i18n::ScriptType::ASIAN)
@@ -799,7 +799,7 @@ namespace
                     nLen = indexUtf16 - nBegin;
                     return nLen;
                 }
-                rText.iterateCodePoints(&indexUtf16, 1);
+                rText.iterateCodePoints(&indexUtf16);
             }
         }
         return nLen;
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index ea020b766ae6..ff83eb9b948c 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -159,11 +159,11 @@ void UndoManager::UnLockUndoNoModifiedPosition()
 
 SwUndo* UndoManager::GetLastUndo()
 {
-    if (!SdrUndoManager::GetUndoActionCount(CurrentLevel))
+    if (!SdrUndoManager::GetUndoActionCount())
     {
         return 0;
     }
-    SfxUndoAction *const pAction( SdrUndoManager::GetUndoAction(0) );
+    SfxUndoAction *const pAction( SdrUndoManager::GetUndoAction() );
     return dynamic_cast<SwUndo*>(pAction);
 }
 
@@ -226,8 +226,8 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter)
                 "EndUndo(): no Undo ID, but rewriter given?");
 
     SfxUndoAction *const pLastUndo(
-        (0 == SdrUndoManager::GetUndoActionCount(CurrentLevel))
-            ? 0 : SdrUndoManager::GetUndoAction(0) );
+        (0 == SdrUndoManager::GetUndoActionCount())
+            ? 0 : SdrUndoManager::GetUndoAction() );
 
     int const nCount = LeaveListAction();
 
@@ -235,7 +235,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter)
     {
         OSL_ASSERT(pLastUndo);
         OSL_ASSERT(UNDO_START != eUndoId);
-        SfxUndoAction *const pUndoAction(SdrUndoManager::GetUndoAction(0));
+        SfxUndoAction *const pUndoAction(SdrUndoManager::GetUndoAction());
         SfxListUndoAction *const pListAction(
             dynamic_cast<SfxListUndoAction*>(pUndoAction));
         OSL_ASSERT(pListAction);
@@ -282,12 +282,12 @@ UndoManager::GetLastUndoInfo(
 {
     // this is actually expected to work on the current level,
     // but that was really not obvious from the previous implementation...
-    if (!SdrUndoManager::GetUndoActionCount(CurrentLevel))
+    if (!SdrUndoManager::GetUndoActionCount())
     {
         return false;
     }
 
-    SfxUndoAction *const pAction( SdrUndoManager::GetUndoAction(0) );
+    SfxUndoAction *const pAction( SdrUndoManager::GetUndoAction() );
 
     if (o_pStr)
     {
@@ -322,12 +322,12 @@ SwUndoComments_t UndoManager::GetUndoComments() const
 bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr,
                                    SwUndoId *const o_pId) const
 {
-    if (!SdrUndoManager::GetRedoActionCount(CurrentLevel))
+    if (!SdrUndoManager::GetRedoActionCount())
     {
         return false;
     }
 
-    SfxUndoAction *const pAction( SdrUndoManager::GetRedoAction(0, CurrentLevel) );
+    SfxUndoAction *const pAction( SdrUndoManager::GetRedoAction(0) );
     if ( pAction == NULL )
     {
         return false;
@@ -380,18 +380,18 @@ SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const
 
 SwUndo * UndoManager::RemoveLastUndo()
 {
-    if (SdrUndoManager::GetRedoActionCount(CurrentLevel) ||
+    if (SdrUndoManager::GetRedoActionCount() ||
         SdrUndoManager::GetRedoActionCount(TopLevel))
     {
         OSL_ENSURE(false, "RemoveLastUndoAction(): there are Redo actions?");
         return 0;
     }
-    if (!SdrUndoManager::GetUndoActionCount(CurrentLevel))
+    if (!SdrUndoManager::GetUndoActionCount())
     {
         OSL_ENSURE(false, "RemoveLastUndoAction(): no Undo actions");
         return 0;
     }
-    SfxUndoAction *const pLastUndo(GetUndoAction(0));
+    SfxUndoAction *const pLastUndo(GetUndoAction());
     SdrUndoManager::RemoveLastUndoAction();
     return dynamic_cast<SwUndo *>(pLastUndo);
 }
@@ -546,7 +546,7 @@ bool UndoManager::Repeat(::sw::RepeatContext & rContext,
     {
         return false;
     }
-    SfxUndoAction *const pRepeatAction(GetUndoAction(0));
+    SfxUndoAction *const pRepeatAction(GetUndoAction());
     OSL_ASSERT(pRepeatAction);
     if (!pRepeatAction || !pRepeatAction->CanRepeat(rContext))
     {
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index ade03ff44331..fc6b51e4719b 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -966,7 +966,7 @@ SwHistory::SwHistory( sal_uInt16 nInitSz )
 
 SwHistory::~SwHistory()
 {
-    Delete( 0 );
+    Delete();
     std::vector<SwHistoryHint*>::const_iterator it;
     for(it = m_SwpHstry.begin(); it != m_SwpHstry.end(); ++it)
         delete *it;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index bdfd99f8906d..3d167c3b2990 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -257,7 +257,7 @@ SwUndoDelete::SwUndoDelete(
                     SwPosition aSplitPos( *pEndTextNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd );
                     --aRg.aEnd;
                 }
                 else
@@ -281,7 +281,7 @@ SwUndoDelete::SwUndoDelete(
                     SwPosition aSplitPos( *pSttTextNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart );
                     --aRg.aStart;
                 }
             }
@@ -319,12 +319,12 @@ SwUndoDelete::SwUndoDelete(
                 if( bJoinNext )
                 {
                     SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart );
                 }
                 else
                 {
                     SwNodeRange aMvRg( *pSttTextNd, 0, *pSttTextNd, 1 );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd );
                 }
             }
         }
@@ -849,7 +849,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
             --aPos.nNode;
             if( !bJoinNext )
                 pMovedNode = &aPos.nNode.GetNode();
-            rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx, true);
+            rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx);
             ++aPos.nNode;
         }
 
@@ -875,8 +875,8 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
                 SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
                 SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 );
                 pMovedNode = &aPos.nNode.GetNode();
-                rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx, true);
-                rDoc.GetNodes().Delete( aMvIdx, 1 );
+                rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx);
+                rDoc.GetNodes().Delete( aMvIdx);
             }
         }
 
@@ -945,7 +945,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
     }
     // delete the temporarily added Node
     if( pInsNd )
-        rDoc.GetNodes().Delete( aIdx, 1 );
+        rDoc.GetNodes().Delete( aIdx );
     if( pRedlSaveData )
         SetSaveData(rDoc, *pRedlSaveData);
 
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 2b8aa17a272c..3683060eecbd 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -823,7 +823,7 @@ void SwUndoSaveSection::SaveSection(
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true, true ))
+    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true ))
         delete pRedlSaveData, pRedlSaveData = 0;
 
     nStartPos = rRange.aStart.GetIndex();
@@ -834,7 +834,7 @@ void SwUndoSaveSection::SaveSection(
     SwContentNode* pCNd = aPam.GetContentNode( false );
     if( pCNd )
         aPam.GetMark()->nContent.Assign( pCNd, 0 );
-    if( 0 != ( pCNd = aPam.GetContentNode( true )) )
+    if( 0 != ( pCNd = aPam.GetContentNode()) )
         aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
     // Keep positions as SwIndex so that this section can be deleted in DTOR
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index d8e7ac553eca..9d194deb0bb0 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -815,13 +815,13 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
 
     if( pOldNm )
     {
-        pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0, true );
+        pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0 );
         delete pOldNm;
         delete pOldFltr;
     }
     else
     {
-        pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, true );
+        pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0 );
         delete pOldGrf;
     }
 
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 99431193a923..6cd854ca2c67 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -256,7 +256,7 @@ void SwUndoMoveNum::RepeatImpl(::sw::RepeatContext & rContext)
     }
     else
     {
-        rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset, false);
+        rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset);
     }
 }
 
@@ -323,7 +323,7 @@ void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & rContext)
     SwDoc & rDoc = rContext.GetDoc();
     if (mbOldNum && ! mbNewNum)
     {
-        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, false);
+        rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode);
     }
     else if ( ! mbOldNum && mbNewNum )
     {
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index cef198e6ed84..32d67b012d36 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -378,7 +378,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl )
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !FillSaveData( rRedl, *pRedlSaveData, false, true ))
+    if( !FillSaveData( rRedl, *pRedlSaveData, false ))
         delete pRedlSaveData, pRedlSaveData = 0;
 }
 
@@ -407,7 +407,7 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext)
 
         // per definition Point is end (in SwUndRng!)
         SwContentNode* pCSttNd = rPam.GetContentNode(false);
-        SwContentNode* pCEndNd = rPam.GetContentNode(true);
+        SwContentNode* pCEndNd = rPam.GetContentNode();
 
         // if start- and end-content is zero, then the doc-compare moves
         // complete nodes into the current doc. And then the selection
@@ -427,14 +427,14 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext)
         if( pCSttNd && !pCEndNd)
         {
             // #112139# Do not step behind the end of content.
-            SwNode & rTmp = rPam.GetNode(true);
+            SwNode & rTmp = rPam.GetNode();
             SwNode * pEnd = rDoc.GetNodes().DocumentSectionEndNode(&rTmp);
 
             if (&rTmp != pEnd)
             {
                 rPam.SetMark();
                 ++rPam.GetPoint()->nNode;
-                rPam.GetBound( true ).nContent.Assign( 0, 0 );
+                rPam.GetBound().nContent.Assign( 0, 0 );
                 rPam.GetBound( false ).nContent.Assign( 0, 0 );
                 pUnDel2 = new SwUndoDelete(rPam, true);
             }
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 722510d05dd8..0e2b42607dd8 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -173,7 +173,7 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext)
     }
     else
     {
-        rDoc.InsertSwSection(rPam, *m_pSectionData, 0, m_pAttrSet.get(), true);
+        rDoc.InsertSwSection(rPam, *m_pSectionData, 0, m_pAttrSet.get());
     }
 
     if (m_pHistory.get())
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index f1cfb15d5aae..6589657b28ed 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2023,7 +2023,7 @@ CHECKTABLE(pTableNd->GetTable())
                         if( pMove )
                             pCNd->MoveTo( *pMove );
                     }
-                    rDoc.GetNodes().Delete( aIdx, 1 );
+                    rDoc.GetNodes().Delete( aIdx );
                 }
                 else if( pTextNd )
                 {
@@ -2534,7 +2534,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
         pEntry->pUndo = pUndo;
 
         aInsIdx = rBox.GetSttIdx() + 1;
-        rDoc.GetNodes().Delete( aInsIdx, 1 );
+        rDoc.GetNodes().Delete( aInsIdx );
 
         SfxItemSet aTmpSet( rDoc.GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                                 RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
@@ -2626,7 +2626,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
         // b62341295: Redline for copying tables - End.
 
         aInsIdx = rBox.GetSttIdx() + 1;
-        rDoc.GetNodes().Delete( aInsIdx, 1 );
+        rDoc.GetNodes().Delete( aInsIdx );
 
         SfxItemSet aTmpSet( rDoc.GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                                 RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
@@ -2701,7 +2701,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex
             pEntry->pUndo = PrepareRedline( pDoc, rBox, aTmpPos, pEntry->bJoin, false );
         }
         SwNodeIndex aDelIdx( *rBox.GetSttNd(), 1 );
-        rBox.GetFrameFormat()->GetDoc()->GetNodes().Delete( aDelIdx, 1 );
+        rBox.GetFrameFormat()->GetDoc()->GetNodes().Delete( aDelIdx );
         _DEBUG_REDLINE( pDoc )
     }
 
@@ -2796,7 +2796,7 @@ bool SwUndoTableCpyTable::InsertRow( SwTable& rTable, const SwSelBoxes& rBoxes,
                                        0, 0, nCnt, true, false );
     SwTableSortBoxes aTmpLst( rTable.GetTabSortBoxes() );
 
-    bool bRet = rTable.InsertRow( rTable.GetFrameFormat()->GetDoc(), rBoxes, nCnt, true );
+    bool bRet = rTable.InsertRow( rTable.GetFrameFormat()->GetDoc(), rBoxes, nCnt );
     if( bRet )
         pInsRowUndo->SaveNewBoxes( *pTableNd, aTmpLst );
     else
@@ -2895,7 +2895,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
         }
 
         // remove implicitly created paragraph again
-        pDoc->GetNodes().Delete( idx, 1 );
+        pDoc->GetNodes().Delete( idx );
     }
 
     rIdx = nTableNode + nOffset;
@@ -2925,7 +2925,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
         {
             SwSelBoxes aSelBoxes;
             SwTableBox* pBox = rTable.GetTableBox( nTableNode + nOffset + 1 );
-            SwTable::SelLineFromBox( pBox, aSelBoxes, true );
+            SwTable::SelLineFromBox( pBox, aSelBoxes );
             _FndBox aTmpBox( 0, 0 );
             aTmpBox.SetTableLines( aSelBoxes, rTable );
             aTmpBox.DelFrms( rTable );
@@ -3027,7 +3027,7 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
     aFndBox.DelFrms( *pTable );
     // ? TL_CHART2: notification or locking of controller required ?
 
-    SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, true, false );
+    SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, true );
 
     // update layout
     aFndBox.MakeFrms( *pTable );
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 69be1618f8c4..b527d80ab062 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -212,7 +212,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
 
             RemoveIdxRel(aDelIdx.GetIndex(), *rPam.GetPoint());
 
-            rDoc.GetNodes().Delete( aDelIdx, 1 );
+            rDoc.GetNodes().Delete( aDelIdx );
         }
         else
         {