[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

 sw/source/filter/rtf/rtffly.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a12a832280db27877c30ee177e9a079cd9c2eed9
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Mon Jun 27 14:46:16 2011 +0000

    n#695479: Remove properties when removing empty fly frame
    
    (cherry picked from commits 4c8307053e3003af6cef5056e36a650f19c8cdb3 and
    b208f71ddd19f1419558e7eb8c413d17d7e9f9da)

diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 92a7ca9..b4c6573 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -1092,6 +1092,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
         // dann zerstoere den FlySave wieder.
         aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
 
+        // Remove the properties that have been parsed before in the paragraph
+        GetAttrStack().pop_back();
     }
     else
     {