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 /xmloff | |
| parent | 5af475887a85e0be38869dc36252d36a572b8943 (diff) | |
convert SvtModuleOptions::EFactory to enum class
and fix issues in iterating through o3tl::enumarray
Change-Id: Ia59ef9be44d8c92c2e406fa71aa92269578e26e3
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 89cee1006824..fe100a0dec22 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -428,7 +428,7 @@ void SvXMLExport::_InitCtor() // Shapes in Writer cannot be named via context menu (#i51726#) void SvXMLExport::_DetermineModelType() { - meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY; + meModelType = SvtModuleOptions::EFactory::UNKNOWN_FACTORY; if ( mxModel.is() ) { @@ -2397,7 +2397,7 @@ void SvXMLExport::DisposingModel() { mxModel.clear(); // Shapes in Writer cannot be named via context menu (#i51726#) - meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY; + meModelType = SvtModuleOptions::EFactory::UNKNOWN_FACTORY; mxEventListener.clear(); } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index e7ec2fbad58f..7e2b5d64d4d7 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -580,7 +580,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape // export hyperlinks with <a><shape/></a>. Currently only in draw since draw // does not support document events - if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::E_DRAW) ) try + if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::EFactory::DRAW) ) try { presentation::ClickAction eAction = presentation::ClickAction_NONE; xSet->getPropertyValue("OnClick") >>= eAction; @@ -649,9 +649,9 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape any names for shapes, except for group shapes. */ { - if ( ( GetExport().GetModelType() != SvtModuleOptions::E_WRITER && - GetExport().GetModelType() != SvtModuleOptions::E_WRITERWEB && - GetExport().GetModelType() != SvtModuleOptions::E_WRITERGLOBAL ) || + if ( ( GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITER && + GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERWEB && + GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERGLOBAL ) || !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) || aShapeInfo.meShapeType == XmlShapeTypeDrawGroupShape || ( aShapeInfo.meShapeType == XmlShapeTypeDrawCustomShape && |