[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/oox-import-drawing-font-spacing.diff             |   13 ++++------
 patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff |   10 +++----
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 0425341ae60c4f79423883be65c52a15a6f11fa3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 12:35:56 2009 +0300

    Adapt oox-pptx-import-fix-transition-auto-advance.diff
    
    * patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff:
      Adapt for dev300-m54.

diff --git a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
index 0e0e778..5011772 100644
--- a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
+++ b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
@@ -56,12 +56,12 @@ diff -rup oox-orig/source/ppt/slidetransition.cxx oox/source/ppt/slidetransition
  		const transition *p = transition::find( sFilterName );
  		if( p )
 @@ -90,6 +92,10 @@ namespace oox { namespace ppt {
- 			aProps[ CREATE_OUSTRING( "TransitionDirection" ) ] = Any( mbTransitionDirectionNormal );
- 			aProps[ CREATE_OUSTRING( "Speed" ) ] = Any( mnAnimationSpeed );
- 			aProps[ CREATE_OUSTRING( "TransitionFadeColor" ) ] = Any( mnFadeColor );
+ 			aProps[ PROP_TransitionDirection ] <<= mbTransitionDirectionNormal;
+ 			aProps[ PROP_Speed ] <<= mnAnimationSpeed;
+ 			aProps[ PROP_TransitionFadeColor ] <<= mnFadeColor;
 +			if( mnAdvanceTime != -1 ) {
-+			    aProps[ CREATE_OUSTRING( "Duration" ) ] = Any( mnAdvanceTime/1000 );
-+			    aProps[ CREATE_OUSTRING( "Change" ) ] = Any( static_cast<sal_Int32>(1) );
++			    aProps[ CREATE_OUSTRING( "Duration" ) ] <<= mnAdvanceTime/1000;
++			    aProps[ CREATE_OUSTRING( "Change" ) ] <<= static_cast<sal_Int32>(1);
 +			}
  		}
  		catch( Exception& )
commit e01c45963d5fddf2d16125eb17e1888e71a55904
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 11:59:48 2009 +0300

    Adapt oox-import-drawing-font-spacing.diff for dev300-m54
    
    * patches/dev300/oox-import-drawing-font-spacing.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/oox-import-drawing-font-spacing.diff b/patches/dev300/oox-import-drawing-font-spacing.diff
index 6dbf790..fc3b90a 100644
--- a/patches/dev300/oox-import-drawing-font-spacing.diff
+++ b/patches/dev300/oox-import-drawing-font-spacing.diff
@@ -50,9 +50,8 @@ 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 );
-diff -rup oox-orig/source/drawingml/textcharacterproperties.cxx oox/source/drawingml/textcharacterproperties.cxx
---- oox-orig/source/drawingml/textcharacterproperties.cxx	2009-04-07 16:42:11.000000000 +0200
-+++ oox/source/drawingml/textcharacterproperties.cxx	2009-04-08 17:57:48.000000000 +0200
+--- oox/source/drawingml/textcharacterproperties.cxx
++++ oox/source/drawingml/textcharacterproperties.cxx
 @@ -60,6 +60,7 @@ void TextCharacterProperties::assignUsed
      maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
      maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
@@ -62,11 +61,11 @@ diff -rup oox-orig/source/drawingml/textcharacterproperties.cxx oox/source/drawi
      moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
      moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
 @@ -127,6 +128,8 @@ void TextCharacterProperties::pushToProp
-         rPropMap[ CREATE_OUSTRING( "CharHeightComplex" ) ] <<= fHeight;
+         rPropMap[ PROP_CharHeightComplex ] <<= fHeight;
      }
  
 +    rPropMap[ CREATE_OUSTRING( "CharKerning" ) ] <<= (sal_Int16) GetTextSpacingPoint( moSpacing.get( 0 ) );
 +
-     rPropMap[ CREATE_OUSTRING( "CharUnderline" ) ] <<= GetFontUnderline( moUnderline.get( XML_none ) );
-     rPropMap[ CREATE_OUSTRING( "CharStrikeout" ) ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) );
-     rPropMap[ CREATE_OUSTRING( "CharCaseMap" ) ] <<= GetCaseMap( moCaseMap.get( XML_none ) );
+     rPropMap[ PROP_CharUnderline ] <<= GetFontUnderline( moUnderline.get( XML_none ) );
+     rPropMap[ PROP_CharStrikeout ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) );
+     rPropMap[ PROP_CharCaseMap ] <<= GetCaseMap( moCaseMap.get( XML_none ) );