summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-23 16:36:33 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-24 07:18:44 +0100
commite5cfe9c050fbd601b64dc13fe6760e762a35a4d4 (patch)
tree8e98fba0391b0530295e0600963b333cafaa622c /connectivity
parentb1d48a0e22bb8d2eabead41a6a6b53ffaec932e4 (diff)
loplugin:makeshared in connectivity..cppuhelper
Change-Id: Id8064e961a64bb03bc0fb61e375cdcf769b340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87276 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/RowFunctionParser.cxx2
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx4
-rw-r--r--connectivity/source/commontools/sqlerror.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx4
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx2
-rw-r--r--connectivity/source/parse/sqliterator.cxx6
-rw-r--r--connectivity/source/parse/sqlnode.cxx2
-rw-r--r--connectivity/source/sdbcx/VKey.cxx2
8 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index e63e0e4a63b7..2246b7636797 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -386,7 +386,7 @@ private:
const ParserContextSharedPtr& getParserContext()
{
- static ParserContextSharedPtr lcl_parserContext( new ParserContext );
+ static ParserContextSharedPtr lcl_parserContext = std::make_shared<ParserContext>();
// clear node stack (since we reuse the static object, that's
// the whole point here)
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 95ec25398600..d677887db1d4 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -374,7 +374,7 @@ void OTableHelper::refreshForeignKeys(::std::vector< OUString>& _rNames)
m_pImpl->m_aKeys.emplace(sOldFKName,pKeyProps);
const OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,false,::dbtools::EComposeRule::InDataManipulation);
- pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule));
+ pKeyProps = std::make_shared<sdbcx::KeyProperties>(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule);
pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn);
_rNames.push_back(sFkName);
if ( m_pTables->hasByName(sReferencedName) )
@@ -555,7 +555,7 @@ std::shared_ptr<sdbcx::KeyProperties> OTableHelper::getKeyProperties(const OUStr
else // only a fall back
{
OSL_FAIL("No key with the given name found");
- pKeyProps.reset(new sdbcx::KeyProperties());
+ pKeyProps = std::make_shared<sdbcx::KeyProperties>();
}
return pKeyProps;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index f5dd3def56cd..db4c59f2f480 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -240,7 +240,7 @@ namespace connectivity
}
SQLError::SQLError()
- :m_pImpl( new SQLError_Impl )
+ :m_pImpl( std::make_shared<SQLError_Impl>() )
{
}
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 4d79ba80f21a..0d49ce333575 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -282,7 +282,7 @@ namespace connectivity::hsqldb
{
try
{
- pHelper.reset(new StreamHelper(storage->openStreamElement(sName,_nMode)));
+ pHelper = std::make_shared<StreamHelper>(storage->openStreamElement(sName,_nMode));
}
catch(const Exception&)
{
@@ -302,7 +302,7 @@ namespace connectivity::hsqldb
if ( !bIsStream )
return pHelper; // readonly file without data stream
}
- pHelper.reset( new StreamHelper(storage->openStreamElement( sStrippedName, _nMode ) ) );
+ pHelper = std::make_shared<StreamHelper>(storage->openStreamElement( sStrippedName, _nMode ) );
}
aFind->second.streams.emplace(sName,pHelper);
}
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 3c5e392d2b7b..408a54dbfc49 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -60,7 +60,7 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
,m_pTable(nullptr)
,m_pConnection(_pConnection)
,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
- ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) )
+ ,m_pSQLIterator( std::make_shared<OSQLParseTreeIterator>( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) )
{
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 0f59720e1868..686a2d46b522 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -82,8 +82,8 @@ namespace connectivity
m_xDatabaseMetaData = m_xConnection->getMetaData();
m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->supportsMixedCaseQuotedIdentifiers();
- m_pTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
- m_pSubTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
+ m_pTables = std::make_shared<OSQLTables>( m_bIsCaseSensitive );
+ m_pSubTables = std::make_shared<OSQLTables>( m_bIsCaseSensitive );
m_xTableContainer = _rxTables;
@@ -124,7 +124,7 @@ namespace connectivity
,m_sForbiddenQueryName( _rForbiddenQueryName )
{
if ( !m_rpAllForbiddenNames.get() )
- m_rpAllForbiddenNames.reset( new QueryNameSet );
+ m_rpAllForbiddenNames = std::make_shared<QueryNameSet>();
m_rpAllForbiddenNames->insert( m_sForbiddenQueryName );
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index a7985de03008..0ea8acdafef8 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -195,7 +195,7 @@ SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _r
:rLocale(_rLocale)
,aMetaData( _rxConnection )
,pParser( nullptr )
- ,pSubQueryHistory( new QueryNameSet )
+ ,pSubQueryHistory( std::make_shared<QueryNameSet>() )
,xFormatter(_xFormatter)
,xField(_xField)
,sPredicateTableAlias(_sPredicateTableAlias)
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index d6ad5ebf1ac2..a310f984a7c3 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -54,7 +54,7 @@ sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName )
OKey::OKey(bool _bCase) : ODescriptor_BASE(m_aMutex)
, ODescriptor(ODescriptor_BASE::rBHelper, _bCase, true)
- , m_aProps(new KeyProperties())
+ , m_aProps(std::make_shared<KeyProperties>())
{
}