Showing with 3 additions and 2 deletions.

+2 −1 python/core/composer/qgscomposerattributetable.sip

+1 −1 src/core/qgsexpression.cpp
diff --git a/python/core/composer/qgscomposerattributetable.sip b/python/core/composer/qgscomposerattributetable.sip
@@ -57,7 +57,8 @@ class QgsComposerAttributeTable : QgsComposerTable
 
     //void setSortAttributes( const QList<QPair<int, bool> > att );
     //QList<QPair<int, bool> > sortAttributes() const;
-
+  protected:
+    virtual QMap<int, QString> getHeaderLabels() const;
 
   signals:
     /**This signal is emitted if the maximum number of feature changes (interactively)*/

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1618,8 +1618,8 @@ int QgsExpression::functionCount()
 QgsExpression::QgsExpression( const QString& expr )
     : mRowNumber( 0 )
     , mScale( 0 )
-    , mCalc( 0 )
     , mExp( expr )
+    , mCalc( 0 )
 {
   mRootNode = ::parseExpression( expr, mParserErrorString );