diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-10 14:38:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-11 09:55:04 +0100 |
| commit | 69a6057b04d3b008623bf172abdb21a9ece4a3ee (patch) | |
| tree | 0a9a6d501bea77443a8df62888a6d3add5232d60 /sw/source/core/doc/htmltbl.cxx | |
| parent | b9d6ea1dd7541c4bd866571f9e3f0aa894687c07 (diff) | |
rename Prc->Percent in sw
Change-Id: I011eb59cf40abc6ff62dd541beb1ebbc50725a05
Reviewed-on: https://gerrit.libreoffice.org/84855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/doc/htmltbl.cxx')
| -rw-r--r-- | sw/source/core/doc/htmltbl.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 9b5defa3b695..692d600f9ec9 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -91,11 +91,11 @@ const SwStartNode *SwHTMLTableLayoutCnts::GetStartNode() const SwHTMLTableLayoutCell::SwHTMLTableLayoutCell(std::shared_ptr<SwHTMLTableLayoutCnts> const& rCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan, - sal_uInt16 nWidth, bool bPrcWidth, + sal_uInt16 nWidth, bool bPercentWidth, bool bNWrapOpt ) : xContents(rCnts), nRowSpan( nRSpan ), nColSpan( nCSpan ), - nWidthOption( nWidth ), bPrcWidthOption( bPrcWidth ), + nWidthOption( nWidth ), bPercentWidthOption( bPercentWidth ), bNoWrapOption( bNWrapOpt ) {} @@ -147,7 +147,7 @@ SwHTMLTableLayoutConstraints *SwHTMLTableLayoutConstraints::InsertNext( SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable, sal_uInt16 nRws, sal_uInt16 nCls, bool bColsOpt, bool bColTgs, - sal_uInt16 nWdth, bool bPrcWdth, + sal_uInt16 nWdth, bool bPercentWdth, sal_uInt16 nBorderOpt, sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust, sal_uInt16 nLMargin, sal_uInt16 nRMargin, @@ -183,7 +183,7 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable, , m_eTableAdjust( eAdjust ) , m_bColsOption( bColsOpt ) , m_bColTags( bColTgs ) - , m_bPrcWidthOption( bPrcWdth ) + , m_bPercentWidthOption( bPercentWdth ) , m_bUseRelWidth( false ) , m_bMustResize( true ) , m_bExportable( true ) @@ -518,7 +518,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() // A fixed table width is taken over as minimum and // maximum at the same time - if( !pChild->m_bPrcWidthOption && pChild->m_nWidthOption ) + if( !pChild->m_bPercentWidthOption && pChild->m_nWidthOption ) { sal_uLong nTabWidth = pChild->m_nWidthOption; if( nTabWidth >= nAbsMinTableCnts ) @@ -552,7 +552,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() // A fixed table width is taken over as minimum and // maximum at the same time - if( !pChild->m_bPrcWidthOption && pChild->m_nWidthOption ) + if( !pChild->m_bPercentWidthOption && pChild->m_nWidthOption ) { sal_uLong nTabWidth = pChild->m_nWidthOption; if( nTabWidth >= nAbsMinTableCnts ) @@ -590,7 +590,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() } // This code previously came after AddBorderWidth - bool bRelWidth = pCell->IsPrcWidthOption(); + bool bRelWidth = pCell->IsPercentWidthOption(); sal_uInt16 nWidth = pCell->GetWidthOption(); // A NOWRAP option applies to text and tables, but is @@ -1121,7 +1121,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv m_bUseRelWidth = false; if( m_nWidthOption ) { - if( m_bPrcWidthOption ) + if( m_bPercentWidthOption ) { OSL_ENSURE( m_nWidthOption<=100, "Percentage value too high" ); if( m_nWidthOption > 100 ) @@ -1734,7 +1734,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, if( !bRecalc && ( !m_bMustResize || (m_nLastResizeAbsAvail==nAbsAvail) || (nAbsAvail<=m_nMin && m_nRelTabWidth==m_nMin) || - (!m_bPrcWidthOption && nAbsAvail>=m_nMax && m_nRelTabWidth==m_nMax) ) ) + (!m_bPercentWidthOption && nAbsAvail>=m_nMax && m_nRelTabWidth==m_nMax) ) ) return false; if( nDelay==HTMLTABLE_RESIZE_NOW ) |