diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-25 10:34:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-26 12:15:53 +0200 |
| commit | 93bf0b1ba11c7710f80a7773eaf0b5ca816d82a7 (patch) | |
| tree | 13245a24edfa1aab9bc52c2f1f4ef44ae448a2c8 /svx/source/svdraw/svdoole2.cxx | |
| parent | ca865af23656f52008713709b3efee0e151d0303 (diff) | |
clang-tidy readability-simplify-boolean-expr in svx
Change-Id: I5190e453edd9fc2eda57f730834567e8e214ff16
Reviewed-on: https://gerrit.libreoffice.org/36931
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 1c3d959ac688..149b81c88567 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -667,18 +667,11 @@ static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObj return false; SvGlobalName aClassName( rObjRef->getClassID() ); - if( aClassName == SvGlobalName(SO3_SM_CLASSID_30) || + return aClassName == SvGlobalName(SO3_SM_CLASSID_30) || aClassName == SvGlobalName(SO3_SM_CLASSID_40) || aClassName == SvGlobalName(SO3_SM_CLASSID_50) || aClassName == SvGlobalName(SO3_SM_CLASSID_60) || - aClassName == SvGlobalName(SO3_SM_CLASSID) ) - { - return true; - } - else - { - return false; - } + aClassName == SvGlobalName(SO3_SM_CLASSID); } // BaseProperties section @@ -2010,18 +2003,13 @@ bool SdrOle2Obj::IsCalc() const return false; SvGlobalName aObjClsId( mpImpl->mxObjRef->getClassID() ); - if( SvGlobalName(SO3_SC_CLASSID_30) == aObjClsId + return SvGlobalName(SO3_SC_CLASSID_30) == aObjClsId || SvGlobalName(SO3_SC_CLASSID_40) == aObjClsId || SvGlobalName(SO3_SC_CLASSID_50) == aObjClsId || SvGlobalName(SO3_SC_CLASSID_60) == aObjClsId || SvGlobalName(SO3_SC_OLE_EMBED_CLASSID_60) == aObjClsId || SvGlobalName(SO3_SC_OLE_EMBED_CLASSID_8) == aObjClsId - || SvGlobalName(SO3_SC_CLASSID) == aObjClsId ) - { - return true; - } - - return false; + || SvGlobalName(SO3_SC_CLASSID) == aObjClsId; } uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const |