diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /reportdesign | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
94 files changed, 1899 insertions, 1899 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 2b40055e1cbd..989b5238f5a2 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -126,7 +126,7 @@ uno::Sequence< OUString > lcl_getLineOptionals() }; return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext) :FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) @@ -140,7 +140,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_nWidth = MIN_WIDTH; } -// ----------------------------------------------------------------------------- + OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape @@ -181,13 +181,13 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OFixedLine::~OFixedLine() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = FixedLineBase::queryInterface(_rType); @@ -198,24 +198,24 @@ uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (u return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) { FixedLinePropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OFixedLine"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OFixedLine::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -223,133 +223,133 @@ uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static( ) throw( return aServices; } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OFixedLine(xContext)); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportComponent REPORTCOMPONENT_IMPL3(OFixedLine,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OFixedLine) -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OFixedLine::getControlBorder( ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setControlBorder( ::sal_Int16 /*_border*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFixedLine::getControlBorderColor() throw (beans::UnknownPropertyException,uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setControlBorderColor( ::sal_Int32 /*_bordercolor*/ ) throw (beans::UnknownPropertyException,lang::IllegalArgumentException,uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInfo( ) throw(uno::RuntimeException) { return FixedLinePropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FixedLinePropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XReportControlModel OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFixedLine::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFixedLine::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setControlBackgroundTransparent( ::sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFixedLine::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setPrintWhenGroupChange( ::sal_Bool /*_printwhengroupchange*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + // XCloneable uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone( ) throw (uno::RuntimeException) { @@ -357,159 +357,159 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone( ) throw (u uno::Reference< report::XFixedLine> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDLINE),uno::UNO_QUERY_THROW); return xSet.get(); } -// ----------------------------------------------------------------------------- + // XFixedLine -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFixedLine::getOrientation() throw (beans::UnknownPropertyException,uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nOrientation; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setOrientation( ::sal_Int32 _orientation ) throw (beans::UnknownPropertyException,uno::RuntimeException) { set(PROPERTY_ORIENTATION,_orientation,m_nOrientation); } -// ----------------------------------------------------------------------------- + drawing::LineStyle SAL_CALL OFixedLine::getLineStyle() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_LineStyle; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setLineStyle( drawing::LineStyle _linestyle ) throw (uno::RuntimeException) { set(PROPERTY_LINESTYLE,_linestyle,m_LineStyle); } -// ----------------------------------------------------------------------------- + drawing::LineDash SAL_CALL OFixedLine::getLineDash() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_LineDash; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setLineDash( const drawing::LineDash& _linedash ) throw (uno::RuntimeException) { set(PROPERTY_LINEDASH,_linedash,m_LineDash); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFixedLine::getLineColor() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_LineColor; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setLineColor( ::sal_Int32 _linecolor ) throw (uno::RuntimeException) { set(PROPERTY_LINECOLOR,_linecolor,m_LineColor); } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OFixedLine::getLineTransparence() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_LineTransparence; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setLineTransparence( ::sal_Int16 _linetransparence ) throw (uno::RuntimeException) { set(PROPERTY_LINETRANSPARENCE,_linetransparence,m_LineTransparence); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFixedLine::getLineWidth() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_LineWidth; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setLineWidth( ::sal_Int32 _linewidth ) throw (uno::RuntimeException) { set(PROPERTY_LINEWIDTH,_linewidth,m_LineWidth); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + // XChild uno::Reference< uno::XInterface > SAL_CALL OFixedLine::getParent( ) throw (uno::RuntimeException) { return OShapeHelper::getParent(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { OShapeHelper::setParent(Parent,this); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XFormatCondition > SAL_CALL OFixedLine::createFormatCondition( ) throw (uno::Exception, uno::RuntimeException) { return new OFormatCondition(m_aProps.aComponent.m_xContext); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OFixedLine::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.addContainerListener(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.removeContainerListener(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OFixedLine::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFixedLine::hasElements( ) throw (uno::RuntimeException) { return m_aProps.hasElements(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OFixedLine::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.insertByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.removeByIndex(Index); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OFixedLine::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.replaceByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OFixedLine::getCount( ) throw (uno::RuntimeException) { return m_aProps.getCount(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedLine::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { return m_aProps.getByIndex( Index ); } -// ----------------------------------------------------------------------------- + // XShape awt::Point SAL_CALL OFixedLine::getPosition( ) throw (uno::RuntimeException) { return OShapeHelper::getPosition(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { OShapeHelper::setPosition(aPosition,this); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OFixedLine::getSize( ) throw (uno::RuntimeException) { return OShapeHelper::getSize(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter) @@ -520,7 +520,7 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + OUString::number(MIN_HEIGHT) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); OShapeHelper::setSize(aSize,this); } -// ----------------------------------------------------------------------------- + // XShapeDescriptor OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException) { @@ -529,7 +529,7 @@ OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException) return m_aProps.aComponent.m_xShape->getShapeType(); return OUString("com.sun.star.drawing.ControlShape"); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); @@ -566,7 +566,7 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( ::sal_Bool /*_printrepeatedval throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + // ============================================================================= } // namespace reportdesign // ============================================================================= diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 0255ba8b7c82..3858fcb514e9 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -41,7 +41,7 @@ uno::Sequence< OUString > lcl_getFixedTextOptionals() OUString pProps[] = { OUString(PROPERTY_DATAFIELD),OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) }; return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext) :FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) @@ -50,7 +50,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_nBorder = 0; // no border } -// ----------------------------------------------------------------------------- + OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) @@ -67,13 +67,13 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OFixedText::~OFixedText() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_REFCOUNT( OFixedText, FixedTextBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = FixedTextBase::queryInterface(_rType); @@ -85,25 +85,25 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) { FixedTextPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); uno::Reference< report::XFixedText> xHoldAlive = this; } -// ----------------------------------------------------------------------------- + OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OFixedText"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OFixedText::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -111,99 +111,99 @@ uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static( ) throw( return aServices; } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OFixedText(xContext)); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportComponent REPORTCOMPONENT_IMPL(OFixedText,m_aProps.aComponent) REPORTCOMPONENT_IMPL2(OFixedText,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OFixedText) REPORTCONTROLFORMAT_IMPL(OFixedText,m_aProps.aFormatProperties) -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInfo( ) throw(uno::RuntimeException) { return FixedTextPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FixedTextPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XReportControlModel OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + ::sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.bPrintWhenGroupChange; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } -// ----------------------------------------------------------------------------- + // XCloneable uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone( ) throw (uno::RuntimeException) @@ -212,7 +212,7 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone( ) throw (u uno::Reference< report::XFixedText> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDTEXT),uno::UNO_QUERY_THROW); return xSet.get(); } -// ----------------------------------------------------------------------------- + // XFixedText OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException) @@ -220,99 +220,99 @@ OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException) ::osl::MutexGuard aGuard(m_aMutex); return m_sLabel; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setLabel( const OUString& _label ) throw (uno::RuntimeException) { set(PROPERTY_LABEL,_label,m_sLabel); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OFixedText::getParent( ) throw (uno::RuntimeException) { return OShapeHelper::getParent(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { OShapeHelper::setParent(Parent,this); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XFormatCondition > SAL_CALL OFixedText::createFormatCondition( ) throw (uno::Exception, uno::RuntimeException) { return new OFormatCondition(m_aProps.aComponent.m_xContext); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OFixedText::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.addContainerListener(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.removeContainerListener(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OFixedText::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFixedText::hasElements( ) throw (uno::RuntimeException) { return m_aProps.hasElements(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OFixedText::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.insertByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.removeByIndex(Index); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OFixedText::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.replaceByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OFixedText::getCount( ) throw (uno::RuntimeException) { return m_aProps.getCount(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFixedText::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { return m_aProps.getByIndex( Index ); } -// ----------------------------------------------------------------------------- + // XShape awt::Point SAL_CALL OFixedText::getPosition( ) throw (uno::RuntimeException) { return OShapeHelper::getPosition(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { OShapeHelper::setPosition(aPosition,this); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OFixedText::getSize( ) throw (uno::RuntimeException) { return OShapeHelper::getSize(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { OShapeHelper::setSize(aSize,this); } -// ----------------------------------------------------------------------------- + // XShapeDescriptor OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException) @@ -322,8 +322,8 @@ OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException) return m_aProps.aComponent.m_xShape->getShapeType(); return OUString("com.sun.star.drawing.ControlShape"); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + // ============================================================================= } // namespace reportdesign // ============================================================================= diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 6190851cb295..e504b648605f 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -33,43 +33,43 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OFormatCondition(xContext)); } -// ----------------------------------------------------------------------------- + OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) :FormatConditionBase(m_aMutex) ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_bEnabled(sal_True) { } -// ----------------------------------------------------------------------------- + OFormatCondition::~OFormatCondition() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet) -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) { FormatConditionPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OFormatCondition"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OFormatCondition::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -77,75 +77,75 @@ uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static( ) return aServices; } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getPropertySetInfo( ) throw(uno::RuntimeException) { return FormatConditionPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FormatConditionPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XFormatCondition ::sal_Bool SAL_CALL OFormatCondition::getEnabled() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bEnabled; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::setEnabled( ::sal_Bool _enabled ) throw (uno::RuntimeException) { set(PROPERTY_ENABLED,_enabled,m_bEnabled); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sFormula; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (uno::RuntimeException) { set(PROPERTY_FORMULA,_formula,m_sFormula); } -// ----------------------------------------------------------------------------- + // XReportControlFormat REPORTCONTROLFORMAT_IMPL(OFormatCondition,m_aFormatProperties) // ============================================================================= diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index fef22daf19b8..a62ffe38e894 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -37,7 +37,7 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OFormattedField(xContext)); @@ -48,7 +48,7 @@ uno::Sequence< OUString > lcl_getFormattedFieldOptionals() OUString pProps[] = { OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) }; return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext) :FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) @@ -57,7 +57,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const { m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager()); } -// ----------------------------------------------------------------------------- + OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) @@ -74,13 +74,13 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OFormattedField::~OFormattedField() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = FormattedFieldBase::queryInterface(_rType); @@ -92,7 +92,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) { FormattedFieldPropertySet::dispose(); @@ -100,18 +100,18 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) m_xFormatsSupplier.clear(); m_xFunction.clear(); } -// ----------------------------------------------------------------------------- + OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OFormattedField"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(2); @@ -120,29 +120,29 @@ uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) t return aServices; } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportComponent REPORTCOMPONENT_IMPL(OFormattedField,m_aProps.aComponent) REPORTCOMPONENT_IMPL2(OFormattedField,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OFormattedField) REPORTCONTROLFORMAT_IMPL(OFormattedField,m_aProps.aFormatProperties) -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertySetInfo( ) throw(uno::RuntimeException) { return FormattedFieldPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { // special case here /// TODO check @@ -151,67 +151,67 @@ void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, else FormattedFieldPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FormattedFieldPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XReportControlModel OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aDataField; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFormattedField::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.bPrintWhenGroupChange; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } -// ----------------------------------------------------------------------------- + // XCloneable uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) throw (uno::RuntimeException) @@ -232,9 +232,9 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) thr } return xSet.get(); } -// ----------------------------------------------------------------------------- + // XFormattedField -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OFormattedField::getFormatKey() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -245,7 +245,7 @@ void SAL_CALL OFormattedField::setFormatKey(::sal_Int32 _formatkey) throw (uno:: { set(PROPERTY_FORMATKEY,_formatkey,m_nFormatKey); } -// ----------------------------------------------------------------------------- + uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getFormatsSupplier() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -263,99 +263,99 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm } return m_xFormatsSupplier; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& _formatssupplier ) throw (uno::RuntimeException) { set(PROPERTY_FORMATSSUPPLIER,_formatssupplier,m_xFormatsSupplier); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OFormattedField::getParent( ) throw (uno::RuntimeException) { return OShapeHelper::getParent(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { OShapeHelper::setParent(Parent,this); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XFormatCondition > SAL_CALL OFormattedField::createFormatCondition( ) throw (uno::Exception, uno::RuntimeException) { return new OFormatCondition(m_aProps.aComponent.m_xContext); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OFormattedField::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.addContainerListener(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.removeContainerListener(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OFormattedField::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFormattedField::hasElements( ) throw (uno::RuntimeException) { return m_aProps.hasElements(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OFormattedField::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.insertByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.removeByIndex(Index); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OFormattedField::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.replaceByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OFormattedField::getCount( ) throw (uno::RuntimeException) { return m_aProps.getCount(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFormattedField::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { return m_aProps.getByIndex( Index ); } -// ----------------------------------------------------------------------------- + // XShape awt::Point SAL_CALL OFormattedField::getPosition( ) throw (uno::RuntimeException) { return OShapeHelper::getPosition(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { OShapeHelper::setPosition(aPosition,this); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OFormattedField::getSize( ) throw (uno::RuntimeException) { return OShapeHelper::getSize(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { OShapeHelper::setSize(aSize,this); } -// ----------------------------------------------------------------------------- + // XShapeDescriptor OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException) @@ -365,7 +365,7 @@ OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException return m_aProps.aComponent.m_xShape->getShapeType(); return OUString("com.sun.star.drawing.ControlShape"); } -// ----------------------------------------------------------------------------- + // ============================================================================= } // namespace reportdesign // ============================================================================= diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index c82cceea048d..978acbf98110 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -30,13 +30,13 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OFunction(xContext)); } -// ----------------------------------------------------------------------------- + OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) :FunctionBase(m_aMutex) ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) @@ -46,30 +46,30 @@ OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) { m_sInitialFormula.IsPresent = sal_False; } -// ----------------------------------------------------------------------------- + OFunction::~OFunction() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet) -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) { FunctionPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OFunction"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OFunction::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -77,119 +77,119 @@ uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static( ) throw(u return aServices; } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo( ) throw(uno::RuntimeException) { return FunctionPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FunctionPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // report::XFunction: ::sal_Bool SAL_CALL OFunction::getPreEvaluated() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_bPreEvaluated; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setPreEvaluated(::sal_Bool the_value) throw (uno::RuntimeException) { set(PROPERTY_PREEVALUATED,the_value,m_bPreEvaluated); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFunction::getDeepTraversing() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_bDeepTraversing; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setDeepTraversing(::sal_Bool the_value) throw (uno::RuntimeException) { set(PROPERTY_DEEPTRAVERSING,the_value,m_bDeepTraversing); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sName; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setName(const OUString & the_value) throw (uno::RuntimeException) { set(PROPERTY_NAME,the_value,m_sName); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sFormula; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setFormula(const OUString & the_value) throw (uno::RuntimeException) { set(PROPERTY_FORMULA,the_value,m_sFormula); } -// ----------------------------------------------------------------------------- + beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sInitialFormula; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value) throw (uno::RuntimeException) { set(PROPERTY_INITIALFORMULA,the_value,m_sInitialFormula); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OFunction::getParent( ) throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_xParent; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { osl::MutexGuard g(m_aMutex); @@ -201,7 +201,7 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par else m_xParent = uno::WeakReference< report::XFunctions >(); } -// ----------------------------------------------------------------------------- + // ============================================================================= } // namespace reportdesign diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index a61cce2c1046..b8eb5d2d797c 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -29,7 +29,7 @@ namespace reportdesign { // ============================================================================= using namespace com::sun::star; -// ----------------------------------------------------------------------------- + OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xParent,const uno::Reference< uno::XComponentContext >& context) :FunctionsBase(m_aMutex) ,m_aContainerListeners(m_aMutex) @@ -37,18 +37,18 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar ,m_xParent(_xParent) { } -//-------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // OFunctions::~OFunctions() { } -//-------------------------------------------------------------------------- + void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // void SAL_CALL OFunctions::disposing() @@ -59,14 +59,14 @@ void SAL_CALL OFunctions::disposing() m_aContainerListeners.disposeAndClear( aDisposeEvent ); m_xContext.clear(); } -// ----------------------------------------------------------------------------- + // XFunctionsSupplier -// ----------------------------------------------------------------------------- + uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction( ) throw (uno::RuntimeException) { return new OFunction(m_xContext); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -94,7 +94,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< report::XFunction > xFunction; @@ -110,7 +110,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), uno::makeAny(xFunction), uno::Any()); m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -130,14 +130,14 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element, aOldElement); m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OFunctions::getCount( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aFunctions.size(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -146,41 +146,41 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::Index ::std::advance(aPos,Index); return uno::makeAny(*aPos); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OFunctions::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFunction>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OFunctions::hasElements( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return !m_aFunctions.empty(); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OFunctions::getParent( ) throw (uno::RuntimeException) { return m_xParent; } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunctions::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException) { throw lang::NoSupportException(); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OFunctions::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.addInterface(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OFunctions::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.removeInterface(xListener); } -// ----------------------------------------------------------------------------- + void OFunctions::checkIndex(sal_Int32 _nIndex) { if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFunctions.size()) <= _nIndex ) diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index ee640a09400f..7344d3a61268 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -36,7 +36,7 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -// ----------------------------------------------------------------------------- + OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent ,const uno::Reference< uno::XComponentContext >& _xContext) :GroupBase(m_aMutex) @@ -50,13 +50,13 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent } osl_atomic_decrement( &m_refCount ); } -//-------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // OGroup::~OGroup() { } -//-------------------------------------------------------------------------- + void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource) { ::comphelper::copyProperties(_xSource.get(),static_cast<GroupPropertySet*>(this)); @@ -73,37 +73,37 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource) OSection::lcl_copySection(_xSource->getFooter(),m_xFooter); } } -//-------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet) -//-------------------------------------------------------------------------- + OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.Group"); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) { uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_GROUP; return aSupported; } -//------------------------------------------------------------------------- + uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return cppu::supportsService(this, _rServiceName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) { GroupPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // void SAL_CALL OGroup::disposing() @@ -113,25 +113,25 @@ void SAL_CALL OGroup::disposing() ::comphelper::disposeComponent(m_xFunctions); m_xContext.clear(); } -// ----------------------------------------------------------------------------- + // XGroup ::sal_Bool SAL_CALL OGroup::getSortAscending() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_eSortAscending; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setSortAscending( ::sal_Bool _sortascending ) throw (uno::RuntimeException) { set(PROPERTY_SORTASCENDING,_sortascending,m_aProps.m_eSortAscending); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OGroup::getHeaderOn() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xHeader.is(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeException) { if ( bool(_headeron) != m_xHeader.is() ) @@ -140,13 +140,13 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader); } } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OGroup::getFooterOn() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xFooter.is(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeException) { if ( bool(_footeron) != m_xFooter.is() ) @@ -155,7 +155,7 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeExc setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter); } } -// ----------------------------------------------------------------------------- + uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container::NoSuchElementException, uno::RuntimeException) { uno::Reference< report::XSection > xRet; @@ -168,7 +168,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container throw container::NoSuchElementException(); return xRet; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container::NoSuchElementException, uno::RuntimeException) { uno::Reference< report::XSection > xRet; @@ -181,13 +181,13 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container throw container::NoSuchElementException(); return xRet; } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OGroup::getGroupOn() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_nGroupOn; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL ) @@ -197,24 +197,24 @@ void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArg ,m_xContext); set(PROPERTY_GROUPON,_groupon,m_aProps.m_nGroupOn); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OGroup::getGroupInterval() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_nGroupInterval; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno::RuntimeException) { set(PROPERTY_GROUPINTERVAL,_groupinterval,m_aProps.m_nGroupInterval); } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OGroup::getKeepTogether() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_nKeepTogether; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL ) @@ -224,92 +224,92 @@ void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang:: ,m_xContext); set(PROPERTY_KEEPTOGETHER,_keeptogether,m_aProps.m_nKeepTogether); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups() throw (uno::RuntimeException) { return m_xParent; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_sExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setExpression( const OUString& _expression ) throw (uno::RuntimeException) { set(PROPERTY_EXPRESSION,_expression,m_aProps.m_sExpression); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OGroup::getStartNewColumn() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_bStartNewColumn; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (uno::RuntimeException) { set(PROPERTY_STARTNEWCOLUMN,_startnewcolumn,m_aProps.m_bStartNewColumn); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + ::sal_Bool SAL_CALL OGroup::getResetPageNumber() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_bResetPageNumber; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setResetPageNumber( ::sal_Bool _resetpagenumber ) throw (uno::RuntimeException) { set(PROPERTY_RESETPAGENUMBER,_resetpagenumber,m_aProps.m_bResetPageNumber); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OGroup::getParent( ) throw (uno::RuntimeException) { return m_xParent; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException) { throw lang::NoSupportException(); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( ) throw(uno::RuntimeException) { return GroupPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return GroupPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void OGroup::setSection( const OUString& _sProperty ,const sal_Bool& _bOn ,const OUString& _sName @@ -325,7 +325,7 @@ void OGroup::setSection( const OUString& _sProperty } l.notify(); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions() throw (uno::RuntimeException) { return m_xFunctions; diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index f1ca56a495b2..d878789c398c 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -28,7 +28,7 @@ namespace reportdesign { // ============================================================================= using namespace com::sun::star; -// ----------------------------------------------------------------------------- + OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,const uno::Reference< uno::XComponentContext >& context) :GroupsBase(m_aMutex) ,m_aContainerListeners(m_aMutex) @@ -36,13 +36,13 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con ,m_xParent(_xParent) { } -//-------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // OGroups::~OGroups() { } -//-------------------------------------------------------------------------- + void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource) { sal_Int32 nCount = _xSource->getCount(); @@ -54,12 +54,12 @@ void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource) pGroup->copyGroup(xGroup); } } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // void SAL_CALL OGroups::disposing() @@ -70,18 +70,18 @@ void SAL_CALL OGroups::disposing() m_aContainerListeners.disposeAndClear( aDisposeEvent ); m_xContext.clear(); } -// ----------------------------------------------------------------------------- + // XGroups uno::Reference< report::XReportDefinition > SAL_CALL OGroups::getReportDefinition() throw (uno::RuntimeException) { return m_xParent; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup( ) throw (uno::RuntimeException) { return new OGroup(this,m_xContext); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -108,7 +108,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< report::XGroup > xGroup; @@ -123,7 +123,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), uno::makeAny(xGroup), uno::Any()); m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -143,14 +143,14 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element, aOldElement); m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OGroups::getCount( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aGroups.size(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -159,41 +159,41 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOut ::std::advance(aPos,Index); return uno::makeAny(*aPos); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OGroups::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XGroup>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OGroups::hasElements( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return !m_aGroups.empty(); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OGroups::getParent( ) throw (uno::RuntimeException) { return m_xParent; } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroups::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException) { throw lang::NoSupportException(); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OGroups::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.addInterface(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OGroups::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.removeInterface(xListener); } -// ----------------------------------------------------------------------------- + void OGroups::checkIndex(sal_Int32 _nIndex) { if ( _nIndex < 0 || static_cast<sal_Int32>(m_aGroups.size()) <= _nIndex ) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 264828630db3..84c383a3db6f 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -112,7 +112,7 @@ uno::Sequence< OUString > lcl_getImageOptionals() return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext) :ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) @@ -122,7 +122,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x { m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); } -// ----------------------------------------------------------------------------- + OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) @@ -140,14 +140,14 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OImageControl::~OImageControl() { } -// ----------------------------------------------------------------------------- + //IMPLEMENT_FORWARD_XINTERFACE2(OImageControl,ImageControlBase,ImageControlPropertySet) IMPLEMENT_FORWARD_REFCOUNT( OImageControl, ImageControlBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = ImageControlBase::queryInterface(_rType); @@ -160,24 +160,24 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) { ImageControlPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OImageControl"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OImageControl::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -185,23 +185,23 @@ uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static( ) thr return aServices; } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OImageControl(xContext)); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportComponent REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent) REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent) @@ -235,7 +235,7 @@ void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -263,78 +263,78 @@ void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _contro set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),m_aProps.aFormatProperties.nBackgroundColor); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo( ) throw(uno::RuntimeException) { return ImageControlPropertySet::getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return ImageControlPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XReportControlModel OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aDataField; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + ::sal_Bool SAL_CALL OImageControl::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.bPrintWhenGroupChange; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } -// ----------------------------------------------------------------------------- + // XCloneable uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw (uno::RuntimeException) @@ -343,32 +343,32 @@ uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw uno::Reference< report::XImageControl> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_IMAGECONTROL),uno::UNO_QUERY_THROW); return xSet.get(); } -// ----------------------------------------------------------------------------- + // XImageControl -// ----------------------------------------------------------------------------- + OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aImageURL; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl ) throw (uno::RuntimeException) { set(PROPERTY_IMAGEURL,_imageurl,m_aImageURL); } -// ----------------------------------------------------------------------------- + uno::Reference< awt::XImageProducer > SAL_CALL OImageControl::getImageProducer( ) throw (uno::RuntimeException) { return uno::Reference< awt::XImageProducer >(); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OImageControl::getParent( ) throw (uno::RuntimeException) { return OShapeHelper::getParent(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { OShapeHelper::setParent(Parent,this); @@ -377,79 +377,79 @@ uno::Reference< report::XFormatCondition > SAL_CALL OImageControl::createFormatC { return new OFormatCondition(m_aProps.aComponent.m_xContext); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OImageControl::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.addContainerListener(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.removeContainerListener(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OImageControl::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OImageControl::hasElements( ) throw (uno::RuntimeException) { return m_aProps.hasElements(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OImageControl::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.insertByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.removeByIndex(Index); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OImageControl::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.replaceByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OImageControl::getCount( ) throw (uno::RuntimeException) { return m_aProps.getCount(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OImageControl::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { return m_aProps.getByIndex( Index ); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + // XShape awt::Point SAL_CALL OImageControl::getPosition( ) throw (uno::RuntimeException) { return OShapeHelper::getPosition(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { OShapeHelper::setPosition(aPosition,this); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OImageControl::getSize( ) throw (uno::RuntimeException) { return OShapeHelper::getSize(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { OShapeHelper::setSize(aSize,this); } -// ----------------------------------------------------------------------------- + // XShapeDescriptor OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException) @@ -459,26 +459,26 @@ OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException) return m_aProps.aComponent.m_xShape->getShapeType(); return OUString("com.sun.star.drawing.ControlShape"); } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nScaleMode; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _scalemode < awt::ImageScaleMode::NONE ||_scalemode > awt::ImageScaleMode::ANISOTROPIC ) throw lang::IllegalArgumentException(); set(PROPERTY_SCALEMODE,_scalemode,m_nScaleMode); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OImageControl::getPreserveIRI() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bPreserveIRI; } -// ----------------------------------------------------------------------------- + void SAL_CALL OImageControl::setPreserveIRI( ::sal_Bool _preserveiri ) throw (uno::RuntimeException) { set(PROPERTY_PRESERVEIRI,_preserveiri,m_bPreserveIRI); diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 8af0d83053c1..6671ed539ac1 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -104,7 +104,7 @@ OFormatProperties::OFormatProperties() aFontDescriptor.Weight = awt::FontWeight::NORMAL; aFontDescriptor.CharacterWidth = awt::FontWidth::NORMAL; } -// ----------------------------------------------------------------------------- + void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xShape,const uno::Reference< report::XReportComponent>& _xTunnel,oslInterlockedCount& _rRefCount) { osl_atomic_increment( &_rRefCount ); @@ -123,7 +123,7 @@ void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xS } osl_atomic_decrement( &_rRefCount ); } -// ----------------------------------------------------------------------------- + OReportComponentProperties::~OReportComponentProperties() { if ( m_xProxy.is() ) diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index f6138af9db3e..8586ff8028aa 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -44,24 +44,24 @@ bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com: && ( _lhs.Type == _rhs.Type ); } -// ----------------------------------------------------------------------------- + // XContainer void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { aContainerListeners.addInterface(xListener); } -// ----------------------------------------------------------------------------- + void OReportControlModel::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { aContainerListeners.removeInterface(xListener); } -// ----------------------------------------------------------------------------- + ::sal_Bool OReportControlModel::hasElements( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return !m_aFormatConditions.empty(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -83,7 +83,7 @@ void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Elem container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any()); aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent); } -// ----------------------------------------------------------------------------- + void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any Element; @@ -98,7 +98,7 @@ void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any()); aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexReplace void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -115,14 +115,14 @@ void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any()); aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 OReportControlModel::getCount( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return m_aFormatConditions.size(); } -// ----------------------------------------------------------------------------- + uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aElement; @@ -133,18 +133,18 @@ uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index ) throw (lang::Index } return aElement; } -// ----------------------------------------------------------------------------- + void OReportControlModel::checkIndex(sal_Int32 _nIndex) { if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFormatConditions.size()) <= _nIndex ) throw lang::IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType) { return (_rType == ::getCppuType((const uno::Reference< beans::XPropertyState>* )0) || _rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet>* )0)); } -// ----------------------------------------------------------------------------- + } // reportdesign /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 8fbb3578b633..1bdb2a7af138 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -60,7 +60,7 @@ namespace reportdesign using namespace com::sun::star; using namespace comphelper; -// ----------------------------------------------------------------------------- + OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context) :ReportEngineBase(m_aMutex) ,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) @@ -68,33 +68,33 @@ OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentCon ,m_nMaxRows(0) { } -// ----------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // OReportEngineJFree::~OReportEngineJFree() { } -//-------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(OReportEngineJFree,ReportEngineBase,ReportEnginePropertySet) -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException) { ReportEnginePropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); m_xActiveConnection.clear(); } -// ----------------------------------------------------------------------------- + OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OReportEngineJFree"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -102,23 +102,23 @@ uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( return aServices; } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OReportEngineJFree(xContext)); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportEngine // Attributes uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getReportDefinition() throw (uno::RuntimeException) @@ -126,7 +126,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getRepo ::osl::MutexGuard aGuard(m_aMutex); return m_xReport; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< report::XReportDefinition >& _report ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( !_report.is() ) @@ -142,18 +142,18 @@ void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< rep } l.notify(); } -// ----------------------------------------------------------------------------- + uno::Reference< task::XStatusIndicator > SAL_CALL OReportEngineJFree::getStatusIndicator() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_StatusIndicator; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task::XStatusIndicator >& _statusindicator ) throw (uno::RuntimeException) { set(PROPERTY_STATUSINDICATOR,_statusindicator,m_StatusIndicator); } -// ----------------------------------------------------------------------------- + OUString OReportEngineJFree::getNewOutputName() { OUString sOutputName; @@ -264,18 +264,18 @@ OUString OReportEngineJFree::getNewOutputName() } return sOutputName; } -// ----------------------------------------------------------------------------- + // Methods uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentModel( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException) { return createDocumentAlive(NULL,true); } -// ----------------------------------------------------------------------------- + uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException) { return createDocumentAlive(_frame,false); } -// ----------------------------------------------------------------------------- + uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException) { uno::Reference< frame::XModel > xModel; @@ -322,7 +322,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive } return xModel; } -// ----------------------------------------------------------------------------- + util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException) { util::URL aRet; @@ -334,7 +334,7 @@ util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedEx } return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::interrupt( ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException) { { @@ -342,60 +342,60 @@ void SAL_CALL OReportEngineJFree::interrupt( ) throw (lang::DisposedException, ::connectivity::checkDisposed(ReportEngineBase::rBHelper.bDisposed); } } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getPropertySetInfo( ) throw(uno::RuntimeException) { return ReportEnginePropertySet::getPropertySetInfo(); } -// ------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return ReportEnginePropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + uno::Reference< sdbc::XConnection > SAL_CALL OReportEngineJFree::getActiveConnection() throw (uno::RuntimeException) { return m_xActiveConnection; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( !_activeconnection.is() ) throw lang::IllegalArgumentException(); set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_xActiveConnection); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OReportEngineJFree::getMaxRows() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nMaxRows; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 _MaxRows ) throw (uno::RuntimeException) { set(PROPERTY_MAXROWS,_MaxRows,m_nMaxRows); diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 224c275ffe90..8d627d62f482 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -26,7 +26,7 @@ OReportVisitor::OReportVisitor(ITraverseReport* _pTraverseReport) { OSL_ENSURE(m_pTraverseReport,"ReportDefintion must be not NULL!"); } -// ----------------------------------------------------------------------------- + void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xReportDefinition) { OSL_ENSURE(_xReportDefinition.is(),"ReportDefinition is NULL!"); @@ -67,7 +67,7 @@ void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xR if ( _xReportDefinition->getReportFooterOn() ) m_pTraverseReport->traverseReportFooter(_xReportDefinition->getReportFooter()); } -// ----------------------------------------------------------------------------- + void OReportVisitor::start(const uno::Reference< report::XGroup>& _xGroup) { OSL_ENSURE(_xGroup.is(),"Group is NULL!"); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index a597c6bf5929..f3efc5567540 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -44,7 +44,7 @@ namespace reportdesign using namespace com::sun::star; using namespace comphelper; -// ----------------------------------------------------------------------------- + uno::Sequence< OUString> lcl_getGroupAbsent() { OUString pProps[] = { @@ -55,7 +55,7 @@ uno::Sequence< OUString> lcl_getGroupAbsent() return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection) { if ( _bPageSection ) @@ -102,7 +102,7 @@ uno::Reference<report::XSection> OSection::createOSection( return pNew; } -// ----------------------------------------------------------------------------- + OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef ,const uno::Reference< report::XGroup >& xParentGroup ,const uno::Reference< uno::XComponentContext >& context @@ -127,16 +127,16 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef ,m_bInInsertNotify(false) { } -//-------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // OSection::~OSection() { } -//-------------------------------------------------------------------------- + //IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet) IMPLEMENT_FORWARD_REFCOUNT( OSection, SectionBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = SectionBase::queryInterface(_rType); @@ -149,7 +149,7 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno return aReturn; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::dispose() throw(uno::RuntimeException) { OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!"); @@ -163,7 +163,7 @@ void SAL_CALL OSection::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } -// ----------------------------------------------------------------------------- + // TODO: VirtualFunctionFinder: This is virtual function! // void SAL_CALL OSection::disposing() @@ -172,29 +172,29 @@ void SAL_CALL OSection::disposing() m_aContainerListeners.disposeAndClear( aDisposeEvent ); m_xContext.clear(); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.Section"); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) { uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_SECTION; return aSupported; } -//------------------------------------------------------------------------- + uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return cppu::supportsService(this, _rServiceName); } -// ----------------------------------------------------------------------------- + void OSection::init() { uno::Reference< report::XReportDefinition> xReport = getReportDefinition(); @@ -217,48 +217,48 @@ void OSection::init() assert(m_refCount > 1); } } -// ----------------------------------------------------------------------------- + // XSection -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getVisible() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bVisible; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) { set(PROPERTY_VISIBLE,_visible,m_bVisible); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OSection::getName() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sName; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setName( const OUString& _name ) throw (uno::RuntimeException) { set(PROPERTY_NAME,_name,m_sName); } -// ----------------------------------------------------------------------------- + ::sal_uInt32 SAL_CALL OSection::getHeight() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nHeight; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setHeight( ::sal_uInt32 _height ) throw (uno::RuntimeException) { set(PROPERTY_HEIGHT,_height,m_nHeight); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OSection::getBackColor() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bBacktransparent ? COL_TRANSPARENT : m_nBackgroundColor; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException) { sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); @@ -266,31 +266,31 @@ void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno: if ( !bTransparent ) set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getBackTransparent() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bBacktransparent; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setBackTransparent( ::sal_Bool _backtransparent ) throw (uno::RuntimeException) { set(PROPERTY_BACKTRANSPARENT,_backtransparent,m_bBacktransparent); if ( _backtransparent ) set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sConditionalPrintExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_sConditionalPrintExpression); } -// ----------------------------------------------------------------------------- + void OSection::checkNotPageHeaderFooter() { ::osl::MutexGuard aGuard(m_aMutex); @@ -303,7 +303,7 @@ void OSection::checkNotPageHeaderFooter() throw beans::UnknownPropertyException(); } } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OSection::getForceNewPage() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -311,7 +311,7 @@ void OSection::checkNotPageHeaderFooter() checkNotPageHeaderFooter(); return m_nForceNewPage; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION ) @@ -322,14 +322,14 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang checkNotPageHeaderFooter(); set(PROPERTY_FORCENEWPAGE,_forcenewpage,m_nForceNewPage); } -// ----------------------------------------------------------------------------- + ::sal_Int16 SAL_CALL OSection::getNewRowOrCol() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); return m_nNewRowOrCol; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION ) @@ -341,14 +341,14 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang:: set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getKeepTogether() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); return m_bKeepTogether; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { { @@ -358,27 +358,27 @@ void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang: set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getCanGrow() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setCanGrow( ::sal_Bool /*_cangrow*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getCanShrink() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setCanShrink( ::sal_Bool /*_canshrink*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::getRepeatSection() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -387,7 +387,7 @@ void SAL_CALL OSection::setCanShrink( ::sal_Bool /*_canshrink*/ ) throw (lang::I throw beans::UnknownPropertyException(); return m_bRepeatSection; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setRepeatSection( ::sal_Bool _repeatsection ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { { @@ -398,13 +398,13 @@ void SAL_CALL OSection::setRepeatSection( ::sal_Bool _repeatsection ) throw (lan } set(PROPERTY_REPEATSECTION,_repeatsection,m_bRepeatSection); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XGroup > SAL_CALL OSection::getGroup() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xGroup; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefinition() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -419,7 +419,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefiniti return xRet; } -// ----------------------------------------------------------------------------- + const ::std::vector< OUString >& lcl_getControlModelMap() { static ::std::vector< OUString > s_sControlModels; @@ -434,7 +434,7 @@ const ::std::vector< OUString >& lcl_getControlModelMap() return s_sControlModels; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -467,7 +467,7 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon } return xRet; } -// ----------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -476,7 +476,7 @@ uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( const OUString* pRet = aRet.empty() ? 0 : &aRet[0]; return uno::Sequence< OUString >(pRet, aRet.size()); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OSection::getParent( ) throw (uno::RuntimeException) { @@ -489,90 +489,90 @@ uno::Reference< uno::XInterface > SAL_CALL OSection::getParent( ) throw (uno::R } return xRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException) { throw lang::NoSupportException(); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OSection::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.addInterface(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aContainerListeners.removeInterface(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OSection::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XReportComponent>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OSection::hasElements( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xDrawPage.is() ? m_xDrawPage->hasElements() : sal_False; } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OSection::getCount( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xDrawPage.is() ? m_xDrawPage->getCount() : 0; } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_xDrawPage.is() ? m_xDrawPage->getByIndex(Index) : uno::Any(); } -// ----------------------------------------------------------------------------- + // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL OSection::createEnumeration( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return new ::comphelper::OEnumerationByIndex(static_cast<XSection*>(this)); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo( ) throw(uno::RuntimeException) { return SectionPropertySet::getPropertySetInfo(); } -// ------------------------------------------------------------------------- + void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return SectionPropertySet::getPropertyValue( PropertyName); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void OSection::lcl_copySection(const uno::Reference< report::XSection>& _xSource,uno::Reference< report::XSection>& _xDest) { if ( _xSource.is() ) @@ -591,7 +591,7 @@ void OSection::lcl_copySection(const uno::Reference< report::XSection>& _xSource } } } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException) { { @@ -603,7 +603,7 @@ void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) t } notifyElementAdded(xShape); } -// ----------------------------------------------------------------------------- + void SAL_CALL OSection::remove( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException) { { @@ -654,9 +654,9 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException) : 0; } -// ----------------------------------------------------------------------------- + // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw (uno::RuntimeException) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -664,7 +664,7 @@ sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw return (m_xDrawPage_Tunnel.is()) ? m_xDrawPage_Tunnel->getSomething(rId) : 0; } -// ----------------------------------------------------------------------------- + OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& _rxComponent ) { OSection* pContent( NULL ); @@ -675,7 +675,7 @@ OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& return pContent; } -//------------------------------------------------------------------------ + uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -690,7 +690,7 @@ uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId() } return pId->getImplementationId(); } -// ----------------------------------------------------------------------------- + void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShape ) { if ( !m_bInInsertNotify ) @@ -699,7 +699,7 @@ void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShap m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent); } } -// ----------------------------------------------------------------------------- + void OSection::notifyElementRemoved(const uno::Reference< drawing::XShape >& xShape) { if ( !m_bInRemoveNotify ) diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 1dd7bcff84ea..c95b0e4068eb 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -51,7 +51,7 @@ uno::Sequence< OUString > lcl_getShapeOptionals() return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } -// ----------------------------------------------------------------------------- + OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) :ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) @@ -61,7 +61,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) { m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager()); } -// ----------------------------------------------------------------------------- + OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape @@ -87,14 +87,14 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OShape::~OShape() { } -// ----------------------------------------------------------------------------- + //IMPLEMENT_FORWARD_XINTERFACE2(OShape,ShapeBase,ShapePropertySet) IMPLEMENT_FORWARD_REFCOUNT( OShape, ShapeBase ) -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = ShapeBase::queryInterface(_rType); @@ -107,30 +107,30 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno:: return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::dispose() throw(uno::RuntimeException) { ShapePropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponentContext > const & xContext) { return *(new OShape(xContext)); } -// ----------------------------------------------------------------------------- + OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.Shape"); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OShape::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > OShape::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -138,7 +138,7 @@ uno::Sequence< OUString > OShape::getSupportedServiceNames_Static( ) throw(uno: return aServices; } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(uno::RuntimeException) { if(m_sServiceName.isEmpty()) @@ -154,46 +154,46 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(un return aServices; } } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + // XReportComponent REPORTCOMPONENT_IMPL(OShape,m_aProps.aComponent) REPORTCOMPONENT_IMPL2(OShape,m_aProps.aComponent) REPORTCOMPONENT_MASTERDETAIL(OShape,m_aProps.aComponent) REPORTCONTROLFORMAT_IMPL2(OShape,m_aProps.aFormatProperties) -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OShape::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OShape::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setControlBackgroundTransparent( ::sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo( ) throw(uno::RuntimeException) { //return ShapePropertySet::getPropertySetInfo(); return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } -// ----------------------------------------------------------------------------- + cppu::IPropertyArrayHelper& OShape::getInfoHelper() { if ( !m_pAggHelper.get() ) @@ -206,7 +206,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper() return *(m_pAggHelper.get()); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -216,7 +216,7 @@ void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY ) ShapePropertySet::setPropertyValue( aPropertyName, aValue ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -227,7 +227,7 @@ uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw return ShapePropertySet::getPropertyValue( PropertyName); return uno::Any(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -237,7 +237,7 @@ void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || aPropertyName.isEmpty() ) ShapePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -247,7 +247,7 @@ void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyNam if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || aPropertyName.isEmpty() ) ShapePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -257,7 +257,7 @@ void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, c if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || PropertyName.isEmpty() ) ShapePropertySet::addVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); @@ -267,40 +267,40 @@ void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || PropertyName.isEmpty() ) ShapePropertySet::removeVetoableChangeListener( PropertyName, aListener ); } -// ----------------------------------------------------------------------------- + // XReportControlModel OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OShape::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.bPrintWhenGroupChange; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } -// ----------------------------------------------------------------------------- + // XCloneable uno::Reference< util::XCloneable > SAL_CALL OShape::createClone( ) throw (uno::RuntimeException) @@ -329,13 +329,13 @@ uno::Reference< util::XCloneable > SAL_CALL OShape::createClone( ) throw (uno:: } return xSet.get(); } -// ----------------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL OShape::getParent( ) throw (uno::RuntimeException) { return OShapeHelper::getParent(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -345,78 +345,78 @@ uno::Reference< report::XFormatCondition > SAL_CALL OShape::createFormatConditio { return new OFormatCondition(m_aProps.aComponent.m_xContext); } -// ----------------------------------------------------------------------------- + // XContainer void SAL_CALL OShape::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.addContainerListener(xListener); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { m_aProps.removeContainerListener(xListener); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL OShape::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OShape::hasElements( ) throw (uno::RuntimeException) { return m_aProps.hasElements(); } -// ----------------------------------------------------------------------------- + // XIndexContainer void SAL_CALL OShape::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.insertByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.removeByIndex(Index); } -// ----------------------------------------------------------------------------- + // XIndexReplace void SAL_CALL OShape::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { m_aProps.replaceByIndex(Index,Element); } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL OShape::getCount( ) throw (uno::RuntimeException) { return m_aProps.getCount(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OShape::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { return m_aProps.getByIndex( Index ); } -// ----------------------------------------------------------------------------- + // XShape awt::Point SAL_CALL OShape::getPosition( ) throw (uno::RuntimeException) { return OShapeHelper::getPosition(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { OShapeHelper::setPosition(aPosition,this); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OShape::getSize( ) throw (uno::RuntimeException) { return OShapeHelper::getSize(this); } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { OShapeHelper::setSize(aSize,this); } -// ----------------------------------------------------------------------------- + // XShapeDescriptor OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException) @@ -426,46 +426,46 @@ OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException) return m_aProps.aComponent.m_xShape->getShapeType(); return OUString("com.sun.star.drawing.CustomShape"); } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_ZORDER) >>= m_nZOrder; return m_nZOrder; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_ZORDER,uno::makeAny(_zorder)); set(PROPERTY_ZORDER,_zorder,m_nZOrder); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OShape::getOpaque() throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bOpaque; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setOpaque( ::sal_Bool _opaque ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); set(PROPERTY_OPAQUE,_opaque,m_bOpaque); } -// ----------------------------------------------------------------------------- + drawing::HomogenMatrix3 SAL_CALL OShape::getTransformation() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_TRANSFORMATION) >>= m_Transformation; return m_Transformation; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transformation ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_TRANSFORMATION,uno::makeAny(_transformation)); set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -473,40 +473,40 @@ OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException) return m_CustomShapeEngine; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine)); set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEDATA) >>= m_CustomShapeData; return m_CustomShapeData; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata)); set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData); } -// ----------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > SAL_CALL OShape::getCustomShapeGeometry() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY) >>= m_CustomShapeGeometry; return m_CustomShapeGeometry; } -// ----------------------------------------------------------------------------- + void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::PropertyValue >& _customshapegeometry ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY,uno::makeAny(_customshapegeometry)); set(PROPERTY_CUSTOMSHAPEGEOMETRY,_customshapegeometry,m_CustomShapeGeometry); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + // ============================================================================= }// namespace reportdesign diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index be6dacb58c6d..718f2b4cc66a 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -39,7 +39,7 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt } return xRet; } -// ----------------------------------------------------------------------------- + void throwIllegallArgumentException( const OUString& _sTypeName ,const uno::Reference< uno::XInterface >& ExceptionContext_ ,const ::sal_Int16& ArgumentPosition_ @@ -50,7 +50,7 @@ void throwIllegallArgumentException( const OUString& _sTypeName sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName); throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_); } -// ----------------------------------------------------------------------------- + uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XReportComponent>& _xReportComponent ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,const OUString& _sServiceName) @@ -60,7 +60,7 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe ::comphelper::copyProperties(_xReportComponent.get(),xClone.get()); return xClone.get(); } -// ----------------------------------------------------------------------------- + // ============================================================================= } // namespace reportdesign diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 08c1fcf6bd69..cf4cd2311be9 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -24,13 +24,13 @@ namespace rptui // ============================================================================= // = ConditionalExpression // ============================================================================= - // ----------------------------------------------------------------------------- + ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern ) :m_sPattern( OUString::createFromAscii( _pAsciiPattern ) ) { } - // ----------------------------------------------------------------------------- + OUString ConditionalExpression::assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const { OUString sExpression( m_sPattern ); @@ -59,7 +59,7 @@ namespace rptui return sExpression; } - // ----------------------------------------------------------------------------- + bool ConditionalExpression::matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const { (void)_rExpression; @@ -165,7 +165,7 @@ namespace rptui // ============================================================================= // = ConditionalExpressionFactory // ============================================================================= - // ----------------------------------------------------------------------------- + size_t ConditionalExpressionFactory::getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp ) { ConditionalExpressions aEmpty; diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index b14d4ad2966b..f5ac039e8591 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -39,17 +39,17 @@ namespace rptui //==================================================================== //= ConditionUpdater //==================================================================== - //-------------------------------------------------------------------- + ConditionUpdater::ConditionUpdater() { } - //-------------------------------------------------------------------- + ConditionUpdater::~ConditionUpdater() { } - //-------------------------------------------------------------------- + void ConditionUpdater::notifyPropertyChange( const PropertyChangeEvent& _rEvent ) { if ( !impl_lateInit_nothrow() ) @@ -65,7 +65,7 @@ namespace rptui } } - //-------------------------------------------------------------------- + bool ConditionUpdater::impl_lateInit_nothrow() { if ( !m_aConditionalExpressions.empty() ) @@ -75,7 +75,7 @@ namespace rptui return true; } - //-------------------------------------------------------------------- + void ConditionUpdater::impl_adjustFormatConditions_nothrow( const Reference< XReportControlModel >& _rxRptControlModel, const OUString& _rOldDataSource, const OUString& _rNewDataSource ) { diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index 689c5d9581cd..a05b58fbb0dc 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -30,7 +30,7 @@ namespace rptui namespace { - //---------------------------------------------------------------- + const OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { static OUString s_sPrefix( "rpt:" ); @@ -39,7 +39,7 @@ namespace rptui return s_sPrefix; } - //---------------------------------------------------------------- + const OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { static OUString s_sPrefix( "field:" ); @@ -52,14 +52,14 @@ namespace rptui //==================================================================== //= ReportFormula //==================================================================== - //-------------------------------------------------------------------- + ReportFormula::ReportFormula( const OUString& _rFormula ) :m_eType( Invalid ) { impl_construct( _rFormula ); } - //-------------------------------------------------------------------- + ReportFormula::ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression ) :m_eType( _eType ) { @@ -91,11 +91,11 @@ namespace rptui m_sUndecoratedContent = _rFieldOrExpression; } - //-------------------------------------------------------------------- + ReportFormula::~ReportFormula() { } - //-------------------------------------------------------------------- + void ReportFormula::impl_construct( const OUString& _rFormula ) { m_sCompleteFormula = _rFormula; @@ -126,7 +126,7 @@ namespace rptui m_eType = Invalid; } - //-------------------------------------------------------------------- + OUString ReportFormula::getBracketedFieldOrExpression() const { bool bIsField = ( getType() == Field ); @@ -139,7 +139,7 @@ namespace rptui return aFieldContent.makeStringAndClear(); } - //-------------------------------------------------------------------- + const OUString& ReportFormula::getUndecoratedContent() const { return m_sUndecoratedContent; @@ -155,7 +155,7 @@ namespace rptui m_sUndecoratedContent = _rHd.m_sUndecoratedContent; return *this; } - //-------------------------------------------------------------------- + OUString ReportFormula::getEqualUndecoratedContent() const { OUStringBuffer aBuffer; diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 2e8714e4d930..17d896fa0d9b 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -22,7 +22,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -//--------------------------------------------------- + #include <osl/thread.h> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -40,13 +40,13 @@ namespace reportdesign //================================================================== SimpleResMgr* ResourceManager::m_pImpl = NULL; - //------------------------------------------------------------------ + ResourceManager::EnsureDelete::~EnsureDelete() { delete ResourceManager::m_pImpl; } - //------------------------------------------------------------------ + void ResourceManager::ensureImplExists(const uno::Reference< lang::XMultiComponentFactory >& /* _rM */) { if (!m_pImpl) @@ -58,7 +58,7 @@ namespace reportdesign } } - //------------------------------------------------------------------ + OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM) { OUString sReturn; diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 7a8759b904b6..8600ddd12641 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -54,20 +54,20 @@ public: ResMgr* getResManager(); }; -//------------------------------------------------------------------------- + OModuleImpl::OModuleImpl() :m_pResources(NULL) { } -//------------------------------------------------------------------------- + OModuleImpl::~OModuleImpl() { if (m_pResources) delete m_pResources; } -//------------------------------------------------------------------------- + ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -92,21 +92,21 @@ namespace sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; -//------------------------------------------------------------------------- + ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); } -//------------------------------------------------------------------------- + void OModule::registerClient() { ::osl::MutexGuard aGuard(theOModuleMutex::get()); ++s_nClients; } -//------------------------------------------------------------------------- + void OModule::revokeClient() { ::osl::MutexGuard aGuard(theOModuleMutex::get()); @@ -117,7 +117,7 @@ void OModule::revokeClient() } } -//------------------------------------------------------------------------- + void OModule::ensureImpl() { if (s_pImpl) diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index e10f891eade4..bb806638e89c 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -86,11 +86,11 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource } osl_atomic_decrement(&m_refCount); } -// ----------------------------------------------------------------------------- + OPropertyMediator::~OPropertyMediator() { } -// ----------------------------------------------------------------------------- + void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -156,13 +156,13 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt m_bInChange = sal_False; } } -// ----------------------------------------------------------------------------- + void SAL_CALL OPropertyMediator::disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); disposing(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OPropertyMediator::disposing() { stopListening(); @@ -171,7 +171,7 @@ void SAL_CALL OPropertyMediator::disposing() m_xDest.clear(); m_xDestInfo.clear(); } -// ----------------------------------------------------------------------------- + void OPropertyMediator::stopListening() { if ( m_xSource.is() ) @@ -179,7 +179,7 @@ void OPropertyMediator::stopListening() if ( m_xDest.is() ) m_xDest->removePropertyChangeListener(OUString(), this); } -// ----------------------------------------------------------------------------- + void OPropertyMediator::startListening() { if ( m_xSource.is() ) @@ -187,7 +187,7 @@ void OPropertyMediator::startListening() if ( m_xDest.is() ) m_xDest->addPropertyChangeListener(OUString(), this); } -// ----------------------------------------------------------------------------- + //........................................................................ } // namespace dbaccess //........................................................................ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 63ce08fd7e6b..2b1ba67c7be3 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -45,7 +45,7 @@ using namespace reportdesign; using namespace com::sun::star; TYPEINIT1(OReportModel,SdrModel); -//---------------------------------------------------------------------------- + OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) : SdrModel(SvtPathOptions().GetPalettePath(),NULL,_pReportDefinition) @@ -57,13 +57,13 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition SetSdrUndoFactory(new OReportUndoFactory); } -//---------------------------------------------------------------------------- + OReportModel::~OReportModel() { detachController(); m_pUndoEnv->release(); } -// ----------------------------------------------------------------------------- + void OReportModel::detachController() { m_pReportDefinition = NULL; @@ -72,14 +72,14 @@ void OReportModel::detachController() ClearUndoBuffer(); m_pUndoEnv->Clear(OXUndoEnvironment::Accessor()); } -//---------------------------------------------------------------------------- + SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) { OSL_FAIL("Who called me!"); return NULL; } -//---------------------------------------------------------------------------- + void OReportModel::SetChanged( bool bChanged ) { @@ -87,25 +87,25 @@ void OReportModel::SetChanged( bool bChanged ) SetModified( bChanged ); } -//---------------------------------------------------------------------------- + OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } -//---------------------------------------------------------------------------- + void OReportModel::SetModified(sal_Bool _bModified) { if ( m_pController ) m_pController->setModified(_bModified); } -// ----------------------------------------------------------------------------- + SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum) { OReportPage* pPage = dynamic_cast<OReportPage*>(SdrModel::RemovePage(nPgNum)); return pPage; } -// ----------------------------------------------------------------------------- + OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection >& _xSection) { SolarMutexGuard aSolarGuard; @@ -114,7 +114,7 @@ OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection m_pUndoEnv->AddSection(_xSection); return pPage; } -// ----------------------------------------------------------------------------- + OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xSection) { OReportPage* pPage = NULL; @@ -127,7 +127,7 @@ OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xS } return pPage; } -// ----------------------------------------------------------------------------- + SvxNumType OReportModel::GetPageNumType() const { uno::Reference< report::XReportDefinition > xReportDefinition( getReportDefinition() ); @@ -136,19 +136,19 @@ SvxNumType OReportModel::GetPageNumType() const return SVX_ARABIC; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XReportDefinition > OReportModel::getReportDefinition() const { uno::Reference< report::XReportDefinition > xReportDefinition = m_pReportDefinition; OSL_ENSURE( xReportDefinition.is(), "OReportModel::getReportDefinition: invalid model at our controller!" ); return xReportDefinition; } -// ----------------------------------------------------------------------------- + uno::Reference< uno::XInterface > OReportModel::createUnoModel() { return uno::Reference< uno::XInterface >(getReportDefinition(),uno::UNO_QUERY); } -// ----------------------------------------------------------------------------- + uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation) { uno::Reference< uno::XInterface > xRet; diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index fb1f18585de8..daf58bf1eebf 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -81,7 +81,7 @@ using namespace reportdesign; using namespace container; using namespace script; using namespace report; -//---------------------------------------------------------------------------- + sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportComponent>& _xComponent) { uno::Reference< lang::XServiceInfo > xServiceInfo( _xComponent , uno::UNO_QUERY ); @@ -315,13 +315,13 @@ OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComp { m_xReportComponent = _xComponent; } -//---------------------------------------------------------------------------- + OObjectBase::OObjectBase(const OUString& _sComponentName) :m_sComponentName(_sComponentName) ,m_bIsListening(sal_False) { } -//---------------------------------------------------------------------------- + OObjectBase::~OObjectBase() { m_xMediator.reset(); @@ -348,7 +348,7 @@ uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent() { return uno::Reference< beans::XPropertySet>(); } -//---------------------------------------------------------------------------- + void OObjectBase::StartListening() { OSL_ENSURE(!isListening(), "OUnoObject::StartListening: already listening!"); @@ -365,7 +365,7 @@ void OObjectBase::StartListening() } } } -//---------------------------------------------------------------------------- + void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/) { OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!"); @@ -389,7 +389,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/) m_xPropertyChangeListener.clear(); } } -//---------------------------------------------------------------------------- + void OObjectBase::SetPropsFromRect(const Rectangle& _rRect) { // set properties @@ -406,17 +406,17 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect) //pModel->GetRefDevice()->Invalidate(INVALIDATE_CHILDREN); } } -//---------------------------------------------------------------------------- + void OObjectBase::_propertyChange( const beans::PropertyChangeEvent& /*evt*/ ) throw( uno::RuntimeException) { } -//---------------------------------------------------------------------------- + void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/) { // do nothing } -//---------------------------------------------------------------------------- + sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const { sal_Bool bSupports = sal_False; @@ -429,7 +429,7 @@ sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const return bSupports; } -//---------------------------------------------------------------------------- + void OObjectBase::ensureSdrObjectOwnership( const uno::Reference< uno::XInterface >& _rxShape ) { // UNDO in the report designer is implemented at the level of the XShapes, not @@ -450,7 +450,7 @@ void OObjectBase::ensureSdrObjectOwnership( const uno::Reference< uno::XInterfac } } -//---------------------------------------------------------------------------- + uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrObject ) { uno::Reference< uno::XInterface > xShape( _rSdrObject.getWeakUnoShape() ); @@ -467,7 +467,7 @@ uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrOb return xShape; } -//---------------------------------------------------------------------------- + TYPEINIT1(OCustomShape, SdrObjCustomShape); OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xComponent ) @@ -477,7 +477,7 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) ); m_bIsListening = sal_True; } -//---------------------------------------------------------------------------- + OCustomShape::OCustomShape(const OUString& _sComponentName) :SdrObjCustomShape() ,OObjectBase(_sComponentName) @@ -485,7 +485,7 @@ OCustomShape::OCustomShape(const OUString& _sComponentName) m_bIsListening = sal_True; } -//---------------------------------------------------------------------------- + OCustomShape::~OCustomShape() { } @@ -494,22 +494,22 @@ sal_uInt16 OCustomShape::GetObjIdentifier() const { return sal_uInt16(OBJ_CUSTOMSHAPE); } -//---------------------------------------------------------------------------- + sal_uInt32 OCustomShape::GetObjInventor() const { return ReportInventor; } -//---------------------------------------------------------------------------- + SdrPage* OCustomShape::GetImplPage() const { return GetPage(); } -//---------------------------------------------------------------------------- + void OCustomShape::SetSnapRectImpl(const Rectangle& _rRect) { SetSnapRect( _rRect ); } -//---------------------------------------------------------------------------- + sal_Int32 OCustomShape::GetStep() const { // get step property @@ -517,7 +517,7 @@ sal_Int32 OCustomShape::GetStep() const OSL_FAIL("Who called me!"); return nStep; } -//---------------------------------------------------------------------------- + void OCustomShape::NbcMove( const Size& rSize ) { if ( m_bIsListening ) @@ -540,20 +540,20 @@ void OCustomShape::NbcMove( const Size& rSize ) else SdrObjCustomShape::NbcMove( rSize ); } -//---------------------------------------------------------------------------- + void OCustomShape::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { SdrObjCustomShape::NbcResize( rRef, xFract, yFract ); SetPropsFromRect(GetSnapRect()); } -//---------------------------------------------------------------------------- + void OCustomShape::NbcSetLogicRect(const Rectangle& rRect) { SdrObjCustomShape::NbcSetLogicRect(rRect); SetPropsFromRect(rRect); } -//---------------------------------------------------------------------------- + bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { bool bResult = SdrObjCustomShape::EndCreate(rStat, eCmd); @@ -572,7 +572,7 @@ bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bResult; } -//---------------------------------------------------------------------------- + void OCustomShape::SetObjectItemHelper(const SfxPoolItem& rItem) { SetObjectItem(rItem); @@ -586,7 +586,7 @@ uno::Reference< beans::XPropertySet> OCustomShape::getAwtComponent() return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY); } -//---------------------------------------------------------------------------- + uno::Reference< uno::XInterface > OCustomShape::getUnoShape() { uno::Reference< uno::XInterface> xShape = OObjectBase::getUnoShapeOf( *this ); @@ -606,10 +606,10 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx m_xReportComponent.clear(); } -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + TYPEINIT1(OUnoObject, SdrUnoObj); -//---------------------------------------------------------------------------- + OUnoObject::OUnoObject(const OUString& _sComponentName ,const OUString& rModelName ,sal_uInt16 _nObjectType) @@ -620,7 +620,7 @@ OUnoObject::OUnoObject(const OUString& _sComponentName if ( !rModelName.isEmpty() ) impl_initializeModel_nothrow(); } -//---------------------------------------------------------------------------- + OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent ,const OUString& rModelName ,sal_uInt16 _nObjectType) @@ -634,7 +634,7 @@ OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xCompon impl_initializeModel_nothrow(); } -//---------------------------------------------------------------------------- + OUnoObject::~OUnoObject() { } @@ -678,22 +678,22 @@ sal_uInt16 OUnoObject::GetObjIdentifier() const { return sal_uInt16(m_nObjectType); } -//---------------------------------------------------------------------------- + sal_uInt32 OUnoObject::GetObjInventor() const { return ReportInventor; } -//---------------------------------------------------------------------------- + SdrPage* OUnoObject::GetImplPage() const { return GetPage(); } -//---------------------------------------------------------------------------- + void OUnoObject::SetSnapRectImpl(const Rectangle& _rRect) { SetSnapRect( _rRect ); } -//---------------------------------------------------------------------------- + sal_Int32 OUnoObject::GetStep() const { // get step property @@ -702,7 +702,7 @@ sal_Int32 OUnoObject::GetStep() const return nStep; } -//---------------------------------------------------------------------------- + void OUnoObject::NbcMove( const Size& rSize ) { @@ -750,7 +750,7 @@ void OUnoObject::NbcMove( const Size& rSize ) SdrUnoObj::NbcMove( rSize ); } -//---------------------------------------------------------------------------- + void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { @@ -765,7 +765,7 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac // start listening OObjectBase::StartListening(); } -//---------------------------------------------------------------------------- + void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) { SdrUnoObj::NbcSetLogicRect(rRect); @@ -778,7 +778,7 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) // start listening OObjectBase::StartListening(); } -//---------------------------------------------------------------------------- + bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { @@ -809,7 +809,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bResult; } -//---------------------------------------------------------------------------- + OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { sal_uInt16 nResId = 0; @@ -942,9 +942,9 @@ OUnoObject* OUnoObject::Clone() const { return CloneHelper< OUnoObject >(); } -//---------------------------------------------------------------------------- + // OOle2Obj -//---------------------------------------------------------------------------- + TYPEINIT1(OOle2Obj, SdrOle2Obj); OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType) :SdrOle2Obj() @@ -956,7 +956,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent, impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) ); m_bIsListening = sal_True; } -//---------------------------------------------------------------------------- + OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType) :SdrOle2Obj() ,OObjectBase(_sComponentName) @@ -965,7 +965,7 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType) { m_bIsListening = sal_True; } -//---------------------------------------------------------------------------- + OOle2Obj::~OOle2Obj() { } @@ -974,22 +974,22 @@ sal_uInt16 OOle2Obj::GetObjIdentifier() const { return m_nType; } -//---------------------------------------------------------------------------- + sal_uInt32 OOle2Obj::GetObjInventor() const { return ReportInventor; } -//---------------------------------------------------------------------------- + SdrPage* OOle2Obj::GetImplPage() const { return GetPage(); } -//---------------------------------------------------------------------------- + void OOle2Obj::SetSnapRectImpl(const Rectangle& _rRect) { SetSnapRect( _rRect ); } -//---------------------------------------------------------------------------- + sal_Int32 OOle2Obj::GetStep() const { // get step property @@ -998,7 +998,7 @@ sal_Int32 OOle2Obj::GetStep() const return nStep; } -//---------------------------------------------------------------------------- + void OOle2Obj::NbcMove( const Size& rSize ) { @@ -1051,7 +1051,7 @@ void OOle2Obj::NbcMove( const Size& rSize ) SdrOle2Obj::NbcMove( rSize ); } -//---------------------------------------------------------------------------- + void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { @@ -1066,7 +1066,7 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti // start listening OObjectBase::StartListening(); } -//---------------------------------------------------------------------------- + void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) { SdrOle2Obj::NbcSetLogicRect(rRect); @@ -1079,7 +1079,7 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) // start listening OObjectBase::StartListening(); } -//---------------------------------------------------------------------------- + bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { @@ -1260,7 +1260,7 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor } return xReturn; } -//---------------------------------------------------------------------------- + //============================================================================ } // rptui //============================================================================ diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 80752efb0c79..ac676eb9dbb4 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -26,34 +26,34 @@ namespace rptui // OObjectListener //============================================================================ -//---------------------------------------------------------------------------- + OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { } -//---------------------------------------------------------------------------- + OObjectListener::~OObjectListener() { } // XEventListener -//---------------------------------------------------------------------------- + void SAL_CALL OObjectListener::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) { } // XPropertyChangeListener -//---------------------------------------------------------------------------- + void SAL_CALL OObjectListener::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException) { m_pObject->_propertyChange( evt ); } -//---------------------------------------------------------------------------- + //============================================================================ // DlgEdHint @@ -61,7 +61,7 @@ void SAL_CALL OObjectListener::propertyChange( const ::com::sun::star::beans::P TYPEINIT1( DlgEdHint, SfxHint ); -//---------------------------------------------------------------------------- + DlgEdHint::DlgEdHint(DlgEdHintKind eHint) : eHintKind(eHint) @@ -69,11 +69,11 @@ DlgEdHint::DlgEdHint(DlgEdHintKind eHint) { } -//---------------------------------------------------------------------------- + DlgEdHint::~DlgEdHint() { } -//---------------------------------------------------------------------------- + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index f20360611eab..8eba54be8f5d 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -29,7 +29,7 @@ namespace rptui using namespace ::com::sun::star; TYPEINIT1( OReportPage, SdrPage ); -//---------------------------------------------------------------------------- + OReportPage::OReportPage( OReportModel& _rModel ,const uno::Reference< report::XSection >& _xSection ,bool bMasterPage ) @@ -40,7 +40,7 @@ OReportPage::OReportPage( OReportModel& _rModel { } -//---------------------------------------------------------------------------- + OReportPage::OReportPage( const OReportPage& rPage ) :SdrPage( rPage ) @@ -51,20 +51,20 @@ OReportPage::OReportPage( const OReportPage& rPage ) { } -//---------------------------------------------------------------------------- + OReportPage::~OReportPage() { } -//---------------------------------------------------------------------------- + SdrPage* OReportPage::Clone() const { return new OReportPage( *this ); } -//---------------------------------------------------------------------------- + sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject) { sal_uLong nCount = GetObjCount(); @@ -80,7 +80,7 @@ sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent } return i; } -//---------------------------------------------------------------------------- + void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent >& _xObject) { sal_uLong nPos = getIndexOf(_xObject); @@ -93,7 +93,7 @@ void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent RemoveObject(nPos); } } -// ----------------------------------------------------------------------------- + SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum) { SdrObject* pObj = SdrPage::RemoveObject(nObjNum); @@ -115,7 +115,7 @@ SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum) } return pObj; } -//---------------------------------------------------------------------------- + void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) { OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!"); @@ -131,17 +131,17 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& if ( pObject ) pObject->StartListening(); } -// ----------------------------------------------------------------------------- + uno::Reference< report::XSection > OReportPage::getSection() const { return m_xSection; } -// ----------------------------------------------------------------------------- + uno::Reference< uno::XInterface > OReportPage::createUnoPage() { return static_cast<cppu::OWeakObject*>( new reportdesign::OReportDrawPage(this,m_xSection) ); } -// ----------------------------------------------------------------------------- + void OReportPage::removeTempObject(SdrObject *_pToRemoveObj) { if (_pToRemoveObj) @@ -174,7 +174,7 @@ void OReportPage::resetSpecialMode() m_bSpecialInsertMode = false; } -// ----------------------------------------------------------------------------- + void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason) { SdrPage::NbcInsertObject(pObj, nPos, pReason); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index b8738c2fff17..bcb94ed259c6 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -56,7 +56,7 @@ namespace rptui using namespace util; using namespace container; using namespace report; -//---------------------------------------------------------------------------- + ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> OGroupHelper::getMemberFunction(const Reference< XSection >& _xSection) { ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter); @@ -65,7 +65,7 @@ namespace rptui pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader); return pMemFunSection; } -// ----------------------------------------------------------------------------- + ::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> OReportHelper::getMemberFunction(const Reference< XSection >& _xSection) { uno::Reference< report::XReportDefinition> xReportDefinition(_xSection->getReportDefinition()); @@ -81,9 +81,9 @@ namespace rptui return pMemFunSection; } -//------------------------------------------------------------------------------ + TYPEINIT1( OCommentUndoAction, SdrUndoAction ); -//---------------------------------------------------------------------------- + OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) :SdrUndoAction(_rMod) { @@ -94,15 +94,15 @@ OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) OCommentUndoAction::~OCommentUndoAction() { } -//---------------------------------------------------------------------------- + void OCommentUndoAction::Undo() { } -//---------------------------------------------------------------------------- + void OCommentUndoAction::Redo() { } -//------------------------------------------------------------------------------ + OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod ,Action _eAction ,const uno::Reference< container::XIndexContainer > _xContainer @@ -118,7 +118,7 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod // we now own the element m_xOwnElement = m_xElement; } -//------------------------------------------------------------------------------ + OUndoContainerAction::~OUndoContainerAction() { // if we own the object .... @@ -150,7 +150,7 @@ OUndoContainerAction::~OUndoContainerAction() } } } -//------------------------------------------------------------------------------ + void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) { if ( m_xContainer.is() ) @@ -162,7 +162,7 @@ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) m_xOwnElement = NULL; } -//------------------------------------------------------------------------------ + void OUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); @@ -188,7 +188,7 @@ void OUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) ) m_xOwnElement = m_xElement; } -//------------------------------------------------------------------------------ + void OUndoContainerAction::Undo() { if ( m_xElement.is() ) @@ -217,7 +217,7 @@ void OUndoContainerAction::Undo() } } -//------------------------------------------------------------------------------ + void OUndoContainerAction::Redo() { if ( m_xElement.is() ) @@ -244,7 +244,7 @@ void OUndoContainerAction::Redo() } } } -// ----------------------------------------------------------------------------- + OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,Action _eAction ,::std::mem_fun_t< uno::Reference< report::XSection > @@ -257,7 +257,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,m_pMemberFunction(_pMemberFunction) { } -//------------------------------------------------------------------------------ + void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); @@ -274,7 +274,7 @@ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) m_xOwnElement = NULL; } -//------------------------------------------------------------------------------ + void OUndoGroupSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); @@ -290,7 +290,7 @@ void OUndoGroupSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) // from now on, we own this object m_xOwnElement = m_xElement; } -//---------------------------------------------------------------------------- + OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,Action _eAction ,::std::mem_fun_t< uno::Reference< report::XSection > @@ -303,7 +303,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,m_pMemberFunction(_pMemberFunction) { } -//------------------------------------------------------------------------------ + void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); @@ -326,7 +326,7 @@ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) m_xOwnElement = NULL; } -//------------------------------------------------------------------------------ + void OUndoReportSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); @@ -341,7 +341,7 @@ void OUndoReportSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) // from now on, we own this object m_xOwnElement = m_xElement; } -//------------------------------------------------------------------------------ + ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt) :OCommentUndoAction(rNewMod,0) ,m_xObj(evt.Source, UNO_QUERY) @@ -350,23 +350,23 @@ ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const Property ,m_aOldValue(evt.OldValue) { } -//------------------------------------------------------------------------------ + void ORptUndoPropertyAction::Undo() { setProperty(sal_True); } -//------------------------------------------------------------------------------ + void ORptUndoPropertyAction::Redo() { setProperty(sal_False); } -// ----------------------------------------------------------------------------- + Reference< XPropertySet> ORptUndoPropertyAction::getObject() { return m_xObj; } -// ----------------------------------------------------------------------------- + void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) { Reference< XPropertySet> xObj = getObject(); @@ -402,12 +402,12 @@ OUndoPropertyGroupSectionAction::OUndoPropertyGroupSectionAction(SdrModel& _rMod ,m_pMemberFunction(_pMemberFunction) { } -// ----------------------------------------------------------------------------- + Reference< XPropertySet> OUndoPropertyGroupSectionAction::getObject() { return m_pMemberFunction(&m_aGroupHelper).get(); } -// ----------------------------------------------------------------------------- + OUndoPropertyReportSectionAction::OUndoPropertyReportSectionAction(SdrModel& _rMod ,const PropertyChangeEvent& evt ,::std::mem_fun_t< uno::Reference< report::XSection > @@ -419,7 +419,7 @@ OUndoPropertyReportSectionAction::OUndoPropertyReportSectionAction(SdrModel& _rM ,m_pMemberFunction(_pMemberFunction) { } -// ----------------------------------------------------------------------------- + Reference< XPropertySet> OUndoPropertyReportSectionAction::getObject() { return m_pMemberFunction(&m_aReportHelper).get(); diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 0f54f75a36d6..c98528025aac 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -58,7 +58,7 @@ namespace rptui using namespace util; using namespace container; using namespace report; -//---------------------------------------------------------------------------- + struct PropertyInfo @@ -92,7 +92,7 @@ struct ObjectInfo typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > > PropertySetInfoCache; -// ----------------------------------------------------------------------------- + class OXUndoEnvironmentImpl { @@ -122,19 +122,19 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_ { } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + OXUndoEnvironment::OXUndoEnvironment(OReportModel& _rModel) :m_pImpl(new OXUndoEnvironmentImpl(_rModel) ) { StartListening(m_pImpl->m_rModel); } -//------------------------------------------------------------------------------ + OXUndoEnvironment::~OXUndoEnvironment() { } -// ----------------------------------------------------------------------------- + void OXUndoEnvironment::Lock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); @@ -147,7 +147,7 @@ void OXUndoEnvironment::UnLock() osl_atomic_decrement( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } -// ----------------------------------------------------------------------------- + void OXUndoEnvironment::RemoveSection(OReportPage* _pPage) { if ( _pPage ) @@ -157,7 +157,7 @@ void OXUndoEnvironment::RemoveSection(OReportPage* _pPage) RemoveElement( xSection ); } } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { OUndoEnvLock aLock(*this); @@ -185,7 +185,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) EndListening(m_pImpl->m_rModel); } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::ModeChanged() { m_pImpl->m_bReadOnly = !m_pImpl->m_bReadOnly; @@ -196,15 +196,15 @@ void OXUndoEnvironment::ModeChanged() EndListening(m_pImpl->m_rModel); } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if (rHint.ISA(SfxSimpleHint) && ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_MODECHANGED ) ModeChanged(); } -// ----------------------------------------------------------------------------- + // XEventListener -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { // check if it's an object we have cached information about @@ -220,7 +220,7 @@ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeE } // XPropertyChangeListener -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEvent ) throw(uno::RuntimeException) { @@ -346,7 +346,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( pUndo ); pController->InvalidateAll(); } -// ----------------------------------------------------------------------------- + ::std::vector< uno::Reference< container::XChild> >::const_iterator OXUndoEnvironment::getSection(const Reference<container::XChild>& _xContainer) const { ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = m_pImpl->m_aSections.end(); @@ -363,7 +363,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv return aFind; } // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -414,13 +414,13 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro implSetModified(); } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::implSetModified() { m_pImpl->m_rModel.SetModified( sal_True ); } -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -436,7 +436,7 @@ void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thro implSetModified(); } -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -481,13 +481,13 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw implSetModified(); } -//------------------------------------------------------------------------------ + void SAL_CALL OXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) { implSetModified(); } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::AddSection(const Reference< report::XSection > & _xSection) { OUndoEnvLock aLock(*this); @@ -505,7 +505,7 @@ void OXUndoEnvironment::AddSection(const Reference< report::XSection > & _xSecti } } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::RemoveSection(const Reference< report::XSection > & _xSection) { OUndoEnvLock aLock(*this); @@ -520,7 +520,7 @@ void OXUndoEnvironment::RemoveSection(const Reference< report::XSection > & _xSe catch(uno::Exception&){} } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element) { // am Container horchen @@ -547,7 +547,7 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxContainer.is(), "OXUndoEnvironment::switchListening: invalid container!" ); @@ -584,7 +584,7 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon } } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxObject.is(), "OXUndoEnvironment::switchListening: how should I listen at a NULL object?" ); @@ -617,7 +617,7 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec } } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement ) { if ( !IsLocked() ) @@ -631,7 +631,7 @@ void OXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement ) switchListening( _rxElement, true ); } -//------------------------------------------------------------------------------ + void OXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement) { uno::Reference<beans::XPropertySet> xProp(_rxElement,uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index a55d0f165107..8973577c1fd3 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -54,7 +54,7 @@ namespace rptui //==================================================================== //= FormatNormalizer //==================================================================== - //-------------------------------------------------------------------- + FormatNormalizer::FormatNormalizer( const OReportModel& _rModel ) :m_rModel( _rModel ) ,m_xReportDefinition( ) @@ -62,12 +62,12 @@ namespace rptui { } - //-------------------------------------------------------------------- + FormatNormalizer::~FormatNormalizer() { } - //-------------------------------------------------------------------- + void FormatNormalizer::notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) { if ( !impl_lateInit() ) @@ -84,7 +84,7 @@ namespace rptui impl_onFormattedProperttyChange( xFormatted, _rEvent.PropertyName ); } - //-------------------------------------------------------------------- + void FormatNormalizer::notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) { if ( !impl_lateInit() ) @@ -97,7 +97,7 @@ namespace rptui impl_adjustFormatToDataFieldType_nothrow( xFormatted ); } - //-------------------------------------------------------------------- + bool FormatNormalizer::impl_lateInit() { if ( m_xReportDefinition.is() ) @@ -107,7 +107,7 @@ namespace rptui return m_xReportDefinition.is(); } - //-------------------------------------------------------------------- + void FormatNormalizer::impl_onDefinitionPropertyChange( const OUString& _rChangedPropName ) { if ( _rChangedPropName != "Command" && _rChangedPropName != "CommandType" && _rChangedPropName != "EscapeProcessing" ) @@ -116,7 +116,7 @@ namespace rptui m_bFieldListDirty = true; } - //-------------------------------------------------------------------- + void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const OUString& _rChangedPropName ) { if ( _rChangedPropName != "DataField" ) @@ -126,7 +126,7 @@ namespace rptui impl_adjustFormatToDataFieldType_nothrow( _rxFormatted ); } - //-------------------------------------------------------------------- + namespace { void lcl_collectFields_throw( const Reference< XIndexAccess >& _rxColumns, FormatNormalizer::FieldList& _inout_rFields ) @@ -156,7 +156,7 @@ namespace rptui } } - //-------------------------------------------------------------------- + bool FormatNormalizer::impl_ensureUpToDateFieldList_nothrow() { if ( !m_bFieldListDirty ) @@ -204,7 +204,7 @@ namespace rptui return true; } - //-------------------------------------------------------------------- + void FormatNormalizer::impl_adjustFormatToDataFieldType_nothrow( const Reference< XFormattedField >& _rxFormatted ) { if ( !impl_ensureUpToDateFieldList_nothrow() ) diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index c30a9fe0830a..ba336c623040 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -39,12 +39,12 @@ using namespace ::com::sun::star::embed; using namespace ::com::sun::star::ui::dialogs; using ::com::sun::star::awt::XWindow; -// ------------------------------------------------------------------------- + ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xContext) : m_xContext(xContext) { } -// ------------------------------------------------------------------------- + OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException) { @@ -77,32 +77,32 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans:: } return OUString(); } -// ------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL ORptTypeDetection::create(Reference< XComponentContext > const & xContext) { return *(new ORptTypeDetection(xContext)); } -// ------------------------------------------------------------------------- + // XServiceInfo OUString SAL_CALL ORptTypeDetection::getImplementationName() throw( ) { return getImplementationName_Static(); } -// ------------------------------------------------------------------------- + // XServiceInfo sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw( ) { return cppu::supportsService(this, ServiceName); } -// ------------------------------------------------------------------------- + // XServiceInfo Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } -// ------------------------------------------------------------------------- + // ORegistryServiceManager_Static Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) { @@ -110,9 +110,9 @@ Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) th aSNS[0] = "com.sun.star.document.ExtendedTypeDetection"; return aSNS; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + }//rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index 2fb68ef3eaf3..01859585e6f9 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -68,20 +68,20 @@ void OXMLAutoStylePoolP::exportStyleAttributes( } } } -// ----------------------------------------------------------------------------- + OXMLAutoStylePoolP::OXMLAutoStylePoolP(ORptExport& rTempORptExport): SvXMLAutoStylePoolP(rTempORptExport), rORptExport(rTempORptExport) { } -// ----------------------------------------------------------------------------- + OXMLAutoStylePoolP::~OXMLAutoStylePoolP() { } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 094e7d7b6e17..89c84f3c2562 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -91,11 +91,11 @@ OXMLCell::OXMLCell( ORptFilter& rImport } } } -// ----------------------------------------------------------------------------- + OXMLCell::~OXMLCell() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLCell::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -182,7 +182,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLCell::EndElement() { if ( m_bContainsShape ) @@ -241,18 +241,18 @@ void OXMLCell::EndElement() else OXMLHelper::copyStyleElements(GetOwnImport().isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get()); } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLCell::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) { m_pCell->m_xComponent = _xComponent; m_xComponent = _xComponent; } -// ----------------------------------------------------------------------------- + void OXMLCell::Characters( const OUString& rChars ) { if ( !rChars.isEmpty() ) @@ -273,8 +273,8 @@ void OXMLCell::setContainsShape(bool _bContainsShape) m_bContainsShape = _bContainsShape; } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 24da3e340800..a893f390b2bb 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -75,12 +75,12 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport } } } -// ----------------------------------------------------------------------------- + OXMLRowColumn::~OXMLRowColumn() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLRowColumn::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -119,7 +119,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLRowColumn::fillStyle(const OUString& _sStyleName) { if ( !_sStyleName.isEmpty() ) @@ -158,17 +158,17 @@ void OXMLRowColumn::fillStyle(const OUString& _sStyleName) } } } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLRowColumn::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + void OXMLRowColumn::EndElement() { } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index e6cfe1fca8ce..aa9bccc204f7 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -88,14 +88,14 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport } } } -// ----------------------------------------------------------------------------- + OXMLComponent::~OXMLComponent() { } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 578d3f55a68a..2a30beb892ac 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -71,19 +71,19 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, OSL_FAIL("Exception catched while putting Function props!"); } } -// ----------------------------------------------------------------------------- + OXMLCondPrtExpr::~OXMLCondPrtExpr() { } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void OXMLCondPrtExpr::Characters( const OUString& rChars ) { m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(rChars)); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 7404861e877b..4784722aa80b 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -110,12 +110,12 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport } } -// ----------------------------------------------------------------------------- + OXMLControlProperty::~OXMLControlProperty() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLControlProperty::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -144,7 +144,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLControlProperty::EndElement() { if ( !m_aSetting.Name.isEmpty() && m_xControl.is() ) @@ -161,13 +161,13 @@ void OXMLControlProperty::EndElement() } } } -// ----------------------------------------------------------------------------- + void OXMLControlProperty::Characters( const OUString& rChars ) { if ( m_pContainer ) m_pContainer->addValue(rChars); } -// ----------------------------------------------------------------------------- + void OXMLControlProperty::addValue(const OUString& _sValue) { Any aValue; @@ -183,12 +183,12 @@ void OXMLControlProperty::addValue(const OUString& _sValue) m_aSequence[nPos] = aValue; } } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLControlProperty::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; @@ -321,7 +321,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe return aReturn; } -//--------------------------------------------------------------------- + ::com::sun::star::util::Time OXMLControlProperty::implGetTime(double _nValue) { ::com::sun::star::util::Time aTime; @@ -338,7 +338,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe return aTime; } -//--------------------------------------------------------------------- + ::com::sun::star::util::Date OXMLControlProperty::implGetDate(double _nValue) { Date aToolsDate((sal_uInt32)_nValue); @@ -346,8 +346,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe ::utl::typeConvert(aToolsDate, aDate); return aDate; } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 692bca00db75..c4b450e35f8c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -59,7 +59,7 @@ #include <boost/bind.hpp> -//-------------------------------------------------------------------------- + namespace rptxml { using namespace xmloff; @@ -70,34 +70,34 @@ namespace rptxml using namespace ::com::sun::star::util; using namespace ::com::sun::star::xml; - //--------------------------------------------------------------------- + Reference< XInterface > ORptExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_SETTINGS )); } - //--------------------------------------------------------------------- + OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString("com.sun.star.comp.report.XMLSettingsExporter"); } - //--------------------------------------------------------------------- + Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } - //--------------------------------------------------------------------- + Reference< XInterface > ORptContentExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT )); } - //--------------------------------------------------------------------- + OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString("com.sun.star.comp.report.XMLContentExporter"); } - //--------------------------------------------------------------------- + Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -105,18 +105,18 @@ namespace rptxml return aSupported; } - //--------------------------------------------------------------------- + Reference< XInterface > ORptStylesExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS|EXPORT_OASIS )); } - //--------------------------------------------------------------------- + OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString("com.sun.star.comp.report.XMLStylesExporter"); } - //--------------------------------------------------------------------- + Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -124,17 +124,17 @@ namespace rptxml return aSupported; } - //--------------------------------------------------------------------- + Reference< XInterface > ORptMetaExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_META )); } - //--------------------------------------------------------------------- + OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString("com.sun.star.comp.report.XMLMetaExporter"); } - //--------------------------------------------------------------------- + Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -142,17 +142,17 @@ namespace rptxml return aSupported; } - //--------------------------------------------------------------------- + Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_ALL)); } - //--------------------------------------------------------------------- + OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString("com.sun.star.comp.report.XMLFullExporter"); } - //--------------------------------------------------------------------- + Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -160,7 +160,7 @@ namespace rptxml return aSupported; } - //--------------------------------------------------------------------- + class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper { @@ -181,7 +181,7 @@ namespace rptxml // nothing to do here } }; -// ----------------------------------------------------------------------------- + void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid) { ORptExport::TSectionsGrid::iterator aSectionIter = _rGrid.begin(); @@ -212,7 +212,7 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid) } } } -// ----------------------------------------------------------------------------- + ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag) : SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, EXPORT_OASIS) ,m_bAllreadyFilled(sal_False) @@ -302,19 +302,19 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME), m_xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)); } -// ----------------------------------------------------------------------------- + Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext) { return *(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); } -// ----------------------------------------------------------------------------- + OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.ExportFilter"); } -//-------------------------------------------------------------------------- + uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -323,7 +323,7 @@ uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw( return aServices; } -// ----------------------------------------------------------------------------- + void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions) { const sal_Int32 nCount = _xFunctions->getCount(); @@ -334,7 +334,7 @@ void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions) exportFunction(xFunction); } } -// ----------------------------------------------------------------------------- + void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction) { exportFormula(XML_FORMULA,_xFunction->getFormula()); @@ -349,7 +349,7 @@ void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction) SvXMLElementExport aFunction(*this,XML_NAMESPACE_REPORT, XML_FUNCTION, sal_True, sal_True); } -// ----------------------------------------------------------------------------- + void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet) { const uno::Sequence< OUString> aMasterFields = _xReportComponet->getMasterFields(); @@ -372,7 +372,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR } } } -// ----------------------------------------------------------------------------- + void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefinition) { if ( _xReportDefinition.is() ) @@ -416,7 +416,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini } } } -// ----------------------------------------------------------------------------- + void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent) { OSL_ENSURE(_xReportComponent.is(),"No component interface!"); @@ -427,7 +427,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); } -// ----------------------------------------------------------------------------- + void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _xReportElement) { OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF"); @@ -451,7 +451,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x OSL_FAIL("Can not access format condition!"); } } -// ----------------------------------------------------------------------------- + void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xReportElement) { OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF"); @@ -479,7 +479,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep if ( xParent.is() ) exportComponent(_xReportElement.get()); } -// ----------------------------------------------------------------------------- + void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sal_Int32>& _aPosY,ORptExport::TGrid& _rColumns) { sal_Int32 nCountX = _aPosX.size() - 1; @@ -495,7 +495,7 @@ void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sa } } } -// ----------------------------------------------------------------------------- + void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames) { ::std::vector< XMLPropertyState > aPropertyStates; @@ -510,7 +510,7 @@ void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_I _rStyleNames.push_back(GetAutoStylePool()->Add(_nFamily, aPropertyStates )); } } -// ----------------------------------------------------------------------------- + void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) { OSL_ENSURE(_xProp != NULL,"Section is NULL -> GPF"); @@ -662,7 +662,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) lcl_adjustColumnSpanOverRows(m_aSectionsGrid); exportReportComponentAutoStyles(_xProp); } -// ----------------------------------------------------------------------------- + void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xProp) { const sal_Int32 nCount = _xProp->getCount(); @@ -701,7 +701,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr } } } -// ----------------------------------------------------------------------------- + void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader) { OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); @@ -739,7 +739,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader exportContainer(_xSection); } -// ----------------------------------------------------------------------------- + void ORptExport::exportTableColumns(const Reference< XSection>& _xSection) { SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, sal_True, sal_True); @@ -756,7 +756,7 @@ void ORptExport::exportTableColumns(const Reference< XSection>& _xSection) SvXMLElementExport aColumn(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True); } } -// ----------------------------------------------------------------------------- + void ORptExport::exportContainer(const Reference< XSection>& _xSection) { OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); @@ -1001,7 +1001,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } } } -// ----------------------------------------------------------------------------- + OUString ORptExport::convertFormula(const OUString& _sFormula) { OUString sFormula = _sFormula; @@ -1009,7 +1009,7 @@ OUString ORptExport::convertFormula(const OUString& _sFormula) sFormula = ""; return sFormula; } -// ----------------------------------------------------------------------------- + bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula) { const OUString sFieldData = convertFormula(_sFormula); @@ -1023,7 +1023,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OU return bRet; } -// ----------------------------------------------------------------------------- + void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName) { Reference<XPropertySet> xFind(_xProp); @@ -1035,7 +1035,7 @@ void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt, m_aAutoStyleNames.erase(aFind); } } -// ----------------------------------------------------------------------------- + sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle) { sal_Bool bGroupExported = sal_False; @@ -1130,7 +1130,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef } return bGroupExported; } -// ----------------------------------------------------------------------------- + void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField) { const uno::Reference<report::XReportControlFormat> xFormat(_xProp,uno::UNO_QUERY); @@ -1240,20 +1240,20 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted if ( !aPropertyStates.empty() ) m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); } -// ----------------------------------------------------------------------------- + void ORptExport::exportAutoStyle(const Reference<XSection>& _xProp) { ::std::vector< XMLPropertyState > aPropertyStates( m_xTableStylesExportPropertySetMapper->Filter(_xProp.get()) ); if ( !aPropertyStates.empty() ) m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp.get(),GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_TABLE, aPropertyStates ))); } -// ----------------------------------------------------------------------------- + void ORptExport::SetBodyAttributes() { Reference<XReportDefinition> xProp(getReportDefinition()); exportReportAttributes(xProp); } -// ----------------------------------------------------------------------------- + void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport) { if ( _xReport.is() ) @@ -1285,17 +1285,17 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,sName); } } -// ----------------------------------------------------------------------------- + void ORptExport::_ExportContent() { exportReport(getReportDefinition()); } -// ----------------------------------------------------------------------------- + void ORptExport::_ExportMasterStyles() { GetPageExport()->exportMasterStyles( sal_True ); } -// ----------------------------------------------------------------------------- + void ORptExport::collectComponentStyles() { if ( m_bAllreadyFilled ) @@ -1322,7 +1322,7 @@ void ORptExport::collectComponentStyles() exportSectionAutoStyle(xProp->getReportFooter()); } } -// ----------------------------------------------------------------------------- + void ORptExport::_ExportAutoStyles() { // there are no styles that require their own autostyles @@ -1360,7 +1360,7 @@ void ORptExport::_ExportAutoStyles() if( (getExportFlags() & EXPORT_MASTERSTYLES) != 0 ) GetPageExport()->exportAutoStyles(); } -// ----------------------------------------------------------------------------- + void ORptExport::_ExportStyles(bool bUsed) { SvXMLExport::_ExportStyles(bUsed); @@ -1368,29 +1368,29 @@ void ORptExport::_ExportStyles(bool bUsed) // write draw:style-name for object graphic-styles GetShapeExport()->ExportGraphicDefaults(); } -// ----------------------------------------------------------------------------- + sal_uInt32 ORptExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) { return SvXMLExport::exportDoc( eClass ); } -// ----------------------------------------------------------------------------- + OUString ORptExport::implConvertNumber(sal_Int32 _nValue) { OUStringBuffer aBuffer; ::sax::Converter::convertNumber(aBuffer, _nValue); return aBuffer.makeStringAndClear(); } -// ----------------------------------------------------------------------------- + UniReference < XMLPropertySetMapper > ORptExport::GetCellStylePropertyMapper() const { return m_xCellStylesPropertySetMapper; } -// ----------------------------------------------------------------------------- + SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool() { return new OXMLAutoStylePoolP(*this); } -// ----------------------------------------------------------------------------- + void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException) { m_xReportDefinition.set(xDoc,UNO_QUERY_THROW); @@ -1398,14 +1398,14 @@ void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc SvXMLExport::setSourceDocument(xDoc); } -// ----------------------------------------------------------------------------- + void ORptExport::_ExportFontDecls() { GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } -// ----------------------------------------------------------------------------- + void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xReportElement) { OSL_PRECOND(_xReportElement.is(),"Element is null!"); @@ -1462,13 +1462,13 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); } } -// ----------------------------------------------------------------------------- + XMLShapeExport* ORptExport::CreateShapeExport() { XMLShapeExport* pShapeExport = new XMLShapeExport( *this, XMLTextParagraphExport::CreateShapeExtPropMapper( *this ) ); return pShapeExport; } -// ----------------------------------------------------------------------------- + void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph) { UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); @@ -1503,7 +1503,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa } } } -// ----------------------------------------------------------------------------- + void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups) { if ( _xGroups.is() ) @@ -1601,8 +1601,8 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG } } -// ----------------------------------------------------------------------------- + }// rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 9a1cda5fb721..53e5502bb115 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -81,7 +81,7 @@ ExportDocumentHandler::ExportDocumentHandler(uno::Reference< uno::XComponentCont ,m_bCountColumnHeader(false) { } -// ----------------------------------------------------------------------------- + ExportDocumentHandler::~ExportDocumentHandler() { if ( m_xProxy.is() ) @@ -92,7 +92,7 @@ ExportDocumentHandler::~ExportDocumentHandler() } IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler) IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE ) -//------------------------------------------------------------------------ + OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); @@ -116,7 +116,7 @@ OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::Runt return OUString("com.sun.star.comp.report.ExportDocumentHandler"); } -//------------------------------------------------------------------------ + uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); @@ -124,7 +124,7 @@ uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static return aSupported; } -//------------------------------------------------------------------------ + uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new ExportDocumentHandler( _rxContext )); @@ -237,7 +237,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const if ( bExport ) m_xDelegatee->startElement(_sName,xAttribs); } -// ----------------------------------------------------------------------------- + void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) { bool bExport = true; @@ -343,13 +343,13 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > } } } -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = ExportDocumentHandler_BASE::queryInterface(_rType); return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn); } -// -------------------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes( ) throw (uno::RuntimeException) { if ( m_xTypeProvider.is() ) @@ -359,7 +359,7 @@ uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes( ) throw (u ); return ExportDocumentHandler_BASE::getTypes(); } -// ----------------------------------------------------------------------------- + void ExportDocumentHandler::exportTableRows() { const OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) ); @@ -432,8 +432,8 @@ void ExportDocumentHandler::exportTableRows() m_xDelegatee->endElement(sRow); } -// ----------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index bfbab186c9ea..03a0aa3fba1f 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -74,7 +74,7 @@ OXMLCharContent::OXMLCharContent( ,m_pFixedContent(_pFixedContent) { } -// ----------------------------------------------------------------------------- + OXMLCharContent::OXMLCharContent( SvXMLImport& rImport, OXMLFixedContent* _pFixedContent, @@ -86,7 +86,7 @@ OXMLCharContent::OXMLCharContent( ,m_pFixedContent(_pFixedContent) { } -// ----------------------------------------------------------------------------- + void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) { switch( _nControl ) @@ -99,12 +99,12 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) break; } } -// ----------------------------------------------------------------------------- + void OXMLCharContent::InsertString(const OUString& _sString) { m_pFixedContent->Characters(_sString); } -// ----------------------------------------------------------------------------- + OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport, @@ -118,14 +118,14 @@ OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport, ,m_bFormattedField(false) { } -// ----------------------------------------------------------------------------- + OXMLFixedContent::~OXMLFixedContent() { } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + SvXMLImportContext* OXMLFixedContent::_CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -176,7 +176,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( } return pContext; } -// ----------------------------------------------------------------------------- + void OXMLFixedContent::EndElement() { if ( m_pInP ) @@ -206,7 +206,7 @@ void OXMLFixedContent::EndElement() OXMLReportElementBase::EndElement(); } } -// ----------------------------------------------------------------------------- + void OXMLFixedContent::Characters( const OUString& rChars ) { m_sLabel += rChars; @@ -223,8 +223,8 @@ void OXMLFixedContent::Characters( const OUString& rChars ) } } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 9162f4e25a51..54014cd415c9 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -85,18 +85,18 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the report definition props"); } } -// ----------------------------------------------------------------------------- + OXMLFormatCondition::~OXMLFormatCondition() { } -// ----------------------------------------------------------------------------- + void OXMLFormatCondition::EndElement() { OXMLHelper::copyStyleElements(m_rImport.isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get()); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index fe363e80490f..cc0a95a1d00e 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -83,13 +83,13 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the report definition props"); } } -// ----------------------------------------------------------------------------- + OXMLFormattedField::~OXMLFormattedField() { } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 0d4f24013e9f..ee5a7f89c8f8 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -93,17 +93,17 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport } } } -// ----------------------------------------------------------------------------- + OXMLFunction::~OXMLFunction() { } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLFunction::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + void OXMLFunction::EndElement() { if ( m_bAddToReport ) @@ -123,9 +123,9 @@ void OXMLFunction::EndElement() } } } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 70738392047b..3670a4ab9f2d 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -185,13 +185,13 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } } } -// ----------------------------------------------------------------------------- + OXMLGroup::~OXMLGroup() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLGroup::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -244,12 +244,12 @@ SvXMLImportContext* OXMLGroup::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLGroup::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + void OXMLGroup::EndElement() { try @@ -261,9 +261,9 @@ void OXMLGroup::EndElement() OSL_FAIL("Exception catched!"); } } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 55c8e9efa345..d65163d16489 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -61,11 +61,11 @@ namespace rptxml OPropertyHandlerFactory::OPropertyHandlerFactory() { } -// ----------------------------------------------------------------------------- + OPropertyHandlerFactory::~OPropertyHandlerFactory() { } -// ----------------------------------------------------------------------------- + const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const { const XMLPropertyHandler* pHandler = NULL; @@ -99,13 +99,13 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 PutHdlCache(nType, pHandler); return pHandler; } -// ----------------------------------------------------------------------------- + #define MAP_CONST_T_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010, false } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010, false} -// ----------------------------------------------------------------------------- + UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport) { if ( _bOldFormat ) @@ -152,7 +152,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aXMLCellStylesProperties,new OPropertyHandlerFactory(), bForExport); } } -// ----------------------------------------------------------------------------- + const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps() { static const XMLPropertyMapEntry aXMLTableStylesProperties[] = @@ -163,7 +163,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps() }; return aXMLTableStylesProperties; } -// ----------------------------------------------------------------------------- + const XMLPropertyMapEntry* OXMLHelper::GetRowStyleProps() { static const XMLPropertyMapEntry aXMLStylesProperties[] = @@ -173,7 +173,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetRowStyleProps() }; return aXMLStylesProperties; } -// ----------------------------------------------------------------------------- + const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() { static const XMLPropertyMapEntry aXMLColumnStylesProperties[] = @@ -183,7 +183,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() }; return aXMLColumnStylesProperties; } -// ----------------------------------------------------------------------------- + const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() { static const SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -195,7 +195,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() }; return s_aXML_EnumMap; } -// ----------------------------------------------------------------------------- + const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() { static const SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -207,7 +207,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() }; return s_aXML_EnumMap; } -// ----------------------------------------------------------------------------- + const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() { static const SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -218,7 +218,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() }; return s_aXML_EnumMap; } -// ----------------------------------------------------------------------------- + const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() { static const SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -229,7 +229,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() }; return s_aXML_EnumMap; } -// ----------------------------------------------------------------------------- + #define PROPERTY_ID_FONTNAME 1 #define PROPERTY_ID_FONTHEIGHT 2 #define PROPERTY_ID_FONTWIDTH 3 @@ -314,7 +314,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName, } } } -// ----------------------------------------------------------------------------- + uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry const pMap[] = @@ -327,7 +327,7 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() }; return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); } -// ----------------------------------------------------------------------------- + SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() { static const SvXMLTokenMapEntry aElemTokenMap[]= @@ -354,7 +354,7 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() }; return new SvXMLTokenMap( aElemTokenMap ); } -// ----------------------------------------------------------------------------- + SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() { static const SvXMLTokenMapEntry aElemTokenMap[]= @@ -366,7 +366,7 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() }; return new SvXMLTokenMap( aElemTokenMap ); } -// ----------------------------------------------------------------------------- + const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions() { static const SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -377,9 +377,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions() }; return s_aXML_EnumMap; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + } // rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 82845d7ee2e9..9564825c606d 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -39,7 +39,7 @@ namespace rptxml using namespace ::com::sun::star::xml::sax; -// ----------------------------------------------------------------------------- + OXMLImage::OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList @@ -104,16 +104,16 @@ OXMLImage::OXMLImage( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the image props"); } } -// ----------------------------------------------------------------------------- + OXMLImage::~OXMLImage() { } -// ----------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 1763b025b9e6..709236335876 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -53,7 +53,7 @@ ImportDocumentHandler::ImportDocumentHandler(uno::Reference< uno::XComponentCont ,m_xContext(context) { } -// ----------------------------------------------------------------------------- + ImportDocumentHandler::~ImportDocumentHandler() { if ( m_xProxy.is() ) @@ -64,7 +64,7 @@ ImportDocumentHandler::~ImportDocumentHandler() } IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler) IMPLEMENT_FORWARD_REFCOUNT( ImportDocumentHandler, ImportDocumentHandler_BASE ) -//------------------------------------------------------------------------ + OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); @@ -95,7 +95,7 @@ uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static return aSupported; } -//------------------------------------------------------------------------ + uno::Reference< uno::XInterface > SAL_CALL ImportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new ImportDocumentHandler( _rxContext )); @@ -385,13 +385,13 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap()); } -// -------------------------------------------------------------------------------- + uno::Any SAL_CALL ImportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException) { uno::Any aReturn = ImportDocumentHandler_BASE::queryInterface(_rType); return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn); } -// -------------------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes( ) throw (uno::RuntimeException) { if ( m_xTypeProvider.is() ) @@ -402,8 +402,8 @@ uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes( ) throw (u return ImportDocumentHandler_BASE::getTypes(); } -// ----------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 135c514199d4..83f5c9cdafff 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -71,13 +71,13 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, if ( !sMasterField.isEmpty() ) m_pReport->addMasterDetailPair(::std::pair< OUString,OUString >(sMasterField,sDetailField)); } -// ----------------------------------------------------------------------------- + OXMLMasterFields::~OXMLMasterFields() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLMasterFields::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -104,8 +104,8 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext( return pContext; } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 855dbd349241..c96da30a10e9 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -23,10 +23,10 @@ #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -//-------------------------------------------------------------------------- + namespace rptxml { -//-------------------------------------------------------------------------- + using namespace ::com::sun::star; using namespace xmloff; using namespace ::com::sun::star::report; @@ -35,12 +35,12 @@ namespace rptxml OXMLRptPropHdlFactory::OXMLRptPropHdlFactory() { } -// ----------------------------------------------------------------------------- + OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory() { } -// ----------------------------------------------------------------------------- + }// rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 812135ffefa1..0dee143809f1 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -102,13 +102,13 @@ OXMLReport::OXMLReport( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the report definition props"); } } -// ----------------------------------------------------------------------------- + OXMLReport::~OXMLReport() { } -// ----------------------------------------------------------------------------- + void OXMLReport::impl_initRuntimeDefaults() const { @@ -126,7 +126,7 @@ void OXMLReport::impl_initRuntimeDefaults() const } } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLReport::CreateChildContext( sal_uInt16 nPrefix, @@ -198,7 +198,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLReport::EndElement() { Reference< XFunctions > xFunctions = m_xComponent->getFunctions(); @@ -213,14 +213,14 @@ void OXMLReport::EndElement() if ( !m_aDetailFields.empty() ) m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); } -// ----------------------------------------------------------------------------- + void OXMLReport::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) { m_aMasterFields.push_back(_aPair.first); m_aDetailFields.push_back(_aPair.second); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 9d6862dbe663..197e20e660ad 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -76,13 +76,13 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the report definition props"); } } -// ----------------------------------------------------------------------------- + OXMLReportElement::~OXMLReportElement() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLReportElement::CreateChildContext( sal_uInt16 _nPrefix, @@ -121,13 +121,13 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLReportElement::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 18e5dc45822e..1a536696c04e 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -41,12 +41,12 @@ OXMLReportElementBase::OXMLReportElementBase( ORptFilter& rImport ,m_xComponent(_xComponent) { } -// ----------------------------------------------------------------------------- + OXMLReportElementBase::~OXMLReportElementBase() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLReportElementBase::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -57,7 +57,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext( pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); return pContext; } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -88,7 +88,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLReportElementBase::EndElement() { try @@ -101,8 +101,8 @@ void OXMLReportElementBase::EndElement() OSL_FAIL("Exception caught while inserting a new control!"); } } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 156e3e36dba3..3857a1f2e66e 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -75,12 +75,12 @@ OXMLRow::OXMLRow( ORptFilter& rImport } } -// ----------------------------------------------------------------------------- + OXMLRow::~OXMLRow() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLRow::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -117,7 +117,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLRow::EndElement() { if ( m_sStyleName.getLength() ) @@ -156,13 +156,13 @@ void OXMLRow::EndElement() } } } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLRow::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index a3eeb02179a5..3a979645193b 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -99,11 +99,11 @@ OXMLSection::OXMLSection( ORptFilter& rImport, OSL_FAIL("Exception catched while filling the section props"); } } -// ----------------------------------------------------------------------------- + OXMLSection::~OXMLSection() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLSection::CreateChildContext( sal_uInt16 _nPrefix, @@ -128,14 +128,14 @@ SvXMLImportContext* OXMLSection::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLSection::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index a712ca4486e2..b41318ab9a1d 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace xmloff::token; -// ----------------------------------------------------------------------------- + class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper { @@ -85,13 +85,13 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport, { } -// ----------------------------------------------------------------------------- + OControlStyleContext::~OControlStyleContext() { } -// ----------------------------------------------------------------------------- + void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPropSet ) { @@ -123,11 +123,11 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr } XMLPropStyleContext::FillPropertySet(rPropSet); } -// ----------------------------------------------------------------------------- + void OControlStyleContext::SetDefaults() { } -// ----------------------------------------------------------------------------- + void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue) { @@ -136,7 +136,7 @@ void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::An XMLPropertyState aPropState(nIndex, rValue); GetProperties().push_back(aPropState); // has to be insertes in a sort order later } -// ----------------------------------------------------------------------------- + void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) @@ -149,12 +149,12 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, else XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue ); } -// ----------------------------------------------------------------------------- + ORptFilter& OControlStyleContext::GetOwnImport() const { return m_rImport; } -// ----------------------------------------------------------------------------- + OReportStylesContext::OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , @@ -172,13 +172,13 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport, { } -// ----------------------------------------------------------------------------- + OReportStylesContext::~OReportStylesContext() { } -// ----------------------------------------------------------------------------- + void OReportStylesContext::EndElement() { @@ -188,7 +188,7 @@ void OReportStylesContext::EndElement() else GetImport().GetStyles()->CopyStylesToDoc(sal_True); } -// ----------------------------------------------------------------------------- + UniReference < SvXMLImportPropertyMapper > OReportStylesContext::GetImportPropertyMapper( @@ -246,7 +246,7 @@ UniReference < SvXMLImportPropertyMapper > return xMapper; } -// ----------------------------------------------------------------------------- + SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) @@ -269,7 +269,7 @@ SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext( } return pStyle; } -// ---------------------------------------------------------------------------- + SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -296,7 +296,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext( return pStyle; } -// ----------------------------------------------------------------------------- + Reference < XNameContainer > OReportStylesContext::GetStylesContainer( sal_uInt16 nFamily ) const { @@ -381,7 +381,7 @@ Reference < XNameContainer > return xStyles; } -// ----------------------------------------------------------------------------- + OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const { @@ -408,7 +408,7 @@ OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const } return sServiceName; } -// ----------------------------------------------------------------------------- + sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID) { @@ -421,19 +421,19 @@ sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID) } return -1; } -// ----------------------------------------------------------------------------- + ORptFilter& OReportStylesContext::GetOwnImport() const { return m_rImport; } -// ----------------------------------------------------------------------------- + sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const { sal_uInt16 nFamily = SvXMLStylesContext::GetFamily(rFamily); return nFamily; } -// ----------------------------------------------------------------------------- + } // rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 3de5ae72c4ac..ab74e204d9ab 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -50,13 +50,13 @@ OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport, { } -// ----------------------------------------------------------------------------- + OXMLSubDocument::~OXMLSubDocument() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLSubDocument::_CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -99,7 +99,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + void OXMLSubDocument::EndElement() { if ( m_bContainsShape ) @@ -138,14 +138,14 @@ void OXMLSubDocument::EndElement() } } } -// ----------------------------------------------------------------------------- + void OXMLSubDocument::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) { m_aMasterFields.push_back(_aPair.first); m_aDetailFields.push_back(_aPair.second); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 245158be2b86..4cb109d05dca 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -112,11 +112,11 @@ OXMLTable::OXMLTable( ORptFilter& rImport OSL_FAIL("Exception catched while filling the section props"); } } -// ----------------------------------------------------------------------------- + OXMLTable::~OXMLTable() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext* OXMLTable::CreateChildContext( sal_uInt16 _nPrefix, @@ -154,12 +154,12 @@ SvXMLImportContext* OXMLTable::CreateChildContext( return pContext; } -// ----------------------------------------------------------------------------- + ORptFilter& OXMLTable::GetOwnImport() { return static_cast<ORptFilter&>(GetImport()); } -// ----------------------------------------------------------------------------- + void OXMLTable::EndElement() { try @@ -270,7 +270,7 @@ void OXMLTable::EndElement() OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } -// ----------------------------------------------------------------------------- + void OXMLTable::addCell(const Reference<XReportComponent>& _xElement) { uno::Reference<report::XShape> xShape(_xElement,uno::UNO_QUERY); @@ -293,15 +293,15 @@ void OXMLTable::addCell(const Reference<XReportComponent>& _xElement) if ( !xShape.is() ) m_nColSpan = m_nRowSpan = 1; } -// ----------------------------------------------------------------------------- + void OXMLTable::incrementRowIndex() { ++m_nRowIndex; m_nColumnIndex = 0; m_aGrid.push_back(::std::vector<TCell>(m_aWidth.size())); } -//---------------------------------------------------------------------------- + } // namespace rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index e2ab7904cffe..cf02246efb00 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -275,35 +275,35 @@ sal_Int32 ReadThroughComponent( return 1; } -//--------------------------------------------------------------------- + uno::Reference< uno::XInterface > ORptImportHelper::create(uno::Reference< uno::XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_SETTINGS )); } -//--------------------------------------------------------------------- + OUString ORptImportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString(SERVICE_SETTINGSIMPORTER); } -//--------------------------------------------------------------------- + Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); aSupported[0] = SERVICE_IMPORTFILTER; return aSupported; } -//--------------------------------------------------------------------- + Reference< XInterface > ORptContentImportHelper::create(const Reference< XComponentContext > & xContext) { return static_cast< XServiceInfo* >(new ORptFilter(xContext,IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS )); } -//--------------------------------------------------------------------- + OUString ORptContentImportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString(SERVICE_CONTENTIMPORTER); } -//--------------------------------------------------------------------- + Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -311,19 +311,19 @@ Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static( return aSupported; } -//--------------------------------------------------------------------- + Reference< XInterface > ORptStylesImportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | IMPORT_FONTDECLS )); } -//--------------------------------------------------------------------- + OUString ORptStylesImportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString(SERVICE_STYLESIMPORTER); } -//--------------------------------------------------------------------- + Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -331,18 +331,18 @@ Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) return aSupported; } -//--------------------------------------------------------------------- + Reference< XInterface > ORptMetaImportHelper::create(Reference< XComponentContext > const & xContext) { return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_META)); } -//--------------------------------------------------------------------- + OUString ORptMetaImportHelper::getImplementationName_Static( ) throw (RuntimeException) { return OUString(SERVICE_METAIMPORTER); } -//--------------------------------------------------------------------- + Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -350,9 +350,9 @@ Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) t return aSupported; } -// ------------- + // - ORptFilter - -// ------------- + ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sal_uInt16 nImportFlags ) :SvXMLImport(_rxContext, getImplementationName_Static(), nImportFlags) { @@ -373,18 +373,18 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa m_xTableStylesPropertySetMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS, false ); } -// ----------------------------------------------------------------------------- + ORptFilter::~ORptFilter() throw() { } -//------------------------------------------------------------------------------ + uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext) { return *(new ORptFilter(xContext)); } -// ----------------------------------------------------------------------------- + OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException) { return OUString("com.sun.star.comp.report.OReportFilter"); @@ -415,7 +415,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { @@ -616,7 +616,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) return bRet; } -// ----------------------------------------------------------------------------- + SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) @@ -679,7 +679,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, return pContext; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const { if ( !m_pDocElemTokenMap.get() ) @@ -700,21 +700,21 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const } return *m_pDocElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const { if ( !m_pReportElemTokenMap.get() ) m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap()); return *m_pReportElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetSubDocumentElemTokenMap() const { if ( !m_pSubDocumentElemTokenMap.get() ) m_pSubDocumentElemTokenMap.reset(OXMLHelper::GetSubDocumentElemTokenMap()); return *m_pSubDocumentElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const { if ( !m_pFunctionElemTokenMap.get() ) @@ -732,7 +732,7 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const } return *m_pFunctionElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const { if ( !m_pFormatElemTokenMap.get() ) @@ -748,7 +748,7 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const } return *m_pFormatElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { if ( !m_pGroupElemTokenMap.get() ) @@ -774,7 +774,7 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const } return *m_pGroupElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const { if ( !m_pElemTokenMap.get() ) @@ -792,7 +792,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const } return *m_pElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const { if ( !m_pControlElemTokenMap.get() ) @@ -814,7 +814,7 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const } return *m_pControlElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const { if ( !m_pControlElemTokenMap.get() ) @@ -836,7 +836,7 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const } return *m_pControlElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const { if ( !m_pComponentElemTokenMap.get() ) @@ -852,7 +852,7 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const } return *m_pComponentElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const { if ( !m_pColumnTokenMap.get() ) @@ -876,7 +876,7 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const } return *m_pColumnTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const { if ( !m_pSectionElemTokenMap.get() ) @@ -899,7 +899,7 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const } return *m_pSectionElemTokenMap; } -// ----------------------------------------------------------------------------- + const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { if ( !m_pCellElemTokenMap.get() ) @@ -924,7 +924,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const } return *m_pCellElemTokenMap; } -// ----------------------------------------------------------------------------- + SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) { @@ -939,20 +939,20 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, } return pContext; } -// ----------------------------------------------------------------------------- + SvXMLImport& ORptFilter::getGlobalContext() { return *this; } -// ----------------------------------------------------------------------------- + void ORptFilter::enterEventContext() { } -// ----------------------------------------------------------------------------- + void ORptFilter::leaveEventContext() { } -// ----------------------------------------------------------------------------- + SvXMLImportContext *ORptFilter::CreateFontDeclsContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) @@ -964,23 +964,23 @@ SvXMLImportContext *ORptFilter::CreateFontDeclsContext( SetFontDecls( pFSContext ); return pFSContext; } -// ----------------------------------------------------------------------------- + XMLShapeImportHelper* ORptFilter::CreateShapeImport() { return new XMLShapeImportHelper( *this,GetModel() ); } -// ----------------------------------------------------------------------------- + void ORptFilter::FinishStyles() { if( GetStyles() ) GetStyles()->FinishStyles( sal_True ); } -// ----------------------------------------------------------------------------- + OUString ORptFilter::convertFormula(const OUString& _sFormula) { return _sFormula; } -// ----------------------------------------------------------------------------- + void SAL_CALL ORptFilter::startDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException ) { @@ -994,7 +994,7 @@ void SAL_CALL ORptFilter::startDocument( void ) SvXMLImport::startDocument(); } } -// ----------------------------------------------------------------------------- + void ORptFilter::endDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException ) { @@ -1013,17 +1013,17 @@ void ORptFilter::endDocument( void ) // delegate to parent: takes care of error handling SvXMLImport::endDocument(); } -// ----------------------------------------------------------------------------- + void ORptFilter::removeFunction(const OUString& _sFunctionName) { m_aFunctions.erase(_sFunctionName); } -// ----------------------------------------------------------------------------- + void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction) { m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); } -// ----------------------------------------------------------------------------- + SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&) { SvXMLImportContext* pContext = NULL; @@ -1035,7 +1035,7 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,con } return pContext; } -// ----------------------------------------------------------------------------- + sal_Bool ORptFilter::isOldFormat() const { sal_Bool bOldFormat = sal_True; @@ -1051,8 +1051,8 @@ sal_Bool ORptFilter::isOldFormat() const return bOldFormat; } -// ----------------------------------------------------------------------------- + }// rptxml -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 2084035a1894..2a04a82fc5d2 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -82,7 +82,7 @@ protected: private: using SvTreeListBox::ExecuteDrop; }; -// ----------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDescriptors() { uno::Sequence< beans::PropertyValue > aArgs(GetSelectionCount()); @@ -101,7 +101,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe //================================================================== // class OAddFieldWindowListBox //================================================================== -//------------------------------------------------------------------------------ + OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) :SvTreeListBox( _pParent, WB_TABSTOP|WB_BORDER|WB_SORT ) ,m_pTabWin( _pParent ) @@ -112,24 +112,24 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) SetHighlightRange( ); } -//------------------------------------------------------------------------------ + OAddFieldWindowListBox::~OAddFieldWindowListBox() { } -//------------------------------------------------------------------------------ + sal_Int8 OAddFieldWindowListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) { return DND_ACTION_NONE; } -//------------------------------------------------------------------------------ + sal_Int8 OAddFieldWindowListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) { return DND_ACTION_NONE; } -//------------------------------------------------------------------------------ + void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { if ( GetSelectionCount() < 1 ) @@ -145,7 +145,7 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r //======================================================================== // class OAddFieldWindow //======================================================================== -//----------------------------------------------------------------------- + OAddFieldWindow::OAddFieldWindow(Window* pParent ,const uno::Reference< beans::XPropertySet >& _xRowSet ) @@ -208,7 +208,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent } } -//----------------------------------------------------------------------- + OAddFieldWindow::~OAddFieldWindow() { if ( m_pListBox.get() ) @@ -226,7 +226,7 @@ OAddFieldWindow::~OAddFieldWindow() m_pContainerListener->dispose(); } -//----------------------------------------------------------------------- + void OAddFieldWindow::GetFocus() { if ( m_pListBox.get() ) @@ -234,13 +234,13 @@ void OAddFieldWindow::GetFocus() else FloatingWindow::GetFocus(); } -//----------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > OAddFieldWindow::getSelectedFieldDescriptors() { return m_pListBox->getSelectedFieldDescriptors(); } -//----------------------------------------------------------------------- + bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) @@ -258,7 +258,7 @@ bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) return FloatingWindow::PreNotify( _rNEvt ); } -//----------------------------------------------------------------------- + void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) throw( uno::RuntimeException ) { OSL_ENSURE( _evt.Source == m_xRowSet, "OAddFieldWindow::_propertyChanged: where did this come from?" ); @@ -266,7 +266,7 @@ void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) Update(); } -//----------------------------------------------------------------------- + namespace { void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< OUString >& _rEntries ) @@ -295,7 +295,7 @@ namespace } } -//----------------------------------------------------------------------- + void OAddFieldWindow::Update() { SolarMutexGuard aSolarGuard; @@ -370,7 +370,7 @@ void OAddFieldWindow::Update() } } -//----------------------------------------------------------------------- + void OAddFieldWindow::Resize() { FloatingWindow::Resize(); @@ -410,12 +410,12 @@ void OAddFieldWindow::Resize() Point aFTPos( aRelated.Width(), aFLPos.Y() + aFLSize.Height() + aRelated.Height() ); m_aHelpText.SetPosSizePixel( aFTPos, aHelpTextSize ); } -// ----------------------------------------------------------------------------- + uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const { return uno::Reference< sdbc::XConnection>(m_xRowSet->getPropertyValue( PROPERTY_ACTIVECONNECTION ),uno::UNO_QUERY); } -// ----------------------------------------------------------------------------- + void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor) { if ( _pSelected && m_xColumns.is() ) @@ -443,7 +443,7 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAcc _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); } } -// ----------------------------------------------------------------------------- + void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { if ( m_pListBox.get() ) @@ -462,7 +462,7 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent } } } -// ----------------------------------------------------------------------------- + void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { if ( m_pListBox.get() ) @@ -472,18 +472,18 @@ void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEven lcl_addToList( *m_pListBox, m_xColumns ); } } -// ----------------------------------------------------------------------------- + void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException) { } -// ----------------------------------------------------------------------------- + IMPL_LINK( OAddFieldWindow, OnSelectHdl, void* ,/*_pAddFieldDlg*/) { m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 )); return 0L; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/) { if ( m_aCreateLink.IsSet() ) @@ -491,7 +491,7 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/) return 0L; } -//------------------------------------------------------------------------------ + ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const { sal_Int16 nN = IMG_ADDFIELD_DLG_SC; @@ -499,7 +499,7 @@ ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const nN = IMG_ADDFIELD_DLG_LC; return ImageList(ModuleRes(nN)); } -//------------------------------------------------------------------ + void OAddFieldWindow::resizeControls(const Size& _rDiff) { // we use large images so we must change them @@ -508,7 +508,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff) Invalidate(); } } -//------------------------------------------------------------------ + IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { const sal_uInt16 nCurItem = m_aActions.GetCurItemId(); @@ -544,7 +544,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) } return 0L; } -// ----------------------------------------------------------------------------- + // ============================================================================= } // namespace rptui // ============================================================================= diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 70cf99736b50..8c7dabb6fd76 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -107,13 +107,13 @@ namespace rptui FreeResource(); } - //------------------------------------------------------------------------ + ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_updateConditionIndicies() { sal_Int32 nIndex = 0; @@ -126,7 +126,7 @@ namespace rptui } } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_conditionCountChanged() { if ( m_aConditions.empty() ) @@ -137,20 +137,20 @@ namespace rptui impl_layoutAll(); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::addCondition( size_t _nAddAfterIndex ) { OSL_PRECOND( _nAddAfterIndex < impl_getConditionCount(), "ConditionalFormattingDialog::addCondition: illegal condition index!" ); impl_addCondition_nothrow( _nAddAfterIndex + 1 ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::deleteCondition( size_t _nCondIndex ) { impl_deleteCondition_nothrow( _nCondIndex ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_addCondition_nothrow( size_t _nNewCondIndex ) { UpdateLocker aLockUpdates( *this ); @@ -180,7 +180,7 @@ namespace rptui impl_ensureConditionVisible( _nNewCondIndex ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_focusCondition( size_t _nCondIndex ) { OSL_PRECOND( _nCondIndex < impl_getConditionCount(), @@ -190,7 +190,7 @@ namespace rptui m_aConditions[ _nCondIndex ]->GrabFocus(); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_deleteCondition_nothrow( size_t _nCondIndex ) { UpdateLocker aLockUpdates( *this ); @@ -238,7 +238,7 @@ namespace rptui impl_focusCondition( nNewFocusIndex ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_moveCondition_nothrow( size_t _nCondIndex, bool _bMoveUp ) { size_t nOldConditionIndex( _nCondIndex ); @@ -283,7 +283,7 @@ namespace rptui impl_ensureConditionVisible( nNewConditionIndex ); } - // ----------------------------------------------------------------------------- + long ConditionalFormattingDialog::impl_getConditionWidth() const { const Size aDialogSize( GetOutputSizePixel() ); @@ -291,7 +291,7 @@ namespace rptui return aDialogSize.Width() - aScrollBarWidth.Width(); } - // ----------------------------------------------------------------------------- + IMPL_LINK( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/ ) { size_t nFirstCondIndex( impl_getFirstVisibleConditionIndex() ); @@ -308,7 +308,7 @@ namespace rptui return 0; } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_layoutConditions( Point& _out_rBelowLastVisible ) { // position the condition's playground @@ -331,7 +331,7 @@ namespace rptui } } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_layoutAll() { // condition's positions @@ -358,7 +358,7 @@ namespace rptui aPos += LogicToPixel( Point( 0, BUTTON_HEIGHT + RELATED_CONTROLS ), MAP_APPFONT ); setPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_initializeConditions() { try @@ -381,7 +381,7 @@ namespace rptui impl_conditionCountChanged(); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) { OSL_PRECOND( _nCommandId, "ConditionalFormattingDialog::applyCommand: illegal command id!" ); @@ -410,7 +410,7 @@ namespace rptui } } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::moveConditionUp( size_t _nCondIndex ) { OSL_PRECOND( _nCondIndex > 0, "ConditionalFormattingDialog::moveConditionUp: cannot move up the first condition!" ); @@ -418,7 +418,7 @@ namespace rptui impl_moveCondition_nothrow( _nCondIndex, true ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::moveConditionDown( size_t _nCondIndex ) { OSL_PRECOND( _nCondIndex < impl_getConditionCount(), "ConditionalFormattingDialog::moveConditionDown: cannot move down the last condition!" ); @@ -426,7 +426,7 @@ namespace rptui impl_moveCondition_nothrow( _nCondIndex, false ); } - // ----------------------------------------------------------------------------- + OUString ConditionalFormattingDialog::getDataField() const { OUString sDataField; @@ -441,7 +441,7 @@ namespace rptui return sDataField; } - // ----------------------------------------------------------------------------- + short ConditionalFormattingDialog::Execute() { short nRet = ModalDialog::Execute(); @@ -491,7 +491,7 @@ namespace rptui return nRet; } - // ----------------------------------------------------------------------------- + bool ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) @@ -502,7 +502,7 @@ namespace rptui const KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); if ( rKeyCode.IsMod1() && rKeyCode.IsMod2() ) { - if ( rKeyCode.GetCode() == 0x0508 ) // - + if ( rKeyCode.GetCode() == 0x0508 ) { impl_deleteCondition_nothrow( impl_getFocusedConditionIndex( 0 ) ); return true; @@ -544,19 +544,19 @@ namespace rptui return ModalDialog::PreNotify( _rNEvt ); } - // ----------------------------------------------------------------------------- + size_t ConditionalFormattingDialog::impl_getFirstVisibleConditionIndex() const { return (size_t)m_aCondScroll.GetThumbPos(); } - // ----------------------------------------------------------------------------- + size_t ConditionalFormattingDialog::impl_getLastVisibleConditionIndex() const { return ::std::min( impl_getFirstVisibleConditionIndex() + MAX_CONDITIONS, impl_getConditionCount() ) - 1; } - // ----------------------------------------------------------------------------- + size_t ConditionalFormattingDialog::impl_getFocusedConditionIndex( sal_Int32 _nFallBackIfNone ) const { size_t nIndex( 0 ); @@ -571,7 +571,7 @@ namespace rptui return _nFallBackIfNone; } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_updateScrollBarRange() { long nMax = ( impl_getConditionCount() > MAX_CONDITIONS ) ? impl_getConditionCount() - MAX_CONDITIONS + 1 : 0; @@ -581,7 +581,7 @@ namespace rptui m_aCondScroll.SetVisibleSize( 1 ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_scrollTo( size_t _nTopCondIndex ) { OSL_PRECOND( _nTopCondIndex + MAX_CONDITIONS <= impl_getConditionCount(), @@ -590,7 +590,7 @@ namespace rptui OnScroll( &m_aCondScroll ); } - // ----------------------------------------------------------------------------- + void ConditionalFormattingDialog::impl_ensureConditionVisible( size_t _nCondIndex ) { OSL_PRECOND( _nCondIndex < impl_getConditionCount(), diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2d3e23eaa270..c1dcb3891412 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -71,13 +71,13 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed m_pSubEdit->Show(); Resize(); } -// ----------------------------------------------------------------------------- + ConditionField::~ConditionField() { SetSubEdit(NULL); delete m_pSubEdit; } -// ----------------------------------------------------------------------------- + void ConditionField::Resize() { Edit::Resize(); @@ -87,7 +87,7 @@ void ConditionField::Resize() m_aFormula.SetPosSizePixel(aButtonPos,aButtonSize); m_pSubEdit->SetPosSizePixel(Point(0,0),Size(aButtonPos.X() ,aSize.Height())); } -// ----------------------------------------------------------------------------- + IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) { OUString sFormula(m_pSubEdit->GetText()); @@ -131,7 +131,7 @@ public: void StartSelection(); void SetSlotId(sal_uInt16 _nSlotId); }; -// ----------------------------------------------------------------------------- + OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) :FloatingWindow(_pParent, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL )) ,m_pCondition(_pCondition) @@ -174,13 +174,13 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) SetOutputSizePixel( aSize ); m_aColorSet.Show(); } -// ----------------------------------------------------------------------------- + void OColorPopup::KeyInput( const KeyEvent& rKEvt ) { m_aColorSet.KeyInput(rKEvt); } -// ----------------------------------------------------------------------------- + void OColorPopup::Resize() { Size aSize = GetOutputSizePixel(); @@ -189,12 +189,12 @@ void OColorPopup::Resize() m_aColorSet.SetPosSizePixel( Point(2,2), aSize ); } -// ----------------------------------------------------------------------------- + void OColorPopup::StartSelection() { m_aColorSet.StartSelection(); } -// ----------------------------------------------------------------------------- + void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) { m_nSlotId = _nSlotId; @@ -204,7 +204,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) m_aColorSet.SetText( OUString(ModuleRes( STR_TRANSPARENT )) ); } } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OColorPopup, SelectHdl) { sal_uInt16 nItemId = m_aColorSet.GetSelectItemId(); @@ -225,7 +225,7 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl) // ============================================================================= // = Condition // ============================================================================= -// ----------------------------------------------------------------------------- + Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ) :Control(_pParent, ModuleRes(WIN_CONDITION)) ,m_rController( _rController ) @@ -306,7 +306,7 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp ConditionalExpressionFactory::getKnownConditionalExpressions( m_aConditionalExpressions ); } -// ----------------------------------------------------------------------------- + Condition::~Condition() { m_bInDestruction = true; @@ -315,7 +315,7 @@ Condition::~Condition() delete m_pBtnUpdaterFontColor; delete m_pBtnUpdaterBackgroundColor; } -// ----------------------------------------------------------------------------- + IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) { sal_uInt16 nId( m_aActions.GetCurItemId() ); @@ -343,7 +343,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) return 1; } -//------------------------------------------------------------------ + IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { Color aCol(COL_AUTO); @@ -351,7 +351,7 @@ IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) return 0L; } -//------------------------------------------------------------------ + IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) { if ( _pClickedButton == &m_aMoveUp ) @@ -365,7 +365,7 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) return 0L; } -//------------------------------------------------------------------------------ + void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) { if ( _nCommandId == SID_ATTR_CHAR_COLOR2 ) @@ -375,7 +375,7 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor ); } -//------------------------------------------------------------------------------ + ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const { sal_Int16 nN = IMG_CONDFORMAT_DLG_SC; @@ -383,7 +383,7 @@ ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const nN = IMG_CONDFORMAT_DLG_LC; return ImageList(ModuleRes(nN)); } -//------------------------------------------------------------------ + void Condition::resizeControls(const Size& _rDiff) { // we use large images so we must change them @@ -392,7 +392,7 @@ void Condition::resizeControls(const Size& _rDiff) Invalidate(); } } -// ----------------------------------------------------------------------------- + void Condition::Paint( const Rectangle& rRect ) { Control::Paint(rRect); @@ -402,7 +402,7 @@ void Condition::Paint( const Rectangle& rRect ) ColorChanger aColors( this, rStyleSettings.GetShadowColor(), rStyleSettings.GetDialogColor() ); DrawRect( impl_getToolBarBorderRect() ); } -// ----------------------------------------------------------------------------- + void Condition::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -419,7 +419,7 @@ void Condition::StateChanged( StateChangedType nType ) checkImageList(); } } -// ----------------------------------------------------------------------------- + void Condition::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -433,7 +433,7 @@ void Condition::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------------- + void Condition::GetFocus() { Control::GetFocus(); @@ -441,14 +441,14 @@ void Condition::GetFocus() m_aCondLHS.GrabFocus(); } -// ----------------------------------------------------------------------------- + void Condition::Resize() { Control::Resize(); impl_layoutAll(); } -// ----------------------------------------------------------------------------- + Rectangle Condition::impl_getToolBarBorderRect() const { const Point aToolbarPos( m_aActions.GetPosPixel() ); @@ -464,7 +464,7 @@ Rectangle Condition::impl_getToolBarBorderRect() const return aBorderRect; } -// ----------------------------------------------------------------------------- + void Condition::impl_layoutAll() { // if our width changed, resize/-position some controls @@ -506,21 +506,21 @@ void Condition::impl_layoutAll() impl_layoutOperands(); } -// ----------------------------------------------------------------------------- + IMPL_LINK( Condition, OnTypeSelected, ListBox*, /*_pNotInterestedIn*/ ) { impl_layoutOperands(); return 0L; } -// ----------------------------------------------------------------------------- + IMPL_LINK( Condition, OnOperationSelected, ListBox*, /*_pNotInterestedIn*/ ) { impl_layoutOperands(); return 0L; } -// ----------------------------------------------------------------------------- + void Condition::impl_layoutOperands() { const ConditionType eType( impl_getCurrentConditionType() ); @@ -570,7 +570,7 @@ void Condition::impl_layoutOperands() m_aCondRHS.Show( bHaveRHS ); } -// ----------------------------------------------------------------------------- + void Condition::impl_setCondition( const OUString& _rConditionFormula ) { // determine the condition's type and comparison operation @@ -622,7 +622,7 @@ void Condition::impl_setCondition( const OUString& _rConditionFormula ) impl_layoutOperands(); } -// ----------------------------------------------------------------------------- + void Condition::setCondition( const uno::Reference< report::XFormatCondition >& _rxCondition ) { OSL_PRECOND( _rxCondition.is(), "Condition::setCondition: empty condition object!" ); @@ -643,7 +643,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& updateToolbar( _rxCondition.get() ); } -// ----------------------------------------------------------------------------- + void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat >& _xReportControlFormat) { OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!"); @@ -674,7 +674,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat } } } -// ----------------------------------------------------------------------------- + void Condition::fillFormatCondition(const uno::Reference< report::XFormatCondition >& _xCondition) { const ConditionType eType( impl_getCurrentConditionType() ); @@ -697,7 +697,7 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi ReportFormula aFormula( ReportFormula::Expression, sUndecoratedFormula ); _xCondition->setFormula( aFormula.getCompleteFormula() ); } -// ----------------------------------------------------------------------------- + void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount ) { m_nCondIndex = _nCondIndex; @@ -710,7 +710,7 @@ void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount ) m_aMoveDown.Enable( _nCondIndex < _nCondCount - 1 ); } -// ----------------------------------------------------------------------------- + bool Condition::isEmpty() const { return m_aCondLHS.GetText().isEmpty(); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index c3c30dcb1373..42ecde726f94 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -91,7 +91,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent aCheckBoxes[i]->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl)); } -// ----------------------------------------------------------------------------- + void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) { const bool bTime = util::NumberFormat::TIME == _nNumberFormatId; @@ -110,11 +110,11 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent pListBox->SetEntryData(nPos, reinterpret_cast<void*>(*pIter)); } } -//------------------------------------------------------------------------ + ODateTimeDialog::~ODateTimeDialog() { } -// ----------------------------------------------------------------------------- + short ODateTimeDialog::Execute() { short nRet = ModalDialog::Execute(); @@ -166,7 +166,7 @@ short ODateTimeDialog::Execute() } return nRet; } -// ----------------------------------------------------------------------------- + OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime) { uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey); @@ -191,7 +191,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con OSL_ENSURE(xPreviewer.is(),"XNumberFormatPreviewer is null!"); return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,sal_True); } -// ----------------------------------------------------------------------------- + IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox ) { (void)_pBox; @@ -211,7 +211,7 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox ) } return 1L; } -// ----------------------------------------------------------------------------- + sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const { sal_Int32 nFormatKey; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 2b0e4077b51c..33a3a50c2147 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -73,7 +73,7 @@ FormulaDialog::FormulaDialog(Window* pParent void FormulaDialog::notifyChange() { } -// ----------------------------------------------------------------------------- + void FormulaDialog::fill() { SetMeText(m_sFormula); @@ -172,19 +172,19 @@ IFunctionManager* FormulaDialog::getFunctionManager() { return m_aFunctionManager.get(); } -// ----------------------------------------------------------------------------- + void FormulaDialog::ShowReference(const OUString& /*_sRef*/) { } -// ----------------------------------------------------------------------------- + void FormulaDialog::HideReference( bool /*bDoneRefMode*/) { } -// ----------------------------------------------------------------------------- + void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/, RefButton* /*pButton*/) { } -// ----------------------------------------------------------------------------- + void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { ::std::pair<RefButton*,RefEdit*> aPair = RefInputStartBefore( _pEdit, _pButton ); @@ -211,7 +211,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) m_pAddField->Show(); } -// ----------------------------------------------------------------------------- + IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) { const uno::Sequence< beans::PropertyValue > aArgs = _pAddFieldDlg->getSelectedFieldDescriptors(); @@ -235,22 +235,22 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) return 0L; } -// ----------------------------------------------------------------------------- + uno::Reference< sheet::XFormulaParser> FormulaDialog::getFormulaParser() const { return m_xParser.get(); } -// ----------------------------------------------------------------------------- + uno::Reference< sheet::XFormulaOpCodeMapper> FormulaDialog::getFormulaOpCodeMapper() const { return m_xOpCodeMapper; } -// ----------------------------------------------------------------------------- + table::CellAddress FormulaDialog::getReferencePosition() const { return table::CellAddress(); } -// ----------------------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 06753d8d7653..4b6dd5fa7b88 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -40,7 +40,7 @@ namespace rptui : m_aGroupRow(_aGroupRow) { } - // ----------------------------------------------------------------------------- + void OGroupExchange::AddSupportedFormats() { if ( m_aGroupRow.getLength() ) @@ -48,7 +48,7 @@ namespace rptui AddFormat(OGroupExchange::getReportGroupId()); } } - // ----------------------------------------------------------------------------- + sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uLong nFormat = SotExchange::GetFormat(rFlavor); @@ -58,12 +58,12 @@ namespace rptui } return sal_False; } - // ----------------------------------------------------------------------------- + void OGroupExchange::ObjectReleased() { m_aGroupRow.realloc(0); } - // ----------------------------------------------------------------------------- + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 80cefa6fc7b4..34fd85035dbe 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -168,7 +168,7 @@ public: //======================================================================== // class OFieldExpressionControl //======================================================================== -//------------------------------------------------------------------------ + OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId ) :EditBrowseBox( _pParent, _rResId,EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL) @@ -184,7 +184,7 @@ OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent SetBorderStyle(WINDOW_BORDER_MONO); } -//------------------------------------------------------------------------ + OFieldExpressionControl::~OFieldExpressionControl() { acquire(); @@ -199,7 +199,7 @@ OFieldExpressionControl::~OFieldExpressionControl() delete m_pComboCell; } -//------------------------------------------------------------------------------ + uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups() { uno::Sequence<uno::Any> aList; @@ -232,7 +232,7 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups() } return aList; } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*_rPosPixel*/ ) { if ( m_pParent && !m_pParent->isReadOnly( ) ) @@ -247,7 +247,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /* } } } -//------------------------------------------------------------------------------ + sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) { sal_Int8 nAction = DND_ACTION_NONE; @@ -264,7 +264,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt } return nAction; } -//------------------------------------------------------------------------------ + sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) { sal_Int8 nAction = DND_ACTION_NONE; @@ -285,7 +285,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE } return nAction; } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect) { if ( _aGroups.getLength() ) @@ -325,14 +325,14 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups Invalidate(); } } -// ----------------------------------------------------------------------------- + void OFieldExpressionControl::fillColumns(const uno::Reference< container::XNameAccess>& _xColumns) { m_pComboCell->Clear(); if ( _xColumns.is() ) lcl_addToList_throw(*m_pComboCell,m_aColumnInfo,_xColumns); } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::lateInit() { uno::Reference< report::XGroups > xGroups = m_pParent->getGroups(); @@ -382,8 +382,8 @@ void OFieldExpressionControl::lateInit() RowInserted(0, m_aGroupPositions.size(), sal_True); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ ) { @@ -391,18 +391,18 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ ) return 0L; } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const { return sal_False; } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::SaveModified() { return SaveModified(true); } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) { sal_Int32 nRow = GetCurRow(); @@ -482,7 +482,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) return sal_True; } -//------------------------------------------------------------------------------ + OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const { OUString sText; @@ -512,13 +512,13 @@ OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ return sText; } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId ) { m_pComboCell->SetText( GetCellText( nRow, nColumnId ) ); } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { @@ -533,7 +533,7 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) m_pParent->DisplayData( m_nDataPos ); return sal_True; } -//------------------------------------------------------------------------------ + CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ ) { ComboBoxCellController* pCellController = new ComboBoxCellController( m_pComboCell ); @@ -541,7 +541,7 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt1 return pCellController; } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::SeekRow( long _nRow ) { // die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird @@ -550,7 +550,7 @@ sal_Bool OFieldExpressionControl::SeekRow( long _nRow ) return sal_True; } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const { OUString aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId ); @@ -567,7 +567,7 @@ void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rR if( rDev.IsClipRegion() ) rDev.SetClipRegion(); } -//------------------------------------------------------------------------------ + EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const { if (nRow >= 0 && nRow == m_nDataPos) @@ -587,13 +587,13 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const return EditBrowseBox::CLEAN; } // XEventListener -//------------------------------------------------------------------------------ + void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException ) { } -//------------------------------------------------------------------------------ + // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException) { if ( m_bIgnoreEvent ) @@ -633,11 +633,11 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe Invalidate(); } } -//------------------------------------------------------------------------------ + void SAL_CALL OFieldExpressionControl::elementReplaced(const container::ContainerEvent& /*evt*/) throw(uno::RuntimeException) { } -//------------------------------------------------------------------------------ + void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -661,12 +661,12 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container } } } -//------------------------------------------------------------------------------ + sal_Bool OFieldExpressionControl::IsDeleteAllowed( ) { return !m_pParent->isReadOnly() && GetSelectRowCount() > 0; } -//------------------------------------------------------------------------ + void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed()) @@ -681,7 +681,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt ) } EditBrowseBox::KeyInput(rEvt); } -//------------------------------------------------------------------------ + void OFieldExpressionControl::Command(const CommandEvent& rEvt) { switch (rEvt.GetCommand()) @@ -736,7 +736,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) } } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::DeleteRows() { @@ -797,15 +797,15 @@ void OFieldExpressionControl::DeleteRows() m_bIgnoreEvent = false; Invalidate(); } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + void OFieldExpressionControl::cut() { copy(); DeleteRows(); } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::copy() { ////////////////////////////////////////////////////////////////////// @@ -822,7 +822,7 @@ void OFieldExpressionControl::copy() } } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::paste() { TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); @@ -833,7 +833,7 @@ void OFieldExpressionControl::paste() m_nPasteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedPaste) ); } } -//------------------------------------------------------------------------------ + IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*, ) { m_nPasteEvent = 0; @@ -846,14 +846,14 @@ IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*, ) return 0; } -//------------------------------------------------------------------------------ + IMPL_LINK( OFieldExpressionControl, DelayedDelete, void*, ) { m_nDeleteEvent = 0; DeleteRows(); return 0; } -//------------------------------------------------------------------------------ + void OFieldExpressionControl::InsertRows( long nRow ) { @@ -911,7 +911,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) RowInserted( nRow,nSize,sal_True ); } -//------------------------------------------------------------------------------ + //======================================================================== // class OGroupsSortingDialog @@ -1006,7 +1006,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent FreeResource(); } -//------------------------------------------------------------------------ + OGroupsSortingDialog::~OGroupsSortingDialog() { delete m_pFieldExpression; @@ -1015,12 +1015,12 @@ OGroupsSortingDialog::~OGroupsSortingDialog() if ( m_pCurrentGroupListener.is() ) m_pCurrentGroupListener->dispose(); } -// ----------------------------------------------------------------------------- + sal_Bool OGroupsSortingDialog::isReadOnly( ) const { return m_bReadOnly; } -//------------------------------------------------------------------------------ + void OGroupsSortingDialog::UpdateData( ) { m_pFieldExpression->Invalidate(); @@ -1029,7 +1029,7 @@ void OGroupsSortingDialog::UpdateData( ) m_pFieldExpression->ActivateCell(nCurRow, m_pFieldExpression->GetCurColumnId()); DisplayData(nCurRow); } -//------------------------------------------------------------------------------ + void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow ) { sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow); @@ -1065,7 +1065,7 @@ void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow ) displayGroup(xGroup); } } -//------------------------------------------------------------------------------ + void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) { sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow); @@ -1097,7 +1097,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) pControls[i]->SaveValue(); } -// ----------------------------------------------------------------------------- + sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) { sal_Int32 nDataType = sdbc::DataType::VARCHAR; @@ -1119,7 +1119,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) return nDataType; } -//------------------------------------------------------------------------------ + IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl ) { if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() ) @@ -1142,7 +1142,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl ) } return 0L; } -//------------------------------------------------------------------------------ + IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl ) { if ( m_pFieldExpression && pControl == &m_aGroupIntervalEd ) @@ -1152,7 +1152,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl ) } return 0L; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { @@ -1195,7 +1195,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) } return 1L; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox ) { if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) @@ -1229,12 +1229,12 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox ) } return 1L; } -// ----------------------------------------------------------------------------- + void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId) { m_aHelpWindow.SetText(OUString(ModuleRes(_nResId))); } -// ----------------------------------------------------------------------------- + void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY); @@ -1243,13 +1243,13 @@ void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _r else fillColumns(); } -// ----------------------------------------------------------------------------- + void OGroupsSortingDialog::fillColumns() { m_xColumns = m_pController->getColumns(); m_pFieldExpression->fillColumns(m_xColumns); } -// ----------------------------------------------------------------------------- + void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _xGroup) { m_aHeaderLst.SelectEntryPos(_xGroup->getHeaderOn() ? 0 : 1 ); @@ -1340,7 +1340,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x pControlsLst2[i]->SetReadOnly(bReadOnly); m_aGroupIntervalEd.SetReadOnly(bReadOnly); } -//------------------------------------------------------------------------------ + void OGroupsSortingDialog::Resize() { Window::Resize(); @@ -1375,7 +1375,7 @@ void OGroupsSortingDialog::Resize() Point aHelpPos = m_aHelpWindow.GetPosPixel(); m_aHelpWindow.SetSizePixel(Size(aTotalOutputSize.Width() - aHelpPos.X(),aTotalOutputSize.Height() - aHelpPos.Y())); } -//------------------------------------------------------------------------------ + void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) { sal_Int32 nGroupCount = m_xGroups->getCount(); @@ -1419,7 +1419,7 @@ ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const return ImageList(ModuleRes( nN )); } -//------------------------------------------------------------------ + void OGroupsSortingDialog::resizeControls(const Size& _rDiff) { // we use large images so we must change them @@ -1429,7 +1429,7 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff) } } -//------------------------------------------------------------------ + // load the images ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException )) { diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 9e16f84ccd37..b551087dcc03 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -78,7 +78,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle nId = SID_DRAWTBX_CS_BASIC; return nId; } -// ----------------------------------------------------------------------------- + OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) { OSL_ENSURE(_xElement.is(),"Found report element which is NULL!"); @@ -103,7 +103,7 @@ OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) } return sName.makeStringAndClear(); } -// ----------------------------------------------------------------------------- + class NavigatorTree : public ::cppu::BaseMutex , public SvTreeListBox @@ -206,7 +206,7 @@ public: private: using SvTreeListBox::ExecuteDrop; }; -// ----------------------------------------------------------------------------- + NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT ) ,comphelper::OSelectionChangeListener(m_aMutex) @@ -244,7 +244,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) SetSelectHdl(LINK(this, NavigatorTree, OnEntrySelDesel)); SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel)); } -// ----------------------------------------------------------------------------- + NavigatorTree::~NavigatorTree() { SvTreeListEntry* pCurrent = First(); @@ -256,7 +256,7 @@ NavigatorTree::~NavigatorTree() m_pReportListener->dispose(); m_pSelectionListener->dispose(); } -//------------------------------------------------------------------------------ + void NavigatorTree::Command( const CommandEvent& rEvt ) { sal_Bool bHandled = sal_False; @@ -340,7 +340,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) if (!bHandled) SvTreeListBox::Command( rEvt ); } -// ----------------------------------------------------------------------------- + sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { sal_Int8 nDropOption = DND_ACTION_NONE; @@ -393,12 +393,12 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDropOption; } -// ------------------------------------------------------------------------- + sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& /*_rEvt*/ ) { return DND_ACTION_NONE; } -// ------------------------------------------------------------------------- + void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) { m_pDragedEntry = GetEntry(_rPosPixel); @@ -407,7 +407,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) EndSelection(); } } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { if (--m_nTimerCounter > 0) @@ -444,7 +444,7 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) return 0L; } -// ----------------------------------------------------------------------------- + IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) { if ( !m_pSelectionListener->locked() ) @@ -460,7 +460,7 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) return 0L; } -// ----------------------------------------------------------------------------- + void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) { m_pSelectionListener->lock(); @@ -496,7 +496,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( } m_pSelectionListener->unlock(); } -// ----------------------------------------------------------------------------- + SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) { SvTreeListEntry* pEntry = NULL; @@ -509,7 +509,7 @@ SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEnt pEntry = InsertEntry(_sName,_pParent,sal_False,_nPosition,_pData); return pEntry; } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition) { SvTreeListEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection)); @@ -528,7 +528,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS } } } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent) { SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, SID_RPT_NEW_FUNCTION, LIST_APPEND, new UserData(this,_xFunctions)); @@ -539,7 +539,7 @@ void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& insertEntry(xElement->getName(),pFunctions,SID_RPT_NEW_FUNCTION,LIST_APPEND,new UserData(this,xElement)); } } -// ----------------------------------------------------------------------------- + SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _xContent) { SvTreeListEntry* pRet = NULL; @@ -560,50 +560,50 @@ SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _x } return pRet; } -// ----------------------------------------------------------------------------- + // ITraverseReport -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseReport(const uno::Reference< report::XReportDefinition>& _xReport) { insertEntry(_xReport->getName(),m_pMasterReport,SID_SELECT_REPORT,LIST_APPEND,new UserData(this,_xReport)); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseReportFunctions(const uno::Reference< report::XFunctions>& _xFunctions) { SvTreeListEntry* pReport = find(_xFunctions->getParent()); traverseFunctions(_xFunctions,pReport); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseReportHeader(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseReportFooter(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traversePageHeader(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups) { SvTreeListEntry* pReport = find(_xGroups->getReportDefinition()); insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, SID_SORTINGANDGROUPING, LIST_APPEND, new UserData(this,_xGroups)); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup) { uno::Reference< report::XGroups> xGroups(_xGroup->getParent(),uno::UNO_QUERY); @@ -611,34 +611,34 @@ void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup OSL_ENSURE(pGroups,"No Groups inserted so far. Why!"); insertEntry(_xGroup->getExpression(),pGroups,SID_GROUP,rptui::getPositionInIndexAccess(xGroups.get(),_xGroup),new UserData(this,_xGroup)); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions) { SvTreeListEntry* pGroup = find(_xFunctions->getParent()); traverseFunctions(_xFunctions,pGroup); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseGroupHeader(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pGroup = find(_xSection->getGroup()); OSL_ENSURE(pGroup,"No group found"); traverseSection(_xSection,pGroup,SID_GROUPHEADER,1); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseGroupFooter(const uno::Reference< report::XSection>& _xSection) { SvTreeListEntry* pGroup = find(_xSection->getGroup()); OSL_ENSURE(pGroup,"No group found"); traverseSection(_xSection,pGroup,SID_GROUPFOOTER); } -// ----------------------------------------------------------------------------- + void NavigatorTree::traverseDetail(const uno::Reference< report::XSection>& _xSection) { uno::Reference< report::XReportDefinition> xReport = _xSection->getReportDefinition(); SvTreeListEntry* pParent = find(xReport); traverseSection(_xSection,pParent,SID_ICON_DETAIL); } -// ----------------------------------------------------------------------------- + void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY); @@ -668,7 +668,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } } -// ----------------------------------------------------------------------------- + void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvTreeListEntry* pEntry = find(_rEvent.Source); @@ -698,7 +698,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) if ( !IsExpanded(pEntry) ) Expand(pEntry); } -// ----------------------------------------------------------------------------- + void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent ) { uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY); @@ -712,7 +712,7 @@ void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent ) PaintEntry(pParent); } } -// ----------------------------------------------------------------------------- + void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) { uno::Reference<beans::XPropertySet> xProp(_rEvent.ReplacedElement,uno::UNO_QUERY); @@ -727,12 +727,12 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) SetEntryText(pEntry,sName); } } -// ----------------------------------------------------------------------------- + void NavigatorTree::_disposing(const lang::EventObject& _rSource)throw( uno::RuntimeException) { removeEntry(find(_rSource.Source)); } -// ----------------------------------------------------------------------------- + void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove) { if ( _pEntry ) @@ -748,7 +748,7 @@ void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove) GetModel()->Remove(_pEntry); } } -// ----------------------------------------------------------------------------- + NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) : OPropertyChangeListener(m_aMutex) , OContainerListener(m_aMutex) @@ -782,7 +782,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer); } } -// ----------------------------------------------------------------------------- + NavigatorTree::UserData::~UserData() { if ( m_pContainerListener.is() ) @@ -790,7 +790,7 @@ NavigatorTree::UserData::~UserData() if ( m_pListener.is() ) m_pListener->dispose(); } -// ----------------------------------------------------------------------------- + // OPropertyChangeListener void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { @@ -835,29 +835,29 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& catch(const uno::Exception &) {} } -// ----------------------------------------------------------------------------- + void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException) { m_pTree->_elementInserted( _rEvent ); } -// ----------------------------------------------------------------------------- + void NavigatorTree::UserData::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException) { m_pTree->_elementRemoved( _rEvent ); } -// ----------------------------------------------------------------------------- + void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException) { m_pTree->_elementReplaced( _rEvent ); } -// ----------------------------------------------------------------------------- + void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException) { m_pTree->_disposing( _rSource ); } -// ----------------------------------------------------------------------------- + // class ONavigatorImpl -// ----------------------------------------------------------------------------- + class ONavigatorImpl { ONavigatorImpl(const ONavigatorImpl&); @@ -882,11 +882,11 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar lang::EventObject aEvent(m_rController); m_pNavigatorTree->_selectionChanged(aEvent); } -//------------------------------------------------------------------------ + ONavigatorImpl::~ONavigatorImpl() { } -// ----------------------------------------------------------------------------- + const long STD_WIN_SIZE_X = 210; const long STD_WIN_SIZE_Y = 280; const long LISTBOX_BORDER = 2; @@ -907,13 +907,13 @@ ONavigator::ONavigator( Window* _pParent Show(); } -// ----------------------------------------------------------------------------- -//------------------------------------------------------------------------ + + ONavigator::~ONavigator() { } -//------------------------------------------------------------------------------ + void ONavigator::Resize() { FloatingWindow::Resize(); @@ -930,8 +930,8 @@ void ONavigator::Resize() m_pImpl->m_pNavigatorTree->SetPosSizePixel( aLBPos, aLBSize ); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void ONavigator::GetFocus() { Window::GetFocus(); diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index eb3b3f06919a..c5aa2e5a958c 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -60,11 +60,11 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent } -//------------------------------------------------------------------------ + OPageNumberDialog::~OPageNumberDialog() { } -// ----------------------------------------------------------------------------- + short OPageNumberDialog::Execute() { short nRet = ModalDialog::Execute(); diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 8cef137d0ed3..ca9807bbabb5 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -226,7 +226,7 @@ void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyNam break; } } -// ----------------------------------------------------------------------------- + void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) { uno::Reference<chart2::XTitled> xTitled(m_xChartModel,uno::UNO_QUERY); @@ -516,7 +516,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); } -// ----------------------------------------------------------------------------- + bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { uno::Sequence<uno::Any> aSeq(2); diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index d058364123c7..c4156bac2bc6 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -50,7 +50,7 @@ namespace rptui //==================================================================== //= DefaultComponentInspectorModel //==================================================================== - //-------------------------------------------------------------------- + DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext) :m_xContext( _rxContext ) ,m_bConstructed( false ) @@ -98,7 +98,7 @@ namespace rptui return *(new DefaultComponentInspectorModel( _rxContext )); } - //-------------------------------------------------------------------- + Sequence< Any > SAL_CALL DefaultComponentInspectorModel::getHandlerFactories() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -129,39 +129,39 @@ namespace rptui return aReturn; } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL DefaultComponentInspectorModel::getHasHelpSection() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bHasHelpSection; } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nMinHelpTextLines; } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_bIsReadOnly; } - //-------------------------------------------------------------------- + void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( ::sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_nMaxHelpTextLines; } - //-------------------------------------------------------------------- + void SAL_CALL DefaultComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -186,12 +186,12 @@ namespace rptui throw lang::IllegalArgumentException( OUString(), *this, 0 ); } - //-------------------------------------------------------------------- + void DefaultComponentInspectorModel::createDefault() { m_bConstructed = true; } - //-------------------------------------------------------------------- + void DefaultComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) @@ -202,7 +202,7 @@ namespace rptui m_nMaxHelpTextLines = _nMaxHelpTextLines; m_bConstructed = true; } - //-------------------------------------------------------------------- + Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultComponentInspectorModel::describeCategories( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -230,7 +230,7 @@ namespace rptui return aReturn; } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index ec3ef752847f..3ac307067e5e 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -128,17 +128,17 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin } }; -// ----------------------------------------------------------------------------- + OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { return "[" + _sFunction + "]"; } -// ----------------------------------------------------------------------------- + OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction) { return lcl_getQuotedFunctionName(_xFunction->getName()); } -// ----------------------------------------------------------------------------- + void lcl_collectFunctionNames(const uno::Reference< report::XFunctions>& _xFunctions,TFunctions& _rFunctionNames) { uno::Reference< report::XFunctionsSupplier> xParent(_xFunctions->getParent(),uno::UNO_QUERY_THROW); @@ -149,7 +149,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XFunctions>& _xFunct _rFunctionNames.insert(TFunctions::value_type(lcl_getQuotedFunctionName(xFunction),TFunctionPair(xFunction,xParent))); } } -// ----------------------------------------------------------------------------- + void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection,TFunctions& _rFunctionNames) { const uno::Reference< report::XReportDefinition> xReportDefinition = _xSection->getReportDefinition(); @@ -168,7 +168,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection } lcl_collectFunctionNames(xReportDefinition->getFunctions(),_rFunctionNames); } -// ----------------------------------------------------------------------------- + void lcl_convertFormulaTo(const uno::Any& _aPropertyValue,uno::Any& _rControlValue) { OUString sName; @@ -196,7 +196,7 @@ template <typename T, T base> T lcl_round(T value) } } // anonymous namespace -// ----------------------------------------------------------------------------- + bool GeometryHandler::impl_isDataField(const OUString& _sName) const { const OUString* pEnd = m_aFieldNames.getConstArray() + m_aFieldNames.getLength(); @@ -209,7 +209,7 @@ bool GeometryHandler::impl_isDataField(const OUString& _sName) const } return bIsField; } -// ----------------------------------------------------------------------------- + OUString GeometryHandler::impl_convertToFormula( const uno::Any& _rControlValue ) { OUString sName; @@ -243,11 +243,11 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const { } } -// ----------------------------------------------------------------------------- + GeometryHandler::~GeometryHandler() { } -//------------------------------------------------------------------------ + OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); @@ -666,13 +666,13 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c m_xReportComponent->setPropertyValue(PropertyName, aNewValue); } -// ----------------------------------------------------------------------------- + beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xFormComponentHandler->getPropertyState(PropertyName); } -// ----------------------------------------------------------------------------- + void GeometryHandler::implCreateListLikeControl( const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory ,inspection::LineDescriptor & out_Descriptor @@ -686,7 +686,7 @@ void GeometryHandler::implCreateListLikeControl( implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox); } -// ----------------------------------------------------------------------------- + void GeometryHandler::implCreateListLikeControl( const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory ,inspection::LineDescriptor & out_Descriptor @@ -705,7 +705,7 @@ void GeometryHandler::implCreateListLikeControl( out_Descriptor.Control = xListControl.get(); ::std::for_each( _aEntries.begin(), _aEntries.end(),::boost::bind( &inspection::XStringListControl::appendListEntry, xListControl,_1 )); } -// ----------------------------------------------------------------------------- + inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) { @@ -914,7 +914,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const } return aOut; } -// ----------------------------------------------------------------------------- + beans::Property GeometryHandler::getProperty(const OUString & PropertyName) { uno::Sequence< beans::Property > aProps = getSupportedProperties(); @@ -1260,8 +1260,8 @@ void SAL_CALL GeometryHandler::removePropertyChangeListener(const uno::Reference m_aPropertyListeners.removeListener( _rxListener ); m_xFormComponentHandler->removePropertyChangeListener(_rxListener); } -// ----------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedProperties() throw (uno::RuntimeException) { ::std::vector< beans::Property > aNewProps; @@ -1544,7 +1544,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati { return m_xFormComponentHandler->suspend(Suspend); } -// ----------------------------------------------------------------------------- + bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { _out_rSelectedClause = ""; @@ -1601,7 +1601,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, return bSuccess; } -// ----------------------------------------------------------------------------- + void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, const awt::Size& _aSize) { @@ -1629,7 +1629,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, } } } -// ----------------------------------------------------------------------------- + void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const { if ( m_nDataFieldType == FUNCTION ) @@ -1637,7 +1637,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _o else if ( m_nDataFieldType == USER_DEF_FUNCTION ) ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>()); } -// ----------------------------------------------------------------------------- + OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const { ::std::vector< OUString > aList; @@ -1656,7 +1656,7 @@ OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIN } return sRet; } -// ----------------------------------------------------------------------------- + OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const { ::comphelper::MimeConfigurationHelper aMimeHelper(m_xContext); @@ -1668,7 +1668,7 @@ OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMim sRet = _sMimetype; return sRet; } -// ----------------------------------------------------------------------------- + void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const { try @@ -1692,7 +1692,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out OSL_FAIL("Exception caught!"); } } -// ----------------------------------------------------------------------------- + void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const { try @@ -1723,7 +1723,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out OSL_FAIL("Exception caught!"); } } -// ----------------------------------------------------------------------------- + uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUString& _rsNamePostFix) { uno::Reference< report::XFunctionsSupplier> xReturn; @@ -1787,7 +1787,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS return xReturn; } -// ----------------------------------------------------------------------------- + sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction ,OUString& _rDataField ,const uno::Reference< report::XFunctionsSupplier>& _xFunctionsSupplier @@ -1838,7 +1838,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction } return bDefaultFunction; } -// ----------------------------------------------------------------------------- + sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< report::XFunction>& _xFunction ,OUString& _rDataField ,OUString& _rsDefaultFunctionName) const @@ -1878,7 +1878,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< } return bDefaultFunction; } -// ----------------------------------------------------------------------------- + void GeometryHandler::loadDefaultFunctions() { if ( m_aDefaultFunctions.empty() ) @@ -1918,7 +1918,7 @@ void GeometryHandler::loadDefaultFunctions() m_aDefaultFunctions.push_back(aDefault); } } -// ----------------------------------------------------------------------------- + void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField) { try @@ -1968,7 +1968,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard OSL_FAIL("Exception caught!"); } } -// ----------------------------------------------------------------------------- + void GeometryHandler::removeFunction() { if ( m_xFunction.is() ) @@ -1989,7 +1989,7 @@ void GeometryHandler::removeFunction() } } } -// ----------------------------------------------------------------------------- + void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType) { const OUString sNewFunction = m_sDefaultFunction; @@ -2024,7 +2024,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co _aGuard.reset(); } -//------------------------------------------------------------------------ + void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rFieldNames ) const { _rFieldNames.realloc(0); @@ -2058,7 +2058,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF OSL_FAIL( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" ); } } -// ----------------------------------------------------------------------------- + bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const { ::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind = m_aFunctionNames.equal_range(_sQuotedFunctionName); @@ -2092,7 +2092,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct } return aFind.first != aFind.second; } -// ----------------------------------------------------------------------------- + void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction) { if ( m_bNewFunction ) @@ -2127,7 +2127,7 @@ void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const O m_aFunctionNames.insert(TFunctions::value_type(sQuotedFunctionName,TFunctionPair(m_xFunction,xFunctionsSupplier))); m_bNewFunction = true; } -// ----------------------------------------------------------------------------- + void GeometryHandler::impl_setCounterFunction_throw() { OUString sNamePostFix; @@ -2142,7 +2142,7 @@ void GeometryHandler::impl_setCounterFunction_throw() OBlocker aBlocker(m_bIn); m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula( uno::makeAny(sQuotedFunctionName)))); } -// ----------------------------------------------------------------------------- + sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataField) const { sal_uInt32 nDataFieldType = UNDEF_DATA; @@ -2174,7 +2174,7 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataFi } return nDataFieldType; } -// ----------------------------------------------------------------------------- + // XEventListener void SAL_CALL GeometryHandler::disposing(const lang::EventObject& ) throw( uno::RuntimeException ) { diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index eeb786d59bf8..b20c8a9300d6 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -54,7 +54,7 @@ namespace rptui sal_uInt32 _nUIFlags); }; - //------------------------------------------------------------------------ + OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, const OUString& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) @@ -65,7 +65,7 @@ namespace rptui { } - //------------------------------------------------------------------------ + // Vergleichen von PropertyInfo struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > { @@ -90,7 +90,7 @@ namespace rptui sal_uInt16 OPropertyInfoService::s_nCount = 0; OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() { if ( s_pPropertyInfos ) @@ -155,35 +155,35 @@ namespace rptui return s_pPropertyInfos; } - //------------------------------------------------------------------------ + sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName); return pInfo ? pInfo->nId : -1; } - //------------------------------------------------------------------------ + OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sTranslation : OUString(); } - //------------------------------------------------------------------------ + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sHelpId : OString(); } - //------------------------------------------------------------------------ + sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nUIFlags : 0; } - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName) { // intialisierung @@ -201,7 +201,7 @@ namespace rptui } - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // intialisierung @@ -216,7 +216,7 @@ namespace rptui return NULL; } - //------------------------------------------------------------------------ + bool OPropertyInfoService::isComposable( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxFormComponentHandler ) { sal_Int32 nId = getPropertyId( _rPropertyName ); @@ -229,7 +229,7 @@ namespace rptui return _rxFormComponentHandler->isComposable( _rPropertyName ); } - //------------------------------------------------------------------------ + void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler) { uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties(); diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index d37137cf072f..3e4f4d2384a1 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -37,12 +37,12 @@ OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry) m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor(); m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor; } -// ----------------------------------------------------------------------------- + OColorListener::~OColorListener() { EndListening(m_aExtendedColorConfig); } -// ----------------------------------------------------------------------- + void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint) { if (rHint.ISA(SfxSimpleHint) @@ -54,7 +54,7 @@ void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint) Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE); } } -//----------------------------------------------------------------------------- + void OColorListener::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -66,7 +66,7 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -// ----------------------------------------------------------------------------- + void OColorListener::setCollapsed(sal_Bool _bCollapsed) { if ( m_bCollapsed != _bCollapsed ) @@ -76,7 +76,7 @@ void OColorListener::setCollapsed(sal_Bool _bCollapsed) m_aCollapsedLink.Call(this); } } -// ----------------------------------------------------------------------------- + void OColorListener::setMarked(sal_Bool _bMark) { if ( m_bMarked != _bMark) diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 59bb0bba9b32..f82c130cfebb 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -50,12 +50,12 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo } return 0; } -// ----------------------------------------------------------------------------- + sal_uInt32 FunctionManager::getCount() const { return m_xMgr->getCount(); } -// ----------------------------------------------------------------------------- + const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) const { if ( _nPos >= m_aCategoryIndex.size() ) @@ -66,7 +66,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) } return m_aCategoryIndex[_nPos]->second.get(); } -// ----------------------------------------------------------------------------- + const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OUString& _sFunctionName) const { const formula::IFunctionDescription* pDesc = NULL; @@ -79,11 +79,11 @@ const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OU } return pDesc; } -// ----------------------------------------------------------------------------- + void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const { } -// ----------------------------------------------------------------------------- + ::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const { ::boost::shared_ptr< FunctionDescription > pDesc; @@ -107,7 +107,7 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula } return pDesc; } -// ----------------------------------------------------------------------------- + FunctionCategory::FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const uno::Reference< report::meta::XFunctionCategory>& _xCategory) : m_xCategory(_xCategory) ,m_nFunctionCount(_xCategory->getCount()) @@ -115,12 +115,12 @@ FunctionCategory::FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPo ,m_pFunctionManager(_pFMgr) { } -// ----------------------------------------------------------------------------- + sal_uInt32 FunctionCategory::getCount() const { return m_nFunctionCount; } -// ----------------------------------------------------------------------------- + const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _nPos) const { if ( _nPos >= m_aFunctions.size() && _nPos < m_nFunctionCount ) @@ -131,22 +131,22 @@ const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _n } return m_aFunctions[_nPos].get(); } -// ----------------------------------------------------------------------------- + sal_uInt32 FunctionCategory::getNumber() const { return m_nNumber; } -// ----------------------------------------------------------------------------- + const formula::IFunctionManager* FunctionCategory::getFunctionManager() const { return m_pFunctionManager; } -// ----------------------------------------------------------------------------- + OUString FunctionCategory::getName() const { return m_xCategory->getName(); } -// ----------------------------------------------------------------------------- + FunctionDescription::FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) : m_xFunctionDescription(_xFunctionDescription) , m_pFunctionCategory(_pFunctionCategory) @@ -157,22 +157,22 @@ OUString FunctionDescription::getFunctionName() const { return m_xFunctionDescription->getName(); } -// ----------------------------------------------------------------------------- + const formula::IFunctionCategory* FunctionDescription::getCategory() const { return m_pFunctionCategory; } -// ----------------------------------------------------------------------------- + OUString FunctionDescription::getDescription() const { return m_xFunctionDescription->getDescription(); } -// ----------------------------------------------------------------------------- + sal_Int32 FunctionDescription::getSuppressedArgumentCount() const { return m_aParameter.getLength(); } -// ----------------------------------------------------------------------------- + OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const { OUString sFormula; @@ -187,7 +187,7 @@ OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArgu } return sFormula; } -// ----------------------------------------------------------------------------- + void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const { const sal_Int32 nCount = m_aParameter.getLength(); @@ -196,47 +196,47 @@ void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments.push_back(i); } } -// ----------------------------------------------------------------------------- + void FunctionDescription::initArgumentInfo() const { } -// ----------------------------------------------------------------------------- + OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } -// ----------------------------------------------------------------------------- + OString FunctionDescription::getHelpId() const { return OString(); } -// ----------------------------------------------------------------------------- + sal_uInt32 FunctionDescription::getParameterCount() const { return m_aParameter.getLength(); } -// ----------------------------------------------------------------------------- + OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Name; return OUString(); } -// ----------------------------------------------------------------------------- + OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Description; return OUString(); } -// ----------------------------------------------------------------------------- + bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].IsOptional; return false; } -// ----------------------------------------------------------------------------- + // ============================================================================= } // rptui // ============================================================================= diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 887d945d0063..034d26fccac1 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -46,7 +46,7 @@ namespace rptui using namespace container; using namespace report; -//---------------------------------------------------------------------------- + namespace { void lcl_collectElements(const uno::Reference< report::XSection >& _xSection,::std::vector< uno::Reference< drawing::XShape> >& _rControls) @@ -64,7 +64,7 @@ namespace } } } - //---------------------------------------------------------------------------- + void lcl_insertElements(const uno::Reference< report::XSection >& _xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls) { if ( _xSection.is() ) @@ -88,7 +88,7 @@ namespace } } } - //---------------------------------------------------------------------------- + void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< OUString ,uno::Any> >& _aValues) { if ( _xSection.is() ) @@ -109,9 +109,9 @@ namespace } } } -//---------------------------------------------------------------------------- + TYPEINIT1( OSectionUndo, OCommentUndoAction ); -//---------------------------------------------------------------------------- + OSectionUndo::OSectionUndo(OReportModel& _rMod ,sal_uInt16 _nSlot ,Action _eAction @@ -122,7 +122,7 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod ,m_bInserted(false) { } -// ----------------------------------------------------------------------------- + OSectionUndo::~OSectionUndo() { if ( !m_bInserted ) @@ -151,7 +151,7 @@ OSectionUndo::~OSectionUndo() } } } -// ----------------------------------------------------------------------------- + void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection) { m_aControls.clear(); @@ -173,7 +173,7 @@ void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xS { } } -//---------------------------------------------------------------------------- + void OSectionUndo::Undo() { try @@ -194,7 +194,7 @@ void OSectionUndo::Undo() OSL_FAIL( "OSectionUndo::Undo: caught an exception!" ); } } -//---------------------------------------------------------------------------- + void OSectionUndo::Redo() { try @@ -215,9 +215,9 @@ void OSectionUndo::Redo() OSL_FAIL( "OSectionUndo::Redo: caught an exception!" ); } } -//---------------------------------------------------------------------------- + TYPEINIT1( OReportSectionUndo, OSectionUndo ); -//---------------------------------------------------------------------------- + OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,::std::mem_fun_t< uno::Reference< report::XSection > ,OReportHelper> _pMemberFunction @@ -231,11 +231,11 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot if( m_eAction == Removed ) collectControls(m_pMemberFunction(&m_aReportHelper)); } -// ----------------------------------------------------------------------------- + OReportSectionUndo::~OReportSectionUndo() { } -//---------------------------------------------------------------------------- + void OReportSectionUndo::implReInsert( ) { const uno::Sequence< beans::PropertyValue > aArgs; @@ -245,7 +245,7 @@ void OReportSectionUndo::implReInsert( ) lcl_setValues(xSection,m_aValues); m_bInserted = true; } -//---------------------------------------------------------------------------- + void OReportSectionUndo::implReRemove( ) { if( m_eAction == Removed ) @@ -254,9 +254,9 @@ void OReportSectionUndo::implReRemove( ) m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } -//---------------------------------------------------------------------------- + TYPEINIT1( OGroupSectionUndo, OSectionUndo ); -//---------------------------------------------------------------------------- + OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,::std::mem_fun_t< uno::Reference< report::XSection > ,OGroupHelper> _pMemberFunction @@ -275,7 +275,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot collectControls(xSection); } } -//---------------------------------------------------------------------------- + OUString OGroupSectionUndo::GetComment() const { if ( m_sName.isEmpty() ) @@ -293,7 +293,7 @@ OUString OGroupSectionUndo::GetComment() const } return m_strComment + m_sName; } -//---------------------------------------------------------------------------- + void OGroupSectionUndo::implReInsert( ) { uno::Sequence< beans::PropertyValue > aArgs(2); @@ -309,7 +309,7 @@ void OGroupSectionUndo::implReInsert( ) lcl_setValues(xSection,m_aValues); m_bInserted = true; } -//---------------------------------------------------------------------------- + void OGroupSectionUndo::implReRemove( ) { if( m_eAction == Removed ) @@ -325,9 +325,9 @@ void OGroupSectionUndo::implReRemove( ) m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } -//---------------------------------------------------------------------------- + TYPEINIT1( OGroupUndo, OCommentUndoAction ); -//---------------------------------------------------------------------------- + OGroupUndo::OGroupUndo(OReportModel& _rMod ,sal_uInt16 nCommentID ,Action _eAction @@ -340,7 +340,7 @@ OGroupUndo::OGroupUndo(OReportModel& _rMod { m_nLastPosition = getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),m_xGroup); } -//---------------------------------------------------------------------------- + void OGroupUndo::implReInsert( ) { try @@ -352,7 +352,7 @@ void OGroupUndo::implReInsert( ) OSL_FAIL("Exception catched while undoing remove group"); } } -//---------------------------------------------------------------------------- + void OGroupUndo::implReRemove( ) { try @@ -364,7 +364,7 @@ void OGroupUndo::implReRemove( ) OSL_FAIL("Exception catched while redoing remove group"); } } -//---------------------------------------------------------------------------- + void OGroupUndo::Undo() { switch ( m_eAction ) @@ -379,7 +379,7 @@ void OGroupUndo::Undo() } } -//---------------------------------------------------------------------------- + void OGroupUndo::Redo() { switch ( m_eAction ) @@ -393,7 +393,7 @@ void OGroupUndo::Redo() break; } } -//---------------------------------------------------------------------------- + //============================================================================ } // rptui //============================================================================ diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 12895e4478f1..2ac3787e315b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -156,7 +156,7 @@ namespace rptui { using namespace ::com::sun::star; using namespace formula; -// ----------------------------------------------------------------------------- + void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 _nPos) { OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF"); @@ -174,7 +174,7 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 _xGroup->getFooter()->setName(sName); } } -// ----------------------------------------------------------------------------- + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener) { ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet = NULL; @@ -193,10 +193,10 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 return pRet; } -// ----------------------------------------------------------------------------- + namespace { - // ------------------------------------------------------------------------- + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,sal_uInt16 _nWichFont) { if ( !_rxReportControlFormat.is() ) @@ -220,13 +220,13 @@ namespace return VCLUnoHelper::CreateFont( _out_rControlFont, aDefaultFont ); } - // ------------------------------------------------------------------------- + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,sal_uInt16 _nWhich ) { awt::FontDescriptor aAwtFont; return lcl_getReportControlFont( _rxReportControlFormat, aAwtFont, _nWhich ); } - // ------------------------------------------------------------------------- + const Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, SfxItemSet& _rItemSet,sal_uInt16 _nWhich,sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nLanguage,sal_uInt16 _nPosture, sal_uInt16 _nWeight) { @@ -317,7 +317,7 @@ namespace ++aIt; } } - // ------------------------------------------------------------------------- + void lcl_CharPropertiesToItems( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, SfxItemSet& _rItemSet ) { @@ -365,7 +365,7 @@ namespace lcl_setFont(_rxReportControlFormat, _rItemSet,COMPLEX,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_LANGUAGE_COMPLEX,ITEMID_POSTURE_COMPLEX,ITEMID_WEIGHT_COMPLEX ); } - // ------------------------------------------------------------------------- + void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const OUString& _sName, const uno::Any& _rValue ) { sal_Int32 nLen( _out_rProperties.getLength() ); @@ -373,7 +373,7 @@ namespace _out_rProperties[ nLen ] = beans::NamedValue( _sName, _rValue ); } - // ------------------------------------------------------------------------- + void lcl_initAwtFont( const Font& _rOriginalFont, const SfxItemSet& _rItemSet, awt::FontDescriptor& _out_rAwtFont, sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nPosture, sal_uInt16 _nWeight) { @@ -438,7 +438,7 @@ namespace _out_rAwtFont = VCLUnoHelper::CreateFontDescriptor( aNewFont ); } - // ------------------------------------------------------------------------- + void lcl_itemsToCharProperties( const Font& _rOriginalControlFont,const Font& _rOriginalControlFontAsian,const Font& _rOriginalControlFontComplex, const SfxItemSet& _rItemSet, uno::Sequence< beans::NamedValue >& _out_rProperties ) { const SfxPoolItem* pItem( NULL ); @@ -559,7 +559,7 @@ namespace } } - // ------------------------------------------------------------------------- + template< class ATTRIBUTE_TYPE > void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, @@ -570,7 +570,7 @@ namespace (_rxReportControlFormat.get()->*pSetter)( aAttributeValue ); } - // ------------------------------------------------------------------------- + void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) ) @@ -580,7 +580,7 @@ namespace (_rxReportControlFormat.get()->*pSetter)( aAttributeValue ); } - // ------------------------------------------------------------------------- + void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, void (SAL_CALL report::XReportControlFormat::*pSetter)( const lang::Locale& ) ) @@ -591,7 +591,7 @@ namespace } } -// ----------------------------------------------------------------------------- + bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, const uno::Reference< awt::XWindow>& _rxParentWindow, uno::Sequence< beans::NamedValue >& _out_rNewValues ) { @@ -601,7 +601,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep _out_rNewValues = uno::Sequence< beans::NamedValue >(); - // ------------ + // UNO->ItemSet static SfxItemInfo aItemInfos[] = { @@ -741,7 +741,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep return bSuccess; } -// ----------------------------------------------------------------------------- + bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::Reference< awt::XWindow>& _rxParentWindow ) { OSL_PRECOND( _xShape.is() && _rxParentWindow.is(), "openAreaDialog: invalid parameters!" ); @@ -778,7 +778,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R return bSuccess; } -// ----------------------------------------------------------------------------- + void applyCharacterSettings( const uno::Reference< report::XReportControlFormat >& _rxReportControlFormat, const uno::Sequence< beans::NamedValue >& _rSettings ) { ::comphelper::NamedValueCollection aSettings( _rSettings ); @@ -837,7 +837,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat } } -// ----------------------------------------------------------------------------- + void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); @@ -847,7 +847,7 @@ void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem _rMemFunc( pSystemWindow->GetTaskPaneList(), _pToRegister ); } } -// ----------------------------------------------------------------------------- + SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, bool _bAllObjects, SdrObject* _pIgnore, sal_Int16 _nIgnoreType) { SdrObject* pOverlappedObj = NULL; @@ -875,7 +875,7 @@ SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, boo } return pOverlappedObj; } -// ----------------------------------------------------------------------------- + bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength) { for(int i=0;i<_nListLength;i++) @@ -913,7 +913,7 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _ return pOverlappedObj; } -//---------------------------------------------------------------------------- + SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMarkedObjects) { SdrObject* pOverlappedObj = NULL; @@ -925,7 +925,7 @@ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMark return pOverlappedObj; } -// ----------------------------------------------------------------------------- + uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet ) { uno::Sequence< OUString > aNames; @@ -956,7 +956,7 @@ uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet return aNames; } -// ----------------------------------------------------------------------------- + Rectangle getRectangleFromControl(SdrObject* _pControl) { if (_pControl) @@ -972,7 +972,7 @@ Rectangle getRectangleFromControl(SdrObject* _pControl) } return Rectangle(); } -// ----------------------------------------------------------------------------- + // check overlapping void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,bool _bInsert) { @@ -995,7 +995,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo if ( !bOverlapping && _bInsert ) // now insert objects rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK); } -// ----------------------------------------------------------------------------- + void setZoomFactor(const Fraction& _aZoom,Window& _rWindow) { MapMode aMapMode( _rWindow.GetMapMode() ); @@ -1003,7 +1003,7 @@ void setZoomFactor(const Fraction& _aZoom,Window& _rWindow) aMapMode.SetScaleY(_aZoom); _rWindow.SetMapMode(aMapMode); } -// ----------------------------------------------------------------------------- + bool openDialogFormula_nothrow( OUString& _in_out_rFormula , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext , const uno::Reference< awt::XWindow>& _xInspectorWindow @@ -1054,8 +1054,8 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula return bSuccess; } -// ----------------------------------------------------------------------------- + } // namespace rptui -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index f4c5512b98c5..494031867491 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -49,24 +49,24 @@ OUString OStatusbarController::getImplementationName_Static() throw( RuntimeExce { return OUString("com.sun.star.report.comp.StatusbarController"); } -//------------------------------------------------------------------------------ + Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.frame.StatusbarController"; return aSupported; } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException) { return cppu::supportsService(this, ServiceName); } -//------------------------------------------------------------------------- + Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -// ------------------------------------------------------------------------- + Reference< XInterface > OStatusbarController::create(Reference< XComponentContext > const & xContext) { return *(new OStatusbarController(xContext)); @@ -79,7 +79,7 @@ OStatusbarController::OStatusbarController(const Reference< XComponentContext >& ,m_nId(1) { } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { StatusbarController::initialize(_rArguments); @@ -207,14 +207,14 @@ throw (::com::sun::star::uno::RuntimeException) if ( m_rController.is() ) m_rController->doubleClick( aPos ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatusbarController::update() throw ( RuntimeException ) { ::svt::StatusbarController::update(); if ( m_rController.is() ) m_rController->update(); } -// ----------------------------------------------------------------------------- + // XComponent void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException) { diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 95750f21f3cb..f6fe3bd77845 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -59,34 +59,34 @@ OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeExce return getImplementationName_Static(); } -//------------------------------------------------------------------------------ + OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) { return OUString("com.sun.star.report.comp.ReportToolboxController"); } -//------------------------------------------------------------------------------ + Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.report.ReportToolboxController"; return aSupported; } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } -//------------------------------------------------------------------------- + Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -// ------------------------------------------------------------------------- + Reference< XInterface > OToolboxController::create(Reference< XComponentContext > const & xContext) { return * new OToolboxController(xContext); } -// ----------------------------------------------------------------------------- + OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB) : m_pToolbarController(NULL) ,m_nToolBoxId(1) @@ -97,11 +97,11 @@ OToolboxController::OToolboxController(const Reference< XComponentContext >& _rx osl_atomic_decrement(&m_refCount); } -// ----------------------------------------------------------------------------- + OToolboxController::~OToolboxController() { } -// ----------------------------------------------------------------------------- + // XInterface Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException) { @@ -110,17 +110,17 @@ Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (Run aReturn = TToolboxController_BASE::queryInterface(_rType); return aReturn; } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::acquire() throw () { ToolboxController::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::release() throw () { ToolboxController::release(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ToolboxController::initialize(_rArguments); @@ -197,7 +197,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | TIB_DROPDOWN); } } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -266,7 +266,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event } } } -// ----------------------------------------------------------------------------- + Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException) { // execute the menu @@ -279,12 +279,12 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw return xRet; } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw (uno::RuntimeException) { return m_nSlotId == SID_DRAWTBX_CS_BASIC; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; @@ -294,7 +294,7 @@ OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeExc return xSub->getSubToolbarName(); return OUString(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; @@ -306,7 +306,7 @@ void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) t xSub->functionSelected(m_aCommandURL = rCommand); } } -// ----------------------------------------------------------------------------- + void SAL_CALL OToolboxController::updateImage( ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; @@ -316,7 +316,7 @@ void SAL_CALL OToolboxController::updateImage( ) throw (uno::RuntimeException) if ( xSub.is() ) xSub->updateImage(); } -// ----------------------------------------------------------------------------- + uno::Reference< awt::XWindow > SAL_CALL OToolboxController::createItemWindow( const uno::Reference< awt::XWindow >& _xParent) throw (uno::RuntimeException) { @@ -334,7 +334,7 @@ throw (uno::RuntimeException) } return xWindow; } -// ----------------------------------------------------------------------------- + //.......................................................................... } // rptui //.......................................................................... diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 8a2a7260af32..613999d815bd 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -86,7 +86,7 @@ public: //================================================================== // class ODesignView //================================================================== -//------------------------------------------------------------------------------ + ODesignView::ODesignView( Window* pParent, const Reference< XComponentContext >& _rxOrb, OReportController& _rController) : @@ -129,7 +129,7 @@ ODesignView::ODesignView( Window* pParent, m_aMarkTimer.SetTimeoutHdl( LINK( this, ODesignView, MarkTimeout ) ); } -//------------------------------------------------------------------------------ + ODesignView::~ODesignView() { m_bDeleted = sal_True; @@ -171,14 +171,14 @@ ODesignView::~ODesignView() m_pTaskPane = NULL; } } -// ----------------------------------------------------------------------------- + void ODesignView::initialize() { SetMapMode( MapMode( MAP_100TH_MM ) ); m_aScrollWindow.initialize(); m_aScrollWindow.Show(); } -//----------------------------------------------------------------------------- + void ODesignView::DataChanged( const DataChangedEvent& rDCEvt ) { ODataView::DataChanged( rDCEvt ); @@ -190,7 +190,7 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -//------------------------------------------------------------------------------ + bool ODesignView::PreNotify( NotifyEvent& rNEvt ) { bool nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here @@ -223,7 +223,7 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt ) return nRet; } -//------------------------------------------------------------------------------ + void ODesignView::resizeDocumentView(Rectangle& _rPlayground) { if ( !_rPlayground.IsEmpty() ) @@ -278,12 +278,12 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -// ----------------------------------------------------------------------------- + // set the view readonly or not void ODesignView::setReadOnly(sal_Bool /*_bReadOnly*/) { } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ODesignView, MarkTimeout) { if ( m_pPropWin && m_pPropWin->IsVisible() ) @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ODesignView, MarkTimeout) return 0; } -//---------------------------------------------------------------------------- + void ODesignView::SetMode( DlgEdMode _eNewMode ) { m_eMode = _eNewMode; @@ -310,62 +310,62 @@ void ODesignView::SetMode( DlgEdMode _eNewMode ) m_aScrollWindow.SetMode(_eNewMode); } -//---------------------------------------------------------------------------- + void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_eActObj = eObj; m_aScrollWindow.SetInsertObj( eObj,_sShapeType ); } -//---------------------------------------------------------------------------- + OUString ODesignView::GetInsertObjString() const { return m_aScrollWindow.GetInsertObjString(); } -//---------------------------------------------------------------------------- + sal_uInt16 ODesignView::GetInsertObj() const { return m_eActObj; } -//---------------------------------------------------------------------------- + void ODesignView::Cut() { Copy(); Delete(); } -//---------------------------------------------------------------------------- + void ODesignView::Copy() { m_aScrollWindow.Copy(); } -//---------------------------------------------------------------------------- + void ODesignView::Paste() { m_aScrollWindow.Paste(); } -//---------------------------------------------------------------------------- + void ODesignView::Delete() { m_aScrollWindow.Delete(); } -//---------------------------------------------------------------------------- + sal_Bool ODesignView::HasSelection() const { return m_aScrollWindow.HasSelection(); } -//---------------------------------------------------------------------------- + sal_Bool ODesignView::IsPasteAllowed() const { return m_aScrollWindow.IsPasteAllowed(); } -//---------------------------------------------------------------------------- + void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView) { if ( m_pCurrentView != &_rView ) @@ -382,32 +382,32 @@ void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView) m_aMarkTimer.Start(); } -//---------------------------------------------------------------------------- + void ODesignView::toggleGrid(sal_Bool _bGridVisible) { m_aScrollWindow.toggleGrid(_bGridVisible); } -//---------------------------------------------------------------------------- + sal_uInt16 ODesignView::getSectionCount() const { return m_aScrollWindow.getSectionCount(); } -//---------------------------------------------------------------------------- + void ODesignView::showRuler(sal_Bool _bShow) { m_aScrollWindow.showRuler(_bShow); } -//---------------------------------------------------------------------------- + void ODesignView::removeSection(sal_uInt16 _nPosition) { m_aScrollWindow.removeSection(_nPosition); } -//---------------------------------------------------------------------------- + void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { m_aScrollWindow.addSection(_xSection,_sColorEntry,_nPosition); } -// ----------------------------------------------------------------------------- + void ODesignView::GetFocus() { Window::GetFocus(); @@ -419,14 +419,14 @@ void ODesignView::GetFocus() pSectionWindow->GrabFocus(); } } -// ----------------------------------------------------------------------------- + void ODesignView::ImplInitSettings() { SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } -//----------------------------------------------------------------------------- + IMPL_LINK( ODesignView, SplitHdl, void*, ) { const Size aOutputSize = GetOutputSizePixel(); @@ -444,17 +444,17 @@ IMPL_LINK( ODesignView, SplitHdl, void*, ) return 0L; } -//----------------------------------------------------------------------------- + void ODesignView::SelectAll(const sal_uInt16 _nObjectType) { m_aScrollWindow.SelectAll(_nObjectType); } -//----------------------------------------------------------------------------- + void ODesignView::unmarkAllObjects(OSectionView* _pSectionView) { m_aScrollWindow.unmarkAllObjects(_pSectionView); } -//----------------------------------------------------------------------------- + void ODesignView::togglePropertyBrowser(bool _bToogleOn) { if ( !m_pPropWin && _bToogleOn ) @@ -483,7 +483,7 @@ void ODesignView::togglePropertyBrowser(bool _bToogleOn) m_aMarkTimer.Start(); } } -//----------------------------------------------------------------------------- + void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xReportComponent) { if ( m_xReportComponent != _xReportComponent ) @@ -495,12 +495,12 @@ void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xRepor m_aMarkTimer.Start(); } } -//----------------------------------------------------------------------------- + sal_Bool ODesignView::isReportExplorerVisible() const { return m_pReportExplorer && m_pReportExplorer->IsVisible(); } -//----------------------------------------------------------------------------- + void ODesignView::toggleReportExplorer() { if ( !m_pReportExplorer ) @@ -516,12 +516,12 @@ void ODesignView::toggleReportExplorer() else m_pReportExplorer->Show(!m_pReportExplorer->IsVisible()); } -//----------------------------------------------------------------------------- + sal_Bool ODesignView::isAddFieldVisible() const { return m_pAddField && m_pAddField->IsVisible(); } -//----------------------------------------------------------------------------- + void ODesignView::toggleAddField() { if ( !m_pAddField ) @@ -555,7 +555,7 @@ void ODesignView::toggleAddField() else m_pAddField->Show(!m_pAddField->IsVisible()); } -// ------------------------------------------------------------------------- + uno::Reference< report::XSection > ODesignView::getCurrentSection() const { uno::Reference< report::XSection > xSection; @@ -564,7 +564,7 @@ uno::Reference< report::XSection > ODesignView::getCurrentSection() const return xSection; } -// ----------------------------------------------------------------------------- + uno::Reference< report::XReportComponent > ODesignView::getCurrentControlModel() const { uno::Reference< report::XReportComponent > xModel; @@ -574,48 +574,48 @@ uno::Reference< report::XReportComponent > ODesignView::getCurrentControlModel() } return xModel; } -// ------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> ODesignView::getMarkedSection(NearSectionAccess nsa) const { return m_aScrollWindow.getMarkedSection(nsa); } -//----------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> ODesignView::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const { return m_aScrollWindow.getSectionWindow(_xSection); } -// ------------------------------------------------------------------------- + void ODesignView::markSection(const sal_uInt16 _nPos) { m_aScrollWindow.markSection(_nPos); } -// ----------------------------------------------------------------------------- + void ODesignView::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { m_aScrollWindow.fillCollapsedSections(_rCollapsedPositions); } -// ----------------------------------------------------------------------------- + void ODesignView::collapseSections(const uno::Sequence< beans::PropertyValue>& _aCollpasedSections) { m_aScrollWindow.collapseSections(_aCollpasedSections); } -// ----------------------------------------------------------------------------- + OUString ODesignView::getCurrentPage() const { return m_pPropWin ? m_pPropWin->getCurrentPage() : OUString(); } -// ----------------------------------------------------------------------------- + void ODesignView::setCurrentPage(const OUString& _sLastActivePage) { if ( m_pPropWin ) m_pPropWin->setCurrentPage(_sLastActivePage); } -// ----------------------------------------------------------------------------- + void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { m_aScrollWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects); } -//------------------------------------------------------------------------------ + sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent) { if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) ) @@ -626,7 +626,7 @@ sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent) return sal_False; return m_aScrollWindow.handleKeyEvent(_rEvent); } -//------------------------------------------------------------------------ + void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { m_aScrollWindow.setMarked(_xSection,_bMark); @@ -635,7 +635,7 @@ void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,s else m_pCurrentView = NULL; } -//------------------------------------------------------------------------ + void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark) { m_aScrollWindow.setMarked(_aShapes,_bMark); @@ -644,7 +644,7 @@ void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReport else m_xReportComponent.clear(); } -//------------------------------------------------------------------------------ + void ODesignView::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -654,7 +654,7 @@ void ODesignView::MouseButtonDown( const MouseEvent& rMEvt ) } ODataView::MouseButtonDown(rMEvt); } -// ----------------------------------------------------------------------------- + uno::Any ODesignView::getCurrentlyShownProperty() const { uno::Any aRet; @@ -676,38 +676,38 @@ uno::Any ODesignView::getCurrentlyShownProperty() const } return aRet; } -// ----------------------------------------------------------------------------- + void ODesignView::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const { m_aScrollWindow.fillControlModelSelection(_rSelection); } -// ----------------------------------------------------------------------------- + void ODesignView::setGridSnap(sal_Bool bOn) { m_aScrollWindow.setGridSnap(bOn); } -// ----------------------------------------------------------------------------- + void ODesignView::setDragStripes(sal_Bool bOn) { m_aScrollWindow.setDragStripes(bOn); } -// ----------------------------------------------------------------------------- + sal_Bool ODesignView::isHandleEvent(sal_uInt16 /*_nId*/) const { return m_pPropWin && m_pPropWin->HasChildPathFocus(); } -// ----------------------------------------------------------------------------- + sal_uInt32 ODesignView::getMarkedObjectCount() const { return m_aScrollWindow.getMarkedObjectCount(); } -// ----------------------------------------------------------------------------- + void ODesignView::zoom(const Fraction& _aZoom) { m_aScrollWindow.zoom(_aZoom); } -// ----------------------------------------------------------------------------- + sal_uInt16 ODesignView::getZoomFactor(SvxZoomType _eType) const { return m_aScrollWindow.getZoomFactor(_eType); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 54b0c39b61f6..1da0cebecd25 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -38,11 +38,11 @@ OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry) SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); } -// ----------------------------------------------------------------------------- + OEndMarker::~OEndMarker() { } -// ----------------------------------------------------------------------------- + void OEndMarker::Paint( const Rectangle& /*rRect*/ ) { Fraction aCornerSpace(long(CORNER_SPACE)); @@ -75,7 +75,7 @@ void OEndMarker::Paint( const Rectangle& /*rRect*/ ) DrawPolyLine(Polygon(PixelToLogic(aRect)),LineInfo(LINE_SOLID,2)); } } -// ----------------------------------------------------------------------- + void OEndMarker::ImplInitSettings() { EnableChildTransparentMode( true ); @@ -85,7 +85,7 @@ void OEndMarker::ImplInitSettings() SetBackground( Wallpaper( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); } -// ----------------------------------------------------------------------- + void OEndMarker::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() && !rMEvt.IsRight()) diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index efbc65ca26e4..9ee741795d13 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -55,11 +55,11 @@ namespace rptui { } - //-------------------------------------------------------------------- + FixedTextColor::~FixedTextColor() { } - // ----------------------------------------------------------------------------- + void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { @@ -80,19 +80,19 @@ namespace rptui } } - // ----------------------------------------------------------------------------- + void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor) { _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR, uno::makeAny(sal_Int32(_nTextColor))); } - // ----------------------------------------------------------------------------- + void FixedTextColor::notifyElementInserted( const uno::Reference< uno::XInterface >& _rxElement ) { handle(_rxElement); } -// ----------------------------------------------------------------------------- + void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement ) { uno::Reference< report::XFixedText > xFixedText( _rxElement, uno::UNO_QUERY ); @@ -151,7 +151,7 @@ namespace rptui } -// ----------------------------------------------------------------------------- + // XPropertyChangeListener uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { @@ -185,7 +185,7 @@ namespace rptui return xControl; } -// ----------------------------------------------------------------------------- + uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException) { uno::Reference<awt::XVclWindowPeer> xVclWindowPeer; diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 8322f676f441..2d4042e6c0a6 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -48,14 +48,14 @@ namespace rptui using namespace ::com::sun::star; - //-------------------------------------------------------------------- + FormattedFieldBeautifier::FormattedFieldBeautifier(const OReportController& _aController) :m_rReportController(_aController) ,m_nTextColor(-1) { } - //-------------------------------------------------------------------- + sal_Int32 FormattedFieldBeautifier::getTextColor() { if (m_nTextColor == -1) @@ -66,12 +66,12 @@ namespace rptui return m_nTextColor; } - //-------------------------------------------------------------------- + FormattedFieldBeautifier::~FormattedFieldBeautifier() { } - // ----------------------------------------------------------------------------- + void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent ) { OUString sDataField; @@ -114,7 +114,7 @@ namespace rptui } } - // ----------------------------------------------------------------------------- + void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ) { OSL_ENSURE( _xVclWindowPeer.is(), "FormattedFieldBeautifier::setPlaceholderText: invalid peer!" ); @@ -133,7 +133,7 @@ namespace rptui _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure)); } - // ----------------------------------------------------------------------------- + void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName != "DataField" ) @@ -143,19 +143,19 @@ namespace rptui setPlaceholderText( _rEvent.Source ); } - // ----------------------------------------------------------------------------- + void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement ) { setPlaceholderText( _rxElement ); } - // ----------------------------------------------------------------------------- + void FormattedFieldBeautifier::notifyElementInserted( const uno::Reference< uno::XInterface >& _rxElement ) { handle( _rxElement ); } - // ----------------------------------------------------------------------------- + uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException) { uno::Reference<awt::XVclWindowPeer> xVclWindowPeer; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 13f55b8886e8..472d1686911d 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -173,7 +173,7 @@ using namespace ::dbaui; using namespace ::comphelper; using namespace ::cppu; -// ----------------------------------------------------------------------------- + namespace { // comparing two PropertyValue instances @@ -217,7 +217,7 @@ namespace } } -// ----------------------------------------------------------------------------- + static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, ODesignView* _pView, uno::Reference< awt::XWindow>& _xWindow, @@ -244,30 +244,30 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, if ( !_xWindow.is() ) _xWindow = VCLUnoHelper::GetInterface(_pView); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } -//------------------------------------------------------------------------------ + OUString OReportController::getImplementationName_Static() throw( RuntimeException ) { return OUString("com.sun.star.report.comp.ReportDesign"); } -//------------------------------------------------------------------------------ + Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.ReportDesign"; return aSupported; } -//------------------------------------------------------------------------- + Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -// ------------------------------------------------------------------------- + Reference< XInterface > OReportController::create(Reference< XComponentContext > const & xContext) { return *(new OReportController(xContext)); @@ -275,7 +275,7 @@ Reference< XInterface > OReportController::create(Reference< XComponentContext > #define PROPERTY_ID_ZOOMVALUE 1 -// ----------------------------------------------------------------------------- + OReportController::OReportController(Reference< XComponentContext > const & xContext) :OReportController_BASE(xContext) ,OPropertyStateContainer(OGenericUnoController_Base::rBHelper) @@ -307,14 +307,14 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon &m_nZoomValue, ::getCppuType(static_cast< sal_Int16*>(0))); } -// ----------------------------------------------------------------------------- + OReportController::~OReportController() { } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2(OReportController,OReportController_BASE,OReportController_Listener) IMPLEMENT_FORWARD_XINTERFACE2(OReportController,OReportController_BASE,OReportController_Listener) -// ----------------------------------------------------------------------------- + void OReportController::disposing() { @@ -393,7 +393,7 @@ void OReportController::disposing() EndListening( *getDesignView() ); clearView(); } -// ----------------------------------------------------------------------------- + FeatureState OReportController::GetState(sal_uInt16 _nId) const { FeatureState aReturn; @@ -955,7 +955,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const return aReturn; } -// ----------------------------------------------------------------------------- + namespace { /** extracts a background color from a dispatched SID_BACKGROUND_COLOR call @@ -979,7 +979,7 @@ namespace } } -// ----------------------------------------------------------------------------- + void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs) { SolarMutexGuard aSolarGuard; @@ -1645,13 +1645,13 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > } InvalidateFeature(_nId,Reference< XStatusListener >(),bForceBroadcast); } -// ----------------------------------------------------------------------------- + short OReportController::saveModified() { return RET_NO; } -// ----------------------------------------------------------------------------- + void OReportController::impl_initialize( ) { OReportController_BASE::impl_initialize(); @@ -1754,13 +1754,13 @@ void OReportController::impl_initialize( ) DBG_UNHANDLED_EXCEPTION(); } } -// ----------------------------------------------------------------------------- + IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/) { doOpenHelpAgent(); return 0L; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg) { WaitObject aObj( getDesignView() ); @@ -1772,7 +1772,7 @@ IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg) } return 0L; } -// ----------------------------------------------------------------------------- + void OReportController::doOpenHelpAgent() { @@ -1787,7 +1787,7 @@ void OReportController::doOpenHelpAgent() getView()->PostUserEvent(LINK(this, OReportController, OnOpenHelpAgent)); } } -// ----------------------------------------------------------------------------- + sal_Bool OReportController::Construct(Window* pParent) { ODesignView* pMyOwnView = new ODesignView( pParent, m_xContext, *this ); @@ -1804,7 +1804,7 @@ sal_Bool OReportController::Construct(Window* pParent) OReportController_BASE::Construct(pParent); return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException ) { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) @@ -1819,7 +1819,7 @@ sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( Runt // this suspend will be handled in the DBAccess interceptor implementation return sal_True; } -// ----------------------------------------------------------------------------- + void OReportController::describeSupportedFeatures() { DBSubComponentController::describeSupportedFeatures(); @@ -2082,7 +2082,7 @@ void OReportController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); } -// ----------------------------------------------------------------------------- + void OReportController::impl_onModifyChanged() { try @@ -2096,7 +2096,7 @@ void OReportController::impl_onModifyChanged() DBG_UNHANDLED_EXCEPTION(); } } -// ----------------------------------------------------------------------------- + void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _xLayoutManager) { if ( _xLayoutManager.is() ) @@ -2118,7 +2118,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ } } } -// ----------------------------------------------------------------------------- + void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _bShow) { uno::Reference< report::XGroup> xGroup(_rEvent.Element,uno::UNO_QUERY); @@ -2166,25 +2166,25 @@ void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _ } } } -// ----------------------------------------------------------------------------- + // ::container::XContainerListener void SAL_CALL OReportController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException) { notifyGroupSections(_rEvent,true); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) { notifyGroupSections(_rEvent,false); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); OSL_FAIL("Not yet implemented!"); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -2280,14 +2280,14 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven } } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) throw(uno::RuntimeException) { // simply disambiguate OReportController_BASE::disposing(Source); } -// ----------------------------------------------------------------------------- + static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups ,sal_Int32 _nGroupPos ,::std::mem_fun_t<sal_Bool,OGroupHelper>&_pGroupMemberFunction) @@ -2305,7 +2305,7 @@ static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XG } return nNonVisibleGroups; } -// ----------------------------------------------------------------------------- + void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) { ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn); @@ -2348,25 +2348,25 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr } } } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(OReportController, OnClipboardChanged) { OnInvalidateClipboard(); return 0; } -//------------------------------------------------------------------------------ + void OReportController::OnInvalidateClipboard() { InvalidateFeature(SID_CUT); InvalidateFeature(SID_COPY); InvalidateFeature(SID_PASTE); } -// ----------------------------------------------------------------------------- + void OReportController::openPageDialog(const uno::Reference<report::XSection>& _xSection) { if ( !m_xReportDefinition.is() ) return; - // ------------ + // UNO->ItemSet static SfxItemInfo aItemInfos[] = { @@ -2444,7 +2444,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ : OString("PageDialog")); if (RET_OK == aDlg.Execute()) { - // ------------ + // ItemSet->UNO // UNO-properties const SfxItemSet* pSet = aDlg.GetOutputItemSet(); @@ -2512,7 +2512,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XModel > & xModel) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2529,7 +2529,7 @@ sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XM return sal_True; } -// ----------------------------------------------------------------------------- + void OReportController::openSortingAndGroupingDialog() { if ( !m_xReportDefinition.is() ) @@ -2545,13 +2545,13 @@ void OReportController::openSortingAndGroupingDialog() else if ( isUiVisible() ) m_pGroupsFloater->Show(!m_pGroupsFloater->IsVisible()); } -// ----------------------------------------------------------------------------- + sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGroup >& _xGroup) { return rptui::getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),_xGroup); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent*, _pEvent ) { if ( _pEvent && _pEvent->GetId() == VCLEVENT_WINDOW_CLOSE ) @@ -2562,7 +2562,7 @@ IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent*, _pEvent ) } return 1L; } -// ----------------------------------------------------------------------------- + void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHint) { if (_rHint.ISA(DlgEdHint) @@ -2581,7 +2581,7 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi } } -// ----------------------------------------------------------------------------- + void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun) { const OUString sUndoAction = ModuleRes(_nUndoStrId); @@ -2590,7 +2590,7 @@ void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std InvalidateFeature( SID_SAVEDOC ); InvalidateFeature( SID_UNDO ); } -// ----------------------------------------------------------------------------- + void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection) { const OUString sUndoAction = ModuleRes(_nUndoStrId); @@ -2599,7 +2599,7 @@ void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _ InvalidateFeature( SID_SAVEDOC ); InvalidateFeature( SID_UNDO ); } -// ----------------------------------------------------------------------------- + void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xSection) { const sal_Int32 nElements = _xSection->getCount(); @@ -2694,7 +2694,7 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<rep InvalidateFeature( SID_UNDO ); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2760,7 +2760,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept aViewData.put( "ZoomFactor", m_nZoomValue ); return uno::makeAny( aViewData.getPropertyValues() ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2824,14 +2824,14 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( DBG_UNHANDLED_EXCEPTION(); } } -// ----------------------------------------------------------------------------- + void OReportController::updateFloater() { if ( m_pGroupsFloater && m_pGroupsFloater->IsVisible() ) m_pGroupsFloater->UpdateData(); } -// ----------------------------------------------------------------------------- + Reference<XFrame> OReportController::getXFrame() { if ( !m_xFrameLoader.is() ) @@ -2844,7 +2844,7 @@ Reference<XFrame> OReportController::getXFrame() return xFrame; } -// ----------------------------------------------------------------------------- + uno::Reference<frame::XModel> OReportController::executeReport() { OSL_ENSURE(m_xReportDefinition.is(),"Where is my report?"); @@ -2960,12 +2960,12 @@ uno::Reference<frame::XModel> OReportController::executeReport() } return xModel; } -// ----------------------------------------------------------------------------- + uno::Reference< frame::XModel > SAL_CALL OReportController::getModel(void) throw( uno::RuntimeException ) { return m_xReportDefinition.get(); } -// ----------------------------------------------------------------------------- + uno::Reference< sdbc::XRowSet > OReportController::getRowSet() { OSL_PRECOND( m_xReportDefinition.is(), "OReportController::getRowSet: no report definition?!" ); @@ -3000,7 +3000,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet() return m_xRowSet; } -// ----------------------------------------------------------------------------- + void OReportController::insertGraphic() { const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC)); @@ -3033,12 +3033,12 @@ void OReportController::insertGraphic() DBG_UNHANDLED_EXCEPTION(); } } -// ----------------------------------------------------------------------------- + ::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() const { return m_aReportModel; } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -3078,7 +3078,7 @@ void OReportController::insertGraphic() } return bRet; } -// ----------------------------------------------------------------------------- + Any SAL_CALL OReportController::getSelection( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -3091,17 +3091,17 @@ Any SAL_CALL OReportController::getSelection( ) throw (RuntimeException) } return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException) { m_aSelectionListeners.addInterface( _Listener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException) { m_aSelectionListeners.removeInterface( _Listener ); } -// ----------------------------------------------------------------------------- + void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); @@ -3111,13 +3111,13 @@ void OReportController::createNewFunction(const uno::Any& _aValue) // the call below will also create an undo action -> listener xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction)); } -// ----------------------------------------------------------------------------- + IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/) { executeReport(); return 0L; } -// ----------------------------------------------------------------------------- + void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId) { SequenceAsHashMap aMap(_aArgs); @@ -3232,7 +3232,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co correctOverlapping(pNewControl,pSectionWindow->getReportSection()); } -// ----------------------------------------------------------------------------- + void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) { getDesignView()->unmarkAllObjects(NULL); @@ -3260,7 +3260,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } } -// ----------------------------------------------------------------------------- + void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs) { getDesignView()->unmarkAllObjects(NULL); @@ -3290,7 +3290,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction); } -// ----------------------------------------------------------------------------- + void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { getDesignView()->unmarkAllObjects(NULL); @@ -3606,7 +3606,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } } -// ----------------------------------------------------------------------------- + OSectionView* OReportController::getCurrentSectionView() const { OSectionView* pSectionView = NULL; @@ -3615,7 +3615,7 @@ OSectionView* OReportController::getCurrentSectionView() const pSectionView = &pSectionWindow->getReportSection().getSectionView(); return pSectionView; } -// ----------------------------------------------------------------------------- + void OReportController::changeZOrder(sal_Int32 _nId) { OSectionView* pSectionView = getCurrentSectionView(); @@ -3645,7 +3645,7 @@ void OReportController::changeZOrder(sal_Int32 _nId) } } } -// ----------------------------------------------------------------------------- + void OReportController::listen(const bool _bAdd) { const OUString aProps [] = { OUString(PROPERTY_REPORTHEADERON),OUString(PROPERTY_REPORTFOOTERON) @@ -3749,7 +3749,7 @@ void OReportController::listen(const bool _bAdd) m_aReportModel->detachController(); } } -// ----------------------------------------------------------------------------- + void OReportController::switchReportSection(const sal_Int16 _nId) { OSL_ENSURE(_nId == SID_REPORTHEADER_WITHOUT_UNDO || _nId == SID_REPORTFOOTER_WITHOUT_UNDO || _nId == SID_REPORTHEADERFOOTER ,"Illegal id given!"); @@ -3799,7 +3799,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId) getView()->Resize(); } } -// ----------------------------------------------------------------------------- + void OReportController::switchPageSection(const sal_Int16 _nId) { OSL_ENSURE(_nId == SID_PAGEHEADERFOOTER || _nId == SID_PAGEHEADER_WITHOUT_UNDO || _nId == SID_PAGEFOOTER_WITHOUT_UNDO ,"Illegal id given!"); @@ -3848,7 +3848,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId) getView()->Resize(); } } -// ----------------------------------------------------------------------------- + void OReportController::modifyGroup(const bool _bAppend, const Sequence< PropertyValue >& _aArgs) { if ( !m_xReportDefinition.is() ) @@ -3892,7 +3892,7 @@ void OReportController::modifyGroup(const bool _bAppend, const Sequence< Propert } } -// ----------------------------------------------------------------------------- + void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader, const Sequence< PropertyValue >& _aArgs) { if ( m_xReportDefinition.is() ) @@ -3922,7 +3922,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader } } } -// ----------------------------------------------------------------------------- + void OReportController::collapseSection(const bool _bCollapse) { ::boost::shared_ptr<OSectionWindow> pSection = getDesignView()->getMarkedSection(); @@ -3931,7 +3931,7 @@ void OReportController::collapseSection(const bool _bCollapse) pSection->setCollapsed(_bCollapse); } } -// ----------------------------------------------------------------------------- + void OReportController::markSection(const bool _bNext) { ::boost::shared_ptr<OSectionWindow> pSection = getDesignView()->getMarkedSection(); @@ -3951,7 +3951,7 @@ void OReportController::markSection(const bool _bNext) select(uno::makeAny(pSection->getReportSection().getSection())); } } -// ----------------------------------------------------------------------------- + void OReportController::createDefaultControl(const uno::Sequence< beans::PropertyValue>& _aArgs) { uno::Reference< report::XSection > xSection = getDesignView()->getCurrentSection(); @@ -3973,12 +3973,12 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert } } } -// ----------------------------------------------------------------------------- + uno::Reference< util::XNumberFormatter > OReportController::getReportNumberFormatter() const { return m_xFormatter; } -// ----------------------------------------------------------------------------- + void OReportController::checkChartEnabled() { if ( !m_bChartEnabledAsked ) @@ -4002,7 +4002,7 @@ void OReportController::checkChartEnabled() } } } -// ----------------------------------------------------------------------------- + // css.frame.XTitle OUString SAL_CALL OReportController::getTitle() @@ -4015,12 +4015,12 @@ OUString SAL_CALL OReportController::getTitle() return xTitle->getTitle (); } -// ----------------------------------------------------------------------------- + void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const { _rDefault <<= sal_Int16(100); } -// ----------------------------------------------------------------------------- + // comphelper::OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* OReportController::createArrayHelper( ) const { @@ -4028,7 +4028,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + // cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL OReportController::getInfoHelper() @@ -4036,7 +4036,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& typedef ::comphelper::OPropertyArrayUsageHelper<OReportController_BASE> OReportController_PROP; return *OReportController_PROP::getArrayHelper(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle,const Any& _aValue) throw (Exception) { if ( _nHandle == PROPERTY_ID_ZOOMVALUE ) @@ -4073,12 +4073,12 @@ OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::R } return pIter != pEnd; } -// ----------------------------------------------------------------------------- + bool OReportController::isUiVisible() const { return m_sMode != "remote"; } -// ----------------------------------------------------------------------------- + void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const { _rState.bEnabled = isEditable(); @@ -4114,7 +4114,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui: } } } -// ----------------------------------------------------------------------------- + void OReportController::impl_zoom_nothrow() { Fraction aZoom(m_nZoomValue,100); @@ -4123,7 +4123,7 @@ void OReportController::impl_zoom_nothrow() InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True); InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True); } -// ----------------------------------------------------------------------------- + sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const { sal_Bool bRet = sal_False; @@ -4154,7 +4154,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un } return bRet; } -// ----------------------------------------------------------------------------- + bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; @@ -4174,14 +4174,14 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo return !aSelection.empty(); } -// ----------------------------------------------------------------------------- + void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomShapeType,dbaui::FeatureState& _rState) const { _rState.bEnabled = isEditable(); _rState.bChecked = getDesignView()->GetInsertObj() == OBJ_CUSTOMSHAPE && getDesignView()->GetInsertObjString().equalsAscii(_pCustomShapeType); } -// ----------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OReportController::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const { if ( getDesignView() ) @@ -4195,7 +4195,7 @@ void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomSh } -// ----------------------------------------------------------------------------- + void OReportController::openZoomDialog() { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -4254,8 +4254,8 @@ void OReportController::openZoomDialog() delete pDefaults[i]; } } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + // XVisualObject void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException) { @@ -4268,13 +4268,13 @@ void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const setModified( sal_True ); m_nAspect = _nAspect; } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL OReportController::getVisualAreaSize( ::sal_Int64 /*nAspect*/ ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return m_aVisualAreaSize; } -// ----------------------------------------------------------------------------- + embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepresentation( ::sal_Int64 _nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -4312,12 +4312,12 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres } return aResult; } -// ----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL OReportController::getMapUnit( ::sal_Int64 /*nAspect*/ ) throw (uno::Exception, uno::RuntimeException) { return embed::EmbedMapUnits::ONE_100TH_MM; } -// ----------------------------------------------------------------------------- + uno::Reference< container::XNameAccess > OReportController::getColumns() const { if ( !m_xColumns.is() && m_xReportDefinition.is() && !m_xReportDefinition->getCommand().isEmpty() ) @@ -4326,7 +4326,7 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const } return m_xColumns; } -// ----------------------------------------------------------------------------- + OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName) const { OUString sLabel; @@ -4340,7 +4340,7 @@ OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName) return sLabel; } -// ----------------------------------------------------------------------------- + SfxUndoManager& OReportController::getUndoManager() const { DBG_TESTSOLARMUTEX(); @@ -4355,13 +4355,13 @@ SfxUndoManager& OReportController::getUndoManager() const return *pUndoManager; } -// ----------------------------------------------------------------------------- + void OReportController::clearUndoManager() const { getUndoManager().Clear(); } -// ----------------------------------------------------------------------------- + void OReportController::addUndoAction( SfxUndoAction* i_pAction ) { getUndoManager().AddUndoAction( i_pAction ); diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index aaf12fb84ac0..dae05f1e80be 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -62,7 +62,7 @@ public: ~OXReportControllerObserverImpl(); }; -// ----------------------------------------------------------------------------- + OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController) :m_rReportController(_rController) @@ -75,9 +75,9 @@ public: { } - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + + + OXReportControllerObserver::OXReportControllerObserver(const OReportController& _rController) @@ -94,7 +94,7 @@ public: Application::RemoveEventListener(LINK( this, OXReportControllerObserver, SettingsChanged ) ); } - // ----------------------------------------------------------------------------- + IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclWindowEvent*, _pEvt) { if ( _pEvt ) @@ -178,7 +178,7 @@ public: m_aFixedTextColor.notifyPropertyChange(_rEvent); } -// ----------------------------------------------------------------------------- + void OXReportControllerObserver::Lock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); @@ -192,7 +192,7 @@ void OXReportControllerObserver::UnLock() } sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::AddSection(const uno::Reference< report::XSection > & _xSection) { OEnvLock aLock(*this); @@ -209,7 +209,7 @@ void OXReportControllerObserver::AddSection(const uno::Reference< report::XSecti } } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::RemoveSection(const uno::Reference< report::XSection > & _xSection) { OEnvLock aLock(*this); @@ -227,7 +227,7 @@ void OXReportControllerObserver::RemoveSection(const uno::Reference< report::XSe } } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< uno::XInterface > & Element) { // listen at Container @@ -254,7 +254,7 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxContainer.is(), "OXReportControllerObserver::switchListening: invalid container!" ); @@ -291,7 +291,7 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe } } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::switchListening( const uno::Reference< uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxObject.is(), "OXReportControllerObserver::switchListening: how should I listen at a NULL object?" ); @@ -325,12 +325,12 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn } } -//------------------------------------------------------------------------------ + void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) { } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterface >& _rxElement ) { m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement); @@ -344,7 +344,7 @@ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterfac switchListening( _rxElement, true ); } -//------------------------------------------------------------------------------ + void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInterface >& _rxElement) { switchListening( _rxElement, false ); @@ -354,7 +354,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter switchListening( xContainer, false ); } -// ----------------------------------------------------------------------------- + ::std::vector< uno::Reference< container::XChild> >::const_iterator OXReportControllerObserver::getSection(const uno::Reference<container::XChild>& _xContainer) const { ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = m_pImpl->m_aSections.end(); @@ -371,7 +371,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter return aFind; } // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL OXReportControllerObserver::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -385,7 +385,7 @@ void SAL_CALL OXReportControllerObserver::elementInserted(const container::Conta } } -//------------------------------------------------------------------------------ + void SAL_CALL OXReportControllerObserver::elementReplaced(const container::ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -399,7 +399,7 @@ void SAL_CALL OXReportControllerObserver::elementReplaced(const container::Conta AddElement(xIface); } -//------------------------------------------------------------------------------ + void SAL_CALL OXReportControllerObserver::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException) { SolarMutexGuard aSolarGuard; diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 9789afa75265..518f24ce9e72 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -30,22 +30,22 @@ OReportRuler::OReportRuler(Window* _pParent,OReportWindow* _pReportWindow,const Show(); } -//------------------------------------------------------------------------------ + OReportRuler::~OReportRuler() { delete m_pSection; } -//------------------------------------------------------------------------------ + void OReportRuler::Resize() { m_pSection->SetPosSizePixel(Point(0,0),GetOutputSize()); } -//------------------------------------------------------------------------------ + void OReportRuler::SetGridVisible(sal_Bool _bVisible) { m_pSection->SetGridVisible( _bVisible ); } -//------------------------------------------------------------------------------ + //============================================================================== } // rptui //============================================================================== diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 905ba74f4a07..2339e9faed01 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -66,7 +66,7 @@ namespace rptui { // ============================================================================= using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- + sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServiceFactory> _rxFactory*/) { @@ -74,7 +74,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServ sal_Int32 nColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBOVERLAPPEDCONTROL).getColor(); return nColor; } -//------------------------------------------------------------------------------ + OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) @@ -110,7 +110,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re m_pFunc.reset(new DlgEdFuncSelect( this )); m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor() ); } -//------------------------------------------------------------------------------ + OReportSection::~OReportSection() { m_pPage = NULL; @@ -128,7 +128,7 @@ OReportSection::~OReportSection() m_pView = NULL; } } -//------------------------------------------------------------------------------ + void OReportSection::Paint( const Rectangle& rRect ) { Window::Paint(rRect); @@ -164,12 +164,12 @@ void OReportSection::Paint( const Rectangle& rRect ) --m_nPaintEntranceCount; } } -//------------------------------------------------------------------------------ + void OReportSection::Resize() { Window::Resize(); } -//------------------------------------------------------------------------------ + void OReportSection::fill() { if ( !m_xSection.is() ) @@ -232,7 +232,7 @@ void OReportSection::fill() const Size aPageSize = m_pPage->GetSize(); m_pView->SetWorkArea( Rectangle( Point( nLeftMargin, 0), Size(aPageSize.Width() - nLeftMargin - nRightMargin,aPageSize.Height()) ) ); } -// ----------------------------------------------------------------------------- + void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce) { OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!"); @@ -300,7 +300,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC } } } -//---------------------------------------------------------------------------- + void OReportSection::Delete() { if( !m_pView->AreObjectsMarked() ) @@ -309,7 +309,7 @@ void OReportSection::Delete() m_pView->BrkAction(); m_pView->DeleteMarked(); } -//---------------------------------------------------------------------------- + void OReportSection::SetMode( DlgEdMode eNewMode ) { if ( eNewMode != m_eMode ) @@ -327,12 +327,12 @@ void OReportSection::SetMode( DlgEdMode eNewMode ) m_eMode = eNewMode; } } -// ----------------------------------------------------------------------------- + void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects) { Copy(_rAllreadyCopiedObjects,false); } -//---------------------------------------------------------------------------- + void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone) { OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!"); @@ -383,33 +383,33 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb pNewValue->Value <<= uno::Sequence< uno::Reference<report::XReportComponent> >(&(*aCopies.begin()),aCopies.size()); } } -//---------------------------------------------------------------------------- + void OReportSection::MouseButtonDown( const MouseEvent& rMEvt ) { m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True); // mark the section in which is clicked m_pFunc->MouseButtonDown( rMEvt ); Window::MouseButtonDown(rMEvt); } -//---------------------------------------------------------------------------- + void OReportSection::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !m_pFunc->MouseButtonUp( rMEvt ) ) m_pParent->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_OBJECT_SELECT,uno::Sequence< beans::PropertyValue>()); } -//---------------------------------------------------------------------------- + void OReportSection::MouseMove( const MouseEvent& rMEvt ) { m_pFunc->MouseMove( rMEvt ); } -//---------------------------------------------------------------------------- + void OReportSection::SetGridVisible(sal_Bool _bVisible) { m_pView->SetGridVisible( _bVisible ); } -//------------------------------------------------------------------------------ + void OReportSection::SelectAll(const sal_uInt16 _nObjectType) { if ( m_pView ) @@ -466,7 +466,7 @@ void lcl_insertMenuItemImages( } } } -//---------------------------------------------------------------------------- + void OReportSection::Command( const CommandEvent& _rCEvt ) { Window::Command(_rCEvt); @@ -499,7 +499,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) break; } } -// ----------------------------------------------------------------------------- + void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { if ( m_xSection.is() ) @@ -600,18 +600,18 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I OSL_FAIL("Exception caught: OReportSection::impl_adjustObjectSizePosition()"); } } -//------------------------------------------------------------------------------ + sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent) { return m_pFunc.get() ? m_pFunc->handleKeyEvent(_rEvent) : sal_False; } -// ----------------------------------------------------------------------------- + void OReportSection::deactivateOle() { if ( m_pFunc.get() ) m_pFunc->deactivateOle(true); } -// ----------------------------------------------------------------------------- + void OReportSection::createDefault(const OUString& _sType) { SdrObject* pObj = m_pView->GetCreateObj(); @@ -619,7 +619,7 @@ void OReportSection::createDefault(const OUString& _sType) return; createDefault(_sType,pObj); } -// ----------------------------------------------------------------------------- + void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) { sal_Bool bAttributesAppliedFromGallery = sal_False; @@ -683,7 +683,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) ((SdrObjCustomShape*)_pObj)->MergeDefaultAttributes( &_sType ); } } -// ----------------------------------------------------------------------------- + uno::Reference< report::XReportComponent > OReportSection::getCurrentControlModel() const { uno::Reference< report::XReportComponent > xModel; @@ -702,7 +702,7 @@ uno::Reference< report::XReportComponent > OReportSection::getCurrentControlMode } return xModel; } -// ----------------------------------------------------------------------------- + void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const { if ( m_pView ) @@ -722,7 +722,7 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un } } } -// ----------------------------------------------------------------------------- + sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) { OSL_TRACE("AcceptDrop::DropEvent.Action %i", _rEvt.mnAction); @@ -772,7 +772,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) return DND_ACTION_NONE; } -// ----------------------------------------------------------------------------- + sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { OSL_TRACE("ExecuteDrop::DropEvent.Action %i", _rEvt.mnAction); @@ -847,17 +847,17 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } return nDropOption; } -// ----------------------------------------------------------------------------- + void OReportSection::stopScrollTimer() { m_pFunc->stopScrollTimer(); } -// ----------------------------------------------------------------------------- + bool OReportSection::isUiActive() const { return m_pFunc->isUiActive(); } -// ----------------------------------------------------------------------------- + // ============================================================================= } // ============================================================================= diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index edacb4d4b192..08d500985730 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -55,7 +55,7 @@ using namespace ::comphelper; //================================================================== // class OReportWindow //================================================================== -//------------------------------------------------------------------------------ + OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) @@ -83,41 +83,41 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) ImplInitSettings(); m_pReportListener = addStyleListener(_pView->getController().getReportDefinition(),this); } -//------------------------------------------------------------------------------ + OReportWindow::~OReportWindow() { if ( m_pReportListener.is() ) m_pReportListener->dispose(); } -// ----------------------------------------------------------------------------- + void OReportWindow::initialize() { m_aViewsWindow.initialize(); } -//---------------------------------------------------------------------------- + void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } -//---------------------------------------------------------------------------- + OUString OReportWindow::GetInsertObjString() const { return m_aViewsWindow.GetInsertObjString(); } -//------------------------------------------------------------------------------ + void OReportWindow::SetMode( DlgEdMode eNewMode ) { m_aViewsWindow.SetMode(eNewMode); } -//---------------------------------------------------------------------------- + void OReportWindow::removeSection(sal_uInt16 _nPosition) { m_aViewsWindow.removeSection(_nPosition); m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT); } -//---------------------------------------------------------------------------- + void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { if ( !_xSection.is() ) @@ -127,19 +127,19 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } -//------------------------------------------------------------------------------ + void OReportWindow::toggleGrid(sal_Bool _bVisible) { m_aViewsWindow.toggleGrid(_bVisible); } -//---------------------------------------------------------------------------- + void OReportWindow::showRuler(sal_Bool _bShow) { m_aHRuler.Show(_bShow); m_aViewsWindow.showRuler(_bShow); } -//------------------------------------------------------------------------------ + sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const { Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); @@ -148,7 +148,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const aStartWidth += Fraction(long(REPORT_ENDMARKER_WIDTH)); return sal_Int32((long)aStartWidth); } -//------------------------------------------------------------------------------ + sal_Int32 OReportWindow::GetTotalWidth() const { sal_Int32 nWidth = 0; @@ -165,7 +165,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const } return nWidth; } -//------------------------------------------------------------------------------ + void OReportWindow::Resize() { Window::Resize(); @@ -202,17 +202,17 @@ void OReportWindow::Resize() m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight)); } } -//------------------------------------------------------------------------------ + Point OReportWindow::getThumbPos() const { return m_pParent->getThumbPos(); } -//------------------------------------------------------------------------------ + void OReportWindow::ImplInitSettings() { SetBackground( ); } -//----------------------------------------------------------------------------- + void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -224,12 +224,12 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -//------------------------------------------------------------------------------ + sal_Int32 OReportWindow::GetTotalHeight() const { return m_aViewsWindow.getTotalHeight(); } -//------------------------------------------------------------------------------ + void OReportWindow::ScrollChildren(const Point& _aThumbPos) { MapMode aMap = m_aHRuler.GetMapMode(); @@ -243,136 +243,136 @@ void OReportWindow::ScrollChildren(const Point& _aThumbPos) m_aViewsWindow.scrollChildren(_aThumbPos); } -//---------------------------------------------------------------------------- + sal_uInt16 OReportWindow::getSectionCount() const { return m_aViewsWindow.getSectionCount(); } -//---------------------------------------------------------------------------- + void OReportWindow::notifySizeChanged() { m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } -//---------------------------------------------------------------------------- + sal_Bool OReportWindow::HasSelection() const { return m_aViewsWindow.HasSelection(); } -//---------------------------------------------------------------------------- + void OReportWindow::Delete() { m_aViewsWindow.Delete(); } -//---------------------------------------------------------------------------- + void OReportWindow::Copy() { m_aViewsWindow.Copy(); } -//---------------------------------------------------------------------------- + void OReportWindow::Paste() { m_aViewsWindow.Paste(); } -//---------------------------------------------------------------------------- + sal_Bool OReportWindow::IsPasteAllowed() const { return m_aViewsWindow.IsPasteAllowed(); } -//----------------------------------------------------------------------------- + void OReportWindow::SelectAll(const sal_uInt16 _nObjectType) { m_aViewsWindow.SelectAll(_nObjectType); } -//----------------------------------------------------------------------------- + void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView) { m_aViewsWindow.unmarkAllObjects(_pSectionView); } -//----------------------------------------------------------------------------- + void OReportWindow::showProperties(const uno::Reference< report::XSection>& _xReportComponent) { ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_aViewsWindow.getSectionWindow( _xReportComponent ); m_pView->UpdatePropertyBrowserDelayed(pSectionWindow->getReportSection().getSectionView()); } -//------------------------------------------------------------------------------ + sal_Bool OReportWindow::handleKeyEvent(const KeyEvent& _rEvent) { return m_aViewsWindow.handleKeyEvent(_rEvent); } -//------------------------------------------------------------------------ + void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) { if ( _pSectionView ) m_aViewsWindow.setMarked(_pSectionView,_bMark); } -//------------------------------------------------------------------------ + void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { m_aViewsWindow.setMarked(_xSection,_bMark); } -//------------------------------------------------------------------------ + void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark) { m_aViewsWindow.setMarked(_xShape,_bMark); } -//----------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OReportWindow::getMarkedSection(NearSectionAccess nsa) const { return m_aViewsWindow.getMarkedSection(nsa); } -//----------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OReportWindow::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const { return m_aViewsWindow.getSectionWindow(_xSection); } -// ------------------------------------------------------------------------- + void OReportWindow::markSection(const sal_uInt16 _nPos) { m_aViewsWindow.markSection(_nPos); } -// ----------------------------------------------------------------------------- + void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions); } -// ----------------------------------------------------------------------------- + void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) { m_aViewsWindow.collapseSections(_aCollpasedSections); } -// ----------------------------------------------------------------------------- + void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); } -// ----------------------------------------------------------------------------- + void OReportWindow::setGridSnap(sal_Bool bOn) { m_aViewsWindow.setGridSnap(bOn); } -// ----------------------------------------------------------------------------- + void OReportWindow::setDragStripes(sal_Bool bOn) { m_aViewsWindow.setDragStripes(bOn); } -// ----------------------------------------------------------------------------- + sal_uInt32 OReportWindow::getMarkedObjectCount() const { return m_aViewsWindow.getMarkedObjectCount(); } -// ----------------------------------------------------------------------------- + void OReportWindow::zoom(const Fraction& _aZoom) { m_aHRuler.SetZoom(_aZoom); @@ -388,12 +388,12 @@ void OReportWindow::zoom(const Fraction& _aZoom) Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } -// ----------------------------------------------------------------------------- + void OReportWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const { m_aViewsWindow.fillControlModelSelection(_rSelection); } -// ----------------------------------------------------------------------------- + sal_Int32 OReportWindow::impl_getRealPixelWidth() const { const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width; @@ -401,7 +401,7 @@ sal_Int32 OReportWindow::impl_getRealPixelWidth() const const Size aPageSize = LogicToPixel(Size(nPaperWidth,0),aMap); return aPageSize.Width() + REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH + SECTION_OFFSET; } -// ----------------------------------------------------------------------------- + sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const { sal_uInt16 nZoom(100); @@ -430,7 +430,7 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const return nZoom; } -// ----------------------------------------------------------------------------- + void OReportWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { (void)_rEvent; diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index ecfcdfd2356d..48e6c7d7cf13 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -34,7 +34,7 @@ namespace rptui #define SCR_LINE_SIZE 10 using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- + void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize,ScrollBar& _rScrollBar) { _rScrollBar.SetPosSizePixel(_aPos,_aSize); @@ -42,7 +42,7 @@ void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize _rScrollBar.SetVisibleSize( _nNewValue ); } -// ----------------------------------------------------------------------------- + OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) : OScrollWindowHelper_BASE( _pDesignView,WB_DIALOGCONTROL) ,OPropertyChangeListener(m_aMutex) @@ -66,14 +66,14 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) ImplInitSettings(); } -// ----------------------------------------------------------------------------- + OScrollWindowHelper::~OScrollWindowHelper() { if ( m_pReportDefintionMultiPlexer.is() ) m_pReportDefintionMultiPlexer->dispose(); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const { AllSettings aSettings( _rScrollBar.GetSettings() ); @@ -86,7 +86,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const _rScrollBar.SetLineSize( SCR_LINE_SIZE ); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::initialize() { uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition(); @@ -94,7 +94,7 @@ void OScrollWindowHelper::initialize() m_aReportWindow.initialize(); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight) { m_aTotalPixelSize.Width() = _nWidth; @@ -108,7 +108,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight) Resize(); } -//------------------------------------------------------------------------------ + Size OScrollWindowHelper::ResizeScrollBars() { // get the new output-size in pixel @@ -174,7 +174,7 @@ Size OScrollWindowHelper::ResizeScrollBars() return aOutPixSz; } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::Resize() { OScrollWindowHelper_BASE::Resize(); @@ -182,140 +182,140 @@ void OScrollWindowHelper::Resize() m_aReportWindow.SetPosSizePixel(Point( 0, 0 ),aTotalOutputSize); } -//------------------------------------------------------------------------------ + IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ ) { m_aReportWindow.ScrollChildren( getThumbPos() ); return 0; } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection ,const OUString& _sColorEntry ,sal_uInt16 _nPosition) { m_aReportWindow.addSection(_xSection,_sColorEntry,_nPosition); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::removeSection(sal_uInt16 _nPosition) { m_aReportWindow.removeSection(_nPosition); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::toggleGrid(sal_Bool _bVisible) { m_aReportWindow.toggleGrid(_bVisible); } -//------------------------------------------------------------------------------ + sal_uInt16 OScrollWindowHelper::getSectionCount() const { return m_aReportWindow.getSectionCount(); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aReportWindow.SetInsertObj(eObj,_sShapeType); } -//---------------------------------------------------------------------------- + OUString OScrollWindowHelper::GetInsertObjString() const { return m_aReportWindow.GetInsertObjString(); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::SetMode( DlgEdMode _eNewMode ) { m_aReportWindow.SetMode(_eNewMode); } -//------------------------------------------------------------------------------ + sal_Bool OScrollWindowHelper::HasSelection() const { return m_aReportWindow.HasSelection(); } -//---------------------------------------------------------------------------- + void OScrollWindowHelper::Delete() { m_aReportWindow.Delete(); } -//---------------------------------------------------------------------------- + void OScrollWindowHelper::Copy() { m_aReportWindow.Copy(); } -//---------------------------------------------------------------------------- + void OScrollWindowHelper::Paste() { m_aReportWindow.Paste(); } -//---------------------------------------------------------------------------- + sal_Bool OScrollWindowHelper::IsPasteAllowed() const { return m_aReportWindow.IsPasteAllowed(); } -//----------------------------------------------------------------------------- + void OScrollWindowHelper::SelectAll(const sal_uInt16 _nObjectType) { m_aReportWindow.SelectAll(_nObjectType); } -//---------------------------------------------------------------------------- + void OScrollWindowHelper::unmarkAllObjects(OSectionView* _pSectionView) { m_aReportWindow.unmarkAllObjects(_pSectionView); } -//------------------------------------------------------------------------------ + sal_Int32 OScrollWindowHelper::getMaxMarkerWidth(sal_Bool _bWithEnd) const { return m_aReportWindow.getMaxMarkerWidth(_bWithEnd); } -//---------------------------------------------------------------------------- + void OScrollWindowHelper::showRuler(sal_Bool _bShow) { m_aReportWindow.showRuler(_bShow); } -//------------------------------------------------------------------------------ + sal_Bool OScrollWindowHelper::handleKeyEvent(const KeyEvent& _rEvent) { return m_aReportWindow.handleKeyEvent(_rEvent); } -//------------------------------------------------------------------------ + void OScrollWindowHelper::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) { m_aReportWindow.setMarked(_pSectionView,_bMark); } -//------------------------------------------------------------------------ + void OScrollWindowHelper::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { m_aReportWindow.setMarked(_xSection,_bMark); } -//------------------------------------------------------------------------ + void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark) { m_aReportWindow.setMarked(_xShape,_bMark); } -// ------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OScrollWindowHelper::getMarkedSection(NearSectionAccess nsa) const { return m_aReportWindow.getMarkedSection(nsa); } -// ------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OScrollWindowHelper::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const { return m_aReportWindow.getSectionWindow(_xSection); } -// ------------------------------------------------------------------------- + void OScrollWindowHelper::markSection(const sal_uInt16 _nPos) { m_aReportWindow.markSection(_nPos); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { m_aReportWindow.fillCollapsedSections(_rCollapsedPositions); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) { m_aReportWindow.collapseSections(_aCollpasedSections); } -//------------------------------------------------------------------------------ + bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) { const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent(); @@ -337,19 +337,19 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) } return OScrollWindowHelper_BASE::Notify(rNEvt); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { m_aReportWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); } -//------------------------------------------------------------------------------ + void OScrollWindowHelper::ImplInitSettings() { SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } -//----------------------------------------------------------------------------- + void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -361,39 +361,39 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_rEvent*/) throw( uno::RuntimeException) { m_aReportWindow.notifySizeChanged(); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::setGridSnap(sal_Bool bOn) { m_aReportWindow.setGridSnap(bOn); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::setDragStripes(sal_Bool bOn) { m_aReportWindow.setDragStripes(bOn); } -// ----------------------------------------------------------------------------- + sal_uInt32 OScrollWindowHelper::getMarkedObjectCount() const { return m_aReportWindow.getMarkedObjectCount(); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::zoom(const Fraction& _aZoom) { m_aReportWindow.zoom(_aZoom); Resize(); Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_TRANSPARENT); } -// ----------------------------------------------------------------------------- + void OScrollWindowHelper::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const { m_aReportWindow.fillControlModelSelection(_rSelection); } -// ----------------------------------------------------------------------------- + sal_uInt16 OScrollWindowHelper::getZoomFactor(SvxZoomType _eType) const { return m_aReportWindow.getZoomFactor(_eType); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index f792d4accc06..564c4072ef12 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -35,7 +35,7 @@ namespace rptui using namespace ::com::sun::star; TYPEINIT1( OSectionView, SdrView ); -//---------------------------------------------------------------------------- + OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor ) :SdrView( pModel, _pSectionWindow ) ,m_pReportWindow( pEditor ) @@ -49,13 +49,13 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O SetQuickTextEditMode(sal_False); } -//---------------------------------------------------------------------------- + OSectionView::~OSectionView() { } -//---------------------------------------------------------------------------- + void OSectionView::MarkListHasChanged() { @@ -69,7 +69,7 @@ void OSectionView::MarkListHasChanged() } } -//---------------------------------------------------------------------------- + void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin ) { @@ -126,7 +126,7 @@ void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin ) rWin.Invalidate(INVALIDATE_NOERASE); } } -//------------------------------------------------------------------------------ + void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SdrView::Notify(rBC,rHint); @@ -142,7 +142,7 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } -//------------------------------------------------------------------------------ + void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject ) { const SdrMarkList& rMarkedList = GetMarkedObjectList(); @@ -161,7 +161,7 @@ void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject ) } } -// ----------------------------------------------------------------------------- + void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) { if (AreObjectsMarked()) @@ -198,7 +198,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) MarkListHasChanged(); } } -// ----------------------------------------------------------------------------- + bool OSectionView::OnlyShapesMarked() const { const SdrMarkList& rMark = GetMarkedObjectList(); @@ -232,7 +232,7 @@ bool OSectionView::IsDragResize() const return false; } -// ----------------------------------------------------------------------------- + short OSectionView::GetLayerIdOfMarkedObjects() const { short nRet = SHRT_MAX; diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 87469429ab49..d0c752ab14fe 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -98,7 +98,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep _propertyChanged(aEvent); } -// ----------------------------------------------------------------------------- + OSectionWindow::~OSectionWindow() { try @@ -112,7 +112,7 @@ OSectionWindow::~OSectionWindow() { } } -// ----------------------------------------------------------------------------- + void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { SolarMutexGuard g; @@ -156,7 +156,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } } -// ----------------------------------------------------------------------------- + bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OReportHelper> _pIsSectionOn) { OReportHelper aReportHelper(_xReport); @@ -169,7 +169,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport } return bRet; } -// ----------------------------------------------------------------------------- + bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OGroupHelper> _pIsSectionOn) { OGroupHelper aGroupHelper(_xGroup); @@ -190,7 +190,7 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& } return bRet; } -//------------------------------------------------------------------------------ + void OSectionWindow::ImplInitSettings() { static bool t = false; @@ -202,7 +202,7 @@ void OSectionWindow::ImplInitSettings() } SetBackground( ); } -//----------------------------------------------------------------------------- + void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -214,7 +214,7 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -//------------------------------------------------------------------------------ + void OSectionWindow::Resize() { Window::Resize(); @@ -265,7 +265,7 @@ void OSectionWindow::Resize() m_aEndMarker.SetPosSizePixel(aReportPos,Size(aEndWidth,aOutputSize.Height())); } } -// ----------------------------------------------------------------------------- + void OSectionWindow::setCollapsed(sal_Bool _bCollapsed) { if ( m_aStartMarker.isCollapsed() != _bCollapsed ) @@ -273,18 +273,18 @@ void OSectionWindow::setCollapsed(sal_Bool _bCollapsed) m_aStartMarker.setCollapsed(_bCollapsed); } } -//----------------------------------------------------------------------------- + void OSectionWindow::showProperties() { m_pParent->getView()->showProperties( m_aReportSection.getSection().get() ); } -//----------------------------------------------------------------------------- + void OSectionWindow::setMarked(sal_Bool _bMark) { m_aStartMarker.setMarked(_bMark); m_aEndMarker.setMarked(_bMark); } -// ----------------------------------------------------------------------------- + IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker ) { if ( _pMarker ) @@ -298,7 +298,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker ) } return 0L; } -// ----------------------------------------------------------------------------- + void OSectionWindow::zoom(const Fraction& _aZoom) { setZoomFactor(_aZoom,*this); @@ -309,20 +309,20 @@ void OSectionWindow::zoom(const Fraction& _aZoom) setZoomFactor(_aZoom,m_aEndMarker); Invalidate(); } -//----------------------------------------------------------------------------- + IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, ) { const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString() ); return 0L; } -//------------------------------------------------------------------------------ + IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, ) { getViewsWindow()->getView()->getReportView()->getController().getUndoManager().LeaveListAction(); return 0L; } -//----------------------------------------------------------------------------- + IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) { if ( !getViewsWindow()->getView()->getReportView()->getController().isEditable() ) @@ -353,20 +353,20 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) return 0L; } -// ----------------------------------------------------------------------------- + void lcl_scroll(Window& _rWindow,const Point& _aDelta) { _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()); _rWindow.Invalidate(INVALIDATE_TRANSPARENT); } -// ----------------------------------------------------------------------------- + void lcl_setOrigin(Window& _rWindow,long _nX, long _nY) { MapMode aMap = _rWindow.GetMapMode(); aMap.SetOrigin( Point(- _nX, - _nY)); _rWindow.SetMapMode( aMap ); } -//---------------------------------------------------------------------------- + void OSectionWindow::scrollChildren(long _nX) { const Point aDelta( _nX,0 ); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index e13d0d984777..deec17b758ed 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -45,7 +45,7 @@ Image* OStartMarker::s_pDefCollapsed = NULL; Image* OStartMarker::s_pDefExpanded = NULL; oslInterlockedCount OStartMarker::s_nImageRefCount = 0; -// ----------------------------------------------------------------------------- + OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) ,m_aVRuler(this,WB_VERT) @@ -77,7 +77,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry SetParentClipMode( PARENTCLIPMODE_NOCLIP ); SetPaintTransparent( true ); } -// ----------------------------------------------------------------------------- + OStartMarker::~OStartMarker() { if ( osl_atomic_decrement(&s_nImageRefCount) == 0 ) @@ -86,14 +86,14 @@ OStartMarker::~OStartMarker() DELETEZ(s_pDefExpanded); } } -// ----------------------------------------------------------------------------- + sal_Int32 OStartMarker::getMinHeight() const { Fraction aExtraWidth(long(2*REPORT_EXTRA_SPACE)); aExtraWidth *= GetMapMode().GetScaleX(); return LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() + (long)aExtraWidth; } -// ----------------------------------------------------------------------------- + void OStartMarker::Paint( const Rectangle& rRect ) { (void)rRect; @@ -142,7 +142,7 @@ void OStartMarker::Paint( const Rectangle& rRect ) DrawPolyLine(Polygon(PixelToLogic(aRect)),LineInfo(LINE_SOLID,2 )); } } -// ----------------------------------------------------------------------------- + void OStartMarker::setColor() { const Color aColor(m_nColor); @@ -152,7 +152,7 @@ void OStartMarker::setColor() m_aText.SetTextColor(aTextColor); m_aText.SetLineColor(m_nColor); } -// ----------------------------------------------------------------------- + void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() ) @@ -177,13 +177,13 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) m_pParent->showProperties(); } -// ----------------------------------------------------------------------------- + void OStartMarker::changeImage() { Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; m_aImage.SetImage(*pImage); } -// ----------------------------------------------------------------------- + void OStartMarker::initDefaultNodeImages() { if ( !s_pDefCollapsed ) @@ -199,14 +199,14 @@ void OStartMarker::initDefaultNodeImages() m_aText.SetBackground(); m_aText.SetMouseTransparent(true); } -// ----------------------------------------------------------------------- + void OStartMarker::ImplInitSettings() { SetBackground( ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); setColor(); } -//------------------------------------------------------------------------------ + void OStartMarker::Resize() { const Size aOutputSize( GetOutputSizePixel() ); @@ -233,12 +233,12 @@ void OStartMarker::Resize() aPos.Y() += static_cast<sal_Int32>((LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() - aImageSize.Height()) * 0.5) ; m_aImage.SetPosSizePixel(aPos,aImageSize); } -// ----------------------------------------------------------------------------- + void OStartMarker::setTitle(const OUString& _sTitle) { m_aText.SetText(_sTitle); } -// ----------------------------------------------------------------------------- + void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint) { OColorListener::Notify(rBc, rHint); @@ -250,13 +250,13 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint) Invalidate(INVALIDATE_CHILDREN); } } -//---------------------------------------------------------------------------- + void OStartMarker::showRuler(sal_Bool _bShow) { m_bShowRuler = _bShow; m_aVRuler.Show(!m_bCollapsed && m_bShowRuler); } -//------------------------------------------------------------------------------ + void OStartMarker::RequestHelp( const HelpEvent& rHEvt ) { if( !m_aText.GetText().isEmpty()) @@ -275,14 +275,14 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt ) Help::ShowQuickHelp( this, aItemRect, m_aText.GetText() ); } } -// ----------------------------------------------------------------------------- + void OStartMarker::setCollapsed(sal_Bool _bCollapsed) { OColorListener::setCollapsed(_bCollapsed); showRuler(_bCollapsed); changeImage(); } -// ----------------------------------------------------------------------- + void OStartMarker::zoom(const Fraction& _aZoom) { setZoomFactor(_aZoom,*this); @@ -291,7 +291,7 @@ void OStartMarker::zoom(const Fraction& _aZoom) Resize(); Invalidate(); } -// ----------------------------------------------------------------------- + // ======================================================================= } // ======================================================================= diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index e0a4b8bc2a63..3e57fb04bc9b 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -56,7 +56,7 @@ namespace rptui using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView,sal_Int32 _nControlModification, bool _bBoundRects) { bool bMoveAllowed = _nXMov != 0 || _nYMov != 0; @@ -168,7 +168,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd } return bMoveAllowed; } -// ----------------------------------------------------------------------------- + OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) : Window( _pReportWindow,WB_DIALOGCONTROL) @@ -181,17 +181,17 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) m_aColorConfig.AddListener(this); ImplInitSettings(); } -// ----------------------------------------------------------------------------- + OViewsWindow::~OViewsWindow() { m_aColorConfig.RemoveListener(this); m_aSections.clear(); } -// ----------------------------------------------------------------------------- + void OViewsWindow::initialize() { } -// ----------------------------------------------------------------------------- + void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet) { const uno::Reference< report::XSection> xSection = _rSectionWindow.getReportSection().getSection(); @@ -213,7 +213,7 @@ void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Poin _rStartPoint.Y() += aSectionSize.Height(); } -// ----------------------------------------------------------------------------- + void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) { bool bSet = false; @@ -239,7 +239,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) } m_pParent->notifySizeChanged(); } -//------------------------------------------------------------------------------ + void OViewsWindow::Resize() { Window::Resize(); @@ -256,7 +256,7 @@ void OViewsWindow::Resize() } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::Paint( const Rectangle& rRect ) { Window::Paint( rRect ); @@ -272,7 +272,7 @@ void OViewsWindow::Paint( const Rectangle& rRect ) Wallpaper aWall( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ); DrawWallpaper(aRect,aWall); } -//------------------------------------------------------------------------------ + void OViewsWindow::ImplInitSettings() { EnableChildTransparentMode( true ); @@ -280,7 +280,7 @@ void OViewsWindow::ImplInitSettings() SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); } -//----------------------------------------------------------------------------- + void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -292,7 +292,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -//---------------------------------------------------------------------------- + void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { ::boost::shared_ptr<OSectionWindow> pSectionWindow( new OSectionWindow(this,_xSection,_sColorEntry) ); @@ -300,7 +300,7 @@ void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSectio m_pParent->setMarked(&pSectionWindow->getReportSection().getSectionView(),m_aSections.size() == 1); Resize(); } -//---------------------------------------------------------------------------- + void OViewsWindow::removeSection(sal_uInt16 _nPosition) { if ( _nPosition < m_aSections.size() ) @@ -314,7 +314,7 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition) Resize(); } } -//------------------------------------------------------------------------------ + void OViewsWindow::toggleGrid(sal_Bool _bVisible) { ::std::for_each(m_aSections.begin(),m_aSections.end(), @@ -322,7 +322,7 @@ void OViewsWindow::toggleGrid(sal_Bool _bVisible) ::std::for_each(m_aSections.begin(),m_aSections.end(), ::o3tl::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper())); } -//------------------------------------------------------------------------------ + sal_Int32 OViewsWindow::getTotalHeight() const { sal_Int32 nHeight = 0; @@ -334,12 +334,12 @@ sal_Int32 OViewsWindow::getTotalHeight() const } return nHeight; } -//---------------------------------------------------------------------------- + sal_uInt16 OViewsWindow::getSectionCount() const { return static_cast<sal_uInt16>(m_aSections.size()); } -//---------------------------------------------------------------------------- + void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -349,19 +349,19 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) m_sShapeType = _sShapeType; } -//---------------------------------------------------------------------------- + OUString OViewsWindow::GetInsertObjString() const { return m_sShapeType; } -//------------------------------------------------------------------------------ + void OViewsWindow::SetMode( DlgEdMode eNewMode ) { ::std::for_each(m_aSections.begin(),m_aSections.end(), ::o3tl::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper())); } -//---------------------------------------------------------------------------- + sal_Bool OViewsWindow::HasSelection() const { TSectionsMap::const_iterator aIter = m_aSections.begin(); @@ -370,7 +370,7 @@ sal_Bool OViewsWindow::HasSelection() const ; return aIter != aEnd; } -//---------------------------------------------------------------------------- + void OViewsWindow::Delete() { m_bInUnmark = sal_True; @@ -378,7 +378,7 @@ void OViewsWindow::Delete() ::o3tl::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper())); m_bInUnmark = sal_False; } -//---------------------------------------------------------------------------- + void OViewsWindow::Copy() { uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects; @@ -389,7 +389,7 @@ void OViewsWindow::Copy() uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy; pCopy->CopyToClipboard(this); } -//---------------------------------------------------------------------------- + void OViewsWindow::Paste() { TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this)); @@ -404,7 +404,7 @@ void OViewsWindow::Paste() pMarkedSection->getReportSection().Paste(aCopies,true); } } -// --------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const uno::Reference< report::XSection>& _xSection) const { OSL_ENSURE(_xSection.is(),"Section is NULL!"); @@ -424,7 +424,7 @@ void OViewsWindow::Paste() return pSectionWindow; } -//---------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OViewsWindow::getMarkedSection(NearSectionAccess nsa) const { ::boost::shared_ptr<OSectionWindow> pRet; @@ -481,19 +481,19 @@ void OViewsWindow::Paste() return pRet; } -// ------------------------------------------------------------------------- + void OViewsWindow::markSection(const sal_uInt16 _nPos) { if ( _nPos < m_aSections.size() ) m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True); } -//---------------------------------------------------------------------------- + sal_Bool OViewsWindow::IsPasteAllowed() const { TransferableDataHelper aTransferData( TransferableDataHelper::CreateFromSystemClipboard( const_cast< OViewsWindow* >( this ) ) ); return aTransferData.HasFormat(OReportExchange::getDescriptorFormatId()); } -//----------------------------------------------------------------------------- + void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType) { m_bInUnmark = sal_True; @@ -501,7 +501,7 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType) ::o3tl::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper())); m_bInUnmark = sal_False; } -//----------------------------------------------------------------------------- + void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) { if ( !m_bInUnmark ) @@ -520,13 +520,13 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) m_bInUnmark = sal_False; } } -// ----------------------------------------------------------------------- + void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32) { ImplInitSettings(); Invalidate(); } -// ----------------------------------------------------------------------------- + void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -537,7 +537,7 @@ void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt ) } Window::MouseButtonDown(rMEvt); } -//---------------------------------------------------------------------------- + void OViewsWindow::showRuler(sal_Bool _bShow) { ::std::for_each(m_aSections.begin(),m_aSections.end(), @@ -545,7 +545,7 @@ void OViewsWindow::showRuler(sal_Bool _bShow) ::std::for_each(m_aSections.begin(),m_aSections.end(), ::o3tl::compose1(::boost::bind(&OStartMarker::Window::Invalidate, _1, sal_uInt16(INVALIDATE_NOERASE)), TStartMarkerHelper())); } -//---------------------------------------------------------------------------- + void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -568,7 +568,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } } -//------------------------------------------------------------------------------ + sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent) { sal_Bool bRet = sal_False; @@ -583,7 +583,7 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent) } return bRet; } -//---------------------------------------------------------------------------- + OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _nPos) { TSectionsMap::iterator aRet = m_aSections.end(); @@ -591,14 +591,14 @@ OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _ aRet = m_aSections.begin() + _nPos; return aRet; } -//------------------------------------------------------------------------ + void OViewsWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) { OSL_ENSURE(_pSectionView != NULL,"SectionView is NULL!"); if ( _pSectionView ) setMarked(_pSectionView->getReportSection()->getSection(),_bMark); } -//------------------------------------------------------------------------ + void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -615,7 +615,7 @@ void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection, } } } -//------------------------------------------------------------------------ + void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark) { bool bFirst = true; @@ -643,7 +643,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBoundRects) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -665,7 +665,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBo } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize) { bool bOnlyOnce = false; @@ -731,7 +731,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects) { if ( _nControlModification == ControlModification::NONE ) @@ -885,14 +885,14 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli pView->AdjustMarkHdl(); } } -// ----------------------------------------------------------------------------- + void OViewsWindow::createDefault() { ::boost::shared_ptr<OSectionWindow> pMarkedSection = getMarkedSection(); if ( pMarkedSection ) pMarkedSection->getReportSection().createDefault(m_sShapeType); } -// ----------------------------------------------------------------------------- + void OViewsWindow::setGridSnap(sal_Bool bOn) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -904,7 +904,7 @@ void OViewsWindow::setGridSnap(sal_Bool bOn) (*aIter)->getReportSection().Invalidate(nIn); } } -// ----------------------------------------------------------------------------- + void OViewsWindow::setDragStripes(sal_Bool bOn) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -912,7 +912,7 @@ void OViewsWindow::setDragStripes(sal_Bool bOn) for (; aIter != aEnd ; ++aIter) (*aIter)->getReportSection().getSectionView().SetDragStripes(bOn); } -// ----------------------------------------------------------------------------- + sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const { TSectionsMap::const_iterator aIter = m_aSections.begin(); @@ -928,7 +928,7 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons } return nPosition; } -// ----------------------------------------------------------------------------- + ::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const sal_uInt16 _nPos) const { ::boost::shared_ptr<OSectionWindow> aReturn; @@ -938,7 +938,7 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons return aReturn; } -// ----------------------------------------------------------------------------- + namespace { enum SectionViewAction @@ -983,13 +983,13 @@ namespace } }; } -// ----------------------------------------------------------------------------- + void OViewsWindow::BrkAction() { EndDragObj_removeInvisibleObjects(); ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eBreakAction) ); } -// ----------------------------------------------------------------------------- + void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _aRect, const OSectionView& _rSection) { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -1022,13 +1022,13 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ aNewPos.Y() -= nSectionHeight; } } -// ----------------------------------------------------------------------------- + bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj) { return ::std::find(m_aBegDragTempList.begin(),m_aBegDragTempList.end(),_pObj) != m_aBegDragTempList.end(); } -// ----------------------------------------------------------------------------- + void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection) { OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d", _aPnt.X(), _aPnt.Y() ); @@ -1126,12 +1126,12 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi } } -// ----------------------------------------------------------------------------- + void OViewsWindow::ForceMarkedToAnotherPage() { ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eForceToAnotherPage ) ); } -// ----------------------------------------------------------------------------- + void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) { bool bAdd = true; @@ -1161,7 +1161,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) nLastSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); } } -// ----------------------------------------------------------------------------- + OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt) { OSectionView* pSection = NULL; @@ -1210,7 +1210,7 @@ OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pS return pSection; } -// ----------------------------------------------------------------------------- + void OViewsWindow::EndDragObj_removeInvisibleObjects() { TSectionsMap::iterator aIter = m_aSections.begin(); @@ -1222,7 +1222,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects() rReportSection.getPage()->resetSpecialMode(); } } -// ----------------------------------------------------------------------------- + void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt) { const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION); @@ -1327,12 +1327,12 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* } m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32); } -// ----------------------------------------------------------------------------- + void OViewsWindow::EndAction() { ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction() ); } -// ----------------------------------------------------------------------------- + void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bool _bMove, bool _bControlKeySet) { (void)_bMove; @@ -1400,7 +1400,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo aRealMousePos.Y() -= nSectionHeight; } } -// ----------------------------------------------------------------------------- + sal_Bool OViewsWindow::IsAction() const { sal_Bool bAction = sal_False; @@ -1410,7 +1410,7 @@ sal_Bool OViewsWindow::IsAction() const bAction = (*aIter)->getReportSection().getSectionView().IsAction(); return bAction; } -// ----------------------------------------------------------------------------- + sal_Bool OViewsWindow::IsDragObj() const { sal_Bool bAction = sal_False; @@ -1420,7 +1420,7 @@ sal_Bool OViewsWindow::IsDragObj() const bAction = (*aIter)->getReportSection().getSectionView().IsAction(); return bAction; } -// ----------------------------------------------------------------------------- + sal_uInt32 OViewsWindow::getMarkedObjectCount() const { sal_uInt32 nCount = 0; @@ -1430,7 +1430,7 @@ sal_uInt32 OViewsWindow::getMarkedObjectCount() const nCount += (*aIter)->getReportSection().getSectionView().GetMarkedObjectCount(); return nCount; } -// ----------------------------------------------------------------------------- + void OViewsWindow::handleKey(const KeyCode& _rCode) { const sal_uInt16 nCode = _rCode.GetCode(); @@ -1647,13 +1647,13 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::stopScrollTimer() { ::std::for_each(m_aSections.begin(),m_aSections.end(), ::o3tl::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); } -// ----------------------------------------------------------------------------- + void OViewsWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { TSectionsMap::const_iterator aIter = m_aSections.begin(); @@ -1664,7 +1664,7 @@ void OViewsWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedP _rCollapsedPositions.push_back(i); } } -// ----------------------------------------------------------------------------- + void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>& _aCollpasedSections) { const beans::PropertyValue* pIter = _aCollpasedSections.getConstArray(); @@ -1678,7 +1678,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>& } } } -// ----------------------------------------------------------------------------- + void OViewsWindow::zoom(const Fraction& _aZoom) { const MapMode& aMapMode = GetMapMode(); @@ -1708,7 +1708,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom) static sal_Int32 nIn = INVALIDATE_NOCHILDREN; Invalidate(aRect,nIn); } -//---------------------------------------------------------------------------- + void OViewsWindow::scrollChildren(const Point& _aThumbPos) { const Point aPos(PixelToLogic(_aThumbPos)); @@ -1731,7 +1731,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos) (*aIter)->scrollChildren(aPos.X()); } } -// ----------------------------------------------------------------------------- + void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const { TSectionsMap::const_iterator aIter = m_aSections.begin(); diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 48b334e9cbd5..6a5752f91645 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -30,12 +30,12 @@ using namespace ::com::sun::star; //============================================================================ // OReportExchange //============================================================================ -//---------------------------------------------------------------------------- + OReportExchange::OReportExchange(const TSectionElements& _rCopyElements ) : m_aCopyElements(_rCopyElements) { } -//-------------------------------------------------------------------- + sal_uInt32 OReportExchange::getDescriptorFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -46,12 +46,12 @@ sal_uInt32 OReportExchange::getDescriptorFormatId() } return s_nFormat; } -//-------------------------------------------------------------------- + void OReportExchange::AddSupportedFormats() { AddFormat(getDescriptorFormatId()); } -//-------------------------------------------------------------------- + sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); @@ -59,12 +59,12 @@ sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) SetAny( uno::Any(m_aCopyElements), _rFlavor ) : sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor) { return IsFormatSupported(_rFlavor,getDescriptorFormatId()); } -// ----------------------------------------------------------------------------- + OReportExchange::TSectionElements OReportExchange::extractCopies(const TransferableDataHelper& _rData) { sal_Int32 nKnownFormatId = getDescriptorFormatId(); diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 8afad4a9ada3..a538ec0dcaa7 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -30,21 +30,21 @@ namespace rptui { using namespace ::com::sun::star; -//---------------------------------------------------------------------------- + DlgEdFactory::DlgEdFactory() { SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } -//---------------------------------------------------------------------------- + DlgEdFactory::~DlgEdFactory() { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } -//---------------------------------------------------------------------------- + IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { @@ -98,7 +98,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) return 0; } -//---------------------------------------------------------------------------- + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index ef5a8f670613..1af8f100afee 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -60,9 +60,9 @@ namespace rptui { using namespace ::com::sun::star; -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, ) { @@ -70,7 +70,7 @@ IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, ) return 0; } -//---------------------------------------------------------------------------- + void DlgEdFunc::ForceScroll( const Point& rPos ) { @@ -117,7 +117,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) aScrollTimer.Start(); } -//---------------------------------------------------------------------------- + DlgEdFunc::DlgEdFunc( OReportSection* _pParent ) :m_pParent(_pParent), @@ -133,12 +133,12 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent ) aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL ); } -//---------------------------------------------------------------------------- + void DlgEdFunc::setOverlappedControlColor(sal_Int32 _nColor) { m_nOverlappedControlColor = _nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nColorTRGB) { sal_Int32 nBackColor = 0; @@ -160,14 +160,14 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC } return nBackColor; } -// ----------------------------------------------------------------------------- + DlgEdFunc::~DlgEdFunc() { unColorizeOverlappedObj(); aScrollTimer.Stop(); } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -227,7 +227,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) return bHandled; } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) { @@ -235,7 +235,7 @@ sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) m_pParent->getSectionWindow()->getViewsWindow()->stopScrollTimer(); return bHandled; } -// ----------------------------------------------------------------------------- + void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt) { deactivateOle(); @@ -255,7 +255,7 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt) } } } -// ----------------------------------------------------------------------------- + void DlgEdFunc::stopScrollTimer() { unColorizeOverlappedObj(); @@ -263,13 +263,13 @@ void DlgEdFunc::stopScrollTimer() if ( m_pParent->IsMouseCaptured() ) m_pParent->ReleaseMouse(); } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ ) { return sal_False; } -//------------------------------------------------------------------------------ + sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) { sal_Bool bReturn = sal_False; @@ -387,7 +387,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) return bReturn; } -// ----------------------------------------------------------------------------- + void DlgEdFunc::activateOle(SdrObject* _pObj) { if ( _pObj ) @@ -429,7 +429,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) } } } -// ----------------------------------------------------------------------------- + void DlgEdFunc::deactivateOle(bool _bSelect) { OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache(); @@ -459,7 +459,7 @@ void DlgEdFunc::deactivateOle(bool _bSelect) } } } -// ----------------------------------------------------------------------------- + void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj) { OObjectBase* pObj = dynamic_cast<OObjectBase*>(_pOverlappedObj); @@ -483,7 +483,7 @@ void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj) } } } -// ----------------------------------------------------------------------------- + void DlgEdFunc::unColorizeOverlappedObj() { // uncolorize an old object, if there is one @@ -500,7 +500,7 @@ void DlgEdFunc::unColorizeOverlappedObj() } } } -// ----------------------------------------------------------------------------- + bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) { SdrViewEvent aVEvt; @@ -516,7 +516,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) return bOverlapping; } -// ----------------------------------------------------------------------------- + void DlgEdFunc::checkMovementAllowed(const MouseEvent& rMEvt) { if ( m_pParent->getSectionWindow()->getViewsWindow()->IsDragObj() ) @@ -556,7 +556,7 @@ void DlgEdFunc::checkMovementAllowed(const MouseEvent& rMEvt) else m_pParent->getSectionWindow()->getViewsWindow()->EndAction(); } -// ----------------------------------------------------------------------------- + bool DlgEdFunc::isOnlyCustomShapeMarked() { bool bReturn = true; @@ -574,7 +574,7 @@ bool DlgEdFunc::isOnlyCustomShapeMarked() } return bReturn; } -// ----------------------------------------------------------------------------- + bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) { if (isOnlyCustomShapeMarked()) @@ -631,7 +631,7 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) bIsSetPoint = false; return bIsSetPoint; } -// ----------------------------------------------------------------------------- + bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt) { bool bIsSetPoint = isRectangleHit(rMEvt); @@ -649,7 +649,7 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt) } return bIsSetPoint; } -//---------------------------------------------------------------------------- + DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) : DlgEdFunc( _pParent ) @@ -657,14 +657,14 @@ DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) : m_rView.SetCreateMode( sal_True ); } -//---------------------------------------------------------------------------- + DlgEdFuncInsert::~DlgEdFuncInsert() { m_rView.SetEditMode( sal_True ); } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -709,7 +709,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) return sal_True; } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) @@ -771,7 +771,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) return bReturn; } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { @@ -807,20 +807,20 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) return sal_True; } -//---------------------------------------------------------------------------- + DlgEdFuncSelect::DlgEdFuncSelect( OReportSection* _pParent ) : DlgEdFunc( _pParent ) { } -//---------------------------------------------------------------------------- + DlgEdFuncSelect::~DlgEdFuncSelect() { } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -866,7 +866,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) return sal_True; } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -890,7 +890,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) return sal_True; } -//---------------------------------------------------------------------------- + sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { @@ -936,7 +936,7 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) return sal_True; } -//---------------------------------------------------------------------------- + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 5c550a7a8294..c9591ae16477 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -67,8 +67,8 @@ using namespace beans; using namespace container; using namespace ::comphelper; -//---------------------------------------------------------------------------- -//----------------------------------------------------------------------- + + namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) @@ -84,13 +84,13 @@ namespace return bEnabled; } } -//----------------------------------------------------------------------- + //============================================================================ // PropBrw //============================================================================ -//---------------------------------------------------------------------------- + PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) @@ -181,7 +181,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, O ::rptui::notifySystemWindow(pParent,this,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } -//---------------------------------------------------------------------------- + PropBrw::~PropBrw() { @@ -205,12 +205,12 @@ PropBrw::~PropBrw() ::rptui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); } -// ----------------------------------------------------------------------------- + void PropBrw::setCurrentPage(const OUString& _sLastActivePage) { m_sLastActivePage = _sLastActivePage; } -//---------------------------------------------------------------------------- + void PropBrw::implDetachController() { @@ -227,7 +227,7 @@ void PropBrw::implDetachController() m_xBrowserController.clear(); m_xBrowserComponentWindow.clear(); } -//----------------------------------------------------------------------- + OUString PropBrw::getCurrentPage() const { OUString sCurrentPage; @@ -247,7 +247,7 @@ OUString PropBrw::getCurrentPage() const } return sCurrentPage; } -//---------------------------------------------------------------------------- + bool PropBrw::Close() { @@ -276,7 +276,7 @@ bool PropBrw::Close() return true; } -//---------------------------------------------------------------------------- + uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const SdrMarkList& _rMarkList) { @@ -308,7 +308,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr Reference<uno::XInterface> *pSets = aSets.empty() ? NULL : &aSets[0]; return uno::Sequence< Reference<uno::XInterface> >(pSets, aSets.size()); } -//---------------------------------------------------------------------------- + void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) { if ( m_xBrowserController.is() ) @@ -326,7 +326,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> SetText( GetHeadlineName(_aObjects) ); } -//---------------------------------------------------------------------------- + OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) { @@ -400,13 +400,13 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac return aName; } -// ----------------------------------------------------------------------------- + uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(OObjectBase* _pObj) { _pObj->initializeOle(); return CreateComponentPair(_pObj->getAwtComponent(),_pObj->getReportComponent()); } -//---------------------------------------------------------------------------- + uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Reference< uno::XInterface>& _xFormComponent ,const uno::Reference< uno::XInterface>& _xReportComponent) { @@ -418,7 +418,7 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen return xNameCont.get(); } -// ----------------------------------------------------------------------------- + ::Size PropBrw::getMinimumSize() const { ::Size aSize; @@ -433,7 +433,7 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen } return aSize; } -//---------------------------------------------------------------------------- + void PropBrw::Resize() { Window::Resize(); @@ -466,7 +466,7 @@ void PropBrw::Resize() awt::PosSize::WIDTH | awt::PosSize::HEIGHT); } } -//---------------------------------------------------------------------------- + void PropBrw::Update( OSectionView* pNewView ) { try @@ -539,7 +539,7 @@ void PropBrw::Update( OSectionView* pNewView ) OSL_FAIL( "PropBrw::Update: Exception occurred!" ); } } -//---------------------------------------------------------------------------- + void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) { if ( m_xLastSection != _xReportComponent ) @@ -562,20 +562,20 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) } } } -//----------------------------------------------------------------------- + IMPL_LINK( PropBrw, OnAsyncGetFocus, void*, ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); return 0L; } -//---------------------------------------------------------------------------- + void PropBrw::LoseFocus() { DockingWindow::LoseFocus(); m_pDesignView->getController().InvalidateAll(); } -//---------------------------------------------------------------------------- + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |