User: rt Date: 2008-01-29 13:51:34+0000 Modified: dba/reportdesign/source/ui/report/ScrollHelper.cxx
Log: INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED 2007/10/26 12:31:37 oj 1.4.36.1: #i77919# use of SplitWindow File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ScrollHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ScrollHelper.cxx?r1=1.4&r2=1.5 Delta lines: +27 -1 -------------------- --- ScrollHelper.cxx 2007-08-03 12:45:48+0000 1.4 +++ ScrollHelper.cxx 2008-01-29 13:51:31+0000 1.5 @@ -248,6 +248,24 @@ void OScrollWindowHelper::Resize() { OScrollWindowHelper_BASE::Resize(); + // Size aSize = GetOutputSizePixel(); + // const Size aMinSize(getMaxMarkerWidth(sal_False),0); + // bool bResize = false; + //if( aSize.Width() < aMinSize.Width() ) + //{ + // aSize.setWidth( aMinSize.Width() ); + // bResize = true; + //} + //if( aSize.Height() < aMinSize.Height() ) + //{ + // aSize.setHeight( aMinSize.Height() ); + // bResize = true; + //} + //if( bResize ) + // { + // //static_cast<SplitWindow*>(GetParent())->SetItemSize(2,aSize.getWidth()); + // SetOutputSizePixel( aSize ); + // } const Size aTotalOutputSize = ResizeScrollBars(); OSL_ENSURE(m_pChild,"ReportWindow is NULL"); @@ -422,7 +440,15 @@ //------------------------------------------------------------------------------ void OScrollWindowHelper::ImplInitSettings() { - SetBackground( ); +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_BLUE )); +//#else + //SetBackground( ); + SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); +//#endif + SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); +//#endif } //----------------------------------------------------------------------------- void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
