diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 8392c0e7f5d1..ea8b5dc326c8 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -681,7 +681,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) if(rKEvt.GetKeyCode().IsMod2()) { OutputDevice* pOut = mrView.GetViewShell()->GetActiveWindow(); - Size aLogicSizeOnePixel = (pOut) ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100); + Size aLogicSizeOnePixel = pOut ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100); nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); } diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 68d2f165c147..e7e5c1a2cba3 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -396,7 +396,7 @@ bool AnnotationTag::OnMove( const KeyEvent& rKEvt ) if(rKEvt.GetKeyCode().IsMod2()) { OutputDevice* pOut = mrView.GetViewShell()->GetActiveWindow(); - Size aLogicSizeOnePixel = (pOut) ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100); + Size aLogicSizeOnePixel = pOut ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100); nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3dbd3503b13a..99dca2efed88 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -455,7 +455,7 @@ OUString ViewShellBase::GetSelectionText(bool bCompleteWords) std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell()); DrawViewShell *const pDrawViewShell( dynamic_cast<DrawViewShell*>(pMainShell.get())); - return (pDrawViewShell) + return pDrawViewShell ? pDrawViewShell->GetSelectionText(bCompleteWords) : SfxViewShell::GetSelectionText(bCompleteWords); } @@ -465,7 +465,7 @@ bool ViewShellBase::HasSelection(bool bText) const std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell()); DrawViewShell *const pDrawViewShell( dynamic_cast<DrawViewShell*>(pMainShell.get())); - return (pDrawViewShell) + return pDrawViewShell ? pDrawViewShell->HasSelection(bText) : SfxViewShell::HasSelection(bText); } |