diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-08 15:27:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-11 10:16:54 +0200 |
| commit | fc4b79f76cf030015c5fdc9609afc0482223d198 (patch) | |
| tree | e23b14bd39ffdf90bc9e09c5735a39acb176613e | |
| parent | 9853d0fa7ae50da40d384945afc8871b80194493 (diff) | |
convert tExternalDataType to enum class
Change-Id: I3cf5670e8cc616e4284c5f4865d244ee4db2c628
| -rw-r--r-- | sw/inc/IDocumentExternalData.hxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx index adbaebc5ea18..6f985f6bc4f0 100644 --- a/sw/inc/IDocumentExternalData.hxx +++ b/sw/inc/IDocumentExternalData.hxx @@ -24,11 +24,12 @@ namespace sw { -enum tExternalDataType { FIB, STTBF_ASSOC }; + +enum class tExternalDataType { FIB, STTBF_ASSOC }; struct ExternalDataTypeHash { - size_t operator()(tExternalDataType eType) const { return eType; } + size_t operator()(tExternalDataType eType) const { return static_cast<size_t>(eType); } }; class ExternalData diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index cd8b821c9a95..822fd4f3a66a 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2840,7 +2840,7 @@ void WW8Export::WriteFkpPlcUsw() // Write SttbfAssoc WW8SttbAssoc * pSttbfAssoc = dynamic_cast<WW8SttbAssoc *> - (pDoc->getIDocumentExternalData().getExternalData(::sw::STTBF_ASSOC).get()); + (pDoc->getIDocumentExternalData().getExternalData(::sw::tExternalDataType::STTBF_ASSOC).get()); if ( pSttbfAssoc ) // #i106057# { @@ -2862,7 +2862,7 @@ void WW8Export::WriteFkpPlcUsw() // Reclaim stored FIB data from document. ::ww8::WW8FibData * pFibData = dynamic_cast<ww8::WW8FibData *> - (pDoc->getIDocumentExternalData().getExternalData(::sw::FIB).get()); + (pDoc->getIDocumentExternalData().getExternalData(::sw::tExternalDataType::FIB).get()); if ( pFibData ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ec49e488e918..deae95a56771 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4882,12 +4882,12 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) ::sw::tExternalDataPointer pExternalFibData(pFibData); - rDoc.getIDocumentExternalData().setExternalData(::sw::FIB, pExternalFibData); + rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::FIB, pExternalFibData); ::sw::tExternalDataPointer pSttbfAsoc (new ::ww8::WW8Sttb<ww8::WW8Struct>(*pTableStream, pWwFib->fcSttbfAssoc, pWwFib->lcbSttbfAssoc)); - rDoc.getIDocumentExternalData().setExternalData(::sw::STTBF_ASSOC, pSttbfAsoc); + rDoc.getIDocumentExternalData().setExternalData(::sw::tExternalDataType::STTBF_ASSOC, pSttbfAsoc); if (pWwFib->fWriteReservation || pWwFib->fReadOnlyRecommended) { |