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:38:37 +0100 |
| commit | 874f0a1be443b8027d5aba2285866f31cf4169e5 (patch) | |
| tree | 03b444daa76532fcc5efccecdd31e617ea9b9fec /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | a5cf6acfab9982bb29bc7df107a34897537bc0b8 (diff) | |
n#779642: ignore framePr inside table or the table import won't work
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index c808d7611546..fe100ff154d8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -727,7 +727,9 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); TextAppendContext& rAppendContext = m_aTextAppendStack.top(); - if( rAppendContext.pLastParagraphProperties.get() && rAppendContext.pLastParagraphProperties->IsFrameMode() ) + // n#779642: ignore fly frame inside table as it could lead to messy situations + if( rAppendContext.pLastParagraphProperties.get() && rAppendContext.pLastParagraphProperties->IsFrameMode() + && !getTableManager().isInTable() ) { try { |