diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-31 14:13:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-02 14:10:40 +0200 |
| commit | 31ee13b5a40715e217711e48753eeb7170e3349c (patch) | |
| tree | 116fa315d12b1a9505f91b52917cfbeafa69fba0 /include/oox | |
| parent | 1463625ae26900d2461fd72a5a2c894b9f1b8726 (diff) | |
convert SHAPEFLAG defines to scoped enum ShapeFlag
they were defined in escherex.hxx as SHAPEFLAG_*
and in msdffimp.hxx as SP_*.
Added include for escherex.hxx to msdffimp.hxx.
Filled the missing flag bits.
ShapeFlag::Deleted is not used at the moment.
Convert ADD_SHAPE macro to lambda.
Fix horizontal/vertical mixup in RtfSdrExport::AddLineDimensions.
Comments for flag Connector were wrong. The flag applies to shapes
which ARE connectors.
MSO definition: "connector: A line that is used to connect two
or more shapes and that remains connected to those shapes."
So Rectangles and such with Connector flag don't make sense.
Change-Id: I735de00110411b280a302840dc0fcdfac5156399
Reviewed-on: https://gerrit.libreoffice.org/41754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 99313638374c..c50c6a77a53e 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -94,7 +94,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx sal_uInt32 m_nShapeType; /// Remember the shape flags. - sal_uInt32 m_nShapeFlags; + ShapeFlag m_nShapeFlags; /// Remember style, the most important shape attribute ;-) OStringBuffer m_ShapeStyle; @@ -176,7 +176,7 @@ private: virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const tools::Rectangle* pBoundRect ) override; virtual void LeaveGroup() override; - virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) override; + virtual void AddShape( sal_uInt32 nShapeType, ShapeFlag nShapeFlags, sal_uInt32 nShapeId = 0 ) override; private: /// Create an OString representing the id from a numerical id. |