[Libreoffice-commits] core.git: dbaccess/source

[Stephan Bergmann]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx    |    6 +++---
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |    2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 451d37279571b36e63ef34c4f6cc940a7dbda804
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 27 18:09:13 2017 +0100

    OSelectionBrowseBox::AddGroupBy parameter _nCurrentPos is unused
    
    ...since ef40dde69e7fff331b7e31460638703a2c82bc9d "INTEGRATION: CWS dba30d"
    
    Change-Id: I2dbd73bd77f71cbf88768dcc2dc4a38f65b84eef

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8463687..f601556 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2371,7 +2371,7 @@ namespace
                     if ( eOk == (eErrorCode = FillDragInfo(_pView,pArgument,aDragInfo)) )
                     {
                         aDragInfo->SetGroupBy(true);
-                        _pSelectionBrw->AddGroupBy(aDragInfo,i);
+                        _pSelectionBrw->AddGroupBy(aDragInfo);
                     }
                 }
                 else if(SQL_ISRULE(pArgument, general_set_fct ) &&
@@ -2379,7 +2379,7 @@ namespace
                         eOk == FillDragInfo(_pView,pParamRef,aDragInfo))
                 {
                     aDragInfo->SetGroupBy(true);
-                    _pSelectionBrw->AddGroupBy( aDragInfo, i );
+                    _pSelectionBrw->AddGroupBy( aDragInfo );
                 }
                 else if( SQL_ISRULE(pArgument, set_fct_spec ) )
                 {
@@ -2395,7 +2395,7 @@ namespace
                         aDragInfo->SetFunctionType(FKT_OTHER);
                         aDragInfo->SetGroupBy(true);
                         aDragInfo->SetVisible(false);
-                        _pSelectionBrw->AddGroupBy( aDragInfo, i );
+                        _pSelectionBrw->AddGroupBy( aDragInfo );
                     }
                     else
                         eErrorCode = eColumnNotFound;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 9994c52..b0d0581 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1629,7 +1629,7 @@ void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition)
     }
 }
 
-void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt32 /*_nCurrentPos*/)
+void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo )
 {
     Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
     if(!xConnection.is())
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 9366ecf..6c66c83 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -92,7 +92,7 @@ namespace dbaui
 
         // AddGroupBy:: inserts a field with function == grouping. If the fields already exists and uses an aggregate function,
         // the flag is not set
-        void                        AddGroupBy( const OTableFieldDescRef& rInfo,sal_uInt32 _nCurrentPos);
+        void                        AddGroupBy( const OTableFieldDescRef& rInfo );
         void                        AddCondition( const OTableFieldDescRef& rInfo,
                                                   const OUString& rValue,
                                                   const sal_uInt16 nLevel,