diff options
Diffstat (limited to 'desktop/source/deployment/registry/configuration/dp_configuration.cxx')
-rw-r--r-- | desktop/source/deployment/registry/configuration/dp_configuration.cxx | 30 |
1 files changed, 14 insertions, 16 deletions
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()) { |