diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:36 +0200 |
| commit | 102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c (patch) | |
| tree | fbf7ceecacb8233b9cf8f65baf210d2bf011f1a6 /oox/inc | |
| parent | Merge remote-tracking branch 'origin/integration/dev300_m106' (diff) | |
| parent | Replace List for std::map<sal_uInt32,ByteString>. (diff) | |
| download | core-102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c.tar.gz core-102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/filters
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/export/drawingml.hxx | 2 | ||||
| -rw-r--r-- | oox/inc/oox/export/shapes.hxx | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index 92603afc633e..93b0358b138e 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -94,7 +94,7 @@ public: void WriteTransformation( const Rectangle& rRectangle, 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 WriteText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rXIface ); void WriteParagraph( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph ); void WriteParagraphProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph ); void WriteParagraphNumbering( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx index 37e68613f6a5..a9459c8540f7 100644 --- a/oox/inc/oox/export/shapes.hxx +++ b/oox/inc/oox/export/shapes.hxx @@ -88,7 +88,7 @@ public: sal_Int32 GetXmlNamespace() const; ShapeExport& SetXmlNamespace( sal_Int32 nXmlNamespace ); - static sal_Bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + static sal_Bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface ); virtual ShapeExport& WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, sal_Bool bClosed ); @@ -133,6 +133,7 @@ public: * <tr><td><tt>com.sun.star.drawing.LineShape</tt></td> <td>ShapeExport::WriteLineShape</td></tr> * <tr><td><tt>com.sun.star.drawing.OpenBezierShape</tt></td> <td>ShapeExport::WriteOpenBezierShape</td></tr> * <tr><td><tt>com.sun.star.drawing.RectangleShape</tt></td> <td>ShapeExport::WriteRectangleShape</td></tr> + * <tr><td><tt>com.sun.star.drawing.TableShape</tt></td> <td>ShapeExport::WriteTableShape</td></tr> * <tr><td><tt>com.sun.star.drawing.TextShape</tt></td> <td>ShapeExport::WriteTextShape</td></tr> * <tr><td><tt>com.sun.star.presentation.DateTimeShape</tt></td> <td>ShapeExport::WriteTextShape</td></tr> * <tr><td><tt>com.sun.star.presentation.FooterShape</tt></td> <td>ShapeExport::WriteTextShape</td></tr> @@ -152,14 +153,19 @@ public: virtual ShapeExport& WriteShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ShapeExport& - WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface, sal_Int32 nXmlNamespace ); virtual ShapeExport& WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ShapeExport& + WriteTableShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + virtual ShapeExport& WriteOLE2Shape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ShapeExport& WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + void WriteTable( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape ); + + sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape ); sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB ); sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape ); |