[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Kohei Yoshida]

 patches/dev300/svx-msdff-import-connector-style-fix.diff |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 5b8ff2a201f5c037b25b788ad75fc607ef712ec4
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 23 13:39:52 2010 -0400

    (Hopefully) fixed incorrect import of MSO drawing objects.
    
    Refer to n#588927 for details.
    
    * patches/dev300/svx-msdff-import-connector-style-fix.diff:

diff --git a/patches/dev300/svx-msdff-import-connector-style-fix.diff b/patches/dev300/svx-msdff-import-connector-style-fix.diff
index 918cd2a..50edc50 100644
--- a/patches/dev300/svx-msdff-import-connector-style-fix.diff
+++ b/patches/dev300/svx-msdff-import-connector-style-fix.diff
@@ -1,12 +1,13 @@
 diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
-index 3f023b7..3bc067e 100644
+index dae1295..645c71c 100644
 --- svx/source/msfilter/msdffimp.cxx
 +++ svx/source/msfilter/msdffimp.cxx
-@@ -5428,6 +5428,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
+@@ -5427,6 +5427,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
+                         aSet.Put( SdrEdgeNode2VertDistItem( n2VertDist ) );
  
                          ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
++
++                        pRet->SetMergedItemSet( aSet );
                      }
-+                    pRet->SetMergedItemSet( aSet );
                  }
              }
-