From e22024c1701a74b7b780f43763857490c5d6a7b0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 6 Nov 2015 08:33:27 +0100 Subject: sw: prefix members of SwHTMLTableLayout Change-Id: I8a0563551f1ee71e9ab9359c7b75ff5855b436b5 --- sw/inc/htmltbl.hxx | 154 ++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index aea633ce948f..8c038a5df51b 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -173,65 +173,65 @@ public: class SwHTMLTableLayout { - Timer aResizeTimer; ///< Timer for DelayedResize. + Timer m_aResizeTimer; ///< Timer for DelayedResize. - SwHTMLTableLayoutColumn **aColumns; - SwHTMLTableLayoutCell **aCells; + SwHTMLTableLayoutColumn **m_aColumns; + SwHTMLTableLayoutCell **m_aCells; - const SwTable *pSwTable; ///< SwTable (Top-Table only). - SwTableBox *pLeftFillerBox; ///< Left filler-box (table in table only). - SwTableBox *pRightFillerBox; ///< Right filler-box (table in Table only). + const SwTable *m_pSwTable; ///< SwTable (Top-Table only). + SwTableBox *m_pLeftFillerBox; ///< Left filler-box (table in table only). + SwTableBox *m_pRightFillerBox; ///< Right filler-box (table in Table only). - sal_uLong nMin; ///< Minimal width of table (Twips). - sal_uLong nMax; ///< Maximal width of table (Twips). + sal_uLong m_nMin; ///< Minimal width of table (Twips). + sal_uLong m_nMax; ///< Maximal width of table (Twips). - sal_uInt16 nRows; ///< Row count. - sal_uInt16 nCols; ///< Column count. + sal_uInt16 m_nRows; ///< Row count. + sal_uInt16 m_nCols; ///< Column count. - sal_uInt16 nLeftMargin; ///< Space to left margin (from paragraph). - sal_uInt16 nRightMargin; ///< Space to left margin (from paragraph). + sal_uInt16 m_nLeftMargin; ///< Space to left margin (from paragraph). + sal_uInt16 m_nRightMargin; ///< Space to left margin (from paragraph). - sal_uInt16 nInhAbsLeftSpace; ///< Space inherited from surrounding box - sal_uInt16 nInhAbsRightSpace; ///< that was added to boxes. + sal_uInt16 m_nInhAbsLeftSpace; ///< Space inherited from surrounding box + sal_uInt16 m_nInhAbsRightSpace; ///< that was added to boxes. - sal_uInt16 nRelLeftFill; ///< Width of boxes relative to alignment - sal_uInt16 nRelRightFill; ///< of tables in tables. + sal_uInt16 m_nRelLeftFill; ///< Width of boxes relative to alignment + sal_uInt16 m_nRelRightFill; ///< of tables in tables. - sal_uInt16 nRelTabWidth; ///< Relative width of table. + sal_uInt16 m_nRelTabWidth; ///< Relative width of table. - sal_uInt16 nWidthOption; ///< Width of table (in Twips oder %). - sal_uInt16 nCellPadding; ///< Space to contents (in Twips). - sal_uInt16 nCellSpacing; ///< Cell spacing (in Twips). - sal_uInt16 nBorder; /** Line strength of outer border, or rather the + sal_uInt16 m_nWidthOption; ///< Width of table (in Twips oder %). + sal_uInt16 m_nCellPadding; ///< Space to contents (in Twips). + sal_uInt16 m_nCellSpacing; ///< Cell spacing (in Twips). + sal_uInt16 m_nBorder; /** Line strength of outer border, or rather the space needed for it as calculated by Netscape. */ - sal_uInt16 nLeftBorderWidth; - sal_uInt16 nRightBorderWidth; - sal_uInt16 nInhLeftBorderWidth; - sal_uInt16 nInhRightBorderWidth; - sal_uInt16 nBorderWidth; + sal_uInt16 m_nLeftBorderWidth; + sal_uInt16 m_nRightBorderWidth; + sal_uInt16 m_nInhLeftBorderWidth; + sal_uInt16 m_nInhRightBorderWidth; + sal_uInt16 m_nBorderWidth; - sal_uInt16 nDelayedResizeAbsAvail; ///< Param for delayed Resize. - sal_uInt16 nLastResizeAbsAvail; + sal_uInt16 m_nDelayedResizeAbsAvail; ///< Param for delayed Resize. + sal_uInt16 m_nLastResizeAbsAvail; - sal_uInt8 nPass1Done; ///< Reference-values for - sal_uInt8 nWidthSet; ///< the runs through loop. + sal_uInt8 m_nPass1Done; ///< Reference-values for + sal_uInt8 m_nWidthSet; ///< the runs through loop. - SvxAdjust eTableAdjust; ///< Alignment of table. + SvxAdjust m_eTableAdjust; ///< Alignment of table. - bool bColsOption : 1; ///< Table has a COLS-option. - bool bColTags : 1; ///< Tabelle has COL/COLGRP-tags. - bool bPrcWidthOption : 1; ///< Width is given in percent. - bool bUseRelWidth : 1; ///< SwTable gets relative width. + bool m_bColsOption : 1; ///< Table has a COLS-option. + bool m_bColTags : 1; ///< Tabelle has COL/COLGRP-tags. + bool m_bPrcWidthOption : 1; ///< Width is given in percent. + bool m_bUseRelWidth : 1; ///< SwTable gets relative width. - bool bMustResize : 1; ///< Table width must be defined. - bool bExportable : 1; ///< Layout may be used for export. - bool bBordersChanged : 1; ///< Borders have been changed. - bool bMayBeInFlyFrame : 1; ///< Table could be within frame. + bool m_bMustResize : 1; ///< Table width must be defined. + bool m_bExportable : 1; ///< Layout may be used for export. + bool m_bBordersChanged : 1; ///< Borders have been changed. + bool m_bMayBeInFlyFrame : 1; ///< Table could be within frame. - bool bDelayedResizeRecalc : 1; ///< Param for delayed Resize. - bool bMustNotResize : 1; ///< Table may not be resized. - bool bMustNotRecalc : 1; ///< Table may not be adapted to its contents. + bool m_bDelayedResizeRecalc : 1; ///< Param for delayed Resize. + bool m_bMustNotResize : 1; ///< Table may not be resized. + bool m_bMustNotRecalc : 1; ///< Table may not be adapted to its contents. void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin, sal_uInt16 nCol, sal_uInt16 nColSpan, @@ -242,7 +242,7 @@ class SwHTMLTableLayout SwFrameFormat *FindFlyFrameFormat() const; const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); } - void ClearPass1Info() { nMin = nMax = 0; } + void ClearPass1Info() { m_nMin = m_nMax = 0; } void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false ); @@ -287,24 +287,24 @@ public: inline SwHTMLTableLayoutCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const; inline void SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow, sal_uInt16 nCol ); - void SetLeftFillerBox( SwTableBox *pBox ) { pLeftFillerBox = pBox; } - void SetRightFillerBox( SwTableBox *pBox ) { pRightFillerBox = pBox; } + void SetLeftFillerBox( SwTableBox *pBox ) { m_pLeftFillerBox = pBox; } + void SetRightFillerBox( SwTableBox *pBox ) { m_pRightFillerBox = pBox; } - sal_uLong GetMin() const { return nMin; } - sal_uLong GetMax() const { return nMax; } - sal_uInt16 GetRelLeftFill() const { return nRelLeftFill; } - sal_uInt16 GetRelRightFill() const { return nRelRightFill; } + sal_uLong GetMin() const { return m_nMin; } + sal_uLong GetMax() const { return m_nMax; } + sal_uInt16 GetRelLeftFill() const { return m_nRelLeftFill; } + sal_uInt16 GetRelRightFill() const { return m_nRelRightFill; } inline long GetBrowseWidthMin() const; - bool HasColsOption() const { return bColsOption; } - bool HasColTags() const { return bColTags; } + bool HasColsOption() const { return m_bColsOption; } + bool HasColTags() const { return m_bColTags; } - bool IsTopTable() const { return pSwTable != 0; } + bool IsTopTable() const { return m_pSwTable != 0; } - void SetMustResize( bool bSet ) { bMustResize = bSet; } - void SetMustNotResize( bool bSet ) { bMustNotResize = bSet; } - void SetMustNotRecalc( bool bSet ) { bMustNotRecalc = bSet; } + void SetMustResize( bool bSet ) { m_bMustResize = bSet; } + void SetMustNotResize( bool bSet ) { m_bMustNotResize = bSet; } + void SetMustNotRecalc( bool bSet ) { m_bMustNotRecalc = bSet; } /** Recalculation of table widths for available width that has been passed. - If bRecalc is set, contents of boxes are included into calculation. @@ -334,23 +334,23 @@ public: sal_uInt16 GetBrowseWidthByTable( const SwDoc& rDoc ) const; /// For Export. - sal_uInt16 GetWidthOption() const { return nWidthOption; } - bool HasPrcWidthOption() const { return bPrcWidthOption; } + sal_uInt16 GetWidthOption() const { return m_nWidthOption; } + bool HasPrcWidthOption() const { return m_bPrcWidthOption; } - sal_uInt16 GetCellPadding() const { return nCellPadding; } - sal_uInt16 GetCellSpacing() const { return nCellSpacing; } - sal_uInt16 GetBorder() const { return nBorder; } + sal_uInt16 GetCellPadding() const { return m_nCellPadding; } + sal_uInt16 GetCellSpacing() const { return m_nCellSpacing; } + sal_uInt16 GetBorder() const { return m_nBorder; } - sal_uInt16 GetRowCount() const { return nRows; } - sal_uInt16 GetColCount() const { return nCols; } + sal_uInt16 GetRowCount() const { return m_nRows; } + sal_uInt16 GetColCount() const { return m_nCols; } - void SetExportable( bool bSet ) { bExportable = bSet; } - bool IsExportable() const { return bExportable; } + void SetExportable( bool bSet ) { m_bExportable = bSet; } + bool IsExportable() const { return m_bExportable; } - bool HaveBordersChanged() const { return bBordersChanged; } + bool HaveBordersChanged() const { return m_bBordersChanged; } - void SetMayBeInFlyFrame( bool bSet ) { bMayBeInFlyFrame = bSet; } - bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; } + void SetMayBeInFlyFrame( bool bSet ) { m_bMayBeInFlyFrame = bSet; } + bool MayBeInFlyFrame() const { return m_bMayBeInFlyFrame; } }; inline void SwHTMLTableLayoutCell::SetProtected() @@ -405,16 +405,16 @@ inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace( sal_uInt16 nCol, { sal_uInt16 nSpace = 0; if( nCol==0 ) - nSpace = nSpace + nInhAbsLeftSpace; - if( nCol+nColSpan==nCols ) - nSpace = nSpace + nInhAbsRightSpace; + nSpace = nSpace + m_nInhAbsLeftSpace; + if( nCol+nColSpan==m_nCols ) + nSpace = nSpace + m_nInhAbsRightSpace; return nSpace; } inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol ) const { - return aColumns[nCol]; + return m_aColumns[nCol]; } inline void SwHTMLTableLayoutColumn::SetWidthOption( @@ -432,29 +432,29 @@ inline void SwHTMLTableLayoutColumn::SetWidthOption( inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ) { - aColumns[nCol] = pCol; + m_aColumns[nCol] = pCol; } inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const { - return aCells[nRow*nCols+nCol]; + return m_aCells[nRow*m_nCols+nCol]; } inline void SwHTMLTableLayout::SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow, sal_uInt16 nCol ) { - aCells[nRow*nCols+nCol] = pCell; + m_aCells[nRow*m_nCols+nCol] = pCell; } inline long SwHTMLTableLayout::GetBrowseWidthMin() const { - return (long)( (!nWidthOption || bPrcWidthOption) ? nMin : nRelTabWidth ); + return (long)( (!m_nWidthOption || m_bPrcWidthOption) ? m_nMin : m_nRelTabWidth ); } void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ) { - nInhLeftBorderWidth = nLeft; - nInhRightBorderWidth = nRight; + m_nInhLeftBorderWidth = nLeft; + m_nInhRightBorderWidth = nRight; } #endif -- cgit