diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/print2.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/stacking.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index da01c318a9b6..bc7a2c9965cd 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -1061,11 +1061,9 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, DBG_ASSERT( !aTotalComponents.aComponentList.empty(), "Printer::GetPreparedMetaFile empty component" ); - DBG_ASSERT( !aTotalComponents.aBounds.IsEmpty() || - (aTotalComponents.aBounds.IsEmpty() && aTotalComponents.aComponentList.size() == 1), + DBG_ASSERT( !aTotalComponents.aBounds.IsEmpty() || (aTotalComponents.aComponentList.size() == 1), "Printer::GetPreparedMetaFile non-output generating actions must be solitary"); - DBG_ASSERT( !aTotalComponents.bIsFullyTransparent || - (aTotalComponents.bIsFullyTransparent && aTotalComponents.aComponentList.size() == 1), + DBG_ASSERT( !aTotalComponents.bIsFullyTransparent || (aTotalComponents.aComponentList.size() == 1), "Printer::GetPreparedMetaFile fully transparent actions must be solitary"); } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 7d01ba35778a..6d8c6d07784a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -966,7 +966,7 @@ void Dialog::EndAllDialogs( vcl::Window* pParent ) while ( pModDialog ) { pTempModDialog = pModDialog->mpPrevExecuteDlg; - if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) ) + if(!pParent || pParent->IsWindowOrChild(pModDialog,true)) { pModDialog->EndDialog( RET_CANCEL ); pModDialog->PostUserEvent( Link<>() ); diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 0059b5577baa..8f2e7bbea7d0 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -636,7 +636,7 @@ bool Window::IsTopWindow() const return false; // topwindows must be frames or they must have a borderwindow which is a frame - if( !mpWindowImpl->mbFrame && (!mpWindowImpl->mpBorderWindow || (mpWindowImpl->mpBorderWindow && !mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) ) + if( !mpWindowImpl->mbFrame && (!mpWindowImpl->mpBorderWindow || !mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame ) ) return false; ImplGetWinData(); diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 6ecfeaab65d5..c8bd5b064e84 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -567,7 +567,7 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItem else { // By default, all checked items are checkmark buttons. - if ( bCheck || ( !bCheck && pCurrentState != NULL ) ) + if (bCheck || pCurrentState != NULL) pCheckValue = g_variant_new_boolean( bCheck ); } |