summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-12-13 08:25:16 +0200
committerNoel Grandin <noel@peralex.com>2012-12-13 08:31:52 +0200
commit6b5059c7b7129c3b9f00d784b6fa5248a24a6d4b (patch)
treecceed7bf4c92f37ad4133b0a820ecaedfd136322
parent8a4db529db50dca5df7b56f770fce2da7725fdda (diff)
fix my UNO changes for MS-Windows build
Change-Id: I137eada05aa74ab8f0a524f17f519e11c27fceb5
-rw-r--r--vcl/win/source/window/salframe.cxx20
1 files changed, 7 insertions, 13 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index b673c463f59b..a23ed43e7290 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -786,24 +786,18 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame,
sal_Int32 nMonitors = Application::GetScreenCount();
if( (pFrame->mnDisplay >= 0) && (pFrame->mnDisplay < nMonitors) )
{
- com::sun::star::awt::Rectangle aRect = Application::GetScreenPosSizePixel( pFrame->mnDisplay );
- nScreenX = aRect.X;
- nScreenY = aRect.Y;
- nScreenDX = aRect.Width+1; // difference between java/awt convention and vcl
- nScreenDY = aRect.Height+1; // difference between java/awt convention and vcl
+ Rectangle aRect = Application::GetScreenPosSizePixel( pFrame->mnDisplay );
+ nScreenX = aRect.Left();
+ nScreenY = aRect.Top();
+ nScreenDX = aRect.GetWidth()+1; // difference between java/awt convention and vcl
+ nScreenDY = aRect.GetHeight()+1; // difference between java/awt convention and vcl
}
else
{
- Rectangle aCombined;
- com::sun::star::awt::Rectangle aRect = Application::GetScreenPosSizePixel( 0 );
- aCombined.Left() = aRect.X;
- aCombined.Top() = aRect.Y;
- aCombined.Right() = aRect.X + aRect.Width;
- aCombined.Bottom() = aRect.Y + aRect.Height;
+ Rectangle aCombined = Application::GetScreenPosSizePixel( 0 );
for( sal_Int32 i = 1 ; i < nMonitors ; i++ )
{
- aRect = Application::GetScreenPosSizePixel( i );
- aCombined.Union( Rectangle( aRect.X, aRect.Y, aRect.X+aRect.Width, aRect.Y+aRect.Height ) );
+ aCombined.Union( Application::GetScreenPosSizePixel( i ) );
}
nScreenX = aCombined.Left();
nScreenY = aCombined.Top();