[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:       2005-10-01 7:16:30
Message-ID: 1128150990.859990.7173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465903 by zachmann:

o Fix: give error message if no masterpage style is found and don't
  crash
o remove unused variables


 M  +8 -4      kpresenter_doc.cc  


--- trunk/koffice/kpresenter/kpresenter_doc.cc #465902:465903
@@ -825,7 +825,6 @@
 
 QDomDocumentFragment KPresenterDoc::saveBackground( QDomDocument &doc )
 {
-    KPBackGround *kpbackground = 0;
     QDomDocumentFragment fragment=doc.createDocumentFragment();
     for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) {
         if ( saveOnlyPage != -1 && i != saveOnlyPage )
@@ -1582,9 +1581,7 @@
     m_loadingInfo = new KPRLoadingInfo;
     ignoreSticky = FALSE;
     emit sigProgress( 0 );
-    int activePage=0;
     lastObj = -1;
-    bool allSlides = false;
     // clean
     if ( _clean ) {
         __pgLayout = KoPageLayout::standardLayout();
@@ -1663,6 +1660,13 @@
         if ( !master ) //last test...
             master = oasisStyles.masterPages()["Default"];
     }
+
+    if ( master == 0 )
+    {
+        setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No master-style \
found inside office:master-styles." ) ); +        return false;
+    }
+
     kdDebug()<<" load sticky oasis object \n";
     if ( master )
         kdDebug()<<" master.isNull() :"<<master->isNull()<<endl;
@@ -4719,7 +4723,7 @@
         static_cast<KPresenterView*>(it2.current())->skipToPage(newPos);
 }
 
-void KPresenterDoc::spellCheckParagraphDeleted( KoTextParag *_parag,  KPTextObject \
*frm) +void KPresenterDoc::spellCheckParagraphDeleted( KoTextParag * /* _parag */,  \
KPTextObject * /* frm */ )  {
     //m_bgSpellCheck->spellCheckParagraphDeleted( _parag, frm->textObject());
 }


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