[Libreoffice-commits] core.git: connectivity/inc connectivity/source reportdesign/inc reportdesign/source

Daniel Robertson danlrobertson89 at gmail.com
Tue Aug 11 15:22:26 PDT 2015 

 connectivity/inc/pch/precompiled_ado.hxx              |    1 -
 connectivity/inc/pch/precompiled_dbtools.hxx          |    1 -
 connectivity/inc/pch/precompiled_odbc.hxx             |    1 -
 connectivity/source/commontools/TSortIndex.cxx        |    1 -
 connectivity/source/commontools/TTableHelper.cxx      |    2 +-
 connectivity/source/drivers/ado/AColumn.cxx           |    2 --
 connectivity/source/drivers/ado/AColumns.cxx          |    2 --
 connectivity/source/drivers/ado/AConnection.cxx       |    2 --
 connectivity/source/drivers/hsqldb/HDriver.cxx        |    2 --
 connectivity/source/drivers/hsqldb/HStorageMap.cxx    |    3 ---
 connectivity/source/drivers/odbc/OResultSet.cxx       |    2 --
 connectivity/source/manager/mdrivermanager.cxx        |    2 --
 reportdesign/inc/pch/precompiled_rpt.hxx              |    1 -
 reportdesign/inc/pch/precompiled_rptui.hxx            |    1 -
 reportdesign/source/core/sdr/PropertyForward.cxx      |    2 --
 reportdesign/source/ui/inspection/GeometryHandler.cxx |    6 ++++--
 reportdesign/source/ui/report/ViewsWindow.cxx         |    1 -
 17 files changed, 5 insertions(+), 27 deletions(-)

New commits:
commit f6595f0b3389ffeefa10035d915a884b02d26c0e
Author: Daniel Robertson <danlrobertson89 at gmail.com>
Date:   Sat Aug 8 00:06:37 2015 -0400

    tdf#92459 remove o3tl/compat_functional.hxx
    
    Replace all uses of deprecated features from the o3tl included in
    compat_functional.hxx with lambda expressions in connectivity and
    reportdesign. The patch should not cause any side effects. The change is
    largely cosmetic.
    
    Change-Id: I2042b91bf0fa2b47cce9ea11c97fa4ca6734c5e2
    Reviewed-on: https://gerrit.libreoffice.org/17588
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx
index be53e17..23e8493 100644
--- a/connectivity/inc/pch/precompiled_ado.hxx
+++ b/connectivity/inc/pch/precompiled_ado.hxx
@@ -53,7 +53,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <limits>
 #include <memory>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/thread.h>
diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index b6f0895..2bc28f6 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -147,7 +147,6 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <iomanip>
 #include <iterator>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
 #include <rtl/math.hxx>
diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx
index 3881b9d..3cef9db 100644
--- a/connectivity/inc/pch/precompiled_odbc.hxx
+++ b/connectivity/inc/pch/precompiled_odbc.hxx
@@ -42,7 +42,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/process.h>
 #include <osl/thread.h>
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index ffe258a..9e3632d 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -20,7 +20,6 @@
 #include "TSortIndex.hxx"
 #include <algorithm>
 #include <iterator>
-
 #include <o3tl/compat_functional.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index b77b2de..30c6a1b 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -295,7 +295,7 @@ void OTableHelper::refreshColumns()
             aSortedColumns.end(),
             ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
             ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >()
-        );
+            );
     }
 
     if(m_pColumns)
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 0e91b49..e1a9803 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -27,8 +27,6 @@
 #include <comphelper/types.hxx>
 #include "ado/ACatalog.hxx"
 
-#include <o3tl/compat_functional.hxx>
-
 using namespace ::comphelper;
 
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 56a253c..c19d8a7 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -31,8 +31,6 @@
 #include <algorithm>
 #include "resource/ado_res.hrc"
 
-#include <o3tl/compat_functional.hxx>
-
 using namespace connectivity::ado;
 using namespace connectivity;
 using namespace comphelper;
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index f66adbd..c1d6ee7 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -33,8 +33,6 @@
 #include <osl/file.hxx>
 #include "resource/ado_res.hrc"
 
-#include <o3tl/compat_functional.hxx>
-
 using namespace dbtools;
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 5ae04b3..02dfb05 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -55,8 +55,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <o3tl/compat_functional.hxx>
-
 #include <boost/scoped_ptr.hpp>
 
 
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 321a129..534b4a4 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -27,9 +27,6 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 
-#include <o3tl/compat_functional.hxx>
-
-
 namespace connectivity
 {
 
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 5e9c840..f813668 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -37,8 +37,6 @@
 #include <connectivity/dbexception.hxx>
 #include "diagnose_ex.h"
 
-#include <o3tl/compat_functional.hxx>
-
 using namespace ::comphelper;
 using namespace connectivity;
 using namespace connectivity::odbc;
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 4b4ad1b..bf4d4df 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -36,8 +36,6 @@
 #include <iterator>
 #include <vector>
 
-#include <o3tl/compat_functional.hxx>
-
 namespace drivermanager
 {
 
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 5c3dee6..cdf0f86 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -151,7 +151,6 @@
 #include <functional>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 00268a8..712651d 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -202,7 +202,6 @@
 #include <map>
 #include <memory>
 #include <numeric>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 8295c67..718d95e 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -24,8 +24,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "corestrings.hrc"
-#include <o3tl/compat_functional.hxx>
-
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b338c67..1a5bcf3 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -103,7 +103,6 @@
 #include "dlgpage.hxx"
 #include "helpids.hrc"
 #include <toolkit/helper/convert.hxx>
-
 #include <o3tl/compat_functional.hxx>
 
 #define DATA_OR_FORMULA     0
@@ -1639,7 +1638,10 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _o
     if ( m_nDataFieldType == FUNCTION )
         ::std::transform(m_aDefaultFunctions.begin(),m_aDefaultFunctions.end(),::std::back_inserter(_out_rList),::boost::bind( &DefaultFunction::getName, _1 ));
     else if ( m_nDataFieldType == USER_DEF_FUNCTION )
-        ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>());
+        ::std::transform( m_aFunctionNames.begin(),
+                          m_aFunctionNames.end(),
+                          ::std::back_inserter(_out_rList),
+                          ::o3tl::select1st< TFunctions::value_type >() );
 }
 
 OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 9740f60..eef1d57 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -49,7 +49,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <numeric>
-#include <o3tl/compat_functional.hxx>
 
 namespace rptui
 {

More information about the Libreoffice-commits mailing list