diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-04 21:32:13 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-04 21:32:13 +0100 |
commit | 3c232768cff2f981f6bcd2a1df978e53eefd964e (patch) | |
tree | cd8ab541e16ab6f34a7870bcec23fddcccde21fe /writerfilter/source/dmapper/TableManager.cxx | |
parent | fdo#65163 reintroduce embedded picture for form components (diff) | |
download | core-3c232768cff2f981f6bcd2a1df978e53eefd964e.tar.gz core-3c232768cff2f981f6bcd2a1df978e53eefd964e.zip |
No need to have TableData as a template
Change-Id: I136f844c3823443a8a42eb7a6e41d3805b085bd1
Diffstat (limited to 'writerfilter/source/dmapper/TableManager.cxx')
-rw-r--r-- | writerfilter/source/dmapper/TableManager.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index 7c2b55833e1e..cf6e318f9459 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -38,7 +38,7 @@ void TableManager::openCell(const css::uno::Reference<css::text::XTextRange>& rH if (mTableDataStack.size() > 0) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData = mTableDataStack.top(); + TableData::Pointer_t pTableData = mTableDataStack.top(); pTableData->addCell(rHandle, pProps); } @@ -211,7 +211,7 @@ void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& r if (mTableDataStack.size() > 0) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData = mTableDataStack.top(); + TableData::Pointer_t pTableData = mTableDataStack.top(); pTableData->endCell(rHandle); } @@ -225,7 +225,7 @@ void TableManager::ensureOpenCell(TablePropertyMapPtr pProps) if (mTableDataStack.size() > 0) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData = mTableDataStack.top(); + TableData::Pointer_t pTableData = mTableDataStack.top(); if (pTableData.get() != nullptr) { @@ -264,7 +264,7 @@ void TableManager::endParagraphGroup() if (mnTableDepth > 0) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData = mTableDataStack.top(); + TableData::Pointer_t pTableData = mTableDataStack.top(); if (isRowEnd()) { @@ -304,7 +304,7 @@ void TableManager::resolveCurrentTable() { try { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData = mTableDataStack.top(); + TableData::Pointer_t pTableData = mTableDataStack.top(); unsigned int nRows = pTableData->getRowCount(); @@ -358,7 +358,7 @@ void TableManager::endLevel() #ifdef DEBUG_WRITERFILTER if (mpTableLogger != nullptr) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData; + TableData::Pointer_t pTableData; if (mTableDataStack.size() > 0) pTableData = mTableDataStack.top(); @@ -379,7 +379,7 @@ void TableManager::startLevel() #ifdef DEBUG_WRITERFILTER if (mpTableLogger != nullptr) { - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t pTableData; + TableData::Pointer_t pTableData; if (mTableDataStack.size() > 0) pTableData = mTableDataStack.top(); @@ -394,8 +394,7 @@ void TableManager::startLevel() } #endif - TableData< css::uno::Reference<css::text::XTextRange> >::Pointer_t - pTableData(new TableData<css::uno::Reference<css::text::XTextRange> >(mTableDataStack.size())); + TableData::Pointer_t pTableData(new TableData(mTableDataStack.size())); // If we have an unfinished row stored here, then push it to the new TableData if (mpUnfinishedRow) |