diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-16 10:13:35 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-16 10:13:35 +0100 |
commit | ccfc261d411d6be27967d28833bad633c06282eb (patch) | |
tree | 58b507653734816ed829670510584c00849db3ad | |
parent | eb215fd49bd9dff8bbf3e5f37aede7036afffec9 (diff) |
Add tab sets to the VSDShape
Change-Id: I5648ab8d97cea6fd9ba1f5d2bcca796396cdf172
-rw-r--r-- | src/lib/VSDStencils.cpp | 9 | ||||
-rw-r--r-- | src/lib/VSDStencils.h | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/VSDStencils.cpp b/src/lib/VSDStencils.cpp index 099fcbf..20a3788 100644 --- a/src/lib/VSDStencils.cpp +++ b/src/lib/VSDStencils.cpp @@ -14,7 +14,7 @@ libvisio::VSDShape::VSDShape() : m_geometries(), m_shapeList(), m_fields(), m_foreign(0), m_parent(0), m_masterPage(MINUS_ONE), m_masterShape(MINUS_ONE), m_shapeId(MINUS_ONE), m_lineStyleId(MINUS_ONE), m_fillStyleId(MINUS_ONE), m_textStyleId(MINUS_ONE), m_lineStyle(), m_fillStyle(), m_textBlockStyle(), m_charStyle(), - m_themeRef(), m_charList(), m_paraStyle(), m_paraList(), m_text(), m_names(), + m_themeRef(), m_charList(), m_paraStyle(), m_paraList(), m_tabSets(), m_text(), m_names(), m_textFormat(libvisio::VSD_TEXT_UTF16), m_nurbsData(), m_polylineData(), m_xform(), m_txtxform(0), m_xform1d(0), m_misc(), m_layerMem() { @@ -27,8 +27,9 @@ libvisio::VSDShape::VSDShape(const libvisio::VSDShape &shape) m_lineStyleId(shape.m_lineStyleId), m_fillStyleId(shape.m_fillStyleId), m_textStyleId(shape.m_textStyleId), m_lineStyle(shape.m_lineStyle), m_fillStyle(shape.m_fillStyle), m_textBlockStyle(shape.m_textBlockStyle), m_charStyle(shape.m_charStyle), m_themeRef(shape.m_themeRef), m_charList(shape.m_charList), - m_paraStyle(shape.m_paraStyle), m_paraList(shape.m_paraList), m_text(shape.m_text), m_names(shape.m_names), - m_textFormat(shape.m_textFormat), m_nurbsData(shape.m_nurbsData), m_polylineData(shape.m_polylineData), + m_paraStyle(shape.m_paraStyle), m_paraList(shape.m_paraList), m_tabSets(shape.m_tabSets), + m_text(shape.m_text), m_names(shape.m_names), m_textFormat(shape.m_textFormat), + m_nurbsData(shape.m_nurbsData), m_polylineData(shape.m_polylineData), m_xform(shape.m_xform), m_txtxform(shape.m_txtxform ? new XForm(*(shape.m_txtxform)) : 0), m_xform1d(shape.m_xform1d ? new XForm1D(*(shape.m_xform1d)) : 0), m_misc(shape.m_misc), m_layerMem(shape.m_layerMem) @@ -65,6 +66,7 @@ libvisio::VSDShape &libvisio::VSDShape::operator=(const libvisio::VSDShape &shap m_charList = shape.m_charList; m_paraStyle = shape.m_paraStyle; m_paraList = shape.m_paraList; + m_tabSets = shape.m_tabSets; m_text = shape.m_text; m_names = shape.m_names; m_textFormat = shape.m_textFormat; @@ -106,6 +108,7 @@ void libvisio::VSDShape::clear() m_charList.clear(); m_paraStyle = VSDOptionalParaStyle(); m_paraList.clear(); + m_tabSets.clear(); m_text.clear(); m_names.clear(); m_nurbsData.clear(); diff --git a/src/lib/VSDStencils.h b/src/lib/VSDStencils.h index c3596d5..cad4b30 100644 --- a/src/lib/VSDStencils.h +++ b/src/lib/VSDStencils.h @@ -46,8 +46,9 @@ public: VSDCharacterList m_charList; VSDOptionalParaStyle m_paraStyle; VSDParagraphList m_paraList; + std::map<unsigned, std::map<unsigned, VSDTabStop> > m_tabSets; librevenge::RVNGBinaryData m_text; - std::map< unsigned, VSDName > m_names; + std::map<unsigned, VSDName> m_names; TextFormat m_textFormat; std::map<unsigned, NURBSData> m_nurbsData; std::map<unsigned, PolylineData> m_polylineData; |