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

[Thorsten Behrens]

 patches/dev300/apply                         |    3 ---
 patches/dev300/cws-impressmedia01-pptin.diff |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 321d130febcc76805b2e0ac6c6ac121c7de3bcf2
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Mar 25 17:47:07 2010 +0100

    Roll ppt sound reading fix into media embedding patch
    
    * patches/dev300/apply: binned sd-ppt-read-sound-fix-crash
    * patches/dev300/cws-impressmedia01-pptin.diff: added fix
    * patches/dev300/sd-ppt-read-sound-fix-crash.diff: removed

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2850d24..8595225 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3754,9 +3754,6 @@ vcl-stl-fix.diff, n#588957, thorsten
 # FIXME: this depends on sd-sound.diff
 cws-impressmedia01-pptin.diff, i#83753, thorsten
 
-[ Fixes ]
-sd-ppt-read-sound-fix-crash.diff, n#590442, rodo
-
 [ Toolbars ]
 SectionOwner => cbosdo
 
diff --git a/patches/dev300/cws-impressmedia01-pptin.diff b/patches/dev300/cws-impressmedia01-pptin.diff
index d82f2b5..06a7021 100644
--- a/patches/dev300/cws-impressmedia01-pptin.diff
+++ b/patches/dev300/cws-impressmedia01-pptin.diff
@@ -25,14 +25,15 @@ index 6f2cae3..344681f 100644
  
  #include <sfx2/docinf.hxx>
  
-@@ -1831,8 +1832,8 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
+@@ -1831,8 +1832,9 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
                                  if ( nBuildFlags & 16 )
                                  {	// Dia mit Soundeffekt
                                      pPage->SetSound( TRUE );
 -                                    String aSoundFile( ReadSound( nSoundRef ) );
 -                                    pPage->SetSoundFile( aSoundFile );
 +                                    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 );
diff --git a/patches/dev300/sd-ppt-read-sound-fix-crash.diff b/patches/dev300/sd-ppt-read-sound-fix-crash.diff
deleted file mode 100644
index e69de29..0000000