[Libreoffice-commits] .: desktop/source

[Caolán McNamara]

 desktop/source/deployment/registry/configuration/dp_configuration.cxx |   11 ++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 2fc7e56a6ce702645f9147a4ea2ec6fb85398380
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 16 20:38:11 2011 +0000

    push/pop deprecated

diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 83ecba9..f9d635a 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" );