fix #5905

qgis · Jun 29, 2012 · 40dc7df7d77e93cc862da11750aae774c56479bd · 40dc7df
1 parent bddb759
commit 40dc7df7d77e93cc862da11750aae774c56479bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -680,33 +680,10 @@ void QgsAttributeTableDialog::editingToggled()
   mRemoveAttribute->setEnabled( canDeleteAttributes && mLayer->isEditable() );
   mAddFeature->setEnabled( canAddFeatures && mLayer->isEditable() && mLayer->geometryType() == QGis::NoGeometry );
 
-  // (probably reload data if user stopped editing - possible revert)
-  mModel->reload( mModel->index( 0, 0 ), mModel->index( mModel->rowCount() - 1, mModel->columnCount() - 1 ) );
-
   // not necessary to set table read only if layer is not editable
   // because model always reflects actual state when returning item flags
 }
 
-// not used now
-void QgsAttributeTableDialog::startEditing()
-{
-  mLayer->startEditing();
-}
-
-// not used now
-void QgsAttributeTableDialog::submit()
-{
-  mLayer->commitChanges();
-}
-
-// not used now
-void QgsAttributeTableDialog::revert()
-{
-  mLayer->rollBack();
-  mModel->revert();
-  mModel->reload( mModel->index( 0, 0 ), mModel->index( mModel->rowCount() - 1, mModel->columnCount() - 1 ) );
-}
-
 void QgsAttributeTableDialog::on_mAddAttribute_clicked()
 {
   if ( !mLayer )

diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
@@ -66,14 +66,6 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
     void finished();
 
   private slots:
-    /**
-     * submits the data
-     */
-    void submit();
-    /**
-     * Reverts the changes
-     */
-    void revert();
     /**
      * Launches search
      */
@@ -148,10 +140,7 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
      * Shows advanced actions
      */
     void showAdvanced();
-    /**
-     * Starts editing mode
-     */
-    void startEditing();
+
     /**Opens dialog to add new attribute*/
     void on_mAddAttribute_clicked();
     /**Opens dialog to remove attribute*/

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -388,7 +388,7 @@ QVariant QgsAttributeTableModel::headerData( int section, Qt::Orientation orient
     {
       return QVariant( section );
     }
-    else if ( section < mFieldCount )
+    else if ( section >= 0 && section < mFieldCount )
     {
       QString attributeName = mLayer->attributeAlias( mAttributes[section] );
       if ( attributeName.isEmpty() )