diff options
Diffstat (limited to 'framework/source/helper')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 7 | ||||
| -rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 15 |
2 files changed, 5 insertions, 17 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 30e3290cdbd2..60810826c941 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -211,12 +211,9 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is necessary to guarantee correct pointer cast! - if ( - (pWindow ) && - (pWindow->IsSystemWindow()) - ) + if ( pWindow && pWindow->IsSystemWindow() ) { - WindowStateMask const nMask = WindowStateMask::All & ~(WindowStateMask::Minimized); + WindowStateMask const nMask = WindowStateMask::All & ~WindowStateMask::Minimized; sWindowState = OStringToOUString( static_cast<SystemWindow*>(pWindow.get())->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index ea8120050863..c6d916a60f19 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -164,10 +164,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr SolarMutexGuard aSolarGuard; VclPtr<vcl::Window> pWindow = (VCLUnoHelper::GetWindow( xWindow )); - if ( - ( pWindow ) && - ( pWindow->GetType() == WindowType::WORKWINDOW ) - ) + if ( pWindow && pWindow->GetType() == WindowType::WORKWINDOW ) { WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow.get()); pWorkWindow->SetApplicationID( sApplicationID ); @@ -281,10 +278,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra SolarMutexGuard aSolarGuard; VclPtr<vcl::Window> pWindow = (VCLUnoHelper::GetWindow( xWindow )); - if ( - ( pWindow ) && - ( pWindow->GetType() == WindowType::WORKWINDOW ) - ) + if ( pWindow && ( pWindow->GetType() == WindowType::WORKWINDOW ) ) { WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow.get()); pWorkWindow->SetIcon( (sal_uInt16)nIcon ); @@ -315,10 +309,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr SolarMutexGuard aSolarGuard; VclPtr<vcl::Window> pWindow = (VCLUnoHelper::GetWindow( xWindow )); - if ( - ( pWindow ) && - ( pWindow->GetType() == WindowType::WORKWINDOW ) - ) + if ( pWindow && ( pWindow->GetType() == WindowType::WORKWINDOW ) ) { WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow.get()); pWorkWindow->SetText( sTitle ); |