diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-12-08 10:56:20 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-12-08 11:07:59 +0100 |
| commit | 662b85c22da5d3c2c018022098828743633beedc (patch) | |
| tree | c2d6c507b227e0b85a667836ce35654cea0ee578 /include | |
| parent | db319dc5039f45288fc0ad6abc1a903cb9596ed3 (diff) | |
Signature lines need to be wrapped in v:shape, not v:rect
Partial backport of c0cc02e2934aeb12dda44818955e5964496c186a
Change-Id: I4532b22c16ad76fa290c142fa7029cc3ef203388
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 37b2af0b8305..433e3b6d7413 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -82,6 +82,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx /// Anchoring. sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel; + bool m_bInline; // css::text::TextContentAnchorType_AS_CHARACTER /// Parent position. const Point* m_pNdTopLeft; @@ -101,9 +102,18 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx /// Remember style, the most important shape attribute ;-) OStringBuffer *m_pShapeStyle; + /// Remember the generated shape id. + OString m_sShapeId; + /// Remember which shape types we had already written. bool *m_pShapeTypeWritten; + /// It seems useless to write out an XML_ID attribute next to XML_id which defines the actual shape id + bool m_bSkipwzName; + + /// Use '#' mark for type attribute (check Type Attribute of VML shape in OOXML documentation) + bool m_bUseHashMarkForType; + public: VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport = nullptr ); virtual ~VMLExport(); @@ -116,11 +126,14 @@ public: /// Export the sdr object as VML. /// /// Call this when you need to export the object as VML. - void AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, + OString AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, const Point* pNdTopLeft = nullptr, const bool bOOxmlExport = false ); + OString AddInlineSdrObject( const SdrObject& rObj, const bool bOOxmlExport = false ); virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override; static bool IsWaterMarkShape(const OUString& rStr); + void SetSkipwzName() { m_bSkipwzName = true; } + void SetHashMarkForType() { m_bUseHashMarkForType = true; } protected: /// Add an attribute to the generated <v:shape/> element. /// |