diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-16 19:43:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-16 22:39:20 +0100 |
| commit | de4b3a135f0bca61c0e29d5af838fa86330b832a (patch) | |
| tree | fa12368c8c551b3c8849afee194ce9d3e7e6e94e /ucb | |
| parent | 81c4be45829826ae73ac14e1cb862e38dd73344d (diff) | |
cid#1545970 COPY_INSTEAD_OF_MOVE
and
cid#1545957 COPY_INSTEAD_OF_MOVE
cid#1545944 COPY_INSTEAD_OF_MOVE
cid#1545939 COPY_INSTEAD_OF_MOVE
cid#1545931 COPY_INSTEAD_OF_MOVE
cid#1545926 COPY_INSTEAD_OF_MOVE
cid#1545909 COPY_INSTEAD_OF_MOVE
cid#1545899 COPY_INSTEAD_OF_MOVE
cid#1545896 COPY_INSTEAD_OF_MOVE
cid#1545894 COPY_INSTEAD_OF_MOVE
cid#1545858 COPY_INSTEAD_OF_MOVE
cid#1545823 COPY_INSTEAD_OF_MOVE
cid#1545820 COPY_INSTEAD_OF_MOVE
cid#1545819 COPY_INSTEAD_OF_MOVE
cid#1545772 COPY_INSTEAD_OF_MOVE
cid#1545749 COPY_INSTEAD_OF_MOVE
cid#1545743 COPY_INSTEAD_OF_MOVE
cid#1545739 COPY_INSTEAD_OF_MOVE
cid#1545635 COPY_INSTEAD_OF_MOVE
cid#1545603 COPY_INSTEAD_OF_MOVE
cid#1545602 COPY_INSTEAD_OF_MOVE
cid#1545592 COPY_INSTEAD_OF_MOVE
cid#1545544 COPY_INSTEAD_OF_MOVE
cid#1545532 COPY_INSTEAD_OF_MOVE
cid#1545520 COPY_INSTEAD_OF_MOVE
cid#1545512 COPY_INSTEAD_OF_MOVE
cid#1545490 COPY_INSTEAD_OF_MOVE
cid#1545483 COPY_INSTEAD_OF_MOVE
cid#1545467 COPY_INSTEAD_OF_MOVE
cid#1545461 COPY_INSTEAD_OF_MOVE
cid#1545458 COPY_INSTEAD_OF_MOVE
cid#1545428 COPY_INSTEAD_OF_MOVE
cid#1545394 COPY_INSTEAD_OF_MOVE
cid#1545385 COPY_INSTEAD_OF_MOVE
cid#1545383 COPY_INSTEAD_OF_MOVE
cid#1545366 COPY_INSTEAD_OF_MOVE
cid#1545357 COPY_INSTEAD_OF_MOVE
Change-Id: I76224326977b4067b94ca3176cad1ca6de17930a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index cb14a7845d88..24c1ba67ea41 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -110,10 +110,7 @@ void ContentResultSetWrapper::impl_initPropertySetInfo(std::unique_lock<std::mut if( !m_xPropertySetOrigin.is() ) return; - Reference< XPropertySetInfo > xOrig = - m_xPropertySetOrigin->getPropertySetInfo(); - - m_xPropertySetInfo = xOrig; + m_xPropertySetInfo = m_xPropertySetOrigin->getPropertySetInfo(); } void ContentResultSetWrapper::impl_EnsureNotDisposed(std::unique_lock<std::mutex>& /*rGuard*/) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index de7b9c16ed97..2fed02b9209f 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -1752,11 +1752,10 @@ void Content::transfer( // 1) Create new child content. - OUString aType = xSource->isFolder() + ucb::ContentInfo aContentInfo; + aContentInfo.Type = xSource->isFolder() ? getContentType( m_aUri.getScheme(), true ) : getContentType( m_aUri.getScheme(), false ); - ucb::ContentInfo aContentInfo; - aContentInfo.Type = aType; aContentInfo.Attributes = 0; // Note: The static cast is okay here, because its sure that |