[Libreoffice-commits] core.git: xmloff/source
Stephan Bergmann
sbergman at redhat.com
Sat Dec 17 19:43:54 UTC 2016
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 66b476647f937afafe55354fccd0f5d859e8cd0b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Dec 17 20:42:11 2016 +0100
More blind fix attempt for MSVC
"warning C4822: 'XMLEmbeddedObjectImportContext::{ctor}::Entry::Entry' : local
class member function does not have a body"
Change-Id: Ieeb11aaf3f204532a77ce80d47e0e6996697003c
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 2c3da98..afe67ad 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -134,6 +134,16 @@ 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 ) :
@@ -182,11 +192,6 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if( !sClass.isEmpty() )
{
- struct Entry {
- XMLTokenEnum eClass;
- OUStringLiteral sFilterService;
- Entry() = delete; // avoid MSVC warning C4510
- };
static Entry const aServiceMap[] = {
{ XML_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
{ XML_ONLINE_TEXT, OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
More information about the Libreoffice-commits
mailing list