diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-06 10:12:29 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 12:23:42 +0100 |
| commit | 065edb4c8e91170017df482843d0c3eb8d4db114 (patch) | |
| tree | 1d030ec9868a56b375a563c9d6e6d81c6115d717 /svx/source/unodraw | |
| parent | 0b34a5dd39e177ba99cd21b639d67ac8123b8458 (diff) | |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643
Reviewed-on: https://gerrit.libreoffice.org/63235
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 2d5871e00c1f..571a1d74ffb5 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -126,9 +126,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape if( dynamic_cast<const E3dObject* >(pSdrShape) != nullptr ) { GetSdrObject()->GetSubList()->NbcInsertObject( pSdrShape ); - - if(pShape) - pShape->Create( pSdrShape, mxPage.get() ); + pShape->Create(pSdrShape, mxPage.get()); } else { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 4dffab0d5906..287d2bd18b42 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -206,12 +206,9 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText mpText = pTextObj->getText( 0 ); } - if( mpModel ) - StartListening( *mpModel ); - if( mpView ) - StartListening( *mpView ); - if( mpObject ) - mpObject->AddObjectUser( *this ); + StartListening( *mpModel ); + StartListening( *mpView ); + mpObject->AddObjectUser( *this ); // Init edit mode state from shape info (IsTextEditActive()) mbShapeIsEditMode = IsEditMode(); |