diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:27:37 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:27:37 -0600 |
| commit | 8cc8ec8b94a36300a3f037885462e06a7749b36f (patch) | |
| tree | e6c68e506d6215be069be9e7d95bcf957f3430d3 /connectivity/source/drivers/ado/ADriver.cxx | |
| parent | cf109aacb26616e1cff76a7c0983fe5dfcd81b2a (diff) | |
merge non-conflicting changes to connectivity
Diffstat (limited to 'connectivity/source/drivers/ado/ADriver.cxx')
| -rw-r--r-- | connectivity/source/drivers/ado/ADriver.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index bed410d180..d87baa5174 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,6 +26,8 @@ * ************************************************************************/ +#define _WIN32_WINNT 0x0501 + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "ado/ADriver.hxx" @@ -90,14 +93,14 @@ void ODriver::disposing() //------------------------------------------------------------------------------ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.ado.ODriver"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ado.ODriver")); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver"); + aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); + aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver")); return aSNS; } //------------------------------------------------------------------ @@ -147,7 +150,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) { - return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:ado:"),9)); + return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:")),9)); } // ----------------------------------------------------------------------------- void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl) @@ -269,3 +272,4 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |