summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2015-06-30 12:55:18 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-07-02 10:07:18 +0000
commit091fe76b6329b4bb974987554369cbfadd8f2401 (patch)
tree0d6a466cfb1bbdcded8199bf38a58bd854b3d712 /include/oox
parent996b16dcb590ebf779f5d95caf15e9ab18036b07 (diff)
tdf#87348 implement mso-next-textbox vml-style textbox chaining import
Change-Id: Ic62769cf5bb1589dd4de3a66b3d7dd896e5b5711 Reviewed-on: https://gerrit.libreoffice.org/16366 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/vml/vmlshape.hxx1
-rw-r--r--include/oox/vml/vmltextbox.hxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 6cc180cbdc21..e4b5c9288920 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -58,6 +58,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4;
struct OOX_DLLPUBLIC ShapeTypeModel
{
OUString maShapeId; ///< Unique identifier of the shape.
+ OUString maLegacyId; ///< Plaintext identifier of the shape.
OUString maShapeName; ///< Name of the shape, if present.
OptValue< sal_Int32 > moShapeType; ///< Builtin shape type identifier.
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 3ff88d48804a..6b14c4c900b3 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -95,6 +95,7 @@ public:
bool borderDistanceSet;
int borderDistanceLeft, borderDistanceTop, borderDistanceRight, borderDistanceBottom;
OUString maLayoutFlow;
+ OUString msNextTextbox;
private:
typedef ::std::vector< TextPortionModel > PortionVector;