diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2011-03-09 19:20:12 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-06 11:58:13 +0000 |
commit | 1865174e30d23f3eb85b7600cb33f29b8d4557d4 (patch) | |
tree | f978fdb5a8514f35dde7b8eb98235577bd891406 | |
parent | 2a755f3af94d8bb0184d1045ac46f0f1f5bcf46d (diff) |
impress211: fix a rebase problem
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index bad030035a0a..2f4a978db642 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -810,7 +810,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, else { Rectangle aCombined; - Reference< XPropertySet > xMonitor( xMultiMon->getByIndex( 0 ), UNO_QUERY_THROW ); + uno::Reference< XPropertySet > xMonitor( xMultiMon->getByIndex( 0 ), UNO_QUERY_THROW ); com::sun::star::awt::Rectangle aRect; if( xMonitor->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ScreenArea" ) ) ) >>= aRect ) { @@ -820,7 +820,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, aCombined.Bottom() = aRect.Y + aRect.Height; for( sal_Int32 i = 1 ; i < nMonitors ; i++ ) { - xMonitor = Reference< XPropertySet >( xMultiMon->getByIndex(i), UNO_QUERY_THROW ); + xMonitor = uno::Reference< XPropertySet >( xMultiMon->getByIndex(i), UNO_QUERY_THROW ); if( xMonitor->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ScreenArea" ) ) ) >>= aRect ) { aCombined.Union( Rectangle( aRect.X, aRect.Y, aRect.X+aRect.Width, aRect.Y+aRect.Height ) ); |