[ooo-build-commit] .: patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Fri Sep 17 06:36:04 PDT 2010
patches/dev300/oox-pptx-export-para-linespacing.diff | 2
patches/dev300/ooxml-sc-page-date-imp.diff | 8
patches/dev300/xlsx-shared-oox-chart-export-part1.diff | 284 ++++++++---------
3 files changed, 147 insertions(+), 147 deletions(-)
New commits:
commit c23106a2e710c786cb3fa7fae7e66b658ef9433b
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Sep 17 15:34:28 2010 +0200
Fixed various patches that didn't apply
diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff
index c926d2e..2e56295 100644
--- a/patches/dev300/oox-pptx-export-para-linespacing.diff
+++ b/patches/dev300/oox-pptx-export-para-linespacing.diff
@@ -48,7 +48,7 @@ index 752ead6..73f5f3e 100644
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/text/XText.hpp>
@@ -70,10 +74,12 @@
- #include <svx/svxenum.hxx>
+ #include <editeng/svxenum.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
diff --git a/patches/dev300/ooxml-sc-page-date-imp.diff b/patches/dev300/ooxml-sc-page-date-imp.diff
index b4bb02f..ecdc2b0 100644
--- a/patches/dev300/ooxml-sc-page-date-imp.diff
+++ b/patches/dev300/ooxml-sc-page-date-imp.diff
@@ -1,9 +1,9 @@
--- oox/util/makefile.mk 2010-06-03 03:22:23.000000000 +0530
+++ oox/util/makefile.mk 2010-07-16 13:39:27.000000000 +0530
-@@ -77,6 +77,7 @@ SHL1STDLIBS= \
- $(SVTOOLLIB) \
- $(SVXCORELIB) \
- $(SVXMSFILTERLIB) \
+@@ -78,6 +78,7 @@ SHL1STDLIBS= \
+ $(SVLLIB) \
+ $(MSFILTERLIB) \
+ $(UNOTOOLSLIB) \
+ $(XMLOFFLIB) \
$(TOOLSLIB)
diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
index 41c5ed4..ef1e3af 100644
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
+++ b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
@@ -221,7 +221,7 @@ index 0000000..ddf738f
+
+#endif /* ndef _OOX_EXPORT_CHART_HXX_ */
diff --git oox/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
-index 211c90e..ebde89e 100644
+index 10397a5..fc70427 100644
--- oox/inc/oox/export/drawingml.hxx
+++ oox/inc/oox/export/drawingml.hxx
@@ -27,6 +27,9 @@ namespace text {
@@ -285,10 +285,10 @@ index 211c90e..ebde89e 100644
}
diff --git oox/inc/oox/export/shapes.hxx oox/inc/oox/export/shapes.hxx
-index be9676e..9abc1c2 100644
+index 74d9a54..5d51e62 100644
--- oox/inc/oox/export/shapes.hxx
+++ oox/inc/oox/export/shapes.hxx
-@@ -105,8 +105,6 @@ public:
+@@ -102,8 +102,6 @@ public:
virtual ShapeExport&
WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
virtual ShapeExport&
@@ -297,7 +297,7 @@ index be9676e..9abc1c2 100644
WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
virtual ShapeExport&
WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-@@ -162,6 +160,8 @@ public:
+@@ -159,6 +157,8 @@ public:
virtual ShapeExport&
WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
virtual ShapeExport&
@@ -3933,10 +3933,10 @@ index 0000000..dc82c0b
+}// oox
+
diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 77bcdf4..5971665 100644
+index 9944ecf..33abc57 100644
--- oox/source/export/drawingml.cxx
+++ oox/source/export/drawingml.cxx
-@@ -54,6 +54,8 @@
+@@ -51,6 +51,8 @@
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/XShape.hpp>
@@ -3945,7 +3945,7 @@ index 77bcdf4..5971665 100644
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/style/LineSpacing.hpp>
-@@ -651,9 +653,9 @@ void DrawingML::WriteStretch()
+@@ -649,9 +651,9 @@ void DrawingML::WriteStretch()
}
void DrawingML::WriteTransformation( const Rectangle& rRect,
@@ -3957,7 +3957,7 @@ index 77bcdf4..5971665 100644
XML_flipH, bFlipH ? "1" : NULL,
XML_flipV, bFlipV ? "1" : NULL,
XML_rot, nRotation ? I32S( nRotation ) : NULL,
-@@ -662,20 +664,20 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
+@@ -660,20 +662,20 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
mpFS->singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( rRect.Left() ) ), XML_y, IS( MM100toEMU( rRect.Top() ) ), FSEND );
mpFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( MM100toEMU( rRect.GetWidth() ) ), XML_cy, IS( MM100toEMU( rRect.GetHeight() ) ), FSEND );
@@ -3982,7 +3982,7 @@ index 77bcdf4..5971665 100644
{
Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
Reference< XPropertyState > rXPropState( rRun, UNO_QUERY );
-@@ -955,7 +957,8 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
+@@ -953,7 +955,8 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
} else
mpFS->startElementNS( XML_a, XML_r, FSEND );
@@ -3992,7 +3992,7 @@ index 77bcdf4..5971665 100644
mpFS->startElementNS( XML_a, XML_t, FSEND );
mpFS->writeEscaped( sText );
-@@ -1535,5 +1538,64 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
+@@ -1526,5 +1529,64 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
return sNumStr.GetChar( 0 );
}
@@ -4072,10 +4072,10 @@ index 08fa7a0..97891cf 100644
$(SLO)$/vmlexport-shape-types.obj
diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx
-index 3c3af21..63ba887 100644
+index fee5abc..603c2a6 100644
--- oox/source/export/shapes.cxx
+++ oox/source/export/shapes.cxx
-@@ -59,6 +59,8 @@
+@@ -56,6 +56,8 @@
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/text/XTextRange.hpp>
@@ -4084,15 +4084,15 @@ index 3c3af21..63ba887 100644
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <vcl/cvtgrf.hxx>
-@@ -73,6 +75,7 @@
+@@ -70,6 +72,7 @@
#include <svx/svdoashp.hxx>
- #include <svx/svxenum.hxx>
+ #include <editeng/svxenum.hxx>
#include <svx/unoapi.hxx>
+#include <oox/export/chartexport.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-@@ -92,6 +95,8 @@ using ::com::sun::star::text::XText;
+@@ -89,6 +92,8 @@ using ::com::sun::star::text::XText;
using ::com::sun::star::text::XTextContent;
using ::com::sun::star::text::XTextField;
using ::com::sun::star::text::XTextRange;
@@ -4101,7 +4101,7 @@ index 3c3af21..63ba887 100644
using ::oox::core::XmlFilterBase;
using ::rtl::OString;
using ::rtl::OStringBuffer;
-@@ -427,7 +432,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
+@@ -424,7 +429,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4110,7 +4110,7 @@ index 3c3af21..63ba887 100644
WritePolyPolygon( aPolyPolygon );
Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() ) {
-@@ -508,7 +513,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
+@@ -505,7 +510,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4119,7 +4119,7 @@ index 3c3af21..63ba887 100644
if( nAdjustmentValuesIndex != -1 )
WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] );
else
-@@ -551,7 +556,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
+@@ -548,7 +553,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4128,7 +4128,7 @@ index 3c3af21..63ba887 100644
WritePresetShape( "ellipse" );
Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() )
-@@ -569,39 +574,6 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
+@@ -566,39 +571,6 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
return *this;
}
@@ -4168,7 +4168,7 @@ index 3c3af21..63ba887 100644
ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
{
DBG(printf("write graphic object shape\n"));
-@@ -664,7 +636,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
+@@ -661,7 +633,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4177,7 +4177,7 @@ index 3c3af21..63ba887 100644
WritePresetShape( "rect" );
pFS->endElementNS( mnXmlNamespace, XML_spPr );
-@@ -796,7 +768,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
+@@ -793,7 +765,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4186,7 +4186,7 @@ index 3c3af21..63ba887 100644
WritePresetShape( "line" );
Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
if( xShapeProps.is() )
-@@ -860,7 +832,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
+@@ -857,7 +829,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4195,7 +4195,7 @@ index 3c3af21..63ba887 100644
WritePresetShape( "rect" );
Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() )
-@@ -898,6 +870,7 @@ static const NameToConvertMapType& lcl_GetConverters()
+@@ -895,6 +867,7 @@ static const NameToConvertMapType& lcl_GetConverters()
shape_converters[ "com.sun.star.drawing.LineShape" ] = &ShapeExport::WriteLineShape;
shape_converters[ "com.sun.star.drawing.OpenBezierShape" ] = &ShapeExport::WriteOpenBezierShape;
shape_converters[ "com.sun.star.drawing.RectangleShape" ] = &ShapeExport::WriteRectangleShape;
@@ -4203,7 +4203,7 @@ index 3c3af21..63ba887 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 )
+@@ -952,7 +925,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -4212,7 +4212,7 @@ index 3c3af21..63ba887 100644
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 )
+@@ -964,6 +937,25 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
return *this;
}
@@ -4238,102 +4238,11 @@ index 3c3af21..63ba887 100644
ShapeExport& ShapeExport::WriteUnknownShape( Reference< XShape > )
{
// Override this method to do something useful.
-diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
-index 01adc19..0ab5c3c 100644
---- sc/source/filter/inc/xcl97rec.hxx
-+++ sc/source/filter/inc/xcl97rec.hxx
-@@ -251,6 +251,8 @@ public:
-
- virtual void Save( XclExpStream& rStrm );
- virtual void SaveXml( XclExpXmlStream& rStrm );
-+ static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj );
-+ static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab );
-
- private:
- com::sun::star::uno::Reference< com::sun::star::drawing::XShape >
-diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx
-index 3e5493a..3633d77 100644
---- sc/source/filter/inc/xeescher.hxx
-+++ sc/source/filter/inc/xeescher.hxx
-@@ -34,6 +34,7 @@
- #include <filter/msfilter/escherex.hxx>
- #include "xcl97rec.hxx"
- #include "xlescher.hxx"
-+#include <com/sun/star/chart/XChartDocument.hpp>
-
- namespace com { namespace sun { namespace star {
- namespace script { struct ScriptEventDescriptor; }
-@@ -312,6 +313,8 @@ class XclExpChartObj : public XclObj, protected XclExpRoot
- class XclExpChartObj : public XclObj, protected XclExpRoot
- {
- public:
-+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > XChartDocRef;
-+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef;
- explicit XclExpChartObj(
- XclExpObjectManager& rObjMgr,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
-@@ -319,10 +321,15 @@ public:
-
- /** Writes the OBJ record and the entire chart substream. */
- virtual void Save( XclExpStream& rStrm );
-+ virtual void SaveXml( XclExpXmlStream& rStrm );
-+ virtual void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm );
-+ void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
-
- private:
- typedef ScfRef< XclExpChart > XclExpChartRef;
- XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
-+ XShapeRef mxShape;
-+ XChartDocRef mxChartDoc;
- };
-
- // ============================================================================
- diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
-index 2c73dff..e463be9 100644
---- sc/source/filter/xcl97/xcl97rec.cxx
-+++ sc/source/filter/xcl97/xcl97rec.cxx
-@@ -924,19 +924,17 @@ void XclObjAny::Save( XclExpStream& rStrm )
- nFileHistory = 0x00000000;
- nLowestBiffVer = 0x00000006; // Biff8
- }
--
--static void
--WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
-+void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& rShape, SCTAB nTab )
- {
- sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
-
-- awt::Point aTopLeft = rObj.GetShape()->getPosition();
-- awt::Size aSize = rObj.GetShape()->getSize();
-+ awt::Point aTopLeft = rShape->getPosition();
-+ awt::Size aSize = rShape->getSize();
- Rectangle aLocation( aTopLeft.X, aTopLeft.Y, aTopLeft.X + aSize.Width, aTopLeft.Y + aSize.Height );
-- ScRange aRange = rStrm.GetRoot().GetDoc().GetRange( rObj.GetTab(), aLocation );
-+ ScRange aRange = rStrm.GetRoot().GetDoc().GetRange( nTab, aLocation );
- Rectangle aRangeRect = rStrm.GetRoot().GetDoc().GetMMRect( aRange.aStart.Col(), aRange.aStart.Row(),
- aRange.aEnd.Col()-1, aRange.aEnd.Row()-1,
-- rObj.GetTab() );
-+ nTab );
-
-
- pDrawing->startElement( FSNS( XML_xdr, XML_from ),
-@@ -1101,6 +1099,11 @@ WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
- pDrawing->endElement( FSNS( XML_xdr, XML_to ) );
- }
-
-+void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
-+{
-+ WriteFromTo( rStrm, rObj.GetShape(), rObj.GetTab() );
-+}
-+
- static void
- WritePicPr( sax_fastparser::FSHelperPtr pDrawing, sal_Int32 nId, Reference< XPropertySet > xPropSet )
- {
diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
-index e224fc2..897373c 100644
+index a1b14f4..cd0a49b 100644
--- sc/source/filter/excel/xeescher.cxx
+++ sc/source/filter/excel/xeescher.cxx
-@@ -47,6 +47,10 @@
+@@ -41,6 +41,10 @@
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/form/binding/XListEntrySource.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -4341,10 +4250,10 @@ index e224fc2..897373c 100644
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/container/XNamed.hpp>
-
- #include <set>
+
+ #include <set>
#include <rtl/ustrbuf.h>
-@@ -69,9 +73,12 @@
+@@ -66,9 +70,12 @@
#include "userdat.hxx"
#include "drwlayer.hxx"
#include "svx/unoapi.hxx"
@@ -4357,7 +4266,7 @@ index e224fc2..897373c 100644
using ::rtl::OString;
using ::rtl::OUString;
-@@ -92,7 +99,10 @@ using ::com::sun::star::form::binding::XListEntrySource;
+@@ -90,7 +97,10 @@ using ::com::sun::star::form::binding::XListEntrySource;
using ::com::sun::star::script::ScriptEventDescriptor;
using ::com::sun::star::table::CellAddress;
using ::com::sun::star::table::CellRangeAddress;
@@ -4366,9 +4275,9 @@ index e224fc2..897373c 100644
using ::oox::drawingml::DrawingML;
+using ::oox::drawingml::ChartExport;
- // Escher client anchor =======================================================
-
-@@ -798,7 +808,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& /*rStrm*/ )
+ // Escher client anchor =======================================================
+
+@@ -936,7 +946,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) :
XclObj( rObjMgr, EXC_OBJTYPE_CHART ),
@@ -4377,7 +4286,7 @@ index e224fc2..897373c 100644
{
// create the MSODRAWING record contents for the chart object
mrEscherEx.OpenContainer( ESCHER_SpContainer );
-@@ -834,6 +844,7 @@ XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xSh
+@@ -970,6 +980,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape
ScfPropertySet aShapeProp( xShape );
Reference< XModel > xModel;
aShapeProp.GetProperty( xModel, CREATE_OUSTRING( "Model" ) );
@@ -4385,8 +4294,8 @@ index e224fc2..897373c 100644
::com::sun::star::awt::Rectangle aBoundRect;
aShapeProp.GetProperty( aBoundRect, CREATE_OUSTRING( "BoundRect" ) );
Rectangle aChartRect( Point( aBoundRect.X, aBoundRect.Y ), Size( aBoundRect.Width, aBoundRect.Height ) );
-@@ -854,6 +865,118 @@ void XclExpChartObj::Save( XclExpStream& /*rStrm*/ )
- mxChart->Save( rStrm );
+@@ -988,6 +999,118 @@ void XclExpChartObj::Save( XclExpStream& rStrm )
+ mxChart->Save( rStrm );
}
+void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm )
@@ -4504,8 +4413,99 @@ index e224fc2..897373c 100644
// ============================================================================
XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
+diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
+index 633b35c..129bbf3 100644
+--- sc/source/filter/inc/xcl97rec.hxx
++++ sc/source/filter/inc/xcl97rec.hxx
+@@ -251,6 +251,8 @@ public:
+
+ virtual void Save( XclExpStream& rStrm );
+ virtual void SaveXml( XclExpXmlStream& rStrm );
++ static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj );
++ static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab );
+
+ private:
+ com::sun::star::uno::Reference< com::sun::star::drawing::XShape >
+diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx
+index 401a461..d067002 100644
+--- sc/source/filter/inc/xeescher.hxx
++++ sc/source/filter/inc/xeescher.hxx
+@@ -32,6 +32,7 @@
+ #include <filter/msfilter/escherex.hxx>
+ #include "xcl97rec.hxx"
+ #include "xlescher.hxx"
++#include <com/sun/star/chart/XChartDocument.hpp>
+
+ namespace com { namespace sun { namespace star {
+ namespace script { struct ScriptEventDescriptor; }
+@@ -311,6 +312,8 @@ class XclExpChart;
+ class XclExpChartObj : public XclObj, protected XclExpRoot
+ {
+ public:
++ typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > XChartDocRef;
++ typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef;
+ explicit XclExpChartObj(
+ XclExpObjectManager& rObjMgr,
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
+@@ -319,10 +322,15 @@ public:
+
+ /** Writes the OBJ record and the entire chart substream. */
+ virtual void Save( XclExpStream& rStrm );
++ virtual void SaveXml( XclExpXmlStream& rStrm );
++ virtual void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm );
++ void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
+
+ private:
+ typedef ScfRef< XclExpChart > XclExpChartRef;
+ XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
++ XShapeRef mxShape;
++ XChartDocRef mxChartDoc;
+ };
+
+ // ============================================================================
+diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
+index e05e8ab..777a3a6 100644
+--- sc/source/filter/xcl97/xcl97rec.cxx
++++ sc/source/filter/xcl97/xcl97rec.cxx
+@@ -920,19 +920,17 @@ ExcBof8_Base::ExcBof8_Base()
+ nFileHistory = 0x00000000;
+ nLowestBiffVer = 0x00000006; // Biff8
+ }
+-
+-static void
+-WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
++void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& rShape, SCTAB nTab )
+ {
+ sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
+
+- awt::Point aTopLeft = rObj.GetShape()->getPosition();
+- awt::Size aSize = rObj.GetShape()->getSize();
++ awt::Point aTopLeft = rShape->getPosition();
++ awt::Size aSize = rShape->getSize();
+ Rectangle aLocation( aTopLeft.X, aTopLeft.Y, aTopLeft.X + aSize.Width, aTopLeft.Y + aSize.Height );
+- ScRange aRange = rStrm.GetRoot().GetDoc().GetRange( rObj.GetTab(), aLocation );
++ ScRange aRange = rStrm.GetRoot().GetDoc().GetRange( nTab, aLocation );
+ Rectangle aRangeRect = rStrm.GetRoot().GetDoc().GetMMRect( aRange.aStart.Col(), aRange.aStart.Row(),
+ aRange.aEnd.Col()-1, aRange.aEnd.Row()-1,
+- rObj.GetTab() );
++ nTab );
+
+
+ pDrawing->startElement( FSNS( XML_xdr, XML_from ),
+@@ -956,6 +954,11 @@ WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
+ pDrawing->endElement( FSNS( XML_xdr, XML_to ) );
+ }
+
++void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
++{
++ WriteFromTo( rStrm, rObj.GetShape(), rObj.GetTab() );
++}
++
+ static void
+ WritePicPr( sax_fastparser::FSHelperPtr pDrawing, sal_Int32 nId, Reference< XPropertySet > xPropSet )
+ {
diff --git sd/source/filter/pptx/pptx-epptooxml.cxx sd/source/filter/pptx/pptx-epptooxml.cxx
-index 456b3f4..164a893 100644
+index 0b64cca..0e348c5 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
@@ -4518,10 +4518,10 @@ index 456b3f4..164a893 100644
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
+index 5fe81fc..a7b325c 100644
--- sw/source/filter/ww8/docxattributeoutput.cxx
+++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -120,6 +120,11 @@
+@@ -125,6 +125,11 @@
#include <tools/color.hxx>
#include <com/sun/star/i18n/ScriptType.hdl>
@@ -4533,7 +4533,7 @@ index 44a5c32..13083c7 100644
#if OSL_DEBUG_LEVEL > 0
#include <stdio.h>
-@@ -136,6 +141,7 @@ using namespace sax_fastparser;
+@@ -141,6 +146,7 @@ using namespace sax_fastparser;
using namespace nsSwDocInfoSubType;
using namespace nsFieldFlags;
using namespace sw::util;
@@ -4541,7 +4541,7 @@ index 44a5c32..13083c7 100644
void DocxAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 /*nScript*/ )
{
-@@ -1667,6 +1673,81 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
+@@ -1766,6 +1772,81 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
m_pSerializer->endElementNS( XML_w, XML_drawing );
}
@@ -4623,7 +4623,7 @@ index 44a5c32..13083c7 100644
void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Point& /*rNdTopLeft*/ )
{
m_pSerializer->mark();
-@@ -1711,6 +1792,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1816,6 +1897,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
m_pParentFrame = &rFrame;
}
break;
@@ -4638,10 +4638,10 @@ index 44a5c32..13083c7 100644
#if OSL_DEBUG_LEVEL > 0
OSL_TRACE( "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
diff --git sw/source/filter/ww8/docxattributeoutput.hxx sw/source/filter/ww8/docxattributeoutput.hxx
-index d751e6c..ee19058 100644
+index 2625d6d..3747125 100644
--- sw/source/filter/ww8/docxattributeoutput.hxx
+++ sw/source/filter/ww8/docxattributeoutput.hxx
-@@ -45,6 +45,7 @@
+@@ -42,6 +42,7 @@
class DocxExport;
class SwGrfNode;
@@ -4658,10 +4658,10 @@ index d751e6c..ee19058 100644
void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
diff --git sw/source/filter/ww8/docxexport.cxx sw/source/filter/ww8/docxexport.cxx
-index b66b059..e2401f4 100644
+index 1bb810c..ca491ab 100644
--- sw/source/filter/ww8/docxexport.cxx
+++ sw/source/filter/ww8/docxexport.cxx
-@@ -34,10 +34,12 @@
+@@ -31,10 +31,12 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/i18n/ScriptType.hdl>
@@ -4674,7 +4674,7 @@ index b66b059..e2401f4 100644
#include <map>
#include <algorithm>
-@@ -423,6 +425,33 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
+@@ -291,6 +293,33 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
OSL_TRACE( "TODO DocxExport::ForFormText()\n" );
}
@@ -4709,10 +4709,10 @@ index b66b059..e2401f4 100644
{
InitStyles();
diff --git sw/source/filter/ww8/docxexport.hxx sw/source/filter/ww8/docxexport.hxx
-index 183b1f3..f732272 100644
+index f4a5668..63d62a0 100644
--- sw/source/filter/ww8/docxexport.hxx
+++ sw/source/filter/ww8/docxexport.hxx
-@@ -55,6 +55,10 @@ namespace oox {
+@@ -52,6 +52,10 @@ namespace oox {
namespace vml { class VMLExport; }
}
@@ -4723,7 +4723,7 @@ index 183b1f3..f732272 100644
/// The class that does all the actual DOCX export-related work.
class DocxExport : public MSWordExportBase
{
-@@ -136,6 +140,9 @@ public:
+@@ -131,6 +135,9 @@ public:
virtual ULONG ReplaceCr( BYTE nChar );
More information about the ooo-build-commit
mailing list