[ooo-build-commit] patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Mon Oct 5 08:36:32 PDT 2009
patches/dev300/apply | 5
patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff | 182 +++++++---
2 files changed, 137 insertions(+), 50 deletions(-)
New commits:
commit 725199ae862267b83dd3688b40cd5e75f6a8ae7d
Author: Radek Doulik <rodo at novell.com>
Date: Mon Oct 5 17:33:36 2009 +0200
fixed the patch to build on m58
* patches/dev300/apply:
* patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ac7c720..df5c85c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2130,10 +2130,7 @@ oox-fix-list-style-apply.diff, n#485417, rodo
oox-pptx-import-fix-layout.diff, n#480223, rodo
oox-pptx-import-fix-wipe-transition.diff, n#480243, rodo
-
-# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
-# oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
-
+oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
# FIXME: 2009-09-02: Apply but cause compilation errors. --tml
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 5011772..1eb13d4 100644
--- a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
+++ b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
@@ -1,33 +1,33 @@
diff -rup oox-orig/inc/oox/ppt/slidetransition.hxx oox/inc/oox/ppt/slidetransition.hxx
---- oox-orig/inc/oox/ppt/slidetransition.hxx 2009-05-14 16:18:57.000000000 +0200
-+++ oox/inc/oox/ppt/slidetransition.hxx 2009-05-14 16:31:11.000000000 +0200
+--- oox-orig/inc/oox/ppt/slidetransition.hxx 2009-10-05 17:12:59.000000000 +0200
++++ oox/inc/oox/ppt/slidetransition.hxx 2009-10-05 17:13:29.000000000 +0200
@@ -54,6 +54,8 @@ namespace oox { namespace ppt {
- { mnFadeColor = nColor; }
- void setMode( sal_Bool bMode )
- { mbMode = bMode; }
+ { mnFadeColor = nColor; }
+ void setMode( sal_Bool bMode )
+ { mbMode = bMode; }
+ void setOoxAdvanceTime( sal_Int32 nAdvanceTime )
+ { mnAdvanceTime = nAdvanceTime; }
static sal_Int16 ooxToOdpDirection( ::sal_Int32 nOoxType );
static sal_Int16 ooxToOdpEightDirections( ::sal_Int32 nOoxType );
@@ -71,6 +73,7 @@ namespace oox { namespace ppt {
- ::sal_Int16 mnAnimationSpeed;
- ::sal_Int32 mnFadeColor;
- ::sal_Bool mbMode; /**< http://api.openoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */
+ ::sal_Int16 mnAnimationSpeed;
+ ::sal_Int32 mnFadeColor;
+ ::sal_Bool mbMode; /**< http://api.openoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */
+ ::sal_Int32 mnAdvanceTime;
- };
+ };
} }
diff -rup oox-orig/source/ppt/slidetransitioncontext.cxx oox/source/ppt/slidetransitioncontext.cxx
---- oox-orig/source/ppt/slidetransitioncontext.cxx 2009-05-14 16:18:58.000000000 +0200
-+++ oox/source/ppt/slidetransitioncontext.cxx 2009-05-14 17:40:17.000000000 +0200
-@@ -71,12 +71,9 @@ SlideTransitionContext::SlideTransitionC
- attribs.getBool( XML_advClick, true );
+--- oox-orig/source/ppt/slidetransitioncontext.cxx 2009-10-05 17:13:00.000000000 +0200
++++ oox/source/ppt/slidetransitioncontext.cxx 2009-10-05 17:13:29.000000000 +0200
+@@ -70,12 +70,9 @@ SlideTransitionContext::SlideTransitionC
+ attribs.getBool( XML_advClick, true );
- // careful. if missing, no auto advance... 0 looks like a valid value
+ // careful. if missing, no auto advance... 0 looks like a valid value
- // for auto advance
+ // for auto advance
- if(attribs.hasAttribute( XML_advTm ))
+ if(attribs.hasAttribute( XML_advTm ))
- {
- // TODO
- xAttribs->getOptionalValue( XML_advTm );
@@ -36,42 +36,132 @@ diff -rup oox-orig/source/ppt/slidetransitioncontext.cxx oox/source/ppt/slidetra
}
SlideTransitionContext::~SlideTransitionContext() throw()
+diff -rup oox-orig/source/ppt/slidetransitioncontext.cxx.orig oox/source/ppt/slidetransitioncontext.cxx.orig
+--- oox-orig/source/ppt/slidetransitioncontext.cxx.orig 2009-10-05 17:13:00.000000000 +0200
++++ oox/source/ppt/slidetransitioncontext.cxx.orig 2009-10-05 17:12:49.000000000 +0200
+@@ -70,9 +70,12 @@ SlideTransitionContext::SlideTransitionC
+ attribs.getBool( XML_advClick, true );
+
+ // careful. if missing, no auto advance... 0 looks like a valid value
+- // for auto advance
++ // for auto advance
+ if(attribs.hasAttribute( XML_advTm ))
+- maTransition.setOoxAdvanceTime( attribs.getInteger( XML_advTm, -1 ) );
++ {
++ // TODO
++ xAttribs->getOptionalValue( XML_advTm );
++ }
+ }
+
+ SlideTransitionContext::~SlideTransitionContext() throw()
diff -rup oox-orig/source/ppt/slidetransition.cxx oox/source/ppt/slidetransition.cxx
---- oox-orig/source/ppt/slidetransition.cxx 2009-05-14 16:18:58.000000000 +0200
-+++ oox/source/ppt/slidetransition.cxx 2009-05-14 17:40:03.000000000 +0200
-@@ -58,6 +58,7 @@ namespace oox { namespace ppt {
- , mnAnimationSpeed( AnimationSpeed_FAST )
- , mnFadeColor( 0 )
- , mbMode( true )
+--- oox-orig/source/ppt/slidetransition.cxx 2009-10-05 17:13:00.000000000 +0200
++++ oox/source/ppt/slidetransition.cxx 2009-10-05 17:17:56.000000000 +0200
+@@ -59,6 +59,7 @@ namespace oox { namespace ppt {
+ , mnAnimationSpeed( AnimationSpeed_FAST )
+ , mnFadeColor( 0 )
+ , mbMode( true )
+ , mnAdvanceTime( -1 )
- {
+ {
- }
-@@ -70,6 +71,7 @@ namespace oox { namespace ppt {
- , mnAnimationSpeed( AnimationSpeed_FAST )
- , mnFadeColor( 0 )
- , mbMode( true )
+ }
+@@ -71,6 +72,7 @@ namespace oox { namespace ppt {
+ , mnAnimationSpeed( AnimationSpeed_FAST )
+ , mnFadeColor( 0 )
+ , mbMode( true )
+ , mnAdvanceTime( -1 )
- {
- const transition *p = transition::find( sFilterName );
- if( p )
-@@ -90,6 +92,10 @@ namespace oox { namespace ppt {
- aProps[ PROP_TransitionDirection ] <<= mbTransitionDirectionNormal;
- aProps[ PROP_Speed ] <<= mnAnimationSpeed;
- aProps[ PROP_TransitionFadeColor ] <<= mnFadeColor;
-+ if( mnAdvanceTime != -1 ) {
-+ aProps[ CREATE_OUSTRING( "Duration" ) ] <<= mnAdvanceTime/1000;
-+ aProps[ CREATE_OUSTRING( "Change" ) ] <<= static_cast<sal_Int32>(1);
-+ }
- }
- catch( Exception& )
- {
-@@ -140,8 +146,6 @@ namespace oox { namespace ppt {
- }
- }
+ {
+ const transition *p = transition::find( sFilterName );
+ if( p )
+@@ -91,6 +93,10 @@ namespace oox { namespace ppt {
+ aProps[ PROP_TransitionDirection ] <<= mbTransitionDirectionNormal;
+ aProps[ PROP_Speed ] <<= mnAnimationSpeed;
+ aProps[ PROP_TransitionFadeColor ] <<= mnFadeColor;
++ if( mnAdvanceTime != -1 ) {
++ aProps[ PROP_Duration ] <<= mnAdvanceTime/1000;
++ aProps[ PROP_Change ] <<= static_cast<sal_Int32>(1);
++ }
+ }
+ catch( Exception& )
+ {
+@@ -141,8 +147,6 @@ namespace oox { namespace ppt {
+ }
+ }
-
-
- sal_Int16 SlideTransition::ooxToOdpEightDirections( ::sal_Int32 nOoxType )
- {
+ sal_Int16 SlideTransition::ooxToOdpEightDirections( ::sal_Int32 nOoxType )
+ {
+ sal_Int16 nOdpDirection;
+diff -rup oox-orig/source/ppt/slidetransition.cxx.orig oox/source/ppt/slidetransition.cxx.orig
+--- oox-orig/source/ppt/slidetransition.cxx.orig 2009-10-05 17:13:00.000000000 +0200
++++ oox/source/ppt/slidetransition.cxx.orig 2009-10-05 17:12:49.000000000 +0200
+@@ -179,6 +179,39 @@ namespace oox { namespace ppt {
+ return nOdpDirection;
+ }
+
++ sal_Int16 SlideTransition::ooxToOdpSideDirections( ::sal_Int32 nOoxType )
++ {
++ sal_Int16 nOdpDirection;
++ switch( nOoxType )
++ {
++ case XML_d:
++ case XML_u:
++ nOdpDirection = TransitionSubType::TOPTOBOTTOM;
++ break;
++ case XML_l:
++ case XML_r:
++ nOdpDirection = TransitionSubType::LEFTTORIGHT;
++ break;
++ default:
++ nOdpDirection= 0;
++ break;
++ }
++ return nOdpDirection;
++ }
++
++ sal_Bool SlideTransition::ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType )
++ {
++ sal_Bool nOdpDirection = true;
++ switch( nOoxType )
++ {
++ case XML_u:
++ case XML_l:
++ nOdpDirection = false;
++ break;
++ }
++ return nOdpDirection;
++ }
++
+ sal_Int16 SlideTransition::ooxToOdpCornerDirections( ::sal_Int32 nOoxType )
+ {
sal_Int16 nOdpDirection;
+@@ -294,7 +327,8 @@ namespace oox { namespace ppt {
+ break;
+ case NMSP_PPT|XML_wipe:
+ mnTransitionType = TransitionType::BARWIPE;
+- mnTransitionSubType = ooxToOdpBorderDirections( param1 );
++ mnTransitionSubType = ooxToOdpSideDirections( param1 );
++ mbTransitionDirectionNormal = ooxToOdpSideDirectionsDirectionNormal( param1 );
+ break;
+ case NMSP_PPT|XML_split:
+ mnTransitionType = TransitionType::BARNDOORWIPE;
+diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt
+--- oox-orig/source/token/properties.txt 2009-10-05 17:13:00.000000000 +0200
++++ oox/source/token/properties.txt 2009-10-05 17:16:55.000000000 +0200
+@@ -37,6 +37,7 @@ CellProtection
+ CellStyle
+ CenterHorizontally
+ CenterVertically
++Change
+ CharCaseMap
+ CharColor
+ CharContoured
+@@ -106,6 +107,7 @@ DiagonalTLBR
+ DisplayLabels
+ DrillDownOnDoubleClick
+ Dropdown
++Duration
+ EchoChar
+ Enabled
+ EndPosition
More information about the ooo-build-commit
mailing list