diff options
| author | Rosemary Sebastian <rosemaryseb8@gmail.com> | 2017-03-18 08:46:27 +0000 |
|---|---|---|
| committer | Rosemary Sebastian <rosemaryseb8@gmail.com> | 2017-03-18 11:54:54 +0000 |
| commit | 109210e5b71a4e0b6fcaae72be7ef8d7667f3708 (patch) | |
| tree | 50fe7d607d490cc4065821d94f40f8f0db259c33 /editeng | |
| parent | 198b6c16e78b3462217c9d8a0429459abe885392 (diff) | |
Revert "Revert "Implement export and import of author field in fixed format""
This reverts commit cae16645e17df6a1f87443c00b6abfd26dabd27f.
Change-Id: If5b85beb53a0925909d537023879a7d86fa011cf
Reviewed-on: https://gerrit.libreoffice.org/35391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rosemary Sebastian <rosemaryseb8@gmail.com>
Tested-by: Rosemary Sebastian <rosemaryseb8@gmail.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/flditem.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 1d5ba3fa784e..690425594227 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -181,13 +181,16 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe SvxAuthorField* pData = new SvxAuthorField( aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); - if (!bFullName) + if (!bIsFixed) { - pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME); - } - else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME) - { - pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt)); + if (!bFullName) + { + pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME); + } + else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME) + { + pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt)); + } } return pData; |