Fix for composer attribute table

git-svn-id: http://svn.osgeo.org/qgis/trunk@14776 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 28, 2010 · 0e2ffec · 0e2ffec
1 parent d0c6f9b
commit 0e2ffec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
@@ -66,6 +66,7 @@ QgsComposerTableWidget::QgsComposerTableWidget( QgsComposerAttributeTable* table
   mLayerComboBox->blockSignals( false );
 
   updateGuiElements();
+  on_mComposerMapComboBox_activated( mComposerMapComboBox->currentIndex() );
 
   if ( mComposerTable )
   {
@@ -123,7 +124,7 @@ void QgsComposerTableWidget::on_mAttributesPushButton_clicked()
   }
 }
 
-void QgsComposerTableWidget::on_mComposerMapComboBox_currentIndexChanged( int index )
+void QgsComposerTableWidget::on_mComposerMapComboBox_activated( int index )
 {
   if ( !mComposerTable )
   {

diff --git a/src/app/composer/qgscomposertablewidget.h b/src/app/composer/qgscomposertablewidget.h
@@ -40,7 +40,7 @@ class QgsComposerTableWidget: public QWidget, private Ui::QgsComposerTableWidget
   private slots:
     void on_mLayerComboBox_currentIndexChanged( int index );
     void on_mAttributesPushButton_clicked();
-    void on_mComposerMapComboBox_currentIndexChanged( int index );
+    void on_mComposerMapComboBox_activated( int index );
     void on_mMaximumColumnsSpinBox_valueChanged( int i );
     void on_mMarginSpinBox_valueChanged( double d );
     void on_mGridStrokeWidthSpinBox_valueChanged( double d );

diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -132,11 +132,11 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap>& at
 
   if ( mDisplayAttributes.size() < 1 )
   {
-    mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, false, true );
+    mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );
   }
   else
   {
-    mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, false, true );
+    mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );
   }
   QgsFeature f;
   int counter = 0;