diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-23 13:34:31 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:05 -0500 |
| commit | d2f7063d7e8c7631d804ea18ce5cc5d0aa310cb9 (patch) | |
| tree | 216a2bf4e0458bc916c2092b1e06d2b28c358f53 /sfx2 | |
| parent | 5fb3078cc992da133527a0b2f933553345c0b58e (diff) | |
convert SFXWB_ constants to scoped enum
Change-Id: I63d442e51b7e22093da1c232e1b575bc961c0e69
(cherry picked from commit 0e04b531448d7915b40c59dccef7a9313bd28c11)
(cherry picked from commit e14539d0ed367e377346cbc0247b4c3e3637c35e)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/new.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 0a7f60b219e0..5d55b9c1ab39 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -140,7 +140,7 @@ class SfxNewFileDialog_Impl OUString aNone; OUString sLoadTemplate; - sal_uInt16 nFlags; + SfxNewFileDialogMode nFlags; SfxDocumentTemplates aTemplates; SfxObjectShellLock xDocShell; VclPtr<SfxNewFileDialog> pAntiImpl; @@ -156,7 +156,7 @@ class SfxNewFileDialog_Impl public: - SfxNewFileDialog_Impl(SfxNewFileDialog* pAntiImplP, sal_uInt16 nFlags); + SfxNewFileDialog_Impl(SfxNewFileDialog* pAntiImplP, SfxNewFileDialogMode nFlags); ~SfxNewFileDialog_Impl(); // Returns sal_False if '- No -' is set as a template @@ -186,7 +186,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Idle*, void) return; } - if (m_pMoreBt->get_expanded() && (nFlags & SFXWB_PREVIEW) == SFXWB_PREVIEW) + if (m_pMoreBt->get_expanded() && (nFlags == SfxNewFileDialogMode::Preview)) { OUString aFileName = aTemplates.GetPath(m_pRegionLb->GetSelectEntryPos(), nEntry - 1); @@ -342,7 +342,7 @@ void SfxNewFileDialog_Impl::SetTemplateFlags(SfxTemplateFlags nSet) SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( - SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl) + SfxNewFileDialog* pAntiImplP, SfxNewFileDialogMode nFl) : aNone(SfxResId(STR_NONE).toString()) , nFlags(nFl) , pAntiImpl(pAntiImplP) @@ -366,9 +366,9 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( pAntiImplP->get(m_pLoadFilePB, "fromfile"); sLoadTemplate = pAntiImplP->get<FixedText>("alttitle")->GetText(); - if (!nFlags) + if (nFlags == SfxNewFileDialogMode::NONE) m_pMoreBt->Hide(); - else if(SFXWB_LOAD_TEMPLATE == nFlags) + else if(SfxNewFileDialogMode::LoadTemplate == nFlags) { m_pLoadFilePB->SetClickHdl(LINK(this, SfxNewFileDialog_Impl, LoadFile)); m_pLoadFilePB->Show(); @@ -389,7 +389,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( OUString &rExtra = pAntiImplP->GetExtraData(); bool bExpand = !rExtra.isEmpty() && rExtra[0] == 'Y'; - m_pMoreBt->set_expanded(bExpand && nFlags); + m_pMoreBt->set_expanded(bExpand && (nFlags != SfxNewFileDialogMode::NONE)); m_pTemplateLb->SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, TemplateSelect)); m_pTemplateLb->SetDoubleClickHdl(LINK(this, SfxNewFileDialog_Impl, DoubleClick)); @@ -421,7 +421,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl() rExtra = m_pMoreBt->get_expanded() ? OUString("Y") : OUString("N"); } -SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags) +SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, SfxNewFileDialogMode nFlags) : SfxModalDialog(pParent, "LoadTemplateDialog", "sfx/ui/loadtemplatedialog.ui"), pImpl( new SfxNewFileDialog_Impl(this, nFlags) ) |