diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-16 20:38:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-16 20:40:36 +0000 |
| commit | 2fc7e56a6ce702645f9147a4ea2ec6fb85398380 (patch) | |
| tree | 9a9b5e2140e7f846508ccf55effa32fd8793eb81 /desktop | |
| parent | efab685286432e36821d60264f978d98407b800c (diff) | |
push/pop deprecated
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/configuration/dp_configuration.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 83ecba912513..f9d635a201de 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -226,15 +226,22 @@ BackendImpl::BackendImpl( deleteUnusedFolders(OUString(), folders); configmgrini_verify_init( xCmdEnv ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<PersistentMap> pMap; + SAL_WNODEPRECATED_DECLARATIONS_POP rtl::OUString aCompatURL( makeURL( getCachePath(), OUSTR("registered_packages.db") ) ); // Don't create it if it doesn't exist already if ( ::utl::UCBContentHelper::Exists( expandUnoRcUrl( aCompatURL ) ) ) { - try { + try + { + SAL_WNODEPRECATED_DECLARATIONS_PUSH pMap = ::std::auto_ptr<PersistentMap>( new PersistentMap( aCompatURL ) ); - } catch (Exception &e) { // const uno::RunTimeException &e) { + SAL_WNODEPRECATED_DECLARATIONS_POP + } + catch (const Exception &e) + { rtl::OStringBuffer aStr( "Exception loading legacy package database: '" ); aStr.append( rtl::OUStringToOString( e.Message, osl_getThreadTextEncoding() ) ); aStr.append( "' - ignoring file, please remove it.\n" ); |