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

List:       kde-commits
Subject:    koffice/kivio/kiviopart
From:       David Faure <faure () kde ! org>
Date:       2007-03-29 14:05:31
Message-ID: 1175177131.029584.9314.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 647776 by dfaure:

Nothing is calling initDoc anymore, get rid of it - this was also the last used of \
KoTemplateChooseDia [except kpresenter's old code for 'insert new page', so I'll keep \
that mode]


 M  +0 -51     kivio_doc.cpp  
 M  +0 -2      kivio_doc.h  


--- trunk/koffice/kivio/kiviopart/kivio_doc.cpp #647775:647776
@@ -73,7 +73,6 @@
 #include <kiconloader.h>
 #include <khelpmenu.h>
 #include <kconfig.h>
-#include <KoTemplateChooseDia.h>
 #include <KoFilterManager.h>
 #include <KoStoreDevice.h>
 #include "KIvioDocIface.h"
@@ -172,56 +171,6 @@
   return *s_docs;
 }
 
-bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
-{
-  KivioPage *t = createPage();
-  m_pMap->addPage( t );
-  m_docOpened = false; // Used to for a hack that make kivio not crash if you cancel \
                startup dialog.
-
-  if(flags == KoDocument::InitDocEmpty) {
-    setEmpty();
-    m_docOpened = true; // Used to for a hack that make kivio not crash if you \
                cancel startup dialog.
-    return true;
-  }
-
-  QString f;
-  KoTemplateChooseDia::ReturnType ret;
-  KoTemplateChooseDia::DialogType dlgtype;
-
-  if(flags != KoDocument::InitDocFileNew) {
-    dlgtype = KoTemplateChooseDia::Everything;
-    initConfig();
-  } else {
-    dlgtype = KoTemplateChooseDia::OnlyTemplates;
-  }
-
-  ret = KoTemplateChooseDia::choose( KivioFactory::global(), f,
-                                     dlgtype, "kivio_template", parentWidget );
-
-  if( ret == KoTemplateChooseDia::File ) {
-    KUrl url(f);
-    bool ok = openURL(url);
-    m_docOpened = ok; // Used to for a hack that make kivio not crash if you cancel \
                startup dialog.
-    return ok;
-  } else if ( ret == KoTemplateChooseDia::Template ) {
-    QFileInfo fileInfo( f );
-    QString fileName( fileInfo.dirPath(true) + '/' + fileInfo.baseName() + ".kft" );
-    resetURL();
-    bool ok = loadNativeFormat( fileName );
-    if ( !ok )
-        showLoadingErrorDialog();
-    setEmpty();
-    m_docOpened = ok; // Used to for a hack that make kivio not crash if you cancel \
                startup dialog.
-    return ok;
-  } else if ( ret == KoTemplateChooseDia::Empty ) {
-    setEmpty();
-    m_docOpened = true; // Used to for a hack that make kivio not crash if you \
                cancel startup dialog.
-    return true;
-  } else {
-    return false;
-  }
-}
-
 void KivioDoc::openExistingFile( const QString& file )
 {
   KivioPage* t = createPage();
--- trunk/koffice/kivio/kiviopart/kivio_doc.h #647775:647776
@@ -78,8 +78,6 @@
     virtual bool loadXML( QIODevice *, const QDomDocument& doc );
     virtual bool loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, \
const QDomDocument& settings, KoStore* );  
-    virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0);
-
     virtual QCString mimeType() const { return MIME_TYPE; }
 
     /**


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