User: rt Date: 2008-01-29 13:52:48+0000 Modified: dba/reportdesign/source/ui/report/propbrw.cxx
Log: INTEGRATION: CWS reportdesign02 (1.3.36); FILE MERGED 2007/10/26 12:31:37 oj 1.3.36.1: #i77919# use of SplitWindow File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: propbrw.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/propbrw.cxx?r1=1.3&r2=1.4 Delta lines: +22 -12 --------------------- --- propbrw.cxx 2007-08-03 10:05:03+0000 1.3 +++ propbrw.cxx 2008-01-29 13:52:46+0000 1.4 @@ -424,7 +424,7 @@ m_xBrowserController->inspect(uno::Sequence< Reference<uno::XInterface> >()); m_xBrowserController->inspect(_aObjects); - Resize(); + //Resize(); } SetText( GetHeadlineName(_aObjects) ); } @@ -520,31 +520,41 @@ return xNameCont.get(); } -//---------------------------------------------------------------------------- -void PropBrw::Resize() +// ----------------------------------------------------------------------------- +::Size PropBrw::getMinimumSize() const { - Window::Resize(); - + ::Size aSize; Reference< awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); if( xLayoutConstrains.is() ) { - ::Size aSize; awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); aMinSize.Height += 4; aMinSize.Width += 4; aSize.setHeight( aMinSize.Height ); aSize.setWidth( aMinSize.Width ); - SetMinOutputSizePixel( aSize ); - aSize = GetOutputSizePixel(); + } + return aSize; +} +//---------------------------------------------------------------------------- +void PropBrw::Resize() +{ + Window::Resize(); + + Reference< awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); + if( xLayoutConstrains.is() ) + { + ::Size aMinSize = getMinimumSize(); + SetMinOutputSizePixel( aMinSize ); + ::Size aSize = GetOutputSizePixel(); sal_Bool bResize = sal_False; - if( aSize.Width() < aMinSize.Width ) + if( aSize.Width() < aMinSize.Width() ) { - aSize.setWidth( aMinSize.Width ); + aSize.setWidth( aMinSize.Width() ); bResize = sal_True; } - if( aSize.Height() < aMinSize.Height ) + if( aSize.Height() < aMinSize.Height() ) { - aSize.setHeight( aMinSize.Height ); + aSize.setHeight( aMinSize.Height() ); bResize = sal_True; } if( bResize ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
