diff options
| -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."); |