[ooo-build-commit] patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Mon Oct 12 06:04:33 PDT 2009
patches/dev300/apply | 2
patches/dev300/oox-import-drawing-font-spacing.diff | 48 ++++++++++++--------
2 files changed, 31 insertions(+), 19 deletions(-)
New commits:
commit e00f319a4f91a353848d809410fb96708beb06f6
Author: Radek Doulik <rodo at novell.com>
Date: Mon Oct 12 15:03:21 2009 +0200
fixed the patch to build with m60, re-enabled
* patches/dev300/apply:
* patches/dev300/oox-import-drawing-font-spacing.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7aed014..b0eec51 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2058,7 +2058,7 @@ oox-custom-shape-polygons.diff, n#485418, rodo
# oox-fix-slide-background-gradients.diff, n#383555, rodo
# FIXME: 2009-09-02: Apply but cause compilation errors. --tml
-# oox-import-drawing-font-spacing.diff, n#479822, rodo
+oox-import-drawing-font-spacing.diff, n#479822, rodo
# oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
oox-pptx-import-fix-layout.diff, n#480223, rodo
diff --git a/patches/dev300/oox-import-drawing-font-spacing.diff b/patches/dev300/oox-import-drawing-font-spacing.diff
index fc3b90a..89d666f 100644
--- a/patches/dev300/oox-import-drawing-font-spacing.diff
+++ b/patches/dev300/oox-import-drawing-font-spacing.diff
@@ -1,7 +1,7 @@
diff -rup oox-orig/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
---- oox-orig/inc/oox/drawingml/drawingmltypes.hxx 2009-04-07 16:42:22.000000000 +0200
-+++ oox/inc/oox/drawingml/drawingmltypes.hxx 2009-04-08 17:57:10.000000000 +0200
-@@ -110,6 +110,7 @@ float GetTextSize( const ::rtl::OUString
+--- oox-orig/inc/oox/drawingml/drawingmltypes.hxx 2009-10-12 14:39:27.000000000 +0200
++++ oox/inc/oox/drawingml/drawingmltypes.hxx 2009-10-12 14:39:38.000000000 +0200
+@@ -121,6 +121,7 @@ float GetTextSize( const ::rtl::OUString
/** converts the ST_TextSpacingPoint to 1/100mm */
sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue );
@@ -10,8 +10,8 @@ diff -rup oox-orig/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/dr
/** */
::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
diff -rup oox-orig/inc/oox/drawingml/textcharacterproperties.hxx oox/inc/oox/drawingml/textcharacterproperties.hxx
---- oox-orig/inc/oox/drawingml/textcharacterproperties.hxx 2009-04-07 16:42:20.000000000 +0200
-+++ oox/inc/oox/drawingml/textcharacterproperties.hxx 2009-04-08 17:11:01.000000000 +0200
+--- oox-orig/inc/oox/drawingml/textcharacterproperties.hxx 2009-10-12 14:39:27.000000000 +0200
++++ oox/inc/oox/drawingml/textcharacterproperties.hxx 2009-10-12 14:39:38.000000000 +0200
@@ -55,6 +55,7 @@ struct TextCharacterProperties
Color maHighlightColor;
OptValue< ::rtl::OUString > moLang;
@@ -21,15 +21,15 @@ diff -rup oox-orig/inc/oox/drawingml/textcharacterproperties.hxx oox/inc/oox/dra
OptValue< sal_Int32 > moStrikeout;
OptValue< sal_Int32 > moCaseMap;
diff -rup oox-orig/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx
---- oox-orig/source/drawingml/drawingmltypes.cxx 2009-04-07 16:42:12.000000000 +0200
-+++ oox/source/drawingml/drawingmltypes.cxx 2009-04-08 17:56:43.000000000 +0200
+--- oox-orig/source/drawingml/drawingmltypes.cxx 2009-10-12 14:39:27.000000000 +0200
++++ oox/source/drawingml/drawingmltypes.cxx 2009-10-12 14:39:38.000000000 +0200
@@ -128,10 +128,14 @@ sal_Int32 GetTextSpacingPoint( const OUS
{
- sal_Int32 nRet;
- if( ::sax::Converter::convertNumber( nRet, sValue ) )
-- nRet = ( nRet * 254 + 360 ) / 720;
+ sal_Int32 nRet;
+ if( ::sax::Converter::convertNumber( nRet, sValue ) )
+- nRet = ( nRet * 254 + 360 ) / 720;
+ nRet = GetTextSpacingPoint( nRet );
- return nRet;
+ return nRet;
}
+sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue )
@@ -40,8 +40,8 @@ diff -rup oox-orig/source/drawingml/drawingmltypes.cxx oox/source/drawingml/draw
float GetFontHeight( sal_Int32 nHeight )
{
diff -rup oox-orig/source/drawingml/textcharacterpropertiescontext.cxx oox/source/drawingml/textcharacterpropertiescontext.cxx
---- oox-orig/source/drawingml/textcharacterpropertiescontext.cxx 2009-04-07 16:42:12.000000000 +0200
-+++ oox/source/drawingml/textcharacterpropertiescontext.cxx 2009-04-08 17:02:50.000000000 +0200
+--- oox-orig/source/drawingml/textcharacterpropertiescontext.cxx 2009-10-12 14:39:27.000000000 +0200
++++ oox/source/drawingml/textcharacterpropertiescontext.cxx 2009-10-12 14:39:38.000000000 +0200
@@ -61,6 +61,7 @@ TextCharacterPropertiesContext::TextChar
AttributeList aAttribs( rXAttributes );
mrTextCharacterProperties.moLang = aAttribs.getString( XML_lang );
@@ -50,9 +50,10 @@ diff -rup oox-orig/source/drawingml/textcharacterpropertiescontext.cxx oox/sourc
mrTextCharacterProperties.moUnderline = aAttribs.getToken( XML_u );
mrTextCharacterProperties.moStrikeout = aAttribs.getToken( XML_strike );
// mrTextCharacterProperties.moCaseMap = aAttribs.getToken( XML_cap );
---- oox/source/drawingml/textcharacterproperties.cxx
-+++ oox/source/drawingml/textcharacterproperties.cxx
-@@ -60,6 +60,7 @@ void TextCharacterProperties::assignUsed
+diff -rup oox-orig/source/drawingml/textcharacterproperties.cxx oox/source/drawingml/textcharacterproperties.cxx
+--- oox-orig/source/drawingml/textcharacterproperties.cxx 2009-10-12 14:39:27.000000000 +0200
++++ oox/source/drawingml/textcharacterproperties.cxx 2009-10-12 14:40:54.000000000 +0200
+@@ -62,6 +62,7 @@ void TextCharacterProperties::assignUsed
maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
moHeight.assignIfUsed( rSourceProps.moHeight );
@@ -60,12 +61,23 @@ diff -rup oox-orig/source/drawingml/textcharacterpropertiescontext.cxx oox/sourc
moUnderline.assignIfUsed( rSourceProps.moUnderline );
moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
-@@ -127,6 +128,8 @@ void TextCharacterProperties::pushToProp
+@@ -129,6 +130,8 @@ void TextCharacterProperties::pushToProp
rPropMap[ PROP_CharHeightComplex ] <<= fHeight;
}
-+ rPropMap[ CREATE_OUSTRING( "CharKerning" ) ] <<= (sal_Int16) GetTextSpacingPoint( moSpacing.get( 0 ) );
++ rPropMap[ PROP_CharKerning ] <<= (sal_Int16) GetTextSpacingPoint( moSpacing.get( 0 ) );
+
rPropMap[ PROP_CharUnderline ] <<= GetFontUnderline( moUnderline.get( XML_none ) );
rPropMap[ PROP_CharStrikeout ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) );
rPropMap[ PROP_CharCaseMap ] <<= GetCaseMap( moCaseMap.get( XML_none ) );
+diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt
+--- oox-orig/source/token/properties.txt 2009-10-12 14:39:27.000000000 +0200
++++ oox/source/token/properties.txt 2009-10-12 14:41:22.000000000 +0200
+@@ -58,6 +58,7 @@ CharFontPitchComplex
+ CharHeight
+ CharHeightAsian
+ CharHeightComplex
++CharKerning
+ CharLocale
+ CharLocaleAsian
+ CharLocaleComplex
More information about the ooo-build-commit
mailing list