sw/source/filter/ww8/ww8par2.cxx | 10 ++++------
writerfilter/source/dmapper/PropertyMap.cxx | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit c93b2a24d42b31043e2456b222bcb433175d6ce9
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Mar 26 09:45:56 2020 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Thu Apr 2 18:51:48 2020 +0200
NFC ww8/writerfilter: comment fixes and general code cleanup
1.) Confusing to set a default in the CTOR head, and then
change it in the body.
2.) fix spelling
3.) clarify somewhat misleading comments.
Change-Id: Icb19a8838f1f01310b2dacc8cef7d9f0c67f3e75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91275
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3f3ff253a44e..a18dd5185ccc 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1767,7 +1767,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
m_nPercentWidth(0),
m_bOk(true),
m_bClaimLineFormat(false),
- m_eOri(text::HoriOrientation::NONE),
+ m_eOri(text::HoriOrientation::LEFT),
m_bIsBiDi(false),
m_nCurrentRow(0),
m_nCurrentBandRow(0),
@@ -1793,8 +1793,6 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
WW8PLCFx_Cp_FKP* pPap = m_pIo->m_xPlcxMan->GetPapPLCF();
- m_eOri = text::HoriOrientation::LEFT;
-
WW8TabBandDesc* pNewBand = new WW8TabBandDesc;
wwSprmParser aSprmParser(m_pIo->GetFib());
@@ -2499,7 +2497,7 @@ void WW8TabDesc::CreateSwTable()
if( m_nMaxRight - m_nMinLeft > MINLAY * m_nDefaultSwCols )
{
SwFormatFrameSize aFrameSize(SwFrameSize::Fixed, m_nSwWidth);
- // Don't set relative width if the table has been converted into a
floating frame
+ // Don't set relative width if the table is in a floating frame
if ( m_nPercentWidth && (!m_pIo->m_xSFlyPara ||
!m_pIo->m_xSFlyPara->pFlyFormat) )
aFrameSize.SetWidthPercent(m_nPercentWidth);
m_pTable->GetFrameFormat()->SetFormatAttr(aFrameSize);
@@ -2530,9 +2528,9 @@ void WW8TabDesc::CreateSwTable()
m_pIo->m_xSFlyPara->pFlyFormat->SetFormatAttr(aHori);
}
}
- else
+ else // Not directly in a floating frame.
{
- //If bApo is set, then this table is being placed in a floating
+ //Historical note: If InLocalApo(), then this table is being
placed in a floating
//frame, and the frame matches the left and right *lines* of the
//table, so the space to the left of the table isn't to be used
//inside the frame, in word the dialog involved greys out the
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 23c9aac40dc0..21fd70d662d4 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1180,7 +1180,7 @@ bool SectionPropertyMap::FloatingTableConversion( const
DomainMapper_Impl& rDM_I
// here represents this limit.
const sal_Int32 nMagicNumber = 469;
- // If the table's with is smaller than the text area width, text might
+ // If the table's width is smaller than the text area width, text might
// be next to the table and so it should behave as a floating table.
if ( (nTableWidth + nMagicNumber) < nTextAreaWidth )
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
