From ccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Oct 2018 15:23:12 +0200 Subject: 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 --- .../accessibility/AccessibleEmptyEditSource.cxx | 12 +- svx/source/accessibility/AccessibleTextHelper.cxx | 2 +- svx/source/dialog/svxruler.cxx | 137 ++++++++++----------- svx/source/fmcomp/fmgridcl.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 6 +- svx/source/form/fmvwimp.cxx | 8 +- svx/source/form/formcontroller.cxx | 6 +- svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4 +- svx/source/sidebar/line/LinePropertyPanelBase.cxx | 6 +- svx/source/svdraw/svdograf.cxx | 2 +- svx/source/svdraw/svdpage.cxx | 17 +-- svx/source/tbxctrls/tbcontrl.cxx | 4 +- svx/source/unodraw/unoshtxt.cxx | 4 +- 13 files changed, 101 insertions(+), 109 deletions(-) (limited to 'svx') diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 804b208b59aa..88fb69043cc1 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -225,7 +225,7 @@ namespace accessibility if( !mbEditSourceEmpty ) { // deregister as listener - if( mpEditSource.get() ) + if (mpEditSource) EndListening( mpEditSource->GetBroadcaster() ); } else @@ -236,7 +236,7 @@ namespace accessibility SvxTextForwarder* AccessibleEmptyEditSource::GetTextForwarder() { - if( !mpEditSource.get() ) + if (!mpEditSource) return nullptr; return mpEditSource->GetTextForwarder(); @@ -244,7 +244,7 @@ namespace accessibility SvxViewForwarder* AccessibleEmptyEditSource::GetViewForwarder() { - if( !mpEditSource.get() ) + if (!mpEditSource) return nullptr; return mpEditSource->GetViewForwarder(); @@ -267,7 +267,7 @@ namespace accessibility SvxEditViewForwarder* AccessibleEmptyEditSource::GetEditViewForwarder( bool bCreate ) { - if( !mpEditSource.get() ) + if (!mpEditSource) return nullptr; // switch edit source, if not yet done @@ -279,7 +279,7 @@ namespace accessibility std::unique_ptr AccessibleEmptyEditSource::Clone() const { - if( !mpEditSource.get() ) + if (!mpEditSource) return nullptr; return mpEditSource->Clone(); @@ -287,7 +287,7 @@ namespace accessibility void AccessibleEmptyEditSource::UpdateData() { - if( mpEditSource.get() ) + if (mpEditSource) mpEditSource->UpdateData(); } diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 9f622b696cd5..8a03b91a935a 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1127,7 +1127,7 @@ namespace accessibility while( !maEventQueue.IsEmpty() ) { ::std::unique_ptr< SfxHint > pHint( maEventQueue.PopFront() ); - if( pHint.get() ) + if (pHint) { const SfxHint& rHint = *(pHint.get()); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index e6ec4bc8e876..af26b6ebe48d 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -502,7 +502,7 @@ void SvxRuler::UpdateFrame() { // if no initialization by default app behavior const long nOld = lLogicNullOffset; - lLogicNullOffset = mxColumnItem.get() ? mxColumnItem->GetLeft(): mxLRSpaceItem->GetLeft(); + lLogicNullOffset = mxColumnItem ? mxColumnItem->GetLeft() : mxLRSpaceItem->GetLeft(); if(bAppSetNullOffset) { @@ -537,7 +537,7 @@ void SvxRuler::UpdateFrame() { // relative the upper edge of the surrounding frame const long nOld = lLogicNullOffset; - lLogicNullOffset = mxColumnItem.get() ? mxColumnItem->GetLeft() : mxULSpaceItem->GetUpper(); + lLogicNullOffset = mxColumnItem ? mxColumnItem->GetLeft() : mxULSpaceItem->GetUpper(); if(bAppSetNullOffset) { @@ -555,7 +555,7 @@ void SvxRuler::UpdateFrame() SetMargin1(ConvertVPosPixel(lAppNullOffset), nMarginStyle); } - long lLower = mxColumnItem.get() ? mxColumnItem->GetRight() : mxULSpaceItem->GetLower(); + long lLower = mxColumnItem ? mxColumnItem->GetRight() : mxULSpaceItem->GetLower(); long nMargin2 = mxPagePosItem->GetHeight() - lLower - lLogicNullOffset + lAppNullOffset; long nMargin2Pixel = ConvertVPosPixel(nMargin2); @@ -568,7 +568,7 @@ void SvxRuler::UpdateFrame() SetMargin2(); } - if(mxColumnItem.get()) + if (mxColumnItem) { mxRulerImpl->nColLeftPix = static_cast(ConvertSizePixel(mxColumnItem->GetLeft())); mxRulerImpl->nColRightPix = static_cast(ConvertSizePixel(mxColumnItem->GetRight())); @@ -610,7 +610,7 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt ) { case RulerType::Indent: { - if (!mxParaItem.get()) + if (!mxParaItem) break; long nIndex = aSelection.nAryPos + INDENT_GAP; @@ -631,10 +631,10 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt ) } case RulerType::Border: { - if (mxColumnItem.get() == nullptr) + if (mxColumnItem == nullptr) break; - SvxColumnItem& aColumnItem = *mxColumnItem.get(); + SvxColumnItem& aColumnItem = *mxColumnItem; if (aSelection.nAryPos + 1 >= aColumnItem.Count()) break; @@ -652,9 +652,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt ) case RulerType::Margin1: { long nLeft = 0.0; - if (mxLRSpaceItem.get()) + if (mxLRSpaceItem) nLeft = mxLRSpaceItem->GetLeft(); - else if (mxULSpaceItem.get()) + else if (mxULSpaceItem) nLeft = mxULSpaceItem->GetUpper(); else break; @@ -668,9 +668,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt ) case RulerType::Margin2: { long nRight = 0.0; - if (mxLRSpaceItem.get()) + if (mxLRSpaceItem) nRight = mxLRSpaceItem->GetRight(); - else if (mxULSpaceItem.get()) + else if (mxULSpaceItem) nRight = mxULSpaceItem->GetLower(); else break; @@ -844,17 +844,17 @@ void SvxRuler::UpdateColumns() void SvxRuler::UpdateObject() { /* Update view of object representation */ - if(mxObjectItem.get()) + if (mxObjectItem) { DBG_ASSERT(!mpObjectBorders.empty(), "no Buffer"); // !! to the page margin - long nMargin = mxLRSpaceItem.get() ? mxLRSpaceItem->GetLeft() : 0; + long nMargin = mxLRSpaceItem ? mxLRSpaceItem->GetLeft() : 0; mpObjectBorders[0].nPos = ConvertPosPixel(mxObjectItem->GetStartX() - nMargin + lAppNullOffset); mpObjectBorders[1].nPos = ConvertPosPixel(mxObjectItem->GetEndX() - nMargin + lAppNullOffset); - nMargin = mxULSpaceItem.get() ? mxULSpaceItem->GetUpper() : 0; + nMargin = mxULSpaceItem ? mxULSpaceItem->GetUpper() : 0; mpObjectBorders[2].nPos = ConvertPosPixel(mxObjectItem->GetStartY() - nMargin + lAppNullOffset); @@ -883,7 +883,7 @@ void SvxRuler::UpdatePara() */ // Dependence on PagePosItem - if(mxParaItem.get() && mxPagePosItem.get() && !mxObjectItem.get()) + if (mxParaItem.get() && mxPagePosItem.get() && !mxObjectItem) { bool bRTLText = mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue(); // First-line indent is negative to the left paragraph margin @@ -958,7 +958,7 @@ void SvxRuler::UpdateParaBorder(const SvxLRSpaceItem * pItem ) void SvxRuler::UpdatePage() { /* Update view of position and width of page */ - if(mxPagePosItem.get()) + if (mxPagePosItem) { // all objects are automatically adjusted if(bHorz) @@ -1063,10 +1063,7 @@ void SvxRuler::UpdateTabs() if(IsDrag()) return; - if( mxPagePosItem.get() && - mxParaItem.get() && - mxTabStopItem.get() && - !mxObjectItem.get() ) + if (mxPagePosItem.get() && mxParaItem.get() && mxTabStopItem.get() && !mxObjectItem) { // buffer for DefaultTabStop // Distance last Tab <-> Right paragraph margin / DefaultTabDist @@ -1222,7 +1219,7 @@ void SvxRuler::Update() long SvxRuler::GetPageWidth() const { - if (!mxPagePosItem.get()) + if (!mxPagePosItem) return 0; return bHorz ? mxPagePosItem->GetWidth() : mxPagePosItem->GetHeight(); } @@ -1238,25 +1235,25 @@ inline long SvxRuler::GetFrameLeft() const long SvxRuler::GetFirstLineIndent() const { /* Get First-line indent in pixels */ - return mxParaItem.get() ? mpIndents[INDENT_FIRST_LINE].nPos : GetMargin1(); + return mxParaItem ? mpIndents[INDENT_FIRST_LINE].nPos : GetMargin1(); } long SvxRuler::GetLeftIndent() const { /* Get Left paragraph margin in Pixels */ - return mxParaItem.get() ? mpIndents[INDENT_LEFT_MARGIN].nPos : GetMargin1(); + return mxParaItem ? mpIndents[INDENT_LEFT_MARGIN].nPos : GetMargin1(); } long SvxRuler::GetRightIndent() const { /* Get Right paragraph margin in Pixels */ - return mxParaItem.get() ? mpIndents[INDENT_RIGHT_MARGIN].nPos : GetMargin2(); + return mxParaItem ? mpIndents[INDENT_RIGHT_MARGIN].nPos : GetMargin2(); } long SvxRuler::GetLogicRightIndent() const { /* Get Right paragraph margin in Logic */ - return mxParaItem.get() ? GetRightFrameMargin() - mxParaItem->GetRight() : GetRightFrameMargin(); + return mxParaItem ? GetRightFrameMargin() - mxParaItem->GetRight() : GetRightFrameMargin(); } // Left margin in App values, is either the margin (= 0) or the left edge of @@ -1264,8 +1261,8 @@ long SvxRuler::GetLogicRightIndent() const long SvxRuler::GetLeftFrameMargin() const { // #126721# for some unknown reason the current column is set to 0xffff - DBG_ASSERT(!mxColumnItem.get() || mxColumnItem->GetActColumn() < mxColumnItem->Count(), - "issue #126721# - invalid current column!"); + DBG_ASSERT(!mxColumnItem || mxColumnItem->GetActColumn() < mxColumnItem->Count(), + "issue #126721# - invalid current column!"); long nLeft = 0; if (mxColumnItem.get() && mxColumnItem->Count() && @@ -1279,8 +1276,8 @@ long SvxRuler::GetLeftFrameMargin() const inline long SvxRuler::GetLeftMin() const { - DBG_ASSERT(mxMinMaxItem.get(), "no MinMax value set"); - if (mxMinMaxItem.get()) + DBG_ASSERT(mxMinMaxItem, "no MinMax value set"); + if (mxMinMaxItem) { if (bHorz) return mxMinMaxItem->GetValue().Left(); @@ -1292,8 +1289,8 @@ inline long SvxRuler::GetLeftMin() const inline long SvxRuler::GetRightMax() const { - DBG_ASSERT(mxMinMaxItem.get(), "no MinMax value set"); - if (mxMinMaxItem.get()) + DBG_ASSERT(mxMinMaxItem, "no MinMax value set"); + if (mxMinMaxItem) { if (bHorz) return mxMinMaxItem->GetValue().Right(); @@ -1307,7 +1304,7 @@ inline long SvxRuler::GetRightMax() const long SvxRuler::GetRightFrameMargin() const { /* Get right frame margin (in logical units) */ - if (mxColumnItem.get()) + if (mxColumnItem) { if (!IsActLastColumn(true)) { @@ -1402,23 +1399,23 @@ void SvxRuler::AdjustMargin1(long lInputDiff) { long lDiff = lDragPos; SetNullOffset(nOld + lDiff); - if (!mxColumnItem.get() || !(nDragType & SvxRulerDragFlags::OBJECT_SIZE_LINEAR)) + if (!mxColumnItem || !(nDragType & SvxRulerDragFlags::OBJECT_SIZE_LINEAR)) { SetMargin2( GetMargin2() - lDiff, nMarginStyle ); - if (!mxColumnItem.get() && !mxObjectItem.get() && mxParaItem.get()) + if (!mxColumnItem && !mxObjectItem && mxParaItem.get()) { // Right indent of the old position mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff; SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP); } - if(mxObjectItem.get()) + if (mxObjectItem) { mpObjectBorders[GetObjectBordersOff(0)].nPos -= lDiff; mpObjectBorders[GetObjectBordersOff(1)].nPos -= lDiff; SetBorders(2, &mpObjectBorders[0] + GetObjectBordersOff(0)); } - if(mxColumnItem.get()) + if (mxColumnItem) { for(sal_uInt16 i = 0; i < mxColumnItem->Count()-1; ++i) mpBorders[i].nPos -= lDiff; @@ -1426,7 +1423,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) if(mxColumnItem->IsFirstAct()) { // Right indent of the old position - if(mxParaItem.get()) + if (mxParaItem) { mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff; SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP); @@ -1434,7 +1431,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) } else { - if(mxParaItem.get()) + if (mxParaItem) { mpIndents[INDENT_FIRST_LINE].nPos -= lDiff; mpIndents[INDENT_LEFT_MARGIN].nPos -= lDiff; @@ -1456,9 +1453,12 @@ void SvxRuler::AdjustMargin1(long lInputDiff) long lDiff = lDragPos - nOld; SetMargin1(nOld + lDiff, nMarginStyle); - if (!mxColumnItem.get() || !(nDragType & (SvxRulerDragFlags::OBJECT_SIZE_LINEAR | SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL))) + if (!mxColumnItem + || !(nDragType + & (SvxRulerDragFlags::OBJECT_SIZE_LINEAR + | SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL))) { - if (!mxColumnItem.get() && !mxObjectItem.get() && mxParaItem.get()) + if (!mxColumnItem && !mxObjectItem && mxParaItem.get()) { // Left indent of the old position mpIndents[INDENT_FIRST_LINE].nPos += lDiff; @@ -1466,7 +1466,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP); } - if (mxColumnItem.get()) + if (mxColumnItem) { for(sal_uInt16 i = 0; i < mxColumnItem->Count() - 1; ++i) mpBorders[i].nPos += lDiff; @@ -1474,7 +1474,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) if (mxColumnItem->IsFirstAct()) { // Left indent of the old position - if(mxParaItem.get()) + if (mxParaItem) { mpIndents[INDENT_FIRST_LINE].nPos += lDiff; mpIndents[INDENT_LEFT_MARGIN].nPos += lDiff; @@ -1483,7 +1483,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) } else { - if(mxParaItem.get()) + if (mxParaItem) { mpIndents[INDENT_FIRST_LINE].nPos += lDiff; mpIndents[INDENT_LEFT_MARGIN].nPos += lDiff; @@ -1492,7 +1492,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff) } } } - if(mxTabStopItem.get()) + if (mxTabStopItem) { ModifyTabs_Impl(nTabCount + TAB_GAP, &mpTabs[0], lDiff); SetTabs(nTabCount, &mpTabs[0] + TAB_GAP); @@ -1529,7 +1529,7 @@ void SvxRuler::DragMargin2() SetMargin2( aDragPosition, nMarginStyle ); // Right indent of the old position - if((!mxColumnItem.get() || IsActLastColumn()) && mxParaItem.get()) + if ((!mxColumnItem || IsActLastColumn()) && mxParaItem.get()) { mpIndents[INDENT_FIRST_LINE].nPos += lDiff; SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP); @@ -1591,7 +1591,7 @@ void SvxRuler::DrawLine_Impl(long& lTabPosition, int nNew, bool bHorizontal) long nDrapPosition = GetCorrectedDragPos( ( nNew & 4 ) != 0, ( nNew & 2 ) != 0 ); nDrapPosition = MakePositionSticky(nDrapPosition, GetLeftFrameMargin()); lTabPosition = ConvertHSizeLogic( nDrapPosition + GetNullOffset() ); - if(mxPagePosItem.get()) + if (mxPagePosItem) lTabPosition += mxPagePosItem->GetPos().X(); pEditWin->InvertTracking( tools::Rectangle( Point(lTabPosition, -aZero.Y()), @@ -1616,7 +1616,7 @@ void SvxRuler::DrawLine_Impl(long& lTabPosition, int nNew, bool bHorizontal) long nDrapPosition = GetCorrectedDragPos(); nDrapPosition = MakePositionSticky(nDrapPosition, GetLeftFrameMargin()); lTabPosition = ConvertVSizeLogic(nDrapPosition + GetNullOffset()); - if(mxPagePosItem.get()) + if (mxPagePosItem) lTabPosition += mxPagePosItem->GetPos().Y(); pEditWin->InvertTracking( tools::Rectangle( Point(-aZero.X(), lTabPosition), @@ -2042,7 +2042,7 @@ void SvxRuler::ApplyMargins() } pBindings->GetDispatcher()->ExecuteList(nId, SfxCallMode::RECORD, { pItem }); - if(mxTabStopItem.get()) + if (mxTabStopItem) UpdateTabs(); } @@ -2309,7 +2309,7 @@ void SvxRuler::ApplyObject() /* Applying object settings, changed by dragging. */ // to the page margin - long nMargin = mxLRSpaceItem.get() ? mxLRSpaceItem->GetLeft() : 0; + long nMargin = mxLRSpaceItem ? mxLRSpaceItem->GetLeft() : 0; long nStartX = PixelAdjust( ConvertPosLogic(mpObjectBorders[0].nPos) + nMargin - @@ -2324,7 +2324,7 @@ void SvxRuler::ApplyObject() mxObjectItem->GetEndX()); mxObjectItem->SetEndX(nEndX); - nMargin = mxULSpaceItem.get() ? mxULSpaceItem->GetUpper() : 0; + nMargin = mxULSpaceItem ? mxULSpaceItem->GetUpper() : 0; long nStartY = PixelAdjust( ConvertPosLogic(mpObjectBorders[2].nPos) + nMargin - @@ -2356,7 +2356,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) case RulerType::Margin1: case RulerType::Border: { - DBG_ASSERT(mxColumnItem.get(), "no ColumnItem"); + DBG_ASSERT(mxColumnItem, "no ColumnItem"); mxRulerImpl->SetPercSize(mxColumnItem->Count()); @@ -2591,7 +2591,7 @@ void SvxRuler::CalcMinMax() mxRulerImpl->lMaxLeftLogic = GetLeftMin(); nMaxLeft=ConvertSizePixel(mxRulerImpl->lMaxLeftLogic); - if (!mxColumnItem.get() || mxColumnItem->Count() == 1 ) + if (!mxColumnItem || mxColumnItem->Count() == 1) { if(bRTL) { @@ -2675,14 +2675,11 @@ void SvxRuler::CalcMinMax() } case RulerType::Margin2: { // right edge of the surrounding Frame - mxRulerImpl->lMaxRightLogic = - mxMinMaxItem.get() ? - GetPageWidth() - GetRightMax() : - GetPageWidth(); + mxRulerImpl->lMaxRightLogic + = mxMinMaxItem ? GetPageWidth() - GetRightMax() : GetPageWidth(); nMaxRight = ConvertSizePixel(mxRulerImpl->lMaxRightLogic); - - if(!mxColumnItem.get()) + if (!mxColumnItem) { if(bRTL) { @@ -2792,7 +2789,7 @@ void SvxRuler::CalcMinMax() } case RulerDragSize::Move: { - if(mxColumnItem.get()) + if (mxColumnItem) { //nIdx contains the position of the currently moved item //next visible separator on the left @@ -3045,7 +3042,7 @@ void SvxRuler::CalcMinMax() { nMaxLeft = lNullPix; nMaxRight = lNullPix + std::min(GetFirstLineIndent(), GetLeftIndent()) - glMinFrame; - if(mxColumnItem.get()) + if (mxColumnItem) { sal_uInt16 nRightCol=GetActRightColumn( true ); if(!IsActLastColumn( true )) @@ -3064,7 +3061,7 @@ void SvxRuler::CalcMinMax() nMaxLeft = lNullPix + std::max(GetFirstLineIndent(), GetLeftIndent()); nMaxRight = lNullPix; - if(mxColumnItem.get()) + if (mxColumnItem) { sal_uInt16 nRightCol=GetActRightColumn( true ); if(!IsActLastColumn( true )) @@ -3126,7 +3123,7 @@ bool SvxRuler::StartDrag() case RulerType::Margin2: // right edge of the surrounding Frame if((bHorz && mxLRSpaceItem.get()) || (!bHorz && mxULSpaceItem.get())) { - if(!mxColumnItem.get()) + if (!mxColumnItem) EvalModifier(); else nDragType = SvxRulerDragFlags::OBJECT; @@ -3137,7 +3134,7 @@ bool SvxRuler::StartDrag() } break; case RulerType::Border: // Table, column (Modifier) - if(mxColumnItem.get()) + if (mxColumnItem) { nDragOffset = 0; if (!mxColumnItem->IsTable()) @@ -3200,9 +3197,9 @@ void SvxRuler::Drag() DragIndents(); break; case RulerType::Border: // Table, columns - if(mxColumnItem.get()) + if (mxColumnItem) DragBorders(); - else if(mxObjectItem.get()) + else if (mxObjectItem) DragObjectBorder(); break; case RulerType::Tab: // Tabs @@ -3233,7 +3230,7 @@ void SvxRuler::EndDrag() case RulerType::Margin1: // upper left edge of the surrounding Frame case RulerType::Margin2: // lower right edge of the surrounding Frame { - if(!mxColumnItem.get() || !mxColumnItem->IsTable()) + if (!mxColumnItem || !mxColumnItem->IsTable()) ApplyMargins(); if(mxColumnItem.get() && @@ -3247,13 +3244,13 @@ void SvxRuler::EndDrag() if(lInitialDragPos != lPos || (mxRulerImpl->bIsTableRows && bHorz)) //special case - the null offset is changed here { - if(mxColumnItem.get()) + if (mxColumnItem) { ApplyBorders(); if(bHorz) UpdateTabs(); } - else if(mxObjectItem.get()) + else if (mxObjectItem) ApplyObject(); } break; @@ -3555,7 +3552,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const if(nActCol == USHRT_MAX) { nRight = 0; - while(!(*mxColumnItem.get())[nRight].bVisible) + while (!(*mxColumnItem)[nRight].bVisible) { nRight++; } @@ -3593,7 +3590,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const sal_uInt16 nVisCols = 0; for(size_t i = GetActRightColumn(false, nCol); i < mpBorders.size();) { - if((*mxColumnItem.get())[i].bVisible) + if ((*mxColumnItem)[i].bVisible) nVisCols++; i = GetActRightColumn(false, i); } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index dc793ef7773d..b4ad25d981b7 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -770,7 +770,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe std::unique_ptr pItem; eState = pCurrentFrame->GetBindings().QueryState(SID_FM_CTL_PROPERTIES, pItem); - if (eState >= SfxItemState::DEFAULT && pItem.get() != nullptr ) + if (eState >= SfxItemState::DEFAULT && pItem != nullptr) { bool bChecked = dynamic_cast( pItem.get()) != nullptr && static_cast(pItem.get())->GetValue(); rMenu.CheckItem("column", bChecked); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ee8df28c5ec2..da44c4e55591 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1784,18 +1784,18 @@ OUString DbPatternField::GetFormatText(const Reference< css::sdb::XColumn >& _rx bool bIsForPaint = _rxField != m_rColumn.GetField(); ::std::unique_ptr< FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; - if ( !rpFormatter.get() ) + if (!rpFormatter) { rpFormatter = o3tl::make_unique< FormattedColumnValue> ( m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) ); - OSL_ENSURE( rpFormatter.get(), "DbPatternField::Init: no value formatter!" ); + OSL_ENSURE(rpFormatter, "DbPatternField::Init: no value formatter!"); } else OSL_ENSURE( rpFormatter->getColumn() == _rxField, "DbPatternField::GetFormatText: my value formatter is working for another field ...!" ); // re-creating the value formatter here every time would be quite expensive ... OUString sText; - if ( rpFormatter.get() ) + if (rpFormatter) sText = rpFormatter->getFormattedValue(); return impl_formatText( sText ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index aa953fa13616..7c2311948a8a 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1608,9 +1608,9 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _nLabelObjectID))); _pLabelPage->NbcInsertObject(pLabel.get()); - OSL_ENSURE( pLabel.get(), "FmXFormView::createControlLabelPair: could not create the label!" ); + OSL_ENSURE(pLabel, "FmXFormView::createControlLabelPair: could not create the label!"); - if ( !pLabel.get() ) + if (!pLabel) return false; xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY ); @@ -1641,9 +1641,9 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _nControlObjectID))); _pControlPage->NbcInsertObject(pControl.get()); - OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" ); + OSL_ENSURE(pControl, "FmXFormView::createControlLabelPair: could not create the control!"); - if ( !pControl.get() ) + if (!pControl) return false; Reference< XPropertySet > xControlSet( pControl->GetUnoControlModel(), UNO_QUERY ); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index a5e6fae5fe75..504158432591 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -2490,7 +2490,7 @@ void FormController::insertControl(const Reference< XControl > & xControl) m_aControls.realloc(m_aControls.getLength() + 1); m_aControls.getArray()[m_aControls.getLength() - 1] = xControl; - if ( m_pColumnInfoCache.get() ) + if (m_pColumnInfoCache) m_pColumnInfoCache->deinitializeControls(); implControlInserted( xControl, m_bAttachEvents ); @@ -3711,8 +3711,8 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent if ( !lcl_shouldValidateRequiredFields_nothrow( _rEvent.Source ) ) return true; - OSL_ENSURE( m_pColumnInfoCache.get(), "FormController::approveRowChange: no column infos!" ); - if ( !m_pColumnInfoCache.get() ) + OSL_ENSURE(m_pColumnInfoCache, "FormController::approveRowChange: no column infos!"); + if (!m_pColumnInfoCache) return true; try diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 1fe3b594ffcf..5b4f67d85020 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -611,7 +611,7 @@ void AreaPropertyPanelBase::ImpUpdateTransparencies() { bool bZeroValue(false); - if(mpTransparanceItem.get()) + if (mpTransparanceItem) { const sal_uInt16 nValue(mpTransparanceItem->GetValue()); @@ -1258,7 +1258,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) { if (!mxTrGrPopup) mxTrGrPopup = VclPtr::Create(*this); - if (mpFloatTransparenceItem.get()) + if (mpFloatTransparenceItem) mxTrGrPopup->Rearrange(mpFloatTransparenceItem.get()); OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT); mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 473953f6ed20..10dad0365a1d 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -785,7 +785,7 @@ void LinePropertyPanelBase::FillLineStyleList() void LinePropertyPanelBase::SelectLineStyle() { - if( !mpStyleItem.get() || !mpDashItem.get() ) + if (!mpStyleItem || !mpDashItem) { mpLBStyle->SetNoSelection(); mpLBStyle->Disable(); @@ -833,7 +833,7 @@ void LinePropertyPanelBase::SelectEndStyle(bool bStart) if(bStart) { - if( !mpStartItem.get() ) + if (!mpStartItem) { mpLBStart->SetNoSelection(); mpLBStart->Disable(); @@ -862,7 +862,7 @@ void LinePropertyPanelBase::SelectEndStyle(bool bStart) } else { - if( !mpEndItem.get() ) + if (!mpEndItem) { mpLBEnd->SetNoSelection(); mpLBEnd->Disable(); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 87e93a1914c1..175abd23252a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -278,7 +278,7 @@ const GraphicObject& SdrGrafObj::GetGraphicObject(bool bForceSwapIn) const { if (bForceSwapIn) ForceSwapIn(); - return *mpGraphicObject.get(); + return *mpGraphicObject; } const GraphicObject* SdrGrafObj::GetReplacementGraphicObject() const diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index fe440edf4649..c56b06d6c954 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -688,12 +688,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) #endif } - -bool SdrObjList::HasObjectNavigationOrder() const -{ - return mxNavigationOrder.get() != nullptr; -} - +bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder != nullptr; } void SdrObjList::SetObjectNavigationPosition ( SdrObject& rObject, @@ -702,7 +697,7 @@ void SdrObjList::SetObjectNavigationPosition ( // When the navigation order container has not yet been created then // create one now. It is initialized with the z-order taken from // maList. - if (mxNavigationOrder.get() == nullptr) + if (mxNavigationOrder == nullptr) { mxNavigationOrder.reset(new WeakSdrObjectContainerType(maList.size())); ::std::copy( @@ -710,7 +705,7 @@ void SdrObjList::SetObjectNavigationPosition ( maList.end(), mxNavigationOrder->begin()); } - OSL_ASSERT(mxNavigationOrder.get()!=nullptr); + OSL_ASSERT(mxNavigationOrder != nullptr); OSL_ASSERT( mxNavigationOrder->size() == maList.size()); tools::WeakReference aReference (&rObject); @@ -787,7 +782,7 @@ bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) { - if (mxNavigationOrder.get() != nullptr) + if (mxNavigationOrder != nullptr) { mbIsNavigationOrderDirty = false; @@ -799,7 +794,7 @@ bool SdrObjList::RecalcNavigationPositions() } } - return mxNavigationOrder.get() != nullptr; + return mxNavigationOrder != nullptr; } @@ -811,7 +806,7 @@ void SdrObjList::SetNavigationOrder (const uno::Reference(nCount) != maList.size()) return; - if (mxNavigationOrder.get() == nullptr) + if (mxNavigationOrder == nullptr) mxNavigationOrder.reset(new WeakSdrObjectContainerType(nCount)); for (sal_Int32 nIndex=0; nIndex aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) ); - if( aHint.get() ) - Broadcast( *aHint.get() ); + if (aHint) + Broadcast(*aHint); } } -- cgit