[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 27 12:47:58 UTC 2017
sw/inc/fesh.hxx | 2 +-
sw/inc/fldbas.hxx | 2 +-
sw/inc/fmtmeta.hxx | 8 ++++----
sw/inc/gotodlg.hxx | 4 ++--
sw/inc/iodetect.hxx | 2 +-
sw/inc/ndarr.hxx | 2 +-
sw/inc/pam.hxx | 6 +++---
sw/inc/swabstdlg.hxx | 2 +-
sw/inc/swcrsr.hxx | 12 ++++++------
sw/inc/swtable.hxx | 4 ++--
sw/inc/tblsel.hxx | 4 ++--
sw/inc/unoparagraph.hxx | 2 +-
sw/inc/usrfld.hxx | 2 +-
sw/qa/core/macros-test.cxx | 2 +-
sw/qa/extras/inc/swmodeltestbase.hxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 10 +++++-----
sw/source/core/doc/tblcpy.cxx | 4 ++--
sw/source/core/frmedt/fetab.cxx | 2 +-
sw/source/core/undo/untbl.cxx | 2 +-
sw/source/core/unocore/unoobj.cxx | 2 +-
sw/source/core/unocore/unorefmk.cxx | 2 +-
sw/source/ui/dialog/swdlgfact.hxx | 2 +-
22 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 9c060802747e0b058a162e7891508d888c6e1a73
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Nov 24 17:13:41 2017 +0200
loplugin:countusersofdefaultparams in sw (2)
Change-Id: Ibb045a0b7750cf6807d6f5caba86a9e6e59828ae
Reviewed-on: https://gerrit.libreoffice.org/45237
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index db61f9a2d44a..9756cd9321ae 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -643,7 +643,7 @@ public:
TableMergeErr MergeTab(); /**< Merge selected parts of table */
/// Split cell vertically or horizontally.
- bool SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight = false );
+ bool SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight );
bool Sort(const SwSortOptions&); //Sortieren.
void SetRowHeight( const SwFormatFrameSize &rSz );
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 9cbf76256998..a71fdb715a15 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -450,7 +450,7 @@ private:
OUString m_sFormula;
protected:
- SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, const double fVal = 0.0 );
+ SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, const double fVal );
SwFormulaField( const SwFormulaField& rField );
public:
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 549b7a1a454f..b1c76dff6827 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -152,7 +152,7 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
- explicit Meta(SwFormatMeta * const i_pFormat = nullptr);
+ explicit Meta(SwFormatMeta * const i_pFormat);
virtual ~Meta() override;
/// sfx2::Metadatable
@@ -179,9 +179,9 @@ private:
bool IsFixedLanguage() const { return m_bIsFixedLanguage; }
void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; }
- explicit MetaField(SwFormatMeta * const i_pFormat = nullptr,
- const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
- const bool bIsFixedLanguage = false );
+ explicit MetaField(SwFormatMeta * const i_pFormat,
+ const sal_uInt32 nNumberFormat,
+ const bool bIsFixedLanguage );
public:
/// get prefix/suffix from the RDF repository. @throws RuntimeException
diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx
index 314ab3b74e5c..41ae860e03fe 100644
--- a/sw/inc/gotodlg.hxx
+++ b/sw/inc/gotodlg.hxx
@@ -28,7 +28,7 @@ class SwWrtShell;
class SwGotoPageDlg : public ModalDialog
{
public:
- SwGotoPageDlg(vcl::Window *parent, SfxBindings* _pBindings = nullptr);
+ SwGotoPageDlg(vcl::Window *parent, SfxBindings* _pBindings);
virtual ~SwGotoPageDlg() override;
virtual void dispose() override;
@@ -52,4 +52,4 @@ private:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 8bc4655bc8ad..3443145af358 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -98,7 +98,7 @@ public:
static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter);
static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
- rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd=nullptr );
+ rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd );
static const OUString GetSubStorageName( const SfxFilter& rFltr );
};
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 1c2bdf87a2bf..689c2c05f13f 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -252,7 +252,7 @@ public:
sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl,
sal_uInt16 nLines, sal_uInt16 nRepeat,
SwTextFormatColl* pHeadlineTextColl,
- const SwAttrSet * pAttrSet = nullptr);
+ const SwAttrSet * pAttrSet);
/// Create balanced table from selected range.
SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index bdd23ecfa2df..6f1f4bef8ef1 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -188,13 +188,13 @@ public:
bool Find( const i18nutil::SearchOptions2& rSearchOpt,
bool bSearchInNotes,
utl::TextSearch& rSText,
- SwMoveFnCollection const & fnMove = fnMoveForward,
+ SwMoveFnCollection const & fnMove,
const SwPaM *pPam =nullptr, bool bInReadOnly = false);
bool Find( const SwFormat& rFormat,
- SwMoveFnCollection const & fnMove = fnMoveForward,
+ SwMoveFnCollection const & fnMove,
const SwPaM *pPam =nullptr, bool bInReadOnly = false);
bool Find( const SfxPoolItem& rAttr, bool bValue,
- SwMoveFnCollection const & fnMove = fnMoveForward,
+ SwMoveFnCollection const & fnMove,
const SwPaM *pPam =nullptr, bool bInReadOnly = false );
bool Find( const SfxItemSet& rAttr, bool bNoColls,
SwMoveFnCollection const & fnMove,
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index ac4918a920ea..f28a86a5fac5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -462,7 +462,7 @@ public:
SfxStyleFamily nRegion,
const OString& sPage,
SwWrtShell* pActShell,
- bool bNew = false) = 0;
+ bool bNew) = 0;
virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0;
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 2f8f53c74a81..7d872757f48f 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -116,24 +116,24 @@ public:
bool bSearchInNotes,
SwDocPositions nStart, SwDocPositions nEnde,
bool& bCancel,
- FindRanges = FindRanges::InBody,
+ FindRanges,
bool bReplace = false );
sal_uLong Find( const SwTextFormatColl& rFormatColl,
SwDocPositions nStart, SwDocPositions nEnde,
bool& bCancel,
- FindRanges = FindRanges::InBody,
+ FindRanges,
const SwTextFormatColl* pReplFormat = nullptr );
sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
SwDocPositions nStart, SwDocPositions nEnde,
bool& bCancel,
- FindRanges = FindRanges::InBody,
+ FindRanges,
const i18nutil::SearchOptions2* pSearchOpt = nullptr,
const SfxItemSet* rReplSet = nullptr );
// UI versions
- bool IsStartWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- bool IsEndWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- bool IsInWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+ bool IsStartWord( sal_Int16 nWordType ) const;
+ bool IsEndWord( sal_Int16 nWordType ) const;
+ bool IsInWord( sal_Int16 nWordType ) const;
bool IsStartEndSentence( bool bEnd ) const;
bool GoStartWord();
bool GoEndWord();
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index ccdf80e9bced..116677eaaf39 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -249,9 +249,9 @@ public:
void PrepareDeleteCol( long nMin, long nMax );
bool InsertCol( SwDoc*, const SwSelBoxes& rBoxes,
- sal_uInt16 nCnt, bool bBehind = true );
+ sal_uInt16 nCnt, bool bBehind );
bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes,
- sal_uInt16 nCnt, bool bBehind = true );
+ sal_uInt16 nCnt, bool bBehind );
void PrepareDelBoxes( const SwSelBoxes& rBoxes );
bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
SwUndo* pUndo, const bool bDelMakeFrames, const bool bCorrBorder );
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 8925733c559c..8fff1d0ec627 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -116,9 +116,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
// Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
bool CheckSplitCells( const SwCursorShell& rShell, sal_uInt16 nDiv,
- const SwTableSearchType = SwTableSearchType::NONE );
+ const SwTableSearchType );
bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
- const SwTableSearchType = SwTableSearchType::NONE );
+ const SwTableSearchType );
// For working on tab selection also for split tables.
class SwSelUnion
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index e915b4d51a5c..8b70bd0f78e2 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -74,7 +74,7 @@ private:
SwXParagraph(css::uno::Reference< css::text::XText > const & xParent,
SwTextNode & rTextNode,
- const sal_Int32 nSelStart, const sal_Int32 nSelEnd = - 1);
+ const sal_Int32 nSelStart, const sal_Int32 nSelEnd);
/// descriptor
SwXParagraph();
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 9d241df8a118..63ebabc2f220 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -91,7 +91,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField
virtual SwField* Copy() const override;
public:
- SwUserField(SwUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat = 0);
+ SwUserField(SwUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat);
virtual sal_uInt16 GetSubType() const override;
virtual void SetSubType(sal_uInt16 nSub) override;
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index d9ed64eb4dd9..d7a75571b05c 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -559,7 +559,7 @@ void SwMacrosTest::testFindReplace()
// find newline on 1st paragraph
bool bFound = pPaM->Find(
- opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel);
+ opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel, FindRanges::InBody);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
CPPUNIT_ASSERT_EQUAL(OUString(), pPaM->GetText());
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 3d791eca7a47..4725b2c7a2c3 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -252,7 +252,7 @@ protected:
* the initial document condition), exports with the desired
* export filter and then calls 'verify' method)
*/
- void executeImportExport(const char* filename, const char* pPassword = nullptr)
+ void executeImportExport(const char* filename, const char* pPassword)
{
maTempFile.EnableKillingFile(false);
header();
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8c8f71f198c5..6bd634596c2f 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -4023,8 +4023,8 @@ void SwUiWriterTest::testTdf87922()
#if HAVE_MORE_FONTS
struct PortionItem
{
- PortionItem(OUString const & sItemType, sal_Int32 nLength = 0,
- sal_uInt16 nTextType = 0)
+ PortionItem(OUString const & sItemType, sal_Int32 nLength,
+ sal_uInt16 nTextType)
: msItemType(sItemType)
, mnLength(nLength)
, mnTextType(nTextType)
@@ -4064,17 +4064,17 @@ class PortionHandler : public SwPortionHandler
virtual void LineBreak(sal_Int32 /*nWidth*/) override
{
- mPortionItems.emplace_back("line_break");
+ mPortionItems.emplace_back("line_break", 0, 0);
}
virtual void Skip(sal_Int32 nLength) override
{
- mPortionItems.emplace_back("skip", nLength);
+ mPortionItems.emplace_back("skip", nLength, 0);
}
virtual void Finish() override
{
- mPortionItems.emplace_back("finish");
+ mPortionItems.emplace_back("finish", 0, 0);
}
};
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 1527689908df..802dfff9f75f 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -680,7 +680,7 @@ bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes
if( pUndo )
pUndo->InsertRow( *this, aBoxes, aTarget.mnAddLine );
else
- InsertRow( pDoc, aBoxes, aTarget.mnAddLine );
+ InsertRow( pDoc, aBoxes, aTarget.mnAddLine, /*bBehind*/true );
aTarget.moreLines( *this );
bClear = true;
@@ -883,7 +883,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
? !pUndo->InsertRow( *this, SelLineFromBox( pInsBox,
aBoxes ), nNewLns )
: !InsertRow( pDoc, SelLineFromBox( pInsBox,
- aBoxes ), nNewLns ) )
+ aBoxes ), nNewLns, /*bBehind*/true ) )
return false;
}
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 0b0644de0a6a..1546fb1fd0e8 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -493,7 +493,7 @@ bool SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight )
SET_CURR_SHELL( this );
- if( bVert && !CheckSplitCells( *this, nCnt + 1 ) )
+ if( bVert && !CheckSplitCells( *this, nCnt + 1, SwTableSearchType::NONE ) )
{
ErrorHandler::HandleError( ERR_TBLSPLIT_ERROR, GetWin(),
DialogMask::MessageInfo | DialogMask::ButtonDefaultsOk );
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 946d7b6bfd42..6383a0b251c6 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2801,7 +2801,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 );
+ bool bRet = rTable.InsertRow( rTable.GetFrameFormat()->GetDoc(), rBoxes, nCnt, /*bBehind*/true );
if( bRet )
pInsRowUndo->SaveNewBoxes( *pTableNd, aTmpLst );
else
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 12ee49ce3fb2..4f466974cd51 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1433,7 +1433,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand)
// if at the end of the sentence (i.e. at the space after the '.')
// advance to next word in order for GoSentence to work properly
// next time and have isStartOfSentence return true after this call
- if (!rUnoCursor.IsStartWord())
+ if (!rUnoCursor.IsStartWord(css::i18n::WordType::ANYWORD_IGNOREWHITESPACES))
{
const bool bNextWord = rUnoCursor.GoNextWord();
if (bWasEOS && !bNextWord)
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index c462aad698ef..2510c4e7bfe5 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1007,7 +1007,7 @@ SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange,
: SetAttrMode::DONTEXPAND );
const std::shared_ptr< ::sw::Meta> pMeta( (RES_TXTATR_META == i_nWhich)
- ? std::make_shared< ::sw::Meta>( )
+ ? std::make_shared< ::sw::Meta>( nullptr )
: std::shared_ptr< ::sw::Meta>(
pDoc->GetMetaFieldManager().makeMetaField()) );
SwFormatMeta meta(pMeta, i_nWhich); // this is cloned by Insert!
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 489faaaf7354..b371b9a13c8d 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -444,7 +444,7 @@ public:
SfxStyleFamily nRegion,
const OString& sPage,
SwWrtShell* pActShell,
- bool bNew = false) override;
+ bool bNew) override;
virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) override;
More information about the Libreoffice-commits
mailing list