[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Noel Grandin
noel at peralex.com
Tue Mar 22 09:48:10 UTC 2016
sw/inc/IDocumentDeviceAccess.hxx | 9 -
sw/inc/IDocumentListItems.hxx | 4
sw/inc/crsskip.hxx | 35 ------
sw/inc/dbmgr.hxx | 5
sw/inc/editsh.hxx | 7 -
sw/inc/fesh.hxx | 2
sw/inc/fmtcol.hxx | 3
sw/inc/htmltbl.hxx | 17 ---
sw/inc/node.hxx | 3
sw/inc/numrule.hxx | 6 -
sw/inc/pagepreviewlayout.hxx | 8 -
sw/inc/pch/precompiled_sw.hxx | 1
sw/inc/postithelper.hxx | 3
sw/inc/swabstdlg.hxx | 3
sw/inc/swcrsr.hxx | 17 ++-
sw/inc/swtable.hxx | 3
sw/inc/txatritr.hxx | 5
sw/inc/view.hxx | 3
sw/qa/core/uwriter.cxx | 2
sw/qa/extras/tiledrendering/tiledrendering.cxx | 1
sw/qa/extras/uiwriter/uiwriter.cxx | 3
sw/source/core/access/accpara.cxx | 1
sw/source/core/access/acctable.cxx | 30 ++---
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/crsr/findattr.cxx | 1
sw/source/core/crsr/pam.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 11 --
sw/source/core/crsr/viscrs.cxx | 8 -
sw/source/core/doc/DocumentDeviceManager.cxx | 7 -
sw/source/core/doc/DocumentFieldsManager.cxx | 4
sw/source/core/doc/DocumentListItemsManager.cxx | 8 -
sw/source/core/doc/docbm.cxx | 8 -
sw/source/core/doc/doccomp.cxx | 4
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docruby.cxx | 2
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/fmtcol.cxx | 8 -
sw/source/core/doc/htmltbl.cxx | 8 -
sw/source/core/doc/notxtfrm.cxx | 3
sw/source/core/doc/number.cxx | 11 --
sw/source/core/doc/tblrwcl.cxx | 11 --
sw/source/core/docnode/ndtbl.cxx | 6 -
sw/source/core/docnode/ndtbl1.cxx | 4
sw/source/core/docnode/node.cxx | 7 -
sw/source/core/docnode/node2lay.cxx | 5
sw/source/core/edit/edattr.cxx | 1
sw/source/core/edit/eddel.cxx | 2
sw/source/core/edit/edfld.cxx | 39 +------
sw/source/core/edit/editsh.cxx | 1
sw/source/core/edit/edlingu.cxx | 1
sw/source/core/edit/ednumber.cxx | 3
sw/source/core/edit/edtab.cxx | 4
sw/source/core/edit/edundo.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 6 -
sw/source/core/frmedt/fefly1.cxx | 14 +-
sw/source/core/frmedt/fetab.cxx | 10 -
sw/source/core/frmedt/fews.cxx | 2
sw/source/core/inc/DocumentDeviceManager.hxx | 2
sw/source/core/inc/DocumentListItemsManager.hxx | 4
sw/source/core/inc/UndoNumbering.hxx | 2
sw/source/core/inc/cellfrm.hxx | 2
sw/source/core/inc/frmtool.hxx | 2
sw/source/core/inc/layfrm.hxx | 2
sw/source/core/inc/mvsave.hxx | 3
sw/source/core/inc/node2lay.hxx | 4
sw/source/core/inc/notxtfrm.hxx | 2
sw/source/core/inc/rolbck.hxx | 2
sw/source/core/inc/txtfly.hxx | 4
sw/source/core/layout/findfrm.cxx | 62 ++++-------
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/frmtool.cxx | 4
sw/source/core/layout/objectformattertxtfrm.cxx | 18 +--
sw/source/core/layout/objectformattertxtfrm.hxx | 7 -
sw/source/core/layout/tabfrm.cxx | 16 +-
sw/source/core/layout/wsfrm.cxx | 6 -
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 1
sw/source/core/text/guess.cxx | 3
sw/source/core/text/inftxt.cxx | 20 ---
sw/source/core/text/inftxt.hxx | 14 --
sw/source/core/text/porexp.cxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/txtfly.cxx | 5
sw/source/core/undo/rolbck.cxx | 3
sw/source/core/undo/unnum.cxx | 2
sw/source/core/unocore/unocrsr.cxx | 6 -
sw/source/core/unocore/unoobj.cxx | 18 +--
sw/source/core/unocore/unoobj2.cxx | 7 -
sw/source/core/unocore/unoparagraph.cxx | 18 +--
sw/source/core/unocore/unoportenum.cxx | 23 +---
sw/source/core/unocore/unotbl.cxx | 5
sw/source/core/unocore/unotext.cxx | 9 -
sw/source/core/view/pagepreviewlayout.cxx | 19 +--
sw/source/filter/html/css1atr.cxx | 65 +++++-------
sw/source/filter/html/htmlatr.cxx | 32 -----
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 8 -
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlnumreader.cxx | 8 -
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/svxcss1.cxx | 8 -
sw/source/filter/html/svxcss1.hxx | 2
sw/source/filter/html/swhtml.cxx | 26 +---
sw/source/filter/html/swhtml.hxx | 11 --
sw/source/filter/html/wrthtml.hxx | 3
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 17 +--
sw/source/filter/xml/xmltext.cxx | 9 -
sw/source/ui/dbui/dbinsdlg.cxx | 1
sw/source/ui/dialog/swdlgfact.cxx | 7 -
sw/source/ui/dialog/swdlgfact.hxx | 3
sw/source/ui/fldui/flddb.cxx | 2
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddok.cxx | 4
sw/source/ui/fldui/fldedt.cxx | 1
sw/source/ui/fldui/fldfunc.cxx | 2
sw/source/ui/fldui/fldref.cxx | 6 -
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/insfnote.cxx | 1
sw/source/ui/vba/vbaaddin.cxx | 4
sw/source/ui/vba/vbaaddin.hxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/uibase/app/appenv.cxx | 1
sw/source/uibase/config/usrpref.cxx | 4
sw/source/uibase/dbui/dbmgr.cxx | 13 --
sw/source/uibase/dochdl/gloshdl.cxx | 3
sw/source/uibase/docvw/PostItMgr.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 1
sw/source/uibase/fldui/fldmgr.cxx | 6 -
sw/source/uibase/inc/cnttab.hxx | 2
sw/source/uibase/inc/fldmgr.hxx | 2
sw/source/uibase/inc/glosdoc.hxx | 12 --
sw/source/uibase/inc/gloslst.hxx | 2
sw/source/uibase/inc/numfmtlb.hxx | 4
sw/source/uibase/inc/prcntfld.hxx | 2
sw/source/uibase/inc/srcview.hxx | 1
sw/source/uibase/inc/tablemgr.hxx | 2
sw/source/uibase/inc/unomod.hxx | 2
sw/source/uibase/inc/usrpref.hxx | 12 --
sw/source/uibase/inc/wrtsh.hxx | 15 +-
sw/source/uibase/index/toxmgr.cxx | 1
sw/source/uibase/lingu/hhcwrp.cxx | 1
sw/source/uibase/lingu/olmenu.cxx | 1
sw/source/uibase/misc/glosdoc.cxx | 8 -
sw/source/uibase/ribbar/workctrl.cxx | 2
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/basesh.cxx | 3
sw/source/uibase/shells/drwbassh.cxx | 2
sw/source/uibase/shells/drwtxtex.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textfld.cxx | 1
sw/source/uibase/shells/textsh.cxx | 7 -
sw/source/uibase/shells/textsh1.cxx | 11 --
sw/source/uibase/shells/txtcrsr.cxx | 1
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/table/tablemgr.cxx | 4
sw/source/uibase/uiview/pview.cxx | 6 -
sw/source/uibase/uiview/srcview.cxx | 23 ----
sw/source/uibase/uiview/view2.cxx | 13 +-
sw/source/uibase/uiview/viewling.cxx | 1
sw/source/uibase/uiview/viewport.cxx | 1
sw/source/uibase/uno/unoatxt.cxx | 8 -
sw/source/uibase/uno/unomod.cxx | 6 -
sw/source/uibase/uno/unotxvw.cxx | 7 -
sw/source/uibase/utlui/content.cxx | 1
sw/source/uibase/utlui/gloslst.cxx | 4
sw/source/uibase/utlui/numfmtlb.cxx | 9 -
sw/source/uibase/wrtsh/delete.cxx | 1
sw/source/uibase/wrtsh/move.cxx | 13 +-
sw/source/uibase/wrtsh/select.cxx | 7 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 9 -
sw/source/uibase/wrtsh/wrtsh2.cxx | 1
sw/source/uibase/wrtsh/wrtsh4.cxx | 1
176 files changed, 437 insertions(+), 735 deletions(-)
New commits:
commit 9585c8b8c8d8724cc1bad4a2060c828c15599929
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 22 10:58:54 2016 +0200
loplugin:constantparam in sw
Change-Id: I56925a8fd776b3ee787cc26adbaa08c58dd022c0
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 18fddae..7f515e7 100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -73,13 +73,10 @@ public:
@param pVd
[in] the new virtual device.
- @param bDeleteOld
- [in] if set, the old virtual device will be deleted.
-
- @param bCallVirDevDataChanged
- [in] if set, triggers all necessary invalidations.
+ The old virtual device will be deleted.
+ Triggers all necessary invalidations.
*/
- virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged ) = 0;
+ virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) = 0;
/** Returns the current reference device
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index 6868fa9..e0e1679 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -34,9 +34,7 @@ public:
virtual void addListItem( const SwNodeNum& rNodeNum ) = 0;
virtual void removeListItem( const SwNodeNum& rNodeNum ) = 0;
- virtual OUString getListItemText( const SwNodeNum& rNodeNum,
- const bool bWithNumber = true,
- const bool bWithSpacesForLevel = false ) const = 0;
+ virtual OUString getListItemText( const SwNodeNum& rNodeNum ) const = 0;
/** get vector of all list items, which are numbered
*/
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
deleted file mode 100644
index 97ec004..0000000
--- a/sw/inc/crsskip.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SW_INC_CRSSKIP_HXX
-#define INCLUDED_SW_INC_CRSSKIP_HXX
-
-#include <tools/solar.h>
-
-// define for cursor travelling normally in western text cells and chars do
-// the same, but in complex text cell skip over legatures and char skip
-// into it.
-// These defines exist only to cut off the dependencies to I18N project.
-const sal_uInt16 CRSR_SKIP_CHARS = 0;
-const sal_uInt16 CRSR_SKIP_CELLS = 1;
-const sal_uInt16 CRSR_SKIP_HIDDEN = 2;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b50f734..9bfcf18 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -349,8 +349,7 @@ public:
inline bool IsInMerge() const { return bInMerge; }
void ExecuteFormLetter(SwWrtShell& rSh,
- const css::uno::Sequence< css::beans::PropertyValue>& rProperties,
- bool bWithDataSourceBrowser = false);
+ const css::uno::Sequence< css::beans::PropertyValue>& rProperties);
static void InsertText(SwWrtShell& rSh,
const css::uno::Sequence< css::beans::PropertyValue>& rProperties);
@@ -380,7 +379,7 @@ public:
bool GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
OUString &rResult, double *pNumber);
bool FillCalcWithMergeData(SvNumberFormatter *pDocFormatter,
- sal_uInt16 nLanguage, bool asString, SwCalc &aCalc);
+ sal_uInt16 nLanguage, SwCalc &aCalc);
bool ToNextMergeRecord();
bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8fd8fa0..7f6ed41 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -365,8 +365,8 @@ public:
void UpdateFields( SwField & ); ///< One single field.
- size_t GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
- SwFieldType* GetFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+ size_t GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX) const;
+ SwFieldType* GetFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX) const;
SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
void RemoveFieldType(size_t nField);
@@ -539,7 +539,6 @@ public:
in case a list style is found, <sListId> holds the list id, to which the
text node belongs, which applies the found list style. */
const SwNumRule * SearchNumRule(const bool bNum,
- const bool bOutline,
int nNonEmptyAllowed,
OUString& sListId );
@@ -716,7 +715,7 @@ public:
Can Merge checks if Prev or Next are possible.
If pointer pChkNxtPrv is passed possible direction is given. */
bool CanMergeTable( bool bWithPrev = true, bool* pChkNxtPrv = nullptr ) const;
- bool MergeTable( bool bWithPrev = true, sal_uInt16 nMode = 0 );
+ bool MergeTable( bool bWithPrev = true );
/// Set up InsertDB as table Undo.
void AppendUndoForInsertFromDB( bool bIsTable );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 295b934..e11eba2 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -263,7 +263,7 @@ public:
bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
bool bIsMove = false, bool bSelectInsert = true );
- void SelectFlyFrame( SwFlyFrame& rFrame, bool bNew = false );
+ void SelectFlyFrame( SwFlyFrame& rFrame );
/// Is selected frame within another frame?
const SwFrameFormat* IsFlyInFly();
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index b31d1fc..7e3e915 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -113,8 +113,7 @@ public:
// If a Paragraph Style is assigned to list level N of the Outline Style,
// then its outline level - AttrOutlineLevel - is set to N+1
void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
- void DeleteAssignmentToListLevelOfOutlineStyle(const bool bResetOutlineLevel
- = true);
+ void DeleteAssignmentToListLevelOfOutlineStyle();
/** Override to recognize changes on the <SwNumRuleItem> and register/unregister
the paragragh style at the corresponding <SwNumRule> instance. */
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 5711d33..1bc85cb 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -144,7 +144,7 @@ public:
~SwHTMLTableLayoutColumn() {}
inline void MergeCellWidthOption( sal_uInt16 nWidth, bool bPrc );
- inline void SetWidthOption( sal_uInt16 nWidth, bool bRelWidth, bool bTest );
+ inline void SetWidthOption( sal_uInt16 nWidth );
sal_uInt16 GetWidthOption() const { return nWidthOption; }
bool IsRelWidthOption() const { return bRelWidthOption; }
@@ -319,7 +319,7 @@ public:
bool Resize( sal_uInt16 nAbsAvail, bool bRecalc=false, bool bForce=false,
sal_uLong nDelay=0 );
- void BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc=false );
+ void BordersChanged( sal_uInt16 nAbsAvail );
/** Calculate available width. This works only if a layout or a
SwViewShell exists. Otherwise returns 0.
@@ -417,17 +417,10 @@ inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol )
return m_aColumns[nCol];
}
-inline void SwHTMLTableLayoutColumn::SetWidthOption(
- sal_uInt16 nWidth, bool bRelWidth, bool bTest )
+inline void SwHTMLTableLayoutColumn::SetWidthOption( sal_uInt16 nWidth )
{
- if( bTest && bRelWidthOption==bRelWidth )
- {
- if( nWidth > nWidthOption )
- nWidthOption = nWidth;
- }
- else
- nWidthOption = nWidth;
- bRelWidthOption = bRelWidth;
+ nWidthOption = nWidth;
+ bRelWidthOption = true;
}
inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol )
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index fd00b7c..8a7bee5 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -407,8 +407,7 @@ public:
/** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
SwRect FindLayoutRect( const bool bPrtArea = false,
- const Point* pPoint = nullptr,
- const bool bCalcFrame = false ) const;
+ const Point* pPoint = nullptr ) const;
SwRect FindPageFrameRect() const;
/** Method creates all views of document for given node. The content
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 2f4fdfd..f6c8ec9 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -147,8 +147,7 @@ public:
/// add parameter <eDefaultNumberFormatPositionAndSpaceMode>
SwNumRule( const OUString& rNm,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
- SwNumRuleType = NUM_RULE,
- bool bAutoFlg = true );
+ SwNumRuleType = NUM_RULE );
SwNumRule( const SwNumRule& );
~SwNumRule();
@@ -165,8 +164,7 @@ public:
void Set( sal_uInt16 i, const SwNumFormat* );
void Set( sal_uInt16 i, const SwNumFormat& );
- OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true,
- bool bOnlyArabic = false ) const;
+ OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true ) const;
/** - add optional parameter <_nRestrictToThisLevel> in order to
restrict returned string to this level. */
OUString MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 1362733..3060177 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -267,17 +267,11 @@ public:
input parameter - window size in which the preview will be displayed and
for which the scaling will be calculated.
- @param _bCalcScale
- input parameter - control, if method should calculate the needed
- scaling for the proposed preview layout for the given window size
- and sets the scaling at the output device and the view options.
-
@return boolean, indicating, if preview layout is successful initialized.
*/
bool Init( const sal_uInt16 _nCols,
const sal_uInt16 _nRows,
- const Size& _rPxWinSize,
- const bool _bCalcScale
+ const Size& _rPxWinSize
);
/** method to adjust page preview layout to document changes
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index a78036f..53ad3c2 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -263,7 +263,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/weak.hxx>
#include <crsrsh.hxx>
-#include <crsskip.hxx>
#include <crstate.hxx>
#include <dbfld.hxx>
#include <dbmgr.hxx>
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 373429b..64cc025 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -125,9 +125,8 @@ class SwAnnotationItem: public SwSidebarItem
public:
SwAnnotationItem(
SwFormatField& rFormatField,
- const bool aShow,
const bool aFocus)
- : SwSidebarItem( aShow, aFocus )
+ : SwSidebarItem( true/*aShow*/, aFocus )
, mrFormatField( rFormatField )
{
}
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 36c8570..9e9efca 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -357,7 +357,6 @@ public:
virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode,
const OUString *pCollName = nullptr,
bool bDraw = false,
const OString& sDefPage = OString() ) = 0;
@@ -371,7 +370,7 @@ public:
bool bSetAutoFormat = true,
const SwTableAutoFormat* pSelFormat = nullptr ) = 0;
virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0;
- virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId ) = 0;
virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) = 0;
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 941f2a0..742821d 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -56,6 +56,15 @@ namespace nsSwCursorSelOverFlags
const SwCursorSelOverFlags SELOVER_CHANGEPOS = 0x08;
}
+// define for cursor travelling normally in western text cells and chars do
+// the same, but in complex text cell skip over ligatures and char skip
+// into it.
+// These defines exist only to cut off the dependencies to I18N project.
+const sal_uInt16 CRSR_SKIP_CHARS = 0;
+const sal_uInt16 CRSR_SKIP_CELLS = 1;
+const sal_uInt16 CRSR_SKIP_HIDDEN = 2;
+
+
class SW_DLLPUBLIC SwCursor : public SwPaM
{
friend class SwCursorSaveState;
@@ -85,7 +94,7 @@ protected:
public:
// single argument ctors shall be explicit.
- SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel );
+ SwCursor( const SwPosition &rPos, SwPaM* pRing );
virtual ~SwCursor();
/// this takes a second parameter, which indicates the Ring that
@@ -164,10 +173,8 @@ public:
bool SttEndDoc( bool bSttDoc );
bool GoPrevNextCell( bool bNext, sal_uInt16 nCnt );
- bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden )
- { return LeftRight( true, nCnt, nMode, bAllowVisual, bSkipHidden, false ); }
- bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden )
- { return LeftRight( false, nCnt, nMode, bAllowVisual, bSkipHidden, false ); }
+ bool Left( sal_uInt16 nCnt ) { return LeftRight( true, nCnt, CRSR_SKIP_CHARS, false/*bAllowVisual*/, false/*bSkipHidden*/, false ); }
+ bool Right( sal_uInt16 nCnt ) { return LeftRight( false, nCnt, CRSR_SKIP_CHARS, false/*bAllowVisual*/, false/*bSkipHidden*/, false ); }
bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( true, nCnt ); }
bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( false, nCnt ); }
virtual bool GotoTable( const OUString& rName );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index fd39286..4909ccb 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -441,8 +441,7 @@ public:
// Search next/previous box with content.
SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =nullptr,
bool bOvrTableLns=true ) const;
- SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr,
- bool bOvrTableLns=true ) const;
+ SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr ) const;
// Return name of this box. It is determined dynamically and
// is calculated from the position in the lines/boxes/table.
OUString GetName() const;
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 6ab4f0c..ee4a3ba 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -76,9 +76,8 @@ class SwLanguageIterator : public SwTextAttrIterator
{
public:
SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0,
- sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
- bool bUseGetWhichOfScript = true )
- : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript )
+ sal_uInt16 nWhich = RES_CHRATR_LANGUAGE )
+ : SwTextAttrIterator( rTextNode, nWhich, nStart, true/*bUseGetWhichOfScript*/ )
{}
sal_uInt16 GetLanguage() const
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 838c8b2..ae253f9 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -624,8 +624,7 @@ public:
//public fuer D&D
int InsertGraphic( const OUString &rPath, const OUString &rFilter,
bool bLink = true, GraphicFilter *pFlt = nullptr,
- Graphic* pPreviewGrf = nullptr,
- bool bRule = false );
+ Graphic* pPreviewGrf = nullptr );
void ExecuteScan( SfxRequest& rReq );
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index d616eb0..3c8833a 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1067,7 +1067,7 @@ void SwDocTest::randomTest()
for( int i = 0; i < 2000; i++ )
{
SwPaM aPam(m_pDoc->GetNodes());
- SwCursor aCrs(getRandomPosition(m_pDoc, i/20), nullptr, false);
+ SwCursor aCrs(getRandomPosition(m_pDoc, i/20), nullptr);
aCrs.SetMark();
switch (getRand (i < 50 ? 3 : 6)) {
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index cf0afae..933982d 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -22,7 +22,6 @@
#include <editeng/editview.hxx>
#include <editeng/outliner.hxx>
#include <svl/srchitem.hxx>
-#include <crsskip.hxx>
#include <drawdoc.hxx>
#include <ndtxt.hxx>
#include <wrtsh.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 64b2209..0683228 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -15,7 +15,6 @@
#include <swmodeltestbase.hxx>
#include <ndtxt.hxx>
#include <wrtsh.hxx>
-#include <crsskip.hxx>
#include <shellio.hxx>
#include <expfld.hxx>
#include <drawdoc.hxx>
@@ -365,7 +364,7 @@ void SwUiWriterTest::testBookmarkCopy()
IDocumentMarkAccess & rIDMA(*pDoc->getIDocumentMarkAccess());
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
- SwCursor aPaM(SwPosition(aIdx), nullptr, false);
+ SwCursor aPaM(SwPosition(aIdx), nullptr);
rIDCO.InsertString(aPaM, "foo");
rIDCO.SplitNode(*aPaM.GetPoint(), false);
rIDCO.InsertString(aPaM, "bar");
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index ce2d3c5..70ee4cc 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -53,7 +53,6 @@
#include <unoport.hxx>
#include <doc.hxx>
#include <IDocumentRedlineAccess.hxx>
-#include <crsskip.hxx>
#include <txtatr.hxx>
#include <acchyperlink.hxx>
#include <acchypertextdata.hxx>
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 5ced1de..5d5ee5f 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -115,11 +115,9 @@ public:
inline Int32Set_Impl::const_iterator GetRowIter( sal_Int32 nRow ) const;
inline Int32Set_Impl::const_iterator GetColumnIter( sal_Int32 nCol ) const;
- const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, bool bExact,
- SwAccessibleTable *pThis ) const
+ const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const
throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception);
- const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop,
- bool bExact ) const;
+ const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop ) const;
inline sal_Int32 GetRowCount() const;
inline sal_Int32 GetColumnCount() const;
bool CompareExtents( const SwAccessibleTableData_Impl& r ) const;
@@ -416,7 +414,7 @@ void SwAccessibleTableData_Impl::GetSelection(
}
const SwFrame *SwAccessibleTableData_Impl::GetCell(
- sal_Int32 nRow, sal_Int32 nColumn, bool,
+ sal_Int32 nRow, sal_Int32 nColumn,
SwAccessibleTable *pThis ) const
throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
@@ -424,7 +422,7 @@ const SwFrame *SwAccessibleTableData_Impl::GetCell(
Int32Set_Impl::const_iterator aSttCol( GetColumnIter( nColumn ) );
Int32Set_Impl::const_iterator aSttRow( GetRowIter( nRow ) );
- const SwFrame *pCellFrame = GetCellAtPos( *aSttCol, *aSttRow, false );
+ const SwFrame *pCellFrame = GetCellAtPos( *aSttCol, *aSttRow );
return pCellFrame;
}
@@ -464,12 +462,12 @@ void SwAccessibleTableData_Impl::GetSelection(
}
const SwFrame *SwAccessibleTableData_Impl::GetCellAtPos(
- sal_Int32 nLeft, sal_Int32 nTop, bool bExact ) const
+ sal_Int32 nLeft, sal_Int32 nTop ) const
{
Point aPos( mpTabFrame->Frame().Pos() );
aPos.Move( nLeft, nTop );
const SwFrame *pRet = nullptr;
- FindCell( aPos, mpTabFrame, bExact, pRet );
+ FindCell( aPos, mpTabFrame, false/*bExact*/, pRet );
return pRet;
}
@@ -1026,8 +1024,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
GetTableData().GetColumnIter( nColumn ) );
Int32Set_Impl::const_iterator aSttRow(
GetTableData().GetRowIter( nRow ) );
- const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
- false );
+ const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow );
if( pCellFrame )
{
sal_Int32 nBottom = pCellFrame->Frame().Bottom();
@@ -1058,8 +1055,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
GetTableData().GetColumnIter( nColumn ) );
Int32Set_Impl::const_iterator aSttRow(
GetTableData().GetRowIter( nRow ) );
- const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
- false );
+ const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow );
if( pCellFrame )
{
sal_Int32 nRight = pCellFrame->Frame().Right();
@@ -1210,7 +1206,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
CHECK_FOR_DEFUNC( XAccessibleTable )
const SwFrame *pCellFrame =
- GetTableData().GetCell( nRow, nColumn, false, this );
+ GetTableData().GetCell( nRow, nColumn, this );
if( pCellFrame )
xRet = GetMap()->GetContext( pCellFrame );
@@ -1242,7 +1238,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
CHECK_FOR_DEFUNC( XAccessibleTable )
const SwFrame *pFrame =
- GetTableData().GetCell( nRow, nColumn, false, this );
+ GetTableData().GetCell( nRow, nColumn, this );
if( pFrame && pFrame->IsCellFrame() )
{
const SwSelBoxes *pSelBoxes = GetSelBoxes();
@@ -1268,7 +1264,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex(
CHECK_FOR_DEFUNC( XAccessibleTable )
- SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, false, this ));
+ SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, this ));
if ( aCell.IsValid() )
{
nRet = GetChildIndex( *(GetMap()), aCell );
@@ -1446,10 +1442,10 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
{
Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) );
Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( 1 ) );
- const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, false );
+ const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow );
Int32Set_Impl::const_iterator aSttCol2( pNewTableData->GetColumnIter( 0 ) );
Int32Set_Impl::const_iterator aSttRow2( pNewTableData->GetRowIter( 0 ) );
- const SwFrame *pCellFrame2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, false );
+ const SwFrame *pCellFrame2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2 );
if(pCellFrame == pCellFrame2)
{
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7e57d31..d36818f 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2299,7 +2299,7 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext )
SwFlyFrame* pFly = pFndFormat->GetFrame(&aPt);
if( pFly )
{
- static_cast<SwFEShell*>(this)->SelectFlyFrame( *pFly, true );
+ static_cast<SwFEShell*>(this)->SelectFlyFrame( *pFly );
MakeSelVisible();
bRet = true;
}
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 82c077f..1534e2e 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -42,7 +42,6 @@
#include <ndtxt.hxx>
#include <pamtyp.hxx>
#include <swundo.hxx>
-#include <crsskip.hxx>
#include <boost/optional.hpp>
#include <memory>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index ef74593..270c527 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -31,12 +31,12 @@
#include <fmtcntnt.hxx>
#include <frmatr.hxx>
#include <swtable.hxx>
-#include <crsskip.hxx>
#include <flyfrm.hxx>
#include <fmteiro.hxx>
#include <section.hxx>
#include <sectfrm.hxx>
#include <ndtxt.hxx>
+#include <swcrsr.hxx>
#include <IMark.hxx>
#include <DocumentSettingManager.hxx>
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index edd72bf..23d60e6 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -45,7 +45,6 @@
#include <viewsh.hxx>
#include <frmatr.hxx>
#include <breakit.hxx>
-#include <crsskip.hxx>
#include <vcl/msgbox.hxx>
#include <mdiexp.hxx>
#include <statstr.hrc>
@@ -115,12 +114,12 @@ struct _PercentHdl
}
};
-SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel )
+SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing )
: SwPaM( rPos, pRing )
, m_pSavePos(nullptr)
, m_nRowSpanOffset(0)
, m_nCursorBidiLevel(0)
- , m_bColumnSelection(bColumnSel)
+ , m_bColumnSelection(false)
{
}
@@ -146,7 +145,7 @@ SwCursor::~SwCursor()
SwCursor* SwCursor::Create( SwPaM* pRing ) const
{
- return new SwCursor( *GetPoint(), pRing, false );
+ return new SwCursor( *GetPoint(), pRing );
}
bool SwCursor::IsReadOnlyAvailable() const
@@ -1224,7 +1223,7 @@ bool SwCursor::IsStartEndSentence( bool bEnd ) const
if( !bRet )
{
- SwCursor aCursor(*GetPoint(), nullptr, false);
+ SwCursor aCursor(*GetPoint(), nullptr);
SwPosition aOrigPos = *aCursor.GetPoint();
aCursor.GoSentence( bEnd ? SwCursor::END_SENT : SwCursor::START_SENT );
bRet = aOrigPos == *aCursor.GetPoint();
@@ -2110,7 +2109,7 @@ void SwCursor::RestoreSavePos()
}
SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
- : SwCursor( rPos, pRing, false )
+ : SwCursor( rPos, pRing )
{
m_bParked = false;
m_bChanged = false;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index e25b334..2ce2f00 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -540,7 +540,7 @@ void SwSelPaintRects::Get1PixelInLogic( const SwViewShell& rSh,
SwShellCursor::SwShellCursor(
const SwCursorShell& rCShell,
const SwPosition &rPos )
- : SwCursor(rPos,nullptr,false)
+ : SwCursor(rPos,nullptr)
, SwSelPaintRects(rCShell)
, m_pInitialPoint(SwPaM::GetPoint())
{}
@@ -550,7 +550,7 @@ SwShellCursor::SwShellCursor(
const SwPosition &rPos,
const Point& rPtPos,
SwPaM* pRing )
- : SwCursor(rPos, pRing, false)
+ : SwCursor(rPos, pRing)
, SwSelPaintRects(rCShell)
, m_MarkPt(rPtPos)
, m_PointPt(rPtPos)
@@ -715,14 +715,14 @@ bool SwShellCursor::IsAtValidPos( bool bPoint ) const
SwShellTableCursor::SwShellTableCursor( const SwCursorShell& rCursorSh,
const SwPosition& rPos )
- : SwCursor(rPos,nullptr,false), SwShellCursor(rCursorSh, rPos), SwTableCursor(rPos)
+ : SwCursor(rPos,nullptr), SwShellCursor(rCursorSh, rPos), SwTableCursor(rPos)
{
}
SwShellTableCursor::SwShellTableCursor( const SwCursorShell& rCursorSh,
const SwPosition& rMkPos, const Point& rMkPt,
const SwPosition& rPtPos, const Point& rPtPt )
- : SwCursor(rPtPos,nullptr,false), SwShellCursor(rCursorSh, rPtPos), SwTableCursor(rPtPos)
+ : SwCursor(rPtPos,nullptr), SwShellCursor(rCursorSh, rPtPos), SwTableCursor(rPtPos)
{
SetMark();
*GetMark() = rMkPos;
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index f67d2b68..38b57b9 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -106,14 +106,13 @@ VirtualDevice* DocumentDeviceManager::getVirtualDevice(/*[in]*/ bool bCreate ) c
return pRet;
}
-void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool )
+void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd )
{
assert ( !pVd->isDisposed() );
if ( mpVirDev.get() != pVd )
{
- if ( bDeleteOld )
- mpVirDev.disposeAndClear();
+ mpVirDev.disposeAndClear();
mpVirDev = pVd;
if ( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() && m_rDoc.GetDocumentSettingManager().get( DocumentSettingId::USE_VIRTUAL_DEVICE ) )
@@ -276,7 +275,7 @@ VirtualDevice& DocumentDeviceManager::CreateVirtualDevice_() const
aMapMode.SetMapUnit( MAP_TWIP );
pNewVir->SetMapMode( aMapMode );
- const_cast<DocumentDeviceManager*>(this)->setVirtualDevice( pNewVir, true, true );
+ const_cast<DocumentDeviceManager*>(this)->setVirtualDevice( pNewVir );
return *mpVirDev;
}
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 8d50969..e071f6f 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -895,7 +895,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
SvtSysLocale aSysLocale;
const LocaleDataWrapper* pLclData = aSysLocale.GetLocaleDataPtr();
const long nLang = pLclData->getLanguageTag().getLanguageType();
- bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc );
+ bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, aCalc );
#endif
// Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
@@ -992,7 +992,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
{
UpdateDBNumFields( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pField)), aCalc );
if( bCanFill )
- bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc );
+ bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, aCalc );
}
#endif
break;
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx
index 7e95b174..c40f1f1 100644
--- a/sw/source/core/doc/DocumentListItemsManager.cxx
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -66,13 +66,11 @@ void DocumentListItemsManager::removeListItem( const SwNodeNum& rNodeNum )
}
}
-OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum,
- const bool bWithNumber,
- const bool bWithSpacesForLevel ) const
+OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum ) const
{
return rNodeNum.GetTextNode()
- ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, bWithNumber,
- bWithNumber, bWithSpacesForLevel )
+ ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, true/*bWithNumber*/,
+ true/*bWithNumber*/, true/*bWithSpacesForLevel*/ )
: OUString();
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index d75eb64..544f45a 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -742,7 +742,7 @@ namespace sw { namespace mark
{
if ( pSaveBkmk )
{
- pSaveBkmk->push_back( SaveBookmark( true, true, *pMark, rStt, pSttIdx ) );
+ pSaveBkmk->push_back( SaveBookmark( *pMark, rStt, pSttIdx ) );
}
vMarksToDelete.push_back(ppMark);
}
@@ -1192,16 +1192,14 @@ const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const
{ return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); }
SaveBookmark::SaveBookmark(
- bool bSavePos,
- bool bSaveOtherPos,
const IMark& rBkmk,
const SwNodeIndex & rMvPos,
const SwIndex* pIdx)
: m_aName(rBkmk.GetName())
, m_aShortName()
, m_aCode()
- , m_bSavePos(bSavePos)
- , m_bSaveOtherPos(bSaveOtherPos)
+ , m_bSavePos(true)
+ , m_bSaveOtherPos(true)
, m_eOrigBkmType(IDocumentMarkAccess::GetType(rBkmk))
{
const IBookmark* const pBookmark = dynamic_cast< const IBookmark* >(&rBkmk);
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 4a5abec..9160825 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -166,8 +166,8 @@ class CompareFrameFormatText : public CompareData
{
const SwNodeIndex &m_rIndex;
public:
- CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
- : CompareData(rD, bRecordDiff)
+ CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex)
+ : CompareData(rD, true/*bRecordDiff*/)
, m_rIndex(rIndex)
{
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 7dc26e1..fe173a6 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -557,7 +557,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
{
SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck );
SwPosition aStart( *pNd, aStartIndex );
- SwCursor aCursor(aStart, nullptr, false);
+ SwCursor aCursor(aStart, nullptr);
SwPosition aOrigPos = *aCursor.GetPoint();
aCursor.GoSentence( SwCursor::START_SENT );
if( aOrigPos != *aCursor.GetPoint() )
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 2f456e4..770e91c 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1314,7 +1314,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
aRegH.RegisterInModify( pTNd, *pTNd );
if( pUndo )
- pUndo->AddNode( *pTNd, false );
+ pUndo->AddNode( *pTNd );
// directly set list style attribute is reset, otherwise empty
// list style is applied
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index d90cfd6..1fc9a2a 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -36,7 +36,7 @@
#include <pam.hxx>
#include <swundo.hxx>
#include <breakit.hxx>
-#include <crsskip.hxx>
+#include <swcrsr.hxx>
using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8871758..2eb305a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -692,7 +692,7 @@ static const SwTextNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl
// then find the "Anchor" (Body) position
Point aPt;
SwNode2Layout aNode2Layout( *pNd, pNd->GetIndex() );
- const SwFrame* pFrame = aNode2Layout.GetFrame( &aPt, nullptr, false );
+ const SwFrame* pFrame = aNode2Layout.GetFrame( &aPt, nullptr );
if( pFrame )
{
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 04a067f..4644188 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -668,14 +668,10 @@ void SwTextFormatColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLe
}
}
-void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle(
- const bool bResetOutlineLevel)
+void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle()
{
mbAssignedToOutlineStyle = false;
- if (bResetOutlineLevel)
- {
- ResetFormatAttr(RES_PARATR_OUTLINELEVEL);
- }
+ ResetFormatAttr(RES_PARATR_OUTLINELEVEL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index e18e74d..89e618e80 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -974,7 +974,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
if( nRel+nColWidth > 100 )
{
nColWidth = 100 - nRel;
- pColumn->SetWidthOption( nColWidth, true, false );
+ pColumn->SetWidthOption( nColWidth );
}
nRelMax += pColumn->GetMax();
nRel = nRel + nColWidth;
@@ -1008,7 +1008,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
// the next column gets the rest
sal_uInt16 nColWidth =
(sal_uInt16)((pColumn->GetMax() * nRelLeft) / nFixMax);
- pColumn->SetWidthOption( nColWidth, true, false );
+ pColumn->SetWidthOption( nColWidth );
}
}
}
@@ -1817,11 +1817,11 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
return true;
}
-void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc )
+void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail )
{
m_bBordersChanged = true;
- Resize( nAbsAvail, bRecalc );
+ Resize( nAbsAvail, true/*bRecalc*/ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index bf53bcd..19d7a79 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -336,8 +336,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
}
/** Calculate the Bitmap's position and the size within the passed rectangle */
-void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
- bool ) const
+void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
{
// Currently only used for scaling, cropping and mirroring the contour of graphics!
// Everything else is handled by GraphicObject
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index f337286..6ab9acc 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -372,8 +372,7 @@ const SwFormatVertOrient* SwNumFormat::GetGraphicOrientation() const
SwNumRule::SwNumRule( const OUString& rNm,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
- SwNumRuleType eType,
- bool bAutoFlg )
+ SwNumRuleType eType )
: maTextNodeList(),
maParagraphStyleList(),
mpNumRuleMap(nullptr),
@@ -382,7 +381,7 @@ SwNumRule::SwNumRule( const OUString& rNm,
mnPoolFormatId( USHRT_MAX ),
mnPoolHelpId( USHRT_MAX ),
mnPoolHlpFileId( UCHAR_MAX ),
- mbAutoRuleFlag( bAutoFlg ),
+ mbAutoRuleFlag( true ),
mbInvalidRuleFlag( true ),
mbContinusNum( false ),
mbAbsSpaces( false ),
@@ -631,12 +630,10 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFormat* pNumFormat )
}
}
-OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings,
- bool bOnlyArabic ) const
+OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings ) const
{
if (rNum.IsCounted())
- return MakeNumString(rNum.GetNumberVector(),
- bInclStrings, bOnlyArabic);
+ return MakeNumString(rNum.GetNumberVector(), bInclStrings);
return OUString();
}
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f6e3a40..3049790 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1372,12 +1372,12 @@ struct _InsULPara
SwTableBox* pLeftBox;
- _InsULPara( SwTableNode* pTNd, bool bUpperLower, bool bUpper,
+ _InsULPara( SwTableNode* pTNd,
SwTableBox* pLeft,
SwTableLine* pLine=nullptr, SwTableBox* pBox=nullptr )
: pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
pLeftBox( pLeft )
- { bUL_LR = bUpperLower; bUL = bUpper; }
+ { bUL_LR = true; bUL = true; }
void SetLeft( SwTableBox* pBox=nullptr )
{ bUL_LR = false; bUL = true; if( pBox ) pInsBox = pBox; }
@@ -1613,7 +1613,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
// This contains all Lines that are above the selected Area,
// thus they form a Upper/Lower Line
- _InsULPara aPara( pTableNd, true, true, pLeftBox, pInsLine );
+ _InsULPara aPara( pTableNd, pLeftBox, pInsLine );
// Move the overlapping upper/lower Lines of the selected Area
for (auto & it : pFndBox->GetLines().front()->GetBoxes())
@@ -2324,12 +2324,11 @@ SwTableBox* SwTableBox::FindNextBox( const SwTable& rTable,
// Find the next Box with content from this Line
SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTable,
- const SwTableBox* pSrchBox, bool bOvrTableLns ) const
+ const SwTableBox* pSrchBox ) const
{
if( !pSrchBox && GetTabLines().empty() )
return const_cast<SwTableBox*>(this);
- return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this,
- bOvrTableLns );
+ return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this );
}
static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 813dad9..45f9bfb 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2590,7 +2590,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
if ( pContent && pContent->IsTextFrame() )
{
const SwPosition aPos( *static_cast<const SwTextFrame*>(pContent)->GetTextNode() );
- const SwCursor aTmpCursor( aPos, nullptr, false );
+ const SwCursor aTmpCursor( aPos, nullptr );
::GetTableSel( aTmpCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
}
@@ -2884,7 +2884,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
aNew.SetHeightSizeType( ATT_MIN_SIZE );
// This position must not be in an overlapped box
const SwPosition aPos( *static_cast<const SwTextFrame*>(pContent)->GetTextNode() );
- const SwCursor aTmpCursor( aPos, nullptr, false );
+ const SwCursor aTmpCursor( aPos, nullptr );
SetRowHeight( aTmpCursor, aNew );
// For the new table model we're done, for the old one
// there might be another (sub)row to adjust...
@@ -4225,7 +4225,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : nullptr );
aRegH.RegisterInModify( pTextNode , *pTextNode );
if ( pUndo )
- pUndo->AddNode( *pTextNode , false );
+ pUndo->AddNode( *pTextNode );
SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFormatItem->Clone());
pNewItem->SetValue(OUString());
rSet.Put( *pNewItem );
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 1a53db7..f484721 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -804,7 +804,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
SwTabFrame* pTabFrame = pFrame->ImplFindTabFrame();
pTableLayout->BordersChanged(
- pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ), true );
+ pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ) );
}
SwTableFormatCmp::Delete( aFormatCmp );
::ClearFEShellTabCols();
@@ -899,7 +899,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
SwTabFrame* pTabFrame = pFrame->ImplFindTabFrame();
pTableLayout->BordersChanged(
- pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ), true );
+ pTableLayout->GetBrowseWidthByTabFrame( *pTabFrame ) );
}
::ClearFEShellTabCols();
getIDocumentState().SetModified();
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index fc8dcf5..0dff016 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -54,7 +54,6 @@
#include <pagedesc.hxx>
#include <fmtpdsc.hxx>
#include <breakit.hxx>
-#include <crsskip.hxx>
#include <SwStyleNameMapper.hxx>
#include <scriptinfo.hxx>
#include <rootfrm.hxx>
@@ -67,6 +66,7 @@
#include <calbck.hxx>
#include "ndole.hxx"
#include <memory>
+#include <swcrsr.hxx>
using namespace ::com::sun::star::i18n;
@@ -1112,12 +1112,11 @@ SwContentFrame *SwContentNode::getLayoutFrame( const SwRootFrame* _pRoot,
pPoint, pPos, bCalcFrame ));
}
-SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
- const bool bCalcFrame ) const
+SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint ) const
{
SwRect aRet;
SwContentFrame* pFrame = static_cast<SwContentFrame*>( ::GetFrameOfModify( nullptr, *const_cast<SwModify*>(static_cast<SwModify const *>(this)),
- FRM_CNTNT, pPoint, nullptr, bCalcFrame ) );
+ FRM_CNTNT, pPoint ) );
if( pFrame )
aRet = bPrtArea ? pFrame->Prt() : pFrame->Frame();
return aRet;
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index d738586..2665aa3 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -452,10 +452,9 @@ SwNode2Layout::~SwNode2Layout()
}
SwFrame* SwNode2Layout::GetFrame( const Point* pDocPos,
- const SwPosition *pPos,
- const bool bCalcFrame ) const
+ const SwPosition *pPos ) const
{
- return pImpl->GetFrame( pDocPos, pPos, bCalcFrame );
+ return pImpl->GetFrame( pDocPos, pPos, false/*bCalcFrame*/ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index c484396..7f7d373 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -37,7 +37,6 @@
#include <breakit.hxx>
#include <txtfld.hxx>
#include <fmtfld.hxx>
-#include <crsskip.hxx>
#include <txtfrm.hxx>
#include <scriptinfo.hxx>
#include <svl/ctloptions.hxx>
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 0d54fe0..70b13d3 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -178,7 +178,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
// by simulated cursor movements from the given first insert position
if( nMove )
{
- SwCursor aCursor( *pPos, nullptr, false);
+ SwCursor aCursor( *pPos, nullptr);
if( aCursor.UpDown( false, nMove, nullptr, 0 ) )
{
pInsertPos.reset( new SwPosition( *aCursor.GetPoint() ) );
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index cfc6962..273840b 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -42,22 +42,13 @@
#include <IDocumentContentOperations.hxx>
/// count field types with a ResId, if 0 count all
-size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const
+size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId ) const
{
const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
if(nResId == USHRT_MAX)
{
- if(!bUsed)
- return static_cast<sal_uInt16>(pFieldTypes->size());
-
- size_t nUsed = 0;
- for ( const auto pFieldType : *pFieldTypes )
- {
- if(IsUsed(*pFieldType))
- nUsed++;
- }
- return nUsed;
+ return static_cast<sal_uInt16>(pFieldTypes->size());
}
// all types with the same ResId
@@ -72,26 +63,13 @@ size_t SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const
}
/// get field types with a ResId, if 0 get all
-SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId, bool bUsed ) const
+SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId ) const
{
const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
if(nResId == USHRT_MAX && nField < pFieldTypes->size())
{
- if(!bUsed)
- return (*pFieldTypes)[nField];
-
- size_t nUsed = 0;
- for ( const auto pFieldType : *pFieldTypes )
- {
- if(IsUsed(*pFieldType))
- {
- if(nUsed == nField)
- return pFieldType;
- nUsed++;
- }
- }
- return nullptr;
+ return (*pFieldTypes)[nField];
}
size_t nIdx = 0;
@@ -100,12 +78,9 @@ SwFieldType* SwEditShell::GetFieldType(size_t nField, sal_uInt16 nResId, bool bU
// same ResId -> increment index
if(pFieldType->Which() == nResId)
{
- if (!bUsed || IsUsed(*pFieldType))
- {
- if(nIdx == nField)
- return pFieldType;
- nIdx++;
- }
+ if(nIdx == nField)
+ return pFieldType;
+ nIdx++;
}
}
return nullptr;
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 03bafcc..a92c676 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -53,7 +53,6 @@
#include <txtfrm.hxx>
#include <rootfrm.hxx>
#include <extinput.hxx>
-#include <crsskip.hxx>
#include <scriptinfo.hxx>
#include <unocrsrhelper.hxx>
#include <section.hxx>
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index f052fb6..c4e59c7 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -50,7 +50,6 @@
#include <mdiexp.hxx>
#include <statstr.hrc>
#include <cntfrm.hxx>
-#include <crsskip.hxx>
#include <splargs.hxx>
#include <redline.hxx>
#include <docary.hxx>
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 27c0c04..b5bb25a 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -856,12 +856,11 @@ sal_uInt16 SwEditShell::GetNodeNumStart( SwPaM* pPaM ) const
}
const SwNumRule * SwEditShell::SearchNumRule( const bool bNum,
- const bool bOutline,
int nNonEmptyAllowed,
OUString& sListId )
{
return GetDoc()->SearchNumRule( *(GetCursor()->Start()),
- false/*bForward*/, bNum, bOutline, nNonEmptyAllowed,
+ false/*bForward*/, bNum, false/*bOutline*/, nNonEmptyAllowed,
sListId );
}
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 5d0113a..fe5b50a 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -447,7 +447,7 @@ bool SwEditShell::SplitTable( sal_uInt16 eMode )
return bRet;
}
-bool SwEditShell::MergeTable( bool bWithPrev, sal_uInt16 nMode )
+bool SwEditShell::MergeTable( bool bWithPrev )
{
bool bRet = false;
SwPaM *pCursor = GetCursor();
@@ -456,7 +456,7 @@ bool SwEditShell::MergeTable( bool bWithPrev, sal_uInt16 nMode )
StartAllAction();
GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, nullptr);
- bRet = GetDoc()->MergeTable( *pCursor->GetPoint(), bWithPrev, nMode );
+ bRet = GetDoc()->MergeTable( *pCursor->GetPoint(), bWithPrev );
GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, nullptr);
ClearFEShellTabCols();
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index ed40e7c..a446e73 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -78,7 +78,7 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
pPageFrame->InvalidateFlyLayout();
pPageFrame->InvalidateContent();
- static_cast<SwFEShell*>(this)->SelectFlyFrame(*pFly, true);
+ static_cast<SwFEShell*>(this)->SelectFlyFrame(*pFly);
}
}
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 2a99fa2..6040898 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -563,7 +563,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
{
//JP 12.05.98: should this be in SelectFlyFrame???
pDestShell->Imp()->GetDrawView()->UnmarkAll();
- pDestShell->SelectFlyFrame( *pFlyFrame, true );
+ pDestShell->SelectFlyFrame( *pFlyFrame );
}
}
@@ -761,7 +761,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
{ // Now we have to look for insertion positions...
if( !nMove ) // Annotate the last given insert position
aStartPos = aInsertPos;
- SwCursor aCursor( aStartPos, nullptr, false);
+ SwCursor aCursor( aStartPos, nullptr);
// Check if we find another insert position by moving
// down the last given position
if( aCursor.UpDown( false, ++nMove, nullptr, 0 ) )
@@ -998,7 +998,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
SwFlyFrame* pFlyFrame = static_cast<SwFlyFrameFormat*>(pNew)->
GetFrame( &aPt );
if( pFlyFrame )
- SelectFlyFrame( *pFlyFrame, true );
+ SelectFlyFrame( *pFlyFrame );
// always pick the first FlyFrame only; the others
// were copied to the clipboard via Fly in Fly
break;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 82f103d..0367dd7 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -220,7 +220,7 @@ bool sw_ChkAndSetNewAnchor(
return ::lcl_FindAnchorPos( *pDoc, rFly.Frame().Pos(), rFly, rSet );
}
-void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame, bool bNew )
+void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame )
{
SET_CURR_SHELL( this );
@@ -232,7 +232,7 @@ void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame, bool bNew )
// The frames should not be selected by the document position, because
// it should have been selected!
SwViewShellImp *pImpl = Imp();
- if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
+ if( GetWin() )
{
OSL_ENSURE( rFrame.IsFlyFrame(), "SelectFlyFrame will einen Fly" );
@@ -750,7 +750,7 @@ const SwFrameFormat *SwFEShell::NewFlyFrame( const SfxItemSet& rSet, bool bAnchV
{
SwFlyFrame* pFrame = pRet->GetFrame( &aPt );
if( pFrame )
- SelectFlyFrame( *pFrame, true );
+ SelectFlyFrame( *pFrame );
else
{
GetLayout()->SetAssertFlyPages();
@@ -839,7 +839,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
pPageFrame->InvalidateFlyLayout();
pPageFrame->InvalidateContent();
- SelectFlyFrame( *pFrame, true );
+ SelectFlyFrame( *pFrame );
}
else
GetLayout()->SetAssertFlyPages();
@@ -869,7 +869,7 @@ SwFlyFrameFormat* SwFEShell::InsertObject( const svt::EmbeddedObjectRef& xObj,
SwFlyFrame* pFrame = pFormat->GetFrame( &aPt );
if( pFrame )
- SelectFlyFrame( *pFrame, true );
+ SelectFlyFrame( *pFrame );
else
GetLayout()->SetAssertFlyPages();
}
@@ -1052,7 +1052,7 @@ bool SwFEShell::SetFlyFrameAttr( SfxItemSet& rSet )
bRet = true;
SwFlyFrame* pFrame = pFlyFormat->GetFrame( &aPt );
if( pFrame )
- SelectFlyFrame( *pFrame, true );
+ SelectFlyFrame( *pFrame );
else
GetLayout()->SetAssertFlyPages();
}
@@ -1194,7 +1194,7 @@ void SwFEShell::SetFrameFormat( SwFrameFormat *pNewFormat, bool bKeepOrient, Poi
{
SwFlyFrame* pFrame = pFlyFormat->GetFrame( &aPt );
if( pFrame )
- SelectFlyFrame( *pFrame, true );
+ SelectFlyFrame( *pFrame );
else
GetLayout()->SetAssertFlyPages();
}
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 29bf808..a6e4b8d 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -132,7 +132,7 @@ void SwFEShell::ParkCursorInTab()
/* Set cursor to end of selection to ensure IsLastCellInRow works
properly. */
{
- SwCursor aTmpCursor( aEndPos, nullptr, false );
+ SwCursor aTmpCursor( aEndPos, nullptr );
*pSwCursor = aTmpCursor;
}
@@ -146,13 +146,13 @@ void SwFEShell::ParkCursorInTab()
it to the next cell. */
{
- SwCursor aTmpCursor( aStartPos, nullptr, false );
+ SwCursor aTmpCursor( aStartPos, nullptr );
*pSwCursor = aTmpCursor;
}
if (! pSwCursor->GoPrevCell())
{
- SwCursor aTmpCursor( aEndPos, nullptr, false );
+ SwCursor aTmpCursor( aEndPos, nullptr );
*pSwCursor = aTmpCursor;
pSwCursor->GoNextCell();
}
@@ -164,13 +164,13 @@ void SwFEShell::ParkCursorInTab()
to the previous cell. */
{
- SwCursor aTmpCursor( aEndPos, nullptr, false );
+ SwCursor aTmpCursor( aEndPos, nullptr );
*pSwCursor = aTmpCursor;
}
if (! pSwCursor->GoNextCell())
{
- SwCursor aTmpCursor( aStartPos, nullptr, false );
+ SwCursor aTmpCursor( aStartPos, nullptr );
*pSwCursor = aTmpCursor;
pSwCursor->GoPrevCell();
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index b67b1fe..35bf7b5 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -502,7 +502,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rText, con
{
const Point aPt(GetCursorDocPos());
if (SwFlyFrame* pFrame = pFlyFormat->GetFrame(&aPt))
- SelectFlyFrame(*pFrame, true);
+ SelectFlyFrame(*pFrame);
}
EndUndo();
EndAllActionAndCall();
diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx
index 25a049c..a4991ec 100644
--- a/sw/source/core/inc/DocumentDeviceManager.hxx
+++ b/sw/source/core/inc/DocumentDeviceManager.hxx
@@ -47,7 +47,7 @@ public:
VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override;
- void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) override;
+ void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) override;
OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override;
diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx
index c08c19e5..34e9fcc 100644
--- a/sw/source/core/inc/DocumentListItemsManager.hxx
+++ b/sw/source/core/inc/DocumentListItemsManager.hxx
@@ -37,9 +37,7 @@ public:
void addListItem( const SwNodeNum& rNodeNum ) override;
void removeListItem( const SwNodeNum& rNodeNum ) override;
- OUString getListItemText( const SwNodeNum& rNodeNum,
- const bool bWithNumber = true,
- const bool bWithSpacesForLevel = false ) const override;
+ OUString getListItemText( const SwNodeNum& rNodeNum ) const override;
void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const override;
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 5b5b716..1d0a1fc 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -76,7 +76,7 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
- void AddNode( const SwTextNode& rNd, bool bResetLRSpace );
+ void AddNode( const SwTextNode& rNd );
SwHistory* GetHistory() { return pHistory; }
};
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index d33ea55..8ddc89f 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -57,7 +57,7 @@ public:
SwCellFrame* GetPreviousCell() const;
// used for rowspan stuff:
- const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTab ) const;
+ const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart ) const;
long GetLayoutRowSpan() const;
DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrame)
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 60ac54e..49fe707 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -397,7 +397,7 @@ class SwOrderIter
const bool m_bFlysOnly;
public:
- SwOrderIter( const SwPageFrame *pPage, bool bFlysOnly = true );
+ SwOrderIter( const SwPageFrame *pPage );
void Current( const SdrObject *pNew ) { m_pCurrent = pNew; }
const SdrObject *operator()() const { return m_pCurrent; }
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 566ca54..64e91e4 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -60,7 +60,7 @@ protected:
virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override;
virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override;
- long CalcRel( const SwFormatFrameSize &rSz, bool bWidth ) const;
+ long CalcRel( const SwFormatFrameSize &rSz ) const;
public:
// --> #i28701#
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 36db7b0..6322742 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -46,8 +46,7 @@ namespace sw { namespace mark
class SaveBookmark
{
public:
- SaveBookmark(bool bSavePos,
- bool bSaveOtherPos,
+ SaveBookmark(
const ::sw::mark::IMark& rBkmk,
const SwNodeIndex& rMvPos,
const SwIndex* pIdx =nullptr);
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 292fd7b..7fb2fcd 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -67,9 +67,7 @@ public:
SwLayoutFrame* UpperFrame( SwFrame* &rpFrame, const SwNode& rNode );
void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd );
- SwFrame *GetFrame( const Point* pDocPos = nullptr,
- const SwPosition *pPos = nullptr,
- const bool bCalcFrame = true ) const;
+ SwFrame *GetFrame( const Point* pDocPos, const SwPosition *pPos ) const;
};
#endif
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index ddd7ba9..6ed54db 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -53,7 +53,7 @@ public:
virtual bool GetCursorOfst(SwPosition* pPos, Point& aPoint,
SwCursorMoveState* = nullptr, bool bTestBackground = false) const override;
- void GetGrfArea( SwRect &rRect, SwRect * = nullptr, bool bMirror = true ) const;
+ void GetGrfArea( SwRect &rRect, SwRect * = nullptr ) const;
bool IsTransparent() const;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index e902fb6..1b5a008 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -338,7 +338,7 @@ class SwHistory
public:
typedef std::vector<SwHistoryHint*>::iterator SwpHstry_iterator;
- SwHistory( sal_uInt16 nInitSz = 0 );
+ SwHistory();
~SwHistory();
// delete History
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 3a08805..f5de71c 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -146,7 +146,7 @@ class SwTextFly
\param[in] rPortion
Scope: document global.
*/
- SwRect _GetFrame( const SwRect &rPortion, bool bTop ) const;
+ SwRect _GetFrame( const SwRect &rPortion ) const;
SwAnchoredObjList* InitAnchoredObjList();
@@ -356,7 +356,7 @@ inline void SwTextFly::SetNextTop( long nNew ) const
inline SwRect SwTextFly::GetFrame( const SwRect &rRect ) const
{
- return bOn ? _GetFrame( rRect, true/*bTop*/ ) : SwRect();
+ return bOn ? _GetFrame( rRect ) : SwRect();
}
inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew )
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 23ad78c..316d974 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1529,7 +1529,7 @@ SwCellFrame* SwCellFrame::GetFollowCell() const
if ( !pRow->GetNext() )
{
- pThisCell = &pThisCell->FindStartEndOfRowSpanCell( false, true );
+ pThisCell = &pThisCell->FindStartEndOfRowSpanCell( false );
pRow = pThisCell->GetUpper();
}
}
@@ -1576,7 +1576,7 @@ SwCellFrame* SwCellFrame::GetPreviousCell() const
if ( pMasterRow )
pRet = lcl_FindCorrespondingCellFrame( *static_cast<const SwRowFrame*>(pRow), *this, *pMasterRow, false );
if ( pRet && pRet->GetTabBox()->getRowSpan() < 1 )
- pRet = &const_cast<SwCellFrame&>(pRet->FindStartEndOfRowSpanCell( true, true ));
+ pRet = &const_cast<SwCellFrame&>(pRet->FindStartEndOfRowSpanCell( true ));
}
}
}
@@ -1585,7 +1585,7 @@ SwCellFrame* SwCellFrame::GetPreviousCell() const
}
// --> NEW TABLES
-const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTableOnly ) const
+const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart ) const
{
const SwCellFrame* pRet = nullptr;
@@ -1604,31 +1604,28 @@ const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCu
const SwTable* pTable = pTableFrame->GetTable();
sal_uInt16 nMax = USHRT_MAX;
- if ( bCurrentTableOnly )
- {
- const SwFrame* pCurrentRow = GetUpper();
- const bool bDoNotEnterHeadline = bStart && pTableFrame->IsFollow() &&
+ const SwFrame* pCurrentRow = GetUpper();
+ const bool bDoNotEnterHeadline = bStart && pTableFrame->IsFollow() &&
!pTableFrame->IsInHeadline( *pCurrentRow );
- // check how many rows we are allowed to go up or down until we reach the end of
- // the current table frame:
- nMax = 0;
- while ( bStart ? pCurrentRow->GetPrev() : pCurrentRow->GetNext() )
+ // check how many rows we are allowed to go up or down until we reach the end of
+ // the current table frame:
+ nMax = 0;
+ while ( bStart ? pCurrentRow->GetPrev() : pCurrentRow->GetNext() )
+ {
+ if ( bStart )
{
- if ( bStart )
- {
- // do not enter a repeated headline:
- if ( bDoNotEnterHeadline && pTableFrame->IsFollow() &&
- pTableFrame->IsInHeadline( *pCurrentRow->GetPrev() ) )
- break;
+ // do not enter a repeated headline:
+ if ( bDoNotEnterHeadline && pTableFrame->IsFollow() &&
+ pTableFrame->IsInHeadline( *pCurrentRow->GetPrev() ) )
+ break;
- pCurrentRow = pCurrentRow->GetPrev();
- }
- else
- pCurrentRow = pCurrentRow->GetNext();
-
- ++nMax;
+ pCurrentRow = pCurrentRow->GetPrev();
}
+ else
+ pCurrentRow = pCurrentRow->GetNext();
+
+ ++nMax;
}
// By passing the nMax value for Find*OfRowSpan (in case of bCurrentTableOnly
@@ -1646,23 +1643,10 @@ const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart, bool bCu
{
const SwTabFrame* pMasterTable = static_cast<const SwTabFrame*>(pMasterCell->GetUpper()->GetUpper());
- if ( bCurrentTableOnly )
+ if ( pMasterTable == pTableFrame )
{
- if ( pMasterTable == pTableFrame )
- {
- pRet = pMasterCell;
- break;
- }
- }
- else
- {
- if ( pMasterTable == pTableFrame ||
- ( (bStart && pMasterTable->IsAnFollow(pTableFrame)) ||
- (!bStart && pTableFrame->IsAnFollow(pMasterTable)) ) )
- {
- pRet = pMasterCell;
- break;
- }
+ pRet = pMasterCell;
+ break;
}
}
}
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 42070f9..603c3f4 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2497,7 +2497,7 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon& rContour,
SwRect aClip;
SwRect aOrig;
Lower()->Calc(pRenderContext);
- static_cast<const SwNoTextFrame*>(Lower())->GetGrfArea( aClip, &aOrig, false );
+ static_cast<const SwNoTextFrame*>(Lower())->GetGrfArea( aClip, &aOrig );
// OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)>
// in order to avoid that graphic has to be loaded for contour scale.
//SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() );
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 5d53ab3..25ef901 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2225,10 +2225,10 @@ SwBorderAttrs *SwBorderAttrAccess::Get()
return static_cast<SwBorderAttrs*>(SwCacheAccess::Get());
}
-SwOrderIter::SwOrderIter( const SwPageFrame *pPg, bool bFlys ) :
+SwOrderIter::SwOrderIter( const SwPageFrame *pPg ) :
m_pPage( pPg ),
m_pCurrent( nullptr ),
- m_bFlysOnly( bFlys )
+ m_bFlysOnly( true )
{
}
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index e7625d9..71b642d 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -154,7 +154,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
{
bSuccess = false;
_InvalidatePrevObjs( _rAnchoredObj );
- _InvalidateFollowObjs( _rAnchoredObj, true );
+ _InvalidateFollowObjs( _rAnchoredObj );
}
// format anchor text frame, if wrapping style influence of the object
@@ -211,7 +211,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
mrAnchorTextFrame.InvalidatePos();
bSuccess = false;
_InvalidatePrevObjs( _rAnchoredObj );
- _InvalidateFollowObjs( _rAnchoredObj, true );
+ _InvalidateFollowObjs( _rAnchoredObj );
}
else
{
@@ -267,7 +267,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
// Invalidate object and following objects for the restart of the
// layout process
- _InvalidateFollowObjs( _rAnchoredObj, true );
+ _InvalidateFollowObjs( _rAnchoredObj );
}
else
{
@@ -395,7 +395,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
mrAnchorTextFrame.InvalidatePos();
bSuccess = false;
_InvalidatePrevObjs( *pObj );
- _InvalidateFollowObjs( *pObj, true );
+ _InvalidateFollowObjs( *pObj );
}
else
{
@@ -436,7 +436,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
// Invalidate object and following objects for the restart of the
// layout process
- _InvalidateFollowObjs( *pObj, true );
+ _InvalidateFollowObjs( *pObj );
}
else
{
@@ -491,13 +491,9 @@ void SwObjectFormatterTextFrame::_InvalidatePrevObjs( SwAnchoredObject& _rAnchor
}
}
-void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj,
- const bool _bInclObj )
+void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj )
{
- if ( _bInclObj )
- {
- _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence();
- }
+ _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence();
const SwSortedObjs* pObjs = GetPageFrame().GetSortedObjs();
if ( pObjs )
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index 8220e60..6932457 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -56,13 +56,8 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter
@param _rAnchoredObj
reference to anchored object - objects, anchored after this one will
be invalidated.
-
- @param _bInclObj
- boolean indicates, if given anchored object <_rAnchoredObj> also have
- to be invalidated.
*/
- void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj,
- const bool _bInclObj );
+ void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj );
/** method to determine first anchored object, whose 'anchor is moved
forward'.
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0e2fed8..de4f749 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -335,7 +335,7 @@ static void lcl_ShrinkCellsAndAllContent( SwRowFrame& rRow )
{
// NEW TABLES
SwCellFrame& rToAdjust = pCurrMasterCell->GetTabBox()->getRowSpan() < 1 ?
- const_cast<SwCellFrame&>(pCurrMasterCell->FindStartEndOfRowSpanCell( true, true )) :
+ const_cast<SwCellFrame&>(pCurrMasterCell->FindStartEndOfRowSpanCell( true )) :
*pCurrMasterCell;
// #i26945#
@@ -441,7 +441,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, SwRowFrame& rDestLine )
// NEW TABLES
SwCellFrame* pDestCell = static_cast<SwCellFrame*>(pCurrDestCell);
if ( pDestCell->GetTabBox()->getRowSpan() < 1 )
- pDestCell = & const_cast<SwCellFrame&>(pDestCell->FindStartEndOfRowSpanCell( true, true ));
+ pDestCell = & const_cast<SwCellFrame&>(pDestCell->FindStartEndOfRowSpanCell( true ));
// Find last content
SwFrame* pFrame = pDestCell->GetLastLower();
@@ -1309,7 +1309,7 @@ void SwInvalidateAll( SwFrame *pFrame, long nBottom )
SwCellFrame* pThisCell = dynamic_cast<SwCellFrame*>(pFrame);
if ( pThisCell && pThisCell->GetTabBox()->getRowSpan() < 1 )
{
- pToInvalidate = & const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true, true ));
+ pToInvalidate = & const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true ));
pToInvalidate->_InvalidatePos();
pToInvalidate->_InvalidateSize();
pToInvalidate->_InvalidatePrt();
@@ -1472,7 +1472,7 @@ static bool lcl_InnerCalcLayout( SwFrame *pFrame,
SwCellFrame* pThisCell = dynamic_cast<SwCellFrame*>(pFrame);
if ( pThisCell && pThisCell->GetTabBox()->getRowSpan() < 1 )
{
- SwCellFrame& rToCalc = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true, true ));
+ SwCellFrame& rToCalc = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( true ));
bRet |= !rToCalc.IsValid();
rToCalc.Calc(pRenderContext);
if ( rToCalc.Lower() )
@@ -1540,7 +1540,7 @@ static void lcl_RecalcRow( SwRowFrame& rRow, long nBottom )
if ( bCalc )
{
SwCellFrame& rToRecalc = 0 == i ?
- const_cast<SwCellFrame&>(pCellFrame->FindStartEndOfRowSpanCell( true, true )) :
+ const_cast<SwCellFrame&>(pCellFrame->FindStartEndOfRowSpanCell( true )) :
*pCellFrame;
bCheck |= SwContentFrame::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false );
}
@@ -2725,7 +2725,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
//the value applies to the screen width in the BrowseView.
const SwFormatFrameSize &rSz = GetFormat()->GetFrameSize();
// OD 14.03.2003 #i9040# - adjust variable name.
- const SwTwips nWishedTableWidth = CalcRel( rSz, true );
+ const SwTwips nWishedTableWidth = CalcRel( rSz );
bool bCheckBrowseWidth = false;
@@ -3824,7 +3824,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrame* _pRow,
// Height of the last cell of a row span is height of master cell
// minus the height of the other rows which are covered by the master
// cell:
- const SwCellFrame& rMaster = pLow->FindStartEndOfRowSpanCell( true, true );
+ const SwCellFrame& rMaster = pLow->FindStartEndOfRowSpanCell( true );
nTmp = ::lcl_CalcMinCellHeight( &rMaster, _bConsiderObjs );
const SwFrame* pMasterRow = rMaster.GetUpper();
while ( pMasterRow && pMasterRow != _pRow )
@@ -4143,7 +4143,7 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight )
// height of the cell starting the row span
if ( pCellFrame->GetLayoutRowSpan() < 1 )
{
- pToAdjust = const_cast< SwCellFrame*>(&pCellFrame->FindStartEndOfRowSpanCell( true, true ));
+ pToAdjust = const_cast< SwCellFrame*>(&pCellFrame->FindStartEndOfRowSpanCell( true ));
pToAdjustRow = pToAdjust->GetUpper();
}
else
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 832a2b6..a46ba4c 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2262,7 +2262,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
const SwCellFrame* pThisCell = dynamic_cast<const SwCellFrame*>(this);
if ( pThisCell && pThisCell->GetLayoutRowSpan() > 1 )
{
- SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false, true ));
+ SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false ));
if ( -1 == rEndCell.GetTabBox()->getRowSpan() )
pToGrow = rEndCell.GetUpper();
else
@@ -2460,7 +2460,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
// NEW TABLES
if ( pThisCell && pThisCell->GetLayoutRowSpan() > 1 )
{
- SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false, true ));
+ SwCellFrame& rEndCell = const_cast<SwCellFrame&>(pThisCell->FindStartEndOfRowSpanCell( false ));
pToShrink = rEndCell.GetUpper();
}
@@ -3115,7 +3115,7 @@ void SwLayoutFrame::InvaPercentLowers( SwTwips nDiff )
} while ( pFrame && IsAnLower( pFrame ) ) ;
}
-long SwLayoutFrame::CalcRel( const SwFormatFrameSize &rSz, bool ) const
+long SwLayoutFrame::CalcRel( const SwFormatFrameSize &rSz ) const
{
long nRet = rSz.GetWidth(),
nPercent = rSz.GetWidthPercent();
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 4e2958c..3807f8f 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -913,7 +913,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
const SwPageFrame* pObjPage = rFlyAtContentFrame.FindPageFrame();
const SwFrame* pObjContext = ::FindKontext( &rAnchorTextFrame, FRM_COLUMN );
sal_uLong nObjIndex = rAnchorTextFrame.GetTextNode()->GetIndex();
- SwOrderIter aIter( pObjPage, true );
+ SwOrderIter aIter( pObjPage );
const SwFlyFrame* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrame();
while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() )
{
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index e6fc6c4..b9b72cd 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -51,7 +51,6 @@
#include <doc.hxx>
#include <IDocumentOutlineNodes.hxx>
#include <docary.hxx>
-#include <crsskip.hxx>
#include <mdiexp.hxx>
#include <docufld.hxx>
#include <ftnidx.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 577506e..92a43c0 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -453,8 +453,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
if( nBreakPos > nCutPos && nBreakPos != COMPLETE_STRING )
{
const sal_Int32 nHangingLen = nBreakPos - nCutPos;
- SwPosSize aTmpSize = rInf.GetTextSize( &rSI, nCutPos,
- nHangingLen, 0 );
+ SwPosSize aTmpSize = rInf.GetTextSize( &rSI, nCutPos, nHangingLen );
aTmpSize.Width(aTmpSize.Width() + nLeftRightBorderSpace);
OSL_ENSURE( !pHanging, "A hanging portion is hanging around" );
pHanging = new SwHangingPortion( aTmpSize );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ed7d416..de21e6c 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -934,27 +934,15 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r
const_cast<SwTextPaintInfo&>(rInf).SetPos( aOldPos );
}
-void SwTextPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
- bool bRetouche ) const
+void SwTextPaintInfo::DrawRect( const SwRect &rRect, bool bRetouche ) const
{
if ( OnWin() || !bRetouche )
{
if( aTextFly.IsOn() )
const_cast<SwTextPaintInfo*>(this)->GetTextFly().
- DrawFlyRect( m_pOut, rRect, *this, bNoGraphic );
- else if ( bNoGraphic )
- m_pOut->DrawRect( rRect.SVRect() );
+ DrawFlyRect( m_pOut, rRect, *this, true/*bNoGraphic*/ );
else
- {
- if(pBrushItem != reinterpret_cast<SvxBrushItem*>(-1))
- {
- ::DrawGraphic( pBrushItem, m_pOut, aItemRect, rRect );
- }
- else
- {
- OSL_ENSURE(false, "DrawRect: Uninitialized BrushItem!" );
- }
- }
+ m_pOut->DrawRect( rRect.SVRect() );
}
}
@@ -1205,7 +1193,7 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
pTmpOut->SetFillColor(aFillColor);
pTmpOut->SetLineColor();
- DrawRect( aIntersect, true, false );
+ DrawRect( aIntersect, false );
pTmpOut->Pop();
}
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index c463bd3..b1ae3b5 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -270,7 +270,7 @@ public:
sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff,
vcl::TextLayoutCache const* = nullptr) const;
inline SwPosSize GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIdx,
- const sal_Int32 nLen, const sal_uInt16 nComp ) const;
+ const sal_Int32 nLen ) const;
inline SwPosSize GetTextSize( const OUString &rText ) const;
sal_Int32 GetTextBreak( const long nLineWidth,
@@ -415,13 +415,11 @@ public:
inline void DrawText( const SwLinePortion &rPor, const sal_Int32 nLen,
const bool bKern = false ) const;
inline void DrawMarkedText( const SwLinePortion &rPor, const sal_Int32 nLen,
- const bool bKern,
const bool bWrong,
const bool bSmartTags,
const bool bGrammarCheck ) const;
- void DrawRect( const SwRect &rRect, bool bNoGraphic = false,
- bool bRetouche = true ) const;
+ void DrawRect( const SwRect &rRect, bool bRetouche ) const;
void DrawTab( const SwLinePortion &rPor ) const;
void DrawLineBreak( const SwLinePortion &rPor ) const;
@@ -747,10 +745,9 @@ inline SwPosSize SwTextSizeInfo::GetTextSize( const OUString &rText ) const
inline SwPosSize SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI,
const sal_Int32 nNewIdx,
- const sal_Int32 nNewLen,
- const sal_uInt16 nCompress ) const
+ const sal_Int32 nNewLen ) const
{
- return GetTextSize( m_pOut, pSI, *m_pText, nNewIdx, nNewLen, nCompress );
+ return GetTextSize( m_pOut, pSI, *m_pText, nNewIdx, nNewLen, 0/*nCompress*/ );
}
inline SwTwips SwTextPaintInfo::GetPaintOfst() const
@@ -779,12 +776,11 @@ inline void SwTextPaintInfo::DrawText( const SwLinePortion &rPor,
inline void SwTextPaintInfo::DrawMarkedText( const SwLinePortion &rPor,
const sal_Int32 nLength,
- const bool bKern,
const bool bWrong,
const bool bSmartTags,
const bool bGrammarCheck ) const
{
- const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck );
+ const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, false/*bKern*/, bWrong, bSmartTags, bGrammarCheck );
}
inline sal_Int32 SwTextFormatInfo::GetReformatStart() const
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 90a290f..0107991 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -85,7 +85,7 @@ void SwExpandPortion::Paint( const SwTextPaintInfo &rInf ) const
// ST2
if ( rInf.GetSmartTags() || rInf.GetGrammarCheckList() )
- rInf.DrawMarkedText( *this, rInf.GetLen(), false, false,
+ rInf.DrawMarkedText( *this, rInf.GetLen(), false,
nullptr != rInf.GetSmartTags(), nullptr != rInf.GetGrammarCheckList() );
else
rInf.DrawText( *this, rInf.GetLen() );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index bd6ee06..0f02b03 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -548,7 +548,7 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf ) const
const bool bSmartTags = nullptr != pSmarttags;
if ( bWrong || bSmartTags || bGrammarCheck )
- rInf.DrawMarkedText( *this, rInf.GetLen(), false, bWrong, bSmartTags, bGrammarCheck );
+ rInf.DrawMarkedText( *this, rInf.GetLen(), bWrong, bSmartTags, bGrammarCheck );
else
rInf.DrawText( *this, rInf.GetLen() );
}
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 8c041c6..341a2eb 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -388,14 +388,13 @@ void SwTextFly::CtorInitTextFly( const SwTextFrame *pFrame )
nIndex = ULONG_MAX;
}
-SwRect SwTextFly::_GetFrame( const SwRect &rRect, bool bTop ) const
+SwRect SwTextFly::_GetFrame( const SwRect &rRect ) const
{
SwRect aRet;
if( ForEach( rRect, &aRet, true ) )
{
SWRECTFN( pCurrFrame )
- if( bTop )
- (aRet.*fnRect->fnSetTop)( (rRect.*fnRect->fnGetTop)() );
+ (aRet.*fnRect->fnSetTop)( (rRect.*fnRect->fnGetTop)() );
// Do not always adapt the bottom
const SwTwips nRetBottom = (aRet.*fnRect->fnGetBottom)();
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index cdf6e98..e340e02 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -957,11 +957,10 @@ void SwHistoryChangeCharFormat::SetInDoc(SwDoc * pDoc, bool )
}
// <- #i27615#
-SwHistory::SwHistory( sal_uInt16 nInitSz )
+SwHistory::SwHistory()
: m_SwpHstry()
, m_nEndDiff( 0 )
{
- m_SwpHstry.reserve( (sal_uInt8)nInitSz );
}
SwHistory::~SwHistory()
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index a313693..fc9ede2 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -204,7 +204,7 @@ void SwUndoDelNum::RepeatImpl(::sw::RepeatContext & rContext)
rContext.GetDoc().DelNumRules(rContext.GetRepeatPaM());
}
-void SwUndoDelNum::AddNode( const SwTextNode& rNd, bool )
+void SwUndoDelNum::AddNode( const SwTextNode& rNd )
{
if( rNd.GetNumRule() )
{
diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx
index 314ee8f..53d7284 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -30,7 +30,7 @@ sw::DocDisposingHint::~DocDisposingHint() {}
IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor )
SwUnoCursor::SwUnoCursor( const SwPosition &rPos, SwPaM* pRing )
- : SwCursor( rPos, pRing, false )
+ : SwCursor( rPos, pRing )
, SwModify(nullptr)
, m_bRemainInSection(true)
, m_bSkipOverHiddenSections(false)
@@ -157,10 +157,10 @@ bool SwUnoCursor::IsSelOvr( int eFlags )
}
SwUnoTableCursor::SwUnoTableCursor(const SwPosition& rPos)
- : SwCursor(rPos, nullptr, false)
+ : SwCursor(rPos, nullptr)
, SwUnoCursor(rPos)
, SwTableCursor(rPos)
- , m_aTableSel(rPos, nullptr, false)
+ , m_aTableSel(rPos, nullptr)
{
SetRemainInSection(false);
}
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 22aa10a..56de02b 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -99,7 +99,6 @@
#include <fmtclds.hxx>
#include <dcontact.hxx>
#include <SwStyleNameMapper.hxx>
-#include <crsskip.hxx>
#include <sortopt.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <memory>
@@ -750,8 +749,7 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
(void) bSuccess;
SwUnoCursorHelper::SelectPam(*pUnoCursor, true);
- pCurrent->Left(rText.getLength(),
- CRSR_SKIP_CHARS, false, false);
+ pCurrent->Left(rText.getLength());
}
pCurrent = static_cast<SwCursor*>(pCurrent->GetNext());
} while (pCurrent != pUnoCursor);
@@ -940,7 +938,7 @@ throw (uno::RuntimeException, std::exception)
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
- bool bRet = rUnoCursor.Left( nCount, CRSR_SKIP_CHARS, false, false);
+ bool bRet = rUnoCursor.Left( nCount);
if (CURSOR_META == m_pImpl->m_eType)
{
bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText,
@@ -959,7 +957,7 @@ throw (uno::RuntimeException, std::exception)
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
- bool bRet = rUnoCursor.Right(nCount, CRSR_SKIP_CHARS, false, false);
+ bool bRet = rUnoCursor.Right(nCount);
if (CURSOR_META == m_pImpl->m_eType)
{
bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText,
@@ -1241,7 +1239,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
if (rUnoCursor.GetContentNode() &&
(pPoint->nContent == rUnoCursor.GetContentNode()->Len()))
{
- rUnoCursor.Right(1, CRSR_SKIP_CHARS, false, false);
+ rUnoCursor.Right(1);
}
else
{
@@ -1284,14 +1282,14 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s
// start of paragraph?
if (pPoint->nContent == 0)
{
- rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false);
+ rUnoCursor.Left(1);
}
else
{
rUnoCursor.GoPrevWordWT( i18n::WordType::DICTIONARY_WORD );
if (pPoint->nContent == 0)
{
- rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false);
+ rUnoCursor.Left(1);
}
}
@@ -1394,7 +1392,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
if (!bRet && (!rUnoCursor.HasMark() ||
*rUnoCursor.GetPoint() == *rUnoCursor.GetMark()))
{
- SwCursor aCursor(*rUnoCursor.GetPoint(),nullptr,false);
+ SwCursor aCursor(*rUnoCursor.GetPoint(),nullptr);
SwPosition aOrigPos = *aCursor.GetPoint();
aCursor.GoSentence(SwCursor::START_SENT );
bRet = aOrigPos == *aCursor.GetPoint();
@@ -1418,7 +1416,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
if (!bRet && (!rUnoCursor.HasMark() ||
*rUnoCursor.GetPoint() == *rUnoCursor.GetMark()))
{
- SwCursor aCursor(*rUnoCursor.GetPoint(), nullptr, false);
+ SwCursor aCursor(*rUnoCursor.GetPoint(), nullptr);
SwPosition aOrigPos = *aCursor.GetPoint();
aCursor.GoSentence(SwCursor::END_SENT);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list