summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableManager.hxx
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2013-02-21 10:27:31 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-02-25 08:54:13 +0000
commit67b069cf42b990f47af0a2de4f9cb0bc5e44eeab (patch)
tree16c04b744a5a5ba387db32cf308f206725917bc9 /writerfilter/source/dmapper/DomainMapperTableManager.hxx
parentfd155af5369e3ec782c768f54781658d210e375c (diff)
n#779642: table positions need to be stacked to handle nested table
(cherry picked from commit 36c64bc194714d60a5c18f63bcfc0f721c2056db) Change-Id: I44d4f9b1547365ff1b909c15d996694d9c3c0cf4 Reviewed-on: https://gerrit.libreoffice.org/2308 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableManager.hxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index e18dcea69295..d3164eaf3ee3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_DOMAIN_MAPPER_TABLE_MANAGER_HXX
#include "TablePropertiesHandler.hxx"
+#include <TablePositionHandler.hxx>
#include <resourcemodel/TableManager.hxx>
#include <PropertyMap.hxx>
@@ -44,7 +45,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t
sal_Int32 m_nTableWidth; //might be set directly or has to be calculated from the column positions
bool m_bOOXML;
OUString m_sTableStyleName;
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> m_aTablePosition;
+ std::vector< TablePositionHandlerPtr > m_aTablePositions;
PropertyMapPtr m_pTableStyleTextProperies;
::std::vector< IntVectorPtr > m_aTableGrid;
@@ -81,7 +82,8 @@ public:
IntVectorPtr getCurrentCellWidths( );
const OUString& getTableStyleName() const { return m_sTableStyleName; }
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() { return m_aTablePosition; }
+ const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getCurrentTablePosition();
+
/// copy the text properties of the table style and its parent into pContext
void CopyTextProperties(PropertyMapPtr pContext, StyleSheetTablePtr pStyleSheetTable);