writerfilter: TablePropertiesHandler's bOOXML was always true

Change-Id: I8b1e05c6f685ea32a3c29a4636be4bc4894d7de0

5 files changed, 8 insertions, 10 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 8c674fd7ca18..f10718acf31d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -60,7 +60,7 @@ DomainMapperTableManager::DomainMapperTableManager() :
     m_bTableSizeTypeInserted(false),
     m_nLayoutType(0),
     m_nMaxFixedWidth(0),
-    m_pTablePropsHandler( new TablePropertiesHandler( true ) )
+    m_pTablePropsHandler(new TablePropertiesHandler())
 {
     m_pTablePropsHandler->SetTableManager( this );
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 6e8c51bbcf3d..21bb8f7a3ce0 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -753,7 +753,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 if (!m_pImpl->m_pCurrentEntry)
                     break;
 
-                TablePropertiesHandlerPtr pTblHandler( new TablePropertiesHandler( true ) );
+                TablePropertiesHandlerPtr pTblHandler(new TablePropertiesHandler());
                 pTblHandler->SetProperties( m_pImpl->m_pCurrentEntry->pProperties );
                 if ( !pTblHandler->sprm( rSprm ) )
                 {
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 202be04b83de..2ff85f29ec2f 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -41,10 +41,9 @@ using namespace oox;
 namespace writerfilter {
 namespace dmapper {
 
-    TablePropertiesHandler::TablePropertiesHandler( bool bOOXML ) :
+    TablePropertiesHandler::TablePropertiesHandler() :
         m_pCurrentInteropGrabBag(nullptr),
-        m_pTableManager( nullptr ),
-        m_bOOXML( bOOXML )
+        m_pTableManager( nullptr )
     {
     }
 
@@ -236,7 +235,7 @@ namespace dmapper {
                 writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
                 if( pProperties.get())
                 {
-                    BorderHandlerPtr pBorderHandler( new BorderHandler(m_bOOXML) );
+                    BorderHandlerPtr pBorderHandler(new BorderHandler(true));
                     if (m_pCurrentInteropGrabBag)
                         pBorderHandler->enableInteropGrabBag("tblBorders");
                     pProperties->resolve(*pBorderHandler);
@@ -266,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( m_bOOXML ));
+                    TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler(true));
                     if (m_pCurrentInteropGrabBag)
                         pTDefTableHandler->enableInteropGrabBag("tcBorders");
                     pProperties->resolve( *pTDefTableHandler );
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index cdca8cb7d1df..305c75751d5a 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -41,10 +41,9 @@ private:
     PropertyMapPtr m_pCurrentProperties;
     std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
     TableManager* m_pTableManager;
-    bool m_bOOXML;
 
 public:
-    TablePropertiesHandler( bool bOOXML );
+    TablePropertiesHandler();
     virtual ~TablePropertiesHandler( );
 
     bool sprm(Sprm & sprm);
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 7b60afc70eeb..1bd6a6dbc169 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -32,7 +32,7 @@ namespace dmapper {
 TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
 LoggedProperties(dmapper_logger, "TblStylePrHandler"),
 m_rDMapper( rDMapper ),
-m_pTablePropsHandler( new TablePropertiesHandler( true ) ),
+m_pTablePropsHandler(new TablePropertiesHandler()),
 m_nType( TBL_STYLE_UNKNOWN ),
 m_pProperties( new PropertyMap )
 {