Attachment #51857 for issue #84487

View | Details | Raw Unified | Return to issue 84487
Collapse All | Expand All




	if ( pOutDev && !mbSizeModified )
	{
        // Currentley we are simply using MAP_APPFONT
		::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.

        // 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] <<= aAppFontSize.Height();
        aValues[1] <<= aAppFontSize.Width();

	    ImplSetPropertyValues( aProps, aValues, true );
        mbSizeModified = false;

Return to issue 84487

Lines 1802-1810 Link Here

(-)source/controls/dialogcontrol.cxx (-5 / +15 lines)
1802	if ( pOutDev && !mbSizeModified )	1802	if ( pOutDev && !mbSizeModified )
1803	{	1803	{
1804	// Currentley we are simply using MAP_APPFONT	1804	// Currentley we are simply using MAP_APPFONT
1805	Any aAny;	1805	::Size aAppFontSize( e.Width, e.Height );
1806	::Size aTmp( e.Width, e.Height );	1806
1807	aTmp = ImplMapPixelToAppFont( pOutDev, aTmp );	1807	Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
		1808	Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), UNO_QUERY );
		1809	OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" );
		1810	if ( xDialogDevice.is() )
		1811	{
		1812	DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
		1813	aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
		1814	aAppFontSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
		1815	}
		1816
		1817	aAppFontSize = ImplMapPixelToAppFont( pOutDev, aAppFontSize );
1808		1818
1809	// Remember that changes have been done by listener. No need to	1819	// Remember that changes have been done by listener. No need to
1810	// update the position because of property change event.	1820	// update the position because of property change event.
Lines 1814-1821 Link Here
1814	// Properties in a sequence must be sorted!	1824	// Properties in a sequence must be sorted!
1815	aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ));	1825	aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ));
1816	aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));	1826	aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
1817	aValues[0] <<= aTmp.Height();	1827	aValues[0] <<= aAppFontSize.Height();
1818	aValues[1] <<= aTmp.Width();	1828	aValues[1] <<= aAppFontSize.Width();
1819		1829
1820	ImplSetPropertyValues( aProps, aValues, true );	1830	ImplSetPropertyValues( aProps, aValues, true );
1821	mbSizeModified = false;	1831	mbSizeModified = false;