diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-18 17:34:06 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-18 17:54:44 +0100 |
commit | fbe103ee6ca81fb4e2e8eec3875311d350908722 (patch) | |
tree | b54d107bf5d4ec4591015a52384bb5ab7af16f56 /writerfilter/inc/resourcemodel/TableManager.hxx | |
parent | c4f266977004abecab5bbcdd257e301bdc618c9c (diff) |
n#779642: ignore framePr inside table or the table import won't work
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Diffstat (limited to 'writerfilter/inc/resourcemodel/TableManager.hxx')
-rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index 72b575a97b5e..1c24be50a583 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -530,6 +530,11 @@ public: virtual void endLevel(); /** + Tells whether a table has been started or not + */ + bool isInTable(); + + /** Handle the start of a paragraph group. */ virtual void startParagraphGroup(); @@ -702,6 +707,15 @@ void TableManager<T, PropertiesPointer>::handle(const T & rHandle) } template <typename T, typename PropertiesPointer> +bool TableManager<T, PropertiesPointer>::isInTable() +{ + bool bInTable = false; + if ( !mTableDataStack.empty() ) + bInTable = mTableDataStack.top()->getDepth() > 0; + return bInTable; +} + +template <typename T, typename PropertiesPointer> void TableManager<T, PropertiesPointer>::startLevel() { #ifdef DEBUG_TABLE |