diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/imapwnd.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/pagectrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 14 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 | ||||
| -rw-r--r-- | svx/source/table/tablertfimporter.cxx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 33eb60a9dd37..7bf8383ab8f6 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -869,7 +869,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) static sal_uInt32 nLevel = 0; if ( nIndex < static_cast<sal_Int32>(vNodesSharedPtr.size()) ) { - if ( vNodesSharedPtr[ nIndex ].get() ) { + if ( vNodesSharedPtr[ nIndex ] ) { nLevel ++; try { diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index bd95ca8237f3..2caa529e12bc 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -363,7 +363,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) IMapObjectPtr pIMapObj = pUserData->GetObject(); bool bActive = true; - if ( pIMapObj.get() ) + if ( pIMapObj ) { aURL = pIMapObj->GetURL(); aAltText = pIMapObj->GetAltText(); diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 6b9259c19328..f7eae17dbca1 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -337,7 +337,7 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, drawinglayer::primitive2d::Primitive2DContainer aSequence; // create fill geometry if there is something to fill - if (rFillAttributes.get() && rFillAttributes->isUsed()) + if (rFillAttributes && rFillAttributes->isUsed()) { aSequence = rFillAttributes->getPrimitive2DSequence(aPaintRange, aDefineRange); } diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index 039311e9739e..57945facb4bb 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -45,8 +45,8 @@ namespace drawinglayer::attribute basegfx::utils::createPolygonFromRect( maLastPaintRange)), maLastDefineRange, - maFillAttribute.get() ? *maFillAttribute : drawinglayer::attribute::SdrFillAttribute(), - maFillGradientAttribute.get() ? *maFillGradientAttribute : drawinglayer::attribute::FillGradientAttribute()); + maFillAttribute ? *maFillAttribute : drawinglayer::attribute::SdrFillAttribute(), + maFillGradientAttribute ? *maFillGradientAttribute : drawinglayer::attribute::FillGradientAttribute()); } } @@ -86,7 +86,7 @@ namespace drawinglayer::attribute bool SdrAllFillAttributesHelper::isUsed() const { // only depends on fill, FillGradientAttribute alone defines no fill - return maFillAttribute.get() && !maFillAttribute->isDefault(); + return maFillAttribute && !maFillAttribute->isDefault(); } bool SdrAllFillAttributesHelper::isTransparent() const @@ -96,7 +96,7 @@ namespace drawinglayer::attribute return true; } - if(maFillGradientAttribute.get() && !maFillGradientAttribute->isDefault()) + if(maFillGradientAttribute && !maFillGradientAttribute->isDefault()) { return true; } @@ -113,7 +113,7 @@ namespace drawinglayer::attribute const drawinglayer::attribute::SdrFillAttribute& SdrAllFillAttributesHelper::getFillAttribute() const { - if(!maFillAttribute.get()) + if(!maFillAttribute) { const_cast< SdrAllFillAttributesHelper* >(this)->maFillAttribute = std::make_shared<drawinglayer::attribute::SdrFillAttribute>(); @@ -124,7 +124,7 @@ namespace drawinglayer::attribute const drawinglayer::attribute::FillGradientAttribute& SdrAllFillAttributesHelper::getFillGradientAttribute() const { - if(!maFillGradientAttribute.get()) + if(!maFillGradientAttribute) { const_cast< SdrAllFillAttributesHelper* >(this)->maFillGradientAttribute = std::make_shared<drawinglayer::attribute::FillGradientAttribute>(); @@ -154,7 +154,7 @@ namespace drawinglayer::attribute { basegfx::BColor aRetval(rFallback); - if(maFillAttribute.get() && !maFillAttribute->isDefault()) + if(maFillAttribute && !maFillAttribute->isDefault()) { const drawinglayer::attribute::FillGradientAttribute& rFillGradientAttribute = maFillAttribute->getGradient(); const drawinglayer::attribute::FillHatchAttribute& rFillHatchAttribute = maFillAttribute->getHatch(); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 3f836d4123cd..be60f5697ca1 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -838,7 +838,7 @@ bool SdrGrafObj::HasGDIMetaFile() const bool SdrGrafObj::isEmbeddedVectorGraphicData() const { - return GraphicType::Bitmap == GetGraphicType() && GetGraphic().getVectorGraphicData().get(); + return GraphicType::Bitmap == GetGraphicType() && GetGraphic().getVectorGraphicData(); } GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedVectorGraphicData() const diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index f8484a81c2e6..fb3af5dd82ed 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -307,7 +307,7 @@ void SdrTableRTFParser::FillTable() RTFCellInfoPtr xCellInfo( (*xColumn)[nIdx] ); CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) ); - if( xCell.is() && xCellInfo.get() ) + if( xCell.is() && xCellInfo ) { const SfxPoolItem *pPoolItem = nullptr; if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET) |