make the patch apply, also remove customashape part as it needs 3.3 changes

* patches/dev300/oox-pptx-import-fix-customshapes-and-groups.diff:

1 files changed, 2 insertions, 29 deletions

diff --git a/patches/dev300/oox-pptx-import-fix-customshapes-and-groups.diff b/patches/dev300/oox-pptx-import-fix-customshapes-and-groups.diff
index 747837b42..f2e51d885 100644
--- a/patches/dev300/oox-pptx-import-fix-customshapes-and-groups.diff
+++ b/patches/dev300/oox-pptx-import-fix-customshapes-and-groups.diff
@@ -21,37 +21,10 @@ diff -rup oox/inc/oox/drawingml/shape.hxx oox-broken-with-changes/inc/oox/drawin
      TextBodyPtr                 mpTextBody;
      LinePropertiesPtr           mpLinePropertiesPtr;
      FillPropertiesPtr           mpFillPropertiesPtr;
-diff -rup oox/source/drawingml/customshapegeometry.cxx oox-broken-with-changes/source/drawingml/customshapegeometry.cxx
---- oox/source/drawingml/customshapegeometry.cxx	2010-08-13 18:05:48.000000000 +0200
-+++ oox-broken-with-changes/source/drawingml/customshapegeometry.cxx	2010-08-12 16:09:04.000000000 +0200
-@@ -403,7 +403,7 @@ static EnhancedCustomShapeParameter GetA
-             }
-             if ( ( n >= '0' ) && ( n <= '9' ) )
-             {	// seems to be a ST_Coordinate
--                aRet.Value = Any( rValue.toInt32() );
-+                aRet.Value = Any( (sal_Int32)(rValue.toInt32() / 5) );
-                 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
-             }
-             else
-diff -rup oox/source/drawingml/customshapeproperties.cxx oox-broken-with-changes/source/drawingml/customshapeproperties.cxx
---- oox/source/drawingml/customshapeproperties.cxx	2010-08-13 18:05:48.000000000 +0200
-+++ oox-broken-with-changes/source/drawingml/customshapeproperties.cxx	2010-08-12 16:20:12.000000000 +0200
-@@ -131,6 +131,11 @@ void CustomShapeProperties::pushToPropSe
-                                         aAdjustmentVal.State = PropertyState_DIRECT_VALUE;
-                                         aAdjustmentSeq[ nAdjustmentIndex ] = aAdjustmentVal;
-                                     }
-+                                } else {
-+                                    EnhancedCustomShapeAdjustmentValue aAdjustmentVal;
-+                                    aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32();
-+                                    aAdjustmentVal.State = PropertyState_DIRECT_VALUE;
-+                                    aAdjustmentSeq[ 0 ] = aAdjustmentVal;
-                                 }
-                                 aIter++;
-                             }
 diff -rup oox/source/drawingml/shape.cxx oox-broken-with-changes/source/drawingml/shape.cxx
 --- oox/source/drawingml/shape.cxx	2010-08-13 18:05:48.000000000 +0200
 +++ oox-broken-with-changes/source/drawingml/shape.cxx	2010-08-13 18:06:54.000000000 +0200
-@@ -267,24 +267,14 @@ void Shape::addChildren(
+@@ -262,24 +262,14 @@ void Shape::addChildren(
      {
          awt::Rectangle aShapeRect;
          awt::Rectangle* pShapeRect = 0;
@@ -82,7 +55,7 @@ diff -rup oox/source/drawingml/shape.cxx oox-broken-with-changes/source/drawingm
 +            aShapeRect.Height = maSize.Height + rChild.maSize.Height - maChSize.Height;
 +            pShapeRect = &aShapeRect;
          }
-         (*aIter++)->addShape( rFilterBase, pTheme, rxShapes, pShapeRect, pShapeMap );
+         (*aIter++)->addShape( rFilterBase, rxTheme, rxShapes, pShapeRect, pShapeMap );
      }
 diff -rup oox/source/drawingml/transform2dcontext.cxx oox-broken-with-changes/source/drawingml/transform2dcontext.cxx
 --- oox/source/drawingml/transform2dcontext.cxx	2010-08-13 18:05:47.000000000 +0200