1 files changed, 25 insertions, 14 deletions
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index 6503b63fb626..131303442ef9 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -88,11 +87,16 @@ for d in definitionSet:
     fieldType = definitionToTypeMap[d]
     if "ModuleClient" in fieldType:
         continue
-    # leave the weld stuff alone until Caolan is finished
-    if "weld::" in fieldType:
-        continue
     if "::sfx2::sidebar::ControllerItem" in fieldType:
         continue
+    if "(lambda at " in d[0]:
+        continue
+    if "weld::CustomWeld" in fieldType:
+        continue
+    if "weld::Container" in fieldType:
+        continue
+    if "weld::Frame" in fieldType:
+        continue
     untouchedSet.add((d[0] + " " + d[1] + " " + fieldType, srcLoc))
     untouchedSetD.add(d)
 
@@ -124,13 +128,12 @@ for d in definitionSet:
         continue
     if "VclPtr<" in fieldType:
         continue
-    # leave the weld stuff alone until Caolan is finished
-    if "weld::" in fieldType:
-        continue
     if "osl::Mutex" in fieldType:
         continue
     if "::sfx2::sidebar::ControllerItem" in fieldType:
         continue
+    if "(lambda at " in d[0]:
+        continue
     onlyUsedInConstructorSet.add((d[0] + " " + d[1] + " " + fieldType, srcLoc))
 
 writeonlySet = set()
@@ -168,18 +171,23 @@ for d in definitionSet:
     # mutex locking
     if "Guard" in fieldType:
         continue
-    # leave the weld stuff alone until Caolan is finished
-    if "weld::" in fieldType:
-        continue
     # these are just all model classes
     if (srcLoc.startswith("oox/")
         or srcLoc.startswith("lotuswordpro/")
         or srcLoc.startswith("include/oox/")
         or srcLoc.startswith("include/filter/")
         or srcLoc.startswith("hwpfilter/")
-        or srcLoc.startswith("filter/")):
+        or srcLoc.startswith("filter/")
+        or srcLoc.startswith("vcl/source/filter/")):
+        continue
+    if "(lambda at " in d[0]:
+        continue
+    if "weld::CustomWeld" in fieldType:
+        continue
+    if "weld::Container" in fieldType:
+        continue
+    if "weld::Frame" in fieldType:
         continue
-
     writeonlySet.add((d[0] + " " + d[1] + " " + definitionToTypeMap[d], srcLoc))
 
 
@@ -204,8 +212,11 @@ for d in definitionSet:
     if (srcLoc.startswith("hwpfilter/")
         or srcLoc.startswith("lotuswordpro/")):
         continue
-    # leave the weld stuff alone until Caolan is finished
-    if "weld::" in fieldType:
+    if "(lambda at " in d[0]:
+        continue
+    if "weld::CustomWeld" in fieldType:
+        continue
+    if "weld::Container" in fieldType:
         continue
     readonlySet.add((d[0] + " " + d[1] + " " + definitionToTypeMap[d], srcLoc))