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

[Kohei Yoshida]

 patches/dev300/svx-msdff-import-connector-style-fix.diff |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 539f23b6937c4d1097d37a59a55802fd0d2f64c6
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Mar 1 11:48:24 2010 -0500

    Fixed the connector import "fix".
    
    * patches/dev300/svx-msdff-import-connector-style-fix.diff: this is
      the correct way to fix this.  The previous fix caused another
      problem & was not done right. (n#559393)

diff --git a/patches/dev300/svx-msdff-import-connector-style-fix.diff b/patches/dev300/svx-msdff-import-connector-style-fix.diff
index cf4c3d0..918cd2a 100644
--- a/patches/dev300/svx-msdff-import-connector-style-fix.diff
+++ b/patches/dev300/svx-msdff-import-connector-style-fix.diff
@@ -1,16 +1,8 @@
 diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
-index 3f023b7..35b6dd0 100644
+index 3f023b7..3bc067e 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
+@@ -5428,6 +5428,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
  
                          ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
                      }