diff options
Diffstat (limited to 'connectivity/source/drivers/flat/EDriver.cxx')
| -rw-r--r-- | connectivity/source/drivers/flat/EDriver.cxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 29492895510e..e9cb465d327f 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -39,7 +39,7 @@ using namespace css::lang; OUString SAL_CALL ODriver::getImplementationName( ) { - return "com.sun.star.comp.sdbc.flat.ODriver"; + return u"com.sun.star.comp.sdbc.flat.ODriver"_ustr; } @@ -54,7 +54,7 @@ connectivity_flat_ODriver( } if (ret) ret->acquire(); - return static_cast<cppu::OWeakObject*>(ret.get()); + return getXWeak(ret.get()); } Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) @@ -68,7 +68,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S rtl::Reference<OFlatConnection> pCon = new OFlatConnection(this); pCon->construct(url,info); - m_xConnections.push_back(WeakReferenceHelper(*pCon)); + m_xConnections.push_back(pCon.get()); return pCon; } @@ -82,43 +82,43 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString { if ( acceptsURL(url) ) { - Sequence< OUString > aBoolean { "0", "1" }; + Sequence< OUString > aBoolean { u"0"_ustr, u"1"_ustr }; std::vector< DriverPropertyInfo > aDriverInfo { { - "FieldDelimiter" - ,"Field separator." + u"FieldDelimiter"_ustr + ,u"Field separator."_ustr ,false ,{} ,{} }, { - "HeaderLine" - ,"Text contains headers." + u"HeaderLine"_ustr + ,u"Text contains headers."_ustr ,false - ,"0" + ,u"0"_ustr ,aBoolean }, { - "StringDelimiter" - ,"Text separator." + u"StringDelimiter"_ustr + ,u"Text separator."_ustr ,false - ,"0" + ,u"0"_ustr ,aBoolean }, { - "DecimalDelimiter" - ,"Decimal separator." + u"DecimalDelimiter"_ustr + ,u"Decimal separator."_ustr ,false - ,"0" + ,u"0"_ustr ,aBoolean }, { - "ThousandDelimiter" - ,"Thousands separator." + u"ThousandDelimiter"_ustr + ,u"Thousands separator."_ustr ,false - ,"0" + ,u"0"_ustr ,aBoolean } }; @@ -128,7 +128,6 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString ::connectivity::SharedResources aResources; const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); - return Sequence< DriverPropertyInfo >(); } |