[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                     |    2 --
 patches/dev300/svx-msdff-import-connector-style-fix.diff |   15 ---------------
 2 files changed, 17 deletions(-)

New commits:
commit 13b22baa8aa3c81e42e5781f6aece262258a4ea5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Apr 6 23:25:32 2011 -0400

    We don't need this fix any more.  It's in OOo's code.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b1ea91a..ff08de8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1448,8 +1448,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 [ Fixes ]
 # 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
-# correctly import connector style attribute.
-# FIXME ooo3330-m4: doesn't apply in m3f svx-msdff-import-connector-style-fix.diff, n#631804, kohei
 
 [ NovellOnly ]
 # remove Macro Recorder from UI since it is borked by design
diff --git a/patches/dev300/svx-msdff-import-connector-style-fix.diff b/patches/dev300/svx-msdff-import-connector-style-fix.diff
deleted file mode 100644
index 739e621..0000000
--- a/patches/dev300/svx-msdff-import-connector-style-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msdffimp.cxx
-index b72b0fc..f1b45ca 100644
---- filter/source/msfilter/msdffimp.cxx
-+++ filter/source/msfilter/msdffimp.cxx
-@@ -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 );
-                 }
-             }
-