diff options
Diffstat (limited to 'reportdesign/source/core')
57 files changed, 719 insertions, 719 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 4b5f26f9cd96..3085c2742083 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; @@ -139,7 +139,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() DBG_NAME(rpt_OFixedLine) // ----------------------------------------------------------------------------- OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(1) @@ -156,7 +156,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,sal_Int32 _nOrientation) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(_nOrientation) @@ -212,10 +212,10 @@ 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) +void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) { FixedLinePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -233,7 +233,7 @@ uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDLINE; - + return aServices; } //------------------------------------------------------------------------------ @@ -539,28 +539,28 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 4414508dcd04..fbc6dce7e1fd 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals() DBG_NAME( rpt_OFixedText ) // ----------------------------------------------------------------------------- OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -64,7 +64,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -99,7 +99,7 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u //IMPLEMENT_FORWARD_XINTERFACE2(OFixedText,FixedTextBase,FixedTextPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) +void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) { FixedTextPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -122,7 +122,7 @@ uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) uno::Sequence< ::rtl::OUString > aServices(1);//2); aServices.getArray()[0] = SERVICE_FIXEDTEXT; //aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); - + return aServices; } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 73315be74314..56973d8194ba 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno:: DBG_NAME( rpt_OFormatCondition ) // ----------------------------------------------------------------------------- OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) -:FormatConditionBase(m_aMutex) +:FormatConditionBase(m_aMutex) ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_bEnabled(sal_True) { @@ -65,10 +65,10 @@ OFormatCondition::~OFormatCondition() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) { FormatConditionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -86,7 +86,7 @@ uno::Sequence< ::rtl::OUString > OFormatCondition::getSupportedServiceNames_Stat { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FORMATCONDITION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 100ded84e8ab..b8096cad5853 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals() DBG_NAME( rpt_OFormattedField ) // ----------------------------------------------------------------------------- OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -71,7 +71,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -106,7 +106,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) { FormattedFieldPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -130,7 +130,7 @@ uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Stati uno::Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel")); - + return aServices; } //-------------------------------------------------------------------------- @@ -231,7 +231,7 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) thr { uno::Reference< report::XReportComponent> xSource = this; uno::Reference< report::XFormattedField> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FORMATTEDFIELD),uno::UNO_QUERY_THROW); - + if ( xSet.is() ) { ::std::vector< uno::Reference< report::XFormatCondition> >::iterator aIter = m_aProps.m_aFormatConditions.begin(); diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 05e52ae6f93c..1752ef615986 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XCompon DBG_NAME( rpt_OFunction ) // ----------------------------------------------------------------------------- OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) -:FunctionBase(m_aMutex) +:FunctionBase(m_aMutex) ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_xContext(_xContext) ,m_bPreEvaluated(sal_False) @@ -66,10 +66,10 @@ OFunction::~OFunction() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) { FunctionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -87,7 +87,7 @@ uno::Sequence< ::rtl::OUString > OFunction::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FUNCTION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 80a06c85ef61..bce09bf54b03 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,20 +49,20 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar DBG_CTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OFunctions::~OFunctions() { DBG_DTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OFunctions::disposing() { ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose)); @@ -83,7 +83,7 @@ uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction( ) thro void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size())); if ( !bAdd ) checkIndex(Index); @@ -111,7 +111,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO { uno::Reference< report::XFunction > xFunction; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); TFunctions::iterator aPos = m_aFunctions.begin(); ::std::advance(aPos,Index); @@ -128,7 +128,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY); if ( !xFunction.is() ) diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index d7c208c98634..f57248420880 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent osl_decrementInterlockedCount( &m_refCount ); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroup::~OGroup() { DBG_DTOR( rpt_OGroup,NULL); @@ -109,14 +109,14 @@ sal_Bool SAL_CALL OGroup::supportsService( const ::rtl::OUString& _rServiceName return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) +void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) { GroupPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OGroup::disposing() { m_xHeader.clear(); @@ -180,7 +180,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xHeader; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xFooter; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -294,7 +294,7 @@ void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Pare // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( ) throw(uno::RuntimeException) { - // return uno::Reference< beans::XPropertySetInfo >(); + // return uno::Reference< beans::XPropertySetInfo >(); return GroupPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- @@ -328,7 +328,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const ::rtl::OUString& Prope GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void OGroup::setSection( const ::rtl::OUString& _sProperty +void OGroup::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index b65d8faf75fe..073894f352bc 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con DBG_CTOR( rpt_OGroups,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroups::~OGroups() { DBG_DTOR( rpt_OGroups,NULL); @@ -59,21 +59,21 @@ void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource) { sal_Int32 nCount = _xSource->getCount(); for (sal_Int32 i = 0; i != nCount; ++i) - { + { OGroup* pGroup = new OGroup(this,m_xContext); m_aGroups.push_back(pGroup); uno::Reference<report::XGroup> xGroup(_xSource->getByIndex(i),uno::UNO_QUERY); pGroup->copyGroup(xGroup); - } + } } // ----------------------------------------------------------------------------- -void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) +void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OGroups::disposing() { ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose)); @@ -98,7 +98,7 @@ uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup( ) throw (uno::R void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size())); if ( !bAdd ) checkIndex(Index); @@ -125,7 +125,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO { uno::Reference< report::XGroup > xGroup; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); TGroups::iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); @@ -141,7 +141,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY); if ( !xGroup.is() ) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 60498b766b12..d7132b80bbb0 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; return uno::Sequence< ::rtl::OUString >(pProps,SAL_N_ELEMENTS(pProps)); @@ -123,7 +123,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() DBG_NAME( rpt_OImageControl ) // ----------------------------------------------------------------------------- OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -136,7 +136,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -173,7 +173,7 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) +void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) { ImageControlPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -194,7 +194,7 @@ uno::Sequence< ::rtl::OUString > OImageControl::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMAGECONTROL; - + return aServices; } //------------------------------------------------------------------------------ @@ -220,61 +220,61 @@ REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OImageControl) //REPORTCONTROLFORMAT_IMPL(OImageControl,m_aProps.aFormatProperties) NO_REPORTCONTROLFORMAT_IMPL(OImageControl) -::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkURL; -} -void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkTarget; -} -void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkName; -} -void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); +::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkURL; +} +void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkTarget; +} +void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkName; +} +void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + 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); - return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; -} - +::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; +} + void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +{ sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); setControlBackgroundTransparent(bTransparent); if ( !bTransparent ) set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor); -} - -::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.m_bBackgroundTransparent; -} - -void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) -{ +} + +::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent; +} + +void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) +{ set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,m_aProps.aFormatProperties.m_bBackgroundTransparent); if ( _controlbackgroundtransparent ) set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),m_aProps.aFormatProperties.nBackgroundColor); -} +} // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo( ) throw(uno::RuntimeException) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 78361152a82d..d43c9032327b 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index c247742d9870..31f5d8127614 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index fd9360e30b3c..0a1e08b3d8d9 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,74 +125,74 @@ #define MAP_LEN(x) x, sizeof(x) - 1 #define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) -// page styles -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" -#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" -#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" -#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" -#define SC_UNO_PAGE_TOPBORDER "TopBorder" -#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" -#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" -#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" -#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" -#define SC_UNO_PAGE_BORDERDIST "BorderDistance" -#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" -#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" -#define SC_UNO_PAGE_SCALEVAL "PageScale" -#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" +// page styles +#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" +#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" +#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" +#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" +#define SC_UNO_PAGE_TOPBORDER "TopBorder" +#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" +#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" +#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" +#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" +#define SC_UNO_PAGE_BORDERDIST "BorderDistance" +#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" +#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" +#define SC_UNO_PAGE_SCALEVAL "PageScale" +#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" -#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" -#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" -#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" -#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" -#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" -#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" -#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" -#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" -#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" -#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" -#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" -#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" -#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" -#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" -#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" -#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" -#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" -#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" -#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" -#define SC_UNO_PAGE_HDRON "HeaderIsOn" -#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" -#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" -#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" -#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" -#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" -#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" -#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" -#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" -#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" -#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" -#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" -#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" -#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" -#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" -#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" -#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" -#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" -#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" -#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" -#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" -#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" -#define SC_UNO_PAGE_FTRON "FooterIsOn" -#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" -#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" +#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" +#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" +#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" +#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" +#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" +#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" +#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" +#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" +#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" +#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" +#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" +#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" +#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" +#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" +#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" +#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" +#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" +#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" +#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" +#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" +#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" +#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" +#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" +#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" +#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" +#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" +#define SC_UNO_PAGE_HDRON "HeaderIsOn" +#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" +#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" +#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" +#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" +#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" +#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" +#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" +#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" +#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" +#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" +#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" +#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" +#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" +#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" +#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" +#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" +#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" +#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" +#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" +#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" +#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" +#define SC_UNO_PAGE_FTRON "FooterIsOn" +#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" +#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" // ============================================================================= namespace reportdesign @@ -243,10 +243,10 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r } } // ----------------------------------------------------------------------------- -typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; +typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; class OStyle; -typedef ::comphelper::OPropertyArrayUsageHelper < OStyle - > OStyle_PABASE; +typedef ::comphelper::OPropertyArrayUsageHelper < OStyle + > OStyle_PABASE; typedef ::cppu::WeakImplHelper2< style::XStyle, beans::XMultiPropertyStates> TStyleBASE; class OStyle : public ::comphelper::OMutexAndBroadcastHelper @@ -317,109 +317,109 @@ OStyle::OStyle() sal_Int32 i = 0; registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); - registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - - registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); - registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + + registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); // - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); // - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); // - registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); + registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound, ::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) ); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) ); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL))); - registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); - registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); + registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); + //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); uno::Sequence<sal_Int8> aSe; - registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); } @@ -487,7 +487,7 @@ void SAL_CALL OStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(;pIter != pEnd;++pIter) setPropertyToDefault(*pIter); } @@ -496,7 +496,7 @@ uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Seque { uno::Sequence< uno::Any > aRet(aPropertyNames.getLength()); const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) aRet[i] = getPropertyDefault(*pIter); return aRet; @@ -572,22 +572,22 @@ namespace // ----------------------------------------------------------------------------- struct OReportDefinitionImpl { - uno::WeakReference< uno::XInterface > m_xParent; - ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aDocEventListeners; + uno::WeakReference< uno::XInterface > m_xParent; + ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aDocEventListeners; ::std::vector< uno::Reference< frame::XController> > m_aControllers; - uno::Sequence< beans::PropertyValue > m_aArgs; - - uno::Reference< report::XGroups > m_xGroups; - uno::Reference< report::XSection> m_xReportHeader; - uno::Reference< report::XSection> m_xReportFooter; - uno::Reference< report::XSection> m_xPageHeader; - uno::Reference< report::XSection> m_xPageFooter; - uno::Reference< report::XSection> m_xDetail; - uno::Reference< embed::XStorage > m_xStorage; - uno::Reference< frame::XController > m_xCurrentController; + uno::Sequence< beans::PropertyValue > m_aArgs; + + uno::Reference< report::XGroups > m_xGroups; + uno::Reference< report::XSection> m_xReportHeader; + uno::Reference< report::XSection> m_xReportFooter; + uno::Reference< report::XSection> m_xPageHeader; + uno::Reference< report::XSection> m_xPageFooter; + uno::Reference< report::XSection> m_xDetail; + uno::Reference< embed::XStorage > m_xStorage; + uno::Reference< frame::XController > m_xCurrentController; uno::Reference< container::XIndexAccess > m_xViewData; uno::Reference< container::XNameAccess > m_xStyles; uno::Reference< container::XNameAccess> m_xXMLNamespaceMap; @@ -608,21 +608,21 @@ struct OReportDefinitionImpl ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - ::rtl::OUString m_sCaption; - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sMimeType; - ::rtl::OUString m_sIdentifier; - ::rtl::OUString m_sDataSourceName; - awt::Size m_aVisualAreaSize; - ::sal_Int64 m_nAspect; - ::sal_Int16 m_nGroupKeepTogether; - ::sal_Int16 m_nPageHeaderOption; - ::sal_Int16 m_nPageFooterOption; - ::sal_Int32 m_nCommandType; - sal_Bool m_bControllersLocked; - sal_Bool m_bModified; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_sCaption; + ::rtl::OUString m_sCommand; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sMimeType; + ::rtl::OUString m_sIdentifier; + ::rtl::OUString m_sDataSourceName; + awt::Size m_aVisualAreaSize; + ::sal_Int64 m_nAspect; + ::sal_Int16 m_nGroupKeepTogether; + ::sal_Int16 m_nPageHeaderOption; + ::sal_Int16 m_nPageFooterOption; + ::sal_Int32 m_nCommandType; + sal_Bool m_bControllersLocked; + sal_Bool m_bModified; + sal_Bool m_bEscapeProcessing; sal_Bool m_bSetModifiedEnabled; OReportDefinitionImpl(::osl::Mutex& _aMutex) :m_aStorageChangeListeners(_aMutex) @@ -1217,7 +1217,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t return xSet.get(); } // ----------------------------------------------------------------------------- -void OReportDefinition::setSection( const ::rtl::OUString& _sProperty +void OReportDefinition::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) @@ -1409,8 +1409,8 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelectio void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< embed::XStorage >& _xStorageToLoadFrom, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) { -// ::osl::MutexGuard aGuard(m_aMutex); -// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); +// ::osl::MutexGuard aGuard(m_aMutex); +// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // m_pImpl->m_xStorage = _xStorageToLoadFrom; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index feb94419f337..e5af3f2d8379 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 8ee97e2369c9..d0c17ef9b69f 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xR m_pTraverseReport->traversePageHeader(_xReportDefinition->getPageHeader()); if ( _xReportDefinition->getReportHeaderOn() ) m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader()); - + uno::Reference< report::XGroups > xGroups = _xReportDefinition->getGroups(); m_pTraverseReport->traverseGroups(xGroups); const sal_Int32 nCount = xGroups->getCount(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 54e5cd8847ca..1935670dd27c 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,8 +139,8 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& _xParent //.getSdrModel()->createNewPage(m_xSection); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OSection::~OSection() { DBG_DTOR( rpt_OSection,NULL); @@ -164,16 +164,16 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::dispose() throw(uno::RuntimeException) +void SAL_CALL OSection::dispose() throw(uno::RuntimeException) { OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!"); SectionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); - + cppu::WeakComponentImplHelperBase::dispose(); + } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OSection::disposing() { lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -191,7 +191,7 @@ void SAL_CALL OSection::disposing() uno::Reference< drawing::XShape> xShape(m_xDrawPage->getByIndex(0),uno::UNO_QUERY); m_xDrawPage->remove(xShape); ::comphelper::disposeComponent(xShape); - } + } catch(const uno::Exception&) {} } @@ -243,7 +243,7 @@ void OSection::init() { ::comphelper::query_aggregation(m_xProxy,m_xDrawPage); } - + // set ourself as delegator { if ( m_xProxy.is() ) @@ -379,7 +379,7 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang:: ,1 ,m_xContext); checkNotPageHeaderFooter(); - + set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol); } // ----------------------------------------------------------------------------- @@ -396,7 +396,7 @@ void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang: ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); } - + set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether); } // ----------------------------------------------------------------------------- @@ -516,7 +516,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OSection::getAvailableReportComponentN const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap(); const ::rtl::OUString* pRet = aRet.empty() ? 0 : &aRet[0]; - return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); + return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); } // ----------------------------------------------------------------------------- // XChild diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 4ed2b8aabb9d..c6327bae2841 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ namespace reportdesign using namespace comphelper; uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() { - ::rtl::OUString pProps[] = { - PROPERTY_DATAFIELD + ::rtl::OUString pProps[] = { + PROPERTY_DATAFIELD ,PROPERTY_CONTROLBACKGROUND ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT }; @@ -64,7 +64,7 @@ uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() DBG_NAME( rpt_OShape ) // ----------------------------------------------------------------------------- OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -78,7 +78,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,const ::rtl::OUString& _sServiceName) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -122,10 +122,10 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno:: } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::dispose() throw(uno::RuntimeException) +void SAL_CALL OShape::dispose() throw(uno::RuntimeException) { ShapePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -143,7 +143,7 @@ uno::Sequence< ::rtl::OUString > OShape::getSupportedServiceNames_Static( ) thr { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_SHAPE; - + return aServices; } //------------------------------------------------------------------------------ @@ -160,7 +160,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OShape::getSupportedServiceNames( ) t //------------------------------------------------------------------------------ sal_Bool SAL_CALL OShape::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) { - + return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- @@ -192,7 +192,7 @@ void SAL_CALL OShape::setControlBackgroundTransparent( ::sal_Bool /*_controlback // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo( ) throw(uno::RuntimeException) { - + //return ShapePropertySet::getPropertySetInfo(); return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -480,7 +480,7 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine; - + return m_CustomShapeEngine; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 99028d9c7e4f..43296d7b2f44 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 32fa29152634..9c500fa9c620 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,11 +72,11 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &OFixedLine::create, &OFixedLine::getImplementationName_Static, &OFixedLine::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } -extern "C" +extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 5ae4790701d2..bc551a8ff136 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,32 +39,32 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedLine - ,com::sun::star::lang::XServiceInfo > FixedLineBase; + ,com::sun::star::lang::XServiceInfo > FixedLineBase; /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine * \ingroup reportdesign_api * */ - class OFixedLine : public comphelper::OBaseMutex, + class OFixedLine : public comphelper::OBaseMutex, public FixedLineBase, public FixedLinePropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::drawing::LineStyle m_LineStyle; - ::com::sun::star::drawing::LineDash m_LineDash; - sal_Int32 m_nOrientation; - ::sal_Int32 m_LineColor; - ::sal_Int16 m_LineTransparence; - ::sal_Int32 m_LineWidth; + OReportControlModel m_aProps; + ::com::sun::star::drawing::LineStyle m_LineStyle; + ::com::sun::star::drawing::LineDash m_LineDash; + sal_Int32 m_nOrientation; + ::sal_Int32 m_LineColor; + ::sal_Int16 m_LineTransparence; + ::sal_Int32 m_LineWidth; private: OFixedLine(const OFixedLine&); OFixedLine& operator=(const OFixedLine&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -116,7 +116,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XFixedLine virtual ::sal_Int32 SAL_CALL getOrientation() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); @@ -139,12 +139,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index f1208c6bf635..0c5aae05c752 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,26 +40,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedText - ,com::sun::star::lang::XServiceInfo > FixedTextBase; + ,com::sun::star::lang::XServiceInfo > FixedTextBase; /** \class OFixedText Defines the implementation of a \interface com:::sun::star::report::XFixedText * \ingroup reportdesign_api * */ - class OFixedText : public comphelper::OBaseMutex, + class OFixedText : public comphelper::OBaseMutex, public FixedTextBase, public FixedTextPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_sLabel; + OReportControlModel m_aProps; + ::rtl::OUString m_sLabel; private: OFixedText(const OFixedText&); OFixedText& operator=(const OFixedText&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -125,12 +125,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index e4698d686655..8a74766f49b4 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,26 +38,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormatCondition - ,com::sun::star::lang::XServiceInfo > FormatConditionBase; + ,com::sun::star::lang::XServiceInfo > FormatConditionBase; /** \class OFormatCondition Defines the implementation of a \interface com:::sun::star::report::XFormatCondition * \ingroup reportdesign_api * */ - class OFormatCondition : public comphelper::OBaseMutex, + class OFormatCondition : public comphelper::OBaseMutex, public FormatConditionBase, public FormatConditionPropertySet { - OFormatProperties m_aFormatProperties; - ::rtl::OUString m_sFormula; - sal_Bool m_bEnabled; + OFormatProperties m_aFormatProperties; + ::rtl::OUString m_sFormula; + sal_Bool m_bEnabled; private: OFormatCondition(const OFormatCondition&); OFormatCondition& operator=(const OFormatCondition&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -104,12 +104,12 @@ namespace reportdesign REPORTCONTROLFORMAT_HEADER() // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 3c5304417f5f..d47ad7bc90ff 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,31 +38,31 @@ #include "ReportHelperDefines.hxx" namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormattedField - ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; + ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; /** \class OFormattedField Defines the implementation of a \interface com:::sun::star::report::XFormattedField * \ingroup reportdesign_api * */ - class OFormattedField : public comphelper::OBaseMutex, + class OFormattedField : public comphelper::OBaseMutex, public FormattedFieldBase, public FormattedFieldPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + OReportControlModel m_aProps; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatsSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction> m_xFunction; ::sal_Int32 m_nFormatKey; - + private: OFormattedField(const OFormattedField&); OFormattedField& operator=(const OFormattedField&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -135,7 +135,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XReportControlFormat REPORTCONTROLFORMAT_HEADER() @@ -150,12 +150,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 21accff689d3..719f911c2bc1 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFunction - ,com::sun::star::lang::XServiceInfo > FunctionBase; + ,com::sun::star::lang::XServiceInfo > FunctionBase; /** \class OFunction Defines the implementation of a \interface com:::sun::star::report::XFunction * \ingroup reportdesign_api * */ - class OFunction : public cppu::BaseMutex, + class OFunction : public cppu::BaseMutex, public FunctionBase, public FunctionPropertySet { @@ -53,14 +53,14 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; ::rtl::OUString m_sName; - ::rtl::OUString m_sFormula; + ::rtl::OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; private: OFunction(const OFunction&); OFunction& operator=(const OFunction&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -110,12 +110,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index 416ef70460b4..7760392651b8 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,24 +46,24 @@ namespace reportdesign class OFunctions : public comphelper::OBaseMutex, public FunctionsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier > m_xParent; - TFunctions m_aFunctions; + TFunctions m_aFunctions; private: OFunctions& operator=(const OFunctions&); OFunctions(const OFunctions&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OFunctions(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: explicit OFunctions( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xParent @@ -89,15 +89,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index cf43755094c1..b6678c68bf27 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,17 +53,17 @@ namespace reportdesign ,public GroupPropertySet { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::rptshared::GroupProperties m_aProps; + ::rptshared::GroupProperties m_aProps; private: OGroup& operator=(const OGroup&); OGroup(const OGroup&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -78,19 +78,19 @@ namespace reportdesign } l.notify(); } - void setSection( const ::rtl::OUString& _sProperty + void setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroup(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent @@ -105,7 +105,7 @@ namespace reportdesign virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - + // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -114,7 +114,7 @@ namespace reportdesign virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + // XGroup virtual ::sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSortAscending( ::sal_Bool _sortascending ) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ namespace reportdesign virtual void SAL_CALL setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setResetPageNumber( ::sal_Bool _resetpagenumber ) throw (::com::sun::star::uno::RuntimeException); - + //XFunctionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException); @@ -147,12 +147,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index c2ef3bc1b508..c5819cec5279 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,24 +45,24 @@ namespace reportdesign class OGroups : public comphelper::OBaseMutex, public GroupsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; - TGroups m_aGroups; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; + TGroups m_aGroups; private: OGroups& operator=(const OGroups&); OGroups(const OGroups&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroups(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroups( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent @@ -92,15 +92,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 79ca29ff822c..49daa5ffdc8b 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,28 +38,28 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XImageControl - ,com::sun::star::lang::XServiceInfo > ImageControlBase; + ,com::sun::star::lang::XServiceInfo > ImageControlBase; /** \class OImageControl Defines the implementation of a \interface com:::sun::star::report::XImageControl * \ingroup reportdesign_api * */ - class OImageControl : public comphelper::OBaseMutex, + class OImageControl : public comphelper::OBaseMutex, public ImageControlBase, public ImageControlPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_aImageURL; + OReportControlModel m_aProps; + ::rtl::OUString m_aImageURL; sal_Int16 m_nScaleMode; - ::sal_Bool m_bPreserveIRI; + ::sal_Bool m_bPreserveIRI; private: OImageControl(const OImageControl&); OImageControl& operator=(const OImageControl&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -129,12 +129,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index df07fadd0fb9..a2ec036be3dc 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ namespace reportdesign { - class OReportComponentProperties + class OReportComponentProperties { public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; @@ -56,16 +56,16 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; - ::rtl::OUString m_sName; - ::sal_Int32 m_nHeight; - ::sal_Int32 m_nWidth; - ::sal_Int32 m_nPosX; - ::sal_Int32 m_nPosY; - ::sal_Int32 m_nBorderColor; - ::sal_Int16 m_nBorder; - ::sal_Bool m_bPrintRepeatedValues; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::rtl::OUString m_sName; + ::sal_Int32 m_nHeight; + ::sal_Int32 m_nWidth; + ::sal_Int32 m_nPosX; + ::sal_Int32 m_nPosY; + ::sal_Int32 m_nBorderColor; + ::sal_Int16 m_nBorder; + ::sal_Bool m_bPrintRepeatedValues; OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext ) diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 44f3b6c1eaa3..1b3f42b67171 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,19 +52,19 @@ namespace reportdesign struct OFormatProperties { - ::sal_Int16 nAlign; - ::com::sun::star::awt::FontDescriptor aFontDescriptor; - ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; - ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; + ::sal_Int16 nAlign; + ::com::sun::star::awt::FontDescriptor aFontDescriptor; + ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; + ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; ::com::sun::star::lang::Locale aCharLocale; ::com::sun::star::lang::Locale aCharLocaleAsian; ::com::sun::star::lang::Locale aCharLocaleComplex; - ::sal_Int16 nFontEmphasisMark; - ::sal_Int16 nFontRelief; - ::sal_Int32 nTextColor; - ::sal_Int32 nTextLineColor; - ::sal_Int32 nCharUnderlineColor; - ::sal_Int32 nBackgroundColor; + ::sal_Int16 nFontEmphasisMark; + ::sal_Int16 nFontRelief; + ::sal_Int32 nTextColor; + ::sal_Int32 nTextLineColor; + ::sal_Int32 nCharUnderlineColor; + ::sal_Int32 nBackgroundColor; ::rtl::OUString sCharCombinePrefix; ::rtl::OUString sCharCombineSuffix; ::rtl::OUString sHyperLinkURL; @@ -73,17 +73,17 @@ namespace reportdesign ::rtl::OUString sVisitedCharStyleName; ::rtl::OUString sUnvisitedCharStyleName; com::sun::star::style::VerticalAlignment aVerticalAlignment; - ::sal_Int16 nCharEscapement; - ::sal_Int16 nCharCaseMap; - ::sal_Int16 nCharKerning; - ::sal_Int8 nCharEscapementHeight; - ::sal_Bool m_bBackgroundTransparent; - ::sal_Bool bCharFlash; - ::sal_Bool bCharAutoKerning; - ::sal_Bool bCharCombineIsOn; - ::sal_Bool bCharHidden; - ::sal_Bool bCharShadowed; - ::sal_Bool bCharContoured; + ::sal_Int16 nCharEscapement; + ::sal_Int16 nCharCaseMap; + ::sal_Int16 nCharKerning; + ::sal_Int8 nCharEscapementHeight; + ::sal_Bool m_bBackgroundTransparent; + ::sal_Bool bCharFlash; + ::sal_Bool bCharAutoKerning; + ::sal_Bool bCharCombineIsOn; + ::sal_Bool bCharHidden; + ::sal_Bool bCharShadowed; + ::sal_Bool bCharContoured; OFormatProperties(); }; class OReportControlModel @@ -92,16 +92,16 @@ namespace reportdesign OReportControlModel(OReportControlModel&); void operator =(OReportControlModel&); public: - ::cppu::OInterfaceContainerHelper aContainerListeners; - OReportComponentProperties aComponent; - OFormatProperties aFormatProperties; + ::cppu::OInterfaceContainerHelper aContainerListeners; + OReportComponentProperties aComponent; + OFormatProperties aFormatProperties; ::com::sun::star::container::XContainer* m_pOwner; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > m_aFormatConditions; osl::Mutex& m_rMutex; - ::rtl::OUString aDataField; - ::rtl::OUString aConditionalPrintExpression; - sal_Bool bPrintWhenGroupChange; + ::rtl::OUString aDataField; + ::rtl::OUString aConditionalPrintExpression; + sal_Bool bPrintWhenGroupChange; OReportControlModel(osl::Mutex& _rMutex ,::com::sun::star::container::XContainer* _pOwner diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index e8fcc2547b8d..9fc3197c762e 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index b56743807056..43bb35df8451 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,16 +50,16 @@ namespace reportdesign public ReportEngineBase, public ReportEnginePropertySet { - typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; + typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::sal_Int32 m_nMaxRows; + ::sal_Int32 m_nMaxRows; private: OReportEngineJFree(const OReportEngineJFree&); OReportEngineJFree& operator=(const OReportEngineJFree&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -79,11 +79,11 @@ namespace reportdesign ::rtl::OUString getNewOutputName(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OReportEngineJFree(); public: - typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; + typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; OReportEngineJFree(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); @@ -126,12 +126,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index 1b5f7d2e78a0..5d27f230e312 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 7a9f26d03371..ee4af6f0de02 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptui { class OReportUndoFactory : public SdrUndoFactory { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory; OReportUndoFactory(const OReportUndoFactory&); @@ -68,7 +68,7 @@ namespace rptui virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); // page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 0174908452f2..b053be589fde 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,14 +46,14 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListene class OObjectListener: public TPropertyChangeListenerHelper { private: - OObjectBase* m_pObject; + OObjectBase* m_pObject; OObjectListener(const OObjectListener&); void operator =(const OObjectListener&); protected: virtual ~OObjectListener(); public: OObjectListener(OObjectBase* _pObject); - + // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index c424b908a4e4..5dbd00c3e9e0 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,41 +44,41 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel> SectionBase; + , ::com::sun::star::lang::XUnoTunnel> SectionBase; typedef ::cppu::PropertySetMixin<com::sun::star::report::XSection> SectionPropertySet; class OSection : public comphelper::OMutexAndBroadcastHelper, public SectionBase, public SectionPropertySet { - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::rtl::OUString m_sName; - ::rtl::OUString m_sConditionalPrintExpression; - ::sal_uInt32 m_nHeight; - ::sal_Int32 m_nBackgroundColor; - ::sal_Int16 m_nForceNewPage; - ::sal_Int16 m_nNewRowOrCol; - ::sal_Bool m_bKeepTogether; - ::sal_Bool m_bCanGrow; - ::sal_Bool m_bCanShrink; - ::sal_Bool m_bRepeatSection; - ::sal_Bool m_bVisible; - ::sal_Bool m_bBacktransparent; + ::rtl::OUString m_sName; + ::rtl::OUString m_sConditionalPrintExpression; + ::sal_uInt32 m_nHeight; + ::sal_Int32 m_nBackgroundColor; + ::sal_Int16 m_nForceNewPage; + ::sal_Int16 m_nNewRowOrCol; + ::sal_Bool m_bKeepTogether; + ::sal_Bool m_bCanGrow; + ::sal_Bool m_bCanShrink; + ::sal_Bool m_bRepeatSection; + ::sal_Bool m_bVisible; + ::sal_Bool m_bBacktransparent; bool m_bInRemoveNotify; bool m_bInInsertNotify; - + private: OSection(const OSection&); OSection& operator=(const OSection&); - - template <typename T> void set( const ::rtl::OUString& _sProperty + + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -101,17 +101,17 @@ namespace reportdesign void init(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OSection(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: - typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; + typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); @@ -119,7 +119,7 @@ namespace reportdesign ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); DECLARE_XINTERFACE( ) - + // ::com::sun::star::lang::XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -185,12 +185,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index dcef6ae36897..3bb22a9d74f8 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XShape - ,com::sun::star::lang::XServiceInfo > ShapeBase; + ,com::sun::star::lang::XServiceInfo > ShapeBase; /** \class OShape Defines the implementation of a \interface com:::sun::star::report::XShape * \ingroup reportdesign_api * */ - class OShape : public comphelper::OBaseMutex, + class OShape : public comphelper::OBaseMutex, public ShapeBase, public ShapePropertySet { @@ -69,7 +69,7 @@ namespace reportdesign OShape(const OShape&); OShape& operator=(const OShape&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -146,12 +146,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 343acfbdf859..81d7a00cf757 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,7 +168,7 @@ namespace reportdesign if ( xChild.is() ) xChild->setParent(Parent); } - template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) + template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index ae7602ca0b82..03f061116545 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index e565ddc9b9c5..64577312852e 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,26 +33,26 @@ #endif //------------------------------------------------------------------------------ -#define RID_CORE_STRINGS_START RID_RPT_START +#define RID_CORE_STRINGS_START RID_RPT_START //------------------------------------------------------------------------------ //- String-IDs -#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) #endif // REPORTDESIGN_CORE_RESOURCE_HRC_ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index 80b9a3228ccb..714771a621ef 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace reportdesign //================================================================== class ResourceManager { - static SimpleResMgr* m_pImpl; + static SimpleResMgr* m_pImpl; private: // no instantiation allowed diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 0804c1814487..7f3b1d8d07fb 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index 69246f36e654..8d7fcd2dc23b 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index cd101b0a3be0..7acea859ba49 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ namespace rptui bool bIsField = ( getType() == Field ); ::rtl::OUStringBuffer aFieldContent; if ( bIsField ) - aFieldContent.appendAscii( "[" ); + aFieldContent.appendAscii( "[" ); aFieldContent.append( getUndecoratedContent() ); if ( bIsField ) aFieldContent.appendAscii( "]" ); @@ -154,9 +154,9 @@ namespace rptui return aFieldContent.makeStringAndClear(); } //-------------------------------------------------------------------- - const ::rtl::OUString& ReportFormula::getUndecoratedContent() const - { - return m_sUndecoratedContent; + const ::rtl::OUString& ReportFormula::getUndecoratedContent() const + { + return m_sUndecoratedContent; } const ::rtl::OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } bool ReportFormula::isValid() const { return getType() != Invalid; } diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 90db1ef61e91..c7e6641e5f56 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ namespace reportdesign if (!m_pImpl) { // now that we have an impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClass; - + static ResourceManager::EnsureDelete s_aDeleteTheImplClass; + ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); rtl::OString sResLibName = rtl::OString( "rpt" ); diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index d6191e2f381e..f7d3d3a764aa 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index d132304be477..c823aed327dc 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include <svl/solar.hrc> #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() //......................................................................... @@ -53,7 +53,7 @@ namespace rptui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -61,7 +61,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME( rpt_OModuleImpl ) @@ -83,7 +83,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -99,11 +99,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -136,7 +136,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 307b6f26c390..7cef3bf1fcb4 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace rptui using namespace ::com::sun::star::beans; using namespace reportdesign; -DBG_NAME( rpt_OPropertyMediator ) -OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource +DBG_NAME( rpt_OPropertyMediator ) +OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,const Reference< XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap ,sal_Bool _bReverse) @@ -53,7 +53,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,m_xDest(_xDest) ,m_bInChange(sal_False) { - DBG_CTOR( rpt_OPropertyMediator,NULL); + DBG_CTOR( rpt_OPropertyMediator,NULL); osl_incrementInterlockedCount(&m_refCount); OSL_ENSURE(m_xDest.is(),"Dest is NULL!"); OSL_ENSURE(m_xSource.is(),"Source is NULL!"); @@ -100,7 +100,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() { - DBG_DTOR( rpt_OPropertyMediator,NULL); + DBG_DTOR( rpt_OPropertyMediator,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) @@ -141,7 +141,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } if ( sPropName.getLength() && xPropInfo->hasPropertyByName(sPropName) ) xProp->setPropertyValue(sPropName,aFind->second.second->operator()(sPropName,evt.NewValue)); - else if ( evt.PropertyName == PROPERTY_CHARFONTNAME + else if ( evt.PropertyName == PROPERTY_CHARFONTNAME || evt.PropertyName == PROPERTY_CHARFONTSTYLENAME || evt.PropertyName == PROPERTY_CHARSTRIKEOUT || evt.PropertyName == PROPERTY_CHARWORDMODE @@ -201,7 +201,7 @@ void OPropertyMediator::startListening() } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 2aa9cca9d187..31c977b05bed 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj; ::rtl::OUString sName; - xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( + xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index a16963c95573..0f2fbcebef48 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ DBG_NAME( rpt_OReportUndoFactory ) // ----------------------------------------------------------------------------- OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory) { - DBG_CTOR( rpt_OReportUndoFactory,NULL); + DBG_CTOR( rpt_OReportUndoFactory,NULL); } // ----------------------------------------------------------------------------- OReportUndoFactory::~OReportUndoFactory() { - DBG_DTOR( rpt_OReportUndoFactory,NULL); + DBG_DTOR( rpt_OReportUndoFactory,NULL); } /////////////////////////////////////////////////////////////////////// // shapes @@ -146,7 +146,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { return m_pUndoFactory->CreateUndoDeletePage( rPage ); } @@ -177,7 +177,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 7b98042f9aeb..689ecd9149a8 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "UndoEnv.hxx" #include "ReportUndoFactory.hxx" #include "ReportDefinition.hxx" -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -120,7 +120,7 @@ Window* OReportModel::GetCurDocViewWin() } //---------------------------------------------------------------------------- -OXUndoEnvironment& OReportModel::GetUndoEnv() +OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUStrin return xRet; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 9e7a83a5b557..3f622a48f636 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,11 +107,11 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo } if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) return OBJ_DLG_IMAGECONTROL; - if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) + if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) ) return OBJ_OLE2; - if ( xServiceInfo->supportsService( SERVICE_SHAPE )) + if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) return OBJ_DLG_SUBREPORT; @@ -128,11 +128,11 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon { case OBJ_DLG_FIXEDTEXT: { - OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + OUnoObject* pUnoObj = new OUnoObject( _xComponent + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; - + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); if ( xControlModel.is() ) xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); @@ -140,18 +140,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,nType); break; case OBJ_CUSTOMSHAPE: @@ -323,7 +323,7 @@ DBG_NAME( rpt_OObjectBase ) OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent) :m_bIsListening(sal_False) { - DBG_CTOR( rpt_OObjectBase,NULL); + DBG_CTOR( rpt_OObjectBase,NULL); m_xReportComponent = _xComponent; } //---------------------------------------------------------------------------- @@ -336,7 +336,7 @@ OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName) //---------------------------------------------------------------------------- OObjectBase::~OObjectBase() { - DBG_DTOR( rpt_OObjectBase,NULL); + DBG_DTOR( rpt_OObjectBase,NULL); m_xMediator.reset(); if ( isListening() ) EndListening(); @@ -370,7 +370,7 @@ void OObjectBase::StartListening() if ( !isListening() && m_xReportComponent.is() ) { m_bIsListening = sal_True; - + if ( !m_xPropertyChangeListener.is() ) { m_xPropertyChangeListener = new OObjectListener( this ); @@ -551,8 +551,8 @@ void OCustomShape::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetSnapRect()); m_bIsListening = sal_True; @@ -728,7 +728,7 @@ sal_Int32 OUnoObject::GetStep() const void OUnoObject::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OUnoObject,NULL); - + if ( m_bIsListening ) { // stop listening @@ -775,7 +775,7 @@ void OUnoObject::NbcMove( const Size& rSize ) // } // } } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -794,8 +794,8 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -807,8 +807,8 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) SdrUnoObj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -823,7 +823,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( bResult ) { impl_setReportComponent_nothrow(); - // set labels + // set labels if ( m_xReportComponent.is() ) { try @@ -840,7 +840,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) impl_initializeModel_nothrow(); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -848,7 +848,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } //---------------------------------------------------------------------------- ::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) -{ +{ sal_uInt16 nResId = 0; ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!")); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) @@ -869,7 +869,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (nResId) - aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); + aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); return aDefaultName; } @@ -928,7 +928,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw OObjectBase::StartListening(); } } - } + } } } // ----------------------------------------------------------------------------- @@ -1035,7 +1035,7 @@ sal_Int32 OOle2Obj::GetStep() const void OOle2Obj::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OOle2Obj,NULL); - + if ( m_bIsListening ) { // stop listening @@ -1048,8 +1048,8 @@ void OOle2Obj::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1068,8 +1068,8 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1081,8 +1081,8 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) SdrOle2Obj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -1103,7 +1103,7 @@ bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( !m_xReportComponent.is() ) m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -1150,7 +1150,7 @@ SdrObject* OOle2Obj::Clone() const OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() ); pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get()); - + uno::Reference< chart2::data::XDatabaseDataProvider > xSource( lcl_getDataProvider(GetObjRef()) ); uno::Reference< chart2::data::XDatabaseDataProvider > xDest( lcl_getDataProvider(pObj->GetObjRef()) ); if ( xSource.is() && xDest.is() ) @@ -1190,7 +1190,7 @@ void OOle2Obj::initializeOle() uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef(); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); - + uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is() ) { @@ -1238,11 +1238,11 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY); - + uno::Reference< style::XStyle> xReturn; uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd && !xReturn.is() ;++pIter) { uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 01ba228ffb96..16ba83604b90 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ DBG_NAME(rpt_OObjectListener) OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { - DBG_CTOR(rpt_OObjectListener,NULL); + DBG_CTOR(rpt_OObjectListener,NULL); } //---------------------------------------------------------------------------- OObjectListener::~OObjectListener() { - DBG_DTOR(rpt_OObjectListener,NULL); + DBG_DTOR(rpt_OObjectListener,NULL); } // XEventListener diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fe9ae18cdb52..b466a60bd839 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,17 +134,17 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum) //---------------------------------------------------------------------------- //namespace //{ -// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) -// { -// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); +// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) +// { +// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); // if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); -// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); -// -// return ::rtl::OUString(); -// } +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); +// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); +// +// return ::rtl::OUString(); +// } //} //---------------------------------------------------------------------------- void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) @@ -197,14 +197,14 @@ void OReportPage::resetSpecialMode() const sal_Bool bChanged = rModel.IsChanged(); ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin(); ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end(); - + for (; aIter != aEnd; ++aIter) { removeTempObject(*aIter); } m_aTemporaryObjectList.clear(); rModel.SetChanged(bChanged); - + m_bSpecialInsertMode = false; } // ----------------------------------------------------------------------------- @@ -218,7 +218,7 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe m_aTemporaryObjectList.push_back(pObj); return; } - + if ( pUnoObj ) { pUnoObj->CreateMediator(); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 737e43af74be..5e043b49bde5 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,17 +97,17 @@ namespace rptui TYPEINIT1( OCommentUndoAction, SdrUndoAction ); DBG_NAME(rpt_OCommentUndoAction) //---------------------------------------------------------------------------- -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) :SdrUndoAction(_rMod) -{ - DBG_CTOR(rpt_OCommentUndoAction,NULL); +{ + DBG_CTOR(rpt_OCommentUndoAction,NULL); m_pController = static_cast< OReportModel& >( _rMod ).getController(); if ( nCommentID ) - m_strComment = String(ModuleRes(nCommentID)); + m_strComment = String(ModuleRes(nCommentID)); } OCommentUndoAction::~OCommentUndoAction() { - DBG_DTOR(rpt_OCommentUndoAction,NULL); + DBG_DTOR(rpt_OCommentUndoAction,NULL); } //---------------------------------------------------------------------------- void OCommentUndoAction::Undo() @@ -170,7 +170,7 @@ OUndoContainerAction::~OUndoContainerAction() } //------------------------------------------------------------------------------ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ if ( m_xContainer.is() ) { // insert the element @@ -277,7 +277,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -323,7 +323,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -406,7 +406,7 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) String ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); - + aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 780113958495..70f132d63cdf 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ public: ::osl::Mutex m_aMutex; ::std::vector< uno::Reference< container::XChild> > m_aSections; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; sal_Bool m_bIsUndo; OXUndoEnvironmentImpl(OReportModel& _rModel); @@ -118,16 +118,16 @@ OXUndoEnvironment::~OXUndoEnvironment() DBG_DTOR( rpt_OXUndoEnvironment,NULL); } // ----------------------------------------------------------------------------- -void OXUndoEnvironment::Lock() -{ +void OXUndoEnvironment::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXUndoEnvironment::UnLock() -{ +void OXUndoEnvironment::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } // ----------------------------------------------------------------------------- @@ -174,7 +174,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { OReportPage* pPage = PTR_CAST( OReportPage, m_pImpl->m_rModel.GetMasterPage(i) ); RemoveSection(pPage); - } + } m_pImpl->m_aSections.clear(); @@ -200,7 +200,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) ModeChanged(); } // ----------------------------------------------------------------------------- -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { @@ -236,7 +236,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( !pController ) return; - // no Undo for transient and readonly props. + // no Undo for transient and readonly props. // let's see if we know something about the set #if OSL_DEBUG_LEVEL > 0 int nlen = m_pImpl->m_aPropertySetCache.size(); @@ -257,7 +257,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv AllProperties& rPropInfos = aSetPos->second; AllPropertiesIterator aPropertyPos = rPropInfos.find( _rEvent.PropertyName ); if (aPropertyPos == rPropInfos.end()) - { // nothing 'til now ... have to change this .... + { // nothing 'til now ... have to change this .... // the attributes INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName( _rEvent.PropertyName ).Attributes; bool bTransReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); @@ -316,7 +316,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); @@ -342,7 +342,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + if ( aFind != m_pImpl->m_aSections.end() ) { OUndoEnvLock aLock(*this); @@ -357,7 +357,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro { DBG_UNHANDLED_EXCEPTION(); } - + } } else @@ -414,7 +414,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw { Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + Reference< report::XReportComponent > xReportComponent( xIface, UNO_QUERY ); if ( aFind != m_pImpl->m_aSections.end() && xReportComponent.is() ) { @@ -445,7 +445,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw } } } - + if ( xIface.is() ) RemoveElement(xIface); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 3620f29bf554..af475726bfa0 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,20 +68,20 @@ namespace rptui //==================================================================== //= FormatNormalizer //==================================================================== - DBG_NAME(rpt_FormatNormalizer) + DBG_NAME(rpt_FormatNormalizer) //-------------------------------------------------------------------- FormatNormalizer::FormatNormalizer( const OReportModel& _rModel ) :m_rModel( _rModel ) ,m_xReportDefinition( ) ,m_bFieldListDirty( true ) { - DBG_CTOR(rpt_FormatNormalizer,NULL); + DBG_CTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- FormatNormalizer::~FormatNormalizer() { - DBG_DTOR(rpt_FormatNormalizer,NULL); + DBG_DTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index a3974f8e9103..f1b6979cc17b 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |