diff options
Diffstat (limited to 'forms/source/misc')
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 54 | ||||
-rw-r--r-- | forms/source/misc/componenttools.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/frm_module.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/frm_strings.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/ids.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/limitedformats.cxx | 26 | ||||
-rw-r--r-- | forms/source/misc/listenercontainers.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/property.cxx | 4 | ||||
-rw-r--r-- | forms/source/misc/services.cxx | 14 |
9 files changed, 54 insertions, 54 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 9235b085d14a..fd54c4c61395 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.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 @@ -106,7 +106,7 @@ Sequence< ScriptEventDescriptor > lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) { Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() ); - + const ScriptEventDescriptor* pDesc = sEvents.getConstArray(); const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() ); sal_Int32 nCopied = 0; @@ -139,7 +139,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn break; ::osl::MutexGuard aGuard( m_rMutex ); - bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) ); + bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) ); if ( hasVBABindings ) break; @@ -306,7 +306,7 @@ namespace _rSave.reserve( _nItemCount ); // copy the events - for (sal_Int32 i=0; i<_nItemCount; ++i) + for (sal_Int32 i=0; i<_nItemCount; ++i) _rSave.push_back(_rxManager->getScriptEvents( i )); } @@ -378,14 +378,14 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr void operator()( ScriptEventDescriptor& _rDescriptor ) { if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) ) - { // it's a starbasic macro + { // it's a starbasic macro sal_Int32 nPrefixLength = _rDescriptor.ScriptCode.indexOf( ':' ); if ( 0 <= nPrefixLength ) - { // the macro name does not already contain a : + { // the macro name does not already contain a : #ifdef DBG_UTIL const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength ); - DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" ) - || 0 == sPrefix.compareToAscii( "application" ), + DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" ) + || 0 == sPrefix.compareToAscii( "application" ), "TransformEventTo52Format: invalid (unknown) prefix!" ); #endif // cut the prefix @@ -401,9 +401,9 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr void operator()( ScriptEventDescriptor& _rDescriptor ) { if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) ) - { // it's a starbasic macro + { // it's a starbasic macro if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 ) - { // the macro name does not already contain a : + { // the macro name does not already contain a : // -> default the type to "document" ::rtl::OUString sNewScriptCode( RTL_CONSTASCII_USTRINGPARAM( "document:" ) ); sNewScriptCode += _rDescriptor.ScriptCode; @@ -434,8 +434,8 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat ) if ( aChildEvents.getLength() ) { // the "iterators" for the events for this child - ScriptEventDescriptor* pChildEvents = aChildEvents.getArray(); - ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength(); + ScriptEventDescriptor* pChildEvents = aChildEvents.getArray(); + ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength(); // do the transformation if ( efVersionSO6x == _eTargetFormat ) @@ -482,7 +482,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream OInterfaceArray::const_iterator aAttachEnd = m_aItems.end(); for ( sal_Int32 i=0; aAttach != aAttachEnd; ++aAttach, ++i ) { - Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY ); // important to normalize this .... + Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY ); // important to normalize this .... Reference< XPropertySet > xAsSet( xAsIFace, UNO_QUERY ); m_xEventAttacher->attach( i, xAsIFace, makeAny( xAsSet ) ); } @@ -601,11 +601,11 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& try { implInsert( - m_aItems.size(), // position - xElement, // element to insert - sal_False, // no event attacher manager handling - NULL, // not yet approved - let implInsert do it - sal_True // fire the event + m_aItems.size(), // position + xElement, // element to insert + sal_False, // no event attacher manager handling + NULL, // not yet approved - let implInsert do it + sal_True // fire the event ); } catch( const Exception& ) @@ -827,7 +827,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r _pElement->xPropertySet = _rxObject; _pElement->xChild = xChild; _pElement->aElementTypeInterface = aCorrectType; - _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface + _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface } } @@ -843,7 +843,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData; ElementDescription* pElementMetaData = _pApprovalResult; if ( !pElementMetaData ) - { // not yet approved by the caller -> do ourself + { // not yet approved by the caller -> do ourself pElementMetaData = createElementMetaData(); DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" ); @@ -895,19 +895,19 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper { Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY ); if ( xMgr.is() ) - { + { OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() ); sal_Int32 nLen = pIfcMgr->getCount(); for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i ) - { + { // add fake events to the control at index i pIfcMgr->impl_addVbEvents_nolck_nothrow( i ); - } + } } else { // add fake events to the control at index i - impl_addVbEvents_nolck_nothrow( _nIndex ); + impl_addVbEvents_nolck_nothrow( _nIndex ); } } @@ -1141,11 +1141,11 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c } catch( const IllegalArgumentException& ) { - throw; // allowed to leave + throw; // allowed to leave } catch( const ElementExistException& ) { - throw; // allowed to leave + throw; // allowed to leave } catch( const Exception& ) { @@ -1366,7 +1366,7 @@ InterfaceRef OFormComponents::getParent() throw( RuntimeException ) } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index abd4c96f5482..f1e3fb0586dc 100644 --- a/forms/source/misc/componenttools.cxx +++ b/forms/source/misc/componenttools.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/forms/source/misc/frm_module.cxx b/forms/source/misc/frm_module.cxx index e1f4fcaf8bc9..684112b50629 100644 --- a/forms/source/misc/frm_module.cxx +++ b/forms/source/misc/frm_module.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/forms/source/misc/frm_strings.cxx b/forms/source/misc/frm_strings.cxx index 62c4a1ee5b8d..f5650e832576 100644 --- a/forms/source/misc/frm_strings.cxx +++ b/forms/source/misc/frm_strings.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/forms/source/misc/ids.cxx b/forms/source/misc/ids.cxx index c9b0265bd533..ee0605790d4d 100644 --- a/forms/source/misc/ids.cxx +++ b/forms/source/misc/ids.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/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 8d2e13e0ea69..d63cb79cd96c 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.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 @@ -46,9 +46,9 @@ namespace frm using namespace ::com::sun::star::form; using namespace ::com::sun::star::beans; - sal_Int32 OLimitedFormats::s_nInstanceCount(0); - ::osl::Mutex OLimitedFormats::s_aMutex; - Reference< XNumberFormatsSupplier > OLimitedFormats::s_xStandardFormats; + sal_Int32 OLimitedFormats::s_nInstanceCount(0); + ::osl::Mutex OLimitedFormats::s_aMutex; + Reference< XNumberFormatsSupplier > OLimitedFormats::s_xStandardFormats; //===================================================================== //= @@ -89,8 +89,8 @@ namespace frm struct FormatEntry { const sal_Char* pDescription; - sal_Int32 nKey; - LocaleType eLocale; + sal_Int32 nKey; + LocaleType eLocale; }; //--------------------------------------------------------------------- @@ -267,7 +267,7 @@ namespace frm // seek to the nValue'th entry sal_Int32 nLookup = 0; - for ( ; + for ( ; (NULL != pFormats->pDescription) && (nLookup < nValue); ++pFormats, ++nLookup ) @@ -305,7 +305,7 @@ namespace frm // look for the entry with the given format key sal_Int32 nTablePosition = 0; - for ( ; + for ( ; (NULL != pFormats->pDescription) && (nNewFormat != pFormats->nKey); ++pFormats, ++nTablePosition ) @@ -323,7 +323,7 @@ namespace frm } if (!_rOldValue.hasValue()) - { // did not reach the end of the table (means we found nNewFormat) + { // did not reach the end of the table (means we found nNewFormat) // -> go to the end to ensure that _rOldValue is set while (pFormats->pDescription) { @@ -341,7 +341,7 @@ namespace frm OSL_ENSURE(_rOldValue.hasValue(), "OLimitedFormats::convertFormatKeyPropertyValue: did not find the old enum value in the table!"); if (!bFoundIt) - { // somebody gave us an format which we can't translate + { // somebody gave us an format which we can't translate ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats."); throw IllegalArgumentException(sMessage, NULL, 2); } @@ -358,7 +358,7 @@ namespace frm OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::setFormatKeyPropertyValue: not initialized!"); if (m_xAggregate.is()) - { // this is to be called after convertFormatKeyPropertyValue, where + { // this is to be called after convertFormatKeyPropertyValue, where // we translated the format key into a enum value. // So now we can simply forward this enum value to our aggreate m_xAggregate->setFastPropertyValue(m_nFormatEnumPropertyHandle, _rNewValue); @@ -370,7 +370,7 @@ namespace frm { ::osl::MutexGuard aGuard(s_aMutex); if ((1 == ++s_nInstanceCount) && _rxORB.is()) - { // create the standard formatter + { // create the standard formatter Sequence< Any > aInit(1); aInit[0] <<= getLocale(ltEnglishUS); @@ -398,7 +398,7 @@ namespace frm } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index 56297368ff74..641be686b161 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.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/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 0d97609f0eb7..4e95fa85ca17 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName) sal_Int32 nHandle = -1; if (aPair.first != aPair.second) - { // we found something _and_ we have an identity + { // we found something _and_ we have an identity nHandle = aPair.first->nHandle; } diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 2732b86bfc8f..a06f4bee89c9 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,17 +103,17 @@ DECLARE_SERVICE_INFO(ImageProducer) //--------------------------------------------------------------------------------------- -static Sequence< ::rtl::OUString > s_aClassImplementationNames; -static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames; -static Sequence<sal_Int64> s_aFactories; +static Sequence< ::rtl::OUString > s_aClassImplementationNames; +static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames; +static Sequence<sal_Int64> s_aFactories; // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so // it can't be used with sequences //--------------------------------------------------------------------------------------- void registerClassInfo( - ::rtl::OUString _rClassImplName, // the ImplName of the class - const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class - ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class + ::rtl::OUString _rClassImplName, // the ImplName of the class + const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class + ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class ) { sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength(); |