Kaydet (Commit) 08e18475 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

More blind fix attempt for MSVC

Change-Id: I023d79c0d8928d8b43df67996ca4eb9dc6bfb25e
üst 66b47664
...@@ -115,6 +115,8 @@ gb_AFLAGS := $(AFLAGS) ...@@ -115,6 +115,8 @@ gb_AFLAGS := $(AFLAGS)
# C4505: 'function' : unreferenced local function has been removed # C4505: 'function' : unreferenced local function has been removed
# C4510: 'class' : default constructor could not be generated
# C4512: 'class' : assignment operator could not be generated # C4512: 'class' : assignment operator could not be generated
# (an issue with MSVC 2013 that appears to be gone with MSVC 2015) # (an issue with MSVC 2013 that appears to be gone with MSVC 2015)
...@@ -186,6 +188,7 @@ gb_CXXFLAGS := \ ...@@ -186,6 +188,7 @@ gb_CXXFLAGS := \
-wd4351 \ -wd4351 \
-wd4373 \ -wd4373 \
-wd4505 \ -wd4505 \
-wd4510 \
-wd4512 \ -wd4512 \
-wd4611 \ -wd4611 \
-wd4706 \ -wd4706 \
......
...@@ -134,16 +134,6 @@ void XMLEmbeddedObjectImportContext::SetComponent( ...@@ -134,16 +134,6 @@ void XMLEmbeddedObjectImportContext::SetComponent(
xComp = rComp; // keep ref to component only if there is a handler 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( XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList >& xAttrList ) : const Reference< XAttributeList >& xAttrList ) :
...@@ -192,7 +182,8 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( ...@@ -192,7 +182,8 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if( !sClass.isEmpty() ) if( !sClass.isEmpty() )
{ {
static Entry const aServiceMap[] = { static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService;
} const aServiceMap[] = {
{ XML_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) }, { XML_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
{ XML_ONLINE_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) }, { XML_ONLINE_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
{ XML_SPREADSHEET, OUStringLiteral(XML_IMPORT_FILTER_CALC) }, { XML_SPREADSHEET, OUStringLiteral(XML_IMPORT_FILTER_CALC) },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment