n#779642: ignore framePr inside table or the table import won't work

1 files changed, 14 insertions, 0 deletions

diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index b6555cc00264..a8ee39be69a1 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -521,6 +521,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();
@@ -693,6 +698,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