diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:08:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:08:24 +0000 |
| commit | 0382f1aec03388f1ac51ba855820e52c1fdcdecc (patch) | |
| tree | 8b94d6df26d6f13507655f324f8c9e5fbe2bf470 /reportdesign | |
| parent | 91f5ea3bc9a1f879f7638988290ddcb444f29a54 (diff) | |
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: cmc@openoffice.org
Reviewed by: frank.schoenheit@sun.com
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
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 67d16dfeb..6ff9666c1 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RptObject.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -122,9 +122,16 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon 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 @@ void OCustomShape::NbcSetLogicRect(const Rectangle& rRect) SetPropsFromRect(rRect); } //---------------------------------------------------------------------------- - FASTBOOL OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { FASTBOOL bResult = SdrObjCustomShape::EndCreate(rStat, eCmd); @@ -677,7 +683,9 @@ FASTBOOL OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) try { if ( supportsService( SERVICE_FIXEDTEXT ) ) + { m_xReportComponent->setPropertyValue( PROPERTY_LABEL, uno::makeAny(GetDefaultName(this)) ); + } } catch(const uno::Exception&) { @@ -851,14 +859,6 @@ OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType) 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() { |