[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                                  |    2 
 patches/dev300/oox-pptx-import-fix-hidden-slides.diff |   39 +++++++++++++-----
 2 files changed, 30 insertions(+), 11 deletions(-)

New commits:
commit 70d56295f3a4b50feaea1470058b0f46959af1a4
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Oct 15 12:25:27 2009 +0200

    make the patch build again
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-import-fix-hidden-slides.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f08eb30..0ed5c00 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2074,7 +2074,7 @@ oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
 
 # FIXME: 2009-09-02: Apply but cause compilation errors. --tml
 # oox-pptx-import-fix-header-footer-visibility.diff, n#480243, rodo
-# oox-pptx-import-fix-hidden-slides.diff, n#480229, rodo
+oox-pptx-import-fix-hidden-slides.diff, n#480229, rodo
 
 oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
 
diff --git a/patches/dev300/oox-pptx-import-fix-hidden-slides.diff b/patches/dev300/oox-pptx-import-fix-hidden-slides.diff
index c5c0295..f213462 100644
--- a/patches/dev300/oox-pptx-import-fix-hidden-slides.diff
+++ b/patches/dev300/oox-pptx-import-fix-hidden-slides.diff
@@ -1,10 +1,18 @@
 diff -rup oox-orig/source/ppt/slidefragmenthandler.cxx oox/source/ppt/slidefragmenthandler.cxx
---- oox-orig/source/ppt/slidefragmenthandler.cxx	2009-05-19 11:22:57.000000000 +0200
-+++ oox/source/ppt/slidefragmenthandler.cxx	2009-05-19 11:39:51.000000000 +0200
-@@ -89,6 +89,18 @@ Reference< XFastContextHandler > SlideFr
- 	    mpSlidePersistPtr->setUseHeaderFooterVisibility( sal_True );
- 		break;
- 	case NMSP_PPT|XML_sld:				// CT_CommonSlideData
+--- oox-orig/source/ppt/slidefragmenthandler.cxx	2009-10-15 11:54:42.000000000 +0200
++++ oox/source/ppt/slidefragmenthandler.cxx	2009-10-15 12:20:25.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <com/sun/star/container/XNamed.hpp>
+ 
+ #include "tokens.hxx"
++#include "properties.hxx"
+ #include "oox/helper/propertyset.hxx"
+ #include "oox/core/namespaces.hxx"
+ #include "oox/core/xmlfilterbase.hxx"
+@@ -89,6 +90,18 @@ Reference< XFastContextHandler > SlideFr
+     case NMSP_PPT|XML_sldMaster:		// CT_SlideMaster
+     case NMSP_PPT|XML_handoutMaster:	// CT_HandoutMaster
+     case NMSP_PPT|XML_sld:				// CT_CommonSlideData
 +	{
 +	    AttributeList attribs( xAttribs );
 +
@@ -12,11 +20,22 @@ diff -rup oox-orig/source/ppt/slidefragmenthandler.cxx oox/source/ppt/slidefragm
 +	    PropertyMap aPropMap;
 +	    PropertySet aSlideProp( xSlide );
 +
-+	    aPropMap[ CREATE_OUSTRING( "Visible" ) ] = Any( attribs.getBool( XML_show, sal_True ) );
++	    aPropMap[ PROP_Visible ] = Any( attribs.getBool( XML_show, sal_True ) );
 +	    aSlideProp.setProperties( aPropMap );
 +
 +	    break;
 +	}
- 	case NMSP_PPT|XML_notes:			// CT_NotesSlide
- 		break;
- 	case NMSP_PPT|XML_cSld:				// CT_CommonSlideData
+     case NMSP_PPT|XML_notes:			// CT_NotesSlide
+     case NMSP_PPT|XML_notesMaster:		// CT_NotesMaster
+         break;
+diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt
+--- oox-orig/source/token/properties.txt	2009-10-15 11:54:42.000000000 +0200
++++ oox/source/token/properties.txt	2009-10-15 12:19:51.000000000 +0200
+@@ -400,6 +400,7 @@ VertJustify
+ VerticalAlign
+ VerticalSplitMode
+ VerticalSplitPositionTwips
++Visible
+ VisibleSize
+ VisualArea
+ VisualEffect