diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index cf27a30c49f3..01236d68b267 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -273,7 +273,7 @@ public:
         ,nVertRelation( text::RelOrientation::FRAME )
         ,nWrap(text::WrapTextMode_NONE)
         ,bLayoutInCell(true)
-        ,bOpaque( !rDMapper.IsInHeaderFooter() )
+        ,bOpaque( !rDMapper.IsInHeaderFooter() || rDMapper.IsInTable() )
         ,bBehindDoc(false)
         ,bContour(false)
         ,bContourOutside(true)
@@ -660,6 +660,9 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 
             break;
         case NS_ooxml::LN_CT_WrapThrough_wrapText:
+            if ( m_pImpl->rDomainMapper.IsInHeaderFooter() && m_pImpl->rDomainMapper.IsInTable() )
+                m_pImpl->bOpaque = false;
+
             m_pImpl->bContour = true;
             m_pImpl->bContourOutside = false;
 
@@ -1223,6 +1226,8 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
         case NS_ooxml::LN_EG_WrapType_wrapNone: // 90944; - doesn't contain attributes
             //depending on the behindDoc attribute text wraps through behind or in front of the object
             m_pImpl->nWrap = text::WrapTextMode_THROUGH;
+            if ( m_pImpl->rDomainMapper.IsInHeaderFooter() && m_pImpl->rDomainMapper.IsInTable() )
+                m_pImpl->bOpaque = false;
 
             // Wrap though means the margins defined earlier should not be
             // respected.