diff options
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/floatwin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/status.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 0df373e02a10..12654bf6c0db 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -187,7 +187,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void) !(aState.mnState & KEY_MOD1) && // i43499 CTRL disables docking now bRealMove ) { - maDockPos = Point( pDockingArea->OutputToScreenPixel( pDockingArea->AbsoluteScreenToOutputPixel( OutputToAbsoluteScreenPixel( Point() ) ) ) ); + maDockPos = pDockingArea->OutputToScreenPixel( pDockingArea->AbsoluteScreenToOutputPixel( OutputToAbsoluteScreenPixel( Point() ) ) ); maDockRect = tools::Rectangle( maDockPos, mpDockWin->GetSizePixel() ); // mouse pos in screen pixels @@ -726,7 +726,7 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) // mouse pos in screen pixels Point aMousePos = pDockingArea->OutputToScreenPixel( aState.maPos ); - Point aDockPos = Point( pDockingArea->AbsoluteScreenToOutputPixel( GetWindow()->OutputToAbsoluteScreenPixel( GetWindow()->GetPosPixel() ) ) ); + Point aDockPos = pDockingArea->AbsoluteScreenToOutputPixel( GetWindow()->OutputToAbsoluteScreenPixel( GetWindow()->GetPosPixel() ) ); tools::Rectangle aDockRect( aDockPos, GetWindow()->GetSizePixel() ); StartDocking( aMousePos, aDockRect ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index a6e828fe2d3c..4c2dda5b79e5 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -154,7 +154,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl, void*, void) ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && !(aState.mnState & KEY_MOD1) ) // i43499 CTRL disables docking now { - maDockPos = Point( mpDockWin->GetParent()->AbsoluteScreenToOutputPixel( OutputToAbsoluteScreenPixel( Point() ) ) ); + maDockPos = mpDockWin->GetParent()->AbsoluteScreenToOutputPixel( OutputToAbsoluteScreenPixel( Point() ) ); maDockPos = mpDockWin->GetParent()->OutputToScreenPixel( maDockPos ); // sfx expects screen coordinates if( ! mpDockWin->IsDocking() ) @@ -591,7 +591,7 @@ void DockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) if ( !IsDockingCanceled() ) { bool bShow = false; - if ( bool(bFloatMode) != IsFloatingMode() ) + if ( bFloatMode != IsFloatingMode() ) { Show( false, ShowFlags::NoFocusChange ); SetFloatingMode( bFloatMode ); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 71de988dfed7..ddca40f52d5c 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -453,8 +453,8 @@ Point FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, const Point& aAbsolute = aRect.TopLeft(); } else - aAbsolute = Point( pReference->OutputToAbsoluteScreenPixel( - pReference->ScreenToOutputPixel(rPos) ) ); + aAbsolute = pReference->OutputToAbsoluteScreenPixel( + pReference->ScreenToOutputPixel(rPos) ); return aAbsolute; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 9dea04a8e4ed..6aef0dbafd69 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -301,7 +301,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() SetMapMode( MapUnit::MapPixel ); maPageVDev->SetMapMode( MapUnit::MapPixel ); - maPreviewBitmap = Bitmap(maPageVDev->GetBitmap(Point(0, 0), aVDevSize)); + maPreviewBitmap = maPageVDev->GetBitmap(Point(0, 0), aVDevSize); maPageVDev->SetDrawMode( nOldDrawMode ); } diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index e4ee8a3dc648..c4643dabbad8 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -452,7 +452,7 @@ void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, cons long nFullWidth = (nPrgsWidth + nOffset) * (10000 / nPercentCount); long nPerc = (nPercent2 > 10000) ? 10000 : nPercent2; - ImplControlValue aValue(nFullWidth * long(nPerc) / 10000); + ImplControlValue aValue(nFullWidth * nPerc / 10000); tools::Rectangle aDrawRect(rPos, Size(nFullWidth, nPrgsHeight)); tools::Rectangle aControlRegion(aDrawRect); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b08cf4ca5261..7b0b4af23a65 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4347,7 +4347,7 @@ void ToolBox::EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) if ( meAlign != meDockAlign ) SetAlign( meDockAlign ); } - if ( bFloatMode || (bool(bFloatMode) != ImplIsFloatingMode()) ) + if ( bFloatMode || (bFloatMode != ImplIsFloatingMode()) ) DockingWindow::EndDocking( rRect, bFloatMode ); } |