diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:42:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:47:23 -0600 |
| commit | 35e44118b8e55b2263bd10e8b11d9ac4e043228b (patch) | |
| tree | 499003287173fc32dae7fda54324bf2fc4414c36 /stoc | |
| parent | 65d6ecfd4e69c2f6b8346e8b655914d5ac5a0286 (diff) | |
Remove visual noise from stoc
Change-Id: I19edfb2796298c4870124d0d1e9488974a010bb8
Reviewed-on: https://gerrit.libreoffice.org/8316
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'stoc')
32 files changed, 305 insertions, 305 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 6bb8b11d9bca..edb6671ceaf0 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -62,17 +62,17 @@ typedef list< OUString > ClassNameList; extern ClassNameList g_aClassNames; #endif -//-------------------------------------------------------------------------------------------------- + Mutex & getMutexAccess(); -//-------------------------------------------------------------------------------------------------- + inline bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType ) { return (pTD->pWeakRef == pType || (pTD->pTypeName->length == pType->pTypeName->length && rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0)); } -//-------------------------------------------------------------------------------------------------- + inline typelib_TypeDescription * getTypeByName( const OUString & rName ) { typelib_TypeDescription * pTypeDescr = 0; @@ -87,7 +87,7 @@ typedef boost::unordered_map< OUString, WeakReference< XIdlField >, typedef boost::unordered_map< OUString, WeakReference< XIdlMethod >, FctHashOUString, equal_to< OUString > > OUString2Method; -//================================================================================================== + class IdlReflectionServiceImpl : public OComponentHelper , public XIdlReflection @@ -148,7 +148,7 @@ public: Reference< XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class IdlClassImpl : public WeakImplHelper1< XIdlClass > { @@ -202,7 +202,7 @@ public: virtual Reference< XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class InterfaceIdlClassImpl : public IdlClassImpl { @@ -244,7 +244,7 @@ public: virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class CompoundIdlClassImpl : public IdlClassImpl { @@ -273,7 +273,7 @@ public: virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class ArrayIdlClassImpl : public IdlClassImpl , public XIdlArray @@ -309,7 +309,7 @@ public: virtual void SAL_CALL set( Any & rArray, sal_Int32 nIndex, const Any & rNewValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class EnumIdlClassImpl : public IdlClassImpl { @@ -335,7 +335,7 @@ public: virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class IdlMemberImpl : public WeakImplHelper1< XIdlMember > { @@ -368,7 +368,7 @@ public: virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); }; -//-------------------------------------------------------------------------------------------------- + // coerces to type descr pTo else queries for it: the interface pointer is returned via rDest // ## type to XidlClass coercion possible inline sal_Bool extract( @@ -398,7 +398,7 @@ inline sal_Bool extract( } return sal_False; } -//-------------------------------------------------------------------------------------------------- + inline sal_Bool coerce_assign( void * pDest, typelib_TypeDescription * pTD, const Any & rSource, IdlReflectionServiceImpl * pRefl ) diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx index 0e3dc6aa771b..17ce150b9d5b 100644 --- a/stoc/source/corereflection/crbase.cxx +++ b/stoc/source/corereflection/crbase.cxx @@ -225,9 +225,9 @@ Reference< XIdlArray > IdlClassImpl::getArray() } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index c9f2deee54f9..60ae43cd2185 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -29,7 +29,7 @@ namespace stoc_corefl { -//================================================================================================== + class IdlCompFieldImpl : public IdlMemberImpl , public XIdlField @@ -280,9 +280,9 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue ) (XWeak *)(OWeakObject *)this, 0 ); } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 3af166452254..d25d137cdf1d 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -425,7 +425,7 @@ uno_Interface * IdlReflectionServiceImpl::mapToUno( (XWeak *)(OWeakObject *)this ); } -//================================================================================================== + Reference< XInterface > SAL_CALL IdlReflectionServiceImpl_create( const Reference< XComponentContext > & xContext ) throw(::com::sun::star::uno::Exception) diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 32a28f96930a..4d90525df8f6 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -23,7 +23,7 @@ namespace stoc_corefl { -//================================================================================================== + class IdlEnumFieldImpl : public IdlMemberImpl , public XIdlField @@ -172,9 +172,9 @@ void IdlEnumFieldImpl::set( Any &, const Any & ) (XWeak *)(OWeakObject *)this ); } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 8f46bf813e42..8eed43664408 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -38,7 +38,7 @@ namespace stoc_corefl { -//================================================================================================== + class IdlAttributeFieldImpl : public IdlMemberImpl , public XIdlField @@ -330,12 +330,12 @@ void IdlAttributeFieldImpl::checkException( } } -//################################################################################################## -//################################################################################################## -//################################################################################################## -//================================================================================================== + + + + class IdlInterfaceMethodImpl : public IdlMemberImpl , public XIdlMethod @@ -780,9 +780,9 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index 1d21df16e630..a4292a1d4b5a 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -88,7 +88,7 @@ public: */ inline void clear(); }; -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::LRU_Cache( sal_Int32 nCachedElements ) #ifdef __CACHE_DIAGNOSE @@ -110,13 +110,13 @@ inline LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::LRU_Cache( sal_Int32 nC } } } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::~LRU_Cache() { delete [] _pBlock; } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::toFront( CacheEntry * pEntry ) const { @@ -138,7 +138,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::toFront( CacheEntr _pHead = pEntry; } } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline sal_Bool LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::hasValue( const t_Key & rKey ) const { @@ -146,7 +146,7 @@ inline sal_Bool LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::hasValue( cons const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); return (iFind != _aKey2Element.end()); } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t_Key & rKey ) const { @@ -165,7 +165,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t } return t_Val(); } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( const t_Key & rKey, const t_Val & rValue ) @@ -203,7 +203,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( toFront( pEntry ); } } -//__________________________________________________________________________________________________ + template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() { @@ -220,7 +220,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() #endif } -//================================================================================================== + struct FctHashOUString : public ::std::unary_function< const OUString &, size_t > { size_t operator()( const OUString & rKey ) const diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 6c8dbb57b8ba..a1cb23112b42 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -88,9 +88,9 @@ protected: }; -//************************************************************************* + // class NestedKeyImpl the implenetation of interface XRegistryKey -//************************************************************************* + class NestedKeyImpl : public WeakImplHelper1< XRegistryKey > { public: @@ -146,7 +146,7 @@ protected: }; -//************************************************************************* + NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry, Reference<XRegistryKey>& localKey, Reference<XRegistryKey>& defaultKey ) @@ -169,7 +169,7 @@ NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry, m_state = m_pRegistry->m_state; } -//************************************************************************* + NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName, NestedKeyImpl* pKey) : m_pRegistry(pKey->m_pRegistry) @@ -197,14 +197,14 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName, m_state = m_pRegistry->m_state; } -//************************************************************************* + NestedKeyImpl::~NestedKeyImpl() { if ( m_pRegistry ) m_pRegistry->release(); } -//************************************************************************* + void NestedKeyImpl::computeChanges() { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); @@ -223,9 +223,9 @@ void NestedKeyImpl::computeChanges() } } -//************************************************************************* + // NestedKey_Impl::computeName() -// + OUString NestedKeyImpl::computeName(const OUString& name) { OUString resLocalName, resDefaultName; @@ -270,14 +270,14 @@ OUString NestedKeyImpl::computeName(const OUString& name) return resLocalName; } -//************************************************************************* + OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); return m_name; } -//************************************************************************* + sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) throw(InvalidRegistryException, RuntimeException) { @@ -290,7 +290,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) throw InvalidRegistryException(); } -//************************************************************************* + sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); @@ -298,7 +298,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException) (m_defaultKey.is() && m_defaultKey->isValid()) ); } -//************************************************************************* + RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException) { @@ -317,7 +317,7 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) return RegistryKeyType_KEY; } -//************************************************************************* + RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) throw(InvalidRegistryException, RuntimeException) { @@ -336,7 +336,7 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) return RegistryValueType_NOT_DEFINED; } -//************************************************************************* + sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -357,7 +357,7 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException) { @@ -381,7 +381,7 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) } } -//************************************************************************* + Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -402,7 +402,7 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException) { @@ -426,7 +426,7 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV } } -//************************************************************************* + OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -447,7 +447,7 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException) { @@ -471,7 +471,7 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) } } -//************************************************************************* + Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -492,7 +492,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException) { @@ -516,7 +516,7 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV } } -//************************************************************************* + OUString SAL_CALL NestedKeyImpl::getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -537,7 +537,7 @@ OUString SAL_CALL NestedKeyImpl::getStringValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException) { @@ -561,7 +561,7 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) } } -//************************************************************************* + Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -582,7 +582,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException) { @@ -606,7 +606,7 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq } } -//************************************************************************* + Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException) { @@ -627,7 +627,7 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException) { @@ -651,7 +651,7 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) } } -//************************************************************************* + Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException) { @@ -687,7 +687,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN } } -//************************************************************************* + Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException) { @@ -745,7 +745,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe return Reference<XRegistryKey>(); } -//************************************************************************* + void SAL_CALL NestedKeyImpl::closeKey( ) throw(InvalidRegistryException, RuntimeException) { @@ -760,7 +760,7 @@ void SAL_CALL NestedKeyImpl::closeKey( ) } } -//************************************************************************* + void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException) { @@ -783,7 +783,7 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) } } -//************************************************************************* + Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) throw(InvalidRegistryException, RuntimeException) { @@ -863,7 +863,7 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) return retSeq; } -//************************************************************************* + Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) throw(InvalidRegistryException, RuntimeException) { @@ -930,7 +930,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) return retSeq; } -//************************************************************************* + sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException) { @@ -988,7 +988,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU return isCreated; } -//************************************************************************* + void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException) { @@ -1034,7 +1034,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) } } -//************************************************************************* + OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException) { @@ -1088,7 +1088,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) return linkTarget; } -//************************************************************************* + OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException) { @@ -1108,16 +1108,16 @@ OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) return resolvedName; } -//************************************************************************* -// + + // DefaultRegistry Implementation -// -//************************************************************************* + + NestedRegistryImpl::NestedRegistryImpl( ) : m_state(0) {} -//************************************************************************* + NestedRegistryImpl::~NestedRegistryImpl() {} class RegistryEnumueration : public WeakImplHelper1< XEnumeration > @@ -1184,7 +1184,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException) -//************************************************************************* + OUString SAL_CALL NestedRegistryImpl::getImplementationName( ) throw(RuntimeException) { @@ -1205,7 +1205,7 @@ Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) return seqNames; } -//************************************************************************* + void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments ) throw( Exception, RuntimeException ) { @@ -1221,7 +1221,7 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments } } -//************************************************************************* + OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); @@ -1237,7 +1237,7 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException) return OUString(); } -//************************************************************************* + void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) throw(InvalidRegistryException, RuntimeException) { @@ -1246,7 +1246,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) Reference< XInterface >() ); } -//************************************************************************* + sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); @@ -1263,7 +1263,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException) return sal_False; } -//************************************************************************* + void SAL_CALL NestedRegistryImpl::close( ) throw(InvalidRegistryException, RuntimeException) { @@ -1278,7 +1278,7 @@ void SAL_CALL NestedRegistryImpl::close( ) } } -//************************************************************************* + void SAL_CALL NestedRegistryImpl::destroy( ) throw(InvalidRegistryException, RuntimeException) { @@ -1287,7 +1287,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) Reference< XInterface >() ); } -//************************************************************************* + Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) throw(InvalidRegistryException, RuntimeException) { @@ -1318,7 +1318,7 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) return Reference<XRegistryKey>(); } -//************************************************************************* + sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) throw(InvalidRegistryException, RuntimeException) { @@ -1335,7 +1335,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) return sal_False; } -//************************************************************************* + void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException) { diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index c5be2a5a28d5..3acc0733f646 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -109,9 +109,9 @@ const StringPool &spool() return *pPool; } -//************************************************************************* + // static deleteAllLinkReferences() -// + static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg, const Reference < XRegistryKey >& xSource) // throw ( InvalidRegistryException, RuntimeException ) @@ -192,9 +192,9 @@ static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg, } } -//************************************************************************* + // static prepareLink -// + static void prepareLink( const Reference < XSimpleRegistry > & xDest, const Reference < XRegistryKey > & xSource, const OUString& link) @@ -236,9 +236,9 @@ static void prepareLink( const Reference < XSimpleRegistry > & xDest, xDest->getRootKey()->createLink(linkName, linkRefName); } -//************************************************************************* + // static searchImplForLink -// + static OUString searchImplForLink( const Reference < XRegistryKey > & xRootKey, const OUString& linkName, @@ -276,9 +276,9 @@ static OUString searchImplForLink( return OUString(); } -//************************************************************************* + // static searchLinkTargetForImpl -// + static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey, const OUString& linkName, const OUString& implName) @@ -320,9 +320,9 @@ static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootK return ret; } -//************************************************************************* + // static createUniqueSubEntry -// + static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey, const OUString& value) // throw ( InvalidRegistryException, RuntimeException ) @@ -381,9 +381,9 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey, } } -//************************************************************************* + // static deleteSubEntry -// + static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const OUString& value) // throw ( InvalidRegistryException, RuntimeException ) { @@ -426,9 +426,9 @@ static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, cons return sal_False; } -//************************************************************************* + // static prepareUserLink -// + static void prepareUserLink(const Reference < XSimpleRegistry >& xDest, const OUString& linkName, const OUString& linkTarget, @@ -453,9 +453,9 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest, xRootKey->createLink(linkName, linkTarget); } -//************************************************************************* + // static deleteUserLink -// + static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey, const OUString& path) { @@ -481,9 +481,9 @@ static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey, } -//************************************************************************* + // static deleteUserLink -// + static void deleteUserLink(const Reference < XRegistryKey >& xRootKey, const OUString& linkName, const OUString& linkTarget, @@ -586,9 +586,9 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey, } } -//************************************************************************* + // static prepareUserKeys -// + static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest, const Reference < XRegistryKey >& xUnoKey, const Reference < XRegistryKey >& xKey, @@ -663,9 +663,9 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest, } } -//************************************************************************* + // static deleteAllImplementations -// + static void deleteAllImplementations( const Reference < XSimpleRegistry >& xReg, const Reference < XRegistryKey >& xSource, const OUString& locationUrl, @@ -752,7 +752,7 @@ static void deleteAllImplementations( const Reference < XSimpleRegistry >& xRe } } -//================================================================================================== + static void delete_all_singleton_entries( Reference < registry::XRegistryKey > const & xSingletons_section, ::std::list< OUString > const & impl_names ) @@ -815,9 +815,9 @@ static void delete_all_singleton_entries( } } -//************************************************************************* + // static deleteAllServiceEntries -// + static void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xReg, const Reference < XRegistryKey >& xSource, const OUString& implName) @@ -1037,9 +1037,9 @@ static void insert_singletons( } -//************************************************************************* + // static prepareRegistry -// + static void prepareRegistry( const Reference < XSimpleRegistry >& xDest, const Reference < XRegistryKey >& xSource, @@ -1282,17 +1282,17 @@ private: // members Reference < XComponentContext > m_xCtx; }; -//************************************************************************* + // ImplementationRegistration() -// + ImplementationRegistration::ImplementationRegistration( const Reference < XComponentContext > & xCtx ) : m_xSMgr( xCtx->getServiceManager() ) , m_xCtx( xCtx ) {} -//************************************************************************* + // ~ImplementationRegistration() -// + ImplementationRegistration::~ImplementationRegistration() {} // XServiceInfo @@ -1339,9 +1339,9 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM } -//************************************************************************ + // XInitialization -// + void ImplementationRegistration::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) @@ -1430,9 +1430,9 @@ void ImplementationRegistration::initialize( -//************************************************************************* + // virtual function registerImplementationWithLocation of XImplementationRegistration2 -// + void ImplementationRegistration::registerImplementationWithLocation( const OUString& implementationLoaderUrl, const OUString& locationUrl, @@ -1536,9 +1536,9 @@ void ImplementationRegistration::prepareRegister( } } -//************************************************************************* + // virtual function registerImplementation of XImplementationRegistration -// + void ImplementationRegistration::registerImplementation( const OUString& implementationLoaderUrl, const OUString& locationUrl, @@ -1549,9 +1549,9 @@ void ImplementationRegistration::registerImplementation( } -//************************************************************************* + // virtual function revokeImplementation of XImplementationRegistration -// + sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location, const Reference < XSimpleRegistry >& xReg) throw ( RuntimeException ) @@ -1597,9 +1597,9 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati return ret; } -//************************************************************************* + // virtual function getImplementations of XImplementationRegistration -// + Sequence< OUString > ImplementationRegistration::getImplementations( const OUString & implementationLoaderUrl, const OUString & locationUrl) @@ -1680,9 +1680,9 @@ Sequence< OUString > ImplementationRegistration::getImplementations( return Sequence<OUString>(); } -//************************************************************************* + // virtual function checkInstantiation of XImplementationRegistration -// + Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&) throw ( RuntimeException ) { @@ -1690,9 +1690,9 @@ Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUStri return Sequence<OUString>(); } -//************************************************************************* + // helper function doRegistration -// + void ImplementationRegistration::doRevoke( const Reference < XSimpleRegistry >& xDest, diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index 830abdf32280..946722fc21ec 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -45,7 +45,7 @@ struct Link }; typedef ::std::vector< Link > t_links; -//================================================================================================== + static void mergeKeys( Reference< registry::XRegistryKey > const & xDest, Reference< registry::XRegistryKey > const & xSource, @@ -141,7 +141,7 @@ static void mergeKeys( } } -//================================================================================================== + void mergeKeys( Reference< registry::XRegistryKey > const & xDest, Reference< registry::XRegistryKey > const & xSource ) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index b2963f570ba5..80e84fc20fd0 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -83,7 +83,7 @@ namespace stoc_inspect typedef WeakImplHelper3< XIntrospectionAccess, XMaterialHolder, XExactName > IntrospectionAccessHelper; -//================================================================================================== + // Special value for Method-Concept, to be able to mark "normal" functions #define MethodConcept_NORMAL_IMPL 0x80000000 @@ -109,7 +109,7 @@ sal_Bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> return sal_False; } -//======================================================================== + // *** Classification of Properties (no enum, to be able to use Sequence) *** // Properties from a PropertySet-Interface @@ -127,9 +127,9 @@ sal_Bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> -//************************************** + //*** IntrospectionAccessStatic_Impl *** -//************************************** + // Equals to the old IntrospectionAccessImpl, forms now a static // part of the new Instance-related ImplIntrospectionAccess @@ -682,9 +682,9 @@ void IntrospectionAccessStatic_Impl::checkInterfaceArraySize( Sequence< Referenc } -//******************************* + //*** ImplIntrospectionAccess *** -//******************************* + // Neue Impl-Klasse im Rahmen der Introspection-Umstellung auf Instanz-gebundene // Introspection mit Property-Zugriff ueber XPropertySet. Die alte Klasse @@ -765,9 +765,9 @@ ImplIntrospectionAccess::~ImplIntrospectionAccess() } -//******************************* + //*** ImplIntrospectionAdapter *** -//******************************* + // Neue Impl-Klasse im Rahmen der Introspection-Umstellung auf Instanz-gebundene // Introspection mit Property-Zugriff ueber XPropertySet. Die alte Klasse @@ -931,9 +931,9 @@ Any SAL_CALL ImplIntrospectionAdapter::queryInterface( const Type& rType ) } -//*************************************************** + //*** Implementation von ImplIntrospectionAdapter *** -//*************************************************** + // Methoden von XPropertySet Reference<XPropertySetInfo> ImplIntrospectionAdapter::getPropertySetInfo(void) @@ -1150,9 +1150,9 @@ void ImplIntrospectionAdapter::set(Any& array, sal_Int32 index, const Any& value } -//************************************************** + //*** Implementation von ImplIntrospectionAccess *** -//************************************************** + // Methoden von XIntrospectionAccess sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts(void) @@ -1576,9 +1576,9 @@ typedef boost::unordered_map > TypeProviderAccessCacheMap; -//************************* + //*** ImplIntrospection *** -//************************* + struct OIntrospectionMutex { @@ -1786,7 +1786,7 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw() return getSupportedServiceNames_Static(); } -//************************************************************************* + // Helper XServiceInfo OUString ImplIntrospection::getImplementationName_Static( ) { @@ -1801,7 +1801,7 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) th return aSNS; } -//************************************************************************* + // Methoden von XIntrospection Reference<XIntrospectionAccess> ImplIntrospection::inspect(const Any& aToInspectObj) @@ -2076,9 +2076,9 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( pMapTypeArray = pAccess->maMapTypeSeq.getArray(); pPropertyConceptArray = pAccess->maPropertyConceptSeq.getArray(); - //************************* + //*** Analyse vornehmen *** - //************************* + if( eType == TypeClass_INTERFACE ) { // Zunaechst nach speziellen Interfaces suchen, die fuer @@ -2191,7 +2191,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( aCheckedInterfacesMap[ pIface ] = pIface; } - //******************************************************************** + // 2. Fields als Properties registrieren @@ -2249,7 +2249,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( rPropCount++; } - //******************************************************************** + // 3. Methoden @@ -2625,7 +2625,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( } - //******************************************************************** + // 4. Methoden in die Gesamt-Sequence uebernehmen @@ -2841,7 +2841,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( return pAccess; } -//************************************************************************* + Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( RuntimeException ) { diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 2daa180850b3..25930907b18c 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -86,7 +86,7 @@ inline Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< } -//================================================================================================== + class Invocation_Impl : public OWeakObject , public XInvocation2 @@ -201,7 +201,7 @@ public: virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException ); - //===================================================================================================== + private: void getInfoSequenceImpl( Sequence< OUString >* pStringSeq, Sequence< InvocationInfo >* pInfoSeq ); void fillInfoForNameAccess( InvocationInfo& rInfo, const OUString& aName ); @@ -227,14 +227,14 @@ private: Reference<XEnumerationAccess> _xEnumerationAccess; Reference<XElementAccess> _xElementAccess; - // + Reference<XExactName> _xENDirect, _xENIntrospection, _xENNameAccess; }; -//================================================================================================== -//================================================================================================== -//================================================================================================== + + + Invocation_Impl::Invocation_Impl @@ -253,9 +253,9 @@ Invocation_Impl::Invocation_Impl Invocation_Impl::~Invocation_Impl() {} -//################################################################################################## + //### INTERFACE IMPLEMENTATIONS #################################################################### -//################################################################################################## + Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) @@ -1063,9 +1063,9 @@ Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( Ru return pId->getImplementationId(); } -//================================================================================================== -//================================================================================================== -//================================================================================================== + + + class InvocationService : public WeakImplHelper2< XSingleServiceFactory, XServiceInfo > { @@ -1148,7 +1148,7 @@ Reference<XInterface> InvocationService::createInstanceWithArguments( } -//************************************************************************* + Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) throw( RuntimeException ) { diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 5759351522d9..57ebb18105e8 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -82,7 +82,7 @@ struct hash_ptr typedef boost::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set; typedef boost::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map; -//============================================================================== + class FactoryImpl : public ::cppu::WeakImplHelper3< lang::XServiceInfo, script::XInvocationAdapterFactory, @@ -126,13 +126,13 @@ public: throw (RuntimeException); }; struct AdapterImpl; -//============================================================================== + struct InterfaceAdapterImpl : public uno_Interface { AdapterImpl * m_pAdapter; typelib_InterfaceTypeDescription * m_pTypeDescr; }; -//============================================================================== + struct AdapterImpl { oslInterlockedCount m_nRef; @@ -183,7 +183,7 @@ inline AdapterImpl::~AdapterImpl() (typelib_TypeDescription *)m_pInterfaces[ nPos ].m_pTypeDescr ); } delete [] m_pInterfaces; - // + (*m_pReceiver->release)( m_pReceiver ); m_pFactory->release(); } @@ -917,7 +917,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() return invadp_getSupportedServiceNames(); } -//============================================================================== + static Reference< XInterface > SAL_CALL FactoryImpl_create( const Reference< XComponentContext > & xContext ) throw (Exception) @@ -928,9 +928,9 @@ static Reference< XInterface > SAL_CALL FactoryImpl_create( } -//############################################################################## -//############################################################################## -//############################################################################## + + + static const struct ::cppu::ImplementationEntry g_entries[] = { diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index d3fbc33042bd..e4eea7da39ae 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -841,7 +841,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } jfw_freeJavaInfo(pJavaInfo); - // + //Error: %PRODUCTNAME requires a Java //runtime environment (JRE) to perform this task. The selected JRE //is defective. Please select another version or install a new JRE diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 9c1283bba5ad..d92ecf4a870c 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -77,16 +77,16 @@ private: Reference<XMultiServiceFactory> m_xSMgr; }; -//************************************************************************* + DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCtx ) { m_xSMgr.set( xCtx->getServiceManager(), UNO_QUERY ); } -//************************************************************************* + DllComponentLoader::~DllComponentLoader() {} -//************************************************************************* + OUString SAL_CALL DllComponentLoader::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { @@ -107,7 +107,7 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames( ) return seqNames; } -//************************************************************************* + void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { @@ -132,7 +132,7 @@ void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::co // m_xSMgr = rServiceManager; } -//************************************************************************* + Reference<XInterface> SAL_CALL DllComponentLoader::activate( const OUString & rImplName, const OUString &, const OUString & rLibName, const Reference< XRegistryKey > & ) @@ -145,7 +145,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( } -//************************************************************************* + sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName ) diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 98be298326b7..96eafee5f86d 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -81,7 +81,7 @@ typedef boost::unordered_map equalOWString_Impl > HashMap_OWString_Interface; -//================================================================================================== + class NamingService_Impl : public WeakImplHelper2 < XServiceInfo, XNamingService > { @@ -109,17 +109,17 @@ public: virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException); }; -//================================================================================================== + static Reference<XInterface> SAL_CALL NamingService_Impl_create( SAL_UNUSED_PARAMETER const Reference<XComponentContext> & ) { return *new NamingService_Impl(); } -//================================================================================================== + NamingService_Impl::NamingService_Impl() {} -//================================================================================================== + NamingService_Impl::~NamingService_Impl() {} // XServiceInfo diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 25aefdfa983d..30d70ca37b50 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -61,7 +61,7 @@ static Sequence< OUString > proxyfac_getSupportedServiceNames() return Sequence< OUString >( &str_name, 1 ); } -//============================================================================== + struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo, reflection::XProxyFactory > { @@ -165,7 +165,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface( } } -//============================================================================== + struct ProxyRoot : public ::cppu::OWeakAggObject { // XAggregation @@ -182,7 +182,7 @@ private: UnoInterfaceReference m_target; }; -//============================================================================== + struct binuno_Proxy : public uno_Interface { oslInterlockedCount m_nRefCount; @@ -395,7 +395,7 @@ Any ProxyRoot::queryAggregation( Type const & rType ) return ret; } -//############################################################################## + FactoryImpl::FactoryImpl() @@ -454,7 +454,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() return proxyfac_getSupportedServiceNames(); } -//============================================================================== + static Reference< XInterface > SAL_CALL proxyfac_create( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) throw (Exception) diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 92ca750b1fa1..f0807942a96a 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -67,7 +67,7 @@ namespace { static OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME; const char s_acRestriction[] = "access-control.restriction"; -//################################################################################################## + /** ac context intersects permissions of two ac contexts */ @@ -308,7 +308,7 @@ Any acc_CurrentContext::getValueByName( OUString const & name ) } } -//################################################################################################## + static inline Reference< security::XAccessControlContext > getDynamicRestriction( Reference< XCurrentContext > const & xContext ) @@ -336,7 +336,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction } return Reference< security::XAccessControlContext >(); } -//================================================================================================== + class cc_reset { void * m_cc; @@ -347,7 +347,7 @@ public: { ::uno_setCurrentContext( m_cc, s_envType.pData, 0 ); } }; -//################################################################################################## + struct MutexHolder { @@ -356,7 +356,7 @@ struct MutexHolder typedef WeakComponentImplHelper3< security::XAccessController, lang::XServiceInfo, lang::XInitialization > t_helper; -//================================================================================================== + class AccessController : public MutexHolder , public t_helper diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index d5bc3c966880..47945a3bcd19 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -54,7 +54,7 @@ struct MutexHolder }; typedef WeakComponentImplHelper2< security::XPolicy, lang::XServiceInfo > t_helper; -//================================================================================================== + class FilePolicy : public MutexHolder , public t_helper @@ -149,7 +149,7 @@ Sequence< Any > FilePolicy::getDefaultPermissions() return m_defaultPermissions; } -//================================================================================================== + class PolicyReader { OUString m_fileName; diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index be081b761074..5033113b1744 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -99,7 +99,7 @@ public: */ inline void setSize( ::std::size_t size ) SAL_THROW(()); }; -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::setSize( ::std::size_t size ) SAL_THROW(()) @@ -121,7 +121,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::setSize( } } } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache( ::std::size_t size ) SAL_THROW(()) @@ -130,21 +130,21 @@ inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache( { setSize( size ); } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lru_cache() SAL_THROW(()) : m_size( 0 ) , m_block( 0 ) { } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline lru_cache< t_key, t_val, t_hashKey, t_equalKey >::~lru_cache() SAL_THROW(()) { delete [] m_block; } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::toFront( Entry * entry ) const SAL_THROW(()) @@ -167,7 +167,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::toFront( m_head = entry; } } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( t_key const & key ) const SAL_THROW(()) @@ -175,7 +175,7 @@ inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); return (iFind != m_key2element.end()); } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( t_key const & key ) const SAL_THROW(()) @@ -201,7 +201,7 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( } return 0; } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( t_key const & key, t_val const & val ) SAL_THROW(()) @@ -252,7 +252,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( toFront( entry ); } } -//__________________________________________________________________________________________________ + template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW(()) { diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 0e6060619fbf..233c56eaa82e 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -100,9 +100,9 @@ static inline OUString makeStrings( return buf.makeStringAndClear(); } -//################################################################################################## -//================================================================================================== + + class SocketPermission : public Permission { static char const * s_actions []; @@ -271,9 +271,9 @@ OUString SocketPermission::toString() const SAL_THROW(()) return buf.makeStringAndClear(); } -//################################################################################################## -//================================================================================================== + + class FilePermission : public Permission { static char const * s_actions []; @@ -428,9 +428,9 @@ OUString FilePermission::toString() const SAL_THROW(()) return buf.makeStringAndClear(); } -//################################################################################################## -//================================================================================================== + + class RuntimePermission : public Permission { OUString m_name; @@ -467,7 +467,7 @@ OUString RuntimePermission::toString() const SAL_THROW(()) return buf.makeStringAndClear(); } -//################################################################################################## + bool AllPermission::implies( Permission const & ) const SAL_THROW(()) @@ -480,7 +480,7 @@ OUString AllPermission::toString() const SAL_THROW(()) return OUString("com.sun.star.security.AllPermission"); } -//################################################################################################## + PermissionCollection::PermissionCollection( @@ -576,7 +576,7 @@ static void throwAccessControlException( throw security::AccessControlException( buf.makeStringAndClear(), Reference< XInterface >(), demanded_perm ); } -//================================================================================================== + void PermissionCollection::checkPermission( Any const & perm ) const SAL_THROW( (RuntimeException) ) { diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 66598960cd03..4a1e96c84e73 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -29,7 +29,7 @@ namespace stoc_sec { -//================================================================================================== + class Permission : public ::salhelper::SimpleReferenceObject { public: @@ -48,7 +48,7 @@ public: virtual bool implies( Permission const & perm ) const SAL_THROW(()) = 0; virtual OUString toString() const SAL_THROW(()) = 0; }; -//================================================================================================== + class AllPermission : public Permission { public: @@ -62,7 +62,7 @@ public: virtual OUString toString() const SAL_THROW(()); }; -//================================================================================================== + class PermissionCollection { ::rtl::Reference< Permission > m_head; diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 3f576004a8b5..747023788415 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -188,7 +188,7 @@ Any ServiceEnumeration_Impl::nextElement() return Any( &aFactories.getConstArray()[nIt++], ::getCppuType( (const Reference<XInterface > *)0 ) ); } -//================================================================================================== + class PropertySetInfo_Impl : public WeakImplHelper1< beans::XPropertySetInfo > { Sequence< beans::Property > m_properties; @@ -501,9 +501,9 @@ inline void OServiceManager::check_undisposed() const } } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + typedef WeakComponentImplHelper6< lang::XMultiServiceFactory, lang::XMultiComponentFactory, lang::XServiceInfo, @@ -679,9 +679,9 @@ OServiceManagerWrapper::OServiceManagerWrapper( } } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + /** * Create a ServiceManager diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 0228db3a0edf..5d1dd19f4118 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -99,7 +99,7 @@ static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW(()) static inline double round( double aVal ) { - sal_Bool bPos = (aVal >= 0.0); // + sal_Bool bPos = (aVal >= 0.0); aVal = ::fabs( aVal ); double aUpper = ::ceil( aVal ); @@ -188,7 +188,7 @@ static sal_Bool getNumericValue( double & rfVal, const OUString & rStr ) return sal_True; } -//================================================================================================== + static sal_Bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr ) { sal_Int32 nLen = rStr.getLength(); @@ -252,7 +252,7 @@ static sal_Bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr ) return sal_False; } -//================================================================================================== + class TypeConverter_Impl : public WeakImplHelper2< XTypeConverter, XServiceInfo > { // ...misc helpers... @@ -909,7 +909,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina namespace stoc_services { -//************************************************************************* + Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance( SAL_UNUSED_PARAMETER const Reference< XComponentContext > & ) throw( RuntimeException ) diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 59fa9c2e4c10..8e5654188cf0 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -126,9 +126,9 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) "com.sun.star.reflection.theTypeDescriptionManager")), css::uno::UNO_QUERY_THROW); - //////////////////////////////////////// + // test: add cmd line rdbs to manager - //////////////////////////////////////// + OSL_ASSERT( arguments.getLength() > 0 ); css::uno::Reference<css::container::XSet> xSet( @@ -166,7 +166,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) } } - /////// + / css::uno::Reference< css::reflection::XIndirectTypeDescription > sequence( manager->getByHierarchicalName( diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 79f06ab7efeb..2fbba4a9008d 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -47,7 +47,7 @@ const double MAX_DOUBLE = DBL_MAX; const double MIN_FLOAT = -FLT_MAX; const double MAX_FLOAT = FLT_MAX; -//================================================================================================== + static void printValue( const Any & rVal ) { // print value @@ -159,7 +159,7 @@ static void printValue( const Any & rVal ) static Reference< XTypeConverter > s_xConverter; -//================================================================================================== + static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bExpectSuccess ) { sal_Bool bCanConvert = sal_False; @@ -261,7 +261,7 @@ static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bE } -//================================================================================================== + typedef struct _ConvBlock { Any _value; @@ -287,7 +287,7 @@ typedef struct _ConvBlock } ConvBlock; -//================================================================================================== + static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) { Any aVal; @@ -601,7 +601,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) return nElems; } -//================================================================================================== + static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) { printf( "test_Conversion(): start...\n" ); diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index bfe792d1e280..23dd0ed1f1e8 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -56,7 +56,7 @@ using namespace com::sun::star::reflection; using namespace com::sun::star::container; -//================================================================================================== + class OInterfaceA : public WeakImplHelper1< XInterfaceA > { public: @@ -70,7 +70,7 @@ public: { return Sequence< StructB >(); } }; -//================================================================================================== + static inline bool uik_equals( const Uik & rUik1, const Uik & rUik2 ) { return (rUik1.m_Data1 == rUik2.m_Data1 && @@ -79,7 +79,7 @@ static inline bool uik_equals( const Uik & rUik1, const Uik & rUik2 ) rUik1.m_Data4 == rUik2.m_Data4 && rUik1.m_Data5 == rUik2.m_Data5); } -//================================================================================================== + static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) { Reference< XIdlClass > xClass; diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 679d937d6463..3abdfb218f00 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star::registry; -//================================================================================================== + sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 ) { OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" ); @@ -85,7 +85,7 @@ sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rDa rData1.Interface == rData2.Interface && rData1.Any == rData2.Any); } -//================================================================================================== + sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 ) { sal_Int32 nLen; @@ -109,7 +109,7 @@ sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 ) } return sal_False; } -//================================================================================================== + void assign( test::TestElement & rData, sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, @@ -136,7 +136,7 @@ void assign( test::TestElement & rData, rData.Interface = xTest; rData.Any = rAny; } -//================================================================================================== + void assign( test::TestData & rData, sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, @@ -154,7 +154,7 @@ void assign( test::TestData & rData, rData.Sequence = rSequence; } -//================================================================================================== + class Test_Impl : public WeakImplHelper1< XLanguageBindingTest > { test::TestData _aData, _aStructData; @@ -277,7 +277,7 @@ public: virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================================================== + class XLB_Invocation : public WeakImplHelper1< XInvocation > { Reference< XLanguageBindingTest > _xLBT; @@ -665,7 +665,7 @@ sal_Bool XLB_Invocation::hasProperty( const OUString & rName ) rName == "RuntimeException" ); } -//################################################################################################## + void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, @@ -737,7 +737,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In return _aStructData; } -//================================================================================================== + sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) { OSL_ENSURE( xLBT.is(), "### no test interface!" ); @@ -760,7 +760,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) aData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aData, 1 ); // aData complete - //================================================================================ + // this is a manually copy of aData for first setting... test::TestData aSetData; @@ -876,7 +876,7 @@ void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::c throw aExc; } -//================================================================================================== + sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT ) { try @@ -932,7 +932,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT ) return sal_False; } -//================================================================================================== + static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr ) { Reference< XInvocationAdapterFactory > xAdapFac( @@ -977,7 +977,7 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr ) return (performTest( xLBT ) && raiseException( xLBT )); } -//================================================================================================== + static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr ) { Reference< XInvocationAdapterFactory > xAdapFac( diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index ef8192faddb7..deb5b13a25a3 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -256,7 +256,7 @@ sal_Bool ImplPropertySetInfo::hasPropertyByName(const OUString& Name) return sal_False; } -//***************************************************************** + class ImplIntroTest : public ImplIntroTestHelper { Reference< XMultiServiceFactory > mxMgr; @@ -844,7 +844,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, OString aErrorStr; - //****************************************************** + // create test object Any aObjAny = getIntrospectionTestObject( xMgr ); diff --git a/stoc/test/testintrosp.idl b/stoc/test/testintrosp.idl index 0ff92e10cf8a..0f7e3489a60f 100644 --- a/stoc/test/testintrosp.idl +++ b/stoc/test/testintrosp.idl @@ -39,7 +39,7 @@ #endif -//============================================================================= + module ModuleA { @@ -48,7 +48,7 @@ module ModuleA //interface XPropertyChangeListener; //interface XPropertiesChangeListener; -//============================================================================= + /** This is a test interface for introspection. <p>IMPORTANT: FOR TEST ONLY! @@ -61,149 +61,149 @@ module ModuleA */ interface XIntroTest: com::sun::star::uno::XInterface { - //------------------------------------------------------------------------- + /** contains the ID-String of the implementation. */ [attribute] string ObjectName; - //------------------------------------------------------------------------- + /** contains the first name of a person. */ [readonly, attribute] string FirstName; - //------------------------------------------------------------------------- + /** contains the last name of a person. */ [readonly, attribute] string LastName; - //------------------------------------------------------------------------- + /** contains the age of a person. */ [readonly, attribute] short Age; - //------------------------------------------------------------------------- + /** contains the number of children person has. */ [attribute] short ChildrenCount; - //------------------------------------------------------------------------- + /** contains a struct of type Property. */ [attribute] com::sun::star::beans::Property FirstStruct; - //------------------------------------------------------------------------- + /** contains a struct of type PropertyValue. */ [attribute] com::sun::star::beans::PropertyValue SecondStruct; - //------------------------------------------------------------------------- + /** Ausgabe-Methode */ void writeln( [in] string Text ); - //------------------------------------------------------------------------- + /** ... */ long getDroenk(); - //------------------------------------------------------------------------- + /** Weitere Introspection-Test-Objekt holen */ XIntroTest getIntroTest(); //com::sun::star::beans::XIntroTest getIntroTest(); - //------------------------------------------------------------------------- + /** !!! No property, because parameter exists */ long getUps( [in] long l ); - //------------------------------------------------------------------------- + /** ... */ void setDroenk( [in] long l ); - //------------------------------------------------------------------------- + /** ... */ short getBla(); - //------------------------------------------------------------------------- + /** !!! Not the set method for property Bla, because param type != return type. */ void setBla( [in] long n ); - //------------------------------------------------------------------------- + /** ... */ short getBlub(); - //------------------------------------------------------------------------- + /** ... */ void setBlub( [in] short n ); - //------------------------------------------------------------------------- + /** ... */ short getGulp(); - //------------------------------------------------------------------------- + /** !!! Not the set method for property Gulp, because return type != void. */ short setGulp( [in] short n ); - //------------------------------------------------------------------------- + /** ... */ com::sun::star::uno::TypeClass getTypeClass( [in] short n ); - //------------------------------------------------------------------------- + /** ... */ void setTypeClass( [in] com::sun::star::uno::TypeClass t, [in] double d1, [in] double d2 ); - //------------------------------------------------------------------------- + /** */ sequence<string> getStrings(); - //------------------------------------------------------------------------- + /** ... */ void setStrings( [in] sequence<string> Strings ); - //------------------------------------------------------------------------- + /** ... */ void setStringsPerMethod( [in] sequence<string> Strings, [in] short n ); - //------------------------------------------------------------------------- + /** */ sequence< sequence< sequence< short > > > getMultiSequence(); - //------------------------------------------------------------------------- + /** ... */ void setMultiSequence( [in] sequence< sequence< sequence< short > > > Seq ); - //------------------------------------------------------------------------- + /**Add a PropertiesChangeListener */ void addPropertiesChangeListener( [in] sequence< string > PropertyNames, [in] com::sun::star::beans::XPropertiesChangeListener Listener ); - //------------------------------------------------------------------------- + /**Remove a PropertiesChangeListener */ void removePropertiesChangeListener( [in] com::sun::star::beans::XPropertiesChangeListener Listener ); }; -//============================================================================= + }; //}; }; }; }; diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 682afb56a927..77eafd98c723 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -49,7 +49,7 @@ typedef WeakImplHelper3< lang::XServiceInfo, XCurrentContext, reflection::XProxyFactory > t_impl; -//============================================================================== + class TargetObject : public t_impl { public: @@ -99,7 +99,7 @@ Any TargetObject::queryInterface( Type const & type ) int TargetObject::s_obj = 0; -//============================================================================== + class TestMaster : public WeakImplHelper1< lang::XServiceInfo > { Reference< XAggregation > m_xProxyTarget; diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index f6801406d68c..a1d1d923c025 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -115,9 +115,9 @@ Reference< XInterface > SAL_CALL Test_Manager_Impl_CreateInstance_Impl() } -//************************************************************************* + // Test_Manager_Impl_CreateInstance() -// + Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw (Exception) { @@ -127,9 +127,9 @@ Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance( } -//************************************************************************* + // Test_Manager_Impl::getImplementationName -// + OUString Test_Manager_Impl::getImplementationName() throw() { return OUString(IMPLEMENTATION_NAME); @@ -141,17 +141,17 @@ sal_Bool Test_Manager_Impl::supportsService( const OUString& ServiceName ) throw return cppu::supportsService(this, ServiceName); } -//************************************************************************* + // Test_Manager_Impl::getSupportedServiceNames -// + Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw () { return getSupportedServiceNames_Static(); } -//************************************************************************* + // Test_Manager_Impl::getSupportedServiceNames_Static -// + Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw () { Sequence< OUString > aSNS( 2 ); @@ -218,9 +218,9 @@ extern "C" void SAL_CALL test_ServiceManager() // try to get an instance for a unknown service OSL_VERIFY( !xSMgr->createInstance("bla.blup.Q").is() ); - // + // First test : register service via the internal function of the component itself - // + { Reference< XImplementationRegistration > xInst( xSMgr->createInstance("com.sun.star.registry.ImplementationRegistration"), UNO_QUERY ); @@ -260,7 +260,7 @@ extern "C" void SAL_CALL test_ServiceManager() extern "C" { -//================================================================================================== + sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { @@ -287,7 +287,7 @@ sal_Bool SAL_CALL component_writeInfo( } return sal_False; } -//================================================================================================== + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { |