User: hr Date: 2007-08-02 14:30:54+0000 Modified: dba/reportdesign/source/core/inc/ReportHelperImpl.hxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/11 10:48:25 oj 1.2.2.2: #i78141# handle transparent color 2007/07/11 09:26:56 oj 1.2.2.1: #i78608# remove props PRINTREPEATEDVALUES,... for fixedline File Changes: Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: ReportHelperImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/ReportHelperImpl.hxx?r1=1.2&r2=1.3 Delta lines: +21 -13 --------------------- --- ReportHelperImpl.hxx 2007-07-09 11:56:15+0000 1.2 +++ ReportHelperImpl.hxx 2007-08-02 14:30:52+0000 1.3 @@ -35,7 +35,7 @@ #ifndef INCLUDED_REPORTHELPERIMPL_HXX #define INCLUDED_REPORTHELPERIMPL_HXX // ::com::sun::star::report::XReportComponent: -#define REPORTCOMPONENT_IMPL(clazz) \ +#define REPORTCOMPONENT_IMPL3(clazz) \ ::rtl::OUString SAL_CALL clazz::getName() throw (uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ @@ -85,6 +85,15 @@ aSize.Width = _width; \ setSize(aSize); \ } \ +uno::Reference< report::XSection > SAL_CALL clazz::getSection() throw (uno::RuntimeException) \ +{ \ + ::osl::MutexGuard aGuard(m_aMutex); \ + uno::Reference< container::XChild > xParent(getParent( ),uno::UNO_QUERY); \ + return lcl_getSection(xParent); \ +} + +#define REPORTCOMPONENT_IMPL(clazz) \ +REPORTCOMPONENT_IMPL3(clazz)\ ::sal_Bool SAL_CALL clazz::getPrintRepeatedValues() throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ @@ -93,13 +102,8 @@ void SAL_CALL clazz::setPrintRepeatedValues( ::sal_Bool _printrepeatedvalues ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ set(PROPERTY_PRINTREPEATEDVALUES,_printrepeatedvalues,m_aProps.aComponent.m_bPrintRepeatedValues); \ -} \ -uno::Reference< report::XSection > SAL_CALL clazz::getSection() throw (uno::RuntimeException) \ -{ \ - ::osl::MutexGuard aGuard(m_aMutex); \ - uno::Reference< container::XChild > xParent(getParent( ),uno::UNO_QUERY); \ - return lcl_getSection(xParent); \ } + #define REPORTCOMPONENT_IMPL2(clazz) \ ::sal_Int16 SAL_CALL clazz::getControlBorder() throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ @@ -130,8 +134,10 @@ \ void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException)\ { \ - setControlBackgroundTransparent(_backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT)); \ - set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,varName.nBackgroundColor); \ + sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);\ + setControlBackgroundTransparent(bTransparent);\ + if ( !bTransparent )\ + set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,varName.nBackgroundColor);\ } \ \ ::sal_Bool SAL_CALL clazz::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) \ @@ -142,7 +148,9 @@ \ void SAL_CALL clazz::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ - set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,varName.m_bBackgroundTransparent); \ + set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,varName.m_bBackgroundTransparent);\ + if ( _controlbackgroundtransparent )\ + set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),varName.nBackgroundColor);\ } #define REPORTCONTROLFORMAT_IMPL2(clazz,varName) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
