connectivity/source/drivers/macab/MacabDriver.hxx | 5 +++--
connectivity/source/drivers/macab/MacabStatement.cxx | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 65d4e59fedc4ce6b0aa1ead3f55cecf5921a0c6f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 5 21:39:36 2012 +0100
fdo#46808: Adapt macab driver to recent commit
Change-Id: Ie6e9c58cc4762a0159680a71ce2e03340dac6f7f
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx
b/connectivity/source/drivers/macab/MacabDriver.hxx
index c908ee4..cbfe0c0 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/compbase3.hxx>
#include <osl/module.h>
@@ -134,8 +135,8 @@ namespace connectivity
static ::rtl::OUString getImplementationName_Static( )
throw(::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
getSupportedServiceNames_Static( ) throw
(::com::sun::star::uno::RuntimeException);
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&
- getMSFactory() const { return m_xMSFactory; }
+ ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >
+ getComponentContext() const { return
comphelper::getComponentContext(m_xMSFactory); }
/** returns the driver's implementation name (being pure ASCII)
for reference in various places
*/
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 7ea31f7..12cf3f4 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -65,7 +65,7 @@ IMPLEMENT_SERVICE_INFO(MacabStatement,
"com.sun.star.sdbc.drivers.MacabStatement
MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
: MacabCommonStatement_BASE(m_aMutex),
OPropertySetHelper(MacabCommonStatement_BASE::rBHelper),
- m_aParser(_pConnection->getDriver()->getMSFactory()),
+ m_aParser(_pConnection->getDriver()->getComponentContext()),
m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(),
m_aParser, NULL ),
m_pParseTree(NULL),
m_pConnection(_pConnection),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
