diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-02 10:28:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-07 13:05:34 +0200 |
| commit | 4906c243877681b4559b495c1dfb4dbf8c51cfb8 (patch) | |
| tree | 7b813844ffa4325ce75dd765513d6a413c198384 /svx | |
| parent | 5af475887a85e0be38869dc36252d36a572b8943 (diff) | |
convert SvtModuleOptions::EFactory to enum class
and fix issues in iterating through o3tl::enumarray
Change-Id: Ia59ef9be44d8c92c2e406fa71aa92269578e26e3
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 83340bf09f1f..a8b7267d0771 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -630,7 +630,7 @@ namespace { SvtModuleOptions::EFactory getModule(SfxBindings& rBindings) { - SvtModuleOptions::EFactory eFactory(SvtModuleOptions::E_UNKNOWN_FACTORY); + SvtModuleOptions::EFactory eFactory(SvtModuleOptions::EFactory::UNKNOWN_FACTORY); try { const uno::Reference< frame::XFrame > xFrame = @@ -655,12 +655,12 @@ void SvxSearchDialog::ShowOptionalControls_Impl() SvtCJKOptions aCJKOptions; SvtCTLOptions aCTLOptions; SvtModuleOptions::EFactory eFactory = getModule(rBindings); - bool bDrawApp = eFactory == SvtModuleOptions::E_DRAW; + bool bDrawApp = eFactory == SvtModuleOptions::EFactory::DRAW; bool bWriterApp = - eFactory == SvtModuleOptions::E_WRITER || - eFactory == SvtModuleOptions::E_WRITERWEB || - eFactory == SvtModuleOptions::E_WRITERGLOBAL; - bool bCalcApp = eFactory == SvtModuleOptions::E_CALC; + eFactory == SvtModuleOptions::EFactory::WRITER || + eFactory == SvtModuleOptions::EFactory::WRITERWEB || + eFactory == SvtModuleOptions::EFactory::WRITERGLOBAL; + bool bCalcApp = eFactory == SvtModuleOptions::EFactory::CALC; m_pLayoutBtn->Show(!bDrawApp); m_pNotesBtn->Show(bWriterApp); @@ -1803,10 +1803,10 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); bool bWriterApp = - eFactory == SvtModuleOptions::E_WRITER || - eFactory == SvtModuleOptions::E_WRITERWEB || - eFactory == SvtModuleOptions::E_WRITERGLOBAL; - bool bCalcApp = eFactory == SvtModuleOptions::E_CALC; + eFactory == SvtModuleOptions::EFactory::WRITER || + eFactory == SvtModuleOptions::EFactory::WRITERWEB || + eFactory == SvtModuleOptions::EFactory::WRITERGLOBAL; + bool bCalcApp = eFactory == SvtModuleOptions::EFactory::CALC; if (bWriterApp) m_pLayoutBtn->SetText(aLayoutWriterStr); @@ -1931,10 +1931,10 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); bool bWriterApp = - eFactory == SvtModuleOptions::E_WRITER || - eFactory == SvtModuleOptions::E_WRITERWEB || - eFactory == SvtModuleOptions::E_WRITERGLOBAL; - bool bCalcApp = eFactory == SvtModuleOptions::E_CALC; + eFactory == SvtModuleOptions::EFactory::WRITER || + eFactory == SvtModuleOptions::EFactory::WRITERWEB || + eFactory == SvtModuleOptions::EFactory::WRITERGLOBAL; + bool bCalcApp = eFactory == SvtModuleOptions::EFactory::CALC; if (bCalcApp) m_pLayoutBtn->SetText( aLayoutCalcStr ); |