diff options
| author | Tor Lillqvist <tml@openoffice.org> | 2010-03-23 14:36:59 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@openoffice.org> | 2010-03-23 14:36:59 +0200 |
| commit | 5cfbc81647dcea2886c1c42e6487eb76f861ad97 (patch) | |
| tree | 7e60ec49c10d2c89feebac945c5c6fc3038d0491 /oox/source/drawingml/textbodypropertiescontext.cxx | |
| parent | 805c67052e0f6f09fc6270b89e3ec275ee57a4e3 (diff) | |
ooxml10: oox-import-text-vert-anchor-and-anchorctr.diff from ooo-build
Diffstat (limited to 'oox/source/drawingml/textbodypropertiescontext.cxx')
| -rw-r--r-- | oox/source/drawingml/textbodypropertiescontext.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index 291af2687149..84ead397bd0d 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -27,7 +27,9 @@ #include "oox/drawingml/textbodypropertiescontext.hxx" +#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/text/ControlCharacter.hpp> +#include <com/sun/star/text/WritingMode.hpp> #include "oox/drawingml/textbodyproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/helper/attributelist.hxx" @@ -38,8 +40,9 @@ using ::rtl::OUString; using namespace ::oox::core; -using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; namespace oox { namespace drawingml { @@ -78,9 +81,12 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent, // ST_TextAnchoringType -// sal_Int32 nAnchoringType = xAttributes->getOptionalValueToken( XML_anchor, XML_t ); + mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= GetTextVerticalAdjust( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) ); -// bool bAnchorCenter = aAttribs.getBool( XML_anchorCtr, false ); + bool bAnchorCenter = aAttribs.getBool( XML_anchorCtr, false ); + if( bAnchorCenter ) + mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<= + TextHorizontalAdjust_CENTER; // bool bCompatLineSpacing = aAttribs.getBool( XML_compatLnSpc, false ); // bool bForceAA = aAttribs.getBool( XML_forceAA, false ); @@ -105,6 +111,15 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent, // ST_TextVerticalType mrTextBodyProp.moVert = aAttribs.getToken( XML_vert ); + bool bRtl = aAttribs.getBool( XML_rtl, false ); + if( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert ) { + mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ] + <<= ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB ); + // workaround for TB_LR as using WritingMode2 doesn't work + if( !bAnchorCenter ) + mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<= + TextHorizontalAdjust_LEFT; + } } // -------------------------------------------------------------------- |