diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-08 12:36:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-10 12:02:44 +0200 |
commit | 366d08f2f6d4de922f6099c62bb81b49d89e0a68 (patch) | |
tree | b232884af6e844c2f0994859e4b42efbc1ce654c /svx | |
parent | 75a2257a5bd716a9f937abe5e53f305c983afd5d (diff) |
new loplugin:simplifypointertobool
Change-Id: Iff68e8f379614a6ab6a6e0d1bad18e70bc76d76a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91907
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 2 | ||||
-rw-r--r-- | svx/source/core/extedit.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/svxruler.cxx | 60 | ||||
-rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tablecontroller.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 2 |
11 files changed, 42 insertions, 42 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 981cfdf36214..a775d572b254 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -829,7 +829,7 @@ void SAL_CALL AccessibleControlShape::elementInserted( const css::container::Con Reference< XInterface > xNewNormalized( xControl->getModel(), UNO_QUERY ); Reference< XInterface > xMyModelNormalized( m_xControlModel, UNO_QUERY ); - if ( xNewNormalized.get() && xMyModelNormalized.get() ) + if ( xNewNormalized && xMyModelNormalized ) { // now finally the control for the model we're responsible for has been inserted into the container Reference< XInterface > xKeepAlive( *this ); diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 7a8598cc1806..e1426d239c67 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -303,7 +303,7 @@ namespace accessibility const SdrHint* pSdrHint = ( rHint.GetId() == SfxHintId::ThisIsAnSdrHint ? static_cast<const SdrHint*>(&rHint) : nullptr ); if( pSdrHint && pSdrHint->GetKind() == SdrHintKind::BeginEdit && - &mrObj == pSdrHint->GetObject() && mpEditSource.get() ) + &mrObj == pSdrHint->GetObject() && mpEditSource ) { // switch edit source, if not yet done. This is necessary // to become a full-fledged EditSource the first time a diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index c96b97282305..6842d7655544 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -365,7 +365,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //this mxshape is the captioned shape uno::Sequence< uno::Reference< uno::XInterface > > aSequence { mpParent->GetAccessibleCaption(mxShape) }; - if(aSequence[0].get()) + if(aSequence[0]) { pRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) ); diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 49fdc2552a6f..b6e1387aba50 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -60,7 +60,7 @@ void ExternalToolEdit::HandleCloseEvent(ExternalToolEdit* pData) void ExternalToolEdit::StartListeningEvent() { //Start an event listener implemented via VCL timeout - assert(!m_pChecker.get()); + assert(!m_pChecker); m_pChecker.reset(new FileChangedChecker( m_aFileName, [this] () { return HandleCloseEvent(this); })); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 32a6b3d9576e..1e53d7a3ab55 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -437,7 +437,7 @@ void SvxRuler::UpdateFrame() mxRulerImpl->aProtectItem->IsPosProtected() ) ? RulerMarginStyle::NONE : RulerMarginStyle::Sizeable; - if(mxLRSpaceItem.get() && mxPagePosItem.get()) + if(mxLRSpaceItem && mxPagePosItem) { // if no initialization by default app behavior const long nOld = lLogicNullOffset; @@ -462,7 +462,7 @@ void SvxRuler::UpdateFrame() long lRight = 0; // evaluate the table right edge of the table - if(mxColumnItem.get() && mxColumnItem->IsTable()) + if(mxColumnItem && mxColumnItem->IsTable()) lRight = mxColumnItem->GetRight(); else lRight = mxLRSpaceItem->GetRight(); @@ -472,7 +472,7 @@ void SvxRuler::UpdateFrame() SetMargin2(aWidthPixel, nMarginStyle); } - else if(mxULSpaceItem.get() && mxPagePosItem.get()) + else if(mxULSpaceItem && mxPagePosItem) { // relative the upper edge of the surrounding frame const long nOld = lLogicNullOffset; @@ -709,7 +709,7 @@ void SvxRuler::Update( if(!bHorz && !mxRulerImpl->bIsTableRows) mxColumnItem->SetWhich(SID_RULER_BORDERS_VERTICAL); } - else if(mxColumnItem.get() && mxColumnItem->Which() == nSID) + else if(mxColumnItem && mxColumnItem->Which() == nSID) //there are two groups of column items table/frame columns and table rows //both can occur in vertical or horizontal mode //the horizontal ruler handles the SID_RULER_BORDERS and SID_RULER_ROWS_VERTICAL @@ -728,7 +728,7 @@ void SvxRuler::Update( void SvxRuler::UpdateColumns() { /* Update column view */ - if(mxColumnItem.get() && mxColumnItem->Count() > 1) + if(mxColumnItem && mxColumnItem->Count() > 1) { mpBorders.resize(mxColumnItem->Count()); @@ -821,7 +821,7 @@ void SvxRuler::UpdatePara() */ // Dependence on PagePosItem - if (mxParaItem.get() && mxPagePosItem.get() && !mxObjectItem) + if (mxParaItem && mxPagePosItem && !mxObjectItem) { bool bRTLText = mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue(); // First-line indent is negative to the left paragraph margin @@ -997,7 +997,7 @@ void SvxRuler::UpdateTabs() if(IsDrag()) return; - if (mxPagePosItem.get() && mxParaItem.get() && mxTabStopItem.get() && !mxObjectItem) + if (mxPagePosItem && mxParaItem && mxTabStopItem && !mxObjectItem) { // buffer for DefaultTabStop // Distance last Tab <-> Right paragraph margin / DefaultTabDist @@ -1198,7 +1198,7 @@ long SvxRuler::GetLeftFrameMargin() const DBG_ASSERT(!mxColumnItem || mxColumnItem->GetActColumn() < mxColumnItem->Count(), "issue #126721# - invalid current column!"); long nLeft = 0; - if (mxColumnItem.get() && + if (mxColumnItem && mxColumnItem->Count() && mxColumnItem->IsConsistent()) { @@ -1249,11 +1249,11 @@ long SvxRuler::GetRightFrameMargin() const long lResult = lLogicNullOffset; // If possible deduct right table entry - if(mxColumnItem.get() && mxColumnItem->IsTable()) + if(mxColumnItem && mxColumnItem->IsTable()) lResult += mxColumnItem->GetRight(); - else if(bHorz && mxLRSpaceItem.get()) + else if(bHorz && mxLRSpaceItem) lResult += mxLRSpaceItem->GetRight(); - else if(!bHorz && mxULSpaceItem.get()) + else if(!bHorz && mxULSpaceItem) lResult += mxULSpaceItem->GetLower(); if(bHorz) @@ -1266,7 +1266,7 @@ long SvxRuler::GetRightFrameMargin() const #define NEG_FLAG ( (nFlags & SvxRulerSupportFlags::NEGATIVE_MARGINS) == \ SvxRulerSupportFlags::NEGATIVE_MARGINS ) -#define TAB_FLAG ( mxColumnItem.get() && mxColumnItem->IsTable() ) +#define TAB_FLAG ( mxColumnItem && mxColumnItem->IsTable() ) long SvxRuler::GetCorrectedDragPos( bool bLeft, bool bRight ) { @@ -1311,7 +1311,7 @@ void SvxRuler::DragMargin1() return; DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz); - if (mxColumnItem.get() && (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)) + if (mxColumnItem && (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)) DragBorders(); AdjustMargin1(aDragPosition); } @@ -1336,7 +1336,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) { SetMargin2( GetMargin2() - lDiff, nMarginStyle ); - if (!mxColumnItem && !mxObjectItem && mxParaItem.get()) + if (!mxColumnItem && !mxObjectItem && mxParaItem) { // Right indent of the old position mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff; @@ -1372,7 +1372,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) SetIndents(INDENT_COUNT, mpIndents.data() + INDENT_GAP); } } - if(mxTabStopItem.get() && (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL) + if(mxTabStopItem && (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL) &&!IsActFirstColumn()) { ModifyTabs_Impl(nTabCount + TAB_GAP, mpTabs.data(), -lDiff); @@ -1391,7 +1391,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) & (SvxRulerDragFlags::OBJECT_SIZE_LINEAR | SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL))) { - if (!mxColumnItem && !mxObjectItem && mxParaItem.get()) + if (!mxColumnItem && !mxObjectItem && mxParaItem) { // Left indent of the old position mpIndents[INDENT_FIRST_LINE].nPos += lDiff; @@ -1447,7 +1447,7 @@ void SvxRuler::DragMargin2() if( mxRulerImpl->bIsTableRows && !bHorz && - mxColumnItem.get() && + mxColumnItem && (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)) { DragBorders(); @@ -1462,7 +1462,7 @@ void SvxRuler::DragMargin2() SetMargin2( aDragPosition, nMarginStyle ); // Right indent of the old position - if ((!mxColumnItem || IsActLastColumn()) && mxParaItem.get()) + if ((!mxColumnItem || IsActLastColumn()) && mxParaItem) { mpIndents[INDENT_FIRST_LINE].nPos += lDiff; SetIndents(INDENT_COUNT, mpIndents.data() + INDENT_GAP); @@ -2004,7 +2004,7 @@ void SvxRuler::ApplyIndents() long nLeftMargin = ConvertPosLogic(mpIndents[INDENT_LEFT_MARGIN].nPos); long nRightMargin = ConvertPosLogic(mpIndents[INDENT_RIGHT_MARGIN].nPos); - if(mxColumnItem.get() && ((bRTL && !IsActLastColumn(true)) || (!bRTL && !IsActFirstColumn(true)))) + if(mxColumnItem && ((bRTL && !IsActLastColumn(true)) || (!bRTL && !IsActFirstColumn(true)))) { if(bRTL) { @@ -2038,7 +2038,7 @@ void SvxRuler::ApplyIndents() else nNewFirstLineOffset = nFirstLine - nLeftMargin - lAppNullOffset; - if(mxColumnItem.get() && ((!bRTL && !IsActLastColumn(true)) || (bRTL && !IsActFirstColumn(true)))) + if(mxColumnItem && ((!bRTL && !IsActLastColumn(true)) || (bRTL && !IsActFirstColumn(true)))) { if(bRTL) { @@ -2440,7 +2440,7 @@ void SvxRuler::EvalModifier() ( ( RulerType::Border == eType || RulerType::Margin1 == eType || RulerType::Margin2 == eType ) && - mxColumnItem.get() ) ) + mxColumnItem ) ) { PrepareProportional_Impl(eType); } @@ -2475,7 +2475,7 @@ void SvxRuler::Click() pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL ); } bool bRTL = mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue(); - if(mxTabStopItem.get() && + if(mxTabStopItem && (nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS) { bool bContentProtected = mxRulerImpl->aProtectItem->IsContentProtected(); @@ -2564,7 +2564,7 @@ void SvxRuler::CalcMinMax() { nMaxRight = ConvertPosPixel( GetPageWidth() - ( - (mxColumnItem->IsTable() && mxLRSpaceItem.get()) + (mxColumnItem->IsTable() && mxLRSpaceItem) ? mxLRSpaceItem->GetRight() : 0)) - GetMargin2() + GetMargin1(); } @@ -2595,7 +2595,7 @@ void SvxRuler::CalcMinMax() nMaxRight += GetRightIndent() - std::max(GetFirstLineIndent(), GetLeftIndent()); } // Do not drag the left table edge over the edge of the page - if(mxLRSpaceItem.get() && mxColumnItem->IsTable()) + if(mxLRSpaceItem && mxColumnItem->IsTable()) { long nTmp=ConvertSizePixel(mxLRSpaceItem->GetLeft()); if(nTmp>nMaxLeft) @@ -2932,7 +2932,7 @@ void SvxRuler::CalcMinMax() { nMaxLeft = lNullPix + GetRightIndent(); - if(mxColumnItem.get() && !mxColumnItem->IsFirstAct()) + if(mxColumnItem && !mxColumnItem->IsFirstAct()) nMaxLeft += mpBorders[mxColumnItem->GetActColumn()-1].nPos + mpBorders[mxColumnItem->GetActColumn()-1].nWidth; nMaxRight = lNullPix + GetMargin2(); @@ -2951,7 +2951,7 @@ void SvxRuler::CalcMinMax() { nMaxLeft = lNullPix; - if(mxColumnItem.get() && !mxColumnItem->IsFirstAct()) + if(mxColumnItem && !mxColumnItem->IsFirstAct()) nMaxLeft += mpBorders[mxColumnItem->GetActColumn()-1].nPos + mpBorders[mxColumnItem->GetActColumn()-1].nWidth; nMaxRight = lNullPix + GetRightIndent() - glMinFrame; @@ -3053,7 +3053,7 @@ bool SvxRuler::StartDrag() { case RulerType::Margin1: // left edge of the surrounding Frame case RulerType::Margin2: // right edge of the surrounding Frame - if((bHorz && mxLRSpaceItem.get()) || (!bHorz && mxULSpaceItem.get())) + if((bHorz && mxLRSpaceItem) || (!bHorz && mxULSpaceItem)) { if (!mxColumnItem) EvalModifier(); @@ -3165,7 +3165,7 @@ void SvxRuler::EndDrag() if (!mxColumnItem || !mxColumnItem->IsTable()) ApplyMargins(); - if(mxColumnItem.get() && + if(mxColumnItem && (mxColumnItem->IsTable() || (nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL))) ApplyBorders(); @@ -3223,7 +3223,7 @@ void SvxRuler::ExtraDown() /* Override SV method, sets the new type for the Default tab. */ // Switch Tab Type - if(mxTabStopItem.get() && + if(mxTabStopItem && (nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS) { ++nDefTabType; @@ -3261,7 +3261,7 @@ IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu, bool ) IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool ) { /* Handler of the tab menu for setting the type */ - if(mxTabStopItem.get() && mxTabStopItem->Count() > mxRulerImpl->nIdx) + if(mxTabStopItem && mxTabStopItem->Count() > mxRulerImpl->nIdx) { SvxTabStop aTabStop = mxTabStopItem->At(mxRulerImpl->nIdx); aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId() - 1); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 51501bc5c807..1177e6eb3e9e 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1111,7 +1111,7 @@ namespace svx ControlFeatures aEmpty; m_aControlFeatures.swap( aEmpty ); - if ( m_aContextMenuObserver.get() ) + if ( m_aContextMenuObserver ) { m_aContextMenuObserver->dispose(); m_aContextMenuObserver = MouseListenerAdapter(); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c413dea2214d..1ede28ae3409 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -882,7 +882,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF for (const PFormViewPageWindowAdapter& pAdapter : m_aPageWindowAdapters) { - if ( !pAdapter.get() ) + if ( !pAdapter ) { SAL_WARN( "svx.form", "FmXFormView::getFormController: invalid page window adapter!" ); continue; @@ -914,7 +914,7 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus, void*, void) Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms() ) : Reference< XIndexAccess >() ); const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? nullptr : m_aPageWindowAdapters[0]; - const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : nullptr; + const vcl::Window* pWindow = pAdapter ? pAdapter->getWindow() : nullptr; ENSURE_OR_RETURN_VOID( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" ); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 76eb6c29e845..f83e9bafdebd 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -615,7 +615,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() void AreaPropertyPanelBase::ImpUpdateTransparencies() { - if(mpTransparanceItem.get() || mpFloatTransparenceItem.get()) + if(mpTransparanceItem || mpFloatTransparenceItem) { bool bZeroValue(false); @@ -646,7 +646,7 @@ void AreaPropertyPanelBase::ImpUpdateTransparencies() } } - if(bZeroValue && mpFloatTransparenceItem.get()) + if(bZeroValue && mpFloatTransparenceItem) { if(mpFloatTransparenceItem->IsEnabled()) { diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 4fc4ded76971..40aacd3474fb 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2175,7 +2175,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) // multiple portions exist with multiple formats. If an OutlinerParaObject // really exists and needs to be rescued is evaluated in the undo // implementation itself. - bool bRescueText = mxTextEditObj.get(); + bool bRescueText = mxTextEditObj; AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *mxTextEditObj, false, !bNoEEItems || bRescueText)); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index c30eca131f2b..9fa0c057565e 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -205,7 +205,7 @@ SvxTableController::~SvxTableController() Application::RemoveUserEvent( mnUpdateEvent ); } - if( mxModifyListener.is() && mxTableObj.get() ) + if( mxModifyListener.is() && mxTableObj ) { Reference< XTable > xTable( mxTableObj->getTable() ); if( xTable.is() ) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index a015d4af8561..9ec7c22f6501 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -176,7 +176,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u sal_Int32 nUserIndex = 1; const OUString aUser(SvxResId(pPrefixResId) + " "); - if( pDefaults.get() ) + if( pDefaults ) { const int nCount = pDefaults->Count(); int nIndex; |