diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /forms/source/misc | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'forms/source/misc')
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 130 | ||||
-rw-r--r-- | forms/source/misc/componenttools.cxx | 14 | ||||
-rw-r--r-- | forms/source/misc/limitedformats.cxx | 28 | ||||
-rw-r--r-- | forms/source/misc/listenercontainers.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/property.cxx | 6 | ||||
-rw-r--r-- | forms/source/misc/services.cxx | 20 |
6 files changed, 100 insertions, 100 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 7954470c3193..dd6829d6beab 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star::util; namespace { - //--------------------------------------------------------------------- + static void lcl_throwIllegalArgumentException() { throw IllegalArgumentException(); @@ -168,12 +168,12 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn //================================================================== //= ElementDescription //================================================================== -//------------------------------------------------------------------ + ElementDescription::ElementDescription( ) { } -//------------------------------------------------------------------ + ElementDescription::~ElementDescription() { } @@ -181,7 +181,7 @@ ElementDescription::~ElementDescription() //================================================================== //= OInterfaceContainer //================================================================== -//------------------------------------------------------------------ + OInterfaceContainer::OInterfaceContainer( const Reference<XComponentContext>& _rxContext, ::osl::Mutex& _rMutex, @@ -195,7 +195,7 @@ OInterfaceContainer::OInterfaceContainer( impl_createEventAttacher_nothrow(); } -//------------------------------------------------------------------------------ + OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfaceContainer& _cloneSource ) :OInterfaceContainer_BASE() ,m_rMutex( _rMutex ) @@ -206,7 +206,7 @@ OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfac impl_createEventAttacher_nothrow(); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource ) { try @@ -230,7 +230,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource ) } } -//------------------------------------------------------------------------------ + void OInterfaceContainer::impl_createEventAttacher_nothrow() { try @@ -243,12 +243,12 @@ void OInterfaceContainer::impl_createEventAttacher_nothrow() } } -//------------------------------------------------------------------------------ + OInterfaceContainer::~OInterfaceContainer() { } -//------------------------------------------------------------------------------ + void OInterfaceContainer::disposing() { // dispose all elements @@ -277,7 +277,7 @@ void OInterfaceContainer::disposing() } // XPersistObject -//------------------------------------------------------------------------------ + namespace { //.......................................................................... @@ -314,7 +314,7 @@ namespace } } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStream>& _rxOutStream) { // We're writing a document in SO 5.2 format (or even from earlier versions) @@ -358,7 +358,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre lcl_restoreEvents( aSave, m_xEventAttacher ); } -//------------------------------------------------------------------------------ + struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescriptor, void > { void operator()( ScriptEventDescriptor& _rDescriptor ) @@ -381,7 +381,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr } }; -//------------------------------------------------------------------------------ + struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescriptor, void > { void operator()( ScriptEventDescriptor& _rDescriptor ) @@ -397,7 +397,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr } }; -//------------------------------------------------------------------------------ + void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat ) { OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::transformEvents: no event attacher manager!" ); @@ -440,7 +440,7 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat ) } } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream>& _rxInStream) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -473,7 +473,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream } } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -504,7 +504,7 @@ void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream > } } -//------------------------------------------------------------------------------ + namespace { Reference< XPersistObject > lcl_createPlaceHolder( const Reference< XComponentContext >& _rxORB ) @@ -531,7 +531,7 @@ namespace } } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -620,20 +620,20 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& } // XContainer -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException ) { m_aContainerListeners.addInterface(_rxListener); } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException ) { m_aContainerListeners.removeInterface(_rxListener); } // XEventListener -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -678,7 +678,7 @@ void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( } // XPropertyChangeListener -//------------------------------------------------------------------------------ + void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) throw (::com::sun::star::uno::RuntimeException) { if (evt.PropertyName == PROPERTY_NAME) @@ -696,20 +696,20 @@ throw (::com::sun::star::uno::RuntimeException) { } // XElementAccess -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException ) { return !m_aMap.empty(); } -//------------------------------------------------------------------------------ + Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException) { return m_aElementType; } // XEnumerationAccess -//------------------------------------------------------------------------------ + Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -717,7 +717,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( } // XNameAccess -//------------------------------------------------------------------------------ + Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ::std::pair <OInterfaceMap::iterator, @@ -729,7 +729,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu return (*aPair.first).second->queryInterface( m_aElementType ); } -//------------------------------------------------------------------------------ + StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException) { StringSequence aNameList(m_aItems.size()); @@ -742,7 +742,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce return aNameList; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { ::std::pair <OInterfaceMap::iterator, @@ -751,13 +751,13 @@ sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw } // XIndexAccess -//------------------------------------------------------------------------------ + sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException ) { return m_aItems.size(); } -//------------------------------------------------------------------------------ + Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { if (_nIndex < 0 || (_nIndex >= (sal_Int32)m_aItems.size())) @@ -766,7 +766,7 @@ Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsEx return m_aItems[_nIndex]->queryInterface( m_aElementType ); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _rxObject, ElementDescription* _pElement ) { // it has to be non-NULL @@ -800,7 +800,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r } } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement, sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) throw( IllegalArgumentException ) { @@ -902,7 +902,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper } } -//------------------------------------------------------------------------------ + void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex) { OInterfaceArray::iterator i = m_aItems.begin() + nIndex; @@ -923,19 +923,19 @@ void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex) xChild->setParent(InterfaceRef ()); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implInserted( const ElementDescription* /*_pElement*/ ) { // not inrerested in } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implRemoved( const InterfaceRef& /*_rxObject*/ ) { // not inrerested in } -//------------------------------------------------------------------------------ + void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, ::osl::ClearableMutexGuard& _rInstanceLock ) { _rInstanceLock.clear(); @@ -943,7 +943,7 @@ void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, : } // XIndexContainer -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { Reference< XPropertySet > xElement; @@ -951,7 +951,7 @@ void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& implInsert( _nIndex, xElement, sal_True /* event handling */ , NULL /* not yet approved */ , sal_True /* notification */ ); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any& _rNewElement, ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" ); @@ -1024,14 +1024,14 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any impl_replacedElement( aReplaceEvent, _rClearBeforeNotify ); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ) { if (_nIndex < 0 || _nIndex >= (sal_Int32)m_aItems.size()) throw IndexOutOfBoundsException(); } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -1041,7 +1041,7 @@ void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& implReplaceByIndex( _nIndex, Element, aGuard ); } -//------------------------------------------------------------------------------ + void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implRemoveByIndex: precondition not met (index)!" ); @@ -1084,7 +1084,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvt ); } -//------------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -1094,13 +1094,13 @@ void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( Index implRemoveByIndex( _nIndex, aGuard ); } -//------------------------------------------------------------------------ + ElementDescription* OInterfaceContainer::createElementMetaData( ) { return new ElementDescription; } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) { Reference< XPropertySet > xElementProps; @@ -1131,7 +1131,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An implInsert( m_aItems.size(), xElementProps, sal_True, aElementMetaData.get(), sal_True ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -1159,7 +1159,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any implReplaceByIndex( nPos, Element, aGuard ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -1174,7 +1174,7 @@ void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoS // XEventAttacherManager -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -1186,7 +1186,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const } } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -1198,35 +1198,35 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const } } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvents( nIndex ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->insertEntry( nIndex ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->removeEntry( nIndex ); } -//------------------------------------------------------------------------ + Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { Sequence< ScriptEventDescriptor > aReturn; @@ -1241,28 +1241,28 @@ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( return aReturn; } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) throw(IllegalArgumentException, ServiceNotRegisteredException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->attach( nIndex, xObject, aHelper ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->detach( nIndex, xObject ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->addScriptListener( xListener ); } -//------------------------------------------------------------------------ + void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) @@ -1272,7 +1272,7 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip //================================================================== //= OFormComponents //================================================================== -//------------------------------------------------------------------------------ + Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException) { Any aReturn = OFormComponents_BASE::queryInterface(_rType); @@ -1287,13 +1287,13 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(Runtime return aReturn; } -//------------------------------------------------------------------ + Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException) { return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes()); } -//------------------------------------------------------------------------------ + OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory) :FormComponentsBase( m_aMutex ) ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XFormComponent>::get() ) @@ -1301,7 +1301,7 @@ OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory) { } -//------------------------------------------------------------------------------ + OFormComponents::OFormComponents( const OFormComponents& _cloneSource ) :FormComponentsBase( m_aMutex ) ,OInterfaceContainer( m_aMutex, _cloneSource ) @@ -1309,7 +1309,7 @@ OFormComponents::OFormComponents( const OFormComponents& _cloneSource ) { } -//------------------------------------------------------------------------------ + OFormComponents::~OFormComponents() { if (!FormComponentsBase::rBHelper.bDisposed) @@ -1320,7 +1320,7 @@ OFormComponents::~OFormComponents() } // OComponentHelper -//------------------------------------------------------------------------------ + void OFormComponents::disposing() { OInterfaceContainer::disposing(); @@ -1329,14 +1329,14 @@ void OFormComponents::disposing() } //XChild -//------------------------------------------------------------------------------ + void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -//------------------------------------------------------------------------------ + InterfaceRef OFormComponents::getParent() throw( RuntimeException ) { return m_xParent; diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index 03b1f0eff145..a4a828529e73 100644 --- a/forms/source/misc/componenttools.cxx +++ b/forms/source/misc/componenttools.cxx @@ -38,20 +38,20 @@ namespace frm //==================================================================== //= TypeBag //==================================================================== - //-------------------------------------------------------------------- + TypeBag::TypeBag( const TypeSequence& _rTypes1 ) { addTypes( _rTypes1 ); } - //-------------------------------------------------------------------- + TypeBag::TypeBag( const TypeSequence& _rTypes1, const TypeSequence& _rTypes2 ) { addTypes( _rTypes1 ); addTypes( _rTypes2 ); } - //-------------------------------------------------------------------- + TypeBag::TypeBag( const TypeSequence& _rTypes1, const TypeSequence& _rTypes2, const TypeSequence& _rTypes3 ) { addTypes( _rTypes1 ); @@ -59,7 +59,7 @@ namespace frm addTypes( _rTypes3 ); } - //-------------------------------------------------------------------- + void TypeBag::addTypes( const TypeSequence& _rTypes ) { ::std::copy( @@ -69,19 +69,19 @@ namespace frm ); } - //-------------------------------------------------------------------- + void TypeBag::addType( const Type& i_rType ) { m_aTypes.insert( i_rType ); } - //-------------------------------------------------------------------- + void TypeBag::removeType( const TypeBag::Type& i_rType ) { m_aTypes.erase( i_rType ); } - //-------------------------------------------------------------------- + TypeBag::TypeSequence TypeBag::getTypes() const { TypeSequence aTypes( m_aTypes.size() ); diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 5f0d71ea166c..ffa75cfa1d1e 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -43,7 +43,7 @@ namespace frm //===================================================================== //= //===================================================================== - //--------------------------------------------------------------------- + enum LocaleType { ltEnglishUS, @@ -51,7 +51,7 @@ namespace frm ltSystem }; - //--------------------------------------------------------------------- + static const Locale& getLocale(LocaleType _eType) { static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() ); @@ -75,7 +75,7 @@ namespace frm return s_aSystem; } - //--------------------------------------------------------------------- + struct FormatEntry { const sal_Char* pDescription; @@ -83,7 +83,7 @@ namespace frm LocaleType eLocale; }; - //--------------------------------------------------------------------- + static FormatEntry* lcl_getFormatTable(sal_Int16 nTableId) { switch (nTableId) @@ -130,7 +130,7 @@ namespace frm //===================================================================== //= OLimitedFormats //===================================================================== - //--------------------------------------------------------------------- + OLimitedFormats::OLimitedFormats(const Reference< XComponentContext >& _rxContext, const sal_Int16 _nClassId) :m_nFormatEnumPropertyHandle(-1) ,m_nTableId(_nClassId) @@ -140,13 +140,13 @@ namespace frm ensureTableInitialized(m_nTableId); } - //--------------------------------------------------------------------- + OLimitedFormats::~OLimitedFormats() { releaseSupplier(); } - //--------------------------------------------------------------------- + void OLimitedFormats::ensureTableInitialized(const sal_Int16 _nTableId) { FormatEntry* pFormatTable = lcl_getFormatTable(_nTableId); @@ -200,7 +200,7 @@ namespace frm } } - //--------------------------------------------------------------------- + void OLimitedFormats::clearTable(const sal_Int16 _nTableId) { ::osl::MutexGuard aGuard(s_aMutex); @@ -213,7 +213,7 @@ namespace frm } } - //--------------------------------------------------------------------- + void OLimitedFormats::setAggregateSet(const Reference< XFastPropertySet >& _rxAggregate, sal_Int32 _nOriginalPropertyHandle) { // changes (NULL -> not NULL) and (not NULL -> NULL) are allowed @@ -237,7 +237,7 @@ namespace frm #endif } - //--------------------------------------------------------------------- + void OLimitedFormats::getFormatKeyPropertyValue( Any& _rValue ) const { _rValue.clear(); @@ -268,7 +268,7 @@ namespace frm // TODO: should use a standard format for the control type we're working for } - //--------------------------------------------------------------------- + sal_Bool OLimitedFormats::convertFormatKeyPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rNewValue) { OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::convertFormatKeyPropertyValue: not initialized!"); @@ -340,7 +340,7 @@ namespace frm return sal_False; } - //--------------------------------------------------------------------- + void OLimitedFormats::setFormatKeyPropertyValue( const Any& _rNewValue ) { OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::setFormatKeyPropertyValue: not initialized!"); @@ -353,7 +353,7 @@ namespace frm } } - //--------------------------------------------------------------------- + void OLimitedFormats::acquireSupplier(const Reference< XComponentContext >& _rxContext) { ::osl::MutexGuard aGuard(s_aMutex); @@ -363,7 +363,7 @@ namespace frm } } - //--------------------------------------------------------------------- + void OLimitedFormats::releaseSupplier() { ::osl::MutexGuard aGuard(s_aMutex); diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index 5c528737d33a..c6ff7fd32e45 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.cxx @@ -31,7 +31,7 @@ namespace frm //==================================================================== //= ResetListeners //==================================================================== - //--------------------------------------------------------------------- + bool ResetListeners::implTypedNotify( const Reference< XResetListener >& _rxListener, const EventObject& _rEvent ) SAL_THROW( ( Exception ) ) { diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index cd5be3dc23e4..d042d2968858 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -35,7 +35,7 @@ namespace frm //= PropertyInfoService //================================================================== PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties; -//------------------------------------------------------------------ + sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName) { initialize(); @@ -57,13 +57,13 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName) return nHandle; } -//------------------------------------------------------------------ + sal_Int32 ConcreteInfoService::getPreferredPropertyId(const OUString& _rName) { return PropertyInfoService::getPropertyId(_rName); } -//------------------------------------------------------------------ + #define ADD_PROP_ASSIGNMENT(varname) \ s_AllKnownProperties.push_back(PropertyAssignment(PROPERTY_##varname, PROPERTY_ID_##varname)) //.................................................................. diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index e071c634b833..fd29532e4b3b 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -27,14 +27,14 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -//--------------------------------------------------------------------------------------- + //....................................................................................... #define DECLARE_SERVICE_INFO(classImplName) \ namespace frm { \ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL classImplName##_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw (::com::sun::star::uno::RuntimeException); \ } -//--------------------------------------------------------------------------------------- + DECLARE_SERVICE_INFO(OFixedTextModel) DECLARE_SERVICE_INFO(ORadioButtonModel) DECLARE_SERVICE_INFO(ORadioButtonControl) @@ -89,7 +89,7 @@ namespace frm { \ DECLARE_SERVICE_INFO(OFormsCollection) DECLARE_SERVICE_INFO(ImageProducer) -//--------------------------------------------------------------------------------------- + static Sequence< OUString > s_aClassImplementationNames; static Sequence<Sequence< OUString > > s_aClassServiceNames; @@ -97,7 +97,7 @@ static Sequence<sal_Int64> s_aFactories; // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so // it can't be used with sequences -//--------------------------------------------------------------------------------------- + void registerClassInfo( OUString _rClassImplName, // the ImplName of the class const Sequence< OUString >& _rServiceNames, // the services supported by this class @@ -118,7 +118,7 @@ void registerClassInfo( s_aFactories.getArray()[nCurrentLength] = reinterpret_cast<sal_Int64>(_pCreateFunction); } -//--------------------------------------------------------------------------------------- + //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ @@ -156,7 +156,7 @@ void registerClassInfo( aServices.getArray()[3] = service4; \ REGISTER_CLASS_CORE(classImplName) -//--------------------------------------------------------------------------------------- + void ensureClassInfos() { if (s_aClassImplementationNames.getLength()) @@ -166,7 +166,7 @@ void ensureClassInfos() // ======================================================================== // = ControlModels - // ------------------------------------------------------------------------ + // - FixedText REGISTER_CLASS2(OFixedTextModel, FRM_COMPONENT_FIXEDTEXT, FRM_SUN_COMPONENT_FIXEDTEXT); // - Hidden @@ -279,7 +279,7 @@ void ensureClassInfos() extern "C" { -//--------------------------------------------------------------------------------------- + void SAL_CALL createRegistryInfo_ODatabaseForm(); void SAL_CALL createRegistryInfo_OFilterControl(); void SAL_CALL createRegistryInfo_OScrollBarModel(); @@ -291,7 +291,7 @@ void SAL_CALL createRegistryInfo_ORichTextControl(); void SAL_CALL createRegistryInfo_CLibxml2XFormsExtension(); void SAL_CALL createRegistryInfo_FormOperations(); -//--------------------------------------------------------------------------------------- + void SAL_CALL createRegistryInfo_FORMS() { static sal_Bool bInit = sal_False; @@ -311,7 +311,7 @@ void SAL_CALL createRegistryInfo_FORMS() } } -//--------------------------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { if (!_pServiceManager || !_pImplName) |