User: vg Date: 2008-08-19 10:06:20+0000 Modified: dba/reportdesign/source/core/api/FixedText.cxx
Log: INTEGRATION: CWS dba31a (1.4.30); FILE MERGED 2008/06/09 10:22:14 oj 1.4.30.1: #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.5 Delta lines: +0 -13 -------------------- --- FixedText.cxx 2008-04-10 18:09:26+0000 1.4 +++ FixedText.cxx 2008-08-19 10:06:17+0000 1.5 @@ -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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
