diff options
Diffstat (limited to 'desktop/source/deployment/registry')
4 files changed, 23 insertions, 27 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 61bba1def6a1..51d0f078d42b 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -953,9 +953,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( - ::rtl::ByteSequence( reinterpret_cast<sal_Int8 const *>(buf2.getStr()), - buf2.getLength() ) ) ); + buf2.getLength() ) ); ::ucbhelper::Content ucb_content( makeURL( getCachePath(), getPlatformString() + "rc" ), xCmdEnv, m_xComponentContext ); @@ -978,9 +977,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) // write unorc: const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( - ::rtl::ByteSequence( reinterpret_cast<sal_Int8 const *>(buf.getStr()), - buf.getLength() ) ) ); + buf.getLength() ) ); ::ucbhelper::Content ucb_content( makeURL( getCachePath(), "unorc" ), xCmdEnv, m_xComponentContext ); ucb_content.writeStream( xData, true /* replace existing */ ); diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index b8e68bb2ca8b..27e229a4da87 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -458,9 +458,8 @@ void BackendImpl::configmgrini_flush( // write configmgr.ini: const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( - ::rtl::ByteSequence( reinterpret_cast<sal_Int8 const *>(buf.getStr()), - buf.getLength() ) ) ); + buf.getLength() ) ); ::ucbhelper::Content ucb_content( makeURL( getCachePath(), "configmgr.ini" ), xCmdEnv, m_xComponentContext ); ucb_content.writeStream( xData, true /* replace existing */ ); @@ -597,15 +596,14 @@ OUString replaceOrigin( { // looking for %origin%: ::ucbhelper::Content ucb_content( url, xCmdEnv, xContext ); - ::rtl::ByteSequence bytes( readFile( ucb_content ) ); - ::rtl::ByteSequence filtered( bytes.getLength() * 2, - ::rtl::BYTESEQ_NODEFAULT ); + std::vector<sal_Int8> bytes( readFile( ucb_content ) ); + std::vector<sal_Int8> filtered( bytes.size() * 2 ); bool use_filtered = false; OString origin; sal_Char const * pBytes = reinterpret_cast<sal_Char const *>( - bytes.getConstArray()); - sal_Size nBytes = bytes.getLength(); - sal_Int32 write_pos = 0; + bytes.data()); + sal_Size nBytes = bytes.size(); + size_t write_pos = 0; while (nBytes > 0) { sal_Int32 index = rtl_str_indexOfChar_WithLength( pBytes, nBytes, '%' ); @@ -615,9 +613,9 @@ OUString replaceOrigin( index = nBytes; } - if ((write_pos + index) > filtered.getLength()) - filtered.realloc( (filtered.getLength() + index) * 2 ); - memcpy( filtered.getArray() + write_pos, pBytes, index ); + if ((write_pos + index) > filtered.size()) + filtered.resize( (filtered.size() + index) * 2 ); + memcpy( filtered.data() + write_pos, pBytes, index ); write_pos += index; pBytes += index; nBytes -= index; @@ -655,15 +653,15 @@ OUString replaceOrigin( nBytes -= RTL_CONSTASCII_LENGTH("origin%"); use_filtered = true; } - if ((write_pos + nAdd) > filtered.getLength()) - filtered.realloc( (filtered.getLength() + nAdd) * 2 ); - memcpy( filtered.getArray() + write_pos, pAdd, nAdd ); + if ((write_pos + nAdd) > filtered.size()) + filtered.resize( (filtered.size() + nAdd) * 2 ); + memcpy( filtered.data() + write_pos, pAdd, nAdd ); write_pos += nAdd; } if (!use_filtered) return url; - if (write_pos < filtered.getLength()) - filtered.realloc( write_pos ); + if (write_pos < filtered.size()) + filtered.resize( write_pos ); OUString newUrl(url); if (!destFolder.isEmpty()) { diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 3cd4185c3f8d..535d9a4ba327 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -52,7 +52,7 @@ BackendDb::BackendDb( void BackendDb::save() { const Reference<css::io::XActiveDataSource> xDataSource(m_doc,css::uno::UNO_QUERY_THROW); - ::rtl::ByteSequence bytes; + std::vector<sal_Int8> bytes; xDataSource->setOutputStream(::xmlscript::createOutputStream(&bytes)); const Reference<css::io::XActiveDataControl> xDataControl(m_doc,css::uno::UNO_QUERY_THROW); xDataControl->start(); diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 58b302e0ea80..5ee41ed53929 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -578,9 +578,9 @@ OUString BackendImpl::PackageImpl::getTextFromURL( { ::ucbhelper::Content descContent( licenseUrl, xCmdEnv, getMyBackend()->getComponentContext()); - ::rtl::ByteSequence seq = dp_misc::readFile(descContent); + std::vector<sal_Int8> seq = dp_misc::readFile(descContent); return OUString( reinterpret_cast<sal_Char const *>( - seq.getConstArray()), seq.getLength(), RTL_TEXTENCODING_UTF8); + seq.data()), seq.size(), RTL_TEXTENCODING_UTF8); } catch (const css::uno::Exception&) { @@ -1544,13 +1544,13 @@ void BackendImpl::PackageImpl::scanBundle( xCmdEnv, false /* no throw */ )) { // patch description: - ::rtl::ByteSequence bytes( readFile( descrFileContent ) ); + std::vector<sal_Int8> bytes( readFile( descrFileContent ) ); OUStringBuffer buf; - if ( bytes.getLength() ) + if ( bytes.size() ) { buf.append( OUString( reinterpret_cast<sal_Char const *>( - bytes.getConstArray() ), - bytes.getLength(), RTL_TEXTENCODING_UTF8 ) ); + bytes.data() ), + bytes.size(), RTL_TEXTENCODING_UTF8 ) ); } else { |