diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-16 16:11:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-16 16:11:43 +0200 |
| commit | d9cff00683d31fbd4b3c4c2d6afbe164f4a85d47 (patch) | |
| tree | 3acc307f64fc7cae7e67aa3614af1f4d27e9bfe6 /sw/inc | |
| parent | 6da5ed6d7cea0917047dca92a9e32a7eb5e85ad6 (diff) | |
Revert "convert ReaderWriterEnum to scoped enum"
It causes breakage on some gcc's with "default constructor could be not
generated" message.
Will attempt to re-land later.
This reverts commit 6da5ed6d7cea0917047dca92a9e32a7eb5e85ad6.
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/iodetect.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 33673cc83742..91ee8ae56d21 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -58,21 +58,21 @@ struct SwIoDetect } }; -enum class ReaderWriterType { - Rtf, - Bas, - Ww6, - Ww8, - RtfWh, - Html, - Ww5, - Xml, - TextDlg, - Text, - LAST = Text +enum ReaderWriterEnum { + READER_WRITER_RTF, + READER_WRITER_BAS, + READER_WRITER_WW6, + READER_WRITER_WW8, + READER_WRITER_RTF_WH, + READER_WRITER_HTML, + READER_WRITER_WW5, + READER_WRITER_XML, + READER_WRITER_TEXT_DLG, + READER_WRITER_TEXT, + MAXFILTER }; -SwIoDetect& GetSwIoDetect(ReaderWriterType); +extern SwIoDetect aFilterDetect[]; /** The following class is a wrapper for basic i/o functions of Writer 3.0. Everything is static. All filter names mentioned are Writer-internal |