[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff |   71 ----------
 1 file changed, 71 deletions(-)

New commits:
commit c9245c026fe0a42e81330064850ac8b6f46dcf51
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 5 21:00:38 2009 +0200

    fix oox-pptx-import-fix-transition-auto-advance.diff
    
    * patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff: remove
      hunks patching .orig files

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 1eb13d4..6278399 100644
--- a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
+++ b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff
@@ -36,24 +36,6 @@ 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-10-05 17:13:00.000000000 +0200
 +++ oox/source/ppt/slidetransition.cxx	2009-10-05 17:17:56.000000000 +0200
@@ -93,59 +75,6 @@ diff -rup oox-orig/source/ppt/slidetransition.cxx oox/source/ppt/slidetransition
      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