connectivity/source/manager/mdrivermanager.hxx | 8 +++----- extensions/source/bibliography/bibload.cxx | 5 ++++- 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 27520df57c887488ff4fd5580a9e932f67bd3976 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 30 14:56:03 2012 +0100 fdo#57696: Missing adaption of OSDBCDriverManager to XDriverManager2 Change-Id: Icce6ab9d6d815e9aff4980fadab71a4197593e0e diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 2cd7078..87b145d 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -20,15 +20,14 @@ #ifndef _CONNECTIVITY_DRIVERMANAGER_HXX_ #define _CONNECTIVITY_DRIVERMANAGER_HXX_ -#include <com/sun/star/sdbc/XDriverManager.hpp> +#include <com/sun/star/sdbc/XDriverManager2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase4.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/logging.hxx> #include <comphelper/componentcontext.hxx> @@ -55,9 +54,8 @@ namespace drivermanager //========================================================================== //= OSDBCDriverManager - the one-instance service for managing SDBC drivers //========================================================================== - typedef ::cppu::WeakImplHelper5 < ::com::sun::star::sdbc::XDriverManager + typedef ::cppu::WeakImplHelper4 < ::com::sun::star::sdbc::XDriverManager2 , ::com::sun::star::sdbc::XDriverAccess - , ::com::sun::star::container::XEnumerationAccess , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::uno::XNamingService > OSDBCDriverManager_Base; commit f6cf7115599a713db7cd177fa87dbce7cc883810 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 30 14:53:38 2012 +0100 Add a SAL_INFO Change-Id: Icca6e25a7c9de408570bf5ceb88aefea692cdc8d diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index f0ff55a..2436791 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -245,8 +245,11 @@ namespace // and the bibliography is assumed to work return com::sun::star::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is(); } - catch(...) + catch (Exception & e) { + SAL_INFO( + "extensions.bibliography", + "assuming Base to be missing; caught " << e.Message); return false; } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
