[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kpresenter
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2008-06-19 8:49:46
Message-ID: 1213865386.477740.8053.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 822111 by zachmann:

o Fix loading of sound event action.
  So finally the sound event action works.


 D             part/KPrSharedLoadingData.cpp  
 D             part/KPrSharedLoadingData.h  
 M  +8 -7      plugins/eventactions/sound/KPrSoundEventAction.cpp  


--- trunk/koffice/kpresenter/plugins/eventactions/sound/KPrSoundEventAction.cpp \
#822110:822111 @@ -27,8 +27,9 @@
 #include <KoShapeLoadingContext.h>
 #include <KPrSoundData.h>
 #include <KPrSoundCollection.h>
-#include <KPrSharedLoadingData.h>
 
+#include <kdebug.h>
+
 KPrSoundEventAction::KPrSoundEventAction()
 : QObject()
 , KoEventAction( KPrSoundEventActionId )
@@ -50,17 +51,17 @@
     bool retval = false;
 
     if ( ! sound.isNull() ) {
-
-        KPrSharedLoadingData * sharedData = dynamic_cast<KPrSharedLoadingData *>( \
                context.sharedData( KPRESENTER_SHARED_LOADING_ID ) );
-        if ( sharedData && sharedData->soundCollection() ) {
+        KPrSoundCollection * soundCollection = dynamic_cast<KPrSoundCollection *>( \
context.dataCenter( "SoundCollection" ) ); +        if ( soundCollection ) {
             QString href = sound.attributeNS( KoXmlNS::xlink, "href" );
-            if ( href.isEmpty() ) {
-                m_soundData = new KPrSoundData( sharedData->soundCollection(), href \
); +            if ( !href.isEmpty() ) {
+                m_soundData = new KPrSoundData( soundCollection, href );
                 retval = true;
             }
         }
         else {
-            // TODO warning
+            kWarning(33000) << "sound collection could not be found";
+            Q_ASSERT( soundCollection );
         }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]