[Libreoffice-commits] core.git: 10 commits - desktop/source sdext/source sd/source slideshow/source starmath/source stoc/source svgio/source svl/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Thu Aug 20 04:52:57 PDT 2015
desktop/source/app/dispatchwatcher.cxx | 8 +--
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 10 +--
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 4 -
desktop/source/deployment/gui/license_dialog.cxx | 2
desktop/source/deployment/manager/dp_activepackages.cxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 6 +-
desktop/source/deployment/registry/executable/dp_executable.cxx | 2
sd/source/core/drawdoc.cxx | 4 -
sd/source/core/drawdoc2.cxx | 6 +-
sd/source/core/drawdoc3.cxx | 6 +-
sd/source/core/drawdoc4.cxx | 6 +-
sd/source/core/sdpage.cxx | 2
sd/source/core/undo/undoobjects.cxx | 2
sd/source/filter/eppt/eppt.cxx | 6 +-
sd/source/filter/eppt/epptso.cxx | 18 +++---
sd/source/filter/eppt/pptexanimations.cxx | 16 +++---
sd/source/filter/eppt/pptx-text.cxx | 12 ++--
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/html/pubdlg.cxx | 8 +--
sd/source/filter/ppt/pptin.cxx | 14 ++---
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 4 -
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/dlg/LayerTabBar.cxx | 2
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 4 -
sd/source/ui/dlg/dlgolbul.cxx | 2
sd/source/ui/dlg/ins_paste.cxx | 2
sd/source/ui/dlg/inspagob.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/present.cxx | 6 +-
sd/source/ui/dlg/sdtreelb.cxx | 10 +--
sd/source/ui/docshell/docshel3.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 8 +--
sd/source/ui/framework/configuration/ResourceId.cxx | 2
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2
sd/source/ui/func/fucushow.cxx | 2
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 2
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/func/fupoor.cxx | 2
sd/source/ui/func/fusel.cxx | 8 +--
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/func/futempl.cxx | 14 ++---
sd/source/ui/func/futext.cxx | 4 -
sd/source/ui/presenter/PresenterHelper.cxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 6 +-
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 7 --
sd/source/ui/slideshow/showwin.cxx | 4 -
sd/source/ui/slideshow/slideshow.cxx | 6 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 6 +-
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 4 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 18 +++---
sd/source/ui/table/tablefunction.cxx | 4 -
sd/source/ui/tools/PreviewRenderer.cxx | 6 +-
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/unoidl/unocpres.hxx | 2
sd/source/ui/unoidl/unolayer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 14 ++---
sd/source/ui/unoidl/unoobj.cxx | 6 +-
sd/source/ui/unoidl/unopage.cxx | 4 -
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/Outliner.cxx | 6 +-
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 14 ++---
sd/source/ui/view/drviews1.cxx | 12 ++--
sd/source/ui/view/drviews2.cxx | 12 ++--
sd/source/ui/view/drviews4.cxx | 4 -
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/drviewsa.cxx | 4 -
sd/source/ui/view/drviewsb.cxx | 4 -
sd/source/ui/view/drviewse.cxx | 2
sd/source/ui/view/drviewsg.cxx | 2
sd/source/ui/view/drviewsj.cxx | 6 +-
sd/source/ui/view/frmview.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/outlview.cxx | 6 +-
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview4.cxx | 2
sd/source/ui/view/viewshe2.cxx | 2
sd/source/ui/view/viewshel.cxx | 12 ++--
sdext/source/minimizer/graphiccollector.cxx | 2
sdext/source/minimizer/informationdialog.cxx | 10 +--
sdext/source/minimizer/optimizerdialogcontrols.cxx | 12 ++--
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 2
slideshow/source/engine/slide/layer.cxx | 2
slideshow/source/engine/slideview.cxx | 4 -
starmath/source/cursor.cxx | 20 +++----
starmath/source/dialog.cxx | 22 ++++----
starmath/source/edit.cxx | 10 +--
starmath/source/visitors.cxx | 8 +--
stoc/source/javavm/javavm.cxx | 2
stoc/source/simpleregistry/simpleregistry.cxx | 2
stoc/source/typeconv/convert.cxx | 2
svgio/source/svgreader/svgclippathnode.cxx | 4 -
svgio/source/svgreader/svggradientnode.cxx | 4 -
svgio/source/svgreader/svgmarkernode.cxx | 4 -
svgio/source/svgreader/svgmasknode.cxx | 8 +--
svgio/source/svgreader/svgpatternnode.cxx | 8 +--
svl/source/fsstor/fsstorage.cxx | 2
sw/inc/fmtcol.hxx | 4 -
sw/inc/ndtxt.hxx | 2
sw/source/core/SwNumberTree/SwNumberTree.cxx | 2
sw/source/core/access/acccontext.cxx | 22 +++-----
sw/source/core/access/accmap.cxx | 10 +--
sw/source/core/access/accnotexthyperlink.cxx | 2
sw/source/core/access/accpara.cxx | 8 +--
sw/source/core/access/accselectionhelper.cxx | 5 -
sw/source/core/access/acctable.cxx | 2
sw/source/core/attr/format.cxx | 2
sw/source/core/bastyp/calc.cxx | 4 -
sw/source/core/bastyp/init.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 16 +++---
sw/source/core/crsr/crstrvl.cxx | 4 -
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 8 +--
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 6 +-
sw/source/core/doc/DocumentFieldsManager.cxx | 2
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 3 -
sw/source/core/doc/DocumentRedlineManager.cxx | 10 +--
sw/source/core/doc/DocumentStylePoolManager.cxx | 4 -
sw/source/core/doc/doccorr.cxx | 2
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docdraw.cxx | 4 -
sw/source/core/doc/docedt.cxx | 10 +--
sw/source/core/doc/docfly.cxx | 8 +--
sw/source/core/doc/docfmt.cxx | 24 ++++-----
sw/source/core/doc/docglbl.cxx | 6 +-
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 6 +-
sw/source/core/doc/docnum.cxx | 6 +-
sw/source/core/doc/docredln.cxx | 22 ++++----
sw/source/core/doc/docsort.cxx | 4 -
sw/source/core/doc/doctxm.cxx | 18 +++---
sw/source/core/doc/ftnidx.cxx | 2
sw/source/core/doc/tblcpy.cxx | 10 +--
sw/source/core/doc/tblrwcl.cxx | 6 +-
sw/source/core/docnode/ndsect.cxx | 8 +--
sw/source/core/docnode/ndtbl.cxx | 16 +++---
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/nodes.cxx | 12 ++--
sw/source/core/docnode/section.cxx | 18 +++---
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/draw/dview.cxx | 4 -
sw/source/core/edit/acorrect.cxx | 2
sw/source/core/edit/autofmt.cxx | 18 +++---
sw/source/core/edit/edglss.cxx | 4 -
sw/source/core/edit/editsh.cxx | 4 -
sw/source/core/edit/edtox.cxx | 2
sw/source/core/edit/edundo.cxx | 2
sw/source/core/fields/docufld.cxx | 4 -
sw/source/core/fields/usrfld.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 16 +++---
sw/source/core/frmedt/fefly1.cxx | 8 +--
sw/source/core/frmedt/feshview.cxx | 6 +-
sw/source/core/frmedt/fetab.cxx | 6 +-
sw/source/core/frmedt/tblsel.cxx | 6 +-
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/colfrm.cxx | 2
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/paintfrm.cxx | 4 -
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/layout/softpagebreak.cxx | 4 -
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 4 -
sw/source/core/sw3io/swacorr.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2
sw/source/core/swg/swblocks.cxx | 4 -
sw/source/core/table/swnewtable.cxx | 8 +--
sw/source/core/table/swtable.cxx | 12 ++--
sw/source/core/text/EnhancedPDFExportHelper.cxx | 3 -
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/frmcrsr.cxx | 4 -
sw/source/core/text/itradj.cxx | 6 +-
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/itrtxt.cxx | 2
sw/source/core/text/porexp.cxx | 2
sw/source/core/text/porfly.cxx | 4 -
sw/source/core/text/portxt.cxx | 8 +--
sw/source/core/text/txtfrm.cxx | 10 +--
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 4 -
sw/source/core/txtnode/SwGrammarContact.cxx | 6 +-
sw/source/core/txtnode/ndtxt.cxx | 2
sw/source/core/txtnode/swfntcch.cxx | 2
sw/source/core/txtnode/txtedt.cxx | 4 -
sw/source/core/undo/docundo.cxx | 26 +++++-----
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/undel.cxx | 16 +++---
sw/source/core/undo/undobj.cxx | 4 -
sw/source/core/undo/unins.cxx | 4 -
sw/source/core/undo/unnum.cxx | 4 -
sw/source/core/undo/unredln.cxx | 8 +--
sw/source/core/undo/unsect.cxx | 2
sw/source/core/undo/untbl.cxx | 16 +++---
sw/source/core/undo/untblk.cxx | 2
sw/source/core/unocore/unocoll.cxx | 4 -
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unoftn.cxx | 2
sw/source/core/unocore/unoidx.cxx | 4 -
sw/source/core/unocore/unoobj.cxx | 10 +--
sw/source/core/unocore/unoobj2.cxx | 10 +--
sw/source/core/unocore/unoparagraph.cxx | 2
sw/source/core/unocore/unoport.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 4 -
sw/source/core/unocore/unoredline.cxx | 4 -
sw/source/core/unocore/unosect.cxx | 2
sw/source/core/unocore/unostyle.cxx | 26 +++++-----
sw/source/core/unocore/unotbl.cxx | 10 +--
sw/source/core/unocore/unotext.cxx | 6 +-
sw/source/core/view/vdraw.cxx | 2
sw/source/core/view/vprint.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/htmltab.cxx | 24 ++++-----
sw/source/filter/html/swhtml.cxx | 20 +++----
231 files changed, 650 insertions(+), 660 deletions(-)
New commits:
commit cc8f854707d751a610dac5a993f7d21a88f63cd8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 20 13:39:25 2015 +0200
loplugin: defaultparams
Change-Id: I463bbaf86b4a44e8bdf5388404730ab3dcd9b9fe
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index f0769da..7761bdb 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -554,7 +554,7 @@ SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc)
break;
case SW_SERVICE_TYPE_FIELDMARK :
{
- xRet = SwXFieldmark::CreateXFieldmark(rDoc, 0, false);
+ xRet = SwXFieldmark::CreateXFieldmark(rDoc, 0);
}
break;
case SW_SERVICE_TYPE_FORMFIELDMARK :
@@ -614,7 +614,7 @@ SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc)
break;
case SW_SERVICE_TYPE_FOOTNOTE :
- xRet = SwXFootnote::CreateXFootnote(rDoc, 0, false);
+ xRet = SwXFootnote::CreateXFootnote(rDoc, 0);
break;
case SW_SERVICE_TYPE_ENDNOTE :
xRet = SwXFootnote::CreateXFootnote(rDoc, 0, true);
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index ef2f3ba..983b5ed 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -664,7 +664,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
{
SwTextNode *const pTextNode = rPam.GetNode().GetTextNode();
- if (&rPam.GetNode(true) == &rPam.GetNode(false)
+ if (&rPam.GetNode() == &rPam.GetNode(false)
&& pTextNode && pTextNode->GetpSwpHints())
{
sal_Int32 nPaMStart = rPam.GetPoint()->nContent.GetIndex();
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 004c30a..bf1babb 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -478,7 +478,7 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception)
SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
SwPosition aPos( *pTextFootnote->GetStartNode() );
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos, false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos));
pUnoCursor->Move(fnMoveForward, fnGoNode);
return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FOOTNOTE);
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index b8f6d0a..edfe314 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1376,7 +1376,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
//TODO: apply Section attributes (columns and background)
SwTOXBaseSection *const pTOX =
- pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0, false );
+ pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0 );
pDoc->SetTOXBaseName(*pTOX, m_pImpl->m_pProps->GetTOXBase().GetTOXName());
@@ -1969,7 +1969,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
// n.b.: toxmarks must have either alternative text or an extent
if (bMark && !rMark.GetAlternativeText().isEmpty())
{
- rPam.Normalize(true);
+ rPam.Normalize();
rPam.DeleteMark();
bMark = false;
}
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index cd4cd0a..779f84a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -670,7 +670,7 @@ public:
: m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
, m_eType(eType)
, m_xParentText(xParent)
- , m_pUnoCursor(rDoc.CreateUnoCrsr(rPoint, false), true)
+ , m_pUnoCursor(rDoc.CreateUnoCrsr(rPoint), true)
{
if (pMark)
{
@@ -2002,7 +2002,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
// if we are reseting paragraph attributes, we need to select the full paragraph first
SwPosition aStart = *rPaM.Start();
SwPosition aEnd = *rPaM.End();
- auto pTemp ( rDoc.CreateUnoCrsr(aStart, false) );
+ auto pTemp ( rDoc.CreateUnoCrsr(aStart) );
if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
{
pTemp->MovePara(fnParaCurr, fnParaStart);
@@ -2515,17 +2515,17 @@ throw (uno::RuntimeException, std::exception)
if ( text::TextMarkupType::SPELLCHECK == nType )
{
txtNode->SetWrongDirty(true);
- txtNode->SetWrong(0, true);
+ txtNode->SetWrong(0);
}
else if( text::TextMarkupType::PROOFREADING == nType )
{
txtNode->SetGrammarCheckDirty(true);
- txtNode->SetGrammarCheck(0,true);
+ txtNode->SetGrammarCheck(0);
}
else if ( text::TextMarkupType::SMARTTAG == nType )
{
txtNode->SetSmartTagDirty(true);
- txtNode->SetSmartTags (0, true);
+ txtNode->SetSmartTags(0);
}
else return;
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 7b1b37e..6a3c7d1 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -576,7 +576,7 @@ SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementE
(CURSOR_SELECTION_IN_TABLE == m_eCursorType)))
{
SwPosition* pStart = rUnoCrsr.Start();
- auto aNewCrsr(rUnoCrsr.GetDoc()->CreateUnoCrsr(*pStart, false));
+ auto aNewCrsr(rUnoCrsr.GetDoc()->CreateUnoCrsr(*pStart));
// one may also go into tables here
if ((CURSOR_TBLTEXT != m_eCursorType) &&
(CURSOR_SELECTION_IN_TABLE != m_eCursorType))
@@ -1118,7 +1118,7 @@ SwXTextRange::CreateXTextRange(
{
const uno::Reference<text::XText> xParentText(
::sw::CreateParentXText(rDoc, rPos));
- const auto pNewCrsr(rDoc.CreateUnoCrsr(rPos, false));
+ const auto pNewCrsr(rDoc.CreateUnoCrsr(rPos));
if(pMark)
{
pNewCrsr->SetMark();
@@ -1252,7 +1252,7 @@ throw (uno::RuntimeException, std::exception)
throw uno::RuntimeException();
}
const SwPosition aPos(GetDoc().GetNodes().GetEndOfContent());
- const auto pNewCrsr(m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false));
+ const auto pNewCrsr(m_pImpl->m_rDoc.CreateUnoCrsr(aPos));
if (!GetPositions(*pNewCrsr))
{
throw uno::RuntimeException();
@@ -1271,7 +1271,7 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException, std::exception)
throw uno::RuntimeException();
}
const SwPosition aPos(GetDoc().GetNodes().GetEndOfContent());
- auto pNewCrsr(m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false));
+ auto pNewCrsr(m_pImpl->m_rDoc.CreateUnoCrsr(aPos));
if (!GetPositions(*pNewCrsr))
{
throw uno::RuntimeException();
@@ -1649,7 +1649,7 @@ SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, cons
SwXParaFrameEnumerationImpl::SwXParaFrameEnumerationImpl(
const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode,
SwFrameFormat* const pFormat)
- : m_pUnoCursor(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false))
+ : m_pUnoCursor(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint()))
{
if (rPaM.HasMark())
{
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 72fc834..744b2f7 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -1180,7 +1180,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
// to paragraph boundaries
SwPosition aStart( *aCursor.Start() );
SwPosition aEnd ( *aCursor.End() );
- auto pTemp( aCursor.GetDoc()->CreateUnoCrsr(aStart, false) );
+ auto pTemp( aCursor.GetDoc()->CreateUnoCrsr(aStart) );
if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
{
pTemp->MovePara(fnParaCurr, fnParaStart);
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index e4da5c4..480e76a 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -129,7 +129,7 @@ SwXTextPortion::SwXTextPortion(
if (!bIsEnd)
{
const SfxPoolItem& rItem = rAttr.GetAttr();
- rItem.QueryValue(*m_pRubyText, MID_RUBY_TEXT);
+ rItem.QueryValue(*m_pRubyText);
rItem.QueryValue(*m_pRubyStyle, MID_RUBY_CHARSTYLE);
rItem.QueryValue(*m_pRubyAdjust, MID_RUBY_ADJUST);
rItem.QueryValue(*m_pRubyIsAbove, MID_RUBY_ABOVE);
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 12f91b8..713a531 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -363,7 +363,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
const sal_Int32 nEnd )
: m_Portions()
{
- m_pUnoCrsr = rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false);
+ m_pUnoCrsr = rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint());
OSL_ENSURE(nEnd == -1 || (nStart <= nEnd &&
nEnd <= m_pUnoCrsr->Start()->nNode.GetNode().GetTextNode()->GetText().getLength()),
@@ -380,7 +380,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
TextRangeList_t const & rPortions )
: m_Portions( rPortions )
{
- m_pUnoCrsr = rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false);
+ m_pUnoCrsr = rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint());
}
SwXTextPortionEnumeration::~SwXTextPortionEnumeration()
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 1443e42..13161e3 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -161,7 +161,7 @@ uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration()
SolarMutexGuard aGuard;
SwPaM aPam(aNodeIndex);
aPam.Move(fnMoveForward, fnGoNode);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(*aPam.Start(), false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(*aPam.Start()));
return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE);
}
@@ -536,7 +536,7 @@ uno::Reference< container::XEnumeration > SwXRedline::createEnumeration() throw
return nullptr;
SwPaM aPam(*pNodeIndex);
aPam.Move(fnMoveForward, fnGoNode);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(*aPam.Start(), false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(*aPam.Start()));
return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE);
}
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index e1eaa86..20262c2 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1138,7 +1138,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
for (size_t nRed = 0; nRed < rRedTable.size(); ++nRed)
{
const SwRangeRedline* pRedline = rRedTable[nRed];
- const SwNode& rRedPointNode = pRedline->GetNode(true);
+ const SwNode& rRedPointNode = pRedline->GetNode();
const SwNode& rRedMarkNode = pRedline->GetNode(false);
if ((&rRedPointNode == pSectNode) ||
(&rRedMarkNode == pSectNode))
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index e609a6a..a17eaf1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -734,7 +734,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName);
if(pBase)
{
@@ -793,7 +793,7 @@ sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExc
{
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName);
bRet = 0 != pBase;
}
@@ -824,7 +824,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
{
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName);
SfxStyleSheetBase* pUINameBase = pBasePool->Find( sStyleName );
if(pBase || pUINameBase)
@@ -861,7 +861,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
const OUString sParentStyleName(pNewStyle->GetParentStyleName());
if (!sParentStyleName.isEmpty())
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pParentBase = pBasePool->Find(sParentStyleName);
if(pParentBase && pParentBase->GetFamily() == eFamily &&
&pParentBase->GetPool() == pBasePool)
@@ -920,7 +920,7 @@ void SwXStyleFamily::removeByName(const OUString& rName) throw( container::NoSuc
SolarMutexGuard aGuard;
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
OUString aString;
SwStyleNameMapper::FillUIName(rName, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
@@ -1294,7 +1294,7 @@ SwXStyle::SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
StartListening(rPool);
if(eFam == SFX_STYLE_FAMILY_PARA)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
OSL_ENSURE(pBase, "where is the style?" );
if(pBase)
@@ -1332,7 +1332,7 @@ OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception )
SolarMutexGuard aGuard;
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
OSL_ENSURE(pBase, "where is the style?" );
if(!pBase)
@@ -1349,7 +1349,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std:
SolarMutexGuard aGuard;
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
OSL_ENSURE(pBase, "where is the style?" );
bool bExcept = true;
@@ -1373,7 +1373,7 @@ sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception
bool bRet = false;
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
//if it is not found it must be non user defined
if(pBase)
@@ -1406,7 +1406,7 @@ OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception
OUString aString;
if(pBasePool)
{
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL);
+ pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
if(pBase)
aString = pBase->GetParent();
@@ -2031,7 +2031,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
bool bStyleFound = false;
if (pBasePool)
{
- pBasePool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask( SFX_STYLE_FAMILY_PARA);
const SfxStyleSheetBase* pBase = pBasePool->First();
while (pBase && !bStyleFound)
{
@@ -2660,7 +2660,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
if(!pBase)
{
const sal_uInt16 nSaveMask = pBasePool->GetSearchMask();
- pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+ pBasePool->SetSearchMask(eFamily);
pBase = pBasePool->Find(m_sStyleName);
pBasePool->SetSearchMask(eFamily, nSaveMask );
}
@@ -3716,7 +3716,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
if(!pBase)
{
const sal_uInt16 nSaveMask = GetBasePool()->GetSearchMask();
- GetBasePool()->SetSearchMask(GetFamily(), SFXSTYLEBIT_ALL );
+ GetBasePool()->SetSearchMask(GetFamily());
pBase = GetBasePool()->Find(GetStyleName());
GetBasePool()->SetSearchMask(GetFamily(), nSaveMask );
}
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index e55465a..457d0d8 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -324,7 +324,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemProp
pTableNode = pTableNode->EndOfSectionNode();
for(const SwRangeRedline* pRedline : pFormat->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable())
{
- const SwNode& rRedPointNode = pRedline->GetNode(true);
+ const SwNode& rRedPointNode = pRedline->GetNode();
const SwNode& rRedMarkNode = pRedline->GetNode(false);
if(&rRedPointNode == pTableNode || &rRedMarkNode == pTableNode)
{
@@ -691,7 +691,7 @@ void sw_setValue( SwXCell &rCell, double nVal )
if(!rCell.IsValid())
return;
// first this text (maybe) needs to be deleted
- sal_uLong nNdPos = rCell.pBox->IsValidNumTextNd( true );
+ sal_uLong nNdPos = rCell.pBox->IsValidNumTextNd();
if(ULONG_MAX != nNdPos)
sw_setString( rCell, OUString(), true ); // true == keep number format
SwDoc* pDoc = rCell.GetDoc();
@@ -862,7 +862,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException,
if(!IsValid())
return;
// first this text (maybe) needs to be deleted
- sal_uInt32 nNdPos = pBox->IsValidNumTextNd( true );
+ sal_uInt32 nNdPos = pBox->IsValidNumTextNd();
if(USHRT_MAX == nNdPos)
sw_setString( *this, OUString(), true );
OUString sFormula(comphelper::string::stripStart(rFormula, ' '));
@@ -1088,7 +1088,7 @@ uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno:
return uno::Reference<container::XEnumeration>();
const SwStartNode* pSttNd = pBox->GetSttNd();
SwPosition aPos(*pSttNd);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos, false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos));
pUnoCursor->Move(fnMoveForward, fnGoNode);
// remember table and start node for later travelling
// (used in export of tables in tables)
@@ -3316,7 +3316,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
nValid = SvxBoxInfoItemValidFlags::DISTANCE;
break;
}
- aBoxInfo.SetValid(nValid, true);
+ aBoxInfo.SetValid(nValid);
aSet.Put(aBoxInfo);
SwDoc::GetTabBorders(rCrsr, aSet);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index a72c9f8..8b537382 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2493,7 +2493,7 @@ SwXBodyText::createTextCursor() throw (uno::RuntimeException, std::exception)
SolarMutexGuard aGuard;
const uno::Reference< text::XTextCursor > xRef(
- static_cast<text::XWordCursor*>(CreateTextCursor(false)) );
+ static_cast<text::XWordCursor*>(CreateTextCursor()) );
if (!xRef.is())
{
uno::RuntimeException aRuntime;
@@ -2564,7 +2564,7 @@ throw (uno::RuntimeException, std::exception)
SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent();
SwPosition aPos(rNode);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos, false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos));
pUnoCursor->Move(fnMoveBackward, fnGoDoc);
return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_BODY);
}
@@ -2826,7 +2826,7 @@ throw (uno::RuntimeException, std::exception)
const SwFormatContent& rFlyContent = rHeadFootFormat.GetContent();
const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode();
SwPosition aPos(rNode);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos, false));
+ auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos));
pUnoCursor->Move(fnMoveForward, fnGoNode);
return SwXParagraphEnumeration::Create(this, pUnoCursor, (m_pImpl->m_bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER);
}
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 611d6e2..f878e99 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -170,7 +170,7 @@ bool SwViewShellImp::IsDragPossible( const Point &rPoint )
if( pO && ::CalcClipRect( pO, aRect, false ) )
{
SwRect aTmp;
- ::CalcClipRect( pO, aTmp, true );
+ ::CalcClipRect( pO, aTmp );
aRect.Union( aTmp );
}
else
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index ac331b6..2407dda 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -549,7 +549,7 @@ bool SwViewShell::PrintOrPDFExport(
pMetaFile->Stop();
pMetaFile->WindStart();
//Enable output to the device again
- pOutDev->EnableOutput(true);
+ pOutDev->EnableOutput();
//Restore the original recorder
pOutDev->SetConnectMetaFile(pOrigRecorder);
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index f7d9f7d..ebd691a 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -300,7 +300,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) ||
MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetWidth() )
{
- SwFormatFrmSize aSz(static_cast<const SwFormatFrmSize&>(rFlySet.Get(RES_FRM_SIZE, true)));
+ SwFormatFrmSize aSz(static_cast<const SwFormatFrmSize&>(rFlySet.Get(RES_FRM_SIZE)));
if (pItem)
aSz = static_cast<const SwFormatFrmSize&>(*pItem);
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index d42b064..33573cc 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -343,7 +343,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
pDoc->UpdateNumRule();
pDoc->ChkCondColls();
pDoc->SetAllUniqueFlyNames();
- pDoc->getIDocumentState().SetLoaded( true );
+ pDoc->getIDocumentState().SetLoaded();
pDoc->GetIDocumentUndoRedo().DoUndo(bDocUndo);
if (!bReadPageDescs)
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index ad77730..7ca574f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3871,7 +3871,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TBODY_ON:
case HTML_TBODY_OFF:
case HTML_TABLE_OFF:
- SkipToken(-1);
+ SkipToken();
//fall-through
case HTML_TABLEHEADER_OFF:
case HTML_TABLEDATA_OFF:
@@ -4261,7 +4261,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TABLE_ON:
if( !pCurTable->GetContext() )
{
- SkipToken( -1 );
+ SkipToken();
bDone = true;
}
@@ -4274,7 +4274,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TFOOT_ON:
case HTML_TFOOT_OFF:
case HTML_TABLE_OFF:
- SkipToken( -1 );
+ SkipToken();
//fall-through
case HTML_TABLEROW_OFF:
bDone = true;
@@ -4438,7 +4438,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
case HTML_TABLE_ON:
if( !pCurTable->GetContext() )
{
- SkipToken( -1 );
+ SkipToken();
bDone = true;
}
@@ -4447,7 +4447,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
case HTML_TFOOT_ON:
case HTML_TBODY_ON:
case HTML_TABLE_OFF:
- SkipToken( -1 );
+ SkipToken();
//fall-through
case HTML_THEAD_OFF:
case HTML_TBODY_OFF:
@@ -4462,7 +4462,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
break;
case HTML_TABLEHEADER_ON:
case HTML_TABLEDATA_ON:
- SkipToken( -1 );
+ SkipToken();
BuildTableRow( pCurTable, false, pSaveStruct->eAdjust,
pSaveStruct->eVertOri );
bDone = pTable->IsOverflowing();
@@ -4632,7 +4632,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_TABLE_ON:
if( !pCurTable->GetContext() )
{
- SkipToken( -1 );
+ SkipToken();
bDone = true;
}
@@ -4643,7 +4643,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_TBODY_ON:
case HTML_TABLEROW_ON:
case HTML_TABLE_OFF:
- SkipToken( -1 );
+ SkipToken();
//fall-through
case HTML_COLGROUP_OFF:
bDone = true;
@@ -4880,7 +4880,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
case HTML_TFOOT_ON:
case HTML_TBODY_ON:
case HTML_TABLEROW_ON:
- SkipToken( -1 );
+ SkipToken();
bDone = true;
break;
@@ -5229,7 +5229,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
{
// Wenn noch keine Tabelle eingefuegt wurde,
// die naechste Tabelle lesen
- SkipToken( -1 );
+ SkipToken();
bDone = true;
}
@@ -5242,7 +5242,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
bDone = pTable->IsOverflowing();
break;
case HTML_COL_ON:
- SkipToken( -1 );
+ SkipToken();
BuildTableColGroup( pCurTable, false );
break;
case HTML_COLGROUP_ON:
@@ -5251,7 +5251,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
case HTML_TABLEROW_ON:
case HTML_TABLEHEADER_ON:
case HTML_TABLEDATA_ON:
- SkipToken( -1 );
+ SkipToken();
BuildTableSection( pCurTable, false, false );
bDone = pTable->IsOverflowing();
break;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f8f0fb7..f24fb15 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -703,15 +703,15 @@ void SwHTMLParser::Continue( int nToken )
#if OSL_DEBUG_LEVEL > 0
// !!! sollte nicht moeglich sein, oder ??
-OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( true ).nNode.GetIndex(),
+OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound().nNode.GetIndex(),
"Pam.Bound1 steht noch im Node" );
OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( false ).nNode.GetIndex(),
"Pam.Bound2 steht noch im Node" );
-if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( true ).nNode.GetIndex() )
+if( pSttNdIdx->GetIndex()+1 == pPam->GetBound().nNode.GetIndex() )
{
- const sal_Int32 nCntPos = pPam->GetBound( true ).nContent.GetIndex();
- pPam->GetBound( true ).nContent.Assign( pTextNode,
+ const sal_Int32 nCntPos = pPam->GetBound().nContent.GetIndex();
+ pPam->GetBound().nContent.Assign( pTextNode,
pTextNode->GetText().getLength() + nCntPos );
}
if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
@@ -775,7 +775,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
pCrsrSh->SetMark();
pCrsrSh->ClearMark();
}
- pPam->GetBound(true).nContent.Assign( 0, 0 );
+ pPam->GetBound().nContent.Assign( 0, 0 );
pPam->GetBound(false).nContent.Assign( 0, 0 );
pDoc->GetNodes().Delete( pPam->GetPoint()->nNode );
}
@@ -794,7 +794,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
{
pPos->nContent.Assign( 0, 0 );
pPam->SetMark(); pPam->DeleteMark();
- pDoc->GetNodes().Delete( pPos->nNode, 1 );
+ pDoc->GetNodes().Delete( pPos->nNode );
pPam->Move( fnMoveBackward );
}
}
@@ -824,8 +824,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
if( pPrev->HasSwAttrSet() )
pTextNode->SetAttr( *pPrev->GetpSwAttrSet() );
- if( &pPam->GetBound(true).nNode.GetNode() == pPrev )
- pPam->GetBound(true).nContent.Assign( pTextNode, 0 );
+ if( &pPam->GetBound().nNode.GetNode() == pPrev )
+ pPam->GetBound().nContent.Assign( pTextNode, 0 );
if( &pPam->GetBound(false).nNode.GetNode() == pPrev )
pPam->GetBound(false).nContent.Assign( pTextNode, 0 );
@@ -888,7 +888,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
pDoc->getIDocumentState().ResetModified();
if( bSetModEnabled && pDoc->GetDocShell() )
{
- pDoc->GetDocShell()->EnableSetModified( true );
+ pDoc->GetDocShell()->EnableSetModified();
bSetModEnabled = false; // this is unnecessary here
}
}
@@ -928,7 +928,7 @@ void SwHTMLParser::DocumentDetected()
if( IsInHeader() )
FinishHeader( true );
- CallEndAction( true, true );
+ CallEndAction( true );
pDoc->GetIDocumentUndoRedo().DoUndo(false);
// Durch das DocumentDetected wurde im allgemeinen eine
commit eede7d8bbf955f09c15ad59c5994c469924019dd
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 20 13:37:10 2015 +0200
loplugin: defaultparams
Change-Id: I4c6b966a54e18cdbb0c64b6e93804a306b5d2638
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index ed70466..2ab8fdb 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 9f2febd..c1d678e 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 f6fc599..d264bbe 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 190887a..2b595c1 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 152e358..4024b09 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 9000baa..9422b1c 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 41afd15..4b0d015 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 6853c1a..a91ff2b 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 d5ee4ee..282c6db 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 1ad212b..0c78977 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 b2368da..a6c7b1f 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 e211d2d..8f4f709 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 161117e..e4fc384 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 ed21ab8..bd62642 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 9ab83c5..d5cca56 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 5171fe6..e931f5a 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 fbcc176..70b2838 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 d1895dc..1613c62 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 3087212..d8e8698 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 a21ca24..a449159 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 0c42a76..ac22a84 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 ea020b7..ff83eb9b 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 ade03ff..fc6b51e 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 bdfd99f8..3d167c3 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 2b8aa17..3683060 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 d8e7ac5..9d194de 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 9943119..6cd854c 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 cef198e..32d67b0 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 722510d..0e2b426 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 f1cfb15..6589657 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 69be161..b527d80 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
{
commit 41e07fd9a1872498fce43edb4d392ae6b439cb56
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 20 13:34:05 2015 +0200
loplugin: defaultparams
Change-Id: I6019dea21b58ac8ba0dba5c7f6ca837716e19869
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 3f8bd09..b18f242 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -58,7 +58,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc)
, m_pDoc( pDoc )
{
SetScaleUnit( MAP_TWIP );
- SetSwapGraphics( true );
+ SetSwapGraphics();
// use common InitDrawModelAndDocShell which will set the associations as needed,
// including SvxColorTableItem with WhichID SID_COLOR_TABLE
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index ac67d62..c78c916 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -101,9 +101,9 @@ SwDrawView::SwDrawView( SwViewShellImp &rI, SdrModel *pMd, OutputDevice *pOutDev
SetGridVisible( false );
SetHlplVisible( false );
SetGlueVisible( false );
- SetFrameDragSingles( true );
+ SetFrameDragSingles();
SetVirtualObjectBundling( true );
- SetSwapAsynchron( true );
+ SetSwapAsynchron();
EnableExtendedKeyInputDispatcher( false );
EnableExtendedMouseEventDispatcher( false );
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 722346a..be1167e 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -345,7 +345,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
}
else
{
- SwTextBlocks aTBlks( rACorrect.GetAutoCorrFileName( aLanguageTag, false, true, false ));
+ SwTextBlocks aTBlks( rACorrect.GetAutoCorrFileName( aLanguageTag, false, true ));
sal_uInt16 nPos = aTBlks.GetIndex( pFnd->GetShort() );
if( USHRT_MAX != nPos && aTBlks.BeginGetDoc( nPos ) )
{
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index a40f38d..8f5c308 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
!CalcLevel( *pNxtNd ) );
}
}
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
AutoCorrect();
}
@@ -1305,7 +1305,7 @@ void SwAutoFormat::BuildTextIndent()
pNxtNd = GetNextNode();
}
}
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
AutoCorrect();
}
@@ -1342,7 +1342,7 @@ void SwAutoFormat::BuildText()
break;
}
}
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
AutoCorrect();
}
@@ -1375,7 +1375,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
IsBlanksInString( *m_pCurTextNd ) ||
IsSentenceAtEnd( *m_pCurTextNd );
bool bRTL = m_pEditShell->IsInRightToLeftText();
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
bool bChgBullet = false, bChgEnum = false;
sal_Int32 nAutoCorrPos = 0;
@@ -1655,7 +1655,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
if(!pNxtNd || pCurrNode == pNxtNd)
break;
}
- DeleteCurrentParagraph( false, true );
+ DeleteCurrentParagraph( false );
AutoCorrect( nAutoCorrPos );
}
@@ -1740,7 +1740,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
pNxtNd = GetNextNode();
}
}
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
AutoCorrect();
}
@@ -1771,7 +1771,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
}
else
{
- DeleteCurrentParagraph( true, true );
+ DeleteCurrentParagraph( true );
AutoCorrect();
}
}
@@ -2213,7 +2213,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
m_eStat = READ_NEXT_PARA;
// delete all blanks at beginning/end and in between
//JP 29.04.98: first only "all in between"
- DelMoreLinesBlanks( false );
+ DelMoreLinesBlanks();
break;
}
@@ -2465,7 +2465,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
m_eStat = READ_NEXT_PARA;
// delete all blanks at beginning/end and in between
//JP 29.04.98: first only "all in between"
- DelMoreLinesBlanks( false );
+ DelMoreLinesBlanks();
// handle hard attributes
if( m_pCurTextNd->HasSwAttrSet() )
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 8ac4107..a22c294 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -198,7 +198,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
break;
}
}
- bRet = pInsDoc->InsCopyOfTable( aPos, aBoxes, 0, bCpyTableNm, false );
+ bRet = pInsDoc->InsCopyOfTable( aPos, aBoxes, 0, bCpyTableNm );
}
else
bRet = false;
@@ -295,7 +295,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
{
// write selected areas into a ASCII document
SwWriter aWriter( aStream, *this);
- xWrt->SetShowProgress( false );
+ xWrt->SetShowProgress();
switch( nHndlParaBrk )
{
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index ba39bce..4fb3dba 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -333,7 +333,7 @@ void SwEditShell::ClearAutomaticContour()
if( pNd->HasAutomaticContour() )
{
StartAllAction();
- pNd->SetContour( NULL, false );
+ pNd->SetContour( NULL );
SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pNd->getLayoutFrm(GetLayout())->GetUpper());
const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
pFly->GetFormat()->NotifyClients( &rSur, &rSur );
@@ -787,7 +787,7 @@ void SwEditShell::SetNumberingRestart()
{
// now set a the start value as attribute
SwPosition aCurrentNode(*pNd);
- GetDoc()->SetNumRuleStart( aCurrentNode, true );
+ GetDoc()->SetNumRuleStart( aCurrentNode );
}
}
}
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 578afe1..8d596e8 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -372,7 +372,7 @@ void SwEditShell::ApplyAutoMark()
// todo/mba: assuming that notes shouldn't be searched
bool bSearchInNotes = false;
sal_uLong nRet = Find( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END, bCancel,
- (FindRanges)(FND_IN_SELALL), false );
+ (FindRanges)(FND_IN_SELALL) );
if(nRet)
{
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 3a3944e..86a9c87 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -69,7 +69,7 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
{
Point aPt;
SwFlyFrm *const pFly =
- static_cast<SwFlyFrameFormat*>(pSelFormat)->GetFrm(& aPt, false);
+ static_cast<SwFlyFrameFormat*>(pSelFormat)->GetFrm(& aPt);
if (pFly)
{
// fdo#36681: Invalidate the content and layout to refresh
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 6c7b4d5..c53dc78 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -899,7 +899,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
// If Seconds > 0 then bSec should be TRUE otherwise Seconds
// information will be lost if file has EditTime in Seconds format.
aStr = pLocalData->getTime( tools::Time(dur/3600, (dur%3600)/60, dur%60),
- dur%60 > 0, false);
+ dur%60 > 0);
}
else
{
@@ -964,7 +964,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
lcl_GetLocalDataWrapper( nLang, &pAppLocalData,
&pLocalData );
aStr = pLocalData->getTime( aDate,
- false, false);
+ false);
}
else
{
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 467d0e9..c0839cf 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -167,7 +167,7 @@ OUString SwUserFieldType::Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uI
{
if((nType & nsSwGetSetExpType::GSE_EXPR) && !(nSubType & nsSwExtendedSubType::SUB_CMD))
{
- EnableFormat(true);
+ EnableFormat();
return ExpandValue(nValue, nFormat, nLng);
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index d6dac44..1ec8a81 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -192,7 +192,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
aSet.Put( aAnchor );
SdrObject *const pNew =
- pClpDoc->CloneSdrObj( *pObj, false, true );
+ pClpDoc->CloneSdrObj( *pObj, false );
SwPaM aTemp(aPos);
pClpDoc->getIDocumentContentOperations().InsertDrawObj(aTemp, *pNew, aSet );
@@ -378,7 +378,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrameFormatSetRange);
aSet.Put( aAnchor );
SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
- GetDoc() == pDestDoc, true );
+ GetDoc() == pDestDoc );
pFormat = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
}
else
@@ -549,7 +549,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// only select if it can be shifted/copied in the same shell
if( bSelectInsert )
{
- SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aPt, false );
+ SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aPt );
if( pFlyFrm )
{
//JP 12.05.98: should this be in SelectFlyFrm???
@@ -868,7 +868,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
}
bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable(),
- false, false );
+ false );
if( bParkTableCrsr )
GetCrsr();
@@ -989,7 +989,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
{
const Point aPt( GetCrsrDocPos() );
SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pNew)->
- GetFrm( &aPt, false );
+ GetFrm( &aPt );
if( pFlyFrm )
SelectFlyFrm( *pFlyFrm, true );
// always pick the first FlyFrame only; the others
@@ -1496,7 +1496,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
aSet.Put(pClpObj->GetMergedItemSet());
}
- pView->SetAttributes( aSet, false );
+ pView->SetAttributes( aSet );
}
break;
@@ -1514,7 +1514,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
bool bDesignMode = pView->IsDesignMode();
if( !bDesignMode )
- pView->SetDesignMode( true );
+ pView->SetDesignMode();
// #i50824#
// method <lcl_RemoveOleObjsFromSdrModel> replaced by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>
@@ -1531,7 +1531,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
pObj->ImpSetAnchorPos( aNull );
}
- pView->SetCurrentObj( OBJ_GRUP, SdrInventor );
+ pView->SetCurrentObj( OBJ_GRUP );
if ( nCnt > 1 )
pView->GroupMarked();
SdrObject *pObj = pView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 194bff8..e31a3f0 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -247,7 +247,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, bool bNew )
pImpl->GetDrawView()->UnmarkAll();
pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
- pImpl->GetPageView(), false, false );
+ pImpl->GetPageView(), false );
KillPams();
ClearMark();
SelFlyGrabCrsr();
@@ -682,7 +682,7 @@ const SwFrameFormat *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchVal
// chaos::anchor should not lie in the shifted area
pRet->DelFrms();
- const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt, false );
+ const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt );
SwPosition aPos( *static_cast<const SwContentFrm*>(pAnch)->GetNode() );
if ( FLY_AS_CHAR == eRndId )
{
@@ -893,7 +893,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
{
// select drawing object
Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView(),
- false, false );
+ false );
}
else
{
@@ -987,7 +987,7 @@ bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
SET_CURR_SHELL( const_cast<SwViewShell*>(static_cast<SwViewShell const *>(this)) );
- if( !rSet.Set( pFly->GetFormat()->GetAttrSet(), true ) )
+ if( !rSet.Set( pFly->GetFormat()->GetAttrSet() ) )
return false;
// now examine all attributes. Remove forbidden attributes, then
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 79331de..433a030 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -642,7 +642,7 @@ void SwFEShell::StartCropImage()
if( bForget )
{
pView->UnmarkAll();
- pView->MarkObj( pTmpObj, Imp()->GetPageView(), false, false );
+ pView->MarkObj( pTmpObj, Imp()->GetPageView(), false );
break;
}
}
@@ -1866,12 +1866,12 @@ bool SwFEShell::ImpEndCreate()
if ( pMarkObj )
{
Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView(),
- false, false );
+ false );
}
else
{
Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView(),
- false, false );
+ false );
}
}
}
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 621284b..2c92b8e 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -390,7 +390,7 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
pDelBox = pLn->GetTabBoxes().back();
}
SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(),
- pDelBox, true );
+ pDelBox );
while( pNextBox &&
pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox );
@@ -402,7 +402,7 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
while( !pDelBox->GetSttNd() )
pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0];
pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(),
- pDelBox, true );
+ pDelBox );
while( pNextBox &&
pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox );
@@ -1802,7 +1802,7 @@ bool SwFEShell::SelTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDr
*pCrsr->GetPoint() = *ppPos[0];
pCrsr->GetPtPos() = paPt[0];
- if ( !pCrsr->IsInProtectTable( false, true ) )
+ if ( !pCrsr->IsInProtectTable( false ) )
{
bool bNewSelection = true;
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 4d16999..16ff319 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -190,7 +190,7 @@ void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
const SwTableLine* pLine = pMarkBox ? pMarkBox->GetUpper() : 0;
sal_uInt16 nSttPos = rLines.GetPos( pLine );
OSL_ENSURE( USHRT_MAX != nSttPos, "Where is my row in the table?" );
- pLine = rTable.GetTableBox( rCrsr.GetNode( true ).StartOfSectionIndex() )->GetUpper();
+ pLine = rTable.GetTableBox( rCrsr.GetNode().StartOfSectionIndex() )->GetUpper();
sal_uInt16 nEndPos = rLines.GetPos( pLine );
OSL_ENSURE( USHRT_MAX != nEndPos, "Where is my row in the table?" );
// pb: #i20193# if tableintable then nSttPos == nEndPos == USHRT_MAX
@@ -1067,7 +1067,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
// then we should insert a new box and adjust the widths
sal_uInt16 nInsPos = pBox->GetUpper()->GetTabBoxes().GetPos(
pBox )+1;
- lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos, 1 );
+ lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos );
SwFormatFrmSize aNew(pBox->GetFrameFormat()->GetFrmSize() );
long nLeft = rUnion.Left() - pCell->Frm().Left(),
@@ -1378,7 +1378,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
(*ppMergeBox)->GetSttNd()->EndOfSectionIndex(),
"empty box" );
SwNodeIndex aIdx( *(*ppMergeBox)->GetSttNd()->EndOfSectionNode(), -1 );
- pDoc->GetNodes().Delete( aIdx, 1 );
+ pDoc->GetNodes().Delete( aIdx );
}
// set width of the box
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 7f9f7c6..e3411c2 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -971,7 +971,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
{
const bool bIsModifyLocked = IsModifyLocked();
LockModify();
- SwapIn( false );
+ SwapIn();
if( !bIsModifyLocked )
UnlockModify();
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index fe24b43..65679b1 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2729,7 +2729,7 @@ SdrObject* SwFrameFormat::FindRealSdrObject()
{
Point aNullPt;
SwFlyFrm* pFly = static_cast<SwFlyFrm*>(::GetFrmOfModify( 0, *this, FRM_FLY,
- &aNullPt, 0, false ));
+ &aNullPt, 0 ));
return pFly ? pFly->GetVirtDrawObj() : 0;
}
return FindSdrObject();
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 89d169a..e8d22fb 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -217,7 +217,7 @@ void SwLayoutFrm::ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew,
// SaveContent would also suck up the content of the footnote container
// and store it within the normal text flow.
if( IsPageBodyFrm() )
- pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFootnotes( static_cast<SwPageFrm*>(GetUpper()), true, false );
+ pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFootnotes( static_cast<SwPageFrm*>(GetUpper()) );
pSave = ::SaveContent( this );
//If columns exist, they get deleted if a column count of 0 or 1 is requested.
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index fa0a155..80dd520 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -273,7 +273,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
const SwVirtFlyDrawObj *pObj = GetVirtDrawObj();
SwRect aClip, aTmpStretch;
- ::CalcClipRect( pObj, aClip, true );
+ ::CalcClipRect( pObj, aClip );
::CalcClipRect( pObj, aTmpStretch, false );
aClip._Intersection( aTmpStretch );
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 6ce689c..d03673a 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -248,7 +248,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd )
pMod = 0;
Point aNullPt;
- return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0, false )
+ return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0 )
: 0;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 06f74fa..b3e1f77 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5147,7 +5147,7 @@ void PaintCharacterBorder(
if( aBottomBorder )
{
if( aBottomBorder->isDouble() )
- aBottomBorder->SetMirrorWidths(true);
+ aBottomBorder->SetMirrorWidths();
Point aLeftTop(
aAlignedRect.Left(),
@@ -5188,7 +5188,7 @@ void PaintCharacterBorder(
if( aRightBorder )
{
if( aRightBorder->isDouble() )
- aRightBorder->SetMirrorWidths(true);
+ aRightBorder->SetMirrorWidths();
Point aLeftTop(
aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index f5fe4fe..9e5ed69 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2457,7 +2457,7 @@ SwFootnoteContFrm* SwSectionFrm::ContainsFootnoteCont( const SwFootnoteContFrm*
const SwLayoutFrm* pLay;
if( pCont )
{
- pLay = pCont->FindFootnoteBossFrm( false );
+ pLay = pCont->FindFootnoteBossFrm();
OSL_ENSURE( IsAnLower( pLay ), "ConatainsFootnoteCont: Wrong FootnoteContainer" );
pLay = static_cast<const SwLayoutFrm*>(pLay->GetNext());
}
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 28049b2..ae8cd82 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -65,7 +65,7 @@ void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
// If there's no follow flow line, the soft page break will be
// exported at the row, not at the content.
if( pRow == pFirstRow &&
- pTab->FindMaster( false )->HasFollowFlowLine() )
+ pTab->FindMaster()->HasFollowFlowLine() )
{
// Now we have the row which causes a new page,
// this row is a follow flow line and therefore cannot get
@@ -131,7 +131,7 @@ bool SwTableLine::hasSoftPageBreak() const
if( pRow == pLast )
{
// The last check: no soft page break for "follow" table lines
- if( pTab->IsFollow() && pTab->FindMaster( false )->HasFollowFlowLine() )
+ if( pTab->IsFollow() && pTab->FindMaster()->HasFollowFlowLine() )
return false;
return true;
}
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 4254ec2..272c315 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -694,7 +694,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrm *pStart,
//going down.
bool bTableSel = false;
if ( pStart->IsInTab() &&
- pPam->GetNode( true ).StartOfSectionNode() !=
+ pPam->GetNode().StartOfSectionNode() !=
pPam->GetNode( false ).StartOfSectionNode() )
{
bTableSel = true;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 6096a12..0bb77e6 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -641,7 +641,7 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) :
pListener( 0 ),
xOLERef( xObj )
{
- xOLERef.Lock( true );
+ xOLERef.Lock();
if ( xObj.is() )
{
pListener = new SwOLEListener_Impl( this );
@@ -655,7 +655,7 @@ SwOLEObj::SwOLEObj( const OUString &rString, sal_Int64 nAspect ) :
pListener( 0 ),
aName( rString )
{
- xOLERef.Lock( true );
+ xOLERef.Lock();
xOLERef.SetViewAspect( nAspect );
}
commit 2675fde1aace586300741207d0dfbf3d7deae867
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 20 13:29:19 2015 +0200
loplugin: defaultparams
Change-Id: I36c7086117112d35df98c05030c965c21d9330ac
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 11039cd..df092d9 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1862,8 +1862,8 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
}
}
- SwContentNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetContentNode();
- rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 );
+ SwContentNode *pTmpNode = rPam.GetBound().nNode.GetNode().GetContentNode();
+ rPam.GetBound().nContent.Assign( pTmpNode, 0 );
pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetContentNode();
rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 );
m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 );
@@ -2680,7 +2680,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf
GetMirrorGrf().GetValue() )
pGrfNd->SetAttr( SwMirrorGrf() );
- pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, true );
+ pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj );
m_rDoc.getIDocumentState().SetModified();
}
}
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 08f29a6..0672cd0 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1652,7 +1652,7 @@ void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCal
SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) );
- if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false ))
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list