From 0f8a30318695447e205b17fb0af06362ab890bc3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 8 Sep 2016 10:21:09 +0200 Subject: loplugin:constantparam in sw Change-Id: Ibae4cac28e6ff52298c804519f683017729c07a5 --- sw/inc/ccoll.hxx | 2 +- sw/inc/crsrsh.hxx | 13 ++----------- sw/inc/dbmgr.hxx | 3 +-- sw/inc/doc.hxx | 10 +++++----- sw/inc/docstyle.hxx | 3 +-- sw/inc/editsh.hxx | 5 +---- 6 files changed, 11 insertions(+), 25 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 313609c44c8a..3048ca91facc 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem OUString m_sStyles[COND_COMMAND_COUNT]; public: - SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL); + SwCondCollItem(); virtual ~SwCondCollItem(); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 82671bfbb965..dde40132e064 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -271,18 +271,9 @@ protected: /* * Compare-Methode for the StackCursor and the current Cursor. - * The Methods return -1, 0, 1 for lower, equal, greater. The enum - * CursorCompareType says which position is compared. + * The Methods return -1, 0, 1 for lower, equal, greater. */ - enum CursorCompareType { - StackPtStackMk, - StackPtCurrPt, - StackPtCurrMk, - StackMkCurrPt, - StackMkCurrMk, - CurrPtCurrMk - }; - int CompareCursor( CursorCompareType eType ) const; + int CompareCursorStackMkCurrPt() const; bool SelTableRowOrCol( bool bRow, bool bRowSimple = false ); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 399414944de8..5ae985d9f947 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -256,8 +256,7 @@ friend class SwConnectionDisposedListener_Impl; /// Run the mail merge for defined modes, except DBMGR_MERGE SAL_DLLPRIVATE bool MergeMailFiles( SwWrtShell* pSh, - const SwMergeDescriptor& rMergeDescriptor, - vcl::Window* pParent ); + const SwMergeDescriptor& rMergeDescriptor ); SAL_DLLPRIVATE bool ToNextMergeRecord(); SAL_DLLPRIVATE bool IsValidMergeRecord() const; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 43472540dc0b..793f6d2ebaed 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1223,11 +1223,11 @@ public: static void GetTabCols( SwTabCols &rFill, const SwCursor* pCursor, const SwCellFrame* pBoxFrame ); void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly, - const SwCursor* pCursor, const SwCellFrame* pBoxFrame ); + const SwCellFrame* pBoxFrame ); static void GetTabRows( SwTabCols &rFill, const SwCursor* pCursor, const SwCellFrame* pBoxFrame ); - void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCursor, - const SwCellFrame* pBoxFrame ); + void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, + const SwCellFrame* pBoxFrame ); // Direct access for UNO. void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, @@ -1247,8 +1247,8 @@ public: const SwTableAutoFormatTable& GetTableStyles() const { return *mpTableStyles.get(); } // Create a new table style. Tracked by Undo. SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = false); - // Delete table style named rName. If pAffectedTables is not null, it contains pointers to affected tables. Tracked by undo. - std::unique_ptr DelTableStyle(const OUString& rName, bool bBroadcast = false, std::vector* pAffectedTables = nullptr); + // Delete table style named rName. Tracked by undo. + std::unique_ptr DelTableStyle(const OUString& rName, bool bBroadcast = false); // Change (replace) a table style named rName. Tracked by undo. void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 1eebe05d3988..c8b526fe5196 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -77,8 +77,7 @@ protected: public: SwDocStyleSheet( SwDoc& rDoc, const OUString& rName, - SwDocStyleSheetPool* pPool, - SfxStyleFamily eFam); + SwDocStyleSheetPool* pPool); SwDocStyleSheet( const SwDocStyleSheet& ); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 2105e224f8dc..aef018e0377b 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -626,8 +626,7 @@ public: /// Re-read if graphic is not ok. Current graphic is replaced by the new one. void ReRead( const OUString& rGrfName, const OUString& rFltName, - const Graphic* pGraphic = nullptr, - const GraphicObject* pGrafObj = nullptr ); + const Graphic* pGraphic = nullptr ); /// Unique identification of object (for ImageMapDlg). void *GetIMapInventor() const; @@ -685,7 +684,6 @@ public: const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_uInt16 nRows, sal_uInt16 nCols, - sal_Int16 eAdj = css::text::HoriOrientation::FULL, const SwTableAutoFormat* pTAFormat = nullptr ); void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER @@ -698,7 +696,6 @@ public: SwFrameFormat *GetTableFormat(); bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_Unicode cCh, - sal_Int16 eAdj = css::text::HoriOrientation::FULL, const SwTableAutoFormat* pTAFormat = nullptr ); bool TableToText( sal_Unicode cCh ); bool IsTextToTableAvailable() const; -- cgit v1.2.3