diff options
Diffstat (limited to 'comphelper/source/misc')
57 files changed, 307 insertions, 307 deletions
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index 8ec3158c6789..82d6eb351af5 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour if (!locked()) m_pListener->_disposing(_rSource); // disconnect the listener - if (m_pListener) // may have been reset whilest calling into _disposing + if (m_pListener) // may have been reset whilest calling into _disposing m_pListener->setAdapter(NULL); } diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 8b6ebde6cc1c..03991ddfc424 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ namespace comphelper { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); - return ( _rPoint.X >= 0 ) - && ( _rPoint.Y >= 0 ) - && ( _rPoint.X < aBounds.Width ) - && ( _rPoint.Y < aBounds.Height ); + return ( _rPoint.X >= 0 ) + && ( _rPoint.Y >= 0 ) + && ( _rPoint.X < aBounds.Width ) + && ( _rPoint.Y < aBounds.Height ); } //-------------------------------------------------------------------- @@ -216,7 +216,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index 5dcda7148275..40baf72e69a9 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,24 +53,24 @@ namespace comphelper class OContextHelper_Impl { private: - OAccessibleContextHelper* m_pAntiImpl; // the owning instance - IMutex* m_pExternalLock; // the optional additional external lock + OAccessibleContextHelper* m_pAntiImpl; // the owning instance + IMutex* m_pExternalLock; // the optional additional external lock - ::cppu::OInterfaceContainerHelper* m_pEventListeners; - WeakReference< XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext + ::cppu::OInterfaceContainerHelper* m_pEventListeners; + WeakReference< XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext - AccessibleEventNotifier::TClientId m_nClientId; + AccessibleEventNotifier::TClientId m_nClientId; public: - inline Reference< XAccessible > getCreator( ) const { return m_aCreator; } - inline void setCreator( const Reference< XAccessible >& _rAcc ); + inline Reference< XAccessible > getCreator( ) const { return m_aCreator; } + inline void setCreator( const Reference< XAccessible >& _rAcc ); - inline IMutex* getExternalLock( ) { return m_pExternalLock; } - inline void setExternalLock( IMutex* _pLock ) { m_pExternalLock = _pLock; } + inline IMutex* getExternalLock( ) { return m_pExternalLock; } + inline void setExternalLock( IMutex* _pLock ) { m_pExternalLock = _pLock; } - inline AccessibleEventNotifier::TClientId - getClientId() const { return m_nClientId; } - inline void setClientId( const AccessibleEventNotifier::TClientId _nId ) + inline AccessibleEventNotifier::TClientId + getClientId() const { return m_nClientId; } + inline void setClientId( const AccessibleEventNotifier::TClientId _nId ) { m_nClientId = _nId; } public: @@ -84,7 +84,7 @@ namespace comphelper }; //--------------------------------------------------------------------- - inline void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc ) + inline void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc ) { m_aCreator = _rAcc; } @@ -289,7 +289,7 @@ namespace comphelper try { - + Reference< XAccessibleContext > xParentContext( implGetParentContext() ); // iterate over parent's children and search for this object @@ -302,7 +302,7 @@ namespace comphelper // two ideas why this could be NULL: // * nobody called our late ctor (init), so we never had a creator at all -> bad // * the creator is already dead. In this case, we should have been disposed, and - // never survived the above OContextEntryGuard. + // never survived the above OContextEntryGuard. // in all other situations the creator should be non-NULL if ( xCreator.is() ) @@ -351,7 +351,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/accessibleeventbuffer.cxx b/comphelper/source/misc/accessibleeventbuffer.cxx index 4137f91853f7..de3a4a736c55 100644 --- a/comphelper/source/misc/accessibleeventbuffer.cxx +++ b/comphelper/source/misc/accessibleeventbuffer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index f03b1e78485a..1e8607e73ebf 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ using namespace ::comphelper; //= AccessibleEventNotifier //===================================================================== //--------------------------------------------------------------------- -namespace +namespace { - struct lclMutex + struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; - struct Clients - : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {}; + struct Clients + : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {}; } //......................................................................... @@ -66,7 +66,7 @@ namespace comphelper // Note that the following relies on the fact the elements in the map are traveled with // ascending keys (aka client ids) AccessibleEventNotifier::ClientMap &rClients = Clients::get(); - for ( ClientMap::const_iterator aLookup = rClients.begin(); + for ( ClientMap::const_iterator aLookup = rClients.begin(); aLookup != rClients.end(); ++aLookup ) @@ -75,7 +75,7 @@ namespace comphelper OSL_ENSURE( nCurrent > nBiggestUsedId, "AccessibleEventNotifier::generateId: map is expected to be sorted ascending!" ); if ( nCurrent - nBiggestUsedId > 1 ) - { // found a "gap" + { // found a "gap" nFreeId = nBiggestUsedId + 1; break; } @@ -255,7 +255,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index ee98678f0b70..07e1e11949cb 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace comphelper } // ----------------------------------------------------------------------------- - + OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper ) : cppu::WeakImplHelper1<XAccessibleKeyBinding>( rHelper ) , m_aKeyBindings( rHelper.m_aKeyBindings ) @@ -111,7 +111,7 @@ namespace comphelper // ----------------------------------------------------------------------------- //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index e6aeac52eac4..88d0c35159b7 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,7 +188,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index d344192e7b46..6edc3df43020 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ namespace comphelper rBoundary = xBreakIter->getWordBoundary( sText, nIndex, implGetLocale(), i18n::WordType::ANY_WORD, sal_True ); // it's a word, if the first character is an alpha-numeric character - Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification(); + Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification(); if ( xCharClass.is() ) { sal_Int32 nType = xCharClass->getCharacterType( sText, rBoundary.startPos, implGetLocale() ); @@ -193,7 +193,7 @@ namespace comphelper if ( implIsValidIndex( nIndex, sText.getLength() ) ) { Locale aLocale = implGetLocale(); - Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator(); + Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator(); if ( xBreakIter.is() ) { rBoundary.endPos = xBreakIter->endOfSentence( sText, nIndex, aLocale ); @@ -241,7 +241,7 @@ namespace comphelper sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) - { + { rBoundary.startPos = 0; rBoundary.endPos = nLength; } @@ -378,7 +378,7 @@ namespace comphelper } break; case AccessibleTextType::WORD: - { + { // get word at index sal_Bool bWord = implGetWordBoundary( aBoundary, nIndex ); if ( bWord && implIsValidBoundary( aBoundary, nLength ) ) @@ -609,7 +609,7 @@ namespace comphelper aResult.SegmentStart = aBoundary.startPos; aResult.SegmentEnd = aBoundary.endPos; } - } + } } break; case AccessibleTextType::WORD: @@ -699,37 +699,37 @@ namespace comphelper // ----------------------------------------------------------------------------- bool OCommonAccessibleText::implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const rtl::OUString& rOldString, + const rtl::OUString& rNewString, ::com::sun::star::uno::Any& rDeleted, ::com::sun::star::uno::Any& rInserted) // throw() { sal_uInt32 nLenOld = rOldString.getLength(); sal_uInt32 nLenNew = rNewString.getLength(); - + // equal if ((0 == nLenOld) && (0 == nLenNew)) return false; TextSegment aDeletedText; - TextSegment aInsertedText; - + TextSegment aInsertedText; + aDeletedText.SegmentStart = -1; - aDeletedText.SegmentEnd = -1; + aDeletedText.SegmentEnd = -1; aInsertedText.SegmentStart = -1; aInsertedText.SegmentEnd = -1; - - // insert only + + // insert only if ((0 == nLenOld) && (nLenNew > 0)) { aInsertedText.SegmentStart = 0; aInsertedText.SegmentEnd = nLenNew; aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart ); - rInserted <<= aInsertedText; + rInserted <<= aInsertedText; return true; } - + // delete only if ((nLenOld > 0) && (0 == nLenNew)) { @@ -737,28 +737,28 @@ namespace comphelper aDeletedText.SegmentEnd = nLenOld; aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); - rDeleted <<= aDeletedText; + rDeleted <<= aDeletedText; return true; } - + const sal_Unicode* pFirstDiffOld = rOldString.getStr(); - const sal_Unicode* pLastDiffOld = rOldString.getStr() + nLenOld; + const sal_Unicode* pLastDiffOld = rOldString.getStr() + nLenOld; const sal_Unicode* pFirstDiffNew = rNewString.getStr(); const sal_Unicode* pLastDiffNew = rNewString.getStr() + nLenNew; - + // find first difference - while ((*pFirstDiffOld == *pFirstDiffNew) && - (pFirstDiffOld < pLastDiffOld) && + while ((*pFirstDiffOld == *pFirstDiffNew) && + (pFirstDiffOld < pLastDiffOld) && (pFirstDiffNew < pLastDiffNew)) { pFirstDiffOld++; - pFirstDiffNew++; - } - + pFirstDiffNew++; + } + // equality test if ((0 == *pFirstDiffOld) && (0 == *pFirstDiffNew)) return false; - + // find last difference while ( ( pLastDiffOld > pFirstDiffOld) && ( pLastDiffNew > pFirstDiffNew) && @@ -767,27 +767,27 @@ namespace comphelper pLastDiffOld--; pLastDiffNew--; } - + if (pFirstDiffOld < pLastDiffOld) - { - aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr(); + { + aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr(); aDeletedText.SegmentEnd = pLastDiffOld - rOldString.getStr(); - aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); - + aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); + rDeleted <<= aDeletedText; } - + if (pFirstDiffNew < pLastDiffNew) { aInsertedText.SegmentStart = pFirstDiffNew - rNewString.getStr(); aInsertedText.SegmentEnd = pLastDiffNew - rNewString.getStr(); aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart ); - + rInserted <<= aInsertedText; } return true; } - + //============================================================================== // OAccessibleTextHelper //============================================================================== @@ -822,8 +822,8 @@ namespace comphelper sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacter( nIndex ); + + return OCommonAccessibleText::getCharacter( nIndex ); } // ----------------------------------------------------------------------------- @@ -831,8 +831,8 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacterCount(); + + return OCommonAccessibleText::getCharacterCount(); } // ----------------------------------------------------------------------------- @@ -840,8 +840,8 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectedText(); + + return OCommonAccessibleText::getSelectedText(); } // ----------------------------------------------------------------------------- @@ -849,7 +849,7 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getSelectionStart(); } @@ -858,8 +858,8 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectionEnd(); + + return OCommonAccessibleText::getSelectionEnd(); } // ----------------------------------------------------------------------------- @@ -867,7 +867,7 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getText(); } @@ -876,8 +876,8 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); + + return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } // ----------------------------------------------------------------------------- @@ -885,7 +885,7 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } @@ -894,7 +894,7 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } @@ -903,14 +903,14 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } // ----------------------------------------------------------------------------- //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 2220e15563b9..d89fb9080b73 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ #include <algorithm> -using namespace ::comphelper; -using namespace ::com::sun::star::accessibility; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; +using namespace ::comphelper; +using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; //............................................................................. namespace comphelper @@ -53,7 +53,7 @@ namespace comphelper : public ::std::unary_function< AccessibleMap::value_type, void > { private: - Reference< XEventListener > m_xListener; + Reference< XEventListener > m_xListener; public: RemoveEventListener( const Reference< XEventListener >& _rxListener ) @@ -113,7 +113,7 @@ namespace comphelper { AccessibleMap::iterator aRemovedPos = m_aChildrenMap.find( _rxKey ); if ( m_aChildrenMap.end() != aRemovedPos ) - { // it was cached + { // it was cached // remove ourself as event listener RemoveEventListener aOperator( this ); aOperator( *aRemovedPos ); @@ -134,7 +134,7 @@ namespace comphelper //------------------------------------------------------------------------- Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor( - const Reference< XAccessible >& _rxKey, sal_Bool _bCreate ) + const Reference< XAccessible >& _rxKey, sal_Bool _bCreate ) { Reference< XAccessible > xValue; @@ -151,7 +151,7 @@ namespace comphelper xValue = aPos->second; } else if ( _bCreate ) - { // not found in the cache, and allowed to create + { // not found in the cache, and allowed to create // -> new wrapper xValue = new OAccessibleWrapper( m_xORB, _rxKey, (Reference< XAccessible >)m_aOwningAccessible ); @@ -259,7 +259,7 @@ namespace comphelper void OWrappedAccessibleChildrenManager::handleChildNotification( const AccessibleEventObject& _rEvent ) { if ( AccessibleEventId::INVALIDATE_ALL_CHILDREN == _rEvent.EventId ) - { // clear our child map + { // clear our child map invalidateAll( ); } else if ( AccessibleEventId::CHILD == _rEvent.EventId ) @@ -326,7 +326,7 @@ namespace comphelper { if ( !m_rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } } @@ -680,7 +680,7 @@ namespace comphelper } //............................................................................. -} // namespace accessibility +} // namespace accessibility //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 65dfd98364c9..45b9edaf9ed5 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace comphelper { //......................................................................... -#define BITFIELDSIZE ( sizeof( sal_Int64 ) * 8 ) +#define BITFIELDSIZE ( sizeof( sal_Int64 ) * 8 ) // maximum number of bits we have in a sal_Int64 using ::com::sun::star::uno::Reference; @@ -57,17 +57,17 @@ namespace comphelper //===================================================================== struct OAccImpl_Impl { - Reference< XAccessible > m_xAccParent; - sal_Int64 m_nForeignControlledStates; + Reference< XAccessible > m_xAccParent; + sal_Int64 m_nForeignControlledStates; }; - + //===================================================================== //= OAccessibleImplementationAccess //===================================================================== //--------------------------------------------------------------------- OAccessibleImplementationAccess::OAccessibleImplementationAccess( ) - :m_pImpl( new OAccImpl_Impl ) + :m_pImpl( new OAccImpl_Impl ) { } @@ -111,7 +111,7 @@ namespace comphelper //--------------------------------------------------------------------- sal_Bool OAccessibleImplementationAccess::setForeignControlledState( const Reference< XAccessibleContext >& _rxComponent, const sal_Int16 _nState, - const sal_Bool _bSet ) + const sal_Bool _bSet ) { OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent ); @@ -143,8 +143,8 @@ namespace comphelper { sal_Int64 nReturn( 0 ); - if ( ( _rIdentifier.getLength() == 16 ) - && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) + if ( ( _rIdentifier.getLength() == 16 ) + && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) ) nReturn = reinterpret_cast< sal_Int64 >( this ); @@ -184,7 +184,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index bdb6d44d6e1f..306891b74cd9 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void appendValue( rtl::OUStringBuffer & buf, buf.append( rtl::OUString::unacquired( &typeRef->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(") ") ); } - + switch (typeRef->eTypeClass) { case typelib_TypeClass_INTERFACE: { buf.append( static_cast<sal_Unicode>('@') ); @@ -114,7 +114,7 @@ void appendValue( rtl::OUStringBuffer & buf, reinterpret_cast< typelib_CompoundTypeDescription * >( typeDescr ); sal_Int32 nDescr = compType->nMembers; - + if (compType->pBaseTypeDescription) { appendValue( buf, val, reinterpret_cast< @@ -123,12 +123,12 @@ void appendValue( rtl::OUStringBuffer & buf, if (nDescr > 0) buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") ); } - + typelib_TypeDescriptionReference ** ppTypeRefs = compType->ppTypeRefs; sal_Int32 * memberOffsets = compType->pMemberOffsets; rtl_uString ** ppMemberNames = compType->ppMemberNames; - + for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos ) { buf.append( ppMemberNames[ nPos ] ); @@ -176,7 +176,7 @@ void appendValue( rtl::OUStringBuffer & buf, uno_Sequence * seq = *static_cast< uno_Sequence * const * >(val); sal_Int32 nElements = seq->nElements; - + if (nElements > 0) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") ); diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 5697eb62b6b5..f68fda46b9b3 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx index 8b9ee4221dfc..2ac0fc7e262b 100644 --- a/comphelper/source/misc/comphelper_module.cxx +++ b/comphelper/source/misc/comphelper_module.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index b9cc41fe5b09..74c29f7bd4e6 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx index d6aa3c5fd50c..0ec5cc0ca93e 100644 --- a/comphelper/source/misc/componentbase.cxx +++ b/comphelper/source/misc/componentbase.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index 072cafbcee4c..3334ee1aafc1 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index f3239dd59846..9caf52966980 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 1016c88b341c..7ce1bba11dc9 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index ccc680729482..9a0c8a0e498a 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -2,7 +2,7 @@ /*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace comphelper { static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) { uno::Sequence< sal_Int8 > aResult; - + if ( aPassword.getLength() && aSalt.getLength() && nCount && nHashLength ) { ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); @@ -91,7 +91,7 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo TimeValue aTime; osl_getSystemTime( &aTime ); rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); rtl_random_getBytes ( aRandomPool, aSalt.getArray(), 16 ); @@ -157,9 +157,9 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( const ::rtl::OUString& aUString ) { - static sal_uInt16 pInitialCode[] = { + static sal_uInt16 pInitialCode[] = { 0xE1F0, // 1 - 0x1D0F, // 2 + 0x1D0F, // 2 0xCC9C, // 3 0x84C0, // 4 0x110C, // 5 @@ -243,7 +243,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetWordHashAsSequence( return aResult; } - + // ============================================================================ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( const ::rtl::OUString& aUString, @@ -281,7 +281,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( return aResult; } - + // ============================================================================ /*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword( diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index a4381a3d89c7..49e941601123 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,7 +142,7 @@ DocPasswordRequest::~DocPasswordRequest() static_cast< XWeak* > ( this ), // my own interfaces static_cast< XInteractionRequest* > ( this ) ); -} +} void SAL_CALL DocPasswordRequest::acquire( ) throw () { @@ -152,7 +152,7 @@ void SAL_CALL DocPasswordRequest::acquire( ) throw () void SAL_CALL DocPasswordRequest::release( ) throw () { OWeakObject::release(); -} +} sal_Bool DocPasswordRequest::isAbort() const { diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index c1884ba513c2..256c50f93f91 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ namespace comphelper { // 5. // <-- #i88104# (05-16-08) TKR: use the new XTitle Interface to get the Title --> - + Reference< XTitle > xTitle( _rxDocument, UNO_QUERY ); if ( xTitle.is() ) { diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index fdc17013a6d9..c4b77338e798 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 90acd7f9152b..a01a37de2eae 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index 3d10c0d76ad8..2459d9160303 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx index 1101a473e716..4fe780630718 100644 --- a/comphelper/source/misc/evtmethodhelper.cxx +++ b/comphelper/source/misc/evtmethodhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ namespace comphelper { typelib_InterfaceTypeDescription *pType=0; type.getDescription( (typelib_TypeDescription**)&pType); - + if(!pType) return Sequence< ::rtl::OUString>(); - + Sequence< ::rtl::OUString> aNames(pType->nMembers); ::rtl::OUString* pNames = aNames.getArray(); for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames) diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index 7d9ef608a1ae..5ee98ca4c1ba 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index c71f84b62309..d45671a9e151 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg if ( m_bDisposed ) throw lang::DisposedException(); // TODO - + if ( !m_refCount ) throw uno::RuntimeException(); // the object must be refcounted already! @@ -167,7 +167,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg !( aArguments[1] >>= nModes ) || ( !( nModes & embed::Actions::PREVENT_CLOSE ) && - !( nModes & embed::Actions::PREVENT_TERMINATION ) + !( nModes & embed::Actions::PREVENT_TERMINATION ) ) ) { @@ -183,7 +183,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("If the third argument is provided, it must be XActionsApproval implementation!" ) ), uno::Reference< uno::XInterface >(), 0 ); - + m_pLockListener = new OLockListener( uno::Reference< lang::XComponent > ( static_cast< lang::XComponent* >( this ) ), xInstance, nModes, @@ -309,7 +309,7 @@ void OLockListener::Dispose() catch( uno::Exception& ) {} } - + m_xInstance = uno::Reference< uno::XInterface >(); m_bDisposed = sal_True; } diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 809aced6e3c1..e271bc2c94ba 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: OLockListener* m_pLockListener; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners - + sal_Bool m_bDisposed; sal_Bool m_bInitialized; @@ -73,7 +73,7 @@ public: static ::rtl::OUString SAL_CALL getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( + Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XComponent @@ -107,7 +107,7 @@ class OLockListener : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XC sal_Int32 m_nMode; public: - OLockListener( const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper, + OLockListener( const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInstance, sal_Int32 nMode, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval > xApproval ); diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 7a69ac4d5cbb..caae6cda0bc3 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace comphelper { m_sPassword = _Password;; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) { @@ -94,7 +94,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/legacysingletonfactory.cxx b/comphelper/source/misc/legacysingletonfactory.cxx index d469d2512c4f..53b76c7d2f52 100644 --- a/comphelper/source/misc/legacysingletonfactory.cxx +++ b/comphelper/source/misc/legacysingletonfactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ namespace comphelper { return m_sImplementationName; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL LegacySingletonFactory::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) { @@ -137,7 +137,7 @@ namespace comphelper const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, _rServiceName ) != pEnd; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL LegacySingletonFactory::getSupportedServiceNames( ) throw (RuntimeException) { @@ -165,7 +165,7 @@ namespace comphelper return m_xTheInstance; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL LegacySingletonFactory::createInstanceWithArgumentsAndContext( const Sequence< Any >& _rArguments, const Reference< XComponentContext >& _rxContext ) throw (Exception, RuntimeException) { diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx index 0f7823a197c7..23bf563993b2 100644 --- a/comphelper/source/misc/listenernotification.cxx +++ b/comphelper/source/misc/listenernotification.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace comphelper if ( _rxListener.is() ) m_aListeners.addInterface( _rxListener ); } - + //-------------------------------------------------------------------- void OListenerContainer::impl_removeListener( const Reference< XEventListener >& _rxListener ) { diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx index d6fa3873110d..e08f5aa57f8e 100644 --- a/comphelper/source/misc/locale.cxx +++ b/comphelper/source/misc/locale.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ const Locale Locale::X_DEFAULT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -59,7 +59,7 @@ const Locale Locale::EN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -68,7 +68,7 @@ const Locale Locale::EN_US() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -77,7 +77,7 @@ const Locale Locale::DE_DE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -86,7 +86,7 @@ const Locale Locale::DE_CH() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CH"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -95,7 +95,7 @@ const Locale Locale::DE_AT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AT"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -104,7 +104,7 @@ const Locale Locale::AR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ar")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -113,7 +113,7 @@ const Locale Locale::CA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -122,7 +122,7 @@ const Locale Locale::CS() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cs")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -131,7 +131,7 @@ const Locale Locale::DA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("da")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -140,7 +140,7 @@ const Locale Locale::EL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("el")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -149,7 +149,7 @@ const Locale Locale::ES() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("es")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -158,7 +158,7 @@ const Locale Locale::FI() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fi")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -167,7 +167,7 @@ const Locale Locale::FR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fr")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -176,7 +176,7 @@ const Locale Locale::HE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -185,7 +185,7 @@ const Locale Locale::HI_IN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -194,7 +194,7 @@ const Locale Locale::HU() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hu")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -203,7 +203,7 @@ const Locale Locale::IT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("it")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -212,7 +212,7 @@ const Locale Locale::JA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -221,7 +221,7 @@ const Locale Locale::KO() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ko")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -230,7 +230,7 @@ const Locale Locale::NL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -239,7 +239,7 @@ const Locale Locale::PL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -248,7 +248,7 @@ const Locale Locale::PT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -257,7 +257,7 @@ const Locale Locale::PT_BR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BR"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -266,7 +266,7 @@ const Locale Locale::RU() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ru")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -275,7 +275,7 @@ const Locale Locale::SK() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sk")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -284,7 +284,7 @@ const Locale Locale::SL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -293,7 +293,7 @@ const Locale Locale::SV() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sv")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -302,7 +302,7 @@ const Locale Locale::TH() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -311,7 +311,7 @@ const Locale Locale::TR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tr")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -320,7 +320,7 @@ const Locale Locale::X_COMMENT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("comment"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -329,7 +329,7 @@ const Locale Locale::X_TRANSLATE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("translate"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -338,7 +338,7 @@ const Locale Locale::X_NOTRANSLATE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notranslate"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -347,7 +347,7 @@ const Locale Locale::ZH_CN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CN"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -356,7 +356,7 @@ const Locale Locale::ZH_TW() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TW"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -390,7 +390,7 @@ Locale::Locale(const Locale& aCopy) { (*this) = aCopy; // recycle assign operator } - + //----------------------------------------------- ::rtl::OUString Locale::getLanguage() const { @@ -439,13 +439,13 @@ void Locale::fromISO(const ::rtl::OUString& sISO) m_sLanguage = ::rtl::OUString(); m_sCountry = ::rtl::OUString(); m_sVariant = ::rtl::OUString(); - + ::rtl::OUString sParser(sISO); sParser.trim(); sal_Int32 nStart = 0; sal_Int32 nEnd = 0; - + // extract language part nEnd = sParser.indexOf(SEPERATOR_LC, nStart); if (nEnd<0) @@ -455,7 +455,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) } setLanguage(sParser.copy(nStart, nEnd-nStart)); nStart = nEnd+1; - + // extract country nEnd = sParser.indexOf(SEPERATOR_CV, nStart); if (nEnd<0) @@ -466,7 +466,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) return; } nStart = nEnd+1; - + // extract variant setVariant(sParser.copy(nStart, sParser.getLength()-nStart)); } @@ -475,7 +475,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) ::rtl::OUString Locale::toISO() const { ::rtl::OUStringBuffer sISO(64); - + sISO.append(m_sLanguage); if (m_sCountry.getLength()) { @@ -488,7 +488,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) sISO.append(m_sVariant); } } - + return sISO.makeStringAndClear(); } @@ -514,21 +514,21 @@ sal_Bool Locale::similar(const Locale& aComparable) const throw(Locale::MalFormedLocaleException) { Locale aReference(sReferenceISO); - + // Note: The same language or "en"/"en-US" should be preferred as fallback. // On the other side some localized variables doesnt use localzation in real. // May be the use a "fix" value only ... marked as X-DEFAULT or X-NOTRANSLATE. // At least it can be discussed, if any language is a valid fallback ... // But in case some office functionality depends on that (that means real functionality instead // of pure UI descriptions) we should do anything, so it can work. - + ::std::vector< ::rtl::OUString >::const_iterator pSimilar = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pEN_US = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pEN = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pXDefault = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pXNoTranslate = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pAny = lISOList.end(); - + ::std::vector< ::rtl::OUString >::const_iterator pIt; for ( pIt = lISOList.begin(); pIt != lISOList.end() ; @@ -538,7 +538,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const // found Locale, which match with 100% => return it if (aCheck.equals(aReference)) return pIt; - + // found similar Locale => safe it as possible fallback if ( (pSimilar == lISOList.end()) && @@ -592,22 +592,22 @@ sal_Bool Locale::similar(const Locale& aComparable) const if (pSimilar != lISOList.end()) return pSimilar; - + if (pEN_US != lISOList.end()) return pEN_US; - + if (pEN != lISOList.end()) return pEN; if (pXDefault != lISOList.end()) return pXDefault; - + if (pXNoTranslate != lISOList.end()) return pXNoTranslate; - + if (pAny != lISOList.end()) return pAny; - + return lISOList.end(); } @@ -645,7 +645,7 @@ sal_Bool Locale::getFallback(Locale& aLocale) aLocale.setCountry(::rtl::OUString()); return sal_True; } - + // e) "en-US" possible? if (!aLocale.equals(EN_US())) { @@ -653,9 +653,9 @@ sal_Bool Locale::getFallback(Locale& aLocale) return sal_True; } - // f) no more fallbacks + // f) no more fallbacks return sal_False; -} +} //----------------------------------------------- void Locale::operator=(const Locale& rCopy) @@ -667,7 +667,7 @@ void Locale::operator=(const Locale& rCopy) m_sCountry = rCopy.m_sCountry; m_sVariant = rCopy.m_sVariant; } - + //----------------------------------------------- sal_Bool Locale::operator==(const Locale& aComparable) const { diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 48b99a6ff94d..f9467998c48c 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 83f54ff027ea..d7bc4deb961e 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -603,7 +603,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) { ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("Invalid MediaDescriptor detected:\n"); - sMsg.append (ex.Message ); + sMsg.append (ex.Message ); OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } #else diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index a61e8a36a27c..2f3f5e445a74 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -750,7 +750,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( } catch( uno::Exception& ) {} - + return aResult; } //------------------------------------------------------------------------- @@ -790,7 +790,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3 return aResult; } -uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) +uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) { uno::Sequence<sal_Int8> aClassId; uno::Reference< container::XNameAccess > xObjectNames = GetConfigurationByPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Embedding/ObjectNames"))); diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 74a37e278185..2031a338cb4e 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -313,7 +313,7 @@ namespace comphelper NamedValue operator()( const NamedValueRepository::value_type& _rValue ) { return NamedValue( _rValue.first, _rValue.second ); - } + } }; } diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index a011964b91fa..47525f5d0c19 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ namespace comphelper { //......................................................................... -namespace starbeans = ::com::sun::star::beans; -namespace starlang = ::com::sun::star::lang; +namespace starbeans = ::com::sun::star::beans; +namespace starlang = ::com::sun::star::lang; //------------------------------------------------------------------------------ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey) @@ -146,7 +146,7 @@ Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 942a8e618261..0703f8e46d7c 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 6c1f38b15ff9..774918ca992e 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,7 +145,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) xFactory->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), m_xContext ), uno::UNO_QUERY_THROW ); - + // Turn Quickstarter veto off uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW ); ::rtl::OUString aVetoPropName( RTL_CONSTASCII_USTRINGPARAM( "SuspendQuickstartVeto" ) ); diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index c0aabf65d531..1fe44d681c59 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index b24aa4407356..19307d794ff6 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,10 +163,10 @@ namespace comphelper // // if ( !m_rBHelper.bDisposed ) // { - // acquire(); // to prevent duplicate dtor calls + // acquire(); // to prevent duplicate dtor calls // dispose(); // } - + m_xInner.clear(); } @@ -174,9 +174,9 @@ namespace comphelper void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException) { if ( _rSource.Source == m_xInner ) - { // it's our inner context which is dying -> dispose ourself + { // it's our inner context which is dying -> dispose ourself if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose ) - { // (if necessary only, of course) + { // (if necessary only, of course) dispose(); } } @@ -243,7 +243,7 @@ namespace comphelper { if ( !rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } } @@ -272,7 +272,7 @@ namespace comphelper //............................................................................. -} // namespace comphelper +} // namespace comphelper //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx index 61cfb6c173f2..348d038383c2 100644 --- a/comphelper/source/misc/querydeep.cxx +++ b/comphelper/source/misc/querydeep.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ sal_Bool comphelper::isDerivedFrom( // now ask in cppu (aka typelib) ::typelib_TypeDescription *pBaseTD = 0, *pTD = 0; - rBaseType. getDescription(&pBaseTD); - rType. getDescription(&pTD); + rBaseType. getDescription(&pBaseTD); + rType. getDescription(&pTD); // interfaces are assignable to a base bRet = ::typelib_typedescription_isAssignableFrom(pBaseTD, pTD); diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx index 898d1224b091..7fa3548cf744 100644 --- a/comphelper/source/misc/regpathhelper.cxx +++ b/comphelper/source/misc/regpathhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,18 +41,18 @@ using namespace osl; using namespace rtl; -#define PATH_DELEMITTER '/' +#define PATH_DELEMITTER '/' -#define USER_REGISTRY_NAME_ENV "STAR_USER_REGISTRY" -#define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY" -#define REGISTRY_SYSTEM_NAME "services.rdb" +#define USER_REGISTRY_NAME_ENV "STAR_USER_REGISTRY" +#define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY" +#define REGISTRY_SYSTEM_NAME "services.rdb" -#define REGISTRY_LOCAL_NAME "user60.rdb" +#define REGISTRY_LOCAL_NAME "user60.rdb" #ifdef SAL_UNX -#define CONFIG_PATH_PREFIX "." +#define CONFIG_PATH_PREFIX "." #else -#define CONFIG_PATH_PREFIX "" +#define CONFIG_PATH_PREFIX "" #endif namespace comphelper @@ -103,7 +103,7 @@ static OUString getDefaultLocalRegistry() OUString portalUserDir; sal_Bool bIsPortalUser = retrievePortalUserDir( &portalUserDir ); - + if ( bIsPortalUser ) { if( portalUserDir.getLength() ) @@ -112,7 +112,7 @@ static OUString getDefaultLocalRegistry() userRegistryName = portalUserDir; userRegistryName += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/" REGISTRY_LOCAL_NAME ) ); - + // Directory creation is probably necessary for bootstrapping a new // user in the portal environment (the ucb uses this function). // This should be solved differently, as @@ -120,7 +120,7 @@ static OUString getDefaultLocalRegistry() OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/")); OUString sPath(RTL_CONSTASCII_USTRINGPARAM("file://")); FileBase::RC retRC = FileBase::E_None; - + sal_Int32 nIndex = 3; sPath += userRegistryName.getToken(2, '/', nIndex); while( nIndex != -1 ) @@ -155,8 +155,8 @@ static OUString getDefaultLocalRegistry() OUString getPathToUserRegistry() { - OUString userRegistryName; - FILE *f=NULL; + OUString userRegistryName; + FILE *f=NULL; // search the environment STAR_USER_REGISTRY OString sBuffer( getenv(USER_REGISTRY_NAME_ENV) ); @@ -184,12 +184,12 @@ OUString getPathToSystemRegistry() OUString uBuffer; OUString registryBaseName( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_SYSTEM_NAME) ); OUString systemRegistryName; - FILE *f=NULL; + FILE *f=NULL; // search in the directory of the executable if(osl_Process_E_None == osl_getExecutableFile(&uBuffer.pData)) { - sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); + sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); if (lastIndex > 0) { uBuffer = uBuffer.copy(0, lastIndex + 1); diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 63ec42befb02..c194e98e5e8d 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx index 622cfff4989d..bc264bf87569 100644 --- a/comphelper/source/misc/sequence.cxx +++ b/comphelper/source/misc/sequence.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,13 +93,13 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString // ----------------------------------------------------------------------------- sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList) { - const ::rtl::OUString * pIter = _aList.getConstArray(); - const ::rtl::OUString * pEnd = pIter + _aList.getLength(); + const ::rtl::OUString * pIter = _aList.getConstArray(); + const ::rtl::OUString * pEnd = pIter + _aList.getLength(); return ::std::find(pIter,pEnd,Value) != pEnd; } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index c1b9cd9463b4..ea583797ee2a 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS { sal_Int32 c = lSource.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { css::beans::PropertyValue lP; @@ -137,10 +137,10 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."), css::uno::Reference< css::uno::XInterface >()); - (*this)[lP.Name] = lP.Value; + (*this)[lP.Name] = lP.Value; continue; } - + css::beans::NamedValue lN; if (lSource[i] >>= lN) { @@ -151,12 +151,12 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."), css::uno::Reference< css::uno::XInterface >()); - (*this)[lN.Name] = lN.Value; + (*this)[lN.Name] = lN.Value; continue; } // ignore VOID Any ... but reject wrong filled ones! - if (lSource[i].hasValue()) + if (lSource[i].hasValue()) throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("Any contains wrong type."), css::uno::Reference< css::uno::XInterface >()); @@ -272,7 +272,7 @@ const css::uno::Sequence< css::uno::Any > SequenceAsHashMap::getAsConstAnyList(: aProp.Value = pThis->second; pDestination[i] = css::uno::makeAny(aProp); } - + ++i; } @@ -312,10 +312,10 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const const ::rtl::OUString& sCheckName = pCheck->first; const css::uno::Any& aCheckValue = pCheck->second; const_iterator pFound = find(sCheckName); - + if (pFound == end()) return sal_False; - + const css::uno::Any& aFoundValue = pFound->second; if (aFoundValue != aCheckValue) return sal_False; @@ -336,7 +336,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate) { const ::rtl::OUString& sName = pUpdate->first; const css::uno::Any& aValue = pUpdate->second; - + (*this)[sName] = aValue; } } diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 92e3b3ef7e44..85bb01e7d15c 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class ServiceDecl::Factory : public: explicit Factory( ServiceDecl const& rServiceDecl ) : m_rServiceDecl(rServiceDecl) {} - + // XServiceInfo: virtual rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); @@ -68,7 +68,7 @@ public: uno::Sequence<uno::Any> const& args, uno::Reference<uno::XComponentContext> const& xContext ) throw (uno::Exception); - + private: virtual ~Factory(); @@ -128,7 +128,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const try { uno::Reference<registry::XRegistryKey> const xNewKey( xKey->createKey( buf.makeStringAndClear() ) ); - + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { @@ -138,7 +138,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + bRet = true; } catch (registry::InvalidRegistryException const&) { @@ -161,8 +161,8 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const { std::vector<rtl::OUString> vec; - - rtl::OString const str(m_pServiceNames); + + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); @@ -170,7 +170,7 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + return comphelper::containerToSequence(vec); } diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 1124146b39f6..90f62ba8deab 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx index 346fead794fe..ab7d68be12d3 100644 --- a/comphelper/source/misc/sharedmutex.cxx +++ b/comphelper/source/misc/sharedmutex.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index f51353e47897..4ae3422fe869 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0)); aInterceptedRequest.MatchExact = sal_False; lInterceptions.push_back(aInterceptedRequest); - + setInterceptedHandler(xHandler); setInterceptions(lInterceptions); } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 1503e08bf6b0..98258b8f615e 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 61e0eff9e0d7..41b0dde2a582 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx index ad7c83c8bb15..ca6362a6754b 100644 --- a/comphelper/source/misc/synchronousdispatch.cxx +++ b/comphelper/source/misc/synchronousdispatch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > SynchronousDispatch::dispatch( } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 713e03caf23e..9be20ac52296 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ float getFloat(const Any& _rAny) } //------------------------------------------------------------------------------ -::rtl::OUString getString(const Any& _rAny) +::rtl::OUString getString(const Any& _rAny) { ::rtl::OUString nReturn; OSL_VERIFY( _rAny >>= nReturn ); @@ -142,7 +142,7 @@ sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException) } //------------------------------------------------------------------------------ -FontDescriptor getDefaultFont() +FontDescriptor getDefaultFont() { FontDescriptor aReturn; aReturn.Slant = FontSlant_DONTKNOW; @@ -203,8 +203,8 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) reinterpret_cast<const Any*>(pData)->getValue(), _rValue); } - else if ( (_rType.getTypeClass() == TypeClass_VOID) - || (_rValue.getValueType().getTypeClass() == TypeClass_VOID) + else if ( (_rType.getTypeClass() == TypeClass_VOID) + || (_rValue.getValueType().getTypeClass() == TypeClass_VOID) ) { bRes = _rType.getTypeClass() == _rValue.getValueType().getTypeClass(); @@ -431,7 +431,7 @@ sal_Bool compare(const Any& rLeft, const Any& rRight) } //------------------------------------------------------------------------- -sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) +sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) { return ( _rLeft.Name.equals( _rRight.Name ) ) && ( _rLeft.Height == _rRight.Height ) && @@ -454,14 +454,14 @@ sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRi //------------------------------------------------------------------------- Type getSequenceElementType(const Type& _rSequenceType) { - OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE, + OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE, "getSequenceElementType: must be called with a sequence type!"); if (!(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE)) return Type(); TypeDescription aTD(_rSequenceType); - typelib_IndirectTypeDescription* pSequenceTD = + typelib_IndirectTypeDescription* pSequenceTD = reinterpret_cast< typelib_IndirectTypeDescription* >(aTD.get()); OSL_ASSERT(pSequenceTD); @@ -473,7 +473,7 @@ Type getSequenceElementType(const Type& _rSequenceType) return Type(); } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx index 1ddf413fc009..6c5a147bb0fb 100644 --- a/comphelper/source/misc/uieventslogger.cxx +++ b/comphelper/source/misc/uieventslogger.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -528,7 +528,7 @@ namespace comphelper { Reference<XMultiServiceFactory> sm = getProcessServiceFactory(); - // getting the Core Uno proxy object + // getting the Core Uno proxy object // It will call disposing and make sure we clear all our references { Reference<XTerminateListener> xCore( @@ -587,7 +587,7 @@ namespace comphelper m_Active = false; } - // private static UiEventsLogger_Impl + // private static UiEventsLogger_Impl bool UiEventsLogger_Impl::shouldActivate() { return getEnabledFromCfg() && getEnabledFromCoreController(); diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index 247554495815..51a7ef3be0c0 100644 --- a/comphelper/source/misc/weak.cxx +++ b/comphelper/source/misc/weak.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ OWeakTypeObject::~OWeakTypeObject() { } -Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException) +Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException) { if( rType == XTypeProvider::static_type() ) return Any( Reference< XTypeProvider >(this) ); @@ -53,12 +53,12 @@ Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (Runti return ::cppu::OWeakObject::queryInterface( rType ); } -void SAL_CALL OWeakTypeObject::acquire() throw () +void SAL_CALL OWeakTypeObject::acquire() throw () { ::cppu::OWeakObject::acquire(); } -void SAL_CALL OWeakTypeObject::release() throw () +void SAL_CALL OWeakTypeObject::release() throw () { ::cppu::OWeakObject::release(); } diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx index 333727e47a45..a02edf3d8881 100644 --- a/comphelper/source/misc/weakeventlistener.cxx +++ b/comphelper/source/misc/weakeventlistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... |