Tag: cws_dev300_dba31a User: oj Date: 2008-06-09 10:22:18+0000 Modified: dba/reportdesign/source/core/api/FixedText.cxx dba/reportdesign/source/core/inc/FixedText.hxx dba/reportdesign/source/core/sdr/ReportDrawPage.cxx dba/reportdesign/source/core/sdr/RptObject.cxx dba/reportdesign/source/ui/report/StartMarker.cxx
Log: #i88506# insert new flag to offer word boundary breaks File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: FixedText.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/FixedText.cxx?r1=1.4&r2=1.4.30.1 Delta lines: +2 -15 -------------------- --- FixedText.cxx 2008-04-10 18:09:26+0000 1.4 +++ FixedText.cxx 2008-06-09 10:22:14+0000 1.4.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FixedText.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.30.1 $ * * This file is part of OpenOffice.org. * @@ -61,7 +61,6 @@ :FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) -,m_bMultiLine(sal_False) { DBG_CTOR( rpt_OFixedText,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager()); @@ -74,7 +73,6 @@ :FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) -,m_bMultiLine(sal_False) { DBG_CTOR( rpt_OFixedText,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager()); @@ -262,17 +260,6 @@ OShapeHelper::setParent(Parent,this); } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL OFixedText::getMultiLine() throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_bMultiLine; -} -// ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::setMultiLine( ::sal_Bool _multiline ) throw (uno::RuntimeException) -{ - set(PROPERTY_MULTILINE,_multiline,m_bMultiLine); -} -// ----------------------------------------------------------------------------- uno::Reference< report::XFormatCondition > SAL_CALL OFixedText::createFormatCondition( ) throw (uno::Exception, uno::RuntimeException) { return new OFormatCondition(m_aProps.aComponent.m_xContext); Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: FixedText.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/FixedText.hxx?r1=1.3&r2=1.3.30.1 Delta lines: +2 -5 ------------------- --- FixedText.hxx 2008-04-10 18:16:33+0000 1.3 +++ FixedText.hxx 2008-06-09 10:22:15+0000 1.3.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FixedText.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.30.1 $ * * This file is part of OpenOffice.org. * @@ -57,7 +57,6 @@ friend class OShapeHelper; OReportControlModel m_aProps; ::rtl::OUString m_sLabel; - ::sal_Bool m_bMultiLine; private: OFixedText(const OFixedText&); OFixedText& operator=(const OFixedText&); @@ -122,8 +121,6 @@ // XFixedText virtual ::rtl::OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLabel( const ::rtl::OUString& _label ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getMultiLine() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMultiLine( ::sal_Bool _multiline ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::report::XReportControlFormat REPORTCONTROLFORMAT_HEADER() 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.5&r2=1.5.28.1 Delta lines: +10 -46 --------------------- --- ReportDrawPage.cxx 2008-04-10 18:25:57+0000 1.5 +++ ReportDrawPage.cxx 2008-06-09 10:22:15+0000 1.5.28.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportDrawPage.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.28.1 $ * * This file is part of OpenOffice.org. * @@ -79,52 +79,16 @@ ::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->getObjectId() == 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->getObjectId() == OBJ_DLG_HFIXEDLINE; } else if ( pObj->ISA(SdrOle2Obj) ) File [changed]: RptObject.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.8&r2=1.8.26.1 Delta lines: +4 -2 ------------------- --- RptObject.cxx 2008-04-10 18:26:46+0000 1.8 +++ RptObject.cxx 2008-06-09 10:22:15+0000 1.8.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RptObject.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.26.1 $ * * This file is part of OpenOffice.org. * @@ -754,8 +754,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!"); Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: StartMarker.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/StartMarker.cxx?r1=1.6&r2=1.6.28.1 Delta lines: +3 -3 ------------------- --- StartMarker.cxx 2008-04-10 19:16:16+0000 1.6 +++ StartMarker.cxx 2008-06-09 10:22:15+0000 1.6.28.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: StartMarker.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.28.1 $ * * This file is part of OpenOffice.org. * @@ -68,7 +68,7 @@ OStartMarker::OStartMarker(OSectionsWindow* _pParent,const ::rtl::OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) ,m_aVRuler(this,WB_VERT) -,m_aText(this,WB_WORDBREAK) +,m_aText(this,WB_HYPHENATION) ,m_aImage(this,WB_LEFT|WB_TOP) ,m_pParent(_pParent) ,m_nCornerSize(CORNER_SPACE) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
