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

[Radek Doulík]

 patches/dev300/apply                                                  |    3 -
 patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff |   30 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit f1657f091590fe3024a76708530aa3212ebba013
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Apr 22 11:19:56 2010 +0200

    updated oox-pptx-import-fix-text-body-properties-priority.diff to m15
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f0a0dbb..2b49098 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3519,8 +3519,7 @@ oox-pptx-import-fix-placeholder-text-style-m14.diff, n#479834, rodo
 oox-pptx-import-fix-text-body-properties-priority-m14.diff, n#403402, rodo
 [ OOXML >= ooo320-m15 ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
-# FIXME_ 2010-04-20: needs porting for ooo320-m15 --pmladek
-# oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
+oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
 
 [ OOXML < ooo320-m15 ]
 # FIXME_ 2010-04-20: can be enabled for ooo320-m15 after we port oox-import-text-vert-anchor-and-anchorctr.diff, --pmladek
diff --git a/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff b/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
index 9747102..2364468 100644
--- a/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
+++ b/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
@@ -1,26 +1,26 @@
-diff -rup oox-orig/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
---- oox-orig/source/drawingml/shape.cxx	2009-10-23 14:52:57.000000000 +0200
-+++ oox/source/drawingml/shape.cxx	2009-10-23 15:05:01.000000000 +0200
-@@ -442,7 +442,6 @@ Reference< XShape > Shape::createAndInse
-         aFillProperties.assignUsed( getFillProperties() );
- 
+diff -rup ../ooo320-m15-orig/oox-orig-2/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
+--- ../ooo320-m15-orig/oox-orig-2/source/drawingml/shape.cxx	2010-04-22 11:06:57.000000000 +0200
++++ oox/source/drawingml/shape.cxx	2010-04-22 11:10:44.000000000 +0200
+@@ -496,7 +496,6 @@ Reference< XShape > Shape::createAndInse
          PropertyMap aShapeProperties;
+         PropertyMap::const_iterator	aShapePropIter;
+ 
 -        aShapeProperties.insert( getShapeProperties().begin(), getShapeProperties().end() );
          if( mxCreateCallback.get() )
-             aShapeProperties.insert( mxCreateCallback->getShapeProperties().begin(), mxCreateCallback->getShapeProperties().end() );
- 
-@@ -450,6 +449,7 @@ Reference< XShape > Shape::createAndInse
-         if( mpTextBody.get() )
-             aShapeProperties.insert( mpTextBody->getTextProperties().maPropertyMap.begin(), mpTextBody->getTextProperties().maPropertyMap.end() );
+         {
+             for ( aShapePropIter = mxCreateCallback->getShapeProperties().begin();
+@@ -512,6 +511,7 @@ Reference< XShape > Shape::createAndInse
+                 aShapeProperties[ (*aShapePropIter).first ] = (*aShapePropIter).second;		
+         }
  
 +        aShapeProperties.insert( getShapeProperties().begin(), getShapeProperties().end() );
          // applying properties
          PropertySet aPropSet( xSet );
          if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
-diff -rup oox-orig/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
---- oox-orig/source/drawingml/textbodypropertiescontext.cxx	2009-10-23 14:52:57.000000000 +0200
-+++ oox/source/drawingml/textbodypropertiescontext.cxx	2009-10-23 14:58:58.000000000 +0200
-@@ -67,21 +67,25 @@ TextBodyPropertiesContext::TextBodyPrope
+diff -rup ../ooo320-m15-orig/oox-orig-2/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+--- ../ooo320-m15-orig/oox-orig-2/source/drawingml/textbodypropertiescontext.cxx	2010-04-22 11:06:57.000000000 +0200
++++ oox/source/drawingml/textbodypropertiescontext.cxx	2010-04-22 11:07:59.000000000 +0200
+@@ -66,21 +66,25 @@ TextBodyPropertiesContext::TextBodyPrope
      // ST_Coordinate
      OUString sValue;
      sValue = xAttributes->getOptionalValue( XML_lIns );