summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-16 15:23:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-17 08:25:47 +0200
commitccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 (patch)
tree2ee2fd4f300ae95cf23bade1f242e02f9b276c07 /reportdesign
parentda5c3a1ee43dd1a07cbd1b8005488bf05432593d (diff)
clang-tidy readability-redundant-smartptr-get
redundant get() call on smart pointer Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd Reviewed-on: https://gerrit.libreoffice.org/61837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/Shape.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx28
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
5 files changed, 19 insertions, 19 deletions
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index c948dddb88a4..5b59b8924b30 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -193,7 +193,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo(
cppu::IPropertyArrayHelper& OShape::getInfoHelper()
{
- if ( !m_pAggHelper.get() )
+ if (!m_pAggHelper)
{
uno::Sequence<beans::Property> aAggSeq;
if ( m_aProps.aComponent.m_xProperty.is() )
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 5a09ba27bc4d..ea94d02740b5 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -812,7 +812,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt )
// set old name property
OObjectBase::EndListening();
if ( m_xMediator.is() )
- m_xMediator.get()->stopListening();
+ m_xMediator->stopListening();
try
{
xControlModel->setPropertyValue( PROPERTY_NAME, evt.NewValue );
@@ -821,7 +821,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt )
{
}
if ( m_xMediator.is() )
- m_xMediator.get()->startListening();
+ m_xMediator->startListening();
OObjectBase::StartListening();
}
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index a709f0418972..8323bd865037 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -773,7 +773,7 @@ SvXMLImportContext *ORptFilter::CreateFastContext( sal_Int32 nElement,
const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
{
- if ( !m_pDocElemTokenMap.get() )
+ if (!m_pDocElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -790,7 +790,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetDocContentElemTokenMap() const
{
- if (!m_pDocContentElemTokenMap.get())
+ if (!m_pDocContentElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -808,21 +808,21 @@ const SvXMLTokenMap& ORptFilter::GetDocContentElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const
{
- if ( !m_pReportElemTokenMap.get() )
+ if (!m_pReportElemTokenMap)
m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
return *m_pReportElemTokenMap;
}
const SvXMLTokenMap& ORptFilter::GetSubDocumentElemTokenMap() const
{
- if ( !m_pSubDocumentElemTokenMap.get() )
+ if (!m_pSubDocumentElemTokenMap)
m_pSubDocumentElemTokenMap.reset(OXMLHelper::GetSubDocumentElemTokenMap());
return *m_pSubDocumentElemTokenMap;
}
const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
{
- if ( !m_pFunctionElemTokenMap.get() )
+ if (!m_pFunctionElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -840,7 +840,7 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
{
- if ( !m_pFormatElemTokenMap.get() )
+ if (!m_pFormatElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -856,7 +856,7 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
{
- if ( !m_pGroupElemTokenMap.get() )
+ if (!m_pGroupElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -882,7 +882,7 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
{
- if ( !m_pElemTokenMap.get() )
+ if (!m_pElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -900,7 +900,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
{
- if ( !m_pControlElemTokenMap.get() )
+ if (!m_pControlElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -922,7 +922,7 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
{
- if ( !m_pControlElemTokenMap.get() )
+ if (!m_pControlElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -944,7 +944,7 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
{
- if ( !m_pComponentElemTokenMap.get() )
+ if (!m_pComponentElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -960,7 +960,7 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
{
- if ( !m_pColumnTokenMap.get() )
+ if (!m_pColumnTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -984,7 +984,7 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
{
- if ( !m_pSectionElemTokenMap.get() )
+ if (!m_pSectionElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -1007,7 +1007,7 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
{
- if ( !m_pCellElemTokenMap.get() )
+ if (!m_pCellElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index e79d4c6a361f..e1b9978633ac 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -4230,7 +4230,7 @@ void OReportController::openZoomDialog()
aZoomItem.SetValueSet(SvxZoomEnableFlags::N100|SvxZoomEnableFlags::WHOLEPAGE|SvxZoomEnableFlags::PAGEWIDTH);
pDescriptor->Put(aZoomItem);
- ScopedVclPtr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(nullptr, *pDescriptor.get()) );
+ ScopedVclPtr<AbstractSvxZoomDialog> pDlg(pFact->CreateSvxZoomDialog(nullptr, *pDescriptor));
pDlg->SetLimits( 20, 400 );
bool bCancel = ( RET_CANCEL == pDlg->Execute() );
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index e64cee395cf5..08cd7e27e2d1 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -567,7 +567,7 @@ bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent)
void OReportSection::deactivateOle()
{
- if ( m_pFunc.get() )
+ if (m_pFunc)
m_pFunc->deactivateOle(true);
}