diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 17:32:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-07-13 21:38:24 +0200 |
| commit | bda666edabc390312e619df89fd9c07b55a4d064 (patch) | |
| tree | 1a60fbfbb5b6ff6550162ec95ea63ae1708a95b9 /jvmfwk | |
| parent | 20d00043469901f55fb2f54a774035dfcd559dce (diff) | |
Turn JavaInfo sal_Sequence* member into rtl::ByteSequence
Change-Id: Iecd476970b0b7a46afe223f71e95b0010048d7b1
(cherry picked from commit 8546831b3b36e29c1ee42b790cbecd3fd8d8bbaf)
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 | ||||
| -rw-r--r-- | jvmfwk/source/elements.cxx | 3 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 12 |
3 files changed, 6 insertions, 16 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index d7e709488159..6499438da8d7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -162,10 +162,9 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info) } OUString sVendorData = buf.makeStringAndClear(); - rtl::ByteSequence byteSeq( reinterpret_cast<sal_Int8*>(sVendorData.pData->buffer), - sVendorData.getLength() * sizeof(sal_Unicode)); - pInfo->arVendorData = byteSeq.get(); - rtl_byte_sequence_acquire(pInfo->arVendorData); + pInfo->arVendorData = rtl::ByteSequence( + reinterpret_cast<sal_Int8*>(sVendorData.pData->buffer), + sVendorData.getLength() * sizeof(sal_Unicode)); return pInfo; } diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index afd9a7b3b665..d407db2f404a 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -984,8 +984,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const pInfo->sVersion = sVersion; pInfo->nFeatures = nFeatures; pInfo->nRequirements = nRequirements; - pInfo->arVendorData = arVendorData.getHandle(); - rtl_byte_sequence_acquire(pInfo->arVendorData); + pInfo->arVendorData = arVendorData; return pInfo; } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index fec33d52e31e..9f94bec48748 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -631,13 +631,12 @@ bool SAL_CALL jfw_areEqualJavaInfo( return true; if (pInfoA == nullptr || pInfoB == nullptr) return false; - rtl::ByteSequence sData(pInfoA->arVendorData); if (pInfoA->sVendor == pInfoB->sVendor && pInfoA->sLocation == pInfoB->sLocation && pInfoA->sVersion == pInfoB->sVersion && pInfoA->nFeatures == pInfoB->nFeatures && pInfoA->nRequirements == pInfoB->nRequirements - && sData == pInfoB->arVendorData) + && pInfoA->arVendorData == pInfoB->arVendorData) { return true; } @@ -647,9 +646,6 @@ bool SAL_CALL jfw_areEqualJavaInfo( void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo) { - if (pInfo == nullptr) - return; - rtl_byte_sequence_release(pInfo->arVendorData); delete pInfo; } @@ -1075,11 +1071,7 @@ CJavaInfo::~CJavaInfo() JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo) { - if (pInfo == nullptr) - return nullptr; - JavaInfo* newInfo = new JavaInfo(*pInfo); - rtl_byte_sequence_acquire(newInfo->arVendorData); - return newInfo; + return pInfo == nullptr ? nullptr : new JavaInfo(*pInfo); } |