fdo#47440 import RTF_SHPBX/YPAGE for Writer pictures, too

Previously this was only handled for drawinglayer shapes.

(cherry picked from commit b755df14a431543f1b70246a5e58830a0a480602)

Change-Id: I7ce440a27ebe44fc867b8a7f4ee62217076677f0
Reviewed-on: https://gerrit.libreoffice.org/5303
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

1 files changed, 4 insertions, 2 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 5bedc6140d24..a4e73ad34f05 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -243,8 +243,10 @@ namespace writerfilter {
                 sal_Int32 nRight;
                 sal_Int32 nBottom;
                 boost::optional<sal_Int32> oZ; ///< Z-Order of the shape.
-                sal_Int16 nHoriOrientRelation;
-                sal_Int16 nVertOrientRelation;
+                sal_Int16 nHoriOrientRelation; ///< Horizontal text::RelOrientation for drawinglayer shapes.
+                sal_Int16 nVertOrientRelation; ///< Vertical text::RelOrientation for drawinglayer shapes.
+                sal_uInt32 nHoriOrientRelationToken; ///< Horizontal dmapper token for Writer pictures.
+                sal_uInt32 nVertOrientRelationToken; ///< Vertical dmapper token for Writer pictures.
                 int nWrap;
         };