summaryrefslogtreecommitdiff
path: root/include/uno
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 19:06:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-01 09:51:32 -0600
commit8792ec7b2129650777b7b4bfacaa7c13d923279b (patch)
treef181e37b61533b460397cc68625fd21f46bb6393 /include/uno
parentdff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff)
Remove visual noise from include
Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/uno')
-rw-r--r--include/uno/current_context.hxx4
-rw-r--r--include/uno/dispatcher.hxx18
-rw-r--r--include/uno/environment.hxx22
-rw-r--r--include/uno/mapping.hxx22
4 files changed, 33 insertions, 33 deletions
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index e75f41fb3fe6..6efc506ebd4a 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -95,7 +95,7 @@ public:
SAL_THROW(())
{ return m_xPreviousContext; }
};
-//__________________________________________________________________________________________________
+
inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext )
SAL_THROW(())
: m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME )
@@ -103,7 +103,7 @@ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewCont
::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 );
::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 );
}
-//__________________________________________________________________________________________________
+
inline ContextLayer::~ContextLayer()
SAL_THROW(())
{
diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx
index fb90a2348529..e457713fff4d 100644
--- a/include/uno/dispatcher.hxx
+++ b/include/uno/dispatcher.hxx
@@ -81,27 +81,27 @@ private:
inline bool operator != ( uno_Interface * ); // not impl
};
-//______________________________________________________________________________
+
inline UnoInterfaceReference::~UnoInterfaceReference()
{
if (m_pUnoI != 0)
(*m_pUnoI->release)( m_pUnoI );
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference::UnoInterfaceReference()
: m_pUnoI( 0 )
{
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference::UnoInterfaceReference(
uno_Interface * pUnoI, __sal_NoAcquire )
: m_pUnoI( pUnoI )
{
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI )
: m_pUnoI( pUnoI )
{
@@ -109,7 +109,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI )
(*m_pUnoI->acquire)( m_pUnoI );
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference::UnoInterfaceReference(
UnoInterfaceReference const & ref )
: m_pUnoI( ref.m_pUnoI )
@@ -118,7 +118,7 @@ inline UnoInterfaceReference::UnoInterfaceReference(
(*m_pUnoI->acquire)( m_pUnoI );
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference & UnoInterfaceReference::set(
uno_Interface * pUnoI )
{
@@ -130,7 +130,7 @@ inline UnoInterfaceReference & UnoInterfaceReference::set(
return *this;
}
-//______________________________________________________________________________
+
inline UnoInterfaceReference & UnoInterfaceReference::set(
uno_Interface * pUnoI, __sal_NoAcquire )
{
@@ -140,7 +140,7 @@ inline UnoInterfaceReference & UnoInterfaceReference::set(
return *this;
}
-//______________________________________________________________________________
+
inline void UnoInterfaceReference::clear()
{
if (m_pUnoI != 0)
@@ -150,7 +150,7 @@ inline void UnoInterfaceReference::clear()
}
}
-//______________________________________________________________________________
+
inline void UnoInterfaceReference::dispatch(
struct _typelib_TypeDescription const * pMemberType,
void * pReturn, void * pArgs [], uno_Any ** ppException ) const
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index 1eb5a2e46fb8..d4b9aefa5502 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -169,33 +169,33 @@ public:
*/
inline int SAL_CALL isValid(rtl::OUString * pReason) const SAL_THROW(());
};
-//__________________________________________________________________________________________________
+
inline Environment::Environment( uno_Environment * pEnv ) SAL_THROW(())
: _pEnv( pEnv )
{
if (_pEnv)
(*_pEnv->acquire)( _pEnv );
}
-//__________________________________________________________________________________________________
+
inline Environment::Environment( rtl::OUString const & rEnvDcp, void * pContext ) SAL_THROW(())
: _pEnv(NULL)
{
uno_getEnvironment(&_pEnv, rEnvDcp.pData, pContext);
}
-//__________________________________________________________________________________________________
+
inline Environment::Environment( const Environment & rEnv ) SAL_THROW(())
: _pEnv( rEnv._pEnv )
{
if (_pEnv)
(*_pEnv->acquire)( _pEnv );
}
-//__________________________________________________________________________________________________
+
inline Environment::~Environment() SAL_THROW(())
{
if (_pEnv)
(*_pEnv->release)( _pEnv );
}
-//__________________________________________________________________________________________________
+
inline void Environment::clear() SAL_THROW(())
{
if (_pEnv)
@@ -204,7 +204,7 @@ inline void Environment::clear() SAL_THROW(())
_pEnv = 0;
}
}
-//__________________________________________________________________________________________________
+
inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THROW(())
{
if (pEnv != _pEnv)
@@ -217,13 +217,13 @@ inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THRO
}
return *this;
}
-//__________________________________________________________________________________________________
+
inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW(())
{
if (_pEnv)
uno_Environment_invoke_v(_pEnv, pCallee, pParam);
}
-//__________________________________________________________________________________________________
+
inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW(())
{
if (_pEnv)
@@ -236,17 +236,17 @@ inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL
}
}
-//__________________________________________________________________________________________________
+
inline void SAL_CALL Environment::enter() const SAL_THROW(())
{
uno_Environment_enter(_pEnv);
}
-//__________________________________________________________________________________________________
+
inline int SAL_CALL Environment::isValid(rtl::OUString * pReason) const SAL_THROW(())
{
return uno_Environment_isValid(_pEnv, (rtl_uString **)pReason);
}
-//__________________________________________________________________________________________________
+
inline Environment Environment::getCurrent(rtl::OUString const & typeName) SAL_THROW(())
{
Environment environment;
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index c5621291cd18..dfc03ae1fdef 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -195,7 +195,7 @@ public:
*/
inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(());
};
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping(
const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose )
SAL_THROW(())
@@ -203,7 +203,7 @@ inline Mapping::Mapping(
{
uno_getMappingByName( &_pMapping, rFrom.pData, rTo.pData, rAddPurpose.pData );
}
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping(
uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose )
SAL_THROW(())
@@ -211,7 +211,7 @@ inline Mapping::Mapping(
{
uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData );
}
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping(
const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose )
SAL_THROW(())
@@ -219,27 +219,27 @@ inline Mapping::Mapping(
{
uno_getMapping( &_pMapping, rFrom.get(), rTo.get(), rAddPurpose.pData );
}
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(())
: _pMapping( pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(())
: _pMapping( rMapping._pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline Mapping::~Mapping() SAL_THROW(())
{
if (_pMapping)
(*_pMapping->release)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline void Mapping::clear() SAL_THROW(())
{
if (_pMapping)
@@ -248,7 +248,7 @@ inline void Mapping::clear() SAL_THROW(())
_pMapping = 0;
}
}
-//__________________________________________________________________________________________________
+
inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
{
if (pMapping)
@@ -258,7 +258,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
_pMapping = pMapping;
return *this;
}
-//__________________________________________________________________________________________________
+
inline void Mapping::mapInterface(
void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const
SAL_THROW(())
@@ -271,7 +271,7 @@ inline void Mapping::mapInterface(
TYPELIB_DANGER_RELEASE( pTD );
}
}
-//__________________________________________________________________________________________________
+
inline void * Mapping::mapInterface(
void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
SAL_THROW(())
@@ -280,7 +280,7 @@ inline void * Mapping::mapInterface(
(*_pMapping->mapInterface)( _pMapping, &pOut, pInterface, pTypeDescr );
return pOut;
}
-//__________________________________________________________________________________________________
+
inline void * Mapping::mapInterface(
void * pInterface, const ::com::sun::star::uno::Type & rType ) const
SAL_THROW(())