diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
| commit | a233dac0653f3f3054f7ad2da114ed989747e89a (patch) | |
| tree | bf1e11438321c06125a94308649c496648061ccb /ucbhelper | |
| parent | acb6133d89abe071108577f821d7eaa381378879 (diff) | |
| parent | e5647de7dd26775e45af24f11ac4f82a5518bd9e (diff) | |
resyncing to master
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/prj/build.lst | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/propertyvalueset.cxx | 12 | ||||
| -rw-r--r-- | ucbhelper/workben/myucp/myucp_services.cxx | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst index 2bc7d164cdff..07a598c4ddb0 100644 --- a/ucbhelper/prj/build.lst +++ b/ucbhelper/prj/build.lst @@ -1,3 +1,3 @@ -uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL +uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL uh ucbhelper\prj nmake - all uh_prj NULL diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index c6ab550237c1..361a8fd514af 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -221,10 +221,10 @@ class PropertyValues : public PropertyValuesVector {}; m_bWasNull = sal_False; \ } \ } \ - catch ( IllegalArgumentException ) \ + catch (const IllegalArgumentException&) \ { \ } \ - catch ( CannotConvertException ) \ + catch (const CannotConvertException&) \ { \ } \ } \ @@ -881,10 +881,10 @@ void PropertyValueSet::appendPropertySet( if ( aValue.hasValue() ) appendObject( rProp, aValue ); } - catch ( UnknownPropertyException ) + catch (const UnknownPropertyException&) { } - catch ( WrappedTargetException ) + catch (const WrappedTargetException&) { } } @@ -909,10 +909,10 @@ sal_Bool PropertyValueSet::appendPropertySetValue( return sal_True; } } - catch ( UnknownPropertyException ) + catch (const UnknownPropertyException&) { } - catch ( WrappedTargetException ) + catch (const WrappedTargetException&) { } } diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx index 6551ca755a12..c455addd1a22 100644 --- a/ucbhelper/workben/myucp/myucp_services.cxx +++ b/ucbhelper/workben/myucp/myucp_services.cxx @@ -81,13 +81,6 @@ sal_Bool writeInfo( void * pRegistryKey, } //========================================================================= -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -//========================================================================= extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { |