diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/scrbar.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/x11/x11sys.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 52dd5890d67d..2769e905423b 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1059,7 +1059,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo // Space for selection change if( !bShift && ( ( eLET == LET_KEYSPACE ) || ( eLET == LET_MBDOWN ) ) ) { - bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? true : !mpEntryList->IsEntryPosSelected( nSelect ); + bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) || !mpEntryList->IsEntryPosSelected( nSelect ); if ( mbStackMode ) { sal_Int32 n; diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 32d977702fde..dc7213001e28 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -486,7 +486,7 @@ bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) if( !bNativeOK ) return false; - bool bHorz = (GetStyle() & WB_HORZ ? true : false); + bool bHorz = (GetStyle() & WB_HORZ) ? true : false; // Draw the entire background if the control supports it if( IsNativeControlSupported(CTRL_SCROLLBAR, bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT) ) @@ -802,7 +802,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) { sal_uInt16 nOldStateFlags = mnStateFlags; bool bAction = false; - bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; + bool bHorizontal = ( GetStyle() & WB_HORZ ) ? true: false; bool bIsInside = false; Point aPoint( 0, 0 ); @@ -912,7 +912,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) { const Point& rMousePos = rMEvt.GetPosPixel(); sal_uInt16 nTrackFlags = 0; - bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; + bool bHorizontal = ( GetStyle() & WB_HORZ ) ? true: false; bool bIsInside = false; bool bDragToMouse = false; @@ -1247,7 +1247,7 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt ) Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt ) { - bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; + bool bHorizontal = ( GetStyle() & WB_HORZ ) ? true: false; bool bIsInside = false; Point aPoint( 0, 0 ); diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index add2b60384b8..9749cfc74e4e 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -52,7 +52,7 @@ bool X11SalSystem::IsUnifiedDisplay() { SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay(); unsigned int nScreenCount = pSalDisp->GetXScreenCount(); - return pSalDisp->IsXinerama() ? true : (nScreenCount == 1); + return pSalDisp->IsXinerama() || (nScreenCount == 1); } unsigned int X11SalSystem::GetDisplayBuiltInScreen() |