From d9cff00683d31fbd4b3c4c2d6afbe164f4a85d47 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 16 Sep 2016 16:11:43 +0200 Subject: 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. --- sw/source/filter/basflt/iodetect.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'sw/source/filter/basflt/iodetect.cxx') 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 #include #include -#include using namespace ::com::sun::star; @@ -34,7 +33,7 @@ static bool IsDocShellRegistered() return SvtModuleOptions().IsWriter(); } -o3tl::enumarray aFilterDetect = +SwIoDetect aFilterDetect[] = { SwIoDetect( FILTER_RTF ), SwIoDetect( FILTER_BAS ), @@ -48,11 +47,6 @@ o3tl::enumarray aFilterDetect = SwIoDetect( FILTER_TEXT ) }; -SwIoDetect& GetSwIoDetect(ReaderWriterType eType) -{ - return aFilterDetect[eType]; -} - const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) { // for StorageFilters also set the SubStorageName -- cgit