diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-15 09:17:19 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-15 09:39:44 +0200 |
| commit | 53cf9748ccce3660ec3a5b0ad8ad402313af6143 (patch) | |
| tree | f205e8257ad31b41b4407055bd5d589b58c38139 /writerfilter | |
| parent | writerfilter: TablePropertiesHandler's bOOXML was always true (diff) | |
| download | core-53cf9748ccce3660ec3a5b0ad8ad402313af6143.tar.gz core-53cf9748ccce3660ec3a5b0ad8ad402313af6143.zip | |
writerfilter: TDefTableHandler's bOOXML was always true
Change-Id: I9efcb32f742aa7a0549ceb246a1b75fa3af662be
Diffstat (limited to 'writerfilter')
4 files changed, 6 insertions, 10 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index f10718acf31d..a345fdd41c17 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -244,7 +244,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if( pProperties.get()) { - TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler(true) ); + TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler() ); pProperties->resolve( *pTDefTableHandler ); TablePropertyMapPtr pRowPropMap( new TablePropertyMap ); diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 658bea68ff08..18746ce431a1 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -34,13 +34,12 @@ using namespace ::com::sun::star; -TDefTableHandler::TDefTableHandler(bool bOOXML) : +TDefTableHandler::TDefTableHandler() : LoggedProperties(dmapper_logger, "TDefTableHandler"), m_nLineWidth(0), m_nLineType(0), m_nLineColor(0), -m_nLineDistance(0), -m_bOOXML( bOOXML ) +m_nLineDistance(0) { } @@ -330,8 +329,7 @@ void TDefTableHandler::localResolve(Id rName, writerfilter::Reference<Properties } pProperties->resolve( *this ); table::BorderLine2 aBorderLine; - ConversionHelper::MakeBorderLine( m_nLineWidth, m_nLineType, m_nLineColor, - aBorderLine, m_bOOXML ); + ConversionHelper::MakeBorderLine(m_nLineWidth, m_nLineType, m_nLineColor, aBorderLine, /*bIsOOXML=*/true); const bool rtl = false; // TODO switch( rName ) { diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index eb6b37b517cc..65a6f56ab3a1 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -59,8 +59,6 @@ private: sal_Int32 m_nLineColor; sal_Int32 m_nLineDistance; - bool m_bOOXML; - OUString m_aInteropGrabBagName; std::vector<css::beans::PropertyValue> m_aInteropGrabBag; void appendGrabBag(const OUString& aKey, const OUString& aValue); @@ -72,7 +70,7 @@ private: virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: - TDefTableHandler( bool bOOXML ); + TDefTableHandler(); virtual ~TDefTableHandler(); size_t getCellCount() const; diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 2ff85f29ec2f..ac563046beea 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -265,7 +265,7 @@ namespace dmapper { if( pProperties.get()) { //in OOXML there's one set of borders at each cell (if there is any) - TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler(true)); + TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler()); if (m_pCurrentInteropGrabBag) pTDefTableHandler->enableInteropGrabBag("tcBorders"); pProperties->resolve( *pTDefTableHandler ); |