[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                     |    3 +--
 patches/dev300/svx-msdff-import-connector-style-fix.diff |   15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit fb5ba6917ab9e33236a2b62fd473c85f548fb64e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Aug 17 09:16:48 2010 -0400

    Re-fix the shape import from MSO file format.
    
    * patches/dev300/apply:
    * patches/dev300/svx-msdff-import-connector-style-fix.diff: the fix
      was somehow lost during rebasing from 3.2.1 to 3.3. (n#631804)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9a15799..0773fa9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3141,9 +3141,8 @@ emf+-driver-string.diff, n#519715, rodo
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
 svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
 
-[ Fixes < ooo330-m3 ]
 # correctly import connector style attribute.
-svx-msdff-import-connector-style-fix.diff, n#559393, i#108086, kohei
+svx-msdff-import-connector-style-fix.diff, n#631804, kohei
 
 [ Win32Only ]
 # FIXME dev300-m77: Doesn't apply, maybe not needed
diff --git a/patches/dev300/svx-msdff-import-connector-style-fix.diff b/patches/dev300/svx-msdff-import-connector-style-fix.diff
index e097154..739e621 100644
--- a/patches/dev300/svx-msdff-import-connector-style-fix.diff
+++ b/patches/dev300/svx-msdff-import-connector-style-fix.diff
@@ -1,20 +1,15 @@
----
- filter/source/msfilter/msdffimp.cxx |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
 diff --git filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msdffimp.cxx
-index b72b0fc..c9fece2 100644
+index b72b0fc..f1b45ca 100644
 --- filter/source/msfilter/msdffimp.cxx
 +++ filter/source/msfilter/msdffimp.cxx
-@@ -5373,6 +5373,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
+@@ -5373,8 +5373,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                          aSet.Put( SdrEdgeNode2VertDistItem( n2VertDist ) );
  
                          ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
 +
 +                        pRet->SetMergedItemSet( aSet );
                      }
-                     pRet->SetMergedItemSet( aSet );
+-                    pRet->SetMergedItemSet( aSet );
                  }
--- 
-1.7.0.1
-
+             }
+