diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-11 12:57:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-11 12:54:48 +0000 |
| commit | 0207ed2a00f1a5962d9b920bdf9898937476aa85 (patch) | |
| tree | fae67e331627fe1a248a40ba82ef2c0e058f3d46 /sd | |
| parent | 93efd7ebbad293d3729b8ea4b9726aff498f607f (diff) | |
sd: inline BEGIN_SHAPE/END_SHAPE macros
They are used only once.
Change-Id: I9d3f3ae1fd8210f09bc11b267ccb2d0a437701f8
Reviewed-on: https://gerrit.libreoffice.org/23991
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 014ea00c74c9..e968e330774f 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1877,9 +1877,6 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, bool pFS->endElementNS( XML_p, XML_spTree ); } -#define BEGIN_SHAPE mpFS->startElementNS( XML_p, XML_sp, FSEND ) -#define END_SHAPE mpFS->endElementNS( XML_p, XML_sp ) - ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, bool bPresObj ) { if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT ) @@ -1902,7 +1899,7 @@ bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, Placeh ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ) { - BEGIN_SHAPE; + mpFS->startElementNS( XML_p, XML_sp, FSEND ); // non visual shape properties mpFS->startElementNS( XML_p, XML_nvSpPr, FSEND ); @@ -1960,7 +1957,7 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x WriteTextBox( xShape, XML_p ); - END_SHAPE; + mpFS->endElementNS( XML_p, XML_sp ); return *this; } |