diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 20:42:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 22:33:02 +0200 |
commit | fe6cce01c88d045a1fcf09acf049c34c22299b02 (patch) | |
tree | c118594a43386096bca55179f31b2b61e64dfa48 /chart2/source | |
parent | b894a3d7f991dd248dfd8935b31da8bccfd130b2 (diff) |
Fix loplugin:simplifypointertobool for libstdc++ std::shared_ptr
...where the get member function is defined on a std::__shared_ptr base class,
so loplugin:simplifypointertobool used to miss those until now. (While e.g.
using libc++ on macOS found those cases.)
366d08f2f6d4de922f6099c62bb81b49d89e0a68 "new loplugin:simplifypointertobool"
was mistaken in breaking isSmartPointerType(const clang::Type* t) out of
isSmartPointerType(const Expr* e); c874294ad9fb178df47c66875bfbdec466e39763 "Fix
detection of std::unique_ptr/shared_ptr in loplugin:redundantpointerops" had
introduced that indivisible two-step algorithm on purpose.
The amount of additional hits (on Linux) apparently asked for turning
loplugin:simplifypointertobool into a rewriting plugin. Which in turn showed
that the naive adivce to just "drop the get()" is not sufficient in places that
are not contextually converted to bool, as those places need to be wrapped in a
bool(...) functional cast now. If the expression was already wrapped in
parentheses, those could be reused as part of the functional cast, but
implementing that showed that such cases are not yet found at all by the
existing loplugin:simplifypointertobool. Lets leave that TODO for another
commit.
Besides the changes to compilerplugins/ itself, this change has been generated
fully automatically with the rewriting plugin on Linux.
Change-Id: I83107d6f634fc9ac232986f49044d7017df83e2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94888
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'chart2/source')
7 files changed, 15 insertions, 15 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 84c477678a28..26c260ffc0b3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -64,7 +64,7 @@ public: bool bHasDetectableInnerValue = false; rHasAmbiguousValue = false; if( m_ePropertyType == DIAGRAM && - m_spChart2ModelContact.get() ) + m_spChart2ModelContact ) { std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); @@ -91,7 +91,7 @@ public: void setInnerValue( PROPERTYTYPE aNewValue ) const { if( m_ePropertyType == DIAGRAM && - m_spChart2ModelContact.get() ) + m_spChart2ModelContact ) { std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index abcbc1f016ec..6e12bea50e0a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -124,7 +124,7 @@ uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact( const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { uno::Reference< chart2::data::XDataProvider > xResult; - if( spChart2ModelContact.get()) + if( spChart2ModelContact) { uno::Reference< chart2::XChartDocument > xChartDoc( spChart2ModelContact->getChart2Document()); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 95759509c563..4dfabee4836f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -283,7 +283,7 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc //so we need to return PropertyState_DIRECT_VALUE for more cases if( m_ePropertyType == DATA_SERIES && //single series or point - m_spChart2ModelContact.get()) + m_spChart2ModelContact) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< chart2::XDataSeries > xSeries( xInnerPropertyState, uno::UNO_QUERY ); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 785a1d16528c..0aaccdea65cf 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -711,7 +711,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const Color nLabelColor; if( ! std::isnan( fData ) && - m_spNumberFormatterWrapper.get() ) + m_spNumberFormatterWrapper ) { bool bColorChanged = false; aResult = m_spNumberFormatterWrapper->getFormattedString( @@ -728,7 +728,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const aResult = aText; else if( aAny>>=fDouble ) { - if( ! std::isnan( fDouble ) && m_spNumberFormatterWrapper.get() ) + if( ! std::isnan( fDouble ) && m_spNumberFormatterWrapper ) { // If a numberformat was available here we could directly // obtain the corresponding edit format in @@ -831,7 +831,7 @@ bool DataBrowser::IsDataValid() const OUString aText( m_aNumberEditField->GetText()); if( !aText.isEmpty() && - m_spNumberFormatterWrapper.get() && + m_spNumberFormatterWrapper && m_spNumberFormatterWrapper->getSvNumberFormatter() && ! m_spNumberFormatterWrapper->getSvNumberFormatter()->IsNumberFormat( aText, nDummy, fDummy )) @@ -1165,7 +1165,7 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_uInt16 nCol ) const bool DataBrowser::isDateTimeString( const OUString& aInputString, double& fOutDateTimeValue ) { sal_uInt32 nNumberFormat=0; - SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : nullptr; + SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper ? m_spNumberFormatterWrapper->getSvNumberFormatter() : nullptr; if( !aInputString.isEmpty() && pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateTimeValue ) ) { SvNumFormatType nType = pSvNumberFormatter->GetType( nNumberFormat); @@ -1186,7 +1186,7 @@ bool DataBrowser::SaveModified() OSL_ENSURE( nRow >= 0 || nCol >= 0, "This cell should not be modified!" ); - SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : nullptr; + SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper ? m_spNumberFormatterWrapper->getSvNumberFormatter() : nullptr; switch( m_apDataBrowserModel->getCellType( nCol )) { case DataBrowserModel::NUMBER: diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 5c8678bc9f5b..b4bdbae6501e 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -393,7 +393,7 @@ void DialogModel::setTemplate( std::shared_ptr< RangeSelectionHelper > const & DialogModel::getRangeSelectionHelper() const { - if( ! m_spRangeSelectionHelper.get()) + if( ! m_spRangeSelectionHelper) m_spRangeSelectionHelper = std::make_shared<RangeSelectionHelper>( m_xChartDocument ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index ad6e94ee1f0c..f81b261182fa 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1460,12 +1460,12 @@ void ChartController::NotifyUndoActionHdl( std::unique_ptr<SdrUndoAction> pUndoA DrawModelWrapper* ChartController::GetDrawModelWrapper() { - if( !m_pDrawModelWrapper.get() ) + if( !m_pDrawModelWrapper ) { ExplicitValueProvider* pProvider = comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ); if( pProvider ) m_pDrawModelWrapper = pProvider->getDrawModelWrapper(); - if ( m_pDrawModelWrapper.get() ) + if ( m_pDrawModelWrapper ) { m_pDrawModelWrapper->getSdrModel().SetNotifyUndoActionHdl( std::bind(&ChartController::NotifyUndoActionHdl, this, std::placeholders::_1) ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index d3b0e8832e36..f168e7e0b2df 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1064,7 +1064,7 @@ ChartView::ChartView( void ChartView::init() { - if( !m_pDrawModelWrapper.get() ) + if( !m_pDrawModelWrapper ) { SolarMutexGuard aSolarGuard; m_pDrawModelWrapper = std::make_shared< DrawModelWrapper >(); @@ -1088,7 +1088,7 @@ ChartView::~ChartView() if ( xComp.is() ) xComp->dispose(); - if( m_pDrawModelWrapper.get() ) + if( m_pDrawModelWrapper ) { SolarMutexGuard aSolarGuard; EndListening( m_pDrawModelWrapper->getSdrModel() ); @@ -1395,7 +1395,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw } if( nWritingMode != -1 && nWritingMode != text::WritingMode2::PAGE ) { - if( pDrawModelWrapper.get() ) + if( pDrawModelWrapper ) pDrawModelWrapper->GetItemPool().SetPoolDefaultItem(SvxFrameDirectionItem(static_cast<SvxFrameDirection>(nWritingMode), EE_PARA_WRITINGDIR) ); } } |