diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:26:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 12:05:23 +0200 |
| commit | e45f61a5906cb84cdd895ef00648d5b7a6468ac5 (patch) | |
| tree | c0b848bb9b21354802e8c80621d52f27167866f1 /editeng | |
| parent | convert SvxFileFormat to scoped enum (diff) | |
| download | core-e45f61a5906cb84cdd895ef00648d5b7a6468ac5.tar.gz core-e45f61a5906cb84cdd895ef00648d5b7a6468ac5.zip | |
convert SvxFileType to scoped enum
Change-Id: Iec1c67f7f0f9b2244b1d6ef52921ddd09f944fbb
Reviewed-on: https://gerrit.libreoffice.org/42314
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/flditem.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index b4cf848c0ef2..4c3f7f5d9f94 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -146,7 +146,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe // pass fixed attribute to constructor return new SvxExtFileField( - aPresentation, bIsFixed ? SVXFILETYPE_FIX : SVXFILETYPE_VAR, eFmt); + aPresentation, bIsFixed ? SvxFileType::Fix : SvxFileType::Var, eFmt); } case text::textfield::Type::AUTHOR: { @@ -709,7 +709,7 @@ SV_IMPL_PERSIST1( SvxExtFileField ); SvxExtFileField::SvxExtFileField() { - eType = SVXFILETYPE_VAR; + eType = SvxFileType::Var; eFormat = SvxFileFormat::PathFull; } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 9416300a6fa7..ec4e45ad93f2 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -347,7 +347,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn case text::textfield::Type::EXTENDED_FILE: mpImpl->msString1 = static_cast<const SvxExtFileField*>(pData)->GetFile(); - mpImpl->mbBoolean1 = static_cast<const SvxExtFileField*>(pData)->GetType() == SVXFILETYPE_FIX; + mpImpl->mbBoolean1 = static_cast<const SvxExtFileField*>(pData)->GetType() == SvxFileType::Fix; mpImpl->mnInt16 = getFileNameDisplayFormat(static_cast<const SvxExtFileField*>(pData)->GetFormat()); break; @@ -441,7 +441,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() { // #92009# pass fixed attribute to constructor pData = new SvxExtFileField( mpImpl->msString1, - mpImpl->mbBoolean1 ? SVXFILETYPE_FIX : SVXFILETYPE_VAR, + mpImpl->mbBoolean1 ? SvxFileType::Fix : SvxFileType::Var, setFileNameDisplayFormat(mpImpl->mnInt16 ) ); break; } |