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 /sfx2 | |
| parent | 5af475887a85e0be38869dc36252d36a572b8943 (diff) | |
convert SvtModuleOptions::EFactory to enum class
and fix issues in iterating through o3tl::enumarray
Change-Id: Ia59ef9be44d8c92c2e406fa71aa92269578e26e3
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/docfac.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 4baecd5b403a..9e0f8de67342 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -204,12 +204,12 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam // Interpret given name as Service- and ShortName! SvtModuleOptions aOpt; SvtModuleOptions::EFactory eFactory = SvtModuleOptions::ClassifyFactoryByServiceName(rName); - if (eFactory == SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFactory == SvtModuleOptions::EFactory::UNKNOWN_FACTORY) eFactory = SvtModuleOptions::ClassifyFactoryByShortName(rName); // could not classify factory by its service nor by its short name. // Must be an unknown factory! => return NULL - if (eFactory == SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFactory == SvtModuleOptions::EFactory::UNKNOWN_FACTORY) return NULL; // For the following code we need some additional information. diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 55dd58283252..ba2ff680d591 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -301,9 +301,9 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU void SfxObjectFactory::SetStandardTemplate( const OUString& rServiceName, const OUString& rTemplate ) { SvtModuleOptions::EFactory eFac = SvtModuleOptions::ClassifyFactoryByServiceName(rServiceName); - if (eFac == SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFac == SvtModuleOptions::EFactory::UNKNOWN_FACTORY) eFac = SvtModuleOptions::ClassifyFactoryByShortName(rServiceName); - if (eFac != SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFac != SvtModuleOptions::EFactory::UNKNOWN_FACTORY) { SetSystemTemplate( rServiceName, rTemplate ); SvtModuleOptions().SetFactoryStandardTemplate(eFac, rTemplate); @@ -313,11 +313,11 @@ void SfxObjectFactory::SetStandardTemplate( const OUString& rServiceName, const OUString SfxObjectFactory::GetStandardTemplate( const OUString& rServiceName ) { SvtModuleOptions::EFactory eFac = SvtModuleOptions::ClassifyFactoryByServiceName(rServiceName); - if (eFac == SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFac == SvtModuleOptions::EFactory::UNKNOWN_FACTORY) eFac = SvtModuleOptions::ClassifyFactoryByShortName(rServiceName); OUString sTemplate; - if (eFac != SvtModuleOptions::E_UNKNOWN_FACTORY) + if (eFac != SvtModuleOptions::EFactory::UNKNOWN_FACTORY) sTemplate = SvtModuleOptions().GetFactoryStandardTemplate(eFac); return sTemplate; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index d20dfc4c9e53..fd6190da3448 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1716,7 +1716,7 @@ static std::vector<OUString> lcl_getAllFactoryURLs () { if ( ! SfxObjectFactory::GetStandardTemplate( aServiceNames[i] ).isEmpty() ) { - SvtModuleOptions::EFactory eFac = SvtModuleOptions::E_WRITER; + SvtModuleOptions::EFactory eFac = SvtModuleOptions::EFactory::WRITER; SvtModuleOptions::ClassifyFactoryByName( aServiceNames[i], eFac ); aList.push_back(aModOpt.GetFactoryEmptyDocumentURL(eFac)); } |