User: vg Date: 2008-08-19 10:08:27+0000 Modified: dba/reportdesign/source/core/sdr/RptObject.cxx
Log: INTEGRATION: CWS dba31a (1.8.26); FILE MERGED 2008/07/15 08:38:55 fs 1.8.26.5: remove unused code Issue number: #i91592# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] 2008/07/10 06:44:42 oj 1.8.26.4: #i88727# new area prop for shapes and some model changes 2008/06/24 12:06:44 oj 1.8.26.3: RESYNC: (1.8-1.9); FILE MERGED 2008/06/11 10:15:37 oj 1.8.26.2: #i77059# set multiline to true 2008/06/09 10:22:15 oj 1.8.26.1: #i88506# insert new flag to offer word boundary breaks File Changes: Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: RptObject.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.9&r2=1.10 Delta lines: +10 -10 --------------------- --- RptObject.cxx 2008-06-16 13:32:06+0000 1.9 +++ RptObject.cxx 2008-08-19 10:08:24+0000 1.10 @@ -122,9 +122,16 @@ switch( nType ) { case OBJ_DLG_FIXEDTEXT: - pNewObj = new OUnoObject( _xComponent + { + OUnoObject* pUnoObj = new OUnoObject( _xComponent ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); + pNewObj = pUnoObj; + + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); + if ( xControlModel.is() ) + xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); + } break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent @@ -488,7 +495,6 @@ SetPropsFromRect(rRect); } //---------------------------------------------------------------------------- - FASTBOOL OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { FASTBOOL bResult = SdrObjCustomShape::EndCreate(rStat, eCmd); @@ -677,8 +683,10 @@ try { if ( supportsService( SERVICE_FIXEDTEXT ) ) + { m_xReportComponent->setPropertyValue( PROPERTY_LABEL, uno::makeAny(GetDefaultName(this)) ); } + } catch(const uno::Exception&) { OSL_ENSURE(0,"OUnoObject::EndCreate: Exception caught!"); @@ -851,14 +859,6 @@ DBG_CTOR( rpt_OOle2Obj, NULL); m_bIsListening = sal_True; } -// ----------------------------------------------------------------------------- -OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect,UINT16 _nType, FASTBOOL bFrame_) - :SdrOle2Obj(rNewObjRef,rNewObjName,rNewRect,bFrame_) - ,OObjectBase(_sComponentName) - ,m_nType(_nType) -{ - m_bIsListening = sal_True; -} //---------------------------------------------------------------------------- OOle2Obj::~OOle2Obj() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
