diff options
| author | Rosemary Sebastian <rosemaryseb8@gmail.com> | 2017-03-16 15:25:26 +0000 |
|---|---|---|
| committer | Rosemary Sebastian <rosemaryseb8@gmail.com> | 2017-03-16 16:17:40 +0000 |
| commit | cae16645e17df6a1f87443c00b6abfd26dabd27f (patch) | |
| tree | bc733ae0bf29349b6a937b93671640df74868e57 /editeng | |
| parent | 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8 (diff) | |
Revert "Implement export and import of author field in fixed format"
This reverts commit 5de40734af30a8b897c6c5b7f681759e36a25557.
Change-Id: Ib09fb1dc54066cadcd9503c92140d78e7482ae6c
Reviewed-on: https://gerrit.libreoffice.org/35281
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, 6 insertions, 9 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 690425594227..1d5ba3fa784e 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -181,16 +181,13 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe SvxAuthorField* pData = new SvxAuthorField( aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); - if (!bIsFixed) + if (!bFullName) { - if (!bFullName) - { - pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME); - } - else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME) - { - pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt)); - } + pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME); + } + else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME) + { + pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt)); } return pData; |