[ooo-build-commit] patches/dev300

Radek Doulík rodo at kemper.freedesktop.org
Mon Oct 5 09:29:45 PDT 2009 

 patches/dev300/apply                          |    3 
 patches/dev300/oox-custom-shape-polygons.diff |  153 ++++++++++++--------------
 2 files changed, 74 insertions(+), 82 deletions(-)

New commits:
commit 38cabbb92f55bcee6e4d199aa79abe989e56e25f
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Oct 5 18:28:58 2009 +0200

    updated the patch to build on m58
    
    * patches/dev300/apply:
    * patches/dev300/oox-custom-shape-polygons.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index df5c85c..a09dc20 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2110,8 +2110,7 @@ oox-fix-list-style-apply.diff, n#485417, rodo
 # upstream. --tml
 # oox-fix-ole2.diff, n#485418, rodo
 
-# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
-# oox-custom-shape-polygons.diff, n#485418, rodo
+oox-custom-shape-polygons.diff, n#485418, rodo
 
 # FIXME: 2009-08-12: This stuff seems to be already in dev300-m54
 # (with some stylistic differences)? --tml
diff --git a/patches/dev300/oox-custom-shape-polygons.diff b/patches/dev300/oox-custom-shape-polygons.diff
index dc8651c..69531a9 100644
--- a/patches/dev300/oox-custom-shape-polygons.diff
+++ b/patches/dev300/oox-custom-shape-polygons.diff
@@ -1,14 +1,13 @@
-diff --git oox/inc/oox/drawingml/customshapegeometry.hxx oox/inc/oox/drawingml/customshapegeometry.hxx
-index af1e6fe..fc86081 100644
---- oox/inc/oox/drawingml/customshapegeometry.hxx
-+++ oox/inc/oox/drawingml/customshapegeometry.hxx
+diff -rup oox-orig-1/inc/oox/drawingml/customshapegeometry.hxx oox/inc/oox/drawingml/customshapegeometry.hxx
+--- oox-orig-1/inc/oox/drawingml/customshapegeometry.hxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/inc/oox/drawingml/customshapegeometry.hxx	2009-10-05 18:18:01.000000000 +0200
 @@ -44,11 +44,11 @@ namespace oox { namespace drawingml {
  class CustomShapeGeometryContext : public ::oox::core::ContextHandler
  {
  public:
 -    CustomShapeGeometryContext( ::oox::core::ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, CustomShapeProperties& rCustomShapeProperties );
 +    CustomShapeGeometryContext( ::oox::core::ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape );
- 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
  
  private:
 -    CustomShapeProperties& mrCustomShapeProperties;
@@ -16,10 +15,9 @@ index af1e6fe..fc86081 100644
  };
  
  // ---------------------------------------------------------------------
-diff --git oox/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx
-index 2fe36f2..53554d7 100644
---- oox/inc/oox/drawingml/customshapeproperties.hxx
-+++ oox/inc/oox/drawingml/customshapeproperties.hxx
+diff -rup oox-orig-1/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx
+--- oox-orig-1/inc/oox/drawingml/customshapeproperties.hxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/inc/oox/drawingml/customshapeproperties.hxx	2009-10-05 18:18:01.000000000 +0200
 @@ -35,6 +35,7 @@
  #include "oox/drawingml/color.hxx"
  #include <com/sun/star/graphic/XGraphic.hpp>
@@ -29,23 +27,22 @@ index 2fe36f2..53554d7 100644
  #include <vector>
  #include <map>
 @@ -80,11 +81,12 @@ public:
- 	std::vector< CustomShapeGuide >& getAdjustmentValues(){ return maAdjustmentValues; };
+     std::vector< CustomShapeGuide >& getAdjustmentValues(){ return maAdjustmentValues; };
  
- 	double getValue( const std::vector< CustomShapeGuide >&, sal_uInt32 nIndex ) const;
+     double getValue( const std::vector< CustomShapeGuide >&, sal_uInt32 nIndex ) const;
 -
 +    ::basegfx::B2DPolyPolygon& getPolygon() { return maPolygon; }
  private:
  
- 	rtl::OUString					maShapePresetType;
- 	std::vector< CustomShapeGuide >	maAdjustmentValues;
+     rtl::OUString					maShapePresetType;
+     std::vector< CustomShapeGuide >	maAdjustmentValues;
 +    ::basegfx::B2DPolyPolygon maPolygon;
  };
  
  } }
-diff --git oox/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
-index 5a7e7e5..547f72e 100644
---- oox/inc/oox/drawingml/shape.hxx
-+++ oox/inc/oox/drawingml/shape.hxx
+diff -rup oox-orig-1/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
+--- oox-orig-1/inc/oox/drawingml/shape.hxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/inc/oox/drawingml/shape.hxx	2009-10-05 18:18:01.000000000 +0200
 @@ -33,7 +33,7 @@
  
  #include "oox/helper/propertymap.hxx"
@@ -65,10 +62,9 @@ index 5a7e7e5..547f72e 100644
  typedef ::std::map< ::rtl::OUString, ShapePtr > ShapeIdMap;
  
  struct ShapeStyleRef
-diff --git oox/source/drawingml/chart/plotareaconverter.cxx oox/source/drawingml/chart/plotareaconverter.cxx
-index f3baa2c..ce6e3e7 100644
---- oox/source/drawingml/chart/plotareaconverter.cxx
-+++ oox/source/drawingml/chart/plotareaconverter.cxx
+diff -rup oox-orig-1/source/drawingml/chart/plotareaconverter.cxx oox/source/drawingml/chart/plotareaconverter.cxx
+--- oox-orig-1/source/drawingml/chart/plotareaconverter.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/chart/plotareaconverter.cxx	2009-10-05 18:18:01.000000000 +0200
 @@ -31,6 +31,7 @@
  
  #include "oox/drawingml/chart/plotareaconverter.hxx"
@@ -77,8 +73,9 @@ index f3baa2c..ce6e3e7 100644
  #include <com/sun/star/drawing/ShadeMode.hpp>
  #include <com/sun/star/chart2/XChartDocument.hpp>
  #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
---- oox/source/drawingml/customshapegeometry.cxx
-+++ oox/source/drawingml/customshapegeometry.cxx
+diff -rup oox-orig-1/source/drawingml/customshapegeometry.cxx oox/source/drawingml/customshapegeometry.cxx
+--- oox-orig-1/source/drawingml/customshapegeometry.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/customshapegeometry.cxx	2009-10-05 18:18:01.000000000 +0200
 @@ -29,10 +29,12 @@
   ************************************************************************/
  
@@ -92,7 +89,7 @@ index f3baa2c..ce6e3e7 100644
  
  #include "oox/helper/helper.hxx"
  #include "oox/helper/propertymap.hxx"
-@@ -41,6 +43,7 @@
+@@ -40,6 +42,7 @@
  #include "tokens.hxx"
  
  using ::rtl::OUString;
@@ -100,7 +97,7 @@ index f3baa2c..ce6e3e7 100644
  using namespace ::oox::core;
  using namespace ::com::sun::star::uno;
  using namespace ::com::sun::star::xml::sax;
-@@ -184,6 +187,88 @@ Reference< XFastContextHandler > AdjustmentValueContext::createFastChildContext(
+@@ -183,6 +186,88 @@ Reference< XFastContextHandler > Adjustm
  
  // ---------------------------------------------------------------------
  
@@ -188,8 +185,8 @@ index f3baa2c..ce6e3e7 100644
 +
  OUString GetShapeType( sal_Int32 nType )
  {
- 	OUString sType;
-@@ -985,9 +1070,9 @@ static OUString GetTextShapeType( sal_Int32 nType )
+     OUString sType;
+@@ -984,9 +1069,9 @@ static OUString GetTextShapeType( sal_In
  
  // ---------------------------------------------------------------------
  // CT_CustomGeometry2D
@@ -201,33 +198,31 @@ index f3baa2c..ce6e3e7 100644
  {
  }
  
-@@ -1001,8 +1086,9 @@ Reference< XFastContextHandler > CustomShapeGeometryContext::createFastChildCont
- 	case NMSP_DRAWINGML|XML_ahLst:		// CT_AdjustHandleList adjust handle list
- 	case NMSP_DRAWINGML|XML_cxnLst:	// CT_ConnectionSiteList connection site list
- 	case NMSP_DRAWINGML|XML_rect:	// CT_GeomRectList geometry rect list
+@@ -1000,8 +1085,9 @@ Reference< XFastContextHandler > CustomS
+     case NMSP_DRAWINGML|XML_ahLst:		// CT_AdjustHandleList adjust handle list
+     case NMSP_DRAWINGML|XML_cxnLst:	// CT_ConnectionSiteList connection site list
+     case NMSP_DRAWINGML|XML_rect:	// CT_GeomRectList geometry rect list
 +	  break;
- 	case NMSP_DRAWINGML|XML_pathLst:	// CT_Path2DList 2d path list
--		break;
+     case NMSP_DRAWINGML|XML_pathLst:	// CT_Path2DList 2d path list
+-        break;
 +	    return new PathListContext( *this, mrShape );
- 	}
+     }
  
- 	Reference< XFastContextHandler > xEmpty;
-diff --git oox/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
-index c28e8eb..94441be 100644
---- oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
-+++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
-@@ -34,6 +34,7 @@
+     Reference< XFastContextHandler > xEmpty;
+diff -rup oox-orig-1/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+--- oox-orig-1/source/drawingml/diagram/diagramdefinitioncontext.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx	2009-10-05 18:18:01.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include "oox/helper/helper.hxx"
  #include "layoutnodecontext.hxx"
- #include "diagramdefinitioncontext.hxx"
  #include "oox/drawingml/diagram/datamodelcontext.hxx"
 +#include "tokens.hxx"
  
  using namespace ::oox::core;
  using namespace ::com::sun::star::uno;
-diff --git oox/source/drawingml/diagram/diagramfragmenthandler.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx
-index fc5fe05..f666fb8 100644
---- oox/source/drawingml/diagram/diagramfragmenthandler.cxx
-+++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+diff -rup oox-orig-1/source/drawingml/diagram/diagramfragmenthandler.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+--- oox-orig-1/source/drawingml/diagram/diagramfragmenthandler.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx	2009-10-05 18:18:01.000000000 +0200
 @@ -34,7 +34,7 @@
  #include "oox/drawingml/diagram/datamodelcontext.hxx"
  #include "oox/core/namespaces.hxx"
@@ -237,9 +232,10 @@ index fc5fe05..f666fb8 100644
  
  using namespace ::oox::core;
  using namespace ::com::sun::star::xml::sax;
---- oox/source/drawingml/graphicshapecontext.cxx
-+++ oox/source/drawingml/graphicshapecontext.cxx
-@@ -32,6 +32,7 @@
+diff -rup oox-orig-1/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/graphicshapecontext.cxx
+--- oox-orig-1/source/drawingml/graphicshapecontext.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/graphicshapecontext.cxx	2009-10-05 18:18:01.000000000 +0200
+@@ -33,6 +33,7 @@
  #include <com/sun/star/chart2/XChartDocument.hpp>
  
  #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
@@ -247,10 +243,9 @@ index fc5fe05..f666fb8 100644
  #include "oox/drawingml/diagram/diagramfragmenthandler.hxx"
  #include "oox/drawingml/table/tablecontext.hxx"
  #include "oox/core/namespaces.hxx"
-diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
-index b1f3559..655083c 100644
---- oox/source/drawingml/shape.cxx
-+++ oox/source/drawingml/shape.cxx
+diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
+--- oox-orig-1/source/drawingml/shape.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/shape.cxx	2009-10-05 18:19:24.000000000 +0200
 @@ -29,6 +29,7 @@
   ************************************************************************/
  
@@ -259,7 +254,7 @@ index b1f3559..655083c 100644
  #include "oox/drawingml/theme.hxx"
  #include "oox/drawingml/fillproperties.hxx"
  #include "oox/drawingml/lineproperties.hxx"
-@@ -209,8 +210,8 @@ void Shape::addChildren(
+@@ -217,8 +218,8 @@ void Shape::addChildren(
      aIter = rMaster.maChildren.begin();
      while( aIter != rMaster.maChildren.end() )
      {
@@ -270,7 +265,7 @@ index b1f3559..655083c 100644
          if ( ( nGlobalLeft != SAL_MAX_INT32 ) && ( nGlobalRight != SAL_MIN_INT32 ) && ( nGlobalTop != SAL_MAX_INT32 ) && ( nGlobalBottom != SAL_MIN_INT32 ) )
          {
              sal_Int32 nGlobalWidth = nGlobalRight - nGlobalLeft;
-@@ -284,6 +285,36 @@ Reference< XShape > Shape::createAndInsert(
+@@ -297,6 +298,35 @@ Reference< XShape > Shape::createAndInse
          aTransformation.translate( aPosition.X / 360.0, aPosition.Y / 360.0 );
      }
  
@@ -298,32 +293,29 @@ index b1f3559..655083c 100644
 +		    }
 +		    aPolyPolySequence.getArray()[ j ] = aPointSequence;
 +		}
-+		static const OUString sPolyPolygon(RTL_CONSTASCII_USTRINGPARAM("PolyPolygon"));
-+		maShapeProperties[ sPolyPolygon ] <<= aPolyPolySequence;
++		maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
 +	    }
 +	}
 +    }
 +
      // special for lineshape
-     if ( rServiceName == OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) )
+     if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) )
      {
-diff --git oox/source/drawingml/shapepropertiescontext.cxx oox/source/drawingml/shapepropertiescontext.cxx
-index 9ef39a4..479b706 100644
---- oox/source/drawingml/shapepropertiescontext.cxx
-+++ oox/source/drawingml/shapepropertiescontext.cxx
-@@ -77,7 +77,7 @@ Reference< XFastContextHandler > ShapePropertiesContext::createFastChildContext(
- 
- 	// GeometryGroup
- 	case NMSP_DRAWINGML|XML_custGeom:	// custom geometry "CT_CustomGeometry2D"
+diff -rup oox-orig-1/source/drawingml/shapepropertiescontext.cxx oox/source/drawingml/shapepropertiescontext.cxx
+--- oox-orig-1/source/drawingml/shapepropertiescontext.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/shapepropertiescontext.cxx	2009-10-05 18:18:01.000000000 +0200
+@@ -77,7 +77,7 @@ Reference< XFastContextHandler > ShapePr
+ 
+     // GeometryGroup
+     case NMSP_DRAWINGML|XML_custGeom:	// custom geometry "CT_CustomGeometry2D"
 -        xRet.set( new CustomShapeGeometryContext( *this, xAttribs, *(mrShape.getCustomShapeProperties())  ) );
 +        xRet.set( new CustomShapeGeometryContext( *this, xAttribs, mrShape ) );
- 		break;
+         break;
  
  
-diff --git oox/source/drawingml/table/tablerowcontext.cxx oox/source/drawingml/table/tablerowcontext.cxx
-index f3ae44c..09913a0 100644
---- oox/source/drawingml/table/tablerowcontext.cxx
-+++ oox/source/drawingml/table/tablerowcontext.cxx
+diff -rup oox-orig-1/source/drawingml/table/tablerowcontext.cxx oox/source/drawingml/table/tablerowcontext.cxx
+--- oox-orig-1/source/drawingml/table/tablerowcontext.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/table/tablerowcontext.cxx	2009-10-05 18:18:01.000000000 +0200
 @@ -34,6 +34,7 @@
  #include "oox/drawingml/table/tablecellcontext.hxx"
  #include "oox/drawingml/table/tablerow.hxx"
@@ -332,10 +324,9 @@ index f3ae44c..09913a0 100644
  
  using namespace ::oox::core;
  using namespace ::com::sun::star;
-diff --git oox/source/drawingml/theme.cxx oox/source/drawingml/theme.cxx
-index e1a7f63..84e1506 100644
---- oox/source/drawingml/theme.cxx
-+++ oox/source/drawingml/theme.cxx
+diff -rup oox-orig-1/source/drawingml/theme.cxx oox/source/drawingml/theme.cxx
+--- oox-orig-1/source/drawingml/theme.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/drawingml/theme.cxx	2009-10-05 18:18:01.000000000 +0200
 @@ -29,6 +29,7 @@
   ************************************************************************/
  
@@ -344,9 +335,10 @@ index e1a7f63..84e1506 100644
  
  using ::rtl::OUString;
  
---- oox/source/shape/ShapeContextHandler.cxx
-+++ oox/source/shape/ShapeContextHandler.cxx
-@@ -30,6 +30,7 @@
+diff -rup oox-orig-1/source/shape/ShapeContextHandler.cxx oox/source/shape/ShapeContextHandler.cxx
+--- oox-orig-1/source/shape/ShapeContextHandler.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/shape/ShapeContextHandler.cxx	2009-10-05 18:18:01.000000000 +0200
+@@ -32,6 +32,7 @@
  #include "oox/vml/vmldrawingfragment.hxx"
  #include "oox/vml/vmlshape.hxx"
  #include "oox/vml/vmlshapecontainer.hxx"
@@ -354,9 +346,10 @@ index e1a7f63..84e1506 100644
  
  namespace oox { namespace shape {
  
---- oox/source/xls/themebuffer.cxx
-+++ oox/source/xls/themebuffer.cxx
-@@ -31,6 +31,7 @@
+diff -rup oox-orig-1/source/xls/themebuffer.cxx oox/source/xls/themebuffer.cxx
+--- oox-orig-1/source/xls/themebuffer.cxx	2009-10-05 18:17:28.000000000 +0200
++++ oox/source/xls/themebuffer.cxx	2009-10-05 18:18:01.000000000 +0200
+@@ -30,6 +30,7 @@
  
  #include "oox/xls/themebuffer.hxx"
  #include "oox/xls/stylesbuffer.hxx"

More information about the ooo-build-commit mailing list