diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-30 15:25:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-30 19:58:54 +0100 |
| commit | 5096d072becf9565b0edec66a872bdb74da1d10a (patch) | |
| tree | 15c52c3f3b714f44e4ffab26f7b778f74a34ce2c /sw/source | |
| parent | d2fd70c655b45f1d4ea570fa0455231d5d059709 (diff) | |
cid#1545965 COPY_INSTEAD_OF_MOVE
and
cid#1545849 COPY_INSTEAD_OF_MOVE
cid#1545814 COPY_INSTEAD_OF_MOVE
cid#1545685 COPY_INSTEAD_OF_MOVE
cid#1545583 COPY_INSTEAD_OF_MOVE
cid#1545575 COPY_INSTEAD_OF_MOVE
cid#1545517 COPY_INSTEAD_OF_MOVE
cid#1545474 COPY_INSTEAD_OF_MOVE
Change-Id: I79a47ee34dace3a4664bfece26c59e719f469cab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbabookmarks.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index db11d4ea334a..01899b6bdde3 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -938,9 +938,9 @@ void SwCursorShell::GotoFormControl(bool bNext) { auto pFieldMark = dynamic_cast<sw::mark::IFieldmark*>(*it); assert(pFieldMark); - std::pair<SwTextContentControl*, sw::mark::IFieldmark*> pFormControl(nullptr, pFieldMark); // legacy form fields do not have (functional) tabIndexes - use lowest priority for them - aFormMap[std::make_pair((*it)->GetMarkStart(), SAL_MAX_UINT32)] = pFormControl; + aFormMap[std::make_pair((*it)->GetMarkStart(), SAL_MAX_UINT32)] = + std::pair<SwTextContentControl*, sw::mark::IFieldmark*>(nullptr, pFieldMark); } if (aFormMap.begin() == aFormMap.end()) diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index de6cbfea2ef5..601ed759dff0 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -43,8 +43,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - OUString aName = xNamed->getName(); - return uno::Any( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); + return uno::Any(uno::Reference<word::XBookmark>(new SwVbaBookmark(m_xParent, m_xContext, mxModel, xNamed->getName()))); } }; |