User: rt Date: 2008-06-16 13:28:35+0000 Modified: dba/reportdesign/source/core/api/ImageControl.cxx
Log: INTEGRATION: CWS rptchart02 (1.5.2); FILE MERGED 2008/06/05 10:40:02 oj 1.5.2.3: #i90298# impl asian and complex 2008/05/15 12:32:10 oj 1.5.2.2: #i87135# allow to enable e.g. bold for controls as other checks 2008/05/07 06:57:01 oj 1.5.2.1: #i88842# ini var File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ImageControl.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ImageControl.cxx?r1=1.5&r2=1.6 Delta lines: +34 -10 --------------------- --- ImageControl.cxx 2008-04-10 18:13:16+0000 1.5 +++ ImageControl.cxx 2008-06-16 13:28:32+0000 1.6 @@ -64,6 +64,8 @@ ,PROPERTY_CHARPOSTURE ,PROPERTY_CHARRELIEF ,PROPERTY_FONTDESCRIPTOR + ,PROPERTY_FONTDESCRIPTORASIAN + ,PROPERTY_FONTDESCRIPTORCOMPLEX ,PROPERTY_CONTROLTEXTEMPHASISMARK ,PROPERTY_CHARROTATION ,PROPERTY_CHARSCALEWIDTH @@ -89,6 +91,36 @@ ,PROPERTY_CHARKERNING ,PROPERTY_MASTERFIELDS ,PROPERTY_DETAILFIELDS + ,PROPERTY_PARAADJUST + , PROPERTY_CHAREMPHASISASIAN + , PROPERTY_CHARFONTNAMEASIAN + , PROPERTY_CHARFONTSTYLENAMEASIAN + , PROPERTY_CHARFONTFAMILYASIAN + , PROPERTY_CHARFONTCHARSETASIAN + , PROPERTY_CHARFONTPITCHASIAN + , PROPERTY_CHARHEIGHTASIAN + , PROPERTY_CHARUNDERLINEASIAN + , PROPERTY_CHARWEIGHTASIAN + , PROPERTY_CHARPOSTUREASIAN + , PROPERTY_CHARWORDMODEASIAN + , PROPERTY_CHARROTATIONASIAN + , PROPERTY_CHARSCALEWIDTHASIAN + , PROPERTY_CHARLOCALEASIAN + , PROPERTY_CHAREMPHASISCOMPLEX + , PROPERTY_CHARFONTNAMECOMPLEX + , PROPERTY_CHARFONTSTYLENAMECOMPLEX + , PROPERTY_CHARFONTFAMILYCOMPLEX + , PROPERTY_CHARFONTCHARSETCOMPLEX + , PROPERTY_CHARFONTPITCHCOMPLEX + , PROPERTY_CHARHEIGHTCOMPLEX + , PROPERTY_CHARUNDERLINECOMPLEX + , PROPERTY_CHARWEIGHTCOMPLEX + , PROPERTY_CHARPOSTURECOMPLEX + , PROPERTY_CHARWORDMODECOMPLEX + , PROPERTY_CHARROTATIONCOMPLEX + , PROPERTY_CHARSCALEWIDTHCOMPLEX + , PROPERTY_CHARLOCALECOMPLEX + }; return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } @@ -100,6 +132,7 @@ ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_bScaleImage(sal_False) +,m_bPreserveIRI(sal_True) { DBG_CTOR( rpt_OImageControl,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); @@ -112,6 +145,7 @@ ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_bScaleImage(sal_False) +,m_bPreserveIRI(sal_True) { DBG_CTOR( rpt_OImageControl,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); @@ -224,16 +258,6 @@ } // ----------------------------------------------------------------------------- -::sal_Int16 SAL_CALL OImageControl::getParaAdjust() throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.nAlign; -} -// ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setParaAdjust( ::sal_Int16 _align ) throw (uno::RuntimeException) -{ - set(PROPERTY_PARAADJUST,_align,m_aProps.aFormatProperties.nAlign); -} ::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (::com::sun::star::beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
