[Libreoffice-commits] core.git: connectivity/source include/comphelper include/connectivity include/svx
Caolán McNamara
caolanm at redhat.com
Wed Feb 18 12:43:55 PST 2015
connectivity/source/parse/sqliterator.cxx | 12 ++++++------
include/comphelper/logging.hxx | 7 +++----
include/comphelper/sharedmutex.hxx | 7 ++-----
include/connectivity/formattedcolumnvalue.hxx | 14 +++++---------
include/connectivity/sdbcx/VKey.hxx | 4 ++--
include/connectivity/sqlerror.hxx | 8 +++-----
include/connectivity/sqlnode.hxx | 6 +++---
include/connectivity/statementcomposer.hxx | 8 ++++----
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 6 +++---
9 files changed, 31 insertions(+), 41 deletions(-)
New commits:
commit 6106d99a905883c7325dae252b8b071be1896641
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 18 17:18:15 2015 +0000
boost->std
Change-Id: Ifa87783f68b0fab98f8a0f7cd6ed867202b4532f
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 2e668e1..dbe0577 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -40,7 +40,7 @@
#include <iterator>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::comphelper;
using namespace ::connectivity;
@@ -65,9 +65,9 @@ namespace connectivity
Reference< XNameAccess > m_xTableContainer;
Reference< XNameAccess > m_xQueryContainer;
- ::boost::shared_ptr< OSQLTables > m_pTables; // all tables which participate in the SQL statement
- ::boost::shared_ptr< OSQLTables > m_pSubTables; // all tables from sub queries not the tables from the select tables
- ::boost::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
+ std::shared_ptr< OSQLTables > m_pTables; // all tables which participate in the SQL statement
+ std::shared_ptr< OSQLTables > m_pSubTables; // all tables from sub queries not the tables from the select tables
+ std::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
sal_uInt32 m_nIncludeMask;
@@ -114,7 +114,7 @@ namespace connectivity
*/
class ForbidQueryName
{
- ::boost::shared_ptr< QueryNameSet >& m_rpAllForbiddenNames;
+ std::shared_ptr< QueryNameSet >& m_rpAllForbiddenNames;
OUString m_sForbiddenQueryName;
public:
@@ -332,7 +332,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
break;
OUString sError;
- boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
+ std::unique_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
if ( !pSubQueryNode.get() )
break;
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 2e52869..0a5e807 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -26,9 +26,8 @@
#include <com/sun/star/logging/XLogHandler.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
-
+#include <memory>
namespace comphelper
{
@@ -93,7 +92,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC EventLogger
{
protected:
- ::boost::shared_ptr< EventLogger_Impl > m_pImpl;
+ std::shared_ptr< EventLogger_Impl > m_pImpl;
public:
/** creates an <code>EventLogger</code> instance working with a css.logging.XLogger
@@ -513,7 +512,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC ResourceBasedEventLogger : public EventLogger
{
private:
- ::boost::shared_ptr< ResourceBasedEventLogger_Data > m_pData;
+ std::shared_ptr< ResourceBasedEventLogger_Data > m_pData;
public:
/** creates a resource based event logger
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 03397d6..cca7239 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -21,11 +21,8 @@
#define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
#include <comphelper/comphelperdllapi.h>
-
#include <osl/mutex.hxx>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace comphelper
{
@@ -48,7 +45,7 @@ namespace comphelper
inline operator ::osl::Mutex& () { return *m_pMutexImpl; }
private:
- ::boost::shared_ptr< ::osl::Mutex > m_pMutexImpl;
+ std::shared_ptr< ::osl::Mutex > m_pMutexImpl;
};
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index 35b45d2..4ce1309 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -26,17 +26,11 @@
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-
-#include <boost/noncopyable.hpp>
-
-#include <memory>
#include <connectivity/dbtoolsdllapi.hxx>
-
+#include <memory>
namespace dbtools
{
-
-
struct FormattedColumnValue_Data;
//= FormattedColumnValue
@@ -44,7 +38,7 @@ namespace dbtools
/** a class which helps retrieving and setting the value of a database column
as formatted string.
*/
- class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue : public ::boost::noncopyable
+ class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue
{
public:
/** constructs an instance
@@ -97,7 +91,9 @@ namespace dbtools
OUString getFormattedValue() const;
private:
- ::std::unique_ptr< FormattedColumnValue_Data > m_pData;
+ FormattedColumnValue(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
+ FormattedColumnValue& operator=(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
+ std::unique_ptr< FormattedColumnValue_Data > m_pData;
};
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index f135a77..6801ded 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -31,7 +31,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace connectivity
{
@@ -56,7 +56,7 @@ namespace connectivity
{}
KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){}
};
- typedef ::boost::shared_ptr< KeyProperties > TKeyProperties;
+ typedef std::shared_ptr< KeyProperties > TKeyProperties;
typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OKey_BASE;
class OCollection;
diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index f381cc7..0c45fff 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -22,11 +22,9 @@
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
#include <connectivity/dbtoolsdllapi.hxx>
-
+#include <boost/optional.hpp>
+#include <memory>
namespace connectivity
{
@@ -305,7 +303,7 @@ namespace connectivity
) const;
private:
- ::boost::shared_ptr< SQLError_Impl > m_pImpl;
+ std::shared_ptr< SQLError_Impl > m_pImpl;
};
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index b6c6234..4efd2ffd 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <vector>
#include <functional>
+#include <memory>
#include <set>
-#include <boost/shared_ptr.hpp>
+#include <vector>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
@@ -80,7 +80,7 @@ namespace connectivity
const ::com::sun::star::lang::Locale& rLocale;
::dbtools::DatabaseMetaData aMetaData;
OSQLParser* pParser;
- ::boost::shared_ptr< QueryNameSet > pSubQueryHistory;
+ std::shared_ptr< QueryNameSet > pSubQueryHistory;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField;
OUString sPredicateTableAlias;
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index d53f390..c3f5464 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -23,8 +23,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#include <boost/noncopyable.hpp>
-
#include <memory>
#include <connectivity/dbtoolsdllapi.hxx>
@@ -39,7 +37,7 @@ namespace dbtools
struct StatementComposer_Data;
/** a class which is able to compose queries (SELECT statements) from a command and a command type
*/
- class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable
+ class OOO_DLLPUBLIC_DBTOOLS StatementComposer
{
::std::unique_ptr< StatementComposer_Data > m_pData;
@@ -90,7 +88,9 @@ namespace dbtools
getQuery();
private:
- StatementComposer(); // not implemented
+ StatementComposer(const StatementComposer&) SAL_DELETED_FUNCTION;
+ StatementComposer& operator=(const StatementComposer&) SAL_DELETED_FUNCTION;
+ StatementComposer() SAL_DELETED_FUNCTION;
};
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 73baeca..580bee2 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -23,9 +23,9 @@
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <boost/shared_ptr.hpp>
#include <tools/color.hxx>
#include <svl/itemset.hxx>
+#include <memory>
//////////////////////////////////////////////////////////////////////////////
@@ -38,8 +38,8 @@ namespace drawinglayer
private:
basegfx::B2DRange maLastPaintRange;
basegfx::B2DRange maLastDefineRange;
- boost::shared_ptr< drawinglayer::attribute::SdrFillAttribute > maFillAttribute;
- boost::shared_ptr< drawinglayer::attribute::FillGradientAttribute > maFillGradientAttribute;
+ std::shared_ptr< drawinglayer::attribute::SdrFillAttribute > maFillAttribute;
+ std::shared_ptr< drawinglayer::attribute::FillGradientAttribute > maFillGradientAttribute;
drawinglayer::primitive2d::Primitive2DSequence maPrimitives;
void createPrimitive2DSequence(
More information about the Libreoffice-commits
mailing list