Skip to content

C
core
Kaydet (Commit) 65d4e59f authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

fdo#46808: Adapt macab driver to recent commit 

Change-Id: Ie6e9c58cc4762a0159680a71ce2e03340dac6f7f
üst 9e434730
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
connectivity/source/drivers/macab/MacabDriver.hxx
Dosyayı görüntüle @ 65d4e59f
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/XTerminateListener.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase3.hxx>
#include <osl/module.h> #include <osl/module.h>
...@@ -134,8 +135,8 @@ namespace connectivity ...@@ -134,8 +135,8 @@ namespace connectivity
static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); 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); 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 >& ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
getMSFactory() const { return m_xMSFactory; } getComponentContext() const { return comphelper::getComponentContext(m_xMSFactory); }
/** returns the driver's implementation name (being pure ASCII) for reference in various places /** returns the driver's implementation name (being pure ASCII) for reference in various places
*/ */
......
connectivity/source/drivers/macab/MacabStatement.cxx
Dosyayı görüntüle @ 65d4e59f
...@@ -65,7 +65,7 @@ IMPLEMENT_SERVICE_INFO(MacabStatement, "com.sun.star.sdbc.drivers.MacabStatement ...@@ -65,7 +65,7 @@ IMPLEMENT_SERVICE_INFO(MacabStatement, "com.sun.star.sdbc.drivers.MacabStatement
MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
: MacabCommonStatement_BASE(m_aMutex), : MacabCommonStatement_BASE(m_aMutex),
OPropertySetHelper(MacabCommonStatement_BASE::rBHelper), OPropertySetHelper(MacabCommonStatement_BASE::rBHelper),
m_aParser(_pConnection->getDriver()->getMSFactory()), m_aParser(_pConnection->getDriver()->getComponentContext()),
m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser, NULL ), m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser, NULL ),
m_pParseTree(NULL), m_pParseTree(NULL),
m_pConnection(_pConnection), m_pConnection(_pConnection),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment