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 /sc | |
| parent | 2b825fe7f525ac017966044a1400d9095c8b7986 (diff) | |
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 'sc')
| -rw-r--r-- | sc/source/filter/excel/xihelper.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 0f22e713be37..3d6e2e49e749 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -354,7 +354,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString ) } break; case 'F': // file name - InsertField( SvxFieldItem( SvxExtFileField( EMPTY_OUSTRING, SVXFILETYPE_VAR, SvxFileFormat::NameAndExt ), EE_FEATURE_FIELD ) ); + InsertField( SvxFieldItem( SvxExtFileField( EMPTY_OUSTRING, SvxFileType::Var, SvxFileFormat::NameAndExt ), EE_FEATURE_FIELD ) ); break; case 'U': // underline diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index ad51a27d77c7..5965e048bb5e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -649,7 +649,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) case eExtFileNameEntry: ClearTextAreas(); m_pWndCenter->InsertField( SvxFieldItem( SvxExtFileField( - EMPTY_OUSTRING, SVXFILETYPE_VAR, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); + EMPTY_OUSTRING, SvxFileType::Var, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); if(!bTravelling) m_pWndCenter->GrabFocus(); break; @@ -702,7 +702,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) m_pWndCenter->GetEditEngine()->SetText(aPageEntry); m_pWndCenter->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) ); m_pWndRight->InsertField( SvxFieldItem( SvxExtFileField( - EMPTY_OUSTRING, SVXFILETYPE_VAR, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); + EMPTY_OUSTRING, SvxFileType::Var, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); if(!bTravelling) m_pWndRight->GrabFocus(); } @@ -820,12 +820,12 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) else if (sSelectedId == "filename") { m_pEditFocus->InsertField( SvxFieldItem( SvxExtFileField( - OUString(), SVXFILETYPE_VAR, SvxFileFormat::NameAndExt ), EE_FEATURE_FIELD ) ); + OUString(), SvxFileType::Var, SvxFileFormat::NameAndExt ), EE_FEATURE_FIELD ) ); } else if (sSelectedId == "pathname") { m_pEditFocus->InsertField( SvxFieldItem( SvxExtFileField( - OUString(), SVXFILETYPE_VAR, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); + OUString(), SvxFileType::Var, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) ); } } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 101f7dd8c4d1..d2f2154c6979 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -592,7 +592,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::EXTENDED_FILE: mpData.reset( - new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SvxFileFormat::NameAndExt)); + new SvxExtFileField(OUString(), SvxFileType::Var, SvxFileFormat::NameAndExt)); break; case text::textfield::Type::PAGE: mpData.reset(new SvxPageField); |