diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-29 10:59:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-29 11:11:29 +0200 |
commit | ee74e401aae0543fd20d80ec4b5c11877e56dafe (patch) | |
tree | c04fa51af8f3bddad408dea7100d839ba3c1214e /sw/inc | |
parent | 4fe23a797291dbf582925ace1392772577506c4e (diff) |
loplugin:unuseddefaultparam in sw (part3)
Change-Id: Ibff7ac9718929349ee7daa3febb0f8fe4a9fa4db
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentState.hxx | 2 | ||||
-rw-r--r-- | sw/inc/PostItMgr.hxx | 3 | ||||
-rw-r--r-- | sw/inc/bparr.hxx | 4 | ||||
-rw-r--r-- | sw/inc/calc.hxx | 5 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 20 | ||||
-rw-r--r-- | sw/inc/dbmgr.hxx | 6 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 3 | ||||
-rw-r--r-- | sw/inc/docary.hxx | 10 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 24 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 17 | ||||
-rw-r--r-- | sw/inc/fldbas.hxx | 2 | ||||
-rw-r--r-- | sw/inc/flddat.hxx | 4 | ||||
-rw-r--r-- | sw/inc/frmfmt.hxx | 3 | ||||
-rw-r--r-- | sw/inc/ndarr.hxx | 9 | ||||
-rw-r--r-- | sw/inc/ndnotxt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 11 | ||||
-rw-r--r-- | sw/inc/node.hxx | 5 | ||||
-rw-r--r-- | sw/inc/redline.hxx | 6 | ||||
-rw-r--r-- | sw/inc/section.hxx | 9 | ||||
-rw-r--r-- | sw/inc/shellio.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swabstdlg.hxx | 22 |
21 files changed, 74 insertions, 97 deletions
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index 95b7872fb948..6c4ecaabaa57 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -47,7 +47,7 @@ public: virtual void SetUpdateExpFieldStat(bool b) = 0; - virtual void SetLoaded(bool b = true) = 0; + virtual void SetLoaded() = 0; protected: virtual ~IDocumentState() {}; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index f8c372715c47..fb0249602aa2 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -204,8 +204,7 @@ class SwPostItMgr: public SfxListener void LayoutPostIts(); bool CalcRects(); - void MakeVisible( const sw::sidebarwindows::SwSidebarWin* pPostIt, - long aPage = -1); + void MakeVisible( const sw::sidebarwindows::SwSidebarWin* pPostIt); bool ShowScrollbar(const unsigned long aPage) const; bool HasNotes() const ; diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index c8a1acd880ad..9ec8c91869b6 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -74,9 +74,7 @@ protected: void UpdIndex( sal_uInt16 ); ///< recalculate indices // fill all blocks - // the short parameter specifies in percent, how full the blocks should be - // made - sal_uInt16 Compress( short = COMPRESSLVL ); + sal_uInt16 Compress(); public: BigPtrArray(); diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index def19644ee12..5c76e0b50b18 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -186,7 +186,7 @@ public: ~SwCalc(); SwSbxValue Calculate( const OUString &rStr ); - OUString GetStrResult( const SwSbxValue& rValue, bool bRound = true ); + OUString GetStrResult( const SwSbxValue& rValue ); OUString GetStrResult( double, bool bRound = true ); SwCalcExp* VarInsert( const OUString& r ); @@ -202,8 +202,7 @@ public: bool IsCalcError() const { return 0 != eError; } static bool Str2Double( const OUString& rStr, sal_Int32& rPos, - double& rVal, - LocaleDataWrapper const*const pData = nullptr ); + double& rVal ); static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, SwDoc *const pDoc ); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index f3850ebf6852..79d0e236871e 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -327,7 +327,7 @@ public: bool StartsWithTable(); SwPaM* GetCursor( bool bMakeTableCursor = true ) const; - inline SwCursor* GetSwCursor( bool bMakeTableCursor = true ) const; + inline SwCursor* GetSwCursor() const; // return only the current cursor SwShellCursor* _GetCursor() { return m_pCurrentCursor; } const SwShellCursor* _GetCursor() const { return m_pCurrentCursor; } @@ -573,9 +573,9 @@ public: OUString GetText() const; // Check of SPoint or Mark of current cursor are placed within a table. - inline const SwTableNode* IsCursorInTable( bool bIsPtInTable = true ) const; + inline const SwTableNode* IsCursorInTable() const; - inline Point& GetCursorDocPos( bool bPoint = true ) const; + inline Point& GetCursorDocPos() const; inline bool IsCursorPtAtEnd() const; inline const SwPaM* GetTableCrs() const; @@ -807,7 +807,7 @@ public: // is cursor or the point in/over a vertical formatted text? bool IsInVerticalText( const Point* pPt = nullptr ) const; // is cursor or the point in/over a right to left formatted text? - bool IsInRightToLeftText( const Point* pPt = nullptr ) const; + bool IsInRightToLeftText() const; static void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); bool bColumnChange(); @@ -852,9 +852,9 @@ inline SwMoveFnCollection* SwCursorShell::MakeFindRange( return m_pCurrentCursor->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); } -inline SwCursor* SwCursorShell::GetSwCursor( bool bMakeTableCursor ) const +inline SwCursor* SwCursorShell::GetSwCursor() const { - return static_cast<SwCursor*>(GetCursor( bMakeTableCursor )); + return static_cast<SwCursor*>(GetCursor()); } inline SwPaM* SwCursorShell::GetStackCursor() const { return m_pCursorStack; } @@ -879,9 +879,9 @@ inline bool SwCursorShell::IsSelOnePara() const m_pCurrentCursor->GetPoint()->nNode == m_pCurrentCursor->GetMark()->nNode; } -inline const SwTableNode* SwCursorShell::IsCursorInTable( bool bIsPtInTable ) const +inline const SwTableNode* SwCursorShell::IsCursorInTable() const { - return m_pCurrentCursor->GetNode( bIsPtInTable ).FindTableNode(); + return m_pCurrentCursor->GetNode().FindTableNode(); } inline bool SwCursorShell::IsCursorPtAtEnd() const @@ -889,9 +889,9 @@ inline bool SwCursorShell::IsCursorPtAtEnd() const return m_pCurrentCursor->End() == m_pCurrentCursor->GetPoint(); } -inline Point& SwCursorShell::GetCursorDocPos( bool bPoint ) const +inline Point& SwCursorShell::GetCursorDocPos() const { - return bPoint ? m_pCurrentCursor->GetPtPos() : m_pCurrentCursor->GetMkPos(); + return m_pCurrentCursor->GetPtPos(); } inline const SwPaM* SwCursorShell::GetTableCrs() const diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index cf52569a6215..f41adaa75b32 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -332,7 +332,7 @@ public: /// Fill listbox with all column names of a database table. void GetColumnNames(ListBox* pListBox, - const OUString& rDBName, const OUString& rTableName, bool bAppend = false); + const OUString& rDBName, const OUString& rTableName); static void GetColumnNames(ListBox* pListBox, css::uno::Reference< css::sdbc::XConnection> xConnection, const OUString& rTableName, bool bAppend = false); @@ -367,7 +367,7 @@ public: /// open the source while fields are updated - for the calculator only! bool OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery, - sal_Int32 nCommandType = -1, bool bCreate = false); + sal_Int32 nCommandType = -1); sal_uInt32 GetSelectedRecordId(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1); bool GetColumnCnt(const OUString& rSourceName, const OUString& rTableName, const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, @@ -389,7 +389,7 @@ public: bool FillCalcWithMergeData(SvNumberFormatter *pDocFormatter, sal_uInt16 nLanguage, bool asString, SwCalc &aCalc); bool ToNextMergeRecord(); - bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1); + bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery); bool ExistsNextRecord()const; sal_uInt32 GetSelectedRecordId(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index d6c5c08f3c07..2eddfa94f91a 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -702,8 +702,7 @@ public: bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const; short GetTextDirection( const SwPosition& rPos, const Point* pPt = nullptr ) const; - bool IsInVerticalText( const SwPosition& rPos, - const Point* pPt = nullptr ) const; + bool IsInVerticalText( const SwPosition& rPos ) const; // Database and DB-Manager void SetDBManager( SwDBManager* pNewMgr ) { mpDBManager = pNewMgr; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 305bcb383574..6eff3f31effc 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -197,8 +197,8 @@ public: bool Contains(const SwRangeRedline* p) const { return maVector.find(const_cast<SwRangeRedline* const>(p)) != maVector.end(); } sal_uInt16 GetPos(const SwRangeRedline* p) const; - bool Insert( SwRangeRedline* p, bool bIns = true ); - bool Insert( SwRangeRedline* p, sal_uInt16& rInsPos, bool bIns = true ); + bool Insert( SwRangeRedline* p ); + bool Insert( SwRangeRedline* p, sal_uInt16& rInsPos ); bool InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos = nullptr ); void Remove( sal_uInt16 nPos ); @@ -213,10 +213,8 @@ public: /** Search next or previous Redline with the same Seq. No. Search can be restricted via Lookahead. Using 0 makes search the whole array. */ - sal_uInt16 FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, - sal_uInt16 nLookahead = 20 ) const; - sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, - sal_uInt16 nLookahead = 20 ) const; + sal_uInt16 FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos ) const; + sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos ) const; /** Find the redline at the given position. diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 76de18ab7948..6e7df6ff7d25 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -206,7 +206,7 @@ public: If table is copied into table, move all cursors away from it. Copy and Paste must be in FEShell because of FlyFrames! Copy all selections to the document. */ - bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = nullptr ); + bool _CopySelToDoc( SwDoc* pInsDoc ); long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); bool AppendTextNode(); @@ -294,8 +294,8 @@ public: sal_uInt16 GetCharFormatCount() const; SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const; SwCharFormat* GetCurCharFormat() const; - void FillByEx(SwCharFormat*, bool bReset = false); - SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = nullptr ); + void FillByEx(SwCharFormat*); + SwCharFormat* MakeCharFormat( const OUString& rName ); SwCharFormat* FindCharFormatByName( const OUString& rName ) const; /* FormatCollections (new) - Explaining the general naming pattern: @@ -338,7 +338,7 @@ public: void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false); SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName, SwTextFormatColl *pDerivedFrom = nullptr); - void FillByEx(SwTextFormatColl*, bool bReset = false); + void FillByEx(SwTextFormatColl*); SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const; /// @return "Auto-Collection" with given Id. If it does not exist create it. @@ -369,7 +369,7 @@ public: SwFieldType* GetFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const; - void RemoveFieldType(size_t nField, sal_uInt16 nResId = USHRT_MAX); + void RemoveFieldType(size_t nField); void RemoveFieldType(sal_uInt16 nResId, const OUString& rName); void FieldToText( SwFieldType* pType ); @@ -523,13 +523,13 @@ public: bool SelectionHasNumber() const; bool SelectionHasBullet() const; - OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const; + OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr ) const; void ChgNumRuleFormats( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. void SetNumRuleStart( bool bFlag = true, SwPaM* pCursor = nullptr ); bool IsNumRuleStart( SwPaM* pPaM = nullptr ) const; - void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = nullptr ); + void SetNodeNumStart( sal_uInt16 nStt ); sal_uInt16 GetNodeNumStart( SwPaM* pPaM = nullptr ) const; @@ -632,7 +632,7 @@ public: // #i73788# /// Remove default parameter, because method always called this default value. Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys! - const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const; + const SwFlyFrameFormat* FindFlyByName( const OUString& rName ) const; /** @return a ClientObject, if CurrentCursor->Point() points to a SwOLENode (and mark is neither set not pointint to same ClientObject) @@ -687,8 +687,7 @@ public: void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER SwDDEFieldType* pDDEType, - sal_uInt16 nRows, sal_uInt16 nCols, - sal_Int16 eAdj = css::text::HoriOrientation::FULL ); + sal_uInt16 nRows, sal_uInt16 nCols ); void UpdateTable(); void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); @@ -831,8 +830,7 @@ public: void UpdateSection( size_t const nSect, SwSectionData &, SfxItemSet const*const = nullptr); bool IsAnySectionInDoc( bool bChkReadOnly = false, - bool bChkHidden = false, - bool BChkTOX = false ) const; + bool bChkHidden = false ) const; OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; @@ -853,7 +851,7 @@ public: bool CanSpecialInsert() const; /// Optimizing UI. - void SetNewDoc(bool bNew = true); + void SetNewDoc(); sfx2::LinkManager& GetLinkManager(); inline const sfx2::LinkManager& GetLinkManager() const; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 27ce4a6b768d..d67c16502781 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -254,7 +254,7 @@ public: /// Copy and Paste methods for internal clipboard. bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = nullptr ); - bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false); + bool Paste( SwDoc* pClpDoc ); /// Paste some pages into another doc - used in mailmerge. bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); @@ -314,7 +314,7 @@ public: bool IsSelContainsControl() const; ObjCntType GetObjCntType( const Point &rPt, SdrObject *&rpObj ) const; - ObjCntType GetObjCntTypeOfSelection( SdrObject** ppObj = nullptr ) const; + ObjCntType GetObjCntTypeOfSelection() const; /// For adjustment of PosAttr when anchor changes. SwRect GetObjRect() const; @@ -351,7 +351,7 @@ public: /// SS for envelopes: get all page-bound objects and set them to new page. void GetPageObjs( std::vector<SwFrameFormat*>& rFillArr ); - void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 ); + void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr ); /// Show current selection (frame / draw object as required). virtual void MakeSelVisible() override; @@ -401,7 +401,7 @@ public: SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const; // Get selected fly, but if none Get current fly in which the cursor is positioned - SwFlyFrame* GetSelectedOrCurrFlyFrame(const bool bCalcFrame = true) const; + SwFlyFrame* GetSelectedOrCurrFlyFrame() const; /// Find/delete fly containing the cursor. SwFrameFormat* WizardGetFly(); @@ -579,7 +579,7 @@ public: // --> #i972# /** for starmath formulas anchored 'as char' it aligns it baseline to baseline changing the previous vertical orientation */ - void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrame * pFly = nullptr ); + void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ); /// aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); @@ -702,7 +702,7 @@ public: sal_uInt16 GetRowsToRepeat() const; void SetRowsToRepeat( sal_uInt16 nNumOfRows ); - sal_uInt16 GetVirtPageNum( const bool bCalcFrame = true ); + sal_uInt16 GetVirtPageNum(); /** @return the number of table rows currently selected if the selection start at the top of the table. */ @@ -749,11 +749,10 @@ public: /// The ruler needs some information too. sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column. - sal_uInt16 GetCurMouseColNum( const Point &rPt, - SwGetCurColNumPara* pPara = nullptr ) const; + sal_uInt16 GetCurMouseColNum( const Point &rPt ) const; size_t GetCurTabColNum() const; //0 == not in any table. size_t GetCurMouseTabColNum( const Point &rPt ) const; - sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = nullptr ) const; ///< Current outer column. + sal_uInt16 GetCurOutColNum() const; ///< Current outer column. bool IsColRightToLeft() const; bool IsTableRightToLeft() const; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 6a49b5e82493..2023f8c691ee 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -312,7 +312,7 @@ public: SwTextFormatter::NewFieldPortion() sets things up properly. @return the generated text (suitable for display) */ - OUString ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const; + OUString ExpandField(bool const bCached) const; /// @return name or content. virtual OUString GetFieldName() const; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 13a59cdb538b..8eb39ca43292 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -114,8 +114,8 @@ public: inline void SetOffset(long nMinutes) { nOffset = nMinutes; } inline long GetOffset() const { return nOffset; } - Date GetDate(bool bUseOffset = false) const; - tools::Time GetTime(bool bUseOffset = false) const; + Date GetDate() const; + tools::Time GetTime() const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 52b0b1324850..50c8246bf513 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -176,8 +176,7 @@ public: SwFlyFrame* GetFrame( const Point* pDocPos = nullptr, const bool bCalcFrame = false ) const; - SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = nullptr, - const bool bCalcFrame = false ) const; + SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = nullptr ) const; virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override; diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 3b55ec5974f5..c2a4e6a6cc7b 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -208,8 +208,7 @@ public: SwAttrSet* pAutoAttr = nullptr ); ///< in ndtxt.cxx SwStartNode* MakeTextSection( const SwNodeIndex & rWhere, SwStartNodeType eSttNdTyp, - SwTextFormatColl *pColl, - SwAttrSet* pAutoAttr = nullptr ); + SwTextFormatColl *pColl ); static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const OUString& rGrfName, @@ -221,13 +220,11 @@ public: static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, - SwGrfFormatColl *pColl, - SwAttrSet* pAutoAttr = nullptr ); ///< in ndgrf.cxx + SwGrfFormatColl *pColl ); ///< in ndgrf.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const svt::EmbeddedObjectRef&, - SwGrfFormatColl *pColl, - SwAttrSet* pAutoAttr = nullptr ); ///< in ndole.cxx + SwGrfFormatColl *pColl ); ///< in ndole.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const OUString &rName, sal_Int64 nAspect, diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 4a4e3c492672..97cdfb53d2a0 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -61,9 +61,9 @@ public: virtual bool RestorePersistentData(); OUString GetTitle() const; - void SetTitle( const OUString& rTitle, bool bBroadcast = false ); + void SetTitle( const OUString& rTitle ); OUString GetDescription() const; - void SetDescription( const OUString& rDescription, bool bBroadcast = false ); + void SetDescription( const OUString& rDescription ); void SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic = false ); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index c5da3964d0b5..efe9462b3fb4 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -233,8 +233,7 @@ public: virtual sal_Int32 Len() const override; /// Is in itratr. - void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs, - OutputDevice* pOut = nullptr ) const; + void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs ) const; /// overriding to handle change of certain paragraph attributes virtual bool SetAttr( const SfxPoolItem& ) override; @@ -388,8 +387,7 @@ public: */ ::std::vector<SwTextAttr *> GetTextAttrsAt( sal_Int32 const nIndex, - RES_TXTATR const nWhich, - enum GetTextAttrMode const eMode = DEFAULT ) const; + RES_TXTATR const nWhich ) const; /** get the text attribute at position nIndex which owns the dummy character CH_TXTATR_* at that position, if one exists. @@ -697,8 +695,7 @@ public: OUString GetRedlineText( sal_Int32 nIdx = 0, sal_Int32 nLen = SAL_MAX_INT32, - bool bExpandFields = false, - bool bWithNum = false ) const; + bool bExpandFields = false ) const; /** @return actual count of initial chars for initial-function. If nWishLen == 0 that of first word. */ @@ -799,7 +796,7 @@ public: sal_uInt32 GetParRsid() const; bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2, - sal_Int32 nEnd1 = 0, sal_Int32 nEnd2 = 0 ) const; + sal_Int32 nEnd1 = 0 ) const; bool CompareParRsid( const SwTextNode &rTextNode ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode) diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index a557f08dfe48..01ad9439e21c 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -410,8 +410,7 @@ public: const Point* pPoint = nullptr, const bool bCalcFrame = false ) const; SwRect FindPageFrameRect( const bool bPrtArea = false, - const Point* pPoint = nullptr, - const bool bCalcFrame = false ) const; + const Point* pPoint = nullptr ) const; /** Method creates all views of document for given node. The content frames that are created are put in the respective layout. */ @@ -437,7 +436,7 @@ public: /// If bInParent is FALSE search for attribute only in this node. const SfxPoolItem& GetAttr( sal_uInt16 nWhich, bool bInParent=true ) const; - bool GetAttr( SfxItemSet& rSet, bool bInParent=true ) const; + bool GetAttr( SfxItemSet& rSet ) const; /// made virtual virtual bool SetAttr( const SfxPoolItem& ); virtual bool SetAttr( const SfxItemSet& rSet ); diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 6b3c2f5b12ff..712256372a2d 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -278,17 +278,15 @@ public: bool PopData(); /** - Returns textual description of this a redline data element of + Returns textual description of a redline data element of this redline. - @param nPos index of the redline data element to describe - The textual description of the selected element contains the kind of redline and the possibly shortened text of the redline. @return textual description of the selected redline data element */ - OUString GetDescr(sal_uInt16 nPos = 0); + OUString GetDescr(); bool operator<( const SwRangeRedline& ) const; void dumpAsXml(struct _xmlTextWriter* pWriter) const; diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index b6008d9e3961..b5b52ce8b9bf 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -115,10 +115,9 @@ public: void SetCondition(OUString const& rNew) { m_sCondition = rNew; } OUString GetLinkFileName() const { return m_sLinkFileName; } - void SetLinkFileName(OUString const& rNew, OUString const* pPassWd = nullptr) + void SetLinkFileName(OUString const& rNew) { m_sLinkFileName = rNew; - if (pPassWd) { SetLinkFilePassword(*pPassWd); } } OUString GetLinkFilePassword() const { return m_sLinkFilePassword; } @@ -201,7 +200,7 @@ public: void SetCondition(OUString const& rNew) { m_Data.SetCondition(rNew); } OUString GetLinkFileName() const; - void SetLinkFileName(OUString const& rNew, OUString const*const pPassWd = nullptr); + void SetLinkFileName(OUString const& rNew); // Password of linked file (only valid during runtime!) OUString GetLinkFilePassword() const { return m_Data.GetLinkFilePassword(); } @@ -316,9 +315,9 @@ public: bool IsInNodesArr() const; SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false); - const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const + const SwSectionNode* GetSectionNode() const { return const_cast<SwSectionFormat *>(this) - ->GetSectionNode(bEvenIfInUndo); } + ->GetSectionNode(); } // Is section a valid one for global document? const SwSection* GetGlobalDocSection() const; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index fc7c612d1b63..02cfbe1751ed 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -374,7 +374,7 @@ protected: bool CopyNextPam( SwPaM ** ); void PutNumFormatFontsInAttrPool(); - void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true ); + void PutEditEngFontsInAttrPool(); virtual sal_uLong WriteStream() = 0; void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 6fd3e806bce1..f6108fc547d0 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -106,19 +106,19 @@ class AbstractFieldInputDlg : public VclAbstractTerminatedDialog public: //from class SalFrame virtual void SetWindowState( const OString & rStr ) = 0; - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; + virtual OString GetWindowState() const = 0; virtual void EndDialog(long ) override = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog { public: - virtual OUString GetFontName() = 0; + virtual OUString GetFontName() = 0; virtual bool IsEndNote() = 0; - virtual OUString GetStr() = 0; + virtual OUString GetStr() = 0; //from class Window - virtual void SetHelpId( const OString& sHelpId ) = 0; - virtual void SetText( const OUString& rStr ) = 0; + virtual void SetHelpId( const OString& sHelpId ) = 0; + virtual void SetText( const OUString& rStr ) = 0; }; class AbstractInsTableDlg : public VclAbstractDialog @@ -241,8 +241,8 @@ public: class AbstractDropDownFieldDialog : public VclAbstractDialog { public: - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow - virtual void SetWindowState( const OString & rStr ) =0;//this method inherit from SystemWindow + virtual OString GetWindowState() const = 0; //this method inherit from SystemWindow + virtual void SetWindowState( const OString & rStr ) = 0; //this method inherit from SystemWindow }; class AbstractSwLabDlg : public SfxAbstractTabDialog @@ -269,7 +269,7 @@ public: class AbstractSwFieldDlg : public SfxAbstractTabDialog { public: - virtual void Start( bool bShow = true ) = 0; //this method from sfxtabdialog + virtual void Start() = 0; //this method from sfxtabdialog virtual void Initialize(SfxChildWinInfo *pInfo) = 0; virtual void ReInitDlg() = 0; virtual void ActivateDatabasePage() = 0; @@ -442,14 +442,12 @@ public: SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, - SfxChildWinInfo* pInfo, - bool bNew=true) = 0; + SfxChildWinInfo* pInfo) = 0; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, - SfxChildWinInfo* pInfo, - bool bNew=true) = 0; + SfxChildWinInfo* pInfo) = 0; virtual VclAbstractDialog * CreateIndexMarkModalDlg( vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; |