diff options
| author | Justin Luth <justin_luth@sil.org> | 2022-03-12 09:32:20 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-04-01 08:11:19 +0200 |
| commit | 8838e88b48e24f8210aa1aaa5e891e37ecae1f10 (patch) | |
| tree | 0fe99715dec58552c23e59c212475c82263f3374 | |
| parent | keep draw and impress sidebar page setup different in sidebar (diff) | |
| download | core-8838e88b48e24f8210aa1aaa5e891e37ecae1f10.tar.gz core-8838e88b48e24f8210aa1aaa5e891e37ecae1f10.zip | |
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.
(cherry picked from commit a13faccd7e8c6503e96e9342a8615b4542b0601f)
Change-Id: I12f345cc92627398ad00fe32b64b98b54e5ed14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132343
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 |
2 files changed, 8 insertions, 15 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index de0b2b6ed6ee..1bb40eff2793 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2886,15 +2886,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField ) dynamic_cast<const SwDocInfoField *> (pField); if (pDocInfoField != nullptr) - { - OUString sFieldname = pDocInfoField->GetFieldName(); - - const sal_Int32 nIndex = sFieldname.indexOf(':'); - if (nIndex >= 0) - sFieldname = sFieldname.copy(nIndex + 1); - - sStr = "\"" + sFieldname + "\""; - } + sStr = "\"" + pDocInfoField->GetName() + "\""; } break; default: diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 689201035d3c..accf1148f916 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4782,14 +4782,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."); |