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/source/filter/basflt/iodetect.cxx | |
| 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/source/filter/basflt/iodetect.cxx')
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 2fc3c0909b1c..5b6e92ff8a91 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -24,7 +24,6 @@ #include <svtools/parhtml.hxx> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> -#include <o3tl/enumarray.hxx> using namespace ::com::sun::star; @@ -34,7 +33,7 @@ static bool IsDocShellRegistered() return SvtModuleOptions().IsWriter(); } -o3tl::enumarray<ReaderWriterType, SwIoDetect> aFilterDetect = +SwIoDetect aFilterDetect[] = { SwIoDetect( FILTER_RTF ), SwIoDetect( FILTER_BAS ), @@ -48,11 +47,6 @@ o3tl::enumarray<ReaderWriterType, SwIoDetect> aFilterDetect = SwIoDetect( FILTER_TEXT ) }; -SwIoDetect& GetSwIoDetect(ReaderWriterType eType) -{ - return aFilterDetect[eType]; -} - const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) { // for StorageFilters also set the SubStorageName |