[ooo-build-commit] .: patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Tue Aug 10 05:20:51 PDT 2010
patches/dev300/apply | 6 +---
patches/dev300/oox-build-fix-dev300-m77.diff | 2 -
patches/dev300/xlsx-shared-oox-chart-export-part1.diff | 24 ++++++++---------
3 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit bd45247b46afcfca4037e0c409b6473483df9432
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Tue Aug 10 14:17:48 2010 +0200
Enabling chart export ( + related build fix)
* patches/dev300/apply:
* patches/dev300/oox-build-fix-dev300-m77.diff:
* patches/dev300/xlsx-shared-oox-chart-export-part1.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c044abf..d320ffb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2968,8 +2968,6 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
# this is shared binary/ooxml filter
# doesn't include
# xlsx-export-row-limit-fix.diff, n#504623, kohei
-# xlsx-export-perf-rowbuffer.diff, n#558577, kohei
-# oox-chart-export-part1.diff, Fong
# Snapshot of the xlsx export filter at the time of creation of ooxml03
# This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
@@ -3242,8 +3240,8 @@ oox-pptx-export-update-to-ooo320.diff, rodo
docx-fixes02.diff, n#581604, cbosdo
iso-ooxml-sw.diff, cbosdo
-#[ OOXMLExportDevel ]
-# FIXME OOXMLExportDevel oox-chart-export-part1.diff, Fong
+[ OOXMLExportDevel ]
+xlsx-shared-oox-chart-export-part1.diff, Fong
[ UnstableLibwpd ]
config_office-testing.diff
diff --git a/patches/dev300/oox-build-fix-dev300-m77.diff b/patches/dev300/oox-build-fix-dev300-m77.diff
index ef0d3ba..dc83790 100644
--- a/patches/dev300/oox-build-fix-dev300-m77.diff
+++ b/patches/dev300/oox-build-fix-dev300-m77.diff
@@ -101,8 +101,8 @@ index 71d3f9c..fee5abc 100644
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <svx/unoapi.hxx>
+ #include <oox/export/chartexport.hxx>
- using namespace ::com::sun::star;
diff --git oox/source/export/vmlexport.cxx oox/source/export/vmlexport.cxx
index 6da08a2..1223519 100644
--- oox/source/export/vmlexport.cxx
diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
index d9d66b8..784715b 100644
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
+++ b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
@@ -4256,7 +4256,7 @@ index 3e5493a..3633d77 100644
--- sc/source/filter/inc/xeescher.hxx
+++ sc/source/filter/inc/xeescher.hxx
@@ -34,6 +34,7 @@
- #include <vcl/graph.hxx>
+ #include <filter/msfilter/escherex.hxx>
#include "xcl97rec.hxx"
#include "xlescher.hxx"
+#include <com/sun/star/chart/XChartDocument.hpp>
@@ -4340,9 +4340,9 @@ 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 <rtl/ustrbuf.h>
- #include <vcl/bmpacc.hxx>
@@ -69,9 +73,12 @@
#include "userdat.hxx"
#include "drwlayer.hxx"
@@ -4365,17 +4365,17 @@ index e224fc2..897373c 100644
using ::oox::drawingml::DrawingML;
+using ::oox::drawingml::ChartExport;
- // ============================================================================
-
+ // Escher client anchor =======================================================
+
@@ -798,7 +808,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& /*rStrm*/ )
- XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
+ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) :
XclObj( rObjMgr, EXC_OBJTYPE_CHART ),
- XclExpRoot( rObjMgr.GetRoot() )
+ XclExpRoot( rObjMgr.GetRoot() ), mxShape( xShape )
{
// create the MSODRAWING record contents for the chart object
- XclEscherEx& rEscherEx = *pMsodrawing->GetEscherEx();
+ mrEscherEx.OpenContainer( ESCHER_SpContainer );
@@ -834,6 +844,7 @@ XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xSh
ScfPropertySet aShapeProp( xShape );
Reference< XModel > xModel;
@@ -4383,9 +4383,9 @@ index e224fc2..897373c 100644
+ mxChartDoc.set( xModel,UNO_QUERY );
::com::sun::star::awt::Rectangle aBoundRect;
aShapeProp.GetProperty( aBoundRect, CREATE_OUSTRING( "BoundRect" ) );
- Size aSize( aBoundRect.Width, aBoundRect.Height );
+ Rectangle aChartRect( Point( aBoundRect.X, aBoundRect.Y ), Size( aBoundRect.Width, aBoundRect.Height ) );
@@ -854,6 +865,118 @@ void XclExpChartObj::Save( XclExpStream& /*rStrm*/ )
- #endif // xlsx
+ mxChart->Save( rStrm );
}
+void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm )
@@ -4623,7 +4623,7 @@ index 44a5c32..13083c7 100644
{
m_pSerializer->mark();
@@ -1711,6 +1792,13 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
- }
+ m_pParentFrame = &rFrame;
}
break;
+ case sw::Frame::eOle:
@@ -4635,7 +4635,7 @@ index 44a5c32..13083c7 100644
+ break;
default:
#if OSL_DEBUG_LEVEL > 0
- fprintf( stderr, "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
+ 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
--- sw/source/filter/ww8/docxattributeoutput.hxx
@@ -4674,7 +4674,7 @@ index b66b059..e2401f4 100644
#include <map>
#include <algorithm>
@@ -423,6 +425,33 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
- #endif
+ OSL_TRACE( "TODO DocxExport::ForFormText()\n" );
}
+rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount )
More information about the ooo-build-commit
mailing list