summaryrefslogtreecommitdiffstats
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-07 13:52:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-08 10:38:35 +0100
commit17dd2662ccfa9d04efbea74e5d7548db5b2126d4 (patch)
tree37c0de883c43a57f54b0a483437da9de3bf4c941 /dbaccess
parentuse unique_ptr in sd::BluetoothServer::Impl (diff)
downloadcore-17dd2662ccfa9d04efbea74e5d7548db5b2126d4.tar.gz
core-17dd2662ccfa9d04efbea74e5d7548db5b2126d4.zip
convert "*xxx.get()" to "*xxx"
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9 Reviewed-on: https://gerrit.libreoffice.org/65951 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx4
4 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index acdeae0d8d4d..cfa8998244bd 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -496,7 +496,7 @@ namespace
if ( rPersistentName.isEmpty() )
{ // it's a logical sub folder used to organize the real objects
- const ODefinitionContainer_Impl& rSubFoldersObjectDefinitions( dynamic_cast< const ODefinitionContainer_Impl& >( *rDefinition.get() ) );
+ const ODefinitionContainer_Impl& rSubFoldersObjectDefinitions( dynamic_cast< const ODefinitionContainer_Impl& >( *rDefinition ) );
bSomeDocHasMacros = lcl_hasObjectWithMacros_throw( rSubFoldersObjectDefinitions, _rxContainerStorage );
if (bSomeDocHasMacros)
break;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 2e660ccb204d..f990224b11c4 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -426,7 +426,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
// a special listener ?
if ( xListener.is() )
- lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates );
+ lcl_notifyMultipleStates( *xListener, aEvent, aStates );
else
{ // no -> iterate through all listeners responsible for the URL
std::set<OUString> aFeatureCommands;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 23dac75ffab3..5587a613fadb 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -160,7 +160,7 @@ namespace
ScopedVclPtrInstance< OQueryTableConnection > aInfo(pTableView, aInfoData);
// Because OQueryTableConnection never takes ownership of the data passed to it, but only remembers the pointer,
// this pointer to a local variable is not critical, as aInfoData and aInfo have the same lifetime
- pTableView->NotifyTabConnection( *aInfo.get() );
+ pTableView->NotifyTabConnection( *aInfo );
}
else
{
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 808e768ece00..d5c4a63c70bf 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -173,7 +173,7 @@ namespace
ScopedVclPtrInstance< OQueryTableConnection > aNewConn(_pView, aNewConnData);
// referring to the local variable is not important, as NotifyQueryTabConn creates a new copy
// to add me (if not existent)
- _pView->NotifyTabConnection(*aNewConn.get(), false);
+ _pView->NotifyTabConnection(*aNewConn, false);
// don't create an Undo-Action for the new connection : the connection is
// covered by the Undo-Action for the tabwin, as the "Undo the insert" will
// automatically remove all connections adjacent to the win.
@@ -564,7 +564,7 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ
pNewConnectionData->AppendConnLine( aSourceFieldName,aDestFieldName );
ScopedVclPtrInstance< OQueryTableConnection > aNewConnection(this, aNewConnectionData);
- NotifyTabConnection(*aNewConnection.get());
+ NotifyTabConnection(*aNewConnection);
// As usual with NotifyTabConnection, using a local variable is fine because a copy is made
}
else