diff options
| author | Justin Luth <justin_luth@sil.org> | 2022-03-12 09:32:20 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-03-21 11:01:37 +0100 |
| commit | a13faccd7e8c6503e96e9342a8615b4542b0601f (patch) | |
| tree | 868cfaa4330800c1df5989bf2c65599f71f2a1c4 /writerfilter | |
| parent | 81eb293ff5c0879fa3d5f9be991c04f6bcd0fa96 (diff) | |
related tdf#147861: cleanup + a function provides the name
This is not quite a NonFunctionalChange because it avoids
adding " (fixed)" to the name. But that is what I want
anyway for bug 147861, so this is an all-around good simplification.
Plus, the writerfilter loop doesn't need to run if an
inside clause will never be true anyway.
Putting this cleanup separately helps highlight the
actual fix and not clutter the real patches.
Change-Id: I12f345cc92627398ad00fe32b64b98b54e5ed14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131413
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index bbbe68a01700..a4d59a8b7fdb 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5414,14 +5414,15 @@ void DomainMapper_Impl::handleAuthor //search for a field mapping OUString sFieldServiceName; size_t nMap = 0; - for( ; nMap < SAL_N_ELEMENTS(aDocProperties); ++nMap ) + if (!xPropertySetInfo->hasPropertyByName(rFirstParam)) { - if ((rFirstParam.equalsAscii(aDocProperties[nMap].pDocPropertyName)) && (!xPropertySetInfo->hasPropertyByName(rFirstParam))) + for( ; nMap < SAL_N_ELEMENTS(aDocProperties); ++nMap ) { - sFieldServiceName = - OUString::createFromAscii - (aDocProperties[nMap].pServiceName); - break; + if (rFirstParam.equalsAscii(aDocProperties[nMap].pDocPropertyName)) + { + sFieldServiceName = OUString::createFromAscii(aDocProperties[nMap].pServiceName); + break; + } } } OUString sServiceName("com.sun.star.text.TextField."); |