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

Pei Feng Lin pflin at kemper.freedesktop.org
Mon Feb 8 23:43:29 PST 2010


 patches/dev300/oox-chart-export-part1.diff |  114 +++++++++++++++++++++++------
 1 file changed, 91 insertions(+), 23 deletions(-)

New commits:
commit 3d3ac1cec1f44f320a794d1e602f7b9287aba9c6
Author: Fong Lin <pflin at novell.com>
Date:   Tue Feb 9 15:43:44 2010 +0800

    Fixed a build breakage in oox
    
    * patches/dev300/oox-chart-export-part1.diff:

diff --git a/patches/dev300/oox-chart-export-part1.diff b/patches/dev300/oox-chart-export-part1.diff
index 91cb9e7..2951ac1 100644
--- a/patches/dev300/oox-chart-export-part1.diff
+++ b/patches/dev300/oox-chart-export-part1.diff
@@ -219,18 +219,10 @@ index 0000000..5e2c6e7
 +
 +#endif /* ndef _OOX_EXPORT_CHART_HXX_ */
 diff --git oox/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
-index 211c90e..6569c8b 100644
+index 211c90e..ebde89e 100644
 --- oox/inc/oox/export/drawingml.hxx
 +++ oox/inc/oox/export/drawingml.hxx
-@@ -8,6 +8,7 @@
- #include <com/sun/star/uno/XReference.hpp>
- #include <tools/poly.hxx>
- #include <svx/escherex.hxx>
-+#include <oox/core/tokens.hxx>
- 
- class Graphic;
- class String;
-@@ -27,6 +28,9 @@ namespace text {
+@@ -27,6 +27,9 @@ namespace text {
      class XTextContent;
      class XTextRange;
  }
@@ -240,7 +232,7 @@ index 211c90e..6569c8b 100644
  }}}
  
  namespace oox {
-@@ -64,6 +68,7 @@ public:
+@@ -64,6 +67,7 @@ public:
      void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
      ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; }
      ::oox::core::XmlFilterBase* GetFB() { return mpFB; }
@@ -248,19 +240,19 @@ index 211c90e..6569c8b 100644
  
      rtl::OUString WriteImage( const Graphic &rGraphic );
  
-@@ -85,9 +90,9 @@ public:
+@@ -85,9 +89,9 @@ public:
      void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
  
      void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
 -                   sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
-+                   sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0, sal_Int32 nXmlNamespace = XML_a );
++                  sal_Int32 nXmlNamespace, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
      void WriteTransformation( const Rectangle& rRectangle,
 -                  sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
-+                  sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 , sal_Int32 nXmlNamespace = XML_a );
++                  sal_Int32 nXmlNamespace, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
  
      void WriteText( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape );
      void WriteParagraph( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
-@@ -95,11 +100,12 @@ public:
+@@ -95,11 +99,12 @@ public:
      void WriteParagraphNumbering( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
                                    sal_Int16 nLevel );
      void WriteRun( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun );
@@ -274,7 +266,7 @@ index 211c90e..6569c8b 100644
  
      static void ResetCounters();
  
-@@ -110,6 +116,15 @@ public:
+@@ -110,6 +115,15 @@ public:
      sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
  
      static const char* GetAlignment( sal_Int32 nAlignment );
@@ -1085,7 +1077,7 @@ index 0000000..6c8a458
 +#endif
 diff --git oox/source/export/chartexport.cxx oox/source/export/chartexport.cxx
 new file mode 100644
-index 0000000..e410a64
+index 0000000..bba4b80
 --- /dev/null
 +++ oox/source/export/chartexport.cxx
 @@ -0,0 +1,2696 @@
@@ -1797,7 +1789,7 @@ index 0000000..e410a64
 +    pFS->endElementNS( mnXmlNamespace, XML_nvGraphicFramePr );
 +
 +    // visual chart properties
-+    WriteShapeTransformation( xShape, false, false, 0, mnXmlNamespace );
++    WriteShapeTransformation( xShape, mnXmlNamespace );
 +
 +    // writer chart object
 +    pFS->startElement( FSNS( XML_a, XML_graphic ), FSEND );
@@ -3786,7 +3778,7 @@ index 0000000..e410a64
 +}// oox
 +
 diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 77bcdf4..88012cd 100644
+index 77bcdf4..5971665 100644
 --- oox/source/export/drawingml.cxx
 +++ oox/source/export/drawingml.cxx
 @@ -54,6 +54,8 @@
@@ -3803,7 +3795,7 @@ index 77bcdf4..88012cd 100644
  
  void DrawingML::WriteTransformation( const Rectangle& rRect,
 -        sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation )
-+        sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation, sal_Int32 nXmlNamespace )
++        sal_Int32 nXmlNamespace, sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation )
  {
 -    mpFS->startElementNS( XML_a, XML_xfrm,
 +    mpFS->startElementNS( nXmlNamespace, XML_xfrm,
@@ -3819,7 +3811,7 @@ index 77bcdf4..88012cd 100644
  }
  
 -void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation )
-+void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation, sal_Int32 nXmlNamespace )
++void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32 nXmlNamespace, sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation )
  {
      DBG(printf( "write shape transformation\n" ));
  
@@ -3827,7 +3819,7 @@ index 77bcdf4..88012cd 100644
      awt::Size aSize = rXShape->getSize();
  
 -    WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), bFlipH, bFlipV, nRotation );
-+    WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), bFlipH, bFlipV, nRotation, nXmlNamespace );
++    WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, nRotation );
  }
  
 -void DrawingML::WriteRunProperties( Reference< XTextRange > rRun, sal_Bool bIsField )
@@ -3925,7 +3917,7 @@ index 08fa7a0..97891cf 100644
          $(SLO)$/vmlexport-shape-types.obj
  
 diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx
-index 3c3af21..35fa1aa 100644
+index 3c3af21..63ba887 100644
 --- oox/source/export/shapes.cxx
 +++ oox/source/export/shapes.cxx
 @@ -59,6 +59,8 @@
@@ -3954,6 +3946,33 @@ index 3c3af21..35fa1aa 100644
  using ::oox::core::XmlFilterBase;
  using ::rtl::OString;
  using ::rtl::OStringBuffer;
+@@ -427,7 +432,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteTransformation( aRect );
++    WriteTransformation( aRect, XML_a );
+     WritePolyPolygon( aPolyPolygon );
+     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+     if( xProps.is() ) {
+@@ -508,7 +513,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     if( nAdjustmentValuesIndex != -1 )
+         WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] );
+     else
+@@ -551,7 +556,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     WritePresetShape( "ellipse" );
+     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+     if( xProps.is() )
 @@ -569,39 +574,6 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
      return *this;
  }
@@ -3994,6 +4013,33 @@ index 3c3af21..35fa1aa 100644
  ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
  {
      DBG(printf("write graphic object shape\n"));
+@@ -664,7 +636,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     WritePresetShape( "rect" );
+     pFS->endElementNS( mnXmlNamespace, XML_spPr );
+ 
+@@ -796,7 +768,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape, bFlipH, bFlipV );
++    WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
+     WritePresetShape( "line" );
+     Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
+     if( xShapeProps.is() )
+@@ -860,7 +832,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     WritePresetShape( "rect" );
+     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+     if( xProps.is() )
 @@ -898,6 +870,7 @@ static const NameToConvertMapType& lcl_GetConverters()
      shape_converters[ "com.sun.star.drawing.LineShape" ]                = &ShapeExport::WriteLineShape;
      shape_converters[ "com.sun.star.drawing.OpenBezierShape" ]          = &ShapeExport::WriteOpenBezierShape;
@@ -4002,6 +4048,15 @@ index 3c3af21..35fa1aa 100644
      shape_converters[ "com.sun.star.drawing.TextShape" ]                = &ShapeExport::WriteTextShape;
      shape_converters[ "com.sun.star.presentation.DateTimeShape" ]       = &ShapeExport::WriteTextShape;
      shape_converters[ "com.sun.star.presentation.FooterShape" ]         = &ShapeExport::WriteTextShape;
+@@ -955,7 +928,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
+ 
+     // visual shape properties
+     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     WritePresetShape( "rect" );
+     WriteBlipFill( Reference< XPropertySet >(xShape, UNO_QUERY ), S( "GraphicURL" ) );
+     pFS->endElementNS( mnXmlNamespace, XML_spPr );
 @@ -967,6 +940,25 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
      return *this;
  }
@@ -4293,6 +4348,19 @@ index e224fc2..897373c 100644
  // ============================================================================
  
  XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
+diff --git sd/source/filter/pptx/pptx-epptooxml.cxx sd/source/filter/pptx/pptx-epptooxml.cxx
+index 456b3f4..164a893 100644
+--- sd/source/filter/pptx/pptx-epptooxml.cxx
++++ sd/source/filter/pptx/pptx-epptooxml.cxx
+@@ -1588,7 +1588,7 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x
+ 
+     // visual shape properties
+     mpFS->startElementNS( XML_p, XML_spPr, FSEND );
+-    WriteShapeTransformation( xShape );
++    WriteShapeTransformation( xShape, XML_a );
+     WritePresetShape( "rect" );
+     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+     if( xProps.is() )
 diff --git sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.cxx
 index 44a5c32..13083c7 100644
 --- sw/source/filter/ww8/docxattributeoutput.cxx


More information about the ooo-build-commit mailing list