diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-01-05 09:55:16 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-01-07 21:04:31 +0100 |
| commit | ea404ac36ac36def92b5df27e42645af9e0eda68 (patch) | |
| tree | a2f949db12e13391a34519bb98ba87686ee013a8 /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | Remove misleading comment and simplify boundary check (diff) | |
| download | core-ea404ac36ac36def92b5df27e42645af9e0eda68.tar.gz core-ea404ac36ac36def92b5df27e42645af9e0eda68.zip | |
Use more proper integer types and avoid unneeded downcasts
Change-Id: Idcb8f5fd47ae4a7952f313a4402a980359c90a83
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index d6e6115d235c..3ae033e35dd4 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -844,7 +844,7 @@ void RtfAttributeOutput::TableRowEnd(sal_uInt32 /*nDepth*/) void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) { - sal_uInt32 nPageSize = 0; + long nPageSize = 0; bool bRelBoxSize = false; // Create the SwWriteTable instance to use col spans @@ -852,14 +852,13 @@ void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t p const SwTable* pTable = pTableTextNodeInfoInner->getTable(); const SwFrmFmt* pFmt = pTable->GetFrmFmt(); - SwTwips nTblSz = pFmt->GetFrmSize().GetWidth(); + const sal_uInt32 nTblSz = static_cast<sal_uInt32>(pFmt->GetFrmSize().GetWidth()); const SwHTMLTableLayout* pLayout = pTable->GetHTMLTableLayout(); if (pLayout && pLayout->IsExportable()) m_pTableWrt = new SwWriteTable(pLayout); else - m_pTableWrt = new SwWriteTable(pTable->GetTabLines(), (sal_uInt16)nPageSize, - (sal_uInt16)nTblSz, false); + m_pTableWrt = new SwWriteTable(pTable->GetTabLines(), nPageSize, nTblSz, false); } void RtfAttributeOutput::StartTable(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/) |