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

[Radek Doulík]

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

New commits:
commit 2cd7c58fa95276575d3c0a0219127a56b2da03e6
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Mar 24 17:33:17 2010 +0100

    test if media link reference is set before using it (crash in n#590442)
    
    * patches/dev300/apply:
    * patches/dev300/sd-ppt-read-sound-fix-crash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fac277a..0cde8ae 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3745,6 +3745,7 @@ captionnumbering-hu.diff, i#110273, timar
 sw-caption-separator.diff, i#110287, timar
 # Fix name order for Hungarian on the UI
 svx-hu-name-order.diff, i#105342, timar
+sd-ppt-read-sound-fix-crash.diff, n#590442, rodo
 
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
diff --git a/patches/dev300/sd-ppt-read-sound-fix-crash.diff b/patches/dev300/sd-ppt-read-sound-fix-crash.diff
new file mode 100644
index 0000000..5006cfd
--- /dev/null
+++ b/patches/dev300/sd-ppt-read-sound-fix-crash.diff
@@ -0,0 +1,12 @@
+--- 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 );