diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-08-27 19:53:36 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2018-09-01 06:17:54 +0200 |
| commit | 4ea9efb492484da7763d25ce09c92ab1c6beb587 (patch) | |
| tree | cd2903ef538dfc1238707eac22fd6c5238b7904e /writerfilter | |
| parent | 1d0727a104d76210814f41c1169df318e40c9d80 (diff) | |
remove single-value variable: nCell
pulled in from OOo project as a single call being passed nCell = 0.
Change-Id: I90899e9b5270d809dbdc37915a5ec31fc43f1f22
Reviewed-on: https://gerrit.libreoffice.org/59673
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/TDefTableHandler.cxx | 27 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TDefTableHandler.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 2 |
3 files changed, 15 insertions, 16 deletions
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 1a29fbc4b6b2..0658a9f8c128 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -413,21 +413,20 @@ void TDefTableHandler::lcl_sprm(Sprm & rSprm) } } -void TDefTableHandler::fillCellProperties( - size_t nCell, const ::tools::SvRef< TablePropertyMap >& pCellProperties ) const +void TDefTableHandler::fillCellProperties( const ::tools::SvRef< TablePropertyMap >& pCellProperties ) const { - if( m_aTopBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_TOP_BORDER, uno::makeAny( m_aTopBorderLines[nCell] ) ); - if( m_aLeftBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_LEFT_BORDER, uno::makeAny( m_aLeftBorderLines[nCell] ) ); - if( m_aBottomBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::makeAny( m_aBottomBorderLines[nCell] ) ); - if( m_aRightBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_RIGHT_BORDER, uno::makeAny( m_aRightBorderLines[nCell] ) ); - if( m_aInsideHBorderLines.size() > nCell ) - pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::makeAny( m_aInsideHBorderLines[nCell] ) ); - if( m_aInsideVBorderLines.size() > nCell ) - pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::makeAny( m_aInsideVBorderLines[nCell] ) ); + if( m_aTopBorderLines.size() ) + pCellProperties->Insert( PROP_TOP_BORDER, uno::makeAny( m_aTopBorderLines[0] ) ); + if( m_aLeftBorderLines.size() ) + pCellProperties->Insert( PROP_LEFT_BORDER, uno::makeAny( m_aLeftBorderLines[0] ) ); + if( m_aBottomBorderLines.size() ) + pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::makeAny( m_aBottomBorderLines[0] ) ); + if( m_aRightBorderLines.size() ) + pCellProperties->Insert( PROP_RIGHT_BORDER, uno::makeAny( m_aRightBorderLines[0] ) ); + if( m_aInsideHBorderLines.size() ) + pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::makeAny( m_aInsideHBorderLines[0] ) ); + if( m_aInsideVBorderLines.size() ) + pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::makeAny( m_aInsideVBorderLines[0] ) ); } diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index 09ef72e8320d..76b3e60b0e85 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -64,7 +64,7 @@ public: TDefTableHandler(); virtual ~TDefTableHandler() override; - void fillCellProperties( size_t nCell, const ::tools::SvRef< TablePropertyMap >& pCellProperties) const; + void fillCellProperties( const ::tools::SvRef< TablePropertyMap >& pCellProperties) const; void enableInteropGrabBag(const OUString& aName); css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString()); static OUString getBorderTypeString(sal_Int32 nType); diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index b109c36f10b3..2343361cfc1c 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -243,7 +243,7 @@ namespace dmapper { if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pTDefTableHandler->getInteropGrabBag()); TablePropertyMapPtr pCellPropMap( new TablePropertyMap ); - pTDefTableHandler->fillCellProperties( 0, pCellPropMap ); + pTDefTableHandler->fillCellProperties( pCellPropMap ); cellProps( pCellPropMap ); } } |