diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-02-16 21:12:52 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-02-16 21:41:09 +0100 |
| commit | 21ab38ffc6629e813838160fba7dafc11ccc5e66 (patch) | |
| tree | 1f787d22e652c03d9dce083ffdf82b71be449be4 /connectivity | |
| parent | a248ab4d27cf8ab8ad5d7b7cf84b01783a5f3b36 (diff) | |
build fix, that works
This reverts commit 638557b2f8baf87ab40d57beaa444038ace94d8a.
Change-Id: Idadbcc18200bd01ab92868d087c993d847bd88cd
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 649cfbda03f9..84dc2132756d 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -251,15 +251,15 @@ namespace connectivity std::unique_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) ); if (pStream) { - OStringBuffer sLine; + OString sLine; OString sVersionString; while ( pStream->ReadLine(sLine) ) { if ( sLine.isEmpty() ) continue; sal_Int32 nIdx {0}; - const std::string_view sIniKey = o3tl::getToken(sLine, 0, '=', nIdx); - const OString sValue(o3tl::getToken(sLine, 0, '=', nIdx)); + const OString sIniKey = sLine.getToken(0, '=', nIdx); + const OString sValue = sLine.getToken(0, '=', nIdx); if( sIniKey == "hsqldb.compatible_version" ) { sVersionString = sValue; @@ -275,9 +275,9 @@ namespace connectivity if (!sVersionString.isEmpty()) { sal_Int32 nIdx {0}; - const sal_Int32 nMajor = o3tl::toInt32(o3tl::getToken(sVersionString, 0, '.', nIdx)); - const sal_Int32 nMinor = o3tl::toInt32(o3tl::getToken(sVersionString, 0, '.', nIdx)); - const sal_Int32 nMicro = o3tl::toInt32(o3tl::getToken(sVersionString, 0, '.', nIdx)); + const sal_Int32 nMajor = sVersionString.getToken(0, '.', nIdx).toInt32(); + const sal_Int32 nMinor = sVersionString.getToken(0, '.', nIdx).toInt32(); + const sal_Int32 nMicro = sVersionString.getToken(0, '.', nIdx).toInt32(); if ( nMajor > 1 || ( nMajor == 1 && nMinor > 8 ) || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) ) @@ -296,7 +296,7 @@ namespace connectivity // // hsqldb 2.6.0 release notes have: added system role SCRIPT_OPS for export / import of database structure and data // which seems to provide a builtin way to do this with contemporary hsqldb - static const OUStringLiteral sScript(u"script"); + const OUString sScript( "script" ); if (!bIsNewDatabase && xStorage->isStreamElement(sScript)) { Reference<XStream > xStream = xStorage->openStreamElement(sScript, ElementModes::READ); @@ -305,10 +305,10 @@ namespace connectivity std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream(xStream)); if (pStream) { - OStringBuffer sLine; + OString sLine; while (pStream->ReadLine(sLine)) { - OString sText = sLine.makeStringAndClear().trim(); + OString sText = sLine.trim(); if (sText.startsWithIgnoreAsciiCase("SCRIPT")) { ::connectivity::SharedResources aResources; |