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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/inc/txtfldi.hxx | 4 | ||||
| -rw-r--r-- | xmloff/source/text/txtflde.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/txtfldi.cxx | 10 |
3 files changed, 2 insertions, 19 deletions
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index ed154c72ffe0..106545c34503 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -234,10 +234,6 @@ protected: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; - /// process attribute values - virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const OUString& sAttrValue ) override; - /// prepare XTextField for insertion into document virtual void PrepareField( const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 91dba974616d..4692856b96e2 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1055,11 +1055,8 @@ void XMLTextFieldExport::ExportFieldHelper( switch (nToken) { case FIELD_ID_AUTHOR: // author field: fixed, field (sub-)type - if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed)) - { - GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_FIXED, - (GetBoolProperty(sPropertyIsFixed, rPropSet) ? XML_TRUE : XML_FALSE) ); - } + ProcessBoolean(XML_FIXED, + GetBoolProperty(sPropertyIsFixed, rPropSet), true); ExportElement(MapAuthorFieldName(rPropSet), sPresentation); break; diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index e521e19eb982..4c2bcbf7a20f 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -680,16 +680,6 @@ void XMLAuthorFieldImportContext::StartElement( XMLTextFieldImportContext::StartElement(xAttrList); } -void XMLAuthorFieldImportContext::ProcessAttribute(sal_uInt16 nAttrToken, const OUString& sAttrValue) -{ - if(nAttrToken == XML_TOK_TEXTFIELD_FIXED) - { - bool bTmp(false); - if (::sax::Converter::convertBool(bTmp, sAttrValue)) - bFixed = bTmp; - } -} - void XMLAuthorFieldImportContext::PrepareField( const Reference<XPropertySet> & rPropSet) { |