[ooo-build-commit] .: patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Wed Apr 21 06:26:44 PDT 2010
patches/dev300/apply | 2
patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff | 76 ++++------
2 files changed, 37 insertions(+), 41 deletions(-)
New commits:
commit a3774d065d5b774ce450f8e7b0ebc55569698729
Author: Radek Doulik <rodo at novell.com>
Date: Wed Apr 21 15:25:50 2010 +0200
updated oox-import-text-vert-anchor-and-anchorctr.diff to m15
* patches/dev300/apply:
* patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index db67d31..59302c2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2361,7 +2361,7 @@ oox-import-text-vert-anchor-and-anchorctr-m14.diff, n#479829, rodo
[ OOXML >= ooo320-m15 ]
oox-import-drawing-font-spacing.diff, n#479822, rodo
# FIXME_ 2010-04-20: need port to ooo320-m15, --pmladek
-#oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
+oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
[ OOXML ]
oox-pptx-import-fix-layout.diff, n#480223, 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 f6053e3..ba09fe7 100644
--- a/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff
+++ b/patches/dev300/oox-import-text-vert-anchor-and-anchorctr.diff
@@ -1,7 +1,7 @@
-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 @@
+diff -wrup oox-orig-1/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
+--- oox-orig-1/inc/oox/drawingml/drawingmltypes.hxx 2010-04-21 15:11:15.000000000 +0200
++++ oox/inc/oox/drawingml/drawingmltypes.hxx 2010-04-21 15:12:00.000000000 +0200
+@@ -30,6 +30,7 @@
#include <boost/shared_ptr.hpp>
#include <com/sun/star/style/TabAlign.hpp>
@@ -18,10 +18,10 @@ diff -rup oox-orig-1/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/
/** */
::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
-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;
+diff -wrup oox-orig-1/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx
+--- oox-orig-1/source/drawingml/drawingmltypes.cxx 2010-04-21 15:11:14.000000000 +0200
++++ oox/source/drawingml/drawingmltypes.cxx 2010-04-21 15:12:00.000000000 +0200
+@@ -37,8 +37,9 @@ using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XFastAttributeList;
using namespace ::com::sun::star::awt;
@@ -32,7 +32,7 @@ diff -rup oox-orig-1/source/drawingml/drawingmltypes.cxx oox/source/drawingml/dr
namespace oox {
namespace drawingml {
-@@ -137,6 +138,22 @@ sal_Int32 GetTextSpacingPoint( const sal
+@@ -134,6 +135,22 @@ sal_Int32 GetTextSpacingPoint( const sal
return ( nValue * 254 + 360 ) / 720;
}
@@ -55,46 +55,49 @@ diff -rup oox-orig-1/source/drawingml/drawingmltypes.cxx oox/source/drawingml/dr
float GetFontHeight( sal_Int32 nHeight )
{
// convert 1/100 points to points
-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 @@
-
+diff -wrup oox-orig-1/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+--- oox-orig-1/source/drawingml/textbodypropertiescontext.cxx 2010-04-21 15:11:14.000000000 +0200
++++ oox/source/drawingml/textbodypropertiescontext.cxx 2010-04-21 15:16:38.000000000 +0200
+@@ -28,6 +28,7 @@
#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 <com/sun/star/drawing/TextVerticalAdjust.hpp>
+ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#include "oox/drawingml/textbodyproperties.hxx"
- #include "oox/drawingml/drawingmltypes.hxx"
- #include "oox/helper/attributelist.hxx"
-@@ -41,8 +43,9 @@
-
- using ::rtl::OUString;
+@@ -42,6 +43,7 @@ using ::rtl::OUString;
using namespace ::oox::core;
--using namespace ::com::sun::star::uno;
+ 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::uno;
using namespace ::com::sun::star::xml::sax;
- namespace oox { namespace drawingml {
-@@ -81,9 +84,12 @@ TextBodyPropertiesContext::TextBodyPrope
+@@ -81,6 +83,13 @@ TextBodyPropertiesContext::TextBodyPrope
// 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 ] <<=
++ mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+ TextHorizontalAdjust_CENTER;
++
+ drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
+ switch( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) )
+ {
+@@ -93,8 +102,6 @@ TextBodyPropertiesContext::TextBodyPrope
+ }
+ mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
+-// bool bAnchorCenter = aAttribs.getBool( XML_anchorCtr, false );
+-
// bool bCompatLineSpacing = aAttribs.getBool( XML_compatLnSpc, false );
// bool bForceAA = aAttribs.getBool( XML_forceAA, false );
-@@ -108,6 +114,15 @@ TextBodyPropertiesContext::TextBodyPrope
+ // bool bFromWordArt = aAttribs.getBool( XML_fromWordArt, false );
+@@ -118,6 +125,15 @@ TextBodyPropertiesContext::TextBodyPrope
// ST_TextVerticalType
mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
@@ -110,10 +113,10 @@ diff -rup oox-orig-1/source/drawingml/textbodypropertiescontext.cxx oox/source/d
}
// --------------------------------------------------------------------
-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
+diff -wrup oox-orig-1/source/token/properties.txt oox/source/token/properties.txt
+--- oox-orig-1/source/token/properties.txt 2010-04-21 15:11:14.000000000 +0200
++++ oox/source/token/properties.txt 2010-04-21 15:18:23.000000000 +0200
+@@ -369,6 +369,7 @@ TargetFrame
TextAutoGrowHeight
TextBreak
TextColor
@@ -121,10 +124,3 @@ diff -rup oox-orig-1/source/token/properties.txt oox/source/token/properties.txt
TextLeftDistance
TextLowerDistance
TextOverlap
- TextRightDistance
- TextRotation
- TextUpperDistance
-+TextVerticalAdjust
- TextWordWrap
- TextWritingMode
- Toggle
More information about the ooo-build-commit
mailing list