Avoid having TableManager as a template class

It was always used with T=css::uno::Reference<css::text::XTextRange>

Change-Id: If79413cf68ad5d5f6fc7aba1c065f49e5781d71d

writerfilter/Library_writerfilter.mk

@@ -101,6 +101,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/dmapper/SettingsTable \
     writerfilter/source/dmapper/StyleSheetTable \
     writerfilter/source/dmapper/TDefTableHandler \
+    writerfilter/source/dmapper/TableManager \
     writerfilter/source/dmapper/TablePositionHandler \
     writerfilter/source/dmapper/TablePropertiesHandler \
     writerfilter/source/dmapper/TextEffectsHandler \

writerfilter/source/dmapper/DomainMapperTableManager.cxx

@@ -133,7 +133,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
     dmapper_logger->chars(sSprm);
     dmapper_logger->endElement();
 #endif
-    bool bRet = DomainMapperTableManager_Base_t::sprm(rSprm);
+    bool bRet = TableManager::sprm(rSprm);
     if( !bRet )
     {
         bRet = m_pTablePropsHandler->sprm( rSprm );
@@ -521,7 +521,7 @@ void DomainMapperTableManager::setIsInShape(bool bIsInShape)
 
 void DomainMapperTableManager::startLevel( )
 {
-    DomainMapperTableManager_Base_t::startLevel( );
+    TableManager::startLevel( );
 
     // If requested, pop the value that was pushed too early.
     boost::optional<sal_Int32> oCurrentWidth;
@@ -576,7 +576,7 @@ void DomainMapperTableManager::endLevel( )
     m_aTmpPosition.pop_back( );
     m_aTmpTableProperties.pop_back( );
 
-    DomainMapperTableManager_Base_t::endLevel( );
+    TableManager::endLevel( );
 #ifdef DEBUG_WRITERFILTER
     dmapper_logger->startElement("dmappertablemanager.endLevel");
     PropertyMapPtr pProps = getTableProps();
@@ -826,7 +826,7 @@ void DomainMapperTableManager::endOfRowAction()
     }
 
     // Now that potentially opened table is closed, save the table properties
-    DomainMapperTableManager_Base_t::insertTableProps( pTmpTableProperties );
+    TableManager::insertTableProps( pTmpTableProperties );
 
     m_aTmpTableProperties.pop_back();
     TablePropertyMapPtr pEmptyTableProps( new TablePropertyMap() );

writerfilter/source/dmapper/DomainMapperTableManager.hxx

@@ -34,7 +34,7 @@ namespace dmapper {
 
 class DomainMapper;
 
-class DomainMapperTableManager : public DomainMapperTableManager_Base_t
+class DomainMapperTableManager : public TableManager
 {
     typedef boost::shared_ptr< std::vector<sal_Int32> > IntVectorPtr;
 
@@ -111,7 +111,7 @@ public:
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
         else
-           DomainMapperTableManager_Base_t::cellProps( pProps );
+           TableManager::cellProps( pProps );
     };
 
     virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE
@@ -119,7 +119,7 @@ public:
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
         else
-           DomainMapperTableManager_Base_t::cellPropsByCell( i, pProps );
+           TableManager::cellPropsByCell( i, pProps );
     };
 
     virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE
@@ -127,7 +127,7 @@ public:
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
         else
-           DomainMapperTableManager_Base_t::insertRowProps( pProps );
+           TableManager::insertRowProps( pProps );
     };
 
     virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE
@@ -160,7 +160,7 @@ public:
 
     bool isInCell()
     {
-        return DomainMapperTableManager_Base_t::isInCell();
+        return TableManager::isInCell();
     }
 
     void setIsInShape(bool bIsInShape);

writerfilter/source/dmapper/TablePropertiesHandler.hxx

@@ -34,16 +34,13 @@ namespace dmapper {
 
 class DomainMapper;
 
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Handle_t;
-typedef TableManager<Handle_t> DomainMapperTableManager_Base_t;
-
 class TablePropertiesHandler
 {
 private:
     std::vector< PropertyMapPtr > m_rPropertiesStack;
     PropertyMapPtr m_pCurrentProperties;
     std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
-    DomainMapperTableManager_Base_t *m_pTableManager;
+    TableManager* m_pTableManager;
     bool m_bOOXML;
 
 public:
@@ -52,7 +49,7 @@ public:
 
     bool sprm(Sprm & sprm);
 
-    inline void SetTableManager( DomainMapperTableManager_Base_t *pTableManager )
+    inline void SetTableManager( TableManager* pTableManager )
     {
         m_pTableManager = pTableManager;
     };