diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-13 21:13:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-14 15:16:40 +0200 |
| commit | 309dc58aee022ea804d04f33c80dddefcdafb987 (patch) | |
| tree | c1931cf60ef8e44034f7eb6d1118915bf9272107 /sfx2/source | |
| parent | 990490781cdea757a25a14da30e575a6a9dfb6a7 (diff) | |
cid#1555652 COPY_INSTEAD_OF_MOVE
and
cid#1555655 COPY_INSTEAD_OF_MOVE
cid#1555658 COPY_INSTEAD_OF_MOVE
cid#1555665 COPY_INSTEAD_OF_MOVE
cid#1555667 COPY_INSTEAD_OF_MOVE
cid#1555670 COPY_INSTEAD_OF_MOVE
cid#1555675 COPY_INSTEAD_OF_MOVE
cid#1555684 COPY_INSTEAD_OF_MOVE
cid#1555687 COPY_INSTEAD_OF_MOVE
cid#1556539 COPY_INSTEAD_OF_MOVE
cid#1556542 COPY_INSTEAD_OF_MOVE
cid#1557448 COPY_INSTEAD_OF_MOVE
cid#1557449 COPY_INSTEAD_OF_MOVE
Change-Id: I3567528e559bca0031c4f5b46801e3130073633b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3b0fbdcd9478..a304e7a9494d 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -404,14 +404,14 @@ ErrCode SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std: if (!sTypeName.isEmpty()) { - std::shared_ptr<const SfxFilter> pNewFilter; + std::shared_ptr<const SfxFilter> xNewFilter; if (!aFilterName.isEmpty()) // Type detection returned a suitable filter for this. Use it. - pNewFilter = SfxFilter::GetFilterByName(aFilterName); + xNewFilter = SfxFilter::GetFilterByName(aFilterName); // fdo#78742 respect requested document service if set - if (!pNewFilter || (!m_rImpl.aName.isEmpty() - && m_rImpl.aName != pNewFilter->GetServiceName())) + if (!xNewFilter || (!m_rImpl.aName.isEmpty() + && m_rImpl.aName != xNewFilter->GetServiceName())) { // detect filter by given type // In case of this matcher is bound to a particular document type: @@ -420,12 +420,12 @@ ErrCode SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std: // This "wrong" type will be sorted out now because we match only allowed filters to the detected type uno::Sequence< beans::NamedValue > lQuery { { u"Name"_ustr, css::uno::Any(sTypeName) } }; - pNewFilter = GetFilterForProps(lQuery, nMust, nDont); + xNewFilter = GetFilterForProps(lQuery, nMust, nDont); } - if (pNewFilter) + if (xNewFilter) { - rpFilter = pNewFilter; + rpFilter = std::move(xNewFilter); return ERRCODE_NONE; } } diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 6fd58613c2ef..ef7e8a681891 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -259,7 +259,7 @@ namespace sfx2 ::std::for_each( aFilterClasses.begin(), aFilterClasses.end(), - ReadGlobalFilter( aFilterClassesNode, aClassReferrer ) + ReadGlobalFilter( std::move(aFilterClassesNode), aClassReferrer ) ); } |