? dbgsv.ini ? wntmsci11 ? util/defs/wntmsci10_bak ? util/defs/wntmsci11_bak Index: source/controls/dialogcontrol.cxx =================================================================== RCS file: /cvs/gsl/toolkit/source/controls/dialogcontrol.cxx,v retrieving revision 1.23.12.3 diff -u -u -r1.23.12.3 dialogcontrol.cxx --- source/controls/dialogcontrol.cxx 4 Feb 2008 13:04:45 -0000 1.23.12.3 +++ source/controls/dialogcontrol.cxx 3 Mar 2008 06:51:25 -0000 @@ -1802,9 +1802,19 @@ if ( pOutDev && !mbSizeModified ) { // Currentley we are simply using MAP_APPFONT - Any aAny; - ::Size aTmp( e.Width, e.Height ); - aTmp = ImplMapPixelToAppFont( pOutDev, aTmp ); + ::Size aAppFontSize( e.Width, e.Height ); + + Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW ); + Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), UNO_QUERY ); + OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" ); + if ( xDialogDevice.is() ) + { + DeviceInfo aDeviceInfo( xDialogDevice->getInfo() ); + aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset; + aAppFontSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset; + } + + aAppFontSize = ImplMapPixelToAppFont( pOutDev, aAppFontSize ); // Remember that changes have been done by listener. No need to // update the position because of property change event. @@ -1814,8 +1824,8 @@ // Properties in a sequence must be sorted! aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" )); aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" )); - aValues[0] <<= aTmp.Height(); - aValues[1] <<= aTmp.Width(); + aValues[0] <<= aAppFontSize.Height(); + aValues[1] <<= aAppFontSize.Width(); ImplSetPropertyValues( aProps, aValues, true ); mbSizeModified = false;