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

List:       kde-commits
Subject:    koffice/kword
From:       Laurent Montel <montel () kde ! org>
Date:       2006-06-15 12:31:02
Message-ID: 1150374662.507581.9484.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 551706 by mlaurent:

Port++


 M  +0 -1      CMakeLists.txt  
 M  +1 -1      KWConfigFootNoteDia.cpp  
 M  +1 -1      KWEditPersonnalExpression.cpp  
 M  +2 -1      KWInsertPicDia.cpp  
 M  +9 -4      KWMailMergeDataBase.cpp  
 M  +2 -2      KWResizeTableDia.cpp  
 M  +2 -1      KWSplitCellDia.cpp  


--- trunk/koffice/kword/CMakeLists.txt #551705:551706
@@ -80,7 +80,6 @@
    KWFindReplace.cpp 
    KWCommand.cpp 
    KWStatisticsDialog.cpp 
-   kwordmailmergedatabaseiface.cpp 
    KWMailMergeDataBase.cpp 
    KWMailMergeLabelAction.cpp 
    KWEditPersonnalExpression.cpp 
--- trunk/koffice/kword/KWConfigFootNoteDia.cpp #551705:551706
@@ -225,5 +225,5 @@
         m_doc->addCommand( macro );
     }
 
-    KDialogBase::slotOk();
+    KDialog::accept();
 }
--- trunk/koffice/kword/KWEditPersonnalExpression.cpp #551705:551706
@@ -250,7 +250,7 @@
 {
     if( m_bChanged)
         saveFile();
-    KDialogBase::slotOk();
+    KDialog::accept();
 }
 
 void KWEditPersonnalExpression::slotAddExpression() {
--- trunk/koffice/kword/KWInsertPicDia.cpp #551705:551706
@@ -95,7 +95,8 @@
     setDefaultButton(  Ok );
     enableButtonSeparator( true );
     setInitialSize( QSize(400, 300) );
-    QWidget *page = plainPage();
+    QWidget *page = new QWidget( this );
+    setMainWidget( page );
     Q3GridLayout *grid = new Q3GridLayout( page, 4, 2, KDialog::marginHint(), \
KDialog::spacingHint() );  
     QPushButton *pbImage = new QPushButton( i18n( "Choose &Picture..." ), page );
--- trunk/koffice/kword/KWMailMergeDataBase.cpp #551705:551706
@@ -54,8 +54,9 @@
  ******************************************************************/
 
 KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ )
-    : QObject(doc_,doc_->dcopObject()->objId()+".MailMergeDataBase"),
-    KWordMailMergeDatabaseIface(DCOPCString(doc_->dcopObject()->objId()+".MailMergeDataBase")),
 +    : QObject(doc_/*,doc_->dcopObject()->objId()+".MailMergeDataBase"*/)
+		/*
+    KWordMailMergeDatabaseIface(DCOPCString(doc_->dcopObject()->objId()+".MailMergeDataBase"))*/,
  m_version(0),
       doc( doc_ )
 {
@@ -225,9 +226,12 @@
 
 int KWMailMergeDataBase::getNumRecords() const
 {
+#warning "kde4: port it"
+#if 0
     if (plugin)
         return plugin->getNumRecords();
     else
+#endif
         return 0;
 
 }
@@ -276,7 +280,7 @@
             return false;
         }
     }
-    tmpPlugin->setObjId(DCOPCString(objId()+".MailMergePlugin"));
+    //tmpPlugin->setObjId(DCOPCString(objId()+".MailMergePlugin"));
     return true;
 }
 
@@ -340,7 +344,8 @@
     setCaption( i18n( "Mail Merge Setup" ) );
     setButtons( Ok | Cancel );
     setDefaultButton( Ok );
-  QWidget *back = plainPage();
+  QWidget *back = new QWidget(this);
+  setMainWidget( back );
   Q3VBoxLayout *layout = new Q3VBoxLayout( back, 0, spacingHint() );
 
   QLabel *label = new QLabel( i18n( "&Available sources:" ), back );
--- trunk/koffice/kword/KWResizeTableDia.cpp #551705:551706
@@ -31,7 +31,7 @@
 KWResizeTableDia::KWResizeTableDia( QWidget *parent, KWTableFrameSet *table, \
KWDocument *doc, int resizeColumn )  : KDialog( parent)
 {
-    setButtonText( KDialogBase::User1, i18n("Reset") );
+    setButtonText( KDialog::User1, i18n("Reset") );
     setCaption( i18n( "Resize Column" ) );
     setButtons( Ok | Cancel | User1 | Apply );
     setDefaultButton( Ok );
@@ -102,7 +102,7 @@
 {
    if (doResize())
    {
-      KDialogBase::slotOk();
+      KDialog::accept();
    }
 }
 
--- trunk/koffice/kword/KWSplitCellDia.cpp #551705:551706
@@ -41,7 +41,8 @@
 
     setInitialSize( QSize(400, 300) );
 
-    QWidget *page = plainPage();
+    QWidget *page = new QWidget( this );
+    setMainWidget( page );
     Q3GridLayout *grid = new Q3GridLayout( page, 4, 2, KDialog::marginHint(), \
KDialog::spacingHint() );  
     QLabel *lRows = new QLabel( i18n( "Number of rows:" ), page );


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