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

[Pei Feng Lin]

 patches/dev300/oox-xlsx-import-fix-connector-shape.diff |   19 +++++++++-------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 41d5fa917695c330e13d4d9684f0f87978848d38
Author: Fong Lin <pflin at novell.com>
Date:   Fri Jan 1 13:42:39 2010 +0800

    more the patch per Kohei's comment
    
    * patches/dev300/oox-xlsx-import-fix-connector-shape.diff:

diff --git a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
index cf7340a..8691d1f 100644
--- a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
+++ b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
@@ -1,5 +1,5 @@
 diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
-index 807b4ad..a10c679 100644
+index 807b4ad..76a72a1 100644
 --- oox/source/drawingml/shape.cxx
 +++ oox/source/drawingml/shape.cxx
 @@ -49,6 +49,7 @@
@@ -19,9 +19,9 @@ index 807b4ad..a10c679 100644
 +        rtl::OUString sConnectorType = mpCustomShapePropertiesPtr->getShapePresetType();
 +        // FIXME: handle other connector type, should be use XEnhancedCustomShapeDefaulter?
 +        ConnectorType eConnectorType = ConnectorType_STANDARD;
-+        if( sConnectorType == OUString::createFromAscii("mso-spt32") )
++        if( sConnectorType.equalsAscii("mso-spt32") )
 +            eConnectorType = ConnectorType_LINE;
-+        else if( sConnectorType == OUString::createFromAscii("mso-spt38") )
++        else if( sConnectorType.equalsAscii("mso-spt38") )
 +            eConnectorType = ConnectorType_CURVE;
 +        
 +        maShapeProperties[ PROP_EdgeKind ] <<= eConnectorType;
@@ -29,14 +29,17 @@ index 807b4ad..a10c679 100644
      else
      {
 diff --git oox/source/token/properties.txt oox/source/token/properties.txt
-index cd57740..064b3ef 100644
+index cd57740..63f53a7 100644
 --- oox/source/token/properties.txt
 +++ oox/source/token/properties.txt
-@@ -411,3 +411,4 @@ WriteProtectionPassword
- WritingMode
- ZoomType
- ZoomValue
+@@ -110,6 +110,7 @@ DrillDownOnDoubleClick
+ Dropdown
+ Duration
+ EchoChar
 +EdgeKind
+ Enabled
+ EndPosition
+ ErrorAlertStyle
 diff --git oox/source/xls/drawingfragment.cxx oox/source/xls/drawingfragment.cxx
 index 3b72126..f410574 100644
 --- oox/source/xls/drawingfragment.cxx