[ooo-build-commit] .: patches/dev300

[Noel Power]

 patches/dev300/apply                            |    1 +
 patches/dev300/sd-ppt-read-sound-fix-crash.diff |   12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 1beb57d186d0a34898fb446dc5b472ba8cd51c94
Author: Noel Power <noel.power at novell.com>
Date:   Thu Mar 25 17:23:12 2010 +0000

    add FATE number to apply for xlsm import ( excel )
    
    * patches/dev300/apply:
    * patches/dev300/sd-ppt-read-sound-fix-crash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 43cf1c7..2850d24 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1763,6 +1763,7 @@ vba-fix-scripting-parallelbuild.diff
 # cause document load to ... loop ( and potential crash )
 vba-ctb-fix-looponload.diff, n#589794, n#590359
 # import vba project from xlsm document ( experimental )
+# FATE # 309162
 vba-import-xlsm.diff
 
 [ VBAUntested ]
diff --git a/patches/dev300/sd-ppt-read-sound-fix-crash.diff b/patches/dev300/sd-ppt-read-sound-fix-crash.diff
index 5006cfd..e69de29 100644
--- a/patches/dev300/sd-ppt-read-sound-fix-crash.diff
+++ b/patches/dev300/sd-ppt-read-sound-fix-crash.diff
@@ -1,12 +0,0 @@
---- sd/source/filter/ppt/pptin.cxx.1	2010-03-24 17:27:21.000000000 +0100
-+++ sd/source/filter/ppt/pptin.cxx	2010-03-24 17:27:32.000000000 +0100
-@@ -1833,7 +1833,8 @@ void ImplSdPPTImport::ImportPageEffect(
-                                 {	// Dia mit Soundeffekt
-                                     pPage->SetSound( TRUE );
-                                     sdr::media::MediaLinkRef aSoundFile( ReadSound( nSoundRef ) );
--                                    pPage->SetSoundFile( aSoundFile->getMediaURL() );
-+				    if ( aSoundFile.is() )
-+				        pPage->SetSoundFile( aSoundFile->getMediaURL() );
-                                 }
-                                 if ( nBuildFlags & ( 1 << 6 ) ) 	// Loop until next sound
-                                     pPage->SetLoopSound( sal_True );