diff options
author | Noel Grandin <noel@peralex.com> | 2012-12-03 13:55:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2012-12-10 08:05:49 +0200 |
commit | b9a4a0b9658015a0d55c42de1f5e56941e20d268 (patch) | |
tree | d5d377f24ee3377fdf6f912415b382b2d3e85070 /connectivity/inc | |
parent | fdo#46808, Adapt sdbc::DriverManager UNO service to new style (diff) | |
download | core-b9a4a0b9658015a0d55c42de1f5e56941e20d268.tar.gz core-b9a4a0b9658015a0d55c42de1f5e56941e20d268.zip |
fdo#46808, Convert connectivity::SQLError to use XComponentContext...
...instead of comphelper::ComponentContext.
Change-Id: I40384c2d7cfcabd06506321d686dd8e7c7c5f266
Diffstat (limited to 'connectivity/inc')
-rw-r--r-- | connectivity/inc/connectivity/sqlerror.hxx | 5 | ||||
-rw-r--r-- | connectivity/inc/connectivity/sqlparse.hxx | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index 9cfaffc62e1e..fae9b2a05870 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -21,8 +21,7 @@ #define CONNECTIVITY_SQLERROR_HXX #include <com/sun/star/sdbc/SQLException.hpp> - -#include <comphelper/componentcontext.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> @@ -82,7 +81,7 @@ namespace connectivity public: - explicit SQLError( const ::comphelper::ComponentContext& _rContext ); + explicit SQLError( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext ); ~SQLError(); /** returns the message associated with a given error condition, after (optionally) replacing diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index e67aa7d034ce..45357d280fbf 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -124,8 +124,8 @@ namespace connectivity ::com::sun::star::lang::Locale aLocale; ::connectivity::SQLError aErrors; - OSQLParser_Data( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ) - :aErrors( _xServiceFactory ) + OSQLParser_Data( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) + :aErrors( _rxContext ) { } }; |