diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-23 15:30:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-24 09:36:58 +0200 |
commit | b2125ae811c2fc2233026e5218a03bc24210a5c1 (patch) | |
tree | 3945a55c8d008a41645f4c05a8f53d93629710f1 /sfx2/source/doc | |
parent | ecec9afe852d3bca019b6b44a40d8be39e0f58f4 (diff) |
convert FILTER_APPLICATION to enum class
Change-Id: I9ad1d1c9a2d9d538a4cc95f0b65f45f631116916
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a584a7d8f296..6b32d1ae58d2 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -136,19 +136,19 @@ public: INetURLObject aUrl(rItem.aPath); OUString aExt = aUrl.getExtension(); - if (meApp == FILTER_APP_WRITER) + if (meApp == FILTER_APPLICATION::WRITER) { bRet = aExt == "ott" || aExt == "stw" || aExt == "oth" || aExt == "dot" || aExt == "dotx"; } - else if (meApp == FILTER_APP_CALC) + else if (meApp == FILTER_APPLICATION::CALC) { bRet = aExt == "ots" || aExt == "stc" || aExt == "xlt" || aExt == "xltm" || aExt == "xltx"; } - else if (meApp == FILTER_APP_IMPRESS) + else if (meApp == FILTER_APPLICATION::IMPRESS) { bRet = aExt == "otp" || aExt == "sti" || aExt == "pot" || aExt == "potm" || aExt == "potx"; } - else if (meApp == FILTER_APP_DRAW) + else if (meApp == FILTER_APPLICATION::DRAW) { bRet = aExt == "otg" || aExt == "std"; } @@ -289,7 +289,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) createDefaultTemplateMenu(); mpLocalView->Populate(); - mpCurView->filterItems(ViewFilter_Application(FILTER_APP_WRITER)); + mpCurView->filterItems(ViewFilter_Application(FILTER_APPLICATION::WRITER)); readSettings(); @@ -330,7 +330,7 @@ void SfxTemplateManagerDlg::setSaveMode() while (mpTabControl->GetPageCount() > 1) mpTabControl->RemovePage(mpTabControl->GetPageId(1)); - mpCurView->filterItems(ViewFilter_Application(FILTER_APP_NONE)); + mpCurView->filterItems(ViewFilter_Application(FILTER_APPLICATION::NONE)); mpViewBar->ShowItem(VIEWBAR_SAVE); mpViewBar->HideItem(VIEWBAR_IMPORT); @@ -356,15 +356,15 @@ FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentFilter() const sal_uInt16 nCurPageId = mpTabControl->GetCurPageId(); if (nCurPageId == mpTabControl->GetPageId(FILTER_DOCS)) - return FILTER_APP_WRITER; + return FILTER_APPLICATION::WRITER; else if (nCurPageId == mpTabControl->GetPageId(FILTER_PRESENTATIONS)) - return FILTER_APP_IMPRESS; + return FILTER_APPLICATION::IMPRESS; else if (nCurPageId == mpTabControl->GetPageId(FILTER_SHEETS)) - return FILTER_APP_CALC; + return FILTER_APPLICATION::CALC; else if (nCurPageId == mpTabControl->GetPageId(FILTER_DRAWINGS)) - return FILTER_APP_DRAW; + return FILTER_APPLICATION::DRAW; - return FILTER_APP_NONE; + return FILTER_APPLICATION::NONE; } IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl) @@ -386,24 +386,25 @@ void SfxTemplateManagerDlg::readSettings () if ( aViewSettings.Exists() ) { - sal_uInt16 nFilter = 0; + sal_uInt16 nTmp = 0; aViewSettings.GetUserItem(TM_SETTING_LASTFOLDER) >>= aLastFolder; - aViewSettings.GetUserItem(TM_SETTING_FILTER) >>= nFilter; - + aViewSettings.GetUserItem(TM_SETTING_FILTER) >>= nTmp; + FILTER_APPLICATION nFilter = static_cast<FILTER_APPLICATION>(nTmp); switch (nFilter) { - case FILTER_APP_WRITER: + case FILTER_APPLICATION::WRITER: nPageId = mpTabControl->GetPageId(FILTER_DOCS); break; - case FILTER_APP_IMPRESS: + case FILTER_APPLICATION::IMPRESS: nPageId = mpTabControl->GetPageId(FILTER_PRESENTATIONS); break; - case FILTER_APP_CALC: + case FILTER_APPLICATION::CALC: nPageId = mpTabControl->GetPageId(FILTER_SHEETS); break; - case FILTER_APP_DRAW: + case FILTER_APPLICATION::DRAW: nPageId = mpTabControl->GetPageId(FILTER_DRAWINGS); break; + default: break; } } |