diff options
Diffstat (limited to 'patches/dev300/oox-pptx-export-vertical-text.diff')
-rw-r--r-- | patches/dev300/oox-pptx-export-vertical-text.diff | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/patches/dev300/oox-pptx-export-vertical-text.diff b/patches/dev300/oox-pptx-export-vertical-text.diff deleted file mode 100644 index 1d84b291c..000000000 --- a/patches/dev300/oox-pptx-export-vertical-text.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- - oox/source/export/drawingml.cxx | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx -index 679dfdd..752ead6 100644 ---- oox/source/export/drawingml.cxx -+++ oox/source/export/drawingml.cxx -@@ -52,6 +52,7 @@ - #include <com/sun/star/i18n/ScriptType.hpp> - #include <com/sun/star/io/XOutputStream.hpp> - #include <com/sun/star/style/ParagraphAdjust.hpp> -+#include <com/sun/star/text/WritingMode.hpp> - #include <com/sun/star/text/XText.hpp> - #include <com/sun/star/text/XTextContent.hpp> - #include <com/sun/star/text/XTextField.hpp> -@@ -71,6 +72,7 @@ - using namespace ::com::sun::star; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::drawing; -+using namespace ::com::sun::star::text; - using namespace ::com::sun::star::i18n; - using ::com::sun::star::beans::PropertyState; - using ::com::sun::star::beans::PropertyValue; -@@ -1180,11 +1182,24 @@ void DrawingML::WriteText( Reference< XShape > rXShape ) - ; - } - -+ const char* sWritingMode = NULL; -+ sal_Bool bVertical = sal_False; -+ if( GETA( TextWritingMode ) ) { -+ WritingMode eMode; -+ -+ if( ( mAny >>= eMode ) && eMode == WritingMode_TB_RL ) { -+ sWritingMode = "vert"; -+ bVertical = sal_True; -+ } -+ } -+ - TextHorizontalAdjust eHorizontalAlignment( TextHorizontalAdjust_CENTER ); - bool bHorizontalCenter = false; - GET( eHorizontalAlignment, TextHorizontalAdjust ); - if( eHorizontalAlignment == TextHorizontalAdjust_CENTER ) - bHorizontalCenter = true; -+ else if( bVertical && eHorizontalAlignment == TextHorizontalAdjust_LEFT ) -+ sVerticalAlignment = "b"; - - sal_Bool bHasWrap = FALSE; - sal_Bool bWrap = FALSE; -@@ -1202,6 +1217,7 @@ void DrawingML::WriteText( Reference< XShape > rXShape ) - XML_bIns, (nBottom != DEFTBINS) ? IS( MM100toEMU( nBottom ) ) : NULL, - XML_anchor, sVerticalAlignment, - XML_anchorCtr, bHorizontalCenter ? "1" : NULL, -+ XML_vert, sWritingMode, - FSEND ); - - Reference< XEnumerationAccess > access( xXText, UNO_QUERY ); --- -1.7.0.1 - |