diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-11-01 16:18:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@hemulen.(none)> | 2010-11-13 12:24:08 +0200 |
| commit | c051ddbb5cd0a71061e1f12abfa9935713f98ea4 (patch) | |
| tree | 8ca5dc8b8d7d5d0d4c64bd04e866f96bb91651a7 /oox/inc | |
| parent | e9e0a70c10a34bb17cfeb2bd16f4cc4c1a467b8c (diff) | |
From hg changeset c94984deded153e8720faf14d1fc5c3a5b866381 in ooxml11
ooxml11: intermediate commit, builds
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/export/drawingml.hxx | 7 | ||||
| -rw-r--r-- | oox/inc/oox/export/shapes.hxx | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index 3fdf70fb9592..92603afc633e 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -45,9 +45,6 @@ public: enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX }; private: - ::sax_fastparser::FSHelperPtr mpFS; - ::oox::core::XmlFilterBase* mpFB; - static int mnImageCounter; /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC). @@ -55,6 +52,8 @@ private: protected: ::com::sun::star::uno::Any mAny; + ::sax_fastparser::FSHelperPtr mpFS; + ::oox::core::XmlFilterBase* mpFB; bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String aName ); bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, @@ -65,7 +64,7 @@ protected: rtl::OUString WriteImage( const rtl::OUString& rURL ); public: - DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : mpFS( pFS ), mpFB( pFB ), meDocumentType( eDocumentType ) {} + 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; } ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; } ::oox::core::XmlFilterBase* GetFB() { return mpFB; } diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx index f2ea765383e0..a3dd71b9ca84 100644 --- a/oox/inc/oox/export/shapes.hxx +++ b/oox/inc/oox/export/shapes.hxx @@ -49,9 +49,12 @@ namespace drawing { namespace oox { namespace drawingml { class OOX_DLLPUBLIC ShapeExport : public DrawingML { + +protected: + sal_Int32 mnShapeIdMax, mnPictureIdMax; + private: sal_Int32 mnXmlNamespace; - sal_Int32 mnShapeIdMax, mnPictureIdMax; Fraction maFraction; MapMode maMapModeSrc, maMapModeDest; @@ -73,7 +76,7 @@ private: }; typedef std::hash_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; - ShapeHashMap maShapeMap; + static ShapeHashMap saShapeMap; public: ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ); @@ -155,7 +158,8 @@ public: WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape ); - sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape ); + static sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB ); + static sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape ); }; }} |