From 08e18475c39f9fd79aea47c37afaf92734bb727d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 17 Dec 2016 20:50:47 +0100 Subject: More blind fix attempt for MSVC Change-Id: I023d79c0d8928d8b43df67996ca4eb9dc6bfb25e --- xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index afe67ade0f94..c9fc928ea58a 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -134,16 +134,6 @@ void XMLEmbeddedObjectImportContext::SetComponent( xComp = rComp; // keep ref to component only if there is a handler } -namespace { - -struct Entry { - XMLTokenEnum eClass; - OUStringLiteral sFilterService; - Entry() = delete; // avoid MSVC warning C4510 -}; - -} - XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList ) : @@ -192,7 +182,8 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( if( !sClass.isEmpty() ) { - static Entry const aServiceMap[] = { + static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService; + } const aServiceMap[] = { { XML_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) }, { XML_ONLINE_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) }, { XML_SPREADSHEET, OUStringLiteral(XML_IMPORT_FILTER_CALC) }, -- cgit