ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

com::sun::star-css in cppu,cppuhelper

Browse Source 
Change-Id: I84a412f587fd66f6c0610f083e61cf0fa079d4d9
Reviewed-on: https://gerrit.libreoffice.org/17384
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-07-29 06:44:57 +00:00
committed by Noel Grandin
parent 62e2fae93e
commit 171990764e
15 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppu/qa/cppumaker/test_cppumaker.cxx
+8 -8
View File
@@ -369,7 +369,7 @@ namespace com { namespace sun { namespace star { namespace uno {
std::ostream & operator <<(
std::ostream & out,
SAL_UNUSED_PARAMETER com::sun::star::uno::Exception const &)
SAL_UNUSED_PARAMETER css::uno::Exception const &)
{
return out << "<UNO exception>";
}
@@ -442,7 +442,7 @@ void Test::testBigStruct() {
CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
+guard.p->m13.getTypeClass(), +com::sun::star::uno::TypeClass_VOID);
+guard.p->m13.getTypeClass(), +css::uno::TypeClass_VOID);
CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
@@ -470,7 +470,7 @@ void Test::testBigStruct() {
#endif
#endif
com::sun::star::uno::Type t(
css::uno::Type t(
cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
typelib_TypeDescription * td = NULL;
t.getDescription(&td);
@@ -488,11 +488,11 @@ void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
rtl::OUString(
"test.codemaker.cppumaker.Struct<char,short>"),
(com::sun::star::uno::makeAny(
(css::uno::makeAny(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
aEmptySequence;
CPPUNIT_ASSERT_EQUAL(
@@ -502,12 +502,12 @@ void Test::testPolyStruct() {
}
void Test::testExceptions() {
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
rtl::OUString("abc"), 0, 1,
com::sun::star::uno::makeAny(123.0),
css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException1 e12(e11);
@@ -517,7 +517,7 @@ void Test::testExceptions() {
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
rtl::OUString("abc"), 0, 1,
com::sun::star::uno::makeAny(123.0),
css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException2 e22(e21);
cppu/source/LogBridge/LogBridge.cxx
+1 -1
View File
@@ -169,7 +169,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
break;
case typelib_TypeClass_TYPE:
{
const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<com::sun::star::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<css::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
SAL_INFO("cppu.log", "" << sValue.getStr());
}
break;
cppu/source/uno/IdentityMapping.hxx
+1 -1
View File
@@ -26,7 +26,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class Environment;
}}}}
uno_Mapping * createIdentityMapping(const ::com::sun::star::uno::Environment & rEnv);
uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv);
#endif
cppuhelper/source/component.cxx
+4 -4
View File
@@ -90,7 +90,7 @@ void OComponentHelper::release() throw()
{
dispose();
}
catch (::com::sun::star::uno::RuntimeException & exc)
catch (css::uno::RuntimeException & exc)
{
// release should not throw exceptions
#if OSL_DEBUG_LEVEL > 0
@@ -139,7 +139,7 @@ void OComponentHelper::disposing()
// XComponent
void OComponentHelper::dispose()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
// An frequently programming error is to release the last
// reference to this object in the disposing message.
@@ -212,7 +212,7 @@ void OComponentHelper::dispose()
// XComponent
void OComponentHelper::addEventListener(
const Reference<XEventListener > & rxListener )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -230,7 +230,7 @@ void OComponentHelper::addEventListener(
// XComponent
void OComponentHelper::removeEventListener(
const Reference<XEventListener > & rxListener )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(), rxListener );
}
cppuhelper/source/factory.cxx
+51 -51
View File
@@ -83,13 +83,13 @@ public:
// XInterface
Any SAL_CALL queryInterface( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSingleServiceFactory
Reference<XInterface > SAL_CALL createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSingleComponentFactory
virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
Reference< XComponentContext > const & xContext )
@@ -101,11 +101,11 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
/**
@@ -115,7 +115,7 @@ protected:
*/
virtual Reference<XInterface > createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
throw(css::uno::Exception, css::uno::RuntimeException);
Reference<XMultiServiceFactory > xSMgr;
ComponentInstantiation pCreateFunction;
@@ -130,7 +130,7 @@ OSingleFactoryHelper::~OSingleFactoryHelper()
Any OSingleFactoryHelper::queryInterface( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType,
@@ -143,7 +143,7 @@ Any OSingleFactoryHelper::queryInterface( const Type & rType )
// OSingleFactoryHelper
Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
throw(css::uno::Exception, css::uno::RuntimeException)
{
if (m_fptr)
{
@@ -168,7 +168,7 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
// XSingleServiceFactory
Reference<XInterface > OSingleFactoryHelper::createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithContext( Reference< XComponentContext >() );
}
@@ -176,7 +176,7 @@ Reference<XInterface > OSingleFactoryHelper::createInstance()
// XSingleServiceFactory
Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithArgumentsAndContext(
Arguments, Reference< XComponentContext >() );
@@ -226,7 +226,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont
// XServiceInfo
OUString OSingleFactoryHelper::getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return aImplementationName;
}
@@ -234,14 +234,14 @@ OUString OSingleFactoryHelper::getImplementationName()
// XServiceInfo
sal_Bool OSingleFactoryHelper::supportsService(
const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return aServiceNames;
}
@@ -272,7 +272,7 @@ public:
// XInterface
Any SAL_CALL queryInterface( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL acquire() throw() SAL_OVERRIDE
{ OComponentHelper::acquire(); }
void SAL_CALL release() throw() SAL_OVERRIDE
@@ -280,9 +280,9 @@ public:
// XSingleServiceFactory
Reference<XInterface > SAL_CALL createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSingleComponentFactory
virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
Reference< XComponentContext > const & xContext )
@@ -293,19 +293,19 @@ public:
throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAggregation
Any SAL_CALL queryAggregation( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUnloadingPreference
virtual sal_Bool SAL_CALL releaseOnNotification()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OComponentHelper
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
Reference<XInterface > xTheInstance;
@@ -318,7 +318,7 @@ protected:
Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
if( rType == cppu::UnoType<XUnloadingPreference>::get() )
{
@@ -331,7 +331,7 @@ Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
// XAggregation
Any OFactoryComponentHelper::queryAggregation( const Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
Any aRet( OComponentHelper::queryAggregation( rType ) );
return (aRet.hasValue() ? aRet : OSingleFactoryHelper::queryInterface( rType ));
@@ -339,7 +339,7 @@ Any OFactoryComponentHelper::queryAggregation( const Type & rType )
// XTypeProvider
Sequence< Type > OFactoryComponentHelper::getTypes()
throw (::com::sun::star::uno::RuntimeException, std::exception)
throw (css::uno::RuntimeException, std::exception)
{
Type ar[ 4 ];
ar[ 0 ] = cppu::UnoType<XSingleServiceFactory>::get();
@@ -353,14 +353,14 @@ Sequence< Type > OFactoryComponentHelper::getTypes()
}
Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
// XSingleServiceFactory
Reference<XInterface > OFactoryComponentHelper::createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -377,7 +377,7 @@ Reference<XInterface > OFactoryComponentHelper::createInstance()
Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -435,7 +435,7 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndC
// OComponentHelper
void OFactoryComponentHelper::dispose()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
OComponentHelper::dispose();
@@ -459,7 +459,7 @@ void OFactoryComponentHelper::dispose()
// one-instance factory: sal_False
// single factory: sal_True
// component factory: sal_True
sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception)
sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
{
if( bOneInstance)
return sal_False;
@@ -510,11 +510,11 @@ public:
// OSingleFactoryHelper
Reference<XInterface > createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE;
// XSingleServiceFactory
Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSingleComponentFactory
Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
@@ -523,7 +523,7 @@ public:
// XServiceInfo
Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUnloadingPreference
sal_Bool SAL_CALL releaseOnNotification()
throw( RuntimeException, std::exception) SAL_OVERRIDE;
@@ -531,7 +531,7 @@ public:
private:
Reference< XInterface > createModuleFactory()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
throw(css::uno::Exception, css::uno::RuntimeException);
/** The registry key of the implementation section */
Reference<XRegistryKey > xImplementationKey;
@@ -650,7 +650,7 @@ void ORegistryFactoryHelper::getFastPropertyValue(
Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
throw(css::uno::Exception, css::uno::RuntimeException)
{
if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
{
@@ -679,7 +679,7 @@ Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
{
@@ -748,7 +748,7 @@ Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndCo
// OSingleFactoryHelper
Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
throw(css::uno::Exception, css::uno::RuntimeException)
{
OUString aActivatorUrl;
OUString aActivatorName;
@@ -811,7 +811,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// XServiceInfo
Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( aMutex );
if( aServiceNames.getLength() == 0 )
@@ -843,7 +843,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
return aServiceNames;
}
sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception)
sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
{
bool retVal= true;
if( isOneInstance() && isInstance())
@@ -882,26 +882,26 @@ public:
// XSingleServiceFactory
Reference<XInterface > SAL_CALL createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XUnloadingPreference
sal_Bool SAL_CALL releaseOnNotification()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
// XSingleServiceFactory
Reference<XInterface > OFactoryProxyHelper::createInstance()
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return xFactory->createInstance();
}
@@ -911,14 +911,14 @@ Reference<XInterface > OFactoryProxyHelper::createInstanceWithArguments
(
const Sequence<Any>& Arguments
)
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return xFactory->createInstanceWithArguments( Arguments );
}
// XServiceInfo
OUString OFactoryProxyHelper::getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY );
if( xInfo.is() )
@@ -928,14 +928,14 @@ OUString OFactoryProxyHelper::getImplementationName()
// XServiceInfo
sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName)
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY );
if( xInfo.is() )
@@ -943,7 +943,7 @@ Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
return Sequence< OUString >();
}
sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception)
sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
{
Reference<XUnloadingPreference> pref( xFactory, UNO_QUERY);
cppuhelper/source/interfacecontainer.cxx
+6 -6
View File
@@ -370,7 +370,7 @@ Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
nSize = pMap->size();
if( nSize )
{
::com::sun::star::uno::Sequence< Type > aInterfaceTypes( nSize );
css::uno::Sequence< Type > aInterfaceTypes( nSize );
Type * pArray = aInterfaceTypes.getArray();
t_type2ptr::iterator iter = pMap->begin();
@@ -387,11 +387,11 @@ Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
}
if( (t_type2ptr::size_type)i != nSize ) {
// may be empty container, reduce the sequence to the right size
aInterfaceTypes = ::com::sun::star::uno::Sequence< Type >( pArray, i );
aInterfaceTypes = css::uno::Sequence< Type >( pArray, i );
}
return aInterfaceTypes;
}
return ::com::sun::star::uno::Sequence< Type >();
return css::uno::Sequence< Type >();
}
static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey )
@@ -552,7 +552,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
nSize = pMap ? pMap->size() : 0;
if( nSize )
{
::com::sun::star::uno::Sequence< sal_Int32 > aInterfaceTypes( nSize );
css::uno::Sequence< sal_Int32 > aInterfaceTypes( nSize );
sal_Int32 * pArray = aInterfaceTypes.getArray();
t_long2ptr::iterator iter = pMap->begin();
@@ -569,11 +569,11 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
}
if( (t_long2ptr::size_type)i != nSize ) {
// may be empty container, reduce the sequence to the right size
aInterfaceTypes = ::com::sun::star::uno::Sequence< sal_Int32 >( pArray, i );
aInterfaceTypes = css::uno::Sequence< sal_Int32 >( pArray, i );
}
return aInterfaceTypes;
}
return ::com::sun::star::uno::Sequence< sal_Int32 >();
return css::uno::Sequence< sal_Int32 >();
}
OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey ) const
cppuhelper/source/macro_expander.hxx
+1 -1
View File
@@ -51,7 +51,7 @@ namespace detail {
*/
::rtl::OUString expandMacros(rtl::OUString const & text);
com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
css::uno::Reference< css::lang::XSingleComponentFactory >
create_bootstrap_macro_expander_factory();
}
cppuhelper/source/propshlp.cxx
+52 -52
View File
@@ -43,15 +43,15 @@ IPropertyArrayHelper::~IPropertyArrayHelper()
{
}
inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( )
inline const css::uno::Type & getPropertyTypeIdentifier( )
{
return cppu::UnoType<XPropertyChangeListener>::get();
}
inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier()
inline const css::uno::Type & getPropertiesTypeIdentifier()
{
return cppu::UnoType<XPropertiesChangeListener>::get();
}
inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier()
inline const css::uno::Type & getVetoableTypeIdentifier()
{
return cppu::UnoType<XVetoableChangeListener>::get();
}
@@ -71,7 +71,7 @@ static int compare_OUString_Property_Impl( const void *arg1, const void *arg2 )
*/
class OPropertySetHelperInfo_Impl
: public WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >
: public WeakImplHelper1< css::beans::XPropertySetInfo >
{
Sequence < Property > aInfos;
@@ -79,9 +79,9 @@ public:
explicit OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
// XPropertySetInfo-methods
virtual Sequence< Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -97,7 +97,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
/**
* Return the sequence of properties, which are provided through the constructor.
*/
Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception)
Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(css::uno::RuntimeException, std::exception)
{
return aInfos;
}
@@ -105,7 +105,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(::com::s
/**
* Return the sequence of properties, which are provided through the constructor.
*/
Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)
Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
{
Property * pR;
pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -121,7 +121,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper
/**
* Return the sequence of properties, which are provided through the constructor.
*/
sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(css::uno::RuntimeException, std::exception)
{
Property * pR;
pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -207,7 +207,7 @@ OPropertySetHelper2::~OPropertySetHelper2()
}
// XInterface
Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rType )
Any OPropertySetHelper::queryInterface( const css::uno::Type & rType )
throw (RuntimeException, std::exception)
{
return ::cppu::queryInterface(
@@ -217,7 +217,7 @@ Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rTyp
static_cast< XFastPropertySet * >( this ) );
}
Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rType )
Any OPropertySetHelper2::queryInterface( const css::uno::Type & rType )
throw (RuntimeException, std::exception)
{
Any cnd(cppu::queryInterface(rType, static_cast< XPropertySetOption * >(this)));
@@ -230,7 +230,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy
/**
* called from the derivee's XTypeProvider::getTypes implementation
*/
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > OPropertySetHelper::getTypes()
css::uno::Sequence< css::uno::Type > OPropertySetHelper::getTypes()
throw (RuntimeException)
{
return css::uno::Sequence<css::uno::Type>({
@@ -262,7 +262,7 @@ Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo(
// XPropertySet
void OPropertySetHelper::setPropertyValue(
const OUString& rPropertyName, const Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// get the map table
IPropertyArrayHelper & rPH = getInfoHelper();
@@ -275,7 +275,7 @@ void OPropertySetHelper::setPropertyValue(
// XPropertySet
Any OPropertySetHelper::getPropertyValue(
const OUString& rPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// get the map table
IPropertyArrayHelper & rPH = getInfoHelper();
@@ -289,9 +289,9 @@ Any OPropertySetHelper::getPropertyValue(
void OPropertySetHelper::addPropertyChangeListener(
const OUString& rPropertyName,
const Reference < XPropertyChangeListener > & rxListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" );
@@ -313,7 +313,7 @@ void OPropertySetHelper::addPropertyChangeListener(
sal_Int16 nAttributes;
rPH.fillPropertyMembersByHandle( NULL, &nAttributes, nHandle );
if( !(nAttributes & ::com::sun::star::beans::PropertyAttribute::BOUND) )
if( !(nAttributes & css::beans::PropertyAttribute::BOUND) )
{
OSL_FAIL( "add listener to an unbound property" );
// silent ignore this
@@ -337,9 +337,9 @@ void OPropertySetHelper::addPropertyChangeListener(
void OPropertySetHelper::removePropertyChangeListener(
const OUString& rPropertyName,
const Reference < XPropertyChangeListener >& rxListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -371,9 +371,9 @@ void OPropertySetHelper::removePropertyChangeListener(
void OPropertySetHelper::addVetoableChangeListener(
const OUString& rPropertyName,
const Reference< XVetoableChangeListener > & rxListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" );
@@ -417,9 +417,9 @@ void OPropertySetHelper::addVetoableChangeListener(
void OPropertySetHelper::removeVetoableChangeListener(
const OUString& rPropertyName,
const Reference < XVetoableChangeListener > & rxListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -448,7 +448,7 @@ void OPropertySetHelper::removeVetoableChangeListener(
}
}
void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, const ::com::sun::star::uno::Any& i_value )
void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, const css::uno::Any& i_value )
{
//OSL_PRECOND( rBHelper.rMutex.isAcquired(), "OPropertySetHelper::setDependentFastPropertyValue: to be called with a locked mutex only!" );
// there is no such thing as Mutex.isAcquired, sadly ...
@@ -501,11 +501,11 @@ void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, cons
// XFastPropertySet
void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -547,19 +547,19 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
// set the property to the new value
setFastPropertyValue_NoBroadcast( nHandle, aConvertedVal );
}
catch (const ::com::sun::star::beans::UnknownPropertyException& ) { throw; /* allowed to leave */ }
catch (const ::com::sun::star::beans::PropertyVetoException& ) { throw; /* allowed to leave */ }
catch (const ::com::sun::star::lang::IllegalArgumentException& ) { throw; /* allowed to leave */ }
catch (const ::com::sun::star::lang::WrappedTargetException& ) { throw; /* allowed to leave */ }
catch (const ::com::sun::star::uno::RuntimeException& ) { throw; /* allowed to leave */ }
catch (const ::com::sun::star::uno::Exception& e )
catch (const css::beans::UnknownPropertyException& ) { throw; /* allowed to leave */ }
catch (const css::beans::PropertyVetoException& ) { throw; /* allowed to leave */ }
catch (const css::lang::IllegalArgumentException& ) { throw; /* allowed to leave */ }
catch (const css::lang::WrappedTargetException& ) { throw; /* allowed to leave */ }
catch (const css::uno::RuntimeException& ) { throw; /* allowed to leave */ }
catch (const css::uno::Exception& e )
{
// not allowed to leave this meathod
::com::sun::star::lang::WrappedTargetException aWrap;
aWrap.Context = static_cast< ::com::sun::star::beans::XPropertySet* >( this );
css::lang::WrappedTargetException aWrap;
aWrap.Context = static_cast< css::beans::XPropertySet* >( this );
aWrap.TargetException <<= e;
throw ::com::sun::star::lang::WrappedTargetException( aWrap );
throw css::lang::WrappedTargetException( aWrap );
}
// release guard to fire events
@@ -571,9 +571,9 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
// XFastPropertySet
Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
IPropertyArrayHelper & rInfo = getInfoHelper();
@@ -898,7 +898,7 @@ void OPropertySetHelper::setFastPropertyValues(
void OPropertySetHelper::setPropertyValues(
const Sequence<OUString>& rPropertyNames,
const Sequence<Any>& rValues )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
sal_Int32 nSeqLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -912,7 +912,7 @@ void OPropertySetHelper::setPropertyValues(
// XMultiPropertySet
Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& rPropertyNames )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nSeqLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -937,7 +937,7 @@ Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& r
void OPropertySetHelper::addPropertiesChangeListener(
const Sequence<OUString> & ,
const Reference < XPropertiesChangeListener > & rListener )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
rBHelper.addListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
}
@@ -945,7 +945,7 @@ void OPropertySetHelper::addPropertiesChangeListener(
// XMultiPropertySet
void OPropertySetHelper::removePropertiesChangeListener(
const Reference < XPropertiesChangeListener > & rListener )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
}
@@ -954,7 +954,7 @@ void OPropertySetHelper::removePropertiesChangeListener(
void OPropertySetHelper::firePropertiesChangeEvent(
const Sequence<OUString>& rPropertyNames,
const Reference < XPropertiesChangeListener >& rListener )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[nLen]);
@@ -996,7 +996,7 @@ void OPropertySetHelper::firePropertiesChangeEvent(
}
void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
m_pReserved->m_bFireEvents = bEnable;
}
cppuhelper/source/weak.cxx
+18 -18
View File
@@ -58,17 +58,17 @@ public:
{}
// XInterface
Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL acquire() throw() SAL_OVERRIDE;
void SAL_CALL release() throw() SAL_OVERRIDE;
// XAdapter
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Called from the weak object if the reference count goes to zero.
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL dispose() throw(css::uno::RuntimeException);
private:
virtual ~OWeakConnectionPoint() {}
@@ -83,7 +83,7 @@ private:
// XInterface
Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
throw(com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) );
@@ -102,7 +102,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
delete this;
}
void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::RuntimeException)
void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
{
Any ex;
OInterfaceIteratorHelper aIt( m_aReferences );
@@ -112,7 +112,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti
{
static_cast<XReference *>(aIt.next())->dispose();
}
catch (com::sun::star::lang::DisposedException &) {}
catch (css::lang::DisposedException &) {}
catch (RuntimeException &)
{
ex = cppu::getCaughtException();
@@ -125,7 +125,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti
}
// XInterface
Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception)
Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css::uno::RuntimeException, std::exception)
{
Reference< XInterface > ret;
@@ -154,14 +154,14 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co
// XInterface
void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef)
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
m_aReferences.addInterface( (const Reference< XInterface > &)rRef );
}
// XInterface
void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
m_aReferences.removeInterface( (const Reference< XInterface > &)rRef );
}
@@ -181,7 +181,7 @@ OWeakObject::OWeakObject()
#endif
// XInterface
Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType,
@@ -231,7 +231,7 @@ OWeakObject::~OWeakObject()
// XWeak
Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
throw (::com::sun::star::uno::RuntimeException, std::exception)
throw (css::uno::RuntimeException, std::exception)
{
if (!m_pWeakConnectionPoint)
{
@@ -276,14 +276,14 @@ void OWeakAggObject::release() throw()
}
// XInterface
Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
Any OWeakAggObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
Reference< XInterface > x( xDelegator ); // harden ref
return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
}
// XAggregation
Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType,
@@ -293,7 +293,7 @@ Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::sta
}
// XAggregation
void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(::com::sun::star::uno::RuntimeException, std::exception)
void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(css::uno::RuntimeException, std::exception)
{
xDelegator = rDelegator;
}
@@ -329,7 +329,7 @@ public:
void SAL_CALL release() throw() SAL_OVERRIDE;
// XReference
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// The reference counter.
oslInterlockedCount m_aRefCount;
@@ -392,7 +392,7 @@ void SAL_CALL OWeakRefListener::release() throw()
}
void SAL_CALL OWeakRefListener::dispose()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
Reference< XAdapter > xAdp;
{
cppuhelper/test/cfg_test.cxx
+5 -5
View File
@@ -129,19 +129,19 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
// XServiceInfo
OUString ServiceImpl0::getImplementationName()
throw(::com::sun::star::uno::RuntimeException)
throw(css::uno::RuntimeException)
{
return impl0_getImplementationName();
}
Sequence< OUString > ServiceImpl0::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException)
throw(css::uno::RuntimeException)
{
return impl0_getSupportedServiceNames();
}
sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName )
throw(::com::sun::star::uno::RuntimeException)
throw(css::uno::RuntimeException)
{
return cppu::supportsService(this, rServiceName);
}
@@ -161,13 +161,13 @@ public:
};
OUString ServiceImpl1::getImplementationName()
throw(::com::sun::star::uno::RuntimeException)
throw(css::uno::RuntimeException)
{
return impl1_getImplementationName();
}
Sequence< OUString > ServiceImpl1::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException)
throw(css::uno::RuntimeException)
{
return impl1_getSupportedServiceNames();
}
cppuhelper/test/testcmp/TestComponent.cxx
+2 -2
View File
@@ -71,7 +71,7 @@ public:
explicit TestComponent(uno::Reference<uno::XComponentContext> const & xCtx);
virtual ~TestComponent();
uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException);
uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException);
void SAL_CALL release() throw ();
void SAL_CALL acquire() throw ();
@@ -136,7 +136,7 @@ void SAL_CALL TestComponent::release() throw ()
cppu::WeakImplHelper1<lang::XServiceInfo>::release();
}
uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException)
{
return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType);
}
cppuhelper/test/testcontainer.cxx
+3 -3
View File
@@ -35,13 +35,13 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener >
{
public:
// Methods
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException)
virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException)
{
}
virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ )
throw(css::beans::PropertyVetoException, css::uno::RuntimeException)
{
}
cppuhelper/test/testhelper.hxx
+2 -2
View File
@@ -20,10 +20,10 @@
#ifndef INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
#define INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
void testidlclass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &r);
void testidlclass( const css::uno::Reference < css::lang::XMultiServiceFactory > &r);
void testPropertyTypeHelper();
void test_PropertySetHelper();
void test_ImplHelper( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > & xSF );
void test_ImplHelper( const css::uno::Reference < css::lang::XMultiServiceFactory > & xSF );
void test_interfacecontainer();
#endif // INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
cppuhelper/test/testpropshlp.cxx
+1 -1
View File
@@ -353,7 +353,7 @@ public:
}
// XInterface
Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException)
Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(RuntimeException)
{
Any aRet( OPropertySetHelper::queryInterface( rType ) );
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
cppuhelper/test/testproptyphlp.cxx
+2 -2
View File
@@ -54,7 +54,7 @@ void testPropertyTypeHelper()
convertPropertyValue( f , a );
OSL_ASSERT( 25. == f );
::com::sun::star::beans::Property prop;
css::beans::Property prop;
prop.Name = rtl::OUString("Huhu");
prop.Handle = 5;
@@ -62,7 +62,7 @@ void testPropertyTypeHelper()
a <<= prop;
::com::sun::star::beans::Property prop2;
css::beans::Property prop2;
convertPropertyValue( prop2 , a );
OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );