2 files changed, 17 insertions, 6 deletions
diff --git a/unoidl/source/sourceprovider-parser-requires.hxx b/unoidl/source/sourceprovider-parser-requires.hxx
index 98657205ac7a..f9cd27ef83b1 100644
--- a/unoidl/source/sourceprovider-parser-requires.hxx
+++ b/unoidl/source/sourceprovider-parser-requires.hxx
@@ -85,13 +85,18 @@ struct SourceProviderType {
         TYPE_INTERFACE, TYPE_INSTANTIATED_POLYMORPHIC_STRUCT, TYPE_PARAMETER
     };
 
-    SourceProviderType() {}
+    SourceProviderType():
+        type(), entity() // avoid false warnings about uninitialized members
+    {}
 
-    explicit SourceProviderType(Type theType): type(theType)
+    explicit SourceProviderType(Type theType):
+        type(theType),
+        entity() // avoid false warnings about uninitialized member
     { assert(theType <= TYPE_ANY); }
 
     explicit SourceProviderType(SourceProviderType const * componentType):
-        type(TYPE_SEQUENCE)
+        type(TYPE_SEQUENCE),
+        entity() // avoid false warnings about uninitialized member
     { assert(componentType != 0); subtypes.push_back(*componentType); }
 
     SourceProviderType(
@@ -113,7 +118,8 @@ struct SourceProviderType {
     { assert(theEntity != 0); }
 
     explicit SourceProviderType(OUString const & identifier):
-        type(TYPE_PARAMETER), name(identifier)
+        type(TYPE_PARAMETER), name(identifier),
+        entity() // avoid false warnings about uninitialized member
     {}
 
     OUString getName() const;
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index ed5105f254b7..c1959a76b739 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -233,7 +233,9 @@ struct SourceProviderEntity {
     explicit SourceProviderEntity(Kind theKind): kind(theKind)
     { assert(theKind >= KIND_INTERFACE_DECL); }
 
-    SourceProviderEntity() {} // needed for std::map::operator []
+    SourceProviderEntity(): // needed for std::map::operator []
+        kind() // avoid false warnings about uninitialized members
+    {}
 
     Kind kind;
     rtl::Reference<unoidl::Entity> entity;
@@ -243,7 +245,10 @@ struct SourceProviderEntity {
 struct SourceProviderScannerData {
     SourceProviderScannerData(
         rtl::Reference<unoidl::Manager> const & theManager):
-        manager(theManager), errorLine(0)
+        manager(theManager),
+        sourcePosition(), sourceEnd(),
+            // avoid false warnings about uninitialized members
+        errorLine(0)
     { assert(manager.is()); }
 
     void setSource(void const * address, sal_uInt64 size) {