User: hr Date: 2007-08-02 14:30:42+0000 Modified: dba/reportdesign/source/core/api/Section.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/11 13:05:25 oj 1.2.2.3: merge conflict 2007/07/11 11:03:05 oj 1.2.2.2: #i78141# handle transparent color 2007/07/11 10:48:25 oj 1.2.2.1: #i78141# handle transparent color File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: Section.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/Section.cxx?r1=1.2&r2=1.3 Delta lines: +9 -5 ------------------- --- Section.cxx 2007-07-09 11:56:14+0000 1.2 +++ Section.cxx 2007-08-02 14:30:39+0000 1.3 @@ -315,7 +315,9 @@ // ----------------------------------------------------------------------------- void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException) { - setBackTransparent(_backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT)); + sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); + setBackTransparent(bTransparent); + if ( !bTransparent ) set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor); } // ----------------------------------------------------------------------------- @@ -328,6 +330,8 @@ void SAL_CALL OSection::setBackTransparent( ::sal_Bool _backtransparent ) throw (uno::RuntimeException) { set(PROPERTY_BACKTRANSPARENT,_backtransparent,m_bBacktransparent); + if ( _backtransparent ) + set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor); } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
