diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-21 15:04:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-22 12:43:56 +0200 |
| commit | 78490b45c771a4c9632b324922f2c8e83f06153b (patch) | |
| tree | 0e74de3a28bce5a7300f39aa36378d35eedc0afe /cui | |
| parent | 5c147fc5fe0e77838b8e9bebd4ff215a80946980 (diff) | |
pvs-studio: V668 no sense testing against null as memory was allocated by new
category V668 complete
Change-Id: I986d4cb89a7c72d54d71ea01fc598a9958deee24
Reviewed-on: https://gerrit.libreoffice.org/62138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index e2a80c4d9473..d7af780b41aa 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -295,13 +295,10 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) std::unique_ptr<GraphicObject> pGraphicObject; pGraphicObject.reset( new GraphicObject(aItem.GetGraphicObject()) ); - if(pGraphicObject) - { - BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx()); - Size aTempBitmapSize = aBmpEx.GetSizePixel(); - rBitmapSize = PixelToLogic( aTempBitmapSize, MapMode(MapUnit::Map100thMM)); - CalculateBitmapPresetSize(); - } + BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx()); + Size aTempBitmapSize = aBmpEx.GetSizePixel(); + rBitmapSize = PixelToLogic( aTempBitmapSize, MapMode(MapUnit::Map100thMM)); + CalculateBitmapPresetSize(); bool bTiled = false; bool bStretched = false; if(rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SfxItemState::DONTCARE) |