diff options
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index f6358f3629c2..2883be985b46 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -148,7 +148,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) sal_Int32 nWhatPage = static_cast<sal_Int32>(pWhatPage->GetValue ()); PageKind nWhatKind = static_cast<PageKind>(pWhatKind->GetValue ()); - if (! (nWhatKind >= PageKind::Standard && nWhatKind <= PageKind::Handout)) + if (nWhatKind < PageKind::Standard || nWhatKind > PageKind::Handout) { #if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 772cf4a48ddb..372cb555ebdf 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -141,7 +141,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } // If it is not a group object, we disable "ungroup" - if(!(dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default)) + if(dynamic_cast< const SdrObjGroup *>( pObj ) == nullptr || nInv != SdrInventor::Default) { rSet.DisableItem(SID_UNGROUP); } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 12470903d5a3..28e163e5bebc 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -180,7 +180,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected { const bool bDoCreateGeometry(pObject->getSdrPageFromSdrObject()->checkVisibility( rOriginal, rDisplayInfo, true )); - if(!bDoCreateGeometry && !(( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_PAGE )) ) + if(!bDoCreateGeometry && + (( pObject->GetObjInventor() != SdrInventor::Default ) || ( pObject->GetObjIdentifier() != OBJ_PAGE )) ) return xRetval; PresObjKind eKind(PresObjKind::NONE); |