More fine grained disabling of -Werror for collada headers only

Change-Id: I4f80d480e6e053038b85f6b26f74abc5921c2f38

avmedia/Library_avmedia.mk

@@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 endif
 
 ifeq ($(ENABLE_COLLADA),TRUE)
-$(eval $(call gb_Library_set_warnings_not_errors,avmedia))
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,avmedia,\

avmedia/source/framework/collada_headers.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX
+#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX
+
+#include <sal/config.h>
+
+#if defined __GNUC__
+#pragma GCC system_header
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+
+#include <COLLADA2GLTFWriter.h>
+
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

avmedia/source/framework/modeltools.cxx

@@ -32,7 +32,7 @@
 #include <config_features.h>
 
 #if HAVE_FEATURE_COLLADA
-#include <COLLADA2GLTFWriter.h>
+#include <collada_headers.hxx>
 #include <GLTFAsset.h>
 #endif