summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-09 16:39:32 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-09 20:42:44 +0200
commit7d361e96c9ea822790db21806e9fc05279423833 (patch)
tree4a158bdac2bd6df4ec2fc3c5a810003c1dd41ff6 /dbaccess
parent4b0afe968ed62ac65d5f04918f4cda501ecf1619 (diff)
loplugin:redundantpointerops
(All related to uses of std::shared_ptr, which builds against libstdc++ apparently missed (fix forthcoming) and which I only now found with my macOS build against libc++.) Change-Id: If581e689f0e5ff62d9ce35513c9ff87b00328766 Reviewed-on: https://gerrit.libreoffice.org/80548 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx2
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index e71b5fe535a9..02e40390ed7f 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -93,8 +93,8 @@ protected:
virtual ~OComponentDefinition() override;
virtual void SAL_CALL disposing() override;
- const OComponentDefinition_Impl& getDefinition() const { return dynamic_cast< const OComponentDefinition_Impl& >( *m_pImpl.get() ); }
- OComponentDefinition_Impl& getDefinition() { return dynamic_cast< OComponentDefinition_Impl& >( *m_pImpl.get() ); }
+ const OComponentDefinition_Impl& getDefinition() const { return dynamic_cast< const OComponentDefinition_Impl& >( *m_pImpl ); }
+ OComponentDefinition_Impl& getDefinition() { return dynamic_cast< OComponentDefinition_Impl& >( *m_pImpl ); }
public:
OComponentDefinition(
const css::uno::Reference< css::uno::XComponentContext >&,
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 9958b6c0e995..2912c625c465 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -511,7 +511,7 @@ namespace
{
bool bSomeDocHasMacros = false;
- const OContentHelper_Impl& rContainerData( *_rModel.getObjectContainer( _eType ).get() );
+ const OContentHelper_Impl& rContainerData( *_rModel.getObjectContainer( _eType ) );
const ODefinitionContainer_Impl& rObjectDefinitions = dynamic_cast< const ODefinitionContainer_Impl& >( rContainerData );
try
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index f93f7d4d3346..4781146f8bed 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -37,7 +37,7 @@ namespace dbaccess
void OCommandDefinition::registerProperties()
{
- OCommandDefinition_Impl& rCommandDefinition = dynamic_cast< OCommandDefinition_Impl& >( *m_pImpl.get() );
+ OCommandDefinition_Impl& rCommandDefinition = dynamic_cast< OCommandDefinition_Impl& >( *m_pImpl );
registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND,
&rCommandDefinition.m_sCommand, cppu::UnoType<decltype(rCommandDefinition.m_sCommand)>::get());
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index e36f90de1eb8..da58ff9daf7d 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -144,12 +144,12 @@ protected:
const ODefinitionContainer_Impl& getDefinitions() const
{
- return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl.get() );
+ return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl );
}
ODefinitionContainer_Impl& getDefinitions()
{
- return dynamic_cast< ODefinitionContainer_Impl& >( *m_pImpl.get() );
+ return dynamic_cast< ODefinitionContainer_Impl& >( *m_pImpl );
}
public:
/** constructs the container.