[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                     |    3 ++
 patches/dev300/svx-msdff-import-connector-style-fix.diff |   20 +++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit 44bd50343bcdcdf961f89a36462fb82cd5b50ba9
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Dec 18 19:02:41 2009 -0500

    Correctly import connector styles from xls documents.
    
    * patches/dev300/apply:
    * patches/dev300/svx-msdff-import-connector-style-fix.diff: merge
      the properties of connector objects after they are imported, or
      else the connectors will always be elbow-shaped. (n#559393)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c6cdfc4..1e70b04 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3213,6 +3213,9 @@ svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
 basegfx-svgpolygon-speedup.diff, n#535304, thorsten
 o3tl-vector-pool.diff, n#535304, thorsten
 
+# correctly import connector style attribute.
+svx-msdff-import-connector-style-fix.diff, n#559393, kohei
+
 [ Fixes ]
 # deliver extra headers for svg import filter.
 boost-1.39-extra-header.diff, kohei
diff --git a/patches/dev300/svx-msdff-import-connector-style-fix.diff b/patches/dev300/svx-msdff-import-connector-style-fix.diff
new file mode 100644
index 0000000..cf4c3d0
--- /dev/null
+++ b/patches/dev300/svx-msdff-import-connector-style-fix.diff
@@ -0,0 +1,20 @@
+diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
+index 3f023b7..35b6dd0 100644
+--- svx/source/msfilter/msdffimp.cxx
++++ svx/source/msfilter/msdffimp.cxx
+@@ -5109,7 +5109,6 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
+                         if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x1000 )	// SJ: Font Kerning On ?
+                             aSet.Put( SvxKerningItem( 1, EE_CHAR_KERNING ) );
+                     }
+-                    pRet->SetMergedItemSet( aSet );
+ 
+                     // sj: taking care of rtl, ltr. In case of fontwork mso. seems not to be able to set
+                     // proper text directions, instead the text default is depending to the string.
+@@ -5428,6 +5427,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
+ 
+                         ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
+                     }
++                    pRet->SetMergedItemSet( aSet );
+                 }
+             }
+