diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-06-13 23:17:34 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-06-14 09:07:14 +0200 |
commit | 31b44f010557c43d8b02cc3be590ed1629bf1ca5 (patch) | |
tree | bf94a8f4ef0f55ee2cd7b0b143d86f9ec8f85115 /oox | |
parent | e598440a946ba3e7785b81f57a36673f7b88db2e (diff) |
sw btlr writing mode: fix tbrl import from VML
Wanted to do btlr, but even tbrl (e.g. Japanese text) is not working, so
let's do that first.
Change-Id: I62cb95754ce473ecf1de2d34460e50db94e64806
Reviewed-on: https://gerrit.libreoffice.org/73991
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/vml/vmlshape.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 27d7b51959ca..a7529493e401 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -52,6 +52,7 @@ #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> +#include <com/sun/star/text/WritingMode2.hpp> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -726,6 +727,13 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes PropertySet( xShape ).setAnyProperty( PROP_RightBorderDistance, makeAny( sal_Int32( getTextBox()->borderDistanceRight ))); PropertySet( xShape ).setAnyProperty( PROP_BottomBorderDistance, makeAny( sal_Int32( getTextBox()->borderDistanceBottom ))); } + + if (getTextBox()->maLayoutFlow == "vertical" && maTypeModel.maLayoutFlowAlt.isEmpty()) + { + PropertySet(xShape).setAnyProperty(PROP_WritingMode, + uno::makeAny(text::WritingMode2::TB_RL)); + } + if (!maTypeModel.maLayoutFlowAlt.isEmpty()) { // Can't handle this property here, as the frame is not attached yet: pass it to writerfilter. |