summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-02-19 16:00:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-02-19 17:39:16 +0100
commit5206992e6e9b22b48cea0a4a7626ee576c66492e (patch)
treedfc29178d2536d31d8de06556a32503feec3fe2b /dbaccess
parent12180ed8d6d64f78d37c6ee070da5a1ab3684843 (diff)
Some uses of C++17 class template argument deduction
Change-Id: I47c469c0fcdff41d83729be9489c946e81ef3686 Reviewed-on: https://gerrit.libreoffice.org/68020 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/api/KeySet.cxx2
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx2
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx4
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.cxx10
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx4
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx2
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
13 files changed, 21 insertions, 21 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 52686ba92045..e10d51f50326 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -809,7 +809,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
aValue.setSigned(m_aSignedFlags[parameterName.second.nPosition-1]);
if ( (_rInsertRow->get())[parameterName.second.nPosition] != aValue )
{
- rtl::Reference<ORowSetValueVector> aCopy(
+ rtl::Reference aCopy(
new ORowSetValueVector(*m_aParameterValueForCache));
(aCopy->get())[i] = (_rInsertRow->get())[parameterName.second.nPosition];
m_aUpdatedParameter[i_nBookmark] = aCopy;
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index a9536a4e789b..dea302029dce 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -99,7 +99,7 @@ rtl::Reference<OQueryContainer> OQueryContainer::create(
, const Reference< XComponentContext >& _rxORB,
::dbtools::WarningsContainer* _pWarnings)
{
- rtl::Reference<OQueryContainer> c(
+ rtl::Reference c(
new OQueryContainer(
_rxCommandDefinitions, _rxConn, _rxORB, _pWarnings));
c->init();
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index afa0d2ce9756..0e1e4bfa9285 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -238,7 +238,7 @@ Sequence< OUString > ODatabaseContext::getSupportedServiceNames( )
Reference< XInterface > ODatabaseContext::impl_createNewDataSource()
{
- ::rtl::Reference<ODatabaseModelImpl> pImpl( new ODatabaseModelImpl( m_aContext, *this ) );
+ ::rtl::Reference pImpl( new ODatabaseModelImpl( m_aContext, *this ) );
Reference< XDataSource > xDataSource( pImpl->getOrCreateDataSource() );
return xDataSource.get();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 4eb8613d683c..37cec2057799 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2198,7 +2198,7 @@ com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context,
xDBContextTunnel->getSomething(
dbaccess::ODatabaseContext::getUnoTunnelImplementationId()));
- rtl::Reference<dbaccess::ODatabaseModelImpl> pImpl(
+ rtl::Reference pImpl(
new dbaccess::ODatabaseModelImpl(context, *pContext));
css::uno::Reference<XInterface> inst(pImpl->createNewModel_deliverOwnership());
inst->acquire();
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 7566a935f101..0881fd3a01a0 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -226,7 +226,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref
DBG_UNHANDLED_EXCEPTION("dbaccess");
}
- ::rtl::Reference< OPropertyForward > pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) );
+ ::rtl::Reference pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) );
m_aForwardList[ _sName ] = pForward;
}
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 8ab5c1f12017..093fbd63befe 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -81,8 +81,8 @@ namespace dbaccess
{
Reference< XInteractionRequestStringResolver > xStringResolver = InteractionRequestStringResolver::create(_rContext);
- ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) );
- ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
+ ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rError ) );
+ ::rtl::Reference pApprove( new ::comphelper::OInteractionApprove );
pRequest->addContinuation( pApprove.get() );
Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() );
if ( aMessage.IsPresent )
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 90c1ccc7f77c..a899c77debf4 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -538,7 +538,7 @@ namespace dbaccess
if ( xDocDefinition.is() )
{
Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW );
- rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xDocDefinition ) );
+ rtl::Reference( new SubComponentLoader( xController, xDocDefinition ) );
}
return xSubComponent;
@@ -591,7 +591,7 @@ namespace dbaccess
}
Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW );
- rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xSubComponent ) );
+ rtl::Reference( new SubComponentLoader( xController, xSubComponent ) );
return xSubComponent;
}
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 8b37b2256043..031c91e497f3 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -77,9 +77,9 @@ namespace dbmm
_rDocumentName
);
- ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( makeAny( aRequest ) ) );
- ::rtl::Reference< ::comphelper::OInteractionPassword > pPassword( new ::comphelper::OInteractionPassword( _io_rPassword ) );
- ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort );
+ ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( makeAny( aRequest ) ) );
+ ::rtl::Reference pPassword( new ::comphelper::OInteractionPassword( _io_rPassword ) );
+ ::rtl::Reference pAbort( new ::comphelper::OInteractionAbort );
pRequest->addContinuation( pPassword.get() );
pRequest->addContinuation( pAbort.get() );
@@ -96,8 +96,8 @@ namespace dbmm
void InteractionHandler::reportError( const Any& _rError )
{
- ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) );
- ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
+ ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rError ) );
+ ::rtl::Reference pApprove( new ::comphelper::OInteractionApprove );
pRequest->addContinuation( pApprove.get() );
m_pData->xHandler->handle( pRequest.get() );
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c6ab355c5c72..80df6c2a1826 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1028,7 +1028,7 @@ namespace dbmm
m_rProgress.startObject( sObjectName, OUString(), DEFAULT_DOC_PROGRESS_RANGE );
// load the document
- rtl::Reference< ProgressCapture > pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) );
+ rtl::Reference pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) );
SubDocument aSubDocument( _rDocument );
OpenDocResult eResult = lcl_loadSubDocument_nothrow( aSubDocument, pStatusIndicator.get(), m_rLogger );
if ( eResult != eOpenedDoc )
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index bb1b82e70cc8..391707a43c9b 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -942,8 +942,8 @@ namespace
Reference< XInteractionHandler > xHandler( aArgs.getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ) );
if ( xHandler.is() )
{
- rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rException ) );
- rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
+ rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rException ) );
+ rtl::Reference pApprove( new ::comphelper::OInteractionApprove );
pRequest->addContinuation( pApprove.get() );
try
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 2dea88533bfe..7689022016fa 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void)
if (!xPopupController.is())
return;
- rtl::Reference<VCLXPopupMenu> xPopupMenu(new VCLXPopupMenu);
+ rtl::Reference xPopupMenu(new VCLXPopupMenu);
xPopupController->setPopupMenu(xPopupMenu.get());
VclPtr<PopupMenu> aMenu(static_cast<PopupMenu*>(xPopupMenu->GetMenu()));
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 43b6ecb1fa0e..921130037653 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -485,7 +485,7 @@ VclPtr<PopupMenu> DBTreeListBox::CreateContextMenu()
if ( !m_xMenuController.is() )
return nullptr;
- rtl::Reference<VCLXPopupMenu> xPopupMenu( new VCLXPopupMenu );
+ rtl::Reference xPopupMenu( new VCLXPopupMenu );
m_xMenuController->setPopupMenu( xPopupMenu.get() );
VclPtr<PopupMenu> pContextMenu( static_cast< PopupMenu* >( xPopupMenu->GetMenu() ) );
pContextMenu->AddEventListener( LINK( this, DBTreeListBox, MenuEventListener ) );
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d68357b21dc4..0f28db2f1f6d 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -878,8 +878,8 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void)
OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY));
SQLContext aError;
aError.Message = sMsg;
- ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) );
- ::rtl::Reference< ::comphelper::OInteractionApprove > xYes = new ::comphelper::OInteractionApprove;
+ ::rtl::Reference xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) );
+ ::rtl::Reference xYes = new ::comphelper::OInteractionApprove;
xRequest->addContinuation( xYes.get() );
xRequest->addContinuation( new ::comphelper::OInteractionDisapprove );
::rtl::Reference< ::comphelper::OInteractionAbort > xAbort = new ::comphelper::OInteractionAbort;