User: vg Date: 2008-08-19 10:07:59+0000 Modified: dba/reportdesign/source/core/sdr/ReportDrawPage.cxx
Log: INTEGRATION: CWS dba31a (1.5.28); FILE MERGED 2008/07/08 06:21:11 oj 1.5.28.4: change needed due to a change in svx 2008/06/25 12:21:33 oj 1.5.28.3: merge conflicts resolved 2008/06/24 12:06:40 oj 1.5.28.2: RESYNC: (1.5-1.7); FILE MERGED 2008/06/09 10:22:15 oj 1.5.28.1: #i88506# insert new flag to offer word boundary breaks File Changes: Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: ReportDrawPage.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/ReportDrawPage.cxx?r1=1.7&r2=1.8 Delta lines: +12 -49 --------------------- --- ReportDrawPage.cxx 2008-06-23 06:37:30+0000 1.7 +++ ReportDrawPage.cxx 2008-08-19 10:07:56+0000 1.8 @@ -82,54 +82,17 @@ ::rtl::OUString sServiceName = pBaseObj->getServiceName(); OSL_ENSURE(sServiceName.getLength(),"No Service Name given!"); - - //if ( !sServiceName.getLength() ) - //{ - // if ( pObj->ISA(OCustomShape) ) - // { - // sServiceName = SERVICE_SHAPE; - // } - // if ( pObj->ISA(SdrOle2Obj) ) - // { - // SdrOle2Obj* pOle2Obj = dynamic_cast<SdrOle2Obj*>(pObj); - // uno::Reference< lang::XServiceInfo > xOleModel(pOle2Obj->getXModel(),uno::UNO_QUERY); - // if ( xOleModel.is() && xOleModel->supportsService(SERVICE_REPORTDEFINITION) ) - // sServiceName = SERVICE_REPORTDEFINITION; - // else - // sServiceName = SERVICE_OLEOBJECT; - // } - // else if ( pObj->ISA(OUnoObject) ) - // { - // OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObj); - // switch(pUnoObj->getObjectId()) - // { - // case OBJ_DLG_FORMATTEDFIELD: - // sServiceName = SERVICE_FORMATTEDFIELD; - // break; - // case OBJ_DLG_HFIXEDLINE: - // sServiceName = SERVICE_FIXEDLINE; - // bChangeOrientation = true; - // break; - // case OBJ_DLG_VFIXEDLINE: - // sServiceName = SERVICE_FIXEDLINE; - // break; - // case OBJ_DLG_FIXEDTEXT: - // sServiceName = SERVICE_FIXEDTEXT; - // break; - // case OBJ_DLG_IMAGECONTROL: - // sServiceName = SERVICE_IMAGECONTROL; - // break; - // default: - // OSL_ENSURE(0,"Illegal case value"); - // break; - // } - // } - //} if ( pObj->ISA(OUnoObject) ) { OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObj); + if ( pUnoObj->GetObjIdentifier() == OBJ_DLG_FIXEDTEXT ) + { + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); + if ( xControlModel.is() ) + xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); + } + else bChangeOrientation = pUnoObj->GetObjIdentifier() == OBJ_DLG_HFIXEDLINE; - SvxShapeControl* pShape = new SvxShapeControl( pObj ); xShape.set(*pShape,uno::UNO_QUERY); pShape->setShapeKind(pObj->GetObjIdentifier()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
