diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:21:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 12:05:07 +0200 |
| commit | 2b825fe7f525ac017966044a1400d9095c8b7986 (patch) | |
| tree | 2756958cd4839a4b274279c98b96e53b42938d9b /sc/source/ui/unoobj/fielduno.cxx | |
| parent | 5d060fd07a16c80bd94d27b08fefe1d0aaf418f7 (diff) | |
convert SvxFileFormat to scoped enum
Change-Id: Ia75c86a89c89bb22759e1d588ce603701cb7fad5
Reviewed-on: https://gerrit.libreoffice.org/42313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/unoobj/fielduno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 23b908d4cf1e..101f7dd8c4d1 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -124,11 +124,11 @@ SvxFileFormat lcl_UnoToSvxFileFormat( sal_Int16 nUnoValue ) { switch( nUnoValue ) { - case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; - case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; - case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; + case text::FilenameDisplayFormat::FULL: return SvxFileFormat::PathFull; + case text::FilenameDisplayFormat::PATH: return SvxFileFormat::PathOnly; + case text::FilenameDisplayFormat::NAME: return SvxFileFormat::NameOnly; default: - return SVXFILEFORMAT_NAME_EXT; + return SvxFileFormat::NameAndExt; } } @@ -136,9 +136,9 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) { switch( nSvxValue ) { - case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; - case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; - case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; + case SvxFileFormat::NameAndExt: return text::FilenameDisplayFormat::NAME_AND_EXT; + case SvxFileFormat::PathFull: return text::FilenameDisplayFormat::FULL; + case SvxFileFormat::PathOnly: return text::FilenameDisplayFormat::PATH; default: return text::FilenameDisplayFormat::NAME; } @@ -592,7 +592,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::EXTENDED_FILE: mpData.reset( - new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); + new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SvxFileFormat::NameAndExt)); break; case text::textfield::Type::PAGE: mpData.reset(new SvxPageField); @@ -790,7 +790,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName) uno::Any aRet; if (rName == SC_UNONAME_FILEFORM) { - SvxFileFormat eFormat = SVXFILEFORMAT_NAME_EXT; + SvxFileFormat eFormat = SvxFileFormat::NameAndExt; const SvxFieldData* pField = nullptr; if (mpEditSource) { |