writerfilter/source/dmapper/DomainMapperTableManager.cxx | 9 ++++-----
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 3 +--
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 +--
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 021089d8ee76baa13f09bbeccf2bdbedc4e9efed
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Dec 2 09:01:51 2014 +0100
DomainMapperTableManager::m_bOOXML was always true
Change-Id: Icfbd0d779fac949484b37ee861e083a449b225c2
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 58771ca..4f11192 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
+DomainMapperTableManager::DomainMapperTableManager() :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
@@ -52,7 +52,6 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_nCellBorderIndex(0),
m_nHeaderRepeat(0),
m_nTableWidth(0),
- m_bOOXML( bOOXML ),
m_bIsInShape(false),
m_aTmpPosition(),
m_aTmpTableProperties(),
@@ -62,7 +61,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
m_nMaxFixedWidth(0),
- m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
+ m_pTablePropsHandler( new TablePropertiesHandler( true ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -246,7 +245,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties =
rSprm.getProps();
if( pProperties.get())
{
- TDefTableHandlerPtr pTDefTableHandler( new
TDefTableHandler(m_bOOXML) );
+ TDefTableHandlerPtr pTDefTableHandler( new
TDefTableHandler(true) );
pProperties->resolve( *pTDefTableHandler );
TablePropertyMapPtr pRowPropMap( new TablePropertyMap );
@@ -276,7 +275,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties =
rSprm.getProps();
if( pProperties.get())
{
- BorderHandlerPtr pBorderHandler( new
BorderHandler(m_bOOXML) );
+ BorderHandlerPtr pBorderHandler(new BorderHandler(true));
pProperties->resolve(*pBorderHandler);
TablePropertyMapPtr pCellPropMap( new TablePropertyMap() );
pCellPropMap->InsertProps(pBorderHandler->getProperties());
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6333c3b..661b130 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -46,7 +46,6 @@ class DomainMapperTableManager : public TableManager
sal_uInt32 m_nCellBorderIndex; //borders are provided for all cells
and need counting
sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1
then the repeating stops
sal_Int32 m_nTableWidth; //might be set directly or has to be
calculated from the column positions
- bool m_bOOXML;
/// Are we in a shape (text append stack is not empty) or in the body
document?
bool m_bIsInShape;
OUString m_sTableStyleName;
@@ -80,7 +79,7 @@ class DomainMapperTableManager : public TableManager
public:
- DomainMapperTableManager(bool bOOXML);
+ DomainMapperTableManager();
virtual ~DomainMapperTableManager();
// use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index bdebc23..01e7577 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -683,8 +683,7 @@ public:
void appendTableManager( )
{
- boost::shared_ptr< DomainMapperTableManager > pMngr(
- new DomainMapperTableManager( m_eDocumentType ==
DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF ));
+ boost::shared_ptr<DomainMapperTableManager> pMngr(new
DomainMapperTableManager());
m_aTableManagers.push( pMngr );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
