diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuscale.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2927fb9428bd..605cdf984ff4 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1529,7 +1529,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper sal_Int32 nGroupId = pEffect->getGroupId(); CustomAnimationTextGroupPtr pTextGroup; - if( (nGroupId != -1) ) + if( nGroupId != -1 ) { // use existing group pTextGroup = pEffectSequence->findGroup( nGroupId ); diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 7235a5c37ce7..97900dc99dd8 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -92,8 +92,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) if( dynamic_cast< DrawViewShell *>( mpViewShell ) != nullptr ) { SdrPageView* pPageView = mpView->GetSdrPageView(); - if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) ) - // || ( mpView->GetMarkedObjectList().GetMarkCount() == 0 ) ) + if( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) { nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; } diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index b50642259255..f3df9d260562 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1148,7 +1148,7 @@ void FuSelection::SelectionHasChanged() FuDraw::SelectionHasChanged(); - if ((mpView->Is3DRotationCreationActive() && !bSuppressChangesOfSelection)) + if (mpView->Is3DRotationCreationActive() && !bSuppressChangesOfSelection) { // Switch rotation body -> selection mpView->ResetCreationActive(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 6b9e55097f54..e1add507af43 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -350,10 +350,10 @@ sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< s { if( rIdentifier.getLength() == 16 ) { - if( (0 == memcmp( SdXImpressDocument::getUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 )) ) + if( 0 == memcmp( SdXImpressDocument::getUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); - if( (0 == memcmp( SdrModel::getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 )) ) + if( 0 == memcmp( SdrModel::getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(mpDoc)); } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 73dd7228ab6e..80cd59e7107d 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -546,8 +546,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); - if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) ) - // || ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 0 ) ) + if( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) { nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; } diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 54b3628826cc..70fc761fdd0e 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1482,7 +1482,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, if( pMarkedObj ) try { // change first marked object - if( (SdrInventor::FmForm == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) + if( SdrInventor::FmForm == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON ) { bNewObj = false; diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index fc1f80294393..c6a82ef919b2 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -115,7 +115,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) if(pSdrOle2Obj) { if (pSdrOle2Obj->GetObjRef().is() && - ((pSdrOle2Obj->GetObjRef()->getStatus( pSdrOle2Obj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE) ) ) + (pSdrOle2Obj->GetObjRef()->getStatus( pSdrOle2Obj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE) ) rSet.DisableItem(SID_ORIGINAL_SIZE); } |