[ooo-build-commit] patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Mon Oct 12 06:27:46 PDT 2009
patches/dev300/apply | 2
patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff | 64 ++++++----
2 files changed, 40 insertions(+), 26 deletions(-)
New commits:
commit ef099fe322819c6edbb5cd21e8e49a706d412d12
Author: Radek Doulik <rodo at novell.com>
Date: Mon Oct 12 15:27:33 2009 +0200
fixed the patch to build with m60, re-enabled
* patches/dev300/apply:
* patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b0eec51..3f8ca2c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2059,7 +2059,7 @@ oox-custom-shape-polygons.diff, n#485418, rodo
# FIXME: 2009-09-02: Apply but cause compilation errors. --tml
oox-import-drawing-font-spacing.diff, n#479822, rodo
-# oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
+oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
oox-pptx-import-fix-layout.diff, n#480223, rodo
oox-pptx-import-fix-wipe-transition.diff, n#480243, rodo
diff --git a/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff b/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff
index dac985b..f6053e3 100644
--- a/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff
+++ b/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff
@@ -1,6 +1,6 @@
-diff -rup oox-M/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
---- oox-M/inc/oox/drawingml/drawingmltypes.hxx 2009-04-08 17:57:10.000000000 +0200
-+++ oox/inc/oox/drawingml/drawingmltypes.hxx 2009-04-09 18:02:17.000000000 +0200
+diff -rup oox-orig-1/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
+--- oox-orig-1/inc/oox/drawingml/drawingmltypes.hxx 2009-10-12 15:04:52.000000000 +0200
++++ oox/inc/oox/drawingml/drawingmltypes.hxx 2009-10-12 15:10:19.000000000 +0200
@@ -33,6 +33,7 @@
#include <boost/shared_ptr.hpp>
@@ -9,7 +9,7 @@ diff -rup oox-M/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawi
#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
-@@ -112,6 +113,8 @@ float GetTextSize( const ::rtl::OUString
+@@ -123,6 +124,8 @@ float GetTextSize( const ::rtl::OUString
sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue );
sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue );
@@ -18,9 +18,9 @@ diff -rup oox-M/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawi
/** */
::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
-diff -rup oox-M/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx
---- oox-M/source/drawingml/drawingmltypes.cxx 2009-04-08 17:56:43.000000000 +0200
-+++ oox/source/drawingml/drawingmltypes.cxx 2009-04-09 18:06:36.000000000 +0200
+diff -rup oox-orig-1/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx
+--- oox-orig-1/source/drawingml/drawingmltypes.cxx 2009-10-12 15:04:52.000000000 +0200
++++ oox/source/drawingml/drawingmltypes.cxx 2009-10-12 15:10:19.000000000 +0200
@@ -40,8 +40,9 @@ using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XFastAttributeList;
@@ -55,9 +55,9 @@ diff -rup oox-M/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawing
float GetFontHeight( sal_Int32 nHeight )
{
// convert 1/100 points to points
-diff -rup oox-M/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
---- oox-M/source/drawingml/textbodypropertiescontext.cxx 2008-07-22 15:42:18.000000000 +0200
-+++ oox/source/drawingml/textbodypropertiescontext.cxx 2009-04-09 18:30:57.000000000 +0200
+diff -rup oox-orig-1/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+--- oox-orig-1/source/drawingml/textbodypropertiescontext.cxx 2009-10-12 15:04:52.000000000 +0200
++++ oox/source/drawingml/textbodypropertiescontext.cxx 2009-10-12 15:15:56.000000000 +0200
@@ -30,7 +30,9 @@
#include "oox/drawingml/textbodypropertiescontext.hxx"
@@ -68,7 +68,7 @@ diff -rup oox-M/source/drawingml/textbodypropertiescontext.cxx oox/source/drawin
#include "oox/drawingml/textbodyproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/helper/attributelist.hxx"
-@@ -40,8 +42,9 @@
+@@ -41,8 +43,9 @@
using ::rtl::OUString;
using namespace ::oox::core;
@@ -79,38 +79,52 @@ diff -rup oox-M/source/drawingml/textbodypropertiescontext.cxx oox/source/drawin
using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-@@ -83,10 +86,13 @@ TextBodyPropertiesContext::TextBodyPrope
- mrTextBodyProp.maPropertyMap[ sTextLowerDistance ] <<= static_cast< sal_Int32 >( nBottonInset );
+@@ -81,9 +84,12 @@ TextBodyPropertiesContext::TextBodyPrope
-- // ST_TextAnchoringType
+ // ST_TextAnchoringType
-// sal_Int32 nAnchoringType = xAttributes->getOptionalValueToken( XML_anchor, XML_t );
-+ // ST_TextAnchoringType
-+ mrTextBodyProp.maPropertyMap[ CREATE_OUSTRING( "TextVerticalAdjust" ) ] <<= GetTextVerticalAdjust( 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[ CREATE_OUSTRING( "TextHorizontalAdjust" ) ] <<=
++ mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+ TextHorizontalAdjust_CENTER;
// bool bCompatLineSpacing = aAttribs.getBool( XML_compatLnSpc, false );
// bool bForceAA = aAttribs.getBool( XML_forceAA, false );
-@@ -109,8 +115,16 @@ TextBodyPropertiesContext::TextBodyPrope
- // bool bSpcFirstLastPara = aAttribs.getBool( XML_spcFirstLastPara, 0 );
- // bool bUpRight = aAttribs.getBool( XML_upright, 0 );
+@@ -108,6 +114,15 @@ TextBodyPropertiesContext::TextBodyPrope
-- // ST_TextVerticalType
-+ // ST_TextVerticalType
+ // 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[ CREATE_OUSTRING( "TextWritingMode" ) ]
-+ <<= WritingMode_TB_RL;
++ 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[ CREATE_OUSTRING( "TextHorizontalAdjust" ) ] <<=
++ mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+ TextHorizontalAdjust_LEFT;
+ }
}
// --------------------------------------------------------------------
+diff -rup oox-orig-1/source/token/properties.txt oox/source/token/properties.txt
+--- oox-orig-1/source/token/properties.txt 2009-10-12 15:04:52.000000000 +0200
++++ oox/source/token/properties.txt 2009-10-12 15:12:32.000000000 +0200
+@@ -367,12 +367,14 @@ TargetFrame
+ TextAutoGrowHeight
+ TextBreak
+ TextColor
++TextHorizontalAdjust
+ TextLeftDistance
+ TextLowerDistance
+ TextOverlap
+ TextRightDistance
+ TextRotation
+ TextUpperDistance
++TextVerticalAdjust
+ TextWordWrap
+ TextWritingMode
+ Toggle
More information about the ooo-build-commit
mailing list