diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
| commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
| tree | 8bece458e55c1b5eab7559076579bf76cca8df68 /sw/inc/swtable.hxx | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/inc/swtable.hxx')
| -rw-r--r-- | sw/inc/swtable.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 143086233ffe..37d488cc5b55 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -154,9 +154,9 @@ private: bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); - bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind ); + bool InsertRow_( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind ); bool NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool ); - void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); + void FindSuperfluousRows_( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, const SwTableBox *pStart, bool bCurRowOnly ); @@ -183,7 +183,7 @@ public: void SetTableStyleName(const OUString& rName) { maTableStyleName = rName; } sal_uInt16 GetRowsToRepeat() const { return std::min( (sal_uInt16)GetTabLines().size(), m_nRowsToRepeat ); } - sal_uInt16 _GetRowsToRepeat() const { return m_nRowsToRepeat; } + sal_uInt16 GetRowsToRepeat_() const { return m_nRowsToRepeat; } void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { m_nRowsToRepeat = nNumOfRows; } bool IsHeadline( const SwTableLine& rLine ) const; @@ -252,7 +252,7 @@ public: bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) - { _FindSuperfluousRows( rBoxes, nullptr, nullptr ); } + { FindSuperfluousRows_( rBoxes, nullptr, nullptr ); } void CheckRowSpan( SwTableLine* &rpLine, bool bUp ) const; SwTableSortBoxes& GetTabSortBoxes() { return m_TabSortContentBoxes; } @@ -262,7 +262,7 @@ public: // #i80314# // add 3rd parameter in order to control validation check on <rStr> - static sal_uInt16 _GetBoxNum( OUString& rStr, + static sal_uInt16 GetBoxNum( OUString& rStr, bool bFirst = false, const bool bPerformValidCheck = false ); @@ -270,7 +270,7 @@ public: // #i80314# // add 2nd parameter in order to control validation check in called method - // <_GetBoxNum(..)> + // <GetBoxNum(..)> const SwTableBox* GetTableBox( const OUString& rName, const bool bPerformValidCheck = false ) const; // Copy selected boxes to another document. |