diff options
| author | Radek Doulik <rodo@novell.com> | 2012-11-19 18:20:24 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2012-11-19 18:24:41 +0100 |
| commit | f3221085e3b84e0c84c1adca3d76ab4c293678ee (patch) | |
| tree | 3c95a317d6df415d82e0c94824312cf56c344211 /oox/inc | |
| parent | 787704495a615f1ea749ba80b0e218c3aae684d9 (diff) | |
export embedded spreadsheet(s), fixes n#780830
Change-Id: Iee8328a695b554d97f6805b64b98706b9e3d7ab9
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/export/drawingml.hxx | 5 | ||||
| -rw-r--r-- | oox/inc/oox/export/shapes.hxx | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index 5da2d6a44e7b..37d579bdd9a8 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -81,6 +81,9 @@ protected: rtl::OUString WriteImage( const rtl::OUString& rURL ); + const char* GetComponentDir(); + const char* GetRelationCompPrefix(); + public: DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : meDocumentType( eDocumentType ), mpFS( pFS ), mpFB( pFB ) {} void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; } @@ -104,7 +107,7 @@ public: void WriteStretch(); void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing ); - ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL ); + ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL, Graphic *pGraphic=NULL ); 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, diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx index b75db6365819..5f83326ad6a7 100644 --- a/oox/inc/oox/export/shapes.hxx +++ b/oox/inc/oox/export/shapes.hxx @@ -42,6 +42,7 @@ namespace oox { namespace drawingml { class OOX_DLLPUBLIC ShapeExport : public DrawingML { private: + static int mnSpreadsheetCounter; struct ShapeCheck { bool operator()( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> s1, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> s2 ) const @@ -61,6 +62,8 @@ public: protected: sal_Int32 mnShapeIdMax, mnPictureIdMax; + void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, Graphic *pGraphic=NULL ); + private: sal_Int32 mnXmlNamespace; Fraction maFraction; |