323 files changed, 30627 insertions, 14936 deletions

diff --git a/compilerplugins/clang/automem.cxx b/compilerplugins/clang/automem.cxx
index 099c05458e13..92478b9fbb95 100644
--- a/compilerplugins/clang/automem.cxx
+++ b/compilerplugins/clang/automem.cxx
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
 
 /**
@@ -51,7 +52,7 @@ bool AutoMem::VisitCXXDeleteExpr(const CXXDeleteExpr* expr)
 {
     if (ignoreLocation( expr ))
         return true;
-    StringRef aFileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+    StringRef aFileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()));
     if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/salhelper/")
         || loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/osl/")
         || loplugin::hasPathnamePrefix(aFileName, SRCDIR "/salhelper/")
@@ -79,7 +80,7 @@ bool AutoMem::VisitCXXDeleteExpr(const CXXDeleteExpr* expr)
     report(
         DiagnosticsEngine::Warning,
         "calling delete on object field, rather use std::unique_ptr or std::scoped_ptr",
-        compat::getBeginLoc(expr))
+        expr->getBeginLoc())
         << expr->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 3f4d6cddecd3..1d003acdb8a6 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -197,18 +197,20 @@ public:
                     // sc/source/core/tool/adiasync.cxx, would leak
                     // ScAddInAsync* keys if that set is not empty at exit
                 || name == "g_aWindowList"
-                    //vcl/unx/gtk3/a11y/gtk3atkutil.cxx, asserted empty at exit
+                    //vcl/unx/gtk3/a11y/atkutil.cxx, asserted empty at exit
                 || name == "gFontPreviewVirDevs"
                     //svtools/source/control/ctrlbox.cxx, empty at exit
+                || name == "gStylePreviewCache" // svx/source/tbxctrls/StylesPreviewWindow.cxx
                 || name == "aLogger" // FormulaLogger& FormulaLogger::get() in sc/source/core/tool/formulalogger.cxx
-                || name == "m_aUncommittedRegistrations" // sw/source/uibase/dbui/dbmgr.cxx
+                || name == "s_aUncommittedRegistrations" // sw/source/uibase/dbui/dbmgr.cxx
                 || (loplugin::DeclCheck(pVarDecl).Var("aAllListeners")
                     .Class("ScAddInListener").GlobalNamespace()) // not owning
                 || (loplugin::DeclCheck(pVarDecl).Var("maThreadSpecific")
                     .Class("ScDocument").GlobalNamespace()) // not owning
                 || name == "s_aLOKWindowsMap" // LOK only, guarded by assert, and LOK never tries to perform a VCL cleanup
                 || name == "s_aLOKWeldBuildersMap" // LOK only, similar case as above
-                || name == "m_pNotebookBarWeldedWrapper" // LOK only, warning about map's key, no VCL cleanup performed
+                || name == "s_aLOKPopupsMap" // LOK only, similar case as above
+                || name == "gNotebookBarManager" // LOK only case, when notebookbar is closed - VclPtr instance is removed
                 || name == "gStaticManager" // vcl/source/graphic/Manager.cxx - stores non-owning pointers
                 || name == "aThreadedInterpreterPool"    // ScInterpreterContext(Pool), not owning
                 || name == "aNonThreadedInterpreterPool" // ScInterpreterContext(Pool), not owning
@@ -218,6 +220,22 @@ public:
                    // Windows-only extensions/source/scanner/scanwin.cxx, problematic
                    // Twain::mpThread -> ShimListenerThread::mxTopWindow released via Twain::Reset
                    // clearing mpThread
+                || name == "g_newReadOnlyDocs"
+                   // sfx2/source/doc/docfile.cxx, warning about map's key
+                || name == "g_existingReadOnlyDocs"
+                   // sfx2/source/doc/docfile.cxx, warning about map's key
+                || name == "gaFramesArr_Impl"
+                   // sfx2/source/view/frame.cxx, vector of pointer, so not a problem, nothing is going to happen on shutdown
+                || name == "g_pOLELRU_Cache" || name == "s_aTableColumnsMap"
+                   // TODO
+                || name == "SINGLETON"
+                   // TheAquaA11yFocusTracker in vcl/osx/a11yfocustracker.cxx,
+                   // AquaA11yFocusTracker::m_aDocumentWindowList elements symmetrically added and
+                   // removed in AquaA11yFocusTracker::window_got_focus and
+                   // AquaA11yFocusTracker::WindowEventHandler (TODO: is that guaranteed?)
+                || (loplugin::DeclCheck(pVarDecl).Var("maEditViewHistory")
+                        .Class("LOKEditViewHistory").GlobalNamespace())
+                   // sfx2/lokhelper.hxx, only handling pointers, not owning
                ) // these variables appear unproblematic
             {
                 return true;
diff --git a/compilerplugins/clang/blockblock.cxx b/compilerplugins/clang/blockblock.cxx
index f1d9ec7a9d61..bfcb0206df0f 100644
--- a/compilerplugins/clang/blockblock.cxx
+++ b/compilerplugins/clang/blockblock.cxx
@@ -14,6 +14,7 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
 
 /**
@@ -55,9 +56,9 @@ bool BlockBlock::VisitCompoundStmt(CompoundStmt const * compound)
     auto inner = *compound->body_begin();
     if (!isa<CompoundStmt>(inner))
         return true;
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(compound)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(compound->getBeginLoc()))
         return true;
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(inner)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(inner->getBeginLoc()))
         return true;
     if (containsPreprocessingConditionalInclusion(compound->getSourceRange())) {
         return true;
@@ -65,12 +66,12 @@ bool BlockBlock::VisitCompoundStmt(CompoundStmt const * compound)
     report(
         DiagnosticsEngine::Warning,
         "block directly inside block",
-         compat::getBeginLoc(compound))
+         compound->getBeginLoc())
         << compound->getSourceRange();
     report(
         DiagnosticsEngine::Note,
         "inner block here",
-         compat::getBeginLoc(inner))
+         inner->getBeginLoc())
         << inner->getSourceRange();
     return true;
 }
@@ -94,7 +95,7 @@ bool BlockBlock::VisitCaseStmt(CaseStmt const * caseStmt)
     report(
         DiagnosticsEngine::Warning,
         "block directly inside block",
-         compat::getBeginLoc(compoundStmt))
+         compoundStmt->getBeginLoc())
         << compoundStmt->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/bufferadd.cxx b/compilerplugins/clang/bufferadd.cxx
index bc8c7065b2a1..8f58e46aba14 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -15,6 +15,8 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -47,9 +49,11 @@ public:
         // some false +
         if (loplugin::isSamePathname(fn, SRCDIR "/unoidl/source/sourcetreeprovider.cxx"))
             return false;
-        if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/StyleSheetTable.cxx"))
+        if (loplugin::isSamePathname(fn,
+                                     SRCDIR "/sw/source/writerfilter/dmapper/StyleSheetTable.cxx"))
             return false;
-        if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/GraphicImport.cxx"))
+        if (loplugin::isSamePathname(fn,
+                                     SRCDIR "/sw/source/writerfilter/dmapper/GraphicImport.cxx"))
             return false;
         if (loplugin::isSamePathname(fn, SRCDIR "/sdext/source/pdfimport/pdfparse/pdfparse.cxx"))
             return false;
@@ -65,7 +69,7 @@ public:
                 && badMap.find(pair.first) == badMap.end())
                 report(DiagnosticsEngine::Warning,
                        "convert this append sequence into a *String + sequence",
-                       compat::getBeginLoc(pair.first))
+                       pair.first->getBeginLoc())
                     << pair.first->getSourceRange();
     }
 
@@ -290,7 +294,7 @@ bool BufferAdd::isMethodOkToMerge(CXXMemberCallExpr const* memberCall)
 
 Expr const* BufferAdd::ignore(Expr const* expr)
 {
-    return compat::IgnoreImplicit(compat::IgnoreImplicit(expr)->IgnoreParens());
+    return expr->IgnoreImplicit()->IgnoreParens()->IgnoreImplicit();
 }
 
 bool BufferAdd::isSideEffectFree(Expr const* expr)
@@ -343,10 +347,19 @@ bool BufferAdd::isSideEffectFree(Expr const* expr)
                     if (isSideEffectFree(callExpr->getArg(0)))
                         return true;
                 // allowlist some known-safe methods
-                if (name.endswith("ResId") || name == "GetXMLToken")
+                if (compat::ends_with(name, "ResId") || name == "GetXMLToken")
                     if (isSideEffectFree(callExpr->getArg(0)))
                         return true;
             }
+        // O[U]String::operator std::[u16]string_view:
+        if (auto const d = dyn_cast_or_null<CXXConversionDecl>(callExpr->getCalleeDecl()))
+        {
+            auto tc = loplugin::TypeCheck(d->getParent());
+            if (tc.Class("OString") || tc.Class("OUString"))
+            {
+                return true;
+            }
+        }
     }
 
     // sometimes we have a constructor call on the RHS
diff --git a/compilerplugins/clang/buriedassign.cxx b/compilerplugins/clang/buriedassign.cxx
index 658ad4789d87..8c2b13c3a708 100644
--- a/compilerplugins/clang/buriedassign.cxx
+++ b/compilerplugins/clang/buriedassign.cxx
@@ -14,6 +14,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -128,9 +129,9 @@ public:
             return;
         if (fn == SRCDIR "/dbaccess/source/core/dataaccess/intercept.cxx")
             return;
-        if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper.cxx")
+        if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper.cxx")
             return;
-        if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper_Impl.cxx")
+        if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper_Impl.cxx")
             return;
         if (fn == SRCDIR "/lotuswordpro/source/filter/lwptablelayout.cxx")
             return;
@@ -257,13 +258,13 @@ static bool isAssignmentOp(clang::OverloadedOperatorKind Opc)
 
 static const Expr* IgnoreImplicitAndConversionOperator(const Expr* expr)
 {
-    expr = compat::IgnoreImplicit(expr);
+    expr = expr->IgnoreImplicit();
     if (auto memberCall = dyn_cast<CXXMemberCallExpr>(expr))
     {
         if (auto conversionDecl = dyn_cast_or_null<CXXConversionDecl>(memberCall->getMethodDecl()))
         {
             if (!conversionDecl->isExplicit())
-                expr = compat::IgnoreImplicit(memberCall->getImplicitObjectArgument());
+                expr = memberCall->getImplicitObjectArgument()->IgnoreImplicit();
         }
     }
     return expr;
@@ -273,7 +274,7 @@ bool BuriedAssign::VisitBinaryOperator(BinaryOperator const* binaryOp)
 {
     if (ignoreLocation(binaryOp))
         return true;
-    if (compat::getBeginLoc(binaryOp).isMacroID())
+    if (binaryOp->getBeginLoc().isMacroID())
         return true;
     if (!isAssignmentOp(binaryOp->getOpcode()))
         return true;
@@ -302,12 +303,12 @@ bool BuriedAssign::VisitBinaryOperator(BinaryOperator const* binaryOp)
 
     // assignment in constructor
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(binaryOp)));
+        compiler.getSourceManager().getSpellingLoc(binaryOp->getBeginLoc()));
     if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/comphelper/flagguard.hxx"))
         return true;
 
     report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-           compat::getBeginLoc(binaryOp))
+           binaryOp->getBeginLoc())
         << binaryOp->getSourceRange();
     //getParentStmt(getParentStmt(getParentStmt(getParentStmt(getParentStmt(getParentStmt(binaryOp))))))->dump();
     return true;
@@ -317,7 +318,7 @@ bool BuriedAssign::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOper)
 {
     if (ignoreLocation(cxxOper))
         return true;
-    if (compat::getBeginLoc(cxxOper).isMacroID())
+    if (cxxOper->getBeginLoc().isMacroID())
         return true;
     if (!isAssignmentOp(cxxOper->getOperator()))
         return true;
@@ -344,7 +345,7 @@ bool BuriedAssign::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOper)
     if (!m_handled.insert(cxxOper).second)
         return true;
     report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-           compat::getBeginLoc(cxxOper))
+           cxxOper->getBeginLoc())
         << cxxOper->getSourceRange();
     //getParentStmt(getParentStmt(getParentStmt(getParentStmt(getParentStmt(cxxOper)))))->dump();
     return true;
@@ -358,7 +359,7 @@ bool BuriedAssign::VisitCompoundStmt(CompoundStmt const* compoundStmt)
     {
         if (auto expr = dyn_cast<Expr>(*i))
         {
-            expr = compat::IgnoreImplicit(expr);
+            expr = expr->IgnoreImplicit();
             if (auto binaryOp = dyn_cast<BinaryOperator>(expr))
             {
                 // ignore comma-chained statements at this level
@@ -379,7 +380,7 @@ void BuriedAssign::MarkIfAssignment(Stmt const* stmt)
 {
     if (auto expr = dyn_cast_or_null<Expr>(stmt))
     {
-        expr = compat::IgnoreImplicit(expr);
+        expr = expr->IgnoreImplicit();
         if (auto binaryOp = dyn_cast<BinaryOperator>(expr))
         {
             if (isAssignmentOp(binaryOp->getOpcode()))
@@ -434,7 +435,7 @@ bool BuriedAssign::VisitIfStmt(IfStmt const* ifStmt)
         if (isAssignmentOp(binaryOp->getOpcode()))
         {
             report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-                   compat::getBeginLoc(expr))
+                   expr->getBeginLoc())
                 << expr->getSourceRange();
         }
         else if (binaryOp->isComparisonOp())
@@ -442,19 +443,21 @@ bool BuriedAssign::VisitIfStmt(IfStmt const* ifStmt)
             if (auto binaryOp2
                 = dyn_cast<BinaryOperator>(binaryOp->getLHS()->IgnoreParenImpCasts()))
             {
-                if (binaryOp->getRHS()->isCXX11ConstantExpr(compiler.getASTContext())
+                if (!binaryOp->getRHS()->isValueDependent()
+                    && binaryOp->getRHS()->isCXX11ConstantExpr(compiler.getASTContext())
                     && isAssignmentOp(binaryOp2->getOpcode()))
                     report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-                           compat::getBeginLoc(expr))
+                           expr->getBeginLoc())
                         << expr->getSourceRange();
             }
             if (auto binaryOp2
                 = dyn_cast<BinaryOperator>(binaryOp->getRHS()->IgnoreParenImpCasts()))
             {
-                if (binaryOp->getLHS()->isCXX11ConstantExpr(compiler.getASTContext())
+                if (!binaryOp->getLHS()->isValueDependent()
+                    && binaryOp->getLHS()->isCXX11ConstantExpr(compiler.getASTContext())
                     && isAssignmentOp(binaryOp2->getOpcode()))
                     report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-                           compat::getBeginLoc(expr))
+                           expr->getBeginLoc())
                         << expr->getSourceRange();
             }
         }
@@ -465,7 +468,7 @@ bool BuriedAssign::VisitIfStmt(IfStmt const* ifStmt)
             {
                 if (isAssignmentOp(binaryOp2->getOpcode()))
                     report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-                           compat::getBeginLoc(expr))
+                           expr->getBeginLoc())
                         << expr->getSourceRange();
             }
         }
@@ -477,7 +480,7 @@ bool BuriedAssign::VisitIfStmt(IfStmt const* ifStmt)
         if (isAssignmentOp(operCall->getOperator()))
         {
             report(DiagnosticsEngine::Warning, "buried assignment, rather put on own line",
-                   compat::getBeginLoc(expr))
+                   expr->getBeginLoc())
                 << expr->getSourceRange();
         }
     }
@@ -529,7 +532,7 @@ void BuriedAssign::MarkConditionForControlLoops(Expr const* expr)
 {
     if (!expr)
         return;
-    expr = compat::IgnoreImplicit(expr);
+    expr = expr->IgnoreImplicit();
 
     if (auto binaryOp = dyn_cast<BinaryOperator>(expr))
     {
@@ -548,7 +551,7 @@ void BuriedAssign::MarkConditionForControlLoops(Expr const* expr)
         if (memberCall->getMethodDecl() && isa<CXXConversionDecl>(memberCall->getMethodDecl()))
         {
             // TODO check that the conversion is converting to bool
-            expr = compat::IgnoreImplicit(memberCall->getImplicitObjectArgument());
+            expr = memberCall->getImplicitObjectArgument()->IgnoreImplicit();
         }
     }
 
@@ -557,31 +560,31 @@ void BuriedAssign::MarkConditionForControlLoops(Expr const* expr)
         // handle: ((xxx = foo()) != error)
         if (binaryOp->isComparisonOp())
         {
-            MarkIfAssignment(compat::IgnoreImplicit(binaryOp->getLHS())->IgnoreParens());
-            MarkIfAssignment(compat::IgnoreImplicit(binaryOp->getRHS())->IgnoreParens());
+            MarkIfAssignment(binaryOp->getLHS()->IgnoreImplicit()->IgnoreParens());
+            MarkIfAssignment(binaryOp->getRHS()->IgnoreImplicit()->IgnoreParens());
         }
     }
     else if (auto cxxOper = dyn_cast<CXXOperatorCallExpr>(expr))
     {
         // handle: ((xxx = foo()) != error)
-        if (compat::isComparisonOp(cxxOper))
+        if (cxxOper->isComparisonOp())
         {
-            MarkIfAssignment(compat::IgnoreImplicit(cxxOper->getArg(0))->IgnoreParens());
-            MarkIfAssignment(compat::IgnoreImplicit(cxxOper->getArg(1))->IgnoreParens());
+            MarkIfAssignment(cxxOper->getArg(0)->IgnoreImplicit()->IgnoreParens());
+            MarkIfAssignment(cxxOper->getArg(1)->IgnoreImplicit()->IgnoreParens());
         }
         // handle: (!(xxx = foo()))
         else if (cxxOper->getOperator() == OO_Exclaim)
-            MarkIfAssignment(compat::IgnoreImplicit(cxxOper->getArg(0))->IgnoreParens());
+            MarkIfAssignment(cxxOper->getArg(0)->IgnoreImplicit()->IgnoreParens());
     }
     else if (auto parenExpr = dyn_cast<ParenExpr>(expr))
     {
         // handle: ((xxx = foo()))
-        MarkIfAssignment(compat::IgnoreImplicit(parenExpr->getSubExpr()));
+        MarkIfAssignment(parenExpr->getSubExpr()->IgnoreImplicit());
     }
     else if (auto unaryOp = dyn_cast<UnaryOperator>(expr))
     {
         // handle: (!(xxx = foo()))
-        MarkIfAssignment(compat::IgnoreImplicit(unaryOp->getSubExpr())->IgnoreParens());
+        MarkIfAssignment(unaryOp->getSubExpr()->IgnoreImplicit()->IgnoreParens());
     }
     else
         MarkIfAssignment(expr);
diff --git a/compilerplugins/clang/casttovoid.cxx b/compilerplugins/clang/casttovoid.cxx
index e6da5b6d7445..87c2f4852aac 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -169,6 +169,32 @@ public:
         return RecursiveASTVisitor::TraverseConstructorInitializer(init);
     }
 
+    bool TraverseLambdaExpr(LambdaExpr * expr, DataRecursionQueue * queue = nullptr) {
+        if (!shouldTraversePostOrder()) {
+            if (!WalkUpFromLambdaExpr(expr)) {
+                return false;
+            }
+        }
+        auto const n = expr->capture_size();
+        for (unsigned i = 0; i != n; ++i) {
+            auto const c = expr->capture_begin() + i;
+            if (c->isExplicit() || shouldVisitImplicitCode()) {
+                if (!TraverseLambdaCapture(expr, c, expr->capture_init_begin()[i])) {
+                    return false;
+                }
+            }
+        }
+        if (!TraverseCXXRecordDecl(expr->getLambdaClass())) {
+            return false;
+        }
+        if (!queue && shouldTraversePostOrder()) {
+            if (!WalkUpFromLambdaExpr(expr)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     bool VisitDeclRefExpr(DeclRefExpr const * expr) {
         if (ignoreLocation(expr)) {
             return true;
@@ -177,6 +203,9 @@ public:
         if (var == nullptr) {
             return true;
         }
+        if (var->getType().isVolatileQualified()) {
+            return true;
+        }
         auto & usage = vars_[var->getCanonicalDecl()];
         if (!castToVoid_.empty() && castToVoid_.top().sub == expr) {
             usage.castToVoid.push_back(castToVoid_.top().cast);
@@ -397,6 +426,11 @@ private:
                     }
                 }
             } else {
+                if (auto const fun = dyn_cast_or_null<FunctionDecl>(i.first->getDeclContext())) {
+                    if (containsPreprocessingConditionalInclusion(fun->getSourceRange())) {
+                        continue;
+                    }
+                }
                 for (auto const j: i.second.castToVoid) {
                     report(
                         DiagnosticsEngine::Warning, "unnecessary cast to void",
@@ -413,10 +447,10 @@ private:
 
     bool isFromCIncludeFile(SourceLocation spellingLocation) const {
         return !compiler.getSourceManager().isInMainFile(spellingLocation)
-            && (StringRef(
-                    compiler.getSourceManager().getPresumedLoc(spellingLocation)
-                    .getFilename())
-                .endswith(".h"));
+            && compat::ends_with(
+                StringRef(
+                    compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename()),
+                ".h");
     }
 
     bool isSharedCAndCppCode(VarDecl const * decl) const {
@@ -438,7 +472,7 @@ private:
             return nullptr;
         }
         if (compiler.getSourceManager().isMacroBodyExpansion(
-                compat::getBeginLoc(expr)))
+                expr->getBeginLoc()))
         {
             return nullptr;
         }
@@ -481,11 +515,14 @@ private:
         if (var == nullptr) {
             return;
         }
+        if (var->getType().isVolatileQualified()) {
+            return;
+        }
         auto & usage = vars_[var->getCanonicalDecl()];
         if (usage.firstConsumption != nullptr) {
             return;
         }
-        auto const loc = compat::getBeginLoc(dre);
+        auto const loc = dre->getBeginLoc();
         if (compiler.getSourceManager().isMacroArgExpansion(loc)
             && (Lexer::getImmediateMacroNameForDiagnostics(
                     loc, compiler.getSourceManager(), compiler.getLangOpts())
diff --git a/compilerplugins/clang/changetoolsgen.cxx b/compilerplugins/clang/changetoolsgen.cxx
index b5eda7dbb826..f4b9b6168a57 100644
--- a/compilerplugins/clang/changetoolsgen.cxx
+++ b/compilerplugins/clang/changetoolsgen.cxx
@@ -17,9 +17,9 @@
  * Changes calls to tools::Rectangle/Point/Size methods that return a ref to instead call the setter methods.
  *
  * run as:
- *   make COMPILER_PLUGIN_TOOL=changetoolsgen UPDATE_FILES=all FORCE_COMPILE_ALL=1
+ *   make COMPILER_PLUGIN_TOOL=changetoolsgen UPDATE_FILES=all FORCE_COMPILE=all
  * or
- *   make <module> COMPILER_PLUGIN_TOOL=changetoolsgen FORCE_COMPILE_ALL=1
+ *   make <module> COMPILER_PLUGIN_TOOL=changetoolsgen FORCE_COMPILE=all
  */
 
 namespace
@@ -111,7 +111,7 @@ bool ChangeToolsGen::VisitCXXMemberCallExpr(CXXMemberCallExpr const* call)
     if (auto unaryOp = dyn_cast<UnaryOperator>(parent))
     {
         if (!ChangeUnaryOperator(unaryOp, call, methodName))
-            report(DiagnosticsEngine::Warning, "Could not fix, unary", compat::getBeginLoc(call));
+            report(DiagnosticsEngine::Warning, "Could not fix, unary", call->getBeginLoc());
         return true;
     }
     auto binaryOp = dyn_cast<BinaryOperator>(parent);
@@ -130,7 +130,7 @@ bool ChangeToolsGen::VisitCXXMemberCallExpr(CXXMemberCallExpr const* call)
         if (parent2 && isa<Expr>(parent2))
         {
             report(DiagnosticsEngine::Warning, "Could not fix, embedded assign",
-                   compat::getBeginLoc(call));
+                   call->getBeginLoc());
             return true;
         }
         // Check for
@@ -139,25 +139,25 @@ bool ChangeToolsGen::VisitCXXMemberCallExpr(CXXMemberCallExpr const* call)
             if (rhs->getOpcode() == BO_Assign)
             {
                 report(DiagnosticsEngine::Warning, "Could not fix, double assign",
-                       compat::getBeginLoc(call));
+                       call->getBeginLoc());
                 return true;
             }
         if (!ChangeAssignment(parent, methodName, setPrefix))
-            report(DiagnosticsEngine::Warning, "Could not fix, assign", compat::getBeginLoc(call));
+            report(DiagnosticsEngine::Warning, "Could not fix, assign", call->getBeginLoc());
         return true;
     }
     if (opcode == BO_AddAssign || opcode == BO_SubAssign)
     {
         if (!ChangeBinaryOperatorPlusMinus(binaryOp, call, methodName))
             report(DiagnosticsEngine::Warning, "Could not fix, assign-and-change",
-                   compat::getBeginLoc(call));
+                   call->getBeginLoc());
         return true;
     }
     else if (opcode == BO_RemAssign || opcode == BO_MulAssign || opcode == BO_DivAssign)
     {
         if (!ChangeBinaryOperatorOther(binaryOp, call, methodName, setPrefix))
             report(DiagnosticsEngine::Warning, "Could not fix, assign-and-change",
-                   compat::getBeginLoc(call));
+                   call->getBeginLoc());
         return true;
     }
     else
@@ -173,8 +173,8 @@ bool ChangeToolsGen::ChangeAssignment(Stmt const* parent, std::string const& met
     // and replace with
     //    aRect.SetLeft( ... );
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = SM.getExpansionLoc(compat::getBeginLoc(parent));
-    SourceLocation endLoc = SM.getExpansionLoc(compat::getEndLoc(parent));
+    SourceLocation startLoc = SM.getExpansionLoc(parent->getBeginLoc());
+    SourceLocation endLoc = SM.getExpansionLoc(parent->getEndLoc());
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
@@ -201,8 +201,8 @@ bool ChangeToolsGen::ChangeBinaryOperatorPlusMinus(BinaryOperator const* binaryO
     // and replace with
     //    aRect.MoveLeft( ... );
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = SM.getExpansionLoc(compat::getBeginLoc(binaryOp));
-    SourceLocation endLoc = SM.getExpansionLoc(compat::getEndLoc(binaryOp));
+    SourceLocation startLoc = SM.getExpansionLoc(binaryOp->getBeginLoc());
+    SourceLocation endLoc = SM.getExpansionLoc(binaryOp->getEndLoc());
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     if (p2 < p1) // clang is misbehaving, appears to be macro constant related
@@ -228,7 +228,7 @@ bool ChangeToolsGen::ChangeBinaryOperatorPlusMinus(BinaryOperator const* binaryO
     if (newText == callText)
     {
         report(DiagnosticsEngine::Warning, "binaryop-plusminus regex match failed",
-               compat::getBeginLoc(call));
+               call->getBeginLoc());
         return false;
     }
 
@@ -245,8 +245,8 @@ bool ChangeToolsGen::ChangeBinaryOperatorOther(BinaryOperator const* binaryOp,
     // and replace with
     //    aRect.SetLeft( aRect.GetLeft() + ... );
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = SM.getExpansionLoc(compat::getBeginLoc(binaryOp));
-    SourceLocation endLoc = SM.getExpansionLoc(compat::getEndLoc(binaryOp));
+    SourceLocation startLoc = SM.getExpansionLoc(binaryOp->getBeginLoc());
+    SourceLocation endLoc = SM.getExpansionLoc(binaryOp->getEndLoc());
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     if (p2 < p1) // clang is misbehaving, appears to be macro constant related
@@ -284,7 +284,7 @@ bool ChangeToolsGen::ChangeBinaryOperatorOther(BinaryOperator const* binaryOp,
     if (newText == callText)
     {
         report(DiagnosticsEngine::Warning, "binaryop-other regex match failed %0",
-               compat::getBeginLoc(call))
+               call->getBeginLoc())
             << reString;
         return false;
     }
@@ -308,8 +308,8 @@ bool ChangeToolsGen::ChangeUnaryOperator(UnaryOperator const* unaryOp,
     //    aRect.MoveLeft( 1 );
 
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = SM.getExpansionLoc(compat::getBeginLoc(unaryOp));
-    SourceLocation endLoc = SM.getExpansionLoc(compat::getEndLoc(unaryOp));
+    SourceLocation startLoc = SM.getExpansionLoc(unaryOp->getBeginLoc());
+    SourceLocation endLoc = SM.getExpansionLoc(unaryOp->getEndLoc());
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     if (p2 < p1) // clang is misbehaving, appears to be macro constant related
@@ -352,8 +352,7 @@ bool ChangeToolsGen::ChangeUnaryOperator(UnaryOperator const* unaryOp,
     }
     if (newText == callText)
     {
-        report(DiagnosticsEngine::Warning, "unaryop regex match failed %0",
-               compat::getBeginLoc(call))
+        report(DiagnosticsEngine::Warning, "unaryop regex match failed %0", call->getBeginLoc())
             << reString;
         return false;
     }
diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index 003224a21ba1..60e476cc37b7 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -133,6 +133,16 @@ TypeCheck TypeCheck::Pointer() const {
     return TypeCheck();
 }
 
+TypeCheck TypeCheck::MemberPointerOf() const {
+    if (!type_.isNull()) {
+        auto const t = type_->getAs<clang::MemberPointerType>();
+        if (t != nullptr) {
+            return TypeCheck(t->getClass());
+        }
+    }
+    return TypeCheck();
+}
+
 TerminalCheck TypeCheck::Enum() const {
     if (!type_.isNull()) {
         auto const t = type_->getAs<clang::EnumType>();
@@ -191,7 +201,7 @@ namespace {
 
 bool isGlobalNamespace(clang::DeclContext const * context) {
     assert(context != nullptr);
-    return (context->isLookupContext() ? context : context->getLookupParent())->isTranslationUnit();
+    return context->getEnclosingNamespaceContext()->isTranslationUnit();
 }
 
 }
@@ -202,7 +212,7 @@ TerminalCheck ContextCheck::GlobalNamespace() const {
 
 TerminalCheck ContextCheck::StdNamespace() const {
     return TerminalCheck(
-        context_ != nullptr && context_->isStdNamespace());
+        context_ != nullptr && lookThroughLinkageSpec()->isStdNamespace());
 }
 
 namespace {
@@ -224,15 +234,22 @@ bool isStdOrNestedNamespace(clang::DeclContext const * context) {
 }
 
 TerminalCheck ContextCheck::StdOrNestedNamespace() const {
-    return TerminalCheck(context_ != nullptr && isStdOrNestedNamespace(context_));
+    return TerminalCheck(context_ != nullptr && isStdOrNestedNamespace(lookThroughLinkageSpec()));
 }
 
 ContextCheck ContextCheck::AnonymousNamespace() const {
-    auto n = llvm::dyn_cast_or_null<clang::NamespaceDecl>(context_);
+    auto n = llvm::dyn_cast_or_null<clang::NamespaceDecl>(lookThroughLinkageSpec());
     return ContextCheck(
         n != nullptr && n->isAnonymousNamespace() ? n->getParent() : nullptr);
 }
 
+clang::DeclContext const * ContextCheck::lookThroughLinkageSpec() const {
+    if (context_ != nullptr && context_->getDeclKind() == clang::Decl::LinkageSpec) {
+        return context_->getParent();
+    }
+    return context_;
+}
+
 namespace {
 
 bool BaseCheckNotSomethingInterestingSubclass(const clang::CXXRecordDecl *BaseDefinition) {
@@ -367,10 +384,10 @@ static bool BaseCheckNotSubclass(const clang::CXXRecordDecl *BaseDefinition, voi
     return true;
 }
 
-bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base) {
+bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base, bool checkSelf) {
     if (!decl)
         return false;
-    if (base(decl))
+    if (checkSelf && base(decl))
         return true;
     if (!decl->hasDefinition()) {
         return false;
diff --git a/compilerplugins/clang/check.hxx b/compilerplugins/clang/check.hxx
index 9c35acff7b5e..65ee16d77f2c 100644
--- a/compilerplugins/clang/check.hxx
+++ b/compilerplugins/clang/check.hxx
@@ -16,6 +16,8 @@
 #include <clang/AST/Type.h>
 #include <clang/Basic/OperatorKinds.h>
 
+#include "compat.hxx"
+
 namespace loplugin {
 
 class ContextCheck;
@@ -60,6 +62,8 @@ public:
 
     TypeCheck Pointer() const;
 
+    TypeCheck MemberPointerOf() const;
+
     TerminalCheck Enum() const;
 
     TypeCheck LvalueReference() const;
@@ -140,6 +144,8 @@ public:
     explicit ContextCheck(const clang::NamespaceDecl * decl ) : context_( decl ) {}
 
 private:
+    clang::DeclContext const * lookThroughLinkageSpec() const;
+
     clang::DeclContext const * const context_;
 };
 
@@ -158,8 +164,9 @@ private:
 
 
 typedef std::function<bool(clang::Decl const *)> DeclChecker;
-// Returns true if the class has a base matching the checker, or if the class itself matches.
-bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base);
+// Returns true if the class has a base matching the checker, or, when checkSelf is true, if the
+// class itself matches.
+bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base, bool checkSelf = true);
 
 
 namespace detail {
@@ -185,7 +192,7 @@ ContextCheck TypeCheck::Class(llvm::StringRef id)
     if (!type_.isNull()) {
         auto const t = type_->getAs<clang::RecordType>();
         if (t != nullptr) {
-            return detail::checkRecordDecl(t->getDecl(), clang::TTK_Class, id);
+            return detail::checkRecordDecl(t->getDecl(), compat::TagTypeKind::Class, id);
         }
     }
     return ContextCheck();
@@ -196,7 +203,7 @@ ContextCheck TypeCheck::Struct(llvm::StringRef id) const
     if (!type_.isNull()) {
         auto const t = type_->getAs<clang::RecordType>();
         if (t != nullptr) {
-            return detail::checkRecordDecl(t->getDecl(), clang::TTK_Struct, id);
+            return detail::checkRecordDecl(t->getDecl(), compat::TagTypeKind::Struct, id);
         }
     }
     return ContextCheck();
@@ -228,12 +235,12 @@ ContextCheck TypeCheck::Typedef(llvm::StringRef id) const
 
 ContextCheck DeclCheck::Class(llvm::StringRef id) const
 {
-    return detail::checkRecordDecl(decl_, clang::TTK_Class, id);
+    return detail::checkRecordDecl(decl_, compat::TagTypeKind::Class, id);
 }
 
 ContextCheck DeclCheck::Struct(llvm::StringRef id) const
 {
-    return detail::checkRecordDecl(decl_, clang::TTK_Struct, id);
+    return detail::checkRecordDecl(decl_, compat::TagTypeKind::Struct, id);
 }
 
 ContextCheck DeclCheck::ClassOrStruct(llvm::StringRef id) const
@@ -247,7 +254,7 @@ ContextCheck DeclCheck::ClassOrStruct(llvm::StringRef id) const
 
 ContextCheck DeclCheck::Union(llvm::StringRef id) const
 {
-    return detail::checkRecordDecl(decl_, clang::TTK_Union, id);
+    return detail::checkRecordDecl(decl_, compat::TagTypeKind::Union, id);
 }
 
 ContextCheck DeclCheck::Function(llvm::StringRef id) const
@@ -277,7 +284,7 @@ ContextCheck DeclCheck::Var(llvm::StringRef id) const
 ContextCheck ContextCheck::Namespace(llvm::StringRef id) const
 {
     if (context_) {
-        auto n = llvm::dyn_cast<clang::NamespaceDecl>(context_);
+        auto n = llvm::dyn_cast<clang::NamespaceDecl>(lookThroughLinkageSpec());
         if (n != nullptr) {
             auto const i = n->getIdentifier();
             if (i != nullptr && i->getName() == id) {
@@ -291,13 +298,13 @@ ContextCheck ContextCheck::Namespace(llvm::StringRef id) const
 ContextCheck ContextCheck::Class(llvm::StringRef id) const
 {
     return detail::checkRecordDecl(
-        llvm::dyn_cast_or_null<clang::Decl>(context_), clang::TTK_Class, id);
+        llvm::dyn_cast_or_null<clang::Decl>(context_), compat::TagTypeKind::Class, id);
 }
 
 ContextCheck ContextCheck::Struct(llvm::StringRef id) const
 {
     return detail::checkRecordDecl(
-        llvm::dyn_cast_or_null<clang::Decl>(context_), clang::TTK_Struct, id);
+        llvm::dyn_cast_or_null<clang::Decl>(context_), compat::TagTypeKind::Struct, id);
 }
 
 bool isExtraWarnUnusedType(clang::QualType type);
diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx
index 6daa9ed2a17e..4bed4c82502c 100644
--- a/compilerplugins/clang/checkconfigmacros.cxx
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -12,8 +12,11 @@
 #include <memory>
 #include <set>
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
+#include "config_clang.h"
+
 #include <clang/Lex/Preprocessor.h>
 
 namespace loplugin
@@ -69,7 +72,7 @@ void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroDirect
 //        fprintf(stderr,"DEF: %s %s\n", macroToken.getIdentifierInfo()->getName().data(), filename );
         StringRef macro = macroToken.getIdentifierInfo()->getName();
         // Skia #defines do not have values, but we set them in config_skia.h .
-        if( macro.startswith( "SK_" ) && loplugin::isSamePathname(filename, BUILDDIR "/config_host/config_skia.h"))
+        if( compat::starts_with(macro, "SK_" ) && loplugin::isSamePathname(filename, BUILDDIR "/config_host/config_skia.h"))
             return;
         configMacros.insert( macro.str());
         }
diff --git a/compilerplugins/clang/collapseif.cxx b/compilerplugins/clang/collapseif.cxx
index b3f192c2ce1d..aecf10f5e0e9 100644
--- a/compilerplugins/clang/collapseif.cxx
+++ b/compilerplugins/clang/collapseif.cxx
@@ -38,7 +38,6 @@ public:
 
 private:
     int getNoCharsInSourceCodeOfExpr(IfStmt const*);
-    bool containsComment(Stmt const* stmt);
 };
 
 bool CollapseIf::VisitIfStmt(IfStmt const* ifStmt)
@@ -73,11 +72,11 @@ bool CollapseIf::VisitIfStmt(IfStmt const* ifStmt)
 
     // Sometimes there is a comment between the first and second if, so
     // merging them would make the comment more awkward to write.
-    if (containsComment(ifStmt))
+    if (containsComment(ifStmt->getSourceRange()))
         return true;
 
     report(DiagnosticsEngine::Warning, "nested if should be collapsed into one statement %0 %1",
-           compat::getBeginLoc(ifStmt))
+           ifStmt->getBeginLoc())
         << noChars1 << noChars2 << ifStmt->getSourceRange();
     return true;
 }
@@ -88,8 +87,8 @@ int CollapseIf::getNoCharsInSourceCodeOfExpr(IfStmt const* ifStmt)
     // measuring the size of the condition expression is unreliable, because clang
     // does not report the location of the last token accurately.
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = compat::getBeginLoc(ifStmt);
-    SourceLocation endLoc = compat::getBeginLoc(ifStmt->getThen());
+    SourceLocation startLoc = ifStmt->getBeginLoc();
+    SourceLocation endLoc = ifStmt->getThen()->getBeginLoc();
     char const* p1 = SM.getCharacterData(startLoc);
     char const* p2 = SM.getCharacterData(endLoc);
 
@@ -101,27 +100,6 @@ int CollapseIf::getNoCharsInSourceCodeOfExpr(IfStmt const* ifStmt)
     return count;
 }
 
-bool CollapseIf::containsComment(Stmt const* stmt)
-{
-    SourceManager& SM = compiler.getSourceManager();
-    auto range = stmt->getSourceRange();
-    SourceLocation startLoc = range.getBegin();
-    SourceLocation endLoc = range.getEnd();
-    char const* p1 = SM.getCharacterData(startLoc);
-    char const* p2 = SM.getCharacterData(endLoc);
-    p2 += Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
-
-    // check for comments
-    constexpr char const comment1[] = "/*";
-    constexpr char const comment2[] = "//";
-    if (std::search(p1, p2, comment1, comment1 + strlen(comment1)) != p2)
-        return true;
-    if (std::search(p1, p2, comment2, comment2 + strlen(comment2)) != p2)
-        return true;
-
-    return false;
-}
-
 /** Off by default because some places are a judgement call if it should be collapsed or not. */
 loplugin::Plugin::Registration<CollapseIf> X("collapseif", false);
 }
diff --git a/compilerplugins/clang/colorcheck.cxx b/compilerplugins/clang/colorcheck.cxx
index 83f9a9688381..69bcaa0cd9cc 100644
--- a/compilerplugins/clang/colorcheck.cxx
+++ b/compilerplugins/clang/colorcheck.cxx
@@ -15,7 +15,10 @@
 #include <fstream>
 #include <set>
 
+#include "config_clang.h"
+
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -53,7 +56,7 @@ bool ColorCheck::VisitCXXConstructExpr(const CXXConstructExpr* constructExpr)
         return true;
 
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(constructExpr)));
+        compiler.getSourceManager().getSpellingLoc(constructExpr->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/tools/color.hxx"))
         return true;
 
@@ -70,8 +73,8 @@ bool ColorCheck::VisitCXXConstructExpr(const CXXConstructExpr* constructExpr)
     {
         if (!arg0->isValueDependent())
         {
-            llvm::Optional<llvm::APSInt> xVal
-                = compat::getIntegerConstantExpr(arg0, compiler.getASTContext());
+            compat::optional<llvm::APSInt> xVal
+                = arg0->getIntegerConstantExpr(compiler.getASTContext());
             if (xVal && *xVal > 0xffffff)
                 report(DiagnosticsEngine::Warning,
                        "Rather use the ColorTransparency or ColorAlpha version of this constructor",
diff --git a/compilerplugins/clang/commaoperator.cxx b/compilerplugins/clang/commaoperator.cxx
index 3da4c18d1e10..3ba1c89c4be2 100644
--- a/compilerplugins/clang/commaoperator.cxx
+++ b/compilerplugins/clang/commaoperator.cxx
@@ -13,8 +13,6 @@
 #include <fstream>
 #include <set>
 
-#include "config_clang.h"
-
 #include "plugin.hxx"
 
 /**
@@ -84,10 +82,6 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinComma(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-#endif
-
     bool VisitBinaryOperator(const BinaryOperator* );
 
 private:
@@ -110,11 +104,11 @@ bool CommaOperator::VisitBinaryOperator(const BinaryOperator* binaryOp)
     // winsock2.h (TODO: improve heuristic of determining that the whole
     // binaryOp is part of a single macro body expansion):
     if (compiler.getSourceManager().isMacroBodyExpansion(
-            compat::getBeginLoc(binaryOp))
+            binaryOp->getBeginLoc())
         && compiler.getSourceManager().isMacroBodyExpansion(
             binaryOp->getOperatorLoc())
         && compiler.getSourceManager().isMacroBodyExpansion(
-            compat::getEndLoc(binaryOp))
+            binaryOp->getEndLoc())
         && ignoreLocation(
             compiler.getSourceManager().getSpellingLoc(
                 binaryOp->getOperatorLoc())))
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index ae7557b71956..ac2a282c4fd8 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -9,201 +9,165 @@
 
 #pragma once
 
-#include <cstddef>
+#include <string>
 #include <utility>
 
 #include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Lexer.h"
+#include "clang/Basic/Specifiers.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Compiler.h"
+#include "llvm/Support/FileSystem.h"
 
 #include "config_clang.h"
 
+#if CLANG_VERSION >= 170000
+#include <optional>
+#else
+#include "llvm/ADT/Optional.h"
+#endif
+
 // Compatibility wrapper to abstract over (trivial) changes in the Clang API:
 namespace compat {
 
-// Copies code from LLVM's include/llvm/Support/Casting.h:
-template<typename... X, typename Y> LLVM_NODISCARD inline bool isa_and_nonnull(Y const & Val) {
-#if CLANG_VERSION >= 90000
-    return llvm::isa_and_nonnull<X...>(Val);
+template<typename T>
+#if CLANG_VERSION >= 170000
+using optional = std::optional<T>;
 #else
-    if (!Val) {
-        return false;
-    }
-    return llvm::isa<X...>(Val);
+using optional = llvm::Optional<T>;
 #endif
-}
 
-inline clang::SourceLocation getBeginLoc(clang::Decl const * decl) {
-#if CLANG_VERSION >= 80000
-    return decl->getBeginLoc();
+template<typename T>
+constexpr bool has_value(optional<T> const & o) {
+#if CLANG_VERSION >= 150000
+    return o.has_value();
 #else
-    return decl->getLocStart();
+    return o.hasValue();
 #endif
 }
 
-inline clang::SourceLocation getEndLoc(clang::Decl const * decl) {
-#if CLANG_VERSION >= 80000
-    return decl->getEndLoc();
+template<typename T>
+constexpr T const & value(optional<T> const & o) {
+#if CLANG_VERSION >= 150000
+    return *o;
 #else
-    return decl->getLocEnd();
+    return o.getValue();
 #endif
 }
 
-inline clang::SourceLocation getBeginLoc(clang::DeclarationNameInfo const & info) {
-#if CLANG_VERSION >= 80000
-    return info.getBeginLoc();
+inline std::string toString(llvm::APSInt const & i, unsigned radix) {
+#if CLANG_VERSION >= 130000
+    return llvm::toString(i, radix);
 #else
-    return info.getLocStart();
+    return i.toString(radix);
 #endif
 }
 
-inline clang::SourceLocation getEndLoc(clang::DeclarationNameInfo const & info) {
-#if CLANG_VERSION >= 80000
-    return info.getEndLoc();
+inline bool starts_with(llvm::StringRef s, llvm::StringRef Prefix) {
+#if CLANG_VERSION >= 160000
+    return s.starts_with(Prefix);
 #else
-    return info.getLocEnd();
+    return s.startswith(Prefix);
 #endif
 }
 
-inline clang::SourceLocation getBeginLoc(clang::Stmt const * stmt) {
-#if CLANG_VERSION >= 80000
-    return stmt->getBeginLoc();
+inline bool ends_with(llvm::StringRef s, llvm::StringRef Suffix) {
+#if CLANG_VERSION >= 160000
+    return s.ends_with(Suffix);
 #else
-    return stmt->getLocStart();
+    return s.endswith(Suffix);
 #endif
 }
 
-inline clang::SourceLocation getEndLoc(clang::Stmt const * stmt) {
-#if CLANG_VERSION >= 80000
-    return stmt->getEndLoc();
+inline std::pair<clang::SourceLocation, clang::SourceLocation> getImmediateExpansionRange(
+    clang::SourceManager const & SM, clang::SourceLocation Loc)
+{
+    auto const csr = SM.getImmediateExpansionRange(Loc);
+    if (csr.isCharRange()) { /*TODO*/ }
+    return {csr.getBegin(), csr.getEnd()};
+}
+
+/// Utility method
+inline clang::Expr const * IgnoreParenImplicit(clang::Expr const * expr) {
+    return expr->IgnoreImplicit()->IgnoreParens()->IgnoreImplicit();
+}
+
+#if CLANG_VERSION >= 130000
+constexpr clang::ExprValueKind VK_PRValue = clang::VK_PRValue;
 #else
-    return stmt->getLocEnd();
+constexpr clang::ExprValueKind VK_PRValue = clang::VK_RValue;
 #endif
-}
 
-inline clang::SourceLocation getBeginLoc(clang::CXXBaseSpecifier const * spec) {
-#if CLANG_VERSION >= 80000
-    return spec->getBeginLoc();
+namespace CXXConstructionKind
+{
+#if CLANG_VERSION >= 180000
+constexpr clang::CXXConstructionKind Complete = clang::CXXConstructionKind::Complete;
 #else
-    return spec->getLocStart();
+constexpr clang::CXXConstructExpr::ConstructionKind Complete = clang::CXXConstructExpr::CK_Complete;
 #endif
 }
 
-inline clang::SourceLocation getEndLoc(clang::CXXBaseSpecifier const * spec) {
-#if CLANG_VERSION >= 80000
-    return spec->getEndLoc();
+namespace CharacterLiteralKind
+{
+#if CLANG_VERSION >= 180000
+constexpr clang::CharacterLiteralKind Ascii = clang::CharacterLiteralKind::Ascii;
 #else
-    return spec->getLocEnd();
+constexpr clang::CharacterLiteral::CharacterKind Ascii = clang::CharacterLiteral::Ascii;
 #endif
 }
 
-inline std::pair<clang::SourceLocation, clang::SourceLocation> getImmediateExpansionRange(
-    clang::SourceManager const & SM, clang::SourceLocation Loc)
+namespace ElaboratedTypeKeyword
 {
-#if CLANG_VERSION >= 70000
-    auto const csr = SM.getImmediateExpansionRange(Loc);
-    if (csr.isCharRange()) { /*TODO*/ }
-    return {csr.getBegin(), csr.getEnd()};
+#if CLANG_VERSION >= 180000
+constexpr clang::ElaboratedTypeKeyword None = clang::ElaboratedTypeKeyword::None;
 #else
-    return SM.getImmediateExpansionRange(Loc);
+constexpr clang::ElaboratedTypeKeyword None = clang::ETK_None;
 #endif
 }
 
-inline bool isPointWithin(
-    clang::SourceManager const & SM, clang::SourceLocation Location, clang::SourceLocation Start,
-    clang::SourceLocation End)
+namespace Linkage
 {
-#if CLANG_VERSION >= 60000
-    return SM.isPointWithin(Location, Start, End);
+#if CLANG_VERSION >= 180000
+constexpr clang::Linkage External = clang::Linkage::External;
+constexpr clang::Linkage Module = clang::Linkage::Module;
 #else
-    return
-        Location == Start || Location == End
-        || (SM.isBeforeInTranslationUnit(Start, Location)
-            && SM.isBeforeInTranslationUnit(Location, End));
+constexpr clang::Linkage External = clang::ExternalLinkage;
+constexpr clang::Linkage Module = clang::ModuleLinkage;
 #endif
 }
 
-inline clang::Expr const * IgnoreImplicit(clang::Expr const * expr) {
-#if CLANG_VERSION >= 80000
-    return expr->IgnoreImplicit();
+namespace StringLiteralKind
+{
+#if CLANG_VERSION >= 180000
+constexpr clang::StringLiteralKind UTF8 = clang::StringLiteralKind::UTF8;
 #else
-    using namespace clang;
-    // Copy from Clang's lib/AST/Stmt.cpp, including <https://reviews.llvm.org/D50666> "Fix
-    // Stmt::ignoreImplicit":
-    Stmt const *s = expr;
-
-    Stmt const *lasts = nullptr;
-
-    while (s != lasts) {
-        lasts = s;
-
-        if (auto *ewc = dyn_cast<ExprWithCleanups>(s))
-            s = ewc->getSubExpr();
-
-        if (auto *mte = dyn_cast<MaterializeTemporaryExpr>(s))
-            s = mte->GetTemporaryExpr();
-
-        if (auto *bte = dyn_cast<CXXBindTemporaryExpr>(s))
-            s = bte->getSubExpr();
-
-        if (auto *ice = dyn_cast<ImplicitCastExpr>(s))
-            s = ice->getSubExpr();
-    }
-
-    return static_cast<Expr const *>(s);
+constexpr clang::StringLiteral::StringKind UTF8 = clang::StringLiteral::UTF8;
 #endif
 }
 
-inline bool CPlusPlus17(clang::LangOptions const & opts) {
-#if CLANG_VERSION >= 60000
-    return opts.CPlusPlus17;
+namespace TagTypeKind
+{
+#if CLANG_VERSION >= 180000
+constexpr clang::TagTypeKind Class = clang::TagTypeKind::Class;
+constexpr clang::TagTypeKind Struct = clang::TagTypeKind::Struct;
+constexpr clang::TagTypeKind Union = clang::TagTypeKind::Union;
 #else
-    return opts.CPlusPlus1z;
+constexpr clang::TagTypeKind Class = clang::TTK_Class;
+constexpr clang::TagTypeKind Struct = clang::TTK_Struct;
+constexpr clang::TagTypeKind Union = clang::TTK_Union;
 #endif
 }
 
 inline bool EvaluateAsInt(clang::Expr const * expr, llvm::APSInt& intRes, const clang::ASTContext& ctx) {
-#if CLANG_VERSION >= 80000
     clang::Expr::EvalResult res;
     bool b = expr->EvaluateAsInt(res, ctx);
     if (b && res.Val.isInt())
         intRes = res.Val.getInt();
     return b;
-#else
-    return expr->EvaluateAsInt(intRes, ctx);
-#endif
 }
 
-inline llvm::Optional<llvm::APSInt> getIntegerConstantExpr(
-    clang::Expr const * expr, clang::ASTContext const & context)
-{
-#if CLANG_VERSION >= 120000
-    return expr->getIntegerConstantExpr(context);
-#else
-    llvm::APSInt res;
-    return expr->isIntegerConstantExpr(res, context) ? res : llvm::Optional<llvm::APSInt>();
-#endif
-}
-
-inline clang::Expr * getSubExpr(clang::MaterializeTemporaryExpr const * expr) {
-#if CLANG_VERSION >= 100000
-    return expr->getSubExpr();
-#else
-    return expr->GetTemporaryExpr();
-#endif
-}
-
-#if CLANG_VERSION < 80000
-inline clang::Expr const * getSubExprAsWritten(clang::CastExpr const * expr)
-{ return expr->getSubExprAsWritten(); }
-#else
 // Work around CastExpr::getSubExprAsWritten firing
 //
 //   include/llvm/Support/Casting.h:269: typename llvm::cast_retty<X, Y*>::ret_type llvm::cast(Y*)
@@ -232,7 +196,7 @@ namespace detail {
     // Skip through reference binding to temporary.
     if (clang::MaterializeTemporaryExpr *Materialize
                                   = clang::dyn_cast<clang::MaterializeTemporaryExpr>(expr))
-      expr = compat::getSubExpr(Materialize);
+      expr = Materialize->getSubExpr();
 
     // Skip any temporary bindings; they're implicit.
     if (clang::CXXBindTemporaryExpr *Binder = clang::dyn_cast<clang::CXXBindTemporaryExpr>(expr))
@@ -269,57 +233,53 @@ inline clang::Expr *getSubExprAsWritten(clang::CastExpr *This) {
 inline const clang::Expr *getSubExprAsWritten(const clang::CastExpr *This) {
   return getSubExprAsWritten(const_cast<clang::CastExpr *>(This));
 }
-#endif
 
-inline clang::QualType getObjectType(clang::CXXMemberCallExpr const * expr) {
-#if CLANG_VERSION >= 100000
-    return expr->getObjectType();
+inline bool isOrdinary(clang::StringLiteral const * expr) {
+#if CLANG_VERSION >= 150000
+    return expr->isOrdinary();
 #else
-    // <https://github.com/llvm/llvm-project/commit/88559637641e993895337e1047a0bd787fecc647>
-    // "[OpenCL] Improve destructor support in C++ for OpenCL":
-    clang::QualType Ty = expr->getImplicitObjectArgument()->getType();
-    if (Ty->isPointerType())
-        Ty = Ty->getPointeeType();
-    return Ty;
+    return expr->isAscii();
 #endif
 }
 
-inline bool isExplicitSpecified(clang::CXXConstructorDecl const * decl) {
-#if CLANG_VERSION >= 90000
-    return decl->getExplicitSpecifier().isExplicit();
+inline bool isPureVirtual(clang::FunctionDecl const * decl) {
+#if CLANG_VERSION >= 180000
+    return decl->isPureVirtual();
 #else
-    return decl->isExplicitSpecified();
+    return decl->isPure();
 #endif
 }
 
-inline bool isExplicitSpecified(clang::CXXConversionDecl const * decl) {
-#if CLANG_VERSION >= 90000
-    return decl->getExplicitSpecifier().isExplicit();
+inline bool isUnnamedBitField(clang::FieldDecl const * decl) {
+#if CLANG_VERSION >= 190000
+    return decl->isUnnamedBitField();
 #else
-    return decl->isExplicitSpecified();
+    return decl->isUnnamedBitfield();
 #endif
 }
 
-inline clang::QualType getDeclaredReturnType(clang::FunctionDecl const * decl) {
-#if CLANG_VERSION >= 80000
-    return decl->getDeclaredReturnType();
+inline clang::TemplateTypeParmDecl const * getReplacedParameter(
+    clang::SubstTemplateTypeParmType const * type)
+{
+#if CLANG_VERSION >= 160000
+    return type->getReplacedParameter();
 #else
-    // <https://github.com/llvm/llvm-project/commit/4576a77b809649f5b8d0ff8c7a4be57eeee0ecf9>
-    // "PR33222: Require the declared return type not the actual return type to":
-    auto *TSI = decl->getTypeSourceInfo();
-    clang::QualType T = TSI ? TSI->getType() : decl->getType();
-    return T->castAs<clang::FunctionType>()->getReturnType();
+    return type->getReplacedParameter()->getDecl();
 #endif
 }
 
-// The isComparisonOp method on CXXOperatorCallExpr is not available yet for the clang we require
-inline bool isComparisonOp(clang::CXXOperatorCallExpr const * callExpr)
-{
-    using namespace clang;
-    auto op = callExpr->getOperator();
-    return op == OO_Less || op == OO_Greater || op == OO_LessEqual || op == OO_GreaterEqual
-           || op == OO_EqualEqual || op == OO_ExclaimEqual;
-}
+// Printing `std::size_t n` via `report(...) << n` is ambiguous prior to
+// <https://github.com/llvm/llvm-project/commit/afdac5fbcb6a375245d435e4427086a376de59ff> "[clang]
+// Allow printing 64 bit ints in diagnostics" (in Clang 14.x) and its follow-up
+// <https://github.com/llvm/llvm-project/commit/ac7a9ef0ae3a5c63dc4e641f9912d8b659ebd720> "Resolve
+// overload ambiguity on Mac OS when printing size_t in diagnostics" (in Clang 15.x):
+inline
+#if CLANG_VERSION >= 150000
+std::size_t
+#else
+unsigned
+#endif
+diagnosticSize(std::size_t n) { return n; }
 
 }
 
diff --git a/compilerplugins/clang/conditionalstring.cxx b/compilerplugins/clang/conditionalstring.cxx
index bf6c196846dc..cf858601ea0a 100644
--- a/compilerplugins/clang/conditionalstring.cxx
+++ b/compilerplugins/clang/conditionalstring.cxx
@@ -12,7 +12,6 @@
 #include <cassert>
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 // Find uses of OUString in conditional expressions that could be rewritten as std::u16string_view,
@@ -32,15 +31,13 @@ Expr const* ignoreImplicit(Expr const* expr)
         {
             e = e1->getSubExprAsWritten();
         }
-#if CLANG_VERSION >= 80000
         else if (auto const e2 = dyn_cast<FullExpr>(e))
         {
             e = e2->getSubExpr();
         }
-#endif
         else if (auto const e3 = dyn_cast<MaterializeTemporaryExpr>(e))
         {
-            e = compat::getSubExpr(e3);
+            e = e3->getSubExpr();
         }
         else if (auto const e4 = dyn_cast<CXXBindTemporaryExpr>(e))
         {
@@ -398,8 +395,7 @@ private:
             {
                 e = e1->getSubExpr();
             }
-            if (auto const e1
-                = dyn_cast<CXXConstructExpr>(compat::IgnoreImplicit(e)->IgnoreParens()))
+            if (auto const e1 = dyn_cast<CXXConstructExpr>(e->IgnoreImplicit()->IgnoreParens()))
             {
                 if (e1->getNumArgs() != 0 //TODO
                     && isa<clang::StringLiteral>(e1->getArg(0)->IgnoreParenImpCasts()))
diff --git a/compilerplugins/clang/constantparam.bitmask.results b/compilerplugins/clang/constantparam.bitmask.results
index b651e6b9c82f..3038062d9a92 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -4,7 +4,7 @@ codemaker/source/javamaker/classfile.hxx:152
 codemaker/source/javamaker/classfile.hxx:167
     void codemaker::javamaker::ClassFile::addField(enum codemaker::javamaker::ClassFile::AccessFlags,const class rtl::OString &,const class rtl::OString &,unsigned short,const class rtl::OString &)
     enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1
-dbaccess/source/filter/xml/xmlExport.hxx:164
+dbaccess/source/filter/xml/xmlExport.hxx:162
     void dbaxml::ODBExport::ODBExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
     enum SvXMLExportFlags nExportFlag setBits=0x400 clearBits=0x200
 include/basegfx/polygon/b2dpolygontools.hxx:145
@@ -13,42 +13,42 @@ include/basegfx/polygon/b2dpolygontools.hxx:145
 include/framework/framelistanalyzer.hxx:185
     void framework::FrameListAnalyzer::FrameListAnalyzer(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFramesSupplier> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,enum FrameAnalyzerFlags)
     enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/sfx2/objsh.hxx:477
+include/sfx2/objsh.hxx:489
     void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
     enum SfxLoadedFlags nWhich setBits=0x1
-include/svtools/brwbox.hxx:511
+include/svtools/brwbox.hxx:514
     void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString &,long,enum HeaderBarItemBits,unsigned short)
     enum HeaderBarItemBits nBits setBits=0x400 clearBits=0x3ec
 include/vcl/wizardmachine.hxx:139
     void vcl::WizardMachine::WizardMachine(class weld::Window *,enum WizardButtonFlags)
     enum WizardButtonFlags _nButtonFlags setBits=0xf
-sc/inc/rangelst.hxx:48
-    void ScRangeList::Format(class rtl::OUString &,enum ScRefFlags,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool) const
-    enum ScRefFlags nFlags setBits=0x8000 clearBits=0x7f80
-sc/inc/rangeutl.hxx:162
+sc/inc/rangeutl.hxx:169
     void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString &,const class ScAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
     enum ScRefFlags nFormatFlags setBits=0x8008 clearBits=0x7ff0
-sc/inc/xmlwrap.hxx:89
-    _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
+sc/inc/xmlwrap.hxx:88
+    _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCodeMsg &)
     enum ImportFlags nMode setBits=0x1
-sc/source/ui/view/cellsh1.cxx:103
+sc/source/ui/view/cellsh1.cxx:106
     enum InsertDeleteFlags FlagsFromString(const class rtl::OUString &,enum InsertDeleteFlags)
-    enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
-sc/source/ui/view/cellsh1.cxx:126
+    enum InsertDeleteFlags nFlagsMask setBits=0x487f clearBits=0x3600
+sc/source/ui/view/cellsh1.cxx:129
     class rtl::OUString FlagsToString(enum InsertDeleteFlags,enum InsertDeleteFlags)
-    enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
-sw/source/core/view/viewsh.cxx:717
+    enum InsertDeleteFlags nFlagsMask setBits=0x487f clearBits=0x3600
+starmath/inc/mathml/export.hxx:199
+    void SmMLExport::SmMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
+    enum SvXMLExportFlags nExportFlags setBits=0x8000 clearBits=0x7a00
+sw/source/core/view/viewsh.cxx:830
     void lcl_InvalidateAllContent(class SwViewShell &,enum SwInvalidateFlags)
     enum SwInvalidateFlags nInv setBits=0x2
-sw/source/filter/html/swhtml.hxx:687
+sw/source/filter/html/swhtml.hxx:698
     void SwHTMLParser::SetFrameFormatAttrs(class SfxItemSet &,enum HtmlFrameFormatFlags,class SfxItemSet &)
     enum HtmlFrameFormatFlags nFlags setBits=0x1
-sw/source/filter/ww8/wrtw8esh.cxx:1545
+sw/source/filter/ww8/wrtw8esh.cxx:1542
     enum ShapeFlag AddMirrorFlags(enum ShapeFlag,const class SwMirrorGrf &)
     enum ShapeFlag nFlags setBits=0xa00 clearBits=0x5ef
-xmloff/inc/MetaExportComponent.hxx:32
+xmloff/inc/MetaExportComponent.hxx:31
     void XMLMetaExportComponent::XMLMetaExportComponent(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
     enum SvXMLExportFlags nFlags setBits=0x1
-xmloff/source/text/XMLAutoTextEventExport.hxx:51
+xmloff/source/text/XMLAutoTextEventExport.hxx:50
     void XMLAutoTextEventExport::XMLAutoTextEventExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
     enum SvXMLExportFlags nFlags setBits=0x5ff clearBits=0x200
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 18cf2a58bb2e..f019a6f3914e 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -1,12 +1,8 @@
-accessibility/inc/standard/vclxaccessiblemenuitem.hxx:58
-    void VCLXAccessibleMenuItem::VCLXAccessibleMenuItem(class Menu *,unsigned short,class Menu *)
-    class Menu * pMenu
-    0
-accessibility/source/standard/vclxaccessibletoolbox.cxx:101
+accessibility/source/standard/vclxaccessibletoolbox.cxx:87
     void (anonymous namespace)::OToolBoxWindowItem::OToolBoxWindowItem(int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &)
     int _nIndexInParent
     0
-basctl/source/basicide/moduldlg.hxx:103
+basctl/source/basicide/moduldlg.hxx:110
     void basctl::LibDialog::EnableReference(_Bool)
     _Bool b
     0
@@ -14,32 +10,40 @@ basctl/source/inc/scriptdocument.hxx:88
     void basctl::ScriptDocument::ScriptDocument(enum basctl::ScriptDocument::SpecialDocument)
     enum basctl::ScriptDocument::SpecialDocument _eType
     0
-basegfx/source/polygon/b2dpolygon.cxx:62
+basegfx/source/polygon/b2dlinegeometry.cxx:332
+    class basegfx::B2DPolygon createAreaGeometryForEdge(const class basegfx::B2DCubicBezier &,double,_Bool,_Bool,_Bool,_Bool,class std::vector<class basegfx::triangulator::B2DTriangle> *)
+    class std::vector<class basegfx::triangulator::B2DTriangle> * pTriangles
+    0
+basegfx/source/polygon/b2dpolygon.cxx:41
     void (anonymous namespace)::CoordinateDataArray2D::CoordinateDataArray2D(unsigned int)
     unsigned int nCount
     0
-basegfx/source/polygon/b3dpolygon.cxx:77
+basegfx/source/polygon/b3dpolygon.cxx:78
     void (anonymous namespace)::CoordinateDataArray3D::CoordinateDataArray3D(unsigned int)
     unsigned int nCount
     0
-basic/source/inc/runtime.hxx:323
+basic/source/inc/runtime.hxx:326
     void SbiRuntime::StepRESUME(unsigned int)
     unsigned int 
     1
-basic/source/inc/runtime.hxx:354
+basic/source/inc/runtime.hxx:357
     _Bool SbiRuntime::IsMissing(class SbxVariable *,unsigned short)
     unsigned short 
     1
-basic/source/runtime/iosys.cxx:62
+basic/source/runtime/iosys.cxx:59
     void (anonymous namespace)::SbiInputDialog::SbiInputDialog(class weld::Window *,const class rtl::OUString &)
     class weld::Window * 
     0
+basic/source/runtime/methods.cxx:3173
+    short GetOptionalIntegerParamOrDefault(class SbxArray &,const unsigned int,const short)
+    const short defaultValue
+    0
 canvas/inc/parametricpolypolygon.hxx:138
-    void canvas::ParametricPolyPolygon::ParametricPolyPolygon(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XGraphicDevice> &,enum canvas::ParametricPolyPolygon::GradientType,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<double> > &,const class com::sun::star::uno::Sequence<double> &)
+    void canvas::ParametricPolyPolygon::ParametricPolyPolygon(class com::sun::star::uno::Reference<class com::sun::star::rendering::XGraphicDevice>,enum canvas::ParametricPolyPolygon::GradientType,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<double> > &,const class com::sun::star::uno::Sequence<double> &)
     enum canvas::ParametricPolyPolygon::GradientType eType
     0
-canvas/inc/spriteredrawmanager.hxx:108
-    void canvas::SpriteRedrawManager::SpriteInfo::SpriteInfo(const class rtl::Reference<class canvas::Sprite> &,const class basegfx::B2DRange &,_Bool,_Bool)
+canvas/inc/spriteredrawmanager.hxx:109
+    void canvas::SpriteRedrawManager::SpriteInfo::SpriteInfo(class rtl::Reference<class canvas::Sprite>,const class basegfx::B2DRange &,_Bool,_Bool)
     _Bool bNeedsUpdate
     1
 canvas/inc/verifyinput.hxx:147
@@ -52,129 +56,153 @@ canvas/inc/verifyinput.hxx:279
     0
 canvas/inc/verifyinput.hxx:520
     void verifyRange(type-parameter-?-?,type-parameter-?-?,_Bool)
-    _Bool bLowerBound
+    type-parameter-?-? bound
     1
 canvas/inc/verifyinput.hxx:520
     void verifyRange(type-parameter-?-?,type-parameter-?-?,_Bool)
-    type-parameter-?-? bound
+    _Bool bLowerBound
     1
+canvas/qa/cppunit/canvastest.cxx:77
+    void CanvasTest::setupCanvas(const class Size &,class Color,_Bool)
+    _Bool alpha
+    0
 canvas/source/cairo/cairo_canvashelper.hxx:248
     void cairocanvas::CanvasHelper::useStates(const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,_Bool)
     _Bool setColor
     1
 canvas/source/vcl/spritecanvashelper.hxx:44
     void vclcanvas::SpriteCanvasHelper::init(const class std::shared_ptr<class vclcanvas::OutDevProvider> &,class vclcanvas::SpriteCanvas &,class canvas::SpriteRedrawManager &,_Bool,_Bool)
-    _Bool bHaveAlpha
+    _Bool bProtect
     0
 canvas/source/vcl/spritecanvashelper.hxx:44
     void vclcanvas::SpriteCanvasHelper::init(const class std::shared_ptr<class vclcanvas::OutDevProvider> &,class vclcanvas::SpriteCanvas &,class canvas::SpriteRedrawManager &,_Bool,_Bool)
-    _Bool bProtect
+    _Bool bHaveAlpha
     0
-chart2/qa/extras/chart2dump/chart2dump.cxx:98
+chart2/qa/extras/chart2dump/chart2dump.cxx:90
     void Chart2DumpTest::Chart2DumpTest(_Bool)
     _Bool bDumpMode
     0
-chart2/qa/extras/chart2export.cxx:435
-    void checkCommonTrendline(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XRegressionCurve> &,double,double,_Bool,double,_Bool,_Bool)
-    _Bool aExpectedShowEquation
-    1
-chart2/qa/extras/charttest.hxx:244
+chart2/qa/extras/charttest.hxx:83
+    class com::sun::star::uno::Sequence<class rtl::OUString> ChartTest::getImpressChartColumnDescriptions(int,int)
+    int nPage
+    0
+chart2/qa/extras/charttest.hxx:83
+    class com::sun::star::uno::Sequence<class rtl::OUString> ChartTest::getImpressChartColumnDescriptions(int,int)
+    int nShape
+    0
+chart2/qa/extras/charttest.hxx:86
+    class com::sun::star::uno::Reference<class com::sun::star::chart::XChartDocument> ChartTest::getChartDocFromDrawImpressNamed(int,class std::basic_string_view<char16_t>)
+    int nPage
+    0
+chart2/qa/extras/charttest.hxx:158
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> getPivotChartDocFromSheet(int,const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &)
     int nSheet
     1
-chart2/qa/extras/charttest.hxx:250
+chart2/qa/extras/charttest.hxx:164
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> getPivotChartDocFromSheet(const class com::sun::star::uno::Reference<class com::sun::star::table::XTablePivotCharts> &,int)
     int nIndex
     0
-chart2/qa/extras/charttest.hxx:284
+chart2/qa/extras/charttest.hxx:198
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XAxis> getAxisFromDoc(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int,int)
     int nCooSys
     0
-chart2/qa/extras/charttest.hxx:304
+chart2/qa/extras/charttest.hxx:218
     int getNumberOfDataSeries(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
     int nChartType
     0
-chart2/qa/extras/charttest.hxx:304
+chart2/qa/extras/charttest.hxx:218
     int getNumberOfDataSeries(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
     int nCooSys
     0
-chart2/qa/extras/charttest.hxx:314
+chart2/qa/extras/charttest.hxx:228
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> getDataSeriesFromDoc(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int,int)
     int nCooSys
     0
-chart2/qa/extras/charttest.hxx:329
+chart2/qa/extras/charttest.hxx:243
     class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataSequence> getLabelDataSequenceFromDoc(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
     int nChartType
     0
-chart2/qa/extras/charttest.hxx:351
-    class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataSequence> getDataSequenceFromDocByRole(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,const class rtl::OUString &,int,int)
+chart2/qa/extras/charttest.hxx:265
+    class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataSequence> getDataSequenceFromDocByRole(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,class std::basic_string_view<char16_t>,int,int)
     int nChartType
     0
-chart2/qa/extras/PivotChartTest.cxx:134
+chart2/qa/extras/PivotChartTest.cxx:135
     void lclModifyColumnGrandTotal(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotDescriptor> &,_Bool)
     _Bool bTotal
     1
-chart2/qa/extras/PivotChartTest.cxx:140
+chart2/qa/extras/PivotChartTest.cxx:141
     void lclModifyRowGrandTotal(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotDescriptor> &,_Bool)
     _Bool bTotal
     1
-chart2/qa/extras/PivotChartTest.cxx:177
+chart2/qa/extras/PivotChartTest.cxx:178
     class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotTable> lclGetPivotTableByName(int,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &)
     int nIndex
     1
-chart2/qa/extras/PivotChartTest.cxx:219
+chart2/qa/extras/PivotChartTest.cxx:220
     class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotTables> lclGetDataPilotTables(int,const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheetDocument> &)
     int nIndex
     0
-chart2/source/controller/dialogs/DialogModel.cxx:170
-    struct (anonymous namespace)::lcl_DataSeriesContainerAppend & (anonymous namespace)::lcl_DataSeriesContainerAppend::operator++(int)
-    int 
-    0
-chart2/source/controller/dialogs/DialogModel.cxx:229
+chart2/source/controller/dialogs/DialogModel.cxx:175
     struct (anonymous namespace)::lcl_RolesWithRangeAppend & (anonymous namespace)::lcl_RolesWithRangeAppend::operator++(int)
     int 
     0
-chart2/source/controller/inc/ChartController.hxx:367
+chart2/source/controller/inc/ChartController.hxx:370
     class chart::ChartController::TheModelRef & chart::ChartController::TheModelRef::operator=(class chart::ChartController::TheModel *)
      ###1
     0
+chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx:49
+    void chart::SchAxisDlg::SchAxisDlg(class weld::Window *,const struct chart::InsertAxisOrGridDialogData &,_Bool)
+    _Bool bAxisDlg
+    0
 chart2/source/controller/inc/ViewElementListProvider.hxx:51
     class Graphic chart::ViewElementListProvider::GetSymbolGraphic(int,const class SfxItemSet *) const
     int nStandardSymbol
     0
-chart2/source/inc/AxisHelper.hxx:193
-    class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartType> chart::AxisHelper::getChartTypeByIndex(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XCoordinateSystem> &,int)
+chart2/source/inc/AxisHelper.hxx:199
+    class rtl::Reference<class chart::ChartType> chart::AxisHelper::getChartTypeByIndex(const class rtl::Reference<class chart::BaseCoordinateSystem> &,int)
     int nIndex
     0
 chart2/source/inc/ChartTypeDialogController.hxx:64
     void chart::ChartTypeParameter::ChartTypeParameter(int,_Bool,_Bool,enum chart::GlobalStackMode,_Bool,_Bool,enum com::sun::star::chart2::CurveStyle)
     enum com::sun::star::chart2::CurveStyle eCurveStyle
     0
-chart2/source/model/template/ColumnLineChartTypeTemplate.hxx:37
+chart2/source/inc/CommonConverters.hxx:85
+    void AddPointToPoly(struct com::sun::star::drawing::PolyPolygonShape3D &,const struct com::sun::star::drawing::Position3D &,int)
+    int nSequenceIndex
+    0
+chart2/source/inc/RegressionCurveHelper.hxx:124
+    class rtl::Reference<class chart::RegressionCurveModel> addRegressionCurve(enum SvxChartRegress,const class rtl::Reference<class chart::DataSeries> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
+    enum SvxChartRegress eType
+    1
+chart2/source/model/template/ColumnLineChartTypeTemplate.hxx:35
     void chart::ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum chart::StackMode,int)
     int nNumberOfLines
     1
-chart2/source/tools/InternalDataProvider.cxx:244
+chart2/source/tools/InternalDataProvider.cxx:241
     void chart::(anonymous namespace)::lcl_setAnyAtLevelFromStringSequence::lcl_setAnyAtLevelFromStringSequence(int)
     int nLevel
     0
-chart2/source/view/axes/VAxisProperties.hxx:149
+chart2/source/view/axes/VAxisProperties.hxx:159
     struct chart::TickmarkProperties chart::AxisProperties::makeTickmarkPropertiesForComplexCategories(int,int) const
     int nTickStartDistanceToAxis
     0
-chart2/source/view/axes/VCartesianAxis.hxx:31
+chart2/source/view/axes/VCartesianAxis.hxx:30
     void chart::VCartesianAxis::VCartesianAxis(const struct chart::AxisProperties &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormatsSupplier> &,int,int,class chart::PlottingPositionHelper *)
     int nDimensionIndex
     1
-chart2/source/view/charttypes/CategoryPositionHelper.hxx:28
+chart2/source/view/charttypes/CategoryPositionHelper.hxx:27
     void chart::CategoryPositionHelper::CategoryPositionHelper(double,double)
     double fSeriesCount
     1
-chart2/source/view/inc/PlottingPositionHelper.hxx:112
+chart2/source/view/inc/Clipping.hxx:47
+    void chart::Clipping::clipPolygonAtRectangle(const struct com::sun::star::drawing::PolyPolygonShape3D &,const class basegfx::B2DRange &,struct com::sun::star::drawing::PolyPolygonShape3D &,_Bool)
+    _Bool bSplitPiecesToDifferentPolygons
+    1
+chart2/source/view/inc/PlottingPositionHelper.hxx:156
     void chart::PlottingPositionHelper::AllowShiftXAxisPos(_Bool)
     _Bool bAllowShift
     1
-chart2/source/view/inc/PlottingPositionHelper.hxx:113
+chart2/source/view/inc/PlottingPositionHelper.hxx:157
     void chart::PlottingPositionHelper::AllowShiftZAxisPos(_Bool)
     _Bool bAllowShift
     1
@@ -182,7 +210,7 @@ chart2/source/view/inc/Stripe.hxx:52
     void chart::Stripe::InvertNormal(_Bool)
     _Bool bInvertNormal
     1
-chart2/source/view/main/ShapeFactory.cxx:704
+chart2/source/view/main/ShapeFactory.cxx:719
     void appendAndCloseBezierCoords(struct com::sun::star::drawing::PolyPolygonBezierCoords &,const struct com::sun::star::drawing::PolyPolygonBezierCoords &,_Bool)
     _Bool bAppendInverse
     1
@@ -194,24 +222,24 @@ codemaker/source/javamaker/classfile.hxx:119
     void codemaker::javamaker::ClassFile::Code::storeLocalReference(unsigned short)
     unsigned short index
     1
-comphelper/source/misc/backupfilehelper.cxx:57
+comphelper/source/misc/backupfilehelper.cxx:58
     unsigned int createCrc32(const class std::shared_ptr<class osl::File> &,unsigned int)
     unsigned int nOffset
     0
-connectivity/inc/sdbcx/VIndex.hxx:62
+connectivity/inc/sdbcx/VIndex.hxx:63
     void connectivity::sdbcx::OIndex::OIndex(_Bool)
     _Bool _bCase
     1
-connectivity/inc/sdbcx/VIndex.hxx:63
-    void connectivity::sdbcx::OIndex::OIndex(const class rtl::OUString &,const class rtl::OUString &,_Bool,_Bool,_Bool,_Bool)
+connectivity/inc/sdbcx/VIndex.hxx:64
+    void connectivity::sdbcx::OIndex::OIndex(const class rtl::OUString &,class rtl::OUString,_Bool,_Bool,_Bool,_Bool)
     _Bool _bCase
     1
-connectivity/inc/sdbcx/VKey.hxx:77
+connectivity/inc/sdbcx/VKey.hxx:78
     void connectivity::sdbcx::OKey::OKey(_Bool)
     _Bool _bCase
     1
-connectivity/inc/sdbcx/VKey.hxx:78
-    void connectivity::sdbcx::OKey::OKey(const class rtl::OUString &,const class std::shared_ptr<struct connectivity::sdbcx::KeyProperties> &,_Bool)
+connectivity/inc/sdbcx/VKey.hxx:79
+    void connectivity::sdbcx::OKey::OKey(const class rtl::OUString &,class std::shared_ptr<struct connectivity::sdbcx::KeyProperties>,_Bool)
     _Bool _bCase
     1
 connectivity/inc/sdbcx/VUser.hxx:61
@@ -222,23 +250,35 @@ connectivity/inc/sdbcx/VUser.hxx:62
     void connectivity::sdbcx::OUser::OUser(const class rtl::OUString &,_Bool)
     _Bool _bCase
     1
-connectivity/source/inc/dbase/DIndex.hxx:113
+connectivity/source/drivers/postgresql/pq_connection.cxx:354
+    void pq_sdbc_driver::(anonymous namespace)::cstr_vector::push_back(const char *,enum __sal_NoAcquire)
+    enum __sal_NoAcquire 
+    0
+connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx:88
+    _Bool pq_sdbc_driver::ResultSetMetaData::getBoolColumnProperty(const class rtl::OUString &,int,_Bool)
+    _Bool def
+    0
+connectivity/source/drivers/postgresql/pq_updateableresultset.hxx:163
+    class com::sun::star::uno::Sequence<class com::sun::star::uno::Type> pq_sdbc_driver::UpdateableResultSet::getStaticTypes(_Bool)
+    _Bool updateable
+    0
+connectivity/source/inc/dbase/DIndex.hxx:108
     _Bool connectivity::dbase::ODbaseIndex::Find(unsigned int,const class connectivity::ORowSetValue &)
     unsigned int nRec
     0
 connectivity/source/inc/OColumn.hxx:68
-    void connectivity::OColumn::OColumn(const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,int)
+    void connectivity::OColumn::OColumn(class rtl::OUString,const class rtl::OUString &,int,int,int,int,int)
     int _aScale
     0
-connectivity/source/inc/odbc/OTools.hxx:180
+connectivity/source/inc/odbc/OTools.hxx:179
     void connectivity::odbc::OTools::getBindTypes(_Bool,_Bool,short,short &,short &)
     _Bool _bUseWChar
     0
-connectivity/source/inc/odbc/OTools.hxx:217
+connectivity/source/inc/odbc/OTools.hxx:216
     void connectivity::odbc::OTools::bindValue(const class connectivity::odbc::OConnection *,void *,int,short,short,const void *,void *,long *,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,unsigned short,_Bool)
     short _nMaxLen
     0
-cppcanvas/source/mtfrenderer/mtftools.cxx:285
+cppcanvas/source/mtfrenderer/mtftools.cxx:284
     void appendRect(class basegfx::B2DPolyPolygon &,const class basegfx::B2DPoint &,const double,const double,const double,const double)
     const double nX1
     0
@@ -254,27 +294,31 @@ cppu/qa/test_unotype.cxx:74
     void (anonymous namespace)::DerivedInterface2::dummy(struct (anonymous namespace)::DerivedInterface2 *)
     struct (anonymous namespace)::DerivedInterface2 * p
     0
-cui/source/inc/acccfg.hxx:43
+cui/source/inc/acccfg.hxx:46
     void TAccInfo::TAccInfo(int,int,const class vcl::KeyCode &)
     int nListPos
     0
-cui/source/inc/cfg.hxx:335
+cui/source/inc/cfg.hxx:339
     void SvxMenuEntriesListBox::set_text(int,const class rtl::OUString &,int)
     int col
     0
-cui/source/inc/cfg.hxx:455
+cui/source/inc/cfg.hxx:460
     void SvxConfigPage::InsertEntryIntoUI(class SvxConfigEntry *,class weld::TreeView &,class weld::TreeIter &,_Bool)
     _Bool bMenu
     1
-cui/source/inc/cfgutil.hxx:128
+cui/source/inc/cfgutil.hxx:134
     void CuiConfigFunctionListBox::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *)
     const class weld::TreeIter * pParent
     0
-cui/source/inc/cfgutil.hxx:143
-    class std::unique_ptr<class weld::TreeIter, struct std::default_delete<class weld::TreeIter> > CuiConfigFunctionListBox::make_iterator(const class weld::TreeIter *) const
+cui/source/inc/cfgutil.hxx:149
+    class std::unique_ptr<class weld::TreeIter> CuiConfigFunctionListBox::make_iterator(const class weld::TreeIter *) const
     const class weld::TreeIter * pOrig
     0
-cui/source/inc/cuitabarea.hxx:725
+cui/source/inc/cuitabarea.hxx:270
+    void SvxAreaTabPage::SvxAreaTabPage(class weld::Container *,class weld::DialogController *,const class SfxItemSet &,_Bool)
+    _Bool bSlideBackground
+    0
+cui/source/inc/cuitabarea.hxx:744
     void SvxColorTabPage::SetPropertyList(enum XPropertyListType,const class rtl::Reference<class XPropertyList> &)
     enum XPropertyListType t
     0
@@ -286,59 +330,59 @@ cui/source/inc/hangulhanjadlg.hxx:58
     class rtl::OUString svx::SuggestionDisplay::GetEntry(unsigned short) const
     unsigned short nPos
     0
-cui/source/inc/scriptdlg.hxx:123
-    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry, struct std::default_delete<class SFEntry> > &&,const class rtl::OUString &,_Bool)
+cui/source/inc/scriptdlg.hxx:122
+    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry> &&,class std::basic_string_view<char16_t>,_Bool)
+    const class weld::TreeIter * pParent
+    0
+cui/source/inc/scriptdlg.hxx:122
+    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry> &&,class std::basic_string_view<char16_t>,_Bool)
     _Bool bChildrenOnDemand
     1
-cui/source/inc/scriptdlg.hxx:123
-    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry, struct std::default_delete<class SFEntry> > &&,const class rtl::OUString &,_Bool)
+cui/source/inc/scriptdlg.hxx:122
+    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry> &&,class std::basic_string_view<char16_t>,_Bool)
     _Bool bSelect
     0
-cui/source/inc/scriptdlg.hxx:123
-    void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const class rtl::OUString &,const class weld::TreeIter *,_Bool,class std::unique_ptr<class SFEntry, struct std::default_delete<class SFEntry> > &&,const class rtl::OUString &,_Bool)
-    const class weld::TreeIter * pParent
-    0
-cui/source/options/optjsearch.hxx:65
+cui/source/options/optjsearch.hxx:67
     void SvxJSearchOptionsPage::EnableSaveOptions(_Bool)
     _Bool bVal
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:674
+dbaccess/source/core/dataaccess/databasedocument.hxx:673
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::DefaultMethod_)
     enum dbaccess::DocumentGuard::DefaultMethod_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:692
+dbaccess/source/core/dataaccess/databasedocument.hxx:691
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::InitMethod_)
     enum dbaccess::DocumentGuard::InitMethod_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:711
+dbaccess/source/core/dataaccess/databasedocument.hxx:710
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::MethodUsedDuringInit_)
     enum dbaccess::DocumentGuard::MethodUsedDuringInit_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:726
+dbaccess/source/core/dataaccess/databasedocument.hxx:725
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::MethodWithoutInit_)
     enum dbaccess::DocumentGuard::MethodWithoutInit_ 
     0
 dbaccess/source/core/inc/column.hxx:167
-    void dbaccess::OColumns::OColumns(class cppu::OWeakObject &,class osl::Mutex &,_Bool,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &,class dbaccess::IColumnFactory *,class connectivity::sdbcx::IRefreshableColumns *,_Bool,_Bool,_Bool)
+    void dbaccess::OColumns::OColumns(class cppu::OWeakObject &,class osl::Mutex &,_Bool,const class std::vector<class rtl::OUString> &,class dbaccess::IColumnFactory *,class connectivity::sdbcx::IRefreshableColumns *,_Bool,_Bool,_Bool)
     _Bool _bDropColumn
     0
 dbaccess/source/core/inc/column.hxx:178
-    void dbaccess::OColumns::OColumns(class cppu::OWeakObject &,class osl::Mutex &,const class com::sun::star::uno::Reference<class com::sun::star::container::XNameAccess> &,_Bool,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &,class dbaccess::IColumnFactory *,class connectivity::sdbcx::IRefreshableColumns *,_Bool,_Bool,_Bool)
+    void dbaccess::OColumns::OColumns(class cppu::OWeakObject &,class osl::Mutex &,class com::sun::star::uno::Reference<class com::sun::star::container::XNameAccess>,_Bool,const class std::vector<class rtl::OUString> &,class dbaccess::IColumnFactory *,class connectivity::sdbcx::IRefreshableColumns *,_Bool,_Bool,_Bool)
     _Bool _bUseHardRef
     1
-dbaccess/source/ui/control/tabletree.cxx:172
-    class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > lcl_getMetaDataStrings_throw(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSet> &,int)
+dbaccess/source/ui/control/tabletree.cxx:166
+    class std::vector<class rtl::OUString> lcl_getMetaDataStrings_throw(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSet> &,int)
     int _nColumnIndex
     1
 dbaccess/source/ui/inc/charsets.hxx:45
     class dbaui::OCharsetDisplay::ExtendedCharsetIterator dbaui::OCharsetDisplay::findEncoding(const unsigned short) const
     const unsigned short _eEncoding
     0
-dbaccess/source/ui/inc/FieldDescControl.hxx:121
-    void dbaui::OFieldDescControl::InitializeControl(class dbaui::OPropListBoxCtrl *,const class rtl::OString &,_Bool)
+dbaccess/source/ui/inc/FieldDescControl.hxx:122
+    void dbaui::OFieldDescControl::InitializeControl(class dbaui::OPropListBoxCtrl *,const class rtl::OUString &,_Bool)
     _Bool _bAddChangeHandler
     1
-dbaccess/source/ui/inc/imageprovider.hxx:85
+dbaccess/source/ui/inc/imageprovider.hxx:70
     class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> dbaui::ImageProvider::getXGraphic(const class rtl::OUString &,const int)
     const int _nDatabaseObjectType
     0
@@ -347,214 +391,178 @@ dbaccess/source/ui/inc/IUpdateHelper.hxx:32
     int _nPos
     1
 dbaccess/source/ui/inc/WCopyTable.hxx:310
-    void dbaui::OCopyTableWizard::OCopyTableWizard(class weld::Window *,const class rtl::OUString &,short,const class std::__debug::map<class rtl::OUString, class dbaui::OFieldDescription *, struct comphelper::UStringMixLess, class std::allocator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> > > &,const class std::__debug::vector<class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> >, class std::__debug::map<class rtl::OUString, class dbaui::OFieldDescription *, struct comphelper::UStringMixLess, class std::allocator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> > >, struct std::bidirectional_iterator_tag>, class std::allocator<class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> >, class std::__debug::map<class rtl::OUString, class dbaui::OFieldDescription *, struct comphelper::UStringMixLess, class std::allocator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> > >, struct std::bidirectional_iterator_tag> > > &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormatter> &,class std::unique_ptr<class dbaui::OWizTypeSelect, struct std::default_delete<class dbaui::OWizTypeSelect> > (*)(class weld::Container *, class dbaui::OCopyTableWizard *, class SvStream &),class SvStream &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
+    void dbaui::OCopyTableWizard::OCopyTableWizard(class weld::Window *,class rtl::OUString,short,class std::map<class rtl::OUString, class dbaui::OFieldDescription *, struct comphelper::UStringMixLess> &&,const class std::vector<class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const class rtl::OUString, class dbaui::OFieldDescription *> >, class std::map<class rtl::OUString, class dbaui::OFieldDescription *, struct comphelper::UStringMixLess> > > &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormatter> &,class std::unique_ptr<class dbaui::OWizTypeSelect> (*)(class weld::Container *, class dbaui::OCopyTableWizard *, class SvStream &),class SvStream &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     class weld::Window * pParent
     0
-dbaccess/source/ui/inc/WTypeSelect.hxx:122
+dbaccess/source/ui/inc/WTypeSelect.hxx:121
     void dbaui::OWizTypeSelect::EnableAuto(_Bool)
     _Bool bEnable
     0
-desktop/source/deployment/gui/dp_gui_updatedialog.hxx:102
-    void dp_gui::UpdateDialog::addAdditional(struct dp_gui::UpdateDialog::Index *,_Bool)
+desktop/qa/desktop_lib/test_desktop_lib.cxx:140
+    struct desktop::LibLODocument_Impl * DesktopLOKTest::loadDocUrl(const class rtl::OUString &,LibreOfficeKitDocumentType)
+    LibreOfficeKitDocumentType eType
+    1
+desktop/qa/desktop_lib/test_desktop_lib.cxx:3421
+    void lcl_repeatKeyStroke(struct desktop::LibLODocument_Impl *,int,int,unsigned long)
+    int nCharCode
+    0
+desktop/source/deployment/gui/dp_gui_updatedialog.hxx:100
+    void dp_gui::UpdateDialog::addAdditional(const struct dp_gui::UpdateDialog::Index *,_Bool)
     _Bool bEnableCheckBox
     0
-desktop/source/lib/init.cxx:6380
+desktop/source/lib/init.cxx:8214
     struct _LibreOfficeKit * libreofficekit_hook_2(const char *,const char *)
     const char * user_profile_url
     0
-editeng/source/editeng/editstt2.hxx:28
-    void InternalEditStatus::TurnOnFlags(enum EEControlBits)
-    enum EEControlBits nFlags
-    1
-editeng/source/editeng/editstt2.hxx:31
-    void InternalEditStatus::TurnOffFlags(enum EEControlBits)
-    enum EEControlBits nFlags
-    1
-editeng/source/editeng/impedit.hxx:897
+drawinglayer/qa/unit/vclmetafileprocessor2d.cxx:62
+    void VclMetaFileProcessor2DTest::setupCanvas(const class Size &,class Color,_Bool)
+    _Bool alpha
+    0
+editeng/inc/ParagraphPortionList.hxx:74
+    void ParaPortionList::MarkAllSelectionsInvalid(int)
+    int nStart
+    0
+editeng/inc/TextPortion.hxx:121
+    void TextPortion::adjustSize(long,long)
+    long nDeltaY
+    0
+editeng/source/editeng/impedit.hxx:1049
     unsigned short ImpEditEngine::GetLineHeight(int,int)
     int nLine
     0
-extensions/source/propctrlr/browserline.cxx:241
-    void implEnable(class weld::Widget *,_Bool)
-    _Bool bEnable
+emfio/inc/mtftools.hxx:462
+    void emfio::WinMtfLineStyle::WinMtfLineStyle(const class Color &,_Bool)
+    _Bool bTrans
+    1
+emfio/inc/mtftools.hxx:467
+    void emfio::WinMtfLineStyle::WinMtfLineStyle(const class Color &,const unsigned int,const int)
+    const unsigned int nStyle
+    0
+emfio/inc/mtftools.hxx:467
+    void emfio::WinMtfLineStyle::WinMtfLineStyle(const class Color &,const unsigned int,const int)
+    const int nPenWidth
+    0
+emfio/inc/mtftools.hxx:784
+    void emfio::MtfTools::DrawArc(const class tools::Rectangle &,const class Point &,const class Point &,_Bool)
+    _Bool bDrawTo
     0
-extensions/source/propctrlr/browserline.hxx:96
+extensions/source/propctrlr/browserline.hxx:95
     void pcr::OBrowserLine::Show(_Bool)
     _Bool bFlag
     0
-extensions/source/propctrlr/newdatatype.hxx:40
-    void pcr::NewDataTypeDialog::NewDataTypeDialog(class weld::Window *,const class rtl::OUString &,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
+extensions/source/propctrlr/newdatatype.hxx:39
+    void pcr::NewDataTypeDialog::NewDataTypeDialog(class weld::Window *,class std::basic_string_view<char16_t>,const class std::vector<class rtl::OUString> &)
     class weld::Window * _pParent
     0
-extensions/source/propctrlr/propertyhandler.hxx:186
-    void pcr::PropertyHandler::addDoublePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
+extensions/source/propctrlr/propertyhandler.hxx:183
+    void pcr::PropertyHandler::addDoublePropertyDescription(class std::vector<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:194
-    void pcr::PropertyHandler::addDatePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
+extensions/source/propctrlr/propertyhandler.hxx:191
+    void pcr::PropertyHandler::addDatePropertyDescription(class std::vector<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:202
-    void pcr::PropertyHandler::addTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
+extensions/source/propctrlr/propertyhandler.hxx:199
+    void pcr::PropertyHandler::addTimePropertyDescription(class std::vector<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:210
-    void pcr::PropertyHandler::addDateTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
+extensions/source/propctrlr/propertyhandler.hxx:207
+    void pcr::PropertyHandler::addDateTimePropertyDescription(class std::vector<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/usercontrol.hxx:42
-    void pcr::OFormatSampleControl::OFormatSampleControl(class std::unique_ptr<class weld::Container, struct std::default_delete<class weld::Container> >,class std::unique_ptr<class weld::Builder, struct std::default_delete<class weld::Builder> >,_Bool)
+extensions/source/propctrlr/usercontrol.hxx:41
+    void pcr::OFormatSampleControl::OFormatSampleControl(class std::unique_ptr<class weld::Container>,class std::unique_ptr<class weld::Builder>,_Bool)
     _Bool bReadOnly
     0
 extensions/source/propctrlr/usercontrol.hxx:91
-    void pcr::OFormattedNumericControl::OFormattedNumericControl(class std::unique_ptr<class weld::FormattedSpinButton, struct std::default_delete<class weld::FormattedSpinButton> >,class std::unique_ptr<class weld::Builder, struct std::default_delete<class weld::Builder> >,_Bool)
+    void pcr::OFormattedNumericControl::OFormattedNumericControl(class std::unique_ptr<class weld::FormattedSpinButton>,class std::unique_ptr<class weld::Builder>,_Bool)
     _Bool bReadOnly
     0
-extensions/source/propctrlr/usercontrol.hxx:121
-    void pcr::OFileUrlControl::OFileUrlControl(class std::unique_ptr<class SvtURLBox, struct std::default_delete<class SvtURLBox> >,class std::unique_ptr<class weld::Builder, struct std::default_delete<class weld::Builder> >,_Bool)
+extensions/source/propctrlr/usercontrol.hxx:124
+    void pcr::OFileUrlControl::OFileUrlControl(class std::unique_ptr<class SvtURLBox>,class std::unique_ptr<class weld::Builder>,_Bool)
     _Bool bReadOnly
     0
-extensions/source/scanner/grid.cxx:130
+extensions/source/scanner/grid.cxx:129
     void GridWindow::Init(double *,double *,int,_Bool,const class BitmapEx &)
     _Bool bCutValues
     1
-extensions/source/scanner/grid.hxx:47
+extensions/source/scanner/grid.hxx:46
     void GridDialog::setBoundings(double,double,double,double)
     double fMinX
     0
-filter/qa/cppunit/filters-dxf-test.cxx:19
-    _Bool idxGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-eps-test.cxx:19
-    _Bool ipsGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-met-test.cxx:19
-    _Bool imeGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-pcd-test.cxx:19
-    _Bool icdGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-pcx-test.cxx:19
-    _Bool ipxGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-pict-test.cxx:24
-    _Bool iptGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-ppm-test.cxx:19
-    _Bool ipbGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-psd-test.cxx:19
-    _Bool ipdGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-ras-test.cxx:19
-    _Bool iraGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-tga-test.cxx:19
-    _Bool itgGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/qa/cppunit/filters-tiff-test.cxx:19
-    _Bool itiGraphicImport(class SvStream &,class Graphic &,class FilterConfigItem *)
-    class FilterConfigItem * 
-    0
-filter/source/graphicfilter/eps/eps.cxx:91
-    enum (anonymous namespace)::NMode operator|(enum (anonymous namespace)::NMode,enum (anonymous namespace)::NMode)
-    enum (anonymous namespace)::NMode a
-    1
-filter/source/graphicfilter/eps/eps.cxx:212
-    void (anonymous namespace)::PSWriter::ImplWriteLineColor(enum (anonymous namespace)::NMode)
-    enum (anonymous namespace)::NMode nMode
-    1
-filter/source/graphicfilter/eps/eps.cxx:213
-    void (anonymous namespace)::PSWriter::ImplWriteFillColor(enum (anonymous namespace)::NMode)
-    enum (anonymous namespace)::NMode nMode
-    1
-filter/source/graphicfilter/icgm/cgm.hxx:89
+filter/source/graphicfilter/icgm/cgm.hxx:90
     unsigned char CGM::ImplGetByte(unsigned int,unsigned int)
     unsigned int nPrecision
     1
-filter/source/svg/svgfilter.hxx:240
-    _Bool SVGFilter::implExportMasterPages(const class std::__debug::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage>, class std::allocator<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > > &,int,int)
+filter/source/svg/svgfilter.hxx:267
+    _Bool SVGFilter::implExportMasterPages(const class std::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > &,int,int)
     int nFirstPage
     0
-filter/source/svg/svgfilter.hxx:242
-    void SVGFilter::implExportDrawPages(const class std::__debug::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage>, class std::allocator<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > > &,int,int)
+filter/source/svg/svgfilter.hxx:269
+    void SVGFilter::implExportDrawPages(const class std::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > &,int,int)
     int nFirstPage
     0
-filter/source/svg/svgwriter.hxx:254
+filter/source/svg/svgwriter.hxx:247
+    void SVGTextWriter::addFontAttributes(_Bool)
+    _Bool bIsTextContainer
+    0
+filter/source/svg/svgwriter.hxx:258
     void SVGTextWriter::startTextPosition(_Bool,_Bool)
     _Bool bExportY
     1
-forms/source/component/DatabaseForm.hxx:231
+forms/source/component/DatabaseForm.hxx:233
     void frm::ODatabaseForm::fire(int *,const class com::sun::star::uno::Any *,const class com::sun::star::uno::Any *,int)
     int nCount
     1
-forms/source/component/GroupManager.hxx:144
+forms/source/component/GroupManager.hxx:143
     const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> & frm::OGroup::GetObject(unsigned short) const
     unsigned short nP
     0
-forms/source/inc/featuredispatcher.hxx:51
+forms/source/inc/featuredispatcher.hxx:50
     void frm::IFeatureDispatcher::dispatchWithArgument(short,const char *,const class com::sun::star::uno::Any &) const
     short _nFeatureId
     1
-formula/source/ui/dlg/structpg.hxx:59
+formula/source/core/api/FormulaCompiler.cxx:161
+    void formula::(anonymous namespace)::OpCodeList::OpCodeList(const struct std::pair<struct TranslateId, int> *,const class std::shared_ptr<class formula::FormulaCompiler::OpCodeMap> &,enum formula::FormulaCompiler::SeparatorType)
+    enum formula::FormulaCompiler::SeparatorType 
+    1
+formula/source/ui/dlg/structpg.hxx:58
     _Bool formula::StructPage::InsertEntry(const class rtl::OUString &,const class weld::TreeIter *,unsigned short,int,const class formula::FormulaToken *,class weld::TreeIter &)
     int nPos
     0
-fpicker/source/office/autocmpledit.hxx:40
+fpicker/source/office/autocmpledit.hxx:41
     void AutocompleteEdit::select_region(int,int)
     int nStartPos
     0
-fpicker/source/office/fileview.hxx:163
+fpicker/source/office/fileview.hxx:162
     void SvtFileView::EnableDelete(_Bool)
     _Bool bEnable
     1
-framework/inc/uielement/uicommanddescription.hxx:83
+framework/inc/uielement/uicommanddescription.hxx:81
     void framework::UICommandDescription::UICommandDescription(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,_Bool)
     _Bool 
     1
-helpcompiler/inc/HelpCompiler.hxx:58
-    void fs::path::path(const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,enum fs::convert)
+helpcompiler/inc/HelpCompiler.hxx:57
+    void fs::path::path(const class std::basic_string<char> &,enum fs::convert)
     enum fs::convert 
     0
 hwpfilter/source/hfont.h:63
     const char * HWPFont::GetFontName(int,int)
     int lang
     0
-hwpfilter/source/hwpfile.h:145
-    void HWPFile::Read4b(void *,unsigned long)
-    unsigned long nmemb
-    1
-i18npool/source/localedata/LocaleNode.hxx:73
+i18npool/source/localedata/LocaleNode.hxx:74
     const class rtl::OUString & Attr::getValueByIndex(int) const
     int idx
     0
-idlc/inc/errorhandler.hxx:86
-    void ErrorHandler::warning0(enum WarningCode,const char *)
-    enum WarningCode e
-    0
-idlc/source/errorhandler.cxx:399
-    void errorHeader(enum ErrorCode,unsigned int)
-    enum ErrorCode eCode
-    0
-include/avmedia/mediaplayer.hxx:51
+include/avmedia/mediaplayer.hxx:49
     void avmedia::MediaFloater::setURL(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bPlayImmediately
     1
-include/basegfx/DrawCommands.hxx:58
+include/basegfx/DrawCommands.hxx:59
     void gfx::GradientInfo::GradientInfo(enum gfx::GradientType)
     enum gfx::GradientType eType
     0
-include/basegfx/polygon/b2dpolygon.hxx:83
+include/basegfx/polygon/b2dpolygon.hxx:84
     void basegfx::B2DPolygon::insert(unsigned int,const class basegfx::B2DPoint &,unsigned int)
     unsigned int nCount
     1
@@ -578,47 +586,47 @@ include/basegfx/polygon/b2dpolygontools.hxx:377
     _Bool isPointInTriangle(const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,_Bool)
     _Bool bWithBorder
     1
-include/basegfx/polygon/b2dpolypolygon.hxx:76
-    void basegfx::B2DPolyPolygon::insert(unsigned int,const class basegfx::B2DPolygon &,unsigned int)
-    unsigned int nCount
-    1
-include/basegfx/polygon/b2dpolypolygon.hxx:76
+include/basegfx/polygon/b2dpolypolygon.hxx:68
     void basegfx::B2DPolyPolygon::insert(unsigned int,const class basegfx::B2DPolygon &,unsigned int)
     unsigned int nIndex
     0
-include/basegfx/polygon/b2dpolypolygon.hxx:77
+include/basegfx/polygon/b2dpolypolygon.hxx:68
+    void basegfx::B2DPolyPolygon::insert(unsigned int,const class basegfx::B2DPolygon &,unsigned int)
+    unsigned int nCount
+    1
+include/basegfx/polygon/b2dpolypolygon.hxx:69
     void basegfx::B2DPolyPolygon::append(const class basegfx::B2DPolygon &,unsigned int)
     unsigned int nCount
     1
-include/basegfx/polygon/b2dpolypolygon.hxx:102
+include/basegfx/polygon/b2dpolypolygon.hxx:95
     void basegfx::B2DPolyPolygon::remove(unsigned int,unsigned int)
     unsigned int nCount
     1
-include/basegfx/polygon/b2dpolypolygon.hxx:137
-    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(class basegfx::SystemDependentDataManager &,type-parameter-?-? &&...) const
+include/basegfx/polygon/b2dpolypolygon.hxx:130
+    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(type-parameter-?-? &&...) const
+     ###2
+    0
+include/basegfx/polygon/b2dpolypolygon.hxx:130
+    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(type-parameter-?-? &&...) const
      ###3
     0
-include/basegfx/polygon/b2dpolypolygon.hxx:137
-    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(class basegfx::SystemDependentDataManager &,type-parameter-?-? &&...) const
+include/basegfx/polygon/b2dpolypolygon.hxx:130
+    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(type-parameter-?-? &&...) const
      ###4
     0
-include/basegfx/polygon/b2dpolypolygon.hxx:137
-    shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(class basegfx::SystemDependentDataManager &,type-parameter-?-? &&...) const
-     ###5
-    0
-include/basegfx/polygon/b3dpolygon.hxx:71
+include/basegfx/polygon/b3dpolygon.hxx:70
     void basegfx::B3DPolygon::append(const class basegfx::B3DPoint &,unsigned int)
     unsigned int nCount
     1
-include/basegfx/polygon/b3dpolygon.hxx:95
+include/basegfx/polygon/b3dpolygon.hxx:94
     void basegfx::B3DPolygon::append(const class basegfx::B3DPolygon &,unsigned int,unsigned int)
-    unsigned int nCount
+    unsigned int nIndex
     0
-include/basegfx/polygon/b3dpolygon.hxx:95
+include/basegfx/polygon/b3dpolygon.hxx:94
     void basegfx::B3DPolygon::append(const class basegfx::B3DPolygon &,unsigned int,unsigned int)
-    unsigned int nIndex
+    unsigned int nCount
     0
-include/basegfx/polygon/b3dpolygon.hxx:98
+include/basegfx/polygon/b3dpolygon.hxx:97
     void basegfx::B3DPolygon::remove(unsigned int,unsigned int)
     unsigned int nCount
     1
@@ -630,7 +638,7 @@ include/basegfx/polygon/b3dpolygontools.hxx:103
     _Bool isPointOnLine(const class basegfx::B3DPoint &,const class basegfx::B3DPoint &,const class basegfx::B3DPoint &,_Bool)
     _Bool bWithPoints
     1
-include/basegfx/polygon/b3dpolypolygon.hxx:82
+include/basegfx/polygon/b3dpolypolygon.hxx:81
     void basegfx::B3DPolyPolygon::append(const class basegfx::B3DPolygon &,unsigned int)
     unsigned int nCount
     1
@@ -646,26 +654,26 @@ include/basegfx/utils/tools.hxx:118
     class basegfx::B2DPolyPolygon number2PolyPolygon(double,int,int,_Bool)
     _Bool bLitSegments
     1
+include/basic/basmgr.hxx:114
+    void BasicManager::BasicManager(class SotStorage &,class std::basic_string_view<char16_t>,class StarBASIC *,const class rtl::OUString *,_Bool)
+    _Bool bDocMgr
+    1
 include/basic/basrdll.hxx:37
     void BasicDLL::EnableBreak(_Bool)
     _Bool bEnable
     1
-include/basic/sbstar.hxx:146
+include/basic/sbstar.hxx:141
     class SbxVariable * StarBASIC::VBAFind(const class rtl::OUString &,enum SbxClassType)
     enum SbxClassType t
     1
-include/basic/sbxobj.hxx:61
+include/basic/sbxobj.hxx:63
     class SbxVariable * SbxObject::FindQualified(const class rtl::OUString &,enum SbxClassType)
     enum SbxClassType 
     1
-include/basic/sbxobj.hxx:72
+include/basic/sbxobj.hxx:74
     void SbxObject::Remove(const class rtl::OUString &,enum SbxClassType)
     enum SbxClassType 
     1
-include/codemaker/commonjava.hxx:31
-    class rtl::OString translateUnoToJavaType(enum codemaker::UnoType::Sort,const class rtl::OString &,_Bool)
-    _Bool referenceType
-    0
 include/comphelper/configurationhelper.hxx:211
     class com::sun::star::uno::Any comphelper::ConfigurationHelper::readDirectKey(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum comphelper::EConfigurationModes)
     enum comphelper::EConfigurationModes eMode
@@ -674,54 +682,66 @@ include/comphelper/configurationhelper.hxx:227
     void comphelper::ConfigurationHelper::writeDirectKey(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Any &,enum comphelper::EConfigurationModes)
     enum comphelper::EConfigurationModes eMode
     0
-include/comphelper/lok.hxx:53
+include/comphelper/errcode.hxx:78
+    void ErrCode::ErrCode(enum WarningFlag,enum ErrCodeArea,enum ErrCodeClass,unsigned short)
+    enum WarningFlag 
+    0
+include/comphelper/interfacecontainer2.hxx:174
+    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> comphelper::OInterfaceContainerHelper2::getInterface(int) const
+    int nIndex
+    0
+include/comphelper/lok.hxx:62
     void setLocalRendering(_Bool)
     _Bool bLocalRendering
     1
-include/comphelper/lok.hxx:78
+include/comphelper/lok.hxx:87
     void setRangeHeaders(_Bool)
     _Bool bTiledAnnotations
     1
-include/comphelper/parallelsort.hxx:285
+include/comphelper/mimeconfighelper.hxx:105
+    class rtl::OUString comphelper::MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool,_Bool)
+    _Bool bAllowDeepFilterDetection
+    1
+include/comphelper/parallelsort.hxx:286
     void s3sort(const type-parameter-?-?,const type-parameter-?-?,type-parameter-?-?,_Bool)
     _Bool bThreaded
     1
-include/comphelper/profilezone.hxx:63
-    void comphelper::ProfileZone::ProfileZone(const char *,_Bool)
-    _Bool bConsole
-    0
 include/comphelper/property.hxx:52
     void ModifyPropertyAttributes(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short,short)
     short _nAddAttrib
     0
+include/comphelper/random.hxx:33
+    unsigned long uniform_size_distribution(unsigned long,unsigned long)
+    unsigned long a
+    0
 include/comphelper/storagehelper.hxx:186
-    class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> comphelper::OStorageHelper::GetStorageAtPath(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class rtl::OUString &,unsigned int,const class comphelper::LifecycleProxy &)
+    class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> comphelper::OStorageHelper::GetStorageAtPath(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,class std::basic_string_view<char16_t>,unsigned int,const class comphelper::LifecycleProxy &)
     unsigned int nOpenMode
     1
-include/comphelper/unique_disposing_ptr.hxx:164
+include/comphelper/string.hxx:236
+    void replaceAt(class rtl::OUStringBuffer &,int,int,class std::basic_string_view<char16_t>)
+    int index
+    0
+include/comphelper/unique_disposing_ptr.hxx:165
     void comphelper::unique_disposing_solar_mutex_reset_ptr::unique_disposing_solar_mutex_reset_ptr<T>(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,type-parameter-?-? *,_Bool)
     _Bool bComponent
     1
-include/comphelper/unique_disposing_ptr.hxx:169
+include/comphelper/unique_disposing_ptr.hxx:170
     void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-?-? *)
     type-parameter-?-? * p
     0
-include/connectivity/dbexception.hxx:312
+include/connectivity/dbexception.hxx:319
     void throwSQLException(const class rtl::OUString &,enum dbtools::StandardSQLState,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const int)
     const int _nErrorCode
     0
-include/connectivity/dbtools.hxx:327
+include/connectivity/dbtools.hxx:335
     _Bool isDataSourcePropertyEnabled(const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class rtl::OUString &,_Bool)
     _Bool _bDefault
     1
-include/connectivity/dbtools.hxx:619
-    class rtl::OUString createStandardCreateStatement(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,class dbtools::ISQLStatementHelper *,const class rtl::OUString &)
+include/connectivity/dbtools.hxx:627
+    class rtl::OUString createStandardCreateStatement(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,class dbtools::ISQLStatementHelper *,class std::basic_string_view<char16_t>)
     class dbtools::ISQLStatementHelper * _pHelper
     0
-include/connectivity/FValue.hxx:469
-    void connectivity::TSetBound::TSetBound(_Bool)
-    _Bool _bBound
-    0
 include/connectivity/sqlscan.hxx:49
     void connectivity::OSQLScanner::prepareScan(const class rtl::OUString &,const class connectivity::IParseContext *,_Bool)
     _Bool bInternational
@@ -730,14 +750,10 @@ include/cppcanvas/color.hxx:61
     int makeColorARGB(unsigned char,unsigned char,unsigned char,unsigned char)
     unsigned char nAlpha
     0
-include/cui/cuicharmap.hxx:147
-    void SvxCharacterMap::SvxCharacterMap(class weld::Widget *,const class SfxItemSet *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &)
-    const class SfxItemSet * pSet
+include/drawinglayer/converters.hxx:34
+    class AlphaMask createAlphaMask(class drawinglayer::primitive2d::Primitive2DContainer &&,const class drawinglayer::geometry::ViewInformation2D &,unsigned int,unsigned int,unsigned int,_Bool)
+    _Bool bUseLuminance
     0
-include/drawinglayer/processor2d/hittestprocessor2d.hxx:78
-    void drawinglayer::processor2d::HitTestProcessor2D::collectHitStack(_Bool)
-    _Bool bCollect
-    1
 include/drawinglayer/XShapeDumper.hxx:23
     class rtl::OUString XShapeDumper::dump(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShapes> &,_Bool)
     _Bool bDumpInteropProperties
@@ -746,79 +762,83 @@ include/drawinglayer/XShapeDumper.hxx:24
     class rtl::OUString XShapeDumper::dump(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,_Bool)
     _Bool bDumpInteropProperties
     0
-include/editeng/borderline.hxx:169
+include/editeng/borderline.hxx:187
     class Color editeng::SvxBorderLine::GetColorOut(_Bool) const
     _Bool bLeftOrTop
     1
-include/editeng/borderline.hxx:170
+include/editeng/borderline.hxx:188
     class Color editeng::SvxBorderLine::GetColorIn(_Bool) const
     _Bool bLeftOrTop
     1
-include/editeng/boxitem.hxx:114
+include/editeng/boxitem.hxx:154
     _Bool SvxBoxItem::HasBorder(_Bool) const
     _Bool bTreatPaddingAsBorder
     1
-include/editeng/colritem.hxx:69
-    void SvxBackgroundColorItem::SvxBackgroundColorItem(const unsigned short)
-    const unsigned short nId
-    0
-include/editeng/editeng.hxx:548
+include/editeng/editeng.hxx:561
     void EditEngine::dumpAsXmlEditDoc(struct _xmlTextWriter *) const
     struct _xmlTextWriter * pWriter
     0
-include/editeng/editeng.hxx:573
+include/editeng/editeng.hxx:586
     class EditPaM EditEngine::CursorLeft(const class EditPaM &,unsigned short)
     unsigned short nCharacterIteratorMode
     0
-include/editeng/editobj.hxx:120
+include/editeng/editobj.hxx:92
+    _Bool EditTextObject::HasText(int) const
+    int nPara
+    0
+include/editeng/editobj.hxx:112
     const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
     int nPara
     0
-include/editeng/editobj.hxx:120
+include/editeng/editobj.hxx:112
     const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
     unsigned long nPos
     0
-include/editeng/editobj.hxx:120
+include/editeng/editobj.hxx:112
     const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
     int nType
     1
-include/editeng/edtdlg.hxx:79
+include/editeng/editview.hxx:341
+    int EditView::GetPosWithField(int,int) const
+    int nPara
+    0
+include/editeng/edtdlg.hxx:75
     enum editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversionDialog::GetDirection(enum editeng::HangulHanjaConversion::ConversionDirection) const
     enum editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection
     0
-include/editeng/outliner.hxx:240
+include/editeng/outliner.hxx:243
     void OutlinerView::SelectRange(int,int)
     int nFirst
     0
-include/editeng/outliner.hxx:625
+include/editeng/outliner.hxx:646
     _Bool Outliner::ImpCanDeleteSelectedPages(class OutlinerView *,int,int)
     int nPages
     1
-include/editeng/pmdlitem.hxx:40
-    void SvxPageModelItem::SvxPageModelItem(unsigned short)
-    unsigned short nWh
-    0
 include/editeng/splwrap.hxx:73
-    void SvxSpellWrapper::SvxSpellWrapper(class weld::Window *,const _Bool,const _Bool)
+    void SvxSpellWrapper::SvxSpellWrapper(class weld::Widget *,const _Bool,const _Bool)
     const _Bool bIsAllRight
     0
-include/editeng/txtrange.hxx:61
+include/editeng/txtrange.hxx:60
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned short,_Bool,_Bool,_Bool)
     _Bool bInner
     1
-include/editeng/txtrange.hxx:61
+include/editeng/txtrange.hxx:60
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned short,_Bool,_Bool,_Bool)
     _Bool bVert
     0
-include/filter/msfilter/escherex.hxx:493
+include/editeng/urlfieldhelper.hxx:22
+    _Bool URLFieldHelper::IsCursorAtURLField(const class OutlinerView *,_Bool)
+    _Bool bAlsoCheckBeforeCursor
+    1
+include/filter/msfilter/escherex.hxx:495
     void EscherExAtom::EscherExAtom(class SvStream &,const unsigned short,const unsigned short,const unsigned char)
     const unsigned char nVersion
     0
-include/filter/msfilter/escherex.hxx:585
+include/filter/msfilter/escherex.hxx:587
     void EscherGraphicProvider::WriteBlibStoreEntry(class SvStream &,unsigned int,unsigned int)
     unsigned int nBlipId
     1
-include/filter/msfilter/escherex.hxx:795
+include/filter/msfilter/escherex.hxx:797
     void EscherPropertyContainer::CreateFillProperties(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &)
     _Bool bEdge
     1
@@ -826,27 +846,27 @@ include/filter/msfilter/escherex.hxx:1139
     void EscherEx::EndAtom(unsigned short,int,int)
     int nRecVersion
     0
-include/filter/msfilter/msdffimp.hxx:710
+include/filter/msfilter/msdffimp.hxx:712
     void SvxMSDffManager::ExchangeInShapeOrder(const class SdrObject *,unsigned long,class SdrObject *) const
     unsigned long nTxBx
     0
-include/filter/msfilter/msdffimp.hxx:763
-    void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
-    unsigned short nBoxId
-    0
-include/filter/msfilter/msdffimp.hxx:763
+include/filter/msfilter/msdffimp.hxx:765
     void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
     unsigned int nId
     0
-include/filter/msfilter/msdffimp.hxx:763
+include/filter/msfilter/msdffimp.hxx:765
     void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
     unsigned short nSeqId
     0
-include/formula/FormulaCompiler.hxx:325
+include/filter/msfilter/msdffimp.hxx:765
+    void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
+    unsigned short nBoxId
+    0
+include/formula/FormulaCompiler.hxx:375
     void formula::FormulaCompiler::PushTokenArray(class formula::FormulaTokenArray *,_Bool)
     _Bool 
     1
-include/formula/token.hxx:234
+include/formula/token.hxx:289
     void formula::FormulaByteToken::FormulaByteToken(enum OpCode,unsigned char,enum formula::StackVar,enum formula::ParamClass)
     enum formula::ParamClass c
     0
@@ -859,30 +879,78 @@ include/formula/vectortoken.hxx:50
     enum formula::VectorRefArray::InitInvalid 
     0
 include/i18nutil/widthfolding.hxx:48
-    class rtl::OUString i18nutil::widthfolding::compose_ja_voiced_sound_marks(const class rtl::OUString &,int,int,class com::sun::star::uno::Sequence<int> &,_Bool,int)
+    class rtl::OUString i18nutil::widthfolding::compose_ja_voiced_sound_marks(const class rtl::OUString &,int,int,class com::sun::star::uno::Sequence<int> *,int)
     int startPos
     0
 include/linguistic/misc.hxx:131
     _Bool IsUpper(const class rtl::OUString &,int,int,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>)
     int nPos
     0
-include/o3tl/strong_int.hxx:86
+include/o3tl/string_view.hxx:87
+    _Bool matchIgnoreAsciiCase(class std::basic_string_view<char16_t>,class std::basic_string_view<char>,int)
+    int fromIndex
+    0
+include/o3tl/string_view.hxx:96
+    _Bool endsWithIgnoreAsciiCase(class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t> *)
+    class std::basic_string_view<char16_t> * rest
+    0
+include/o3tl/string_view.hxx:107
+    _Bool endsWithIgnoreAsciiCase(class std::basic_string_view<char16_t>,class std::basic_string_view<char>,class std::basic_string_view<char16_t> *)
+    class std::basic_string_view<char16_t> * rest
+    0
+include/o3tl/string_view.hxx:214
+    class std::basic_string_view<char> getToken(class std::basic_string_view<char>,int,char,int &)
+    int nToken
+    0
+include/o3tl/strong_int.hxx:87
     void o3tl::strong_int::strong_int<UNDERLYING_TYPE, PHANTOM_TYPE>(type-parameter-?-?,typename enable_if<std::is_integral<T>::value, int>::type)
     typename enable_if<std::is_integral<T>::value, int>::type 
     0
-include/o3tl/strong_int.hxx:110
+include/o3tl/strong_int.hxx:107
     strong_int<UNDERLYING_TYPE, PHANTOM_TYPE> o3tl::strong_int::operator++(int)
      ###1
     0
-include/oox/drawingml/shape.hxx:107
-    void oox::drawingml::Shape::Shape(const char *,_Bool)
+include/o3tl/strong_int.hxx:109
+    strong_int<UNDERLYING_TYPE, PHANTOM_TYPE> o3tl::strong_int::operator--(int)
+     ###1
+    0
+include/o3tl/unit_conversion.hxx:229
+    auto convert(type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,_Bool &,long)
+    long nDefault
+    0
+include/oox/core/contexthandler2.hxx:215
+    void oox::core::ContextHandler2Helper::addMCEState(enum oox::core::ContextHandler2Helper::MCE_STATE)
+    enum oox::core::ContextHandler2Helper::MCE_STATE aState
+    0
+include/oox/drawingml/shape.hxx:114
+    void oox::drawingml::Shape::Shape(const class rtl::OUString &,_Bool)
     _Bool bDefaultHeight
     1
-include/oox/export/vmlexport.hxx:143
+include/oox/export/DMLPresetShapeExport.hxx:117
+    struct oox::drawingml::DMLPresetShapeExporter::AdjustmentPointValueBase oox::drawingml::DMLPresetShapeExporter::GetAdjustmentPointRadiusValue(int)
+    int nPoint
+    0
+include/oox/export/DMLPresetShapeExport.hxx:118
+    struct oox::drawingml::DMLPresetShapeExporter::AdjustmentPointValueBase oox::drawingml::DMLPresetShapeExporter::GetAdjustmentPointAngleValue(int)
+    int nPoint
+    0
+include/oox/export/drawingml.hxx:279
+    void oox::drawingml::GraphicExport::writeBlip(const class Graphic &,const class std::vector<class model::BlipEffect> &,_Bool)
+    _Bool bRelPathToMedia
+    0
+include/oox/export/drawingml.hxx:365
+    class rtl::OUString oox::drawingml::DrawingML::writeGraphicToStorage(const class Graphic &,_Bool,enum oox::drawingml::GraphicExport::TypeHint)
+    enum oox::drawingml::GraphicExport::TypeHint eHint
+    0
+include/oox/export/drawingml.hxx:445
+    void oox::drawingml::DrawingML::WriteShapeTransformation(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,int,_Bool,_Bool,_Bool,_Bool,_Bool)
+    _Bool bSuppressFlipping
+    0
+include/oox/export/vmlexport.hxx:145
     const class rtl::OString & oox::vml::VMLExport::AddInlineSdrObject(const class SdrObject &,const _Bool)
     const _Bool bOOxmlExport
     1
-include/oox/helper/attributelist.hxx:159
+include/oox/helper/attributelist.hxx:164
     long oox::AttributeList::getHyper(int,long) const
     long nDefault
     0
@@ -894,11 +962,11 @@ include/oox/helper/containerhelper.hxx:114
     typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::const_reference oox::Matrix::operator()(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type) const
     typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type nY
     0
-include/oox/helper/helper.hxx:115
+include/oox/helper/helper.hxx:116
     type-parameter-?-? getIntervalValue(type-parameter-?-?,type-parameter-?-?,type-parameter-?-?)
     type-parameter-?-? nBegin
     0
-include/oox/mathml/importutils.hxx:207
+include/oox/mathml/importutils.hxx:212
     void oox::formulaimport::XmlStream::skipElementInternal(int,_Bool)
     _Bool silent
     0
@@ -914,7 +982,7 @@ include/oox/ole/vbacontrol.hxx:189
     void oox::ole::VbaUserForm::VbaUserForm(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class oox::GraphicHelper &,_Bool)
     _Bool bDefaultColorBgr
     1
-include/oox/ole/vbaexport.hxx:90
+include/oox/ole/vbaexport.hxx:91
     void VBACompressionChunk::SetFlagBit(unsigned long,_Bool,unsigned char &)
     _Bool bVal
     1
@@ -926,10 +994,18 @@ include/oox/vml/vmldrawing.hxx:96
     void oox::vml::Drawing::Drawing(class oox::core::XmlFilterBase &,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> &,enum oox::vml::DrawingType)
     enum oox::vml::DrawingType eType
     1
-include/oox/vml/vmlformatting.hxx:122
-    int decodeMeasureToHmm(const class oox::GraphicHelper &,const class rtl::OUString &,int,_Bool,_Bool)
+include/oox/vml/vmlformatting.hxx:126
+    int decodeMeasureToHmm(const class oox::GraphicHelper &,class std::basic_string_view<char16_t>,int,_Bool,_Bool)
+    int nRefValue
+    0
+include/oox/vml/vmlformatting.hxx:141
+    int decodeMeasureToTwip(const class oox::GraphicHelper &,class std::basic_string_view<char16_t>,int,_Bool,_Bool)
     int nRefValue
     0
+include/oox/vml/vmlformatting.hxx:141
+    int decodeMeasureToTwip(const class oox::GraphicHelper &,class std::basic_string_view<char16_t>,int,_Bool,_Bool)
+    _Bool bDefaultAsPixel
+    1
 include/opencl/openclwrapper.hxx:61
     _Bool buildProgramFromBinary(const char *,struct openclwrapper::GPUEnv *,const char *,int)
     int idx
@@ -938,23 +1014,39 @@ include/opencl/openclwrapper.hxx:86
     void setOpenCLCmdQueuePosition(int)
     int nPos
     0
-include/package/Deflater.hxx:42
+include/package/Deflater.hxx:45
     int ZipUtils::Deflater::doDeflateBytes(class com::sun::star::uno::Sequence<signed char> &,int,int)
     int nNewOffset
     0
-include/sfx2/app.hxx:109
+include/package/Deflater.hxx:49
+    void ZipUtils::Deflater::Deflater(int,_Bool)
+    _Bool bNowrap
+    1
+include/package/Inflater.hxx:43
+    void ZipUtils::Inflater::Inflater(_Bool)
+    _Bool bNoWrap
+    1
+include/sax/tools/converter.hxx:275
+    _Bool sax::Converter::parseDateOrDateTime(struct com::sun::star::util::Date *,struct com::sun::star::util::DateTime &,_Bool &,class std::optional<short> *,class std::basic_string_view<char>)
+    struct com::sun::star::util::Date * pDate
+    0
+include/sax/tools/converter.hxx:275
+    _Bool sax::Converter::parseDateOrDateTime(struct com::sun::star::util::Date *,struct com::sun::star::util::DateTime &,_Bool &,class std::optional<short> *,class std::basic_string_view<char>)
+    class std::optional<short> * pTimeZoneOffset
+    0
+include/sfx2/app.hxx:104
     void SfxApplication::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/sfx2/dispatch.hxx:151
+include/sfx2/dispatch.hxx:156
     enum ToolbarId SfxDispatcher::GetObjectBarId(unsigned short) const
     unsigned short nPos
     1
-include/sfx2/docfile.hxx:167
+include/sfx2/docfile.hxx:180
     void SfxMedium::DisableFileSync(_Bool)
     _Bool bDisableFileSync
     1
-include/sfx2/event.hxx:239
+include/sfx2/event.hxx:241
     void SfxPrintingHint::SfxPrintingHint(enum com::sun::star::view::PrintableState,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,class SfxObjectShell *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XController2> &)
     enum com::sun::star::view::PrintableState nState
     0
@@ -962,146 +1054,218 @@ include/sfx2/fcontnr.hxx:109
     void SfxFilterMatcherIter::SfxFilterMatcherIter(const class SfxFilterMatcher &,enum SfxFilterFlags,enum SfxFilterFlags)
     enum SfxFilterFlags nMask
     0
-include/sfx2/filedlghelper.hxx:96
+include/sfx2/filedlghelper.hxx:154
     void sfx2::FileDialogHelper::FileDialogHelper(short,enum FileDialogFlags,const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags,class weld::Window *)
     enum SfxFilterFlags nDont
     0
-include/sfx2/lokhelper.hxx:96
+include/sfx2/lokhelper.hxx:140
+    void SfxLokHelper::setViewTimezone(int,_Bool,const class rtl::OUString &)
+    _Bool isSet
+    1
+include/sfx2/lokhelper.hxx:171
     void SfxLokHelper::notifyDocumentSizeChangedAllViews(class vcl::ITiledRenderable *,_Bool)
     _Bool bInvalidateAll
     1
-include/sfx2/module.hxx:61
+include/sfx2/lokhelper.hxx:191
+    void SfxLokHelper::notifyUpdatePerViewId(const class SfxViewShell *,int)
+    int nType
+    1
+include/sfx2/module.hxx:58
     void SfxModule::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/sfx2/notebookbar/SfxNotebookBar.hxx:58
+include/sfx2/msg.hxx:209
+    void SfxSlot::SfxSlot(unsigned short,enum SfxGroupId,enum SfxSlotMode,unsigned short,unsigned short,void (*)(class SfxShell *, class SfxRequest &),void (*)(class SfxShell *, class SfxItemSet &),const struct SfxType *,const class SfxSlot *,const struct SfxFormalArgument *,unsigned short,enum SfxDisableFlags,const char (&)[N])
+    unsigned short value
+    0
+include/sfx2/msg.hxx:209
+    void SfxSlot::SfxSlot(unsigned short,enum SfxGroupId,enum SfxSlotMode,unsigned short,unsigned short,void (*)(class SfxShell *, class SfxRequest &),void (*)(class SfxShell *, class SfxItemSet &),const struct SfxType *,const class SfxSlot *,const struct SfxFormalArgument *,unsigned short,enum SfxDisableFlags,const char (&)[_ArrayExtent])
+    unsigned short value
+    0
+include/sfx2/msg.hxx:209
+    void SfxSlot::SfxSlot(unsigned short,enum SfxGroupId,enum SfxSlotMode,unsigned short,unsigned short,void (*)(class SfxShell *, class SfxRequest &),void (*)(class SfxShell *, class SfxItemSet &),const struct SfxType *,const class SfxSlot *,const struct SfxFormalArgument *,unsigned short,enum SfxDisableFlags,const char (&)[_ArrayExtent])
+    enum SfxDisableFlags disableFlags
+    0
+include/sfx2/notebookbar/SfxNotebookBar.hxx:69
     void sfx2::SfxNotebookBar::ShowMenubar(const class SfxViewFrame *,_Bool)
     _Bool bShow
     1
-include/sfx2/objsh.hxx:231
+include/sfx2/objsh.hxx:236
     void SfxObjectShell::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/sfx2/objsh.hxx:450
-    class BitmapEx SfxObjectShell::GetPreviewBitmap(_Bool,enum BmpConversion,enum BmpScaleFlag) const
-    _Bool bFullContent
+include/sfx2/objsh.hxx:449
+    void SfxObjectShell::DetectCsvSeparators(class SvStream &,unsigned short &,class rtl::OUString &,char16_t,_Bool,_Bool)
+    _Bool bForceCommonSeps
+    1
+include/sfx2/objsh.hxx:449
+    void SfxObjectShell::DetectCsvSeparators(class SvStream &,unsigned short &,class rtl::OUString &,char16_t,_Bool,_Bool)
+    _Bool bAllowMultipleSeps
+    0
+include/sfx2/objsh.hxx:451
+    void SfxObjectShell::DetectFilterOptions(class SfxMedium *,_Bool)
+    _Bool bForceDetect
     0
-include/sfx2/objsh.hxx:685
+include/sfx2/objsh.hxx:703
     void SfxObjectShell::AppendInfoBarWhenReady(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum InfobarType,_Bool)
     _Bool bShowCloseButton
     1
-include/sfx2/opengrf.hxx:44
+include/sfx2/opengrf.hxx:43
     void SvxOpenGraphicDialog::SetPath(const class rtl::OUString &,_Bool)
     _Bool bLinkState
     1
-include/sfx2/opengrf.hxx:49
+include/sfx2/opengrf.hxx:48
     void SvxOpenGraphicDialog::EnableLink(_Bool)
     _Bool 
     0
-include/sfx2/passwd.hxx:125
+include/sfx2/passwd.hxx:129
     void SfxPasswordDialog::ShowMinLengthText(_Bool)
     _Bool bShow
     0
-include/sfx2/request.hxx:62
+include/sfx2/request.hxx:60
     void SfxRequest::SfxRequest(const class SfxSlot *,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,enum SfxCallMode,class SfxItemPool &)
     enum SfxCallMode nCallMode
     1
-include/sfx2/request.hxx:65
+include/sfx2/request.hxx:63
     void SfxRequest::SfxRequest(unsigned short,enum SfxCallMode,const class SfxAllItemSet &,const class SfxAllItemSet &)
     enum SfxCallMode nCallMode
     1
-include/sfx2/request.hxx:100
+include/sfx2/request.hxx:103
     void SfxRequest::AllowRecording(_Bool)
     _Bool 
     1
-include/sfx2/sfxdlg.hxx:133
+include/sfx2/sfxdlg.hxx:132
     class VclPtr<class VclAbstractDialog> SfxAbstractDialogFactory::CreateEditObjectDialog(class weld::Window *,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::embed::XEmbeddedObject> &)
     class weld::Window * pParent
     0
-include/sfx2/sfxdlg.hxx:142
+include/sfx2/sfxdlg.hxx:143
     void SfxAbstractDialogFactory::ShowAsyncScriptErrorDialog(class weld::Window *,const class com::sun::star::uno::Any &)
     class weld::Window * pParent
     0
-include/sfx2/sidebar/FocusManager.hxx:116
-    _Bool sfx2::sidebar::FocusManager::IsPanelTitleVisible(const int) const
-    const int nPanelIndex
-    0
-include/sfx2/thumbnailview.hxx:229
+include/sfx2/thumbnailview.hxx:215
     void ThumbnailView::ShowTooltips(_Bool)
     _Bool bShowTooltips
     1
-include/sfx2/thumbnailview.hxx:231
+include/sfx2/thumbnailview.hxx:217
     void ThumbnailView::DrawMnemonics(_Bool)
     _Bool bDrawMnemonics
     1
-include/sfx2/viewfrm.hxx:74
+include/sfx2/viewfrm.hxx:82
     void SfxViewFrame::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/sfx2/viewsh.hxx:191
+include/sfx2/viewsh.hxx:217
     void SfxViewShell::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/sfx2/weldutils.hxx:52
+include/sfx2/viewsh.hxx:445
+    class Color SfxViewShell::GetColorConfigColor(enum svtools::ColorConfigEntry) const
+    enum svtools::ColorConfigEntry nColorType
+    0
+include/sfx2/weldutils.hxx:53
     void ToolbarUnoDispatcher::ToolbarUnoDispatcher(class weld::Toolbar &,class weld::Builder &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,_Bool)
     _Bool bSideBar
     1
-include/sot/stg.hxx:158
-    void Storage::Storage(const class rtl::OUString &,enum StreamMode,_Bool)
+include/sot/stg.hxx:157
+    void Storage::Storage(class rtl::OUString,enum StreamMode,_Bool)
     _Bool bDirect
     1
-include/sot/stg.hxx:250
+include/sot/stg.hxx:247
+    void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
+    enum StreamMode nMode
+    1
+include/sot/stg.hxx:247
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bDirect
     0
-include/sot/stg.hxx:250
+include/sot/stg.hxx:247
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bIsRoot
     1
-include/sot/stg.hxx:250
-    void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    enum StreamMode nMode
-    1
-include/sot/stg.hxx:256
+include/sot/stg.hxx:253
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bDirect
     1
-include/sot/stg.hxx:256
+include/sot/stg.hxx:253
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bIsRoot
     1
-include/sot/stg.hxx:261
+include/sot/stg.hxx:258
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XProgressHandler> &)
     _Bool bIsRoot
     0
-include/sot/stg.hxx:271
+include/sot/stg.hxx:268
     void UCBStorage::UCBStorage(class SvStream &,_Bool)
     _Bool bDirect
     0
-include/store/store.hxx:104
+include/sot/storage.hxx:84
+    void SotStorage::SotStorage(_Bool,const class rtl::OUString &,enum StreamMode)
+    _Bool bUCBStorage
+    0
+include/store/store.hxx:95
     storeError store::OStoreStream::writeAt(unsigned int,const void *,unsigned int,unsigned int &)
     unsigned int nOffset
     0
-include/svl/adrparse.hxx:42
-    const class rtl::OUString & SvAddressParser::GetEmailAddress(int) const
-    int nIndex
+include/svl/ctloptions.hxx:80
+    _Bool SvtCTLOptions::IsReadOnly(enum SvtCTLOptions::EOption) const
+    enum SvtCTLOptions::EOption eOption
     0
 include/svl/gridprinter.hxx:29
     void svl::GridPrinter::GridPrinter(unsigned long,unsigned long,_Bool)
     _Bool bPrint
     0
-include/svl/itempool.hxx:151
-    const type-parameter-?-? & SfxItemPool::Put(unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> >,unsigned short)
-    unsigned short nWhich
+include/svl/itemiter.hxx:50
+    enum SfxItemState SfxItemIter::GetItemState(_Bool,const class SfxPoolItem **) const
+    const class SfxPoolItem ** ppItem
+    0
+include/svl/itempool.hxx:102
+    void ItemInfoUser::ItemInfoUser(const class ItemInfo &,class SfxItemPool &,const class SfxPoolItem &,_Bool)
+    _Bool bPassingOwnership
     0
-include/svl/itemset.hxx:172
+include/svl/itempool.hxx:197
+    _Bool SfxItemPool::CheckItemInfoFlag(unsigned short,unsigned short) const
+    unsigned short nMask
+    1
+include/svl/itemset.hxx:141
+    void SfxItemSet::SfxItemSet(class SfxItemPool &,enum SfxItemSet::SfxAllItemSetFlag)
+    enum SfxItemSet::SfxAllItemSetFlag 
+    0
+include/svl/itemset.hxx:212
     const type-parameter-?-? * SfxItemSet::GetItem(const class SfxItemSet *,TypedWhichId<type-parameter-?-?>,_Bool)
     _Bool bSearchInParent
     0
+include/svl/itemset.hxx:249
+    _Bool SfxItemSet::HasItem(TypedWhichId<type-parameter-?-?>,const type-parameter-?-? **) const
+    const type-parameter-?-? ** ppItem
+    0
+include/svl/itemset.hxx:281
+    void SfxItemSet::MergeValue(const class SfxPoolItem &,_Bool)
+    _Bool bOverwriteDefaults
+    1
+include/svl/numformat.hxx:531
+    const struct std::array<class rtl::OUString, 53> & SvNumberFormatter::GetKeywords(unsigned int)
+    unsigned int nKey
+    0
+include/svl/numformat.hxx:562
+    void SvNumberFormatter::ImpGenerateAdditionalFormats(unsigned int,const class com::sun::star::uno::Reference<class com::sun::star::i18n::XNumberFormatCode> &,_Bool)
+    _Bool bAfterChangingSystemCL
+    1
+include/svl/poolitem.hxx:182
+    void SfxPoolItem::AddRef(unsigned int) const
+    unsigned int n
+    1
 include/svl/svdde.hxx:131
     void DdeLink::DdeLink(class DdeConnection &,const class rtl::OUString &,long)
     long 
     0
+include/svl/typedwhich.hxx:31
+    void TypedWhichId::TypedWhichId<T>(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<T, derived_type>, int>::type)
+    typename enable_if<std::is_base_of_v<T, derived_type>, int>::type 
+    0
+include/svl/typedwhich.hxx:31
+    void TypedWhichId::TypedWhichId<T>(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<reference_type, derived_type>, int>::type)
+    typename enable_if<std::is_base_of_v<reference_type, derived_type>, int>::type 
+    0
 include/svl/urihelper.hxx:51
     class rtl::OUString SmartRel2Abs(const class INetURLObject &,const class rtl::OUString &,const class Link<class rtl::OUString *, _Bool> &,_Bool,_Bool,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
     enum INetURLObject::EncodeMechanism eEncodeMechanism
@@ -1110,79 +1274,79 @@ include/svl/urihelper.hxx:116
     class rtl::OUString FindFirstURLInText(const class rtl::OUString &,int &,int &,const class CharClass &,enum INetURLObject::EncodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eMechanism
     1
-include/svl/urihelper.hxx:148
+include/svl/urihelper.hxx:153
     class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eEncodeMechanism
     1
-include/svl/zforlist.hxx:903
-    const class NfKeywordTable & SvNumberFormatter::GetKeywords(unsigned int)
-    unsigned int nKey
-    0
-include/svl/zformat.hxx:300
+include/svl/zformat.hxx:311
     class rtl::OUString SvNumberformat::GetPercentString(unsigned short) const
     unsigned short nNumFor
     0
-include/svl/zformat.hxx:411
+include/svl/zformat.hxx:422
     int SvNumberformat::GetQuoteEnd(const class rtl::OUString &,int,char16_t,char16_t)
     char16_t cEscIn
     0
-include/svl/zformat.hxx:421
+include/svl/zformat.hxx:432
     int SvNumberformat::InsertBlanks(class rtl::OUString &,int,char16_t)
     int nPos
     0
-include/svl/zformat.hxx:487
+include/svl/zformat.hxx:502
     _Bool SvNumberformat::IsIso8601(unsigned short) const
     unsigned short nNumFor
     0
-include/svtools/HtmlWriter.hxx:38
-    void HtmlWriter::prettyPrint(_Bool)
-    _Bool b
+include/svtools/ctrlbox.hxx:284
+    void SvtCalendarBox::SvtCalendarBox(class std::unique_ptr<class weld::MenuButton>,_Bool)
+    _Bool bUseLabel
+    1
+include/svtools/htmlout.hxx:75
+    class SvStream & HTMLOutFuncs::Out_Events(class SvStream &,const class SvxMacroTableDtor &,const struct HTMLOutEvent *,_Bool,class rtl::OUString *)
+    class rtl::OUString * pNonConvertableChars
     0
 include/svtools/imagemgr.hxx:124
-    class Image SvFileInformationManager::GetImage(const class INetURLObject &,_Bool)
+    class Image SvFileInformationManager::GetImage(const class INetURLObject &,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &)
     _Bool bBig
     1
-include/svtools/inettbc.hxx:81
+include/svtools/inettbc.hxx:80
     void SvtURLBox::select_entry_region(int,int)
     int nStartPos
     0
-include/svtools/ruler.hxx:733
+include/svtools/ruler.hxx:731
     void Ruler::SetWinPos(long,long)
     long nWidth
     0
-include/svtools/stringtransfer.hxx:63
+include/svtools/stringtransfer.hxx:61
     void svt::OStringTransfer::StartStringDrag(const class rtl::OUString &,class vcl::Window *,signed char)
     signed char _nDragSourceActions
     1
-include/svtools/valueset.hxx:321
+include/svtools/valueset.hxx:319
     void ValueSet::EnableFullItemMode(_Bool)
     _Bool bFullMode
     0
-include/svtools/valueset.hxx:359
+include/svtools/valueset.hxx:357
     void ValueSet::SetItemColor(unsigned short,const class Color &)
     unsigned short nItemId
     1
-include/svx/algitem.hxx:35
-    void SvxOrientationItem::SvxOrientationItem(const enum SvxCellOrientation,const unsigned short)
-    const unsigned short nId
-    0
-include/svx/algitem.hxx:39
-    void SvxOrientationItem::SvxOrientationItem(int,_Bool,const unsigned short)
-    const unsigned short nId
-    0
-include/svx/ctredlin.hxx:219
+include/svx/ColorSets.hxx:42
+    void svx::ColorSets::insert(const class model::ColorSet &,enum svx::ColorSets::IdenticalNameAction)
+    enum svx::ColorSets::IdenticalNameAction eAction
+    1
+include/svx/ctredlin.hxx:217
     void SvxTPFilter::SelectedAuthorPos(int)
     int nPos
     0
-include/svx/ctredlin.hxx:242
+include/svx/ctredlin.hxx:240
     void SvxTPFilter::CheckAction(_Bool)
     _Bool bFlag
     0
-include/svx/dlgctrl.hxx:137
+include/svx/cuicharmap.hxx:137
+    void SvxCharacterMap::SvxCharacterMap(class weld::Widget *,const class SfxItemSet *,class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame>)
+    const class SfxItemSet * pSet
+    0
+include/svx/dlgctrl.hxx:135
     void SvxRectCtl::DoCompletelyDisable(_Bool)
     _Bool bNew
     1
-include/svx/extrusionbar.hxx:40
+include/svx/extrusionbar.hxx:39
     void svx::ExtrusionBar::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
@@ -1199,22 +1363,22 @@ include/svx/fmtools.hxx:142
     short _nId
     0
 include/svx/fmview.hxx:88
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,enum SdrObjKind,enum SdrInventor,enum SdrObjKind,class SdrModel &,class rtl::Reference<class SdrUnoObj> &,class rtl::Reference<class SdrUnoObj> &)
     int _nYOffsetMM
     0
-include/svx/fontworkbar.hxx:40
+include/svx/fontworkbar.hxx:41
     void svx::FontworkBar::RegisterInterface(const class SfxModule *)
     const class SfxModule * pMod
     0
-include/svx/framelink.hxx:119
+include/svx/framelink.hxx:117
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle,double)
     double nD
     0
-include/svx/framelink.hxx:119
+include/svx/framelink.hxx:117
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle,double)
     double nS
     0
-include/svx/framelink.hxx:119
+include/svx/framelink.hxx:117
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle,double)
     enum SvxBorderLineStyle nType
     0
@@ -1222,7 +1386,7 @@ include/svx/frmsel.hxx:144
     void svx::FrameSelector::SelectAllBorders(_Bool)
     _Bool bSelect
     0
-include/svx/gridctrl.hxx:402
+include/svx/gridctrl.hxx:396
     void DbGridControl::RemoveRows(_Bool)
     _Bool bNewCursor
     0
@@ -1235,51 +1399,39 @@ include/svx/nbdtmg.hxx:130
     unsigned short nFromIndex
     0
 include/svx/nbdtmg.hxx:131
-    void svx::sidebar::NBOTypeMgrBase::RelplaceNumRule(class SvxNumRule &,unsigned short,unsigned short)
+    void svx::sidebar::NBOTypeMgrBase::ReplaceNumRule(class SvxNumRule &,unsigned short,unsigned short)
     unsigned short mLevel
     1
 include/svx/nbdtmg.hxx:133
     class rtl::OUString svx::sidebar::NBOTypeMgrBase::GetDescription(unsigned short,_Bool)
     _Bool isDefault
     1
-include/svx/postattr.hxx:33
-    void SvxPostItAuthorItem::SvxPostItAuthorItem(unsigned short)
-    unsigned short nWhich
-    0
-include/svx/postattr.hxx:53
-    void SvxPostItDateItem::SvxPostItDateItem(unsigned short)
-    unsigned short nWhich
-    0
-include/svx/postattr.hxx:72
-    void SvxPostItTextItem::SvxPostItTextItem(unsigned short)
-    unsigned short nWhich
+include/svx/ParseContext.hxx:40
+    void svxform::OSystemParseContext::OSystemParseContext(_Bool)
+    _Bool bInit
     0
-include/svx/postattr.hxx:93
-    void SvxPostItIdItem::SvxPostItIdItem(unsigned short)
-    unsigned short nWhich
+include/svx/RectangleAlignmentItem.hxx:30
+    void SvxRectangleAlignmentItem::SvxRectangleAlignmentItem(unsigned short,enum model::RectangleAlignment)
+    enum model::RectangleAlignment nValue
     0
 include/svx/relfld.hxx:43
     void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short)
     unsigned short nMin
     0
-include/svx/relfld.hxx:51
+include/svx/relfld.hxx:52
     int SvxRelativeField::get_min(enum FieldUnit) const
     enum FieldUnit eValueUnit
     0
-include/svx/relfld.hxx:64
+include/svx/relfld.hxx:65
     void SvxRelativeField::SetFieldUnit(enum FieldUnit,_Bool)
     _Bool bAll
     0
-include/svx/rulritem.hxx:123
+include/svx/rulritem.hxx:126
     void SvxColumnDescription::SvxColumnDescription(long,long,_Bool)
     _Bool bVis
     1
-include/svx/sdr/overlay/overlayobject.hxx:120
-    void sdr::overlay::OverlayObject::allowAntiAliase(_Bool)
-    _Bool bNew
-    0
-include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx:102
-    void drawinglayer::primitive2d::SdrFrameBorderPrimitive2D::SdrFrameBorderPrimitive2D(class std::shared_ptr<class std::__debug::vector<class drawinglayer::primitive2d::SdrFrameBorderData, class std::allocator<class drawinglayer::primitive2d::SdrFrameBorderData> > > &,_Bool)
+include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx:101
+    void drawinglayer::primitive2d::SdrFrameBorderPrimitive2D::SdrFrameBorderPrimitive2D(class std::vector<class drawinglayer::primitive2d::SdrFrameBorderData> &&,_Bool)
     _Bool bForceToSingleDiscreteUnit
     1
 include/svx/svdhlpln.hxx:43
@@ -1288,21 +1440,29 @@ include/svx/svdhlpln.hxx:43
     0
 include/svx/svditer.hxx:51
     void SdrObjListIter::SdrObjListIter(const class SdrObjList *,_Bool,enum SdrIterMode,_Bool)
-    _Bool bReverse
+    enum SdrIterMode eMode
     0
 include/svx/svditer.hxx:51
     void SdrObjListIter::SdrObjListIter(const class SdrObjList *,_Bool,enum SdrIterMode,_Bool)
-    enum SdrIterMode eMode
+    _Bool bReverse
     0
 include/svx/svditer.hxx:55
     void SdrObjListIter::SdrObjListIter(const class SdrObject &,enum SdrIterMode,_Bool)
     _Bool bReverse
     0
-include/svx/svdundo.hxx:101
+include/svx/svdmodel.hxx:577
+    void SdrModel::SetCompatibilityFlag(enum SdrCompatibilityFlag,_Bool)
+    _Bool bEnabled
+    1
+include/svx/svdpage.hxx:81
+    void SdrObjList::impClearSdrObjList(_Bool)
+    _Bool bBroadcast
+    1
+include/svx/svdundo.hxx:107
     class SdrUndoAction * SdrUndoGroup::GetAction(int) const
     int nNum
     0
-include/svx/svdview.hxx:178
+include/svx/svdview.hxx:175
     void SdrView::EnableExtendedKeyInputDispatcher(_Bool)
     _Bool bOn
     0
@@ -1310,7 +1470,7 @@ include/svx/svx3ditems.hxx:66
     void Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(_Bool)
     _Bool bVal
     0
-include/svx/svxdlg.hxx:83
+include/svx/svxdlg.hxx:82
     void AbstractSvxZoomDialog::HideButton(enum ZoomButtonId)
     enum ZoomButtonId nBtnId
     1
@@ -1342,47 +1502,51 @@ include/svx/sxmtfitm.hxx:32
     void SdrMeasureTextIsFixedAngleItem::SdrMeasureTextIsFixedAngleItem(_Bool)
     _Bool bOn
     0
-include/svx/sxmtfitm.hxx:45
-    void SdrMeasureTextFixedAngleItem::SdrMeasureTextFixedAngleItem(long)
-    long nVal
-    0
 include/svx/sxmtritm.hxx:42
     void SdrMeasureTextUpsideDownItem::SdrMeasureTextUpsideDownItem(_Bool)
     _Bool bOn
     0
-include/svx/unopool.hxx:44
-    void SvxUnoDrawPool::SvxUnoDrawPool(class SdrModel *,int)
-    int nServiceId
-    1
 include/svx/unoshtxt.hxx:54
     void SvxTextEditSource::SvxTextEditSource(class SdrObject &,class SdrText *,class SdrView &,const class OutputDevice &)
     class SdrText * pText
     0
-include/svx/verttexttbxctrl.hxx:31
-    void SvxVertCTLTextTbxCtrl_Base::ImplInheritanceHelper(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,nullptr_t &&,class rtl::OUString &&)
-    nullptr_t && 
-    0
 include/svx/xflbmsli.hxx:29
     void XFillBmpSizeLogItem::XFillBmpSizeLogItem(_Bool)
     _Bool bLog
     1
 include/svx/xflftrit.hxx:40
-    void XFillFloatTransparenceItem::XFillFloatTransparenceItem(const class rtl::OUString &,const class XGradient &,_Bool)
+    void XFillFloatTransparenceItem::XFillFloatTransparenceItem(const class rtl::OUString &,const class basegfx::BGradient &,_Bool)
     _Bool bEnable
     1
 include/svx/xtable.hxx:217
-    class rtl::Reference<class XPropertyList> XPropertyList::CreatePropertyListFromURL(enum XPropertyListType,const class rtl::OUString &)
+    class rtl::Reference<class XPropertyList> XPropertyList::CreatePropertyListFromURL(enum XPropertyListType,class std::basic_string_view<char16_t>)
     enum XPropertyListType t
     0
+include/test/a11y/accessibletestbase.hxx:54
+    void test::AccessibleTestBase::documentPostKeyEvent(int,int,int)
+    int nType
+    0
+include/test/a11y/accessibletestbase.hxx:204
+    void test::AccessibleTestBase::Dialog::close(int)
+    int result
+    0
+include/test/a11y/accessibletestbase.hxx:287
+    class std::shared_ptr<class test::AccessibleTestBase::DialogWaiter> test::AccessibleTestBase::awaitDialog(const class std::basic_string_view<char16_t>,class std::function<void (class test::AccessibleTestBase::Dialog &)>,_Bool)
+    _Bool bAutoClose
+    1
+include/test/a11y/eventposter.hxx:42
+    void test::EventPosterHelperBase::postKeyEventAsync(int,int) const
+    int nCharCode
+    0
 include/test/sheet/xactivationbroadcaster.hxx:24
     class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XActivationBroadcaster::getXSpreadsheet(const short)
     const short nNumber
     1
-include/test/sheet/xdocumentauditing.hxx:36
+include/test/sheet/xdocumentauditing.hxx:35
     _Bool apitest::XDocumentAuditing::hasRightAmountOfShapes(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> &,int,int)
     int nShapes
     1
-include/test/sheet/xnamedranges.hxx:39
+include/test/sheet/xnamedranges.hxx:40
     class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XNamedRanges::getXNamedRanges(int)
     int nSheet
     1
@@ -1392,16 +1556,32 @@ include/test/text/textcontent.hxx:25
     1
 include/test/text/textcontent.hxx:25
     void apitest::TextContent::TextContent(const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::WrapTextMode,const enum com::sun::star::text::WrapTextMode)
-    const enum com::sun::star::text::WrapTextMode aExpectedWTM
-    0
-include/test/text/textcontent.hxx:25
-    void apitest::TextContent::TextContent(const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::WrapTextMode,const enum com::sun::star::text::WrapTextMode)
     const enum com::sun::star::text::TextContentAnchorType aNewTCAT
     1
 include/test/text/textcontent.hxx:25
     void apitest::TextContent::TextContent(const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::WrapTextMode,const enum com::sun::star::text::WrapTextMode)
+    const enum com::sun::star::text::WrapTextMode aExpectedWTM
+    0
+include/test/text/textcontent.hxx:25
+    void apitest::TextContent::TextContent(const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::TextContentAnchorType,const enum com::sun::star::text::WrapTextMode,const enum com::sun::star::text::WrapTextMode)
     const enum com::sun::star::text::WrapTextMode aNewWTM
     0
+include/tools/color.hxx:87
+    void Color::Color(enum ColorTransparencyTag,unsigned int)
+    enum ColorTransparencyTag 
+    0
+include/tools/color.hxx:92
+    void Color::Color(enum ColorAlphaTag,unsigned int)
+    enum ColorAlphaTag 
+    0
+include/tools/color.hxx:97
+    void Color::Color(enum ColorTransparencyTag,unsigned char,unsigned char,unsigned char,unsigned char)
+    enum ColorTransparencyTag 
+    0
+include/tools/color.hxx:101
+    void Color::Color(enum ColorAlphaTag,unsigned char,unsigned char,unsigned char,unsigned char)
+    enum ColorAlphaTag 
+    0
 include/tools/date.hxx:71
     void Date::Date(enum Date::DateInitEmpty)
     enum Date::DateInitEmpty 
@@ -1410,19 +1590,27 @@ include/tools/date.hxx:72
     void Date::Date(enum Date::DateInitSystem)
     enum Date::DateInitSystem 
     0
-include/tools/datetime.hxx:42
+include/tools/datetime.hxx:47
     void DateTime::DateTime(enum DateTime::DateTimeInitEmpty)
     enum DateTime::DateTimeInitEmpty 
     0
-include/tools/datetime.hxx:43
+include/tools/datetime.hxx:48
     void DateTime::DateTime(enum DateTime::DateTimeInitSystem)
     enum DateTime::DateTimeInitSystem 
     0
-include/tools/fract.hxx:45
+include/tools/fract.hxx:44
     void Fraction::Fraction(type-parameter-?-?,type-parameter-?-?,typename enable_if<std::is_integral<T1>::value && std::is_integral<T2>::value, int>::type)
     typename enable_if<std::is_integral<T1>::value && std::is_integral<T2>::value, int>::type 
     0
-include/tools/stream.hxx:670
+include/tools/Guid.hxx:101
+    void tools::Guid::Guid(enum tools::Guid::GenerateTag)
+    enum tools::Guid::GenerateTag 
+    0
+include/tools/stream.hxx:370
+    _Bool SvStream::WriteUnicodeOrByteText(class std::basic_string_view<char16_t>,_Bool)
+    _Bool bZero
+    0
+include/tools/stream.hxx:653
     void SvMemoryStream::ObjectOwnsMemory(_Bool)
     _Bool bOwn
     1
@@ -1435,21 +1623,17 @@ include/tools/time.hxx:69
     enum tools::Time::TimeInitSystem 
     0
 include/tools/urlobj.hxx:344
-    class rtl::OUString INetURLObject::GetAbsURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
-    enum INetURLObject::DecodeMechanism eDecodeMechanism
-    1
-include/tools/urlobj.hxx:344
-    class rtl::OUString INetURLObject::GetAbsURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
-    enum INetURLObject::EncodeMechanism eEncodeMechanism
-    1
-include/tools/urlobj.hxx:351
-    class rtl::OUString INetURLObject::GetRelURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
+    class rtl::OUString INetURLObject::GetAbsURL(class std::basic_string_view<char16_t>,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eEncodeMechanism
     1
-include/tools/urlobj.hxx:826
-    class rtl::OUString INetURLObject::encode(const class rtl::OUString &,enum INetURLObject::Part,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:822
+    class rtl::OUString INetURLObject::encode(class std::basic_string_view<char16_t>,enum INetURLObject::Part,enum INetURLObject::EncodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eMechanism
     0
+include/tools/zcodec.hxx:83
+    void ZCodec::SetCompressionMetadata(const class rtl::OString &,unsigned int,unsigned int)
+    unsigned int nLastModifiedTime
+    0
 include/unotools/calendarwrapper.hxx:61
     void CalendarWrapper::loadDefaultCalendar(const struct com::sun::star::lang::Locale &,_Bool)
     _Bool bTimeZoneUTC
@@ -1458,94 +1642,106 @@ include/unotools/calendarwrapper.hxx:63
     void CalendarWrapper::loadCalendar(const class rtl::OUString &,const struct com::sun::star::lang::Locale &,_Bool)
     _Bool bTimeZoneUTC
     1
-include/unotools/charclass.hxx:130
+include/unotools/charclass.hxx:129
     class rtl::OUString CharClass::titlecase(const class rtl::OUString &,int,int) const
     int nPos
     0
-include/unotools/charclass.hxx:173
-    _Bool CharClass::isAlphaNumeric(const class rtl::OUString &,int) const
-    int nPos
-    0
-include/unotools/cmdoptions.hxx:78
-    _Bool SvtCommandOptions::HasEntries(enum SvtCommandOptions::CmdOption) const
-    enum SvtCommandOptions::CmdOption eOption
-    0
-include/unotools/cmdoptions.hxx:88
-    _Bool SvtCommandOptions::Lookup(enum SvtCommandOptions::CmdOption,const class rtl::OUString &) const
-    enum SvtCommandOptions::CmdOption eOption
-    0
 include/unotools/confignode.hxx:254
     class utl::OConfigurationTreeRoot utl::OConfigurationTreeRoot::tryCreateWithComponentContext(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,int,enum utl::OConfigurationTreeRoot::CREATION_MODE)
     enum utl::OConfigurationTreeRoot::CREATION_MODE _eMode
     1
-include/unotools/fontdefs.hxx:51
+include/unotools/fontdefs.hxx:55
     void ConvertChar::RecodeString(class rtl::OUString &,int,int) const
     int nIndex
     0
-include/unotools/historyoptions.hxx:93
-    void SvtHistoryOptions::DeleteItem(enum EHistoryType,const class rtl::OUString &)
+include/unotools/historyoptions.hxx:84
+    void DeleteItem(enum EHistoryType,const class rtl::OUString &,const _Bool)
     enum EHistoryType eHistory
     0
-include/unotools/localedatawrapper.hxx:305
-    double LocaleDataWrapper::stringToDouble(const char16_t *,const char16_t *,_Bool,enum rtl_math_ConversionStatus *,const char16_t **) const
-    _Bool bUseGroupSep
-    1
-include/unotools/mediadescriptor.hxx:258
-    class com::sun::star::uno::Sequence<struct com::sun::star::beans::NamedValue> utl::MediaDescriptor::requestAndVerifyDocPassword(class comphelper::IDocPasswordVerifier &,enum comphelper::DocPasswordRequestType,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > *)
+include/unotools/historyoptions.hxx:88
+    void TogglePinItem(enum EHistoryType,const class rtl::OUString &)
+    enum EHistoryType eHistory
+    0
+include/unotools/mediadescriptor.hxx:260
+    class com::sun::star::uno::Sequence<struct com::sun::star::beans::NamedValue> utl::MediaDescriptor::requestAndVerifyDocPassword(class comphelper::IDocPasswordVerifier &,enum comphelper::DocPasswordRequestType,const class std::vector<class rtl::OUString> *)
     enum comphelper::DocPasswordRequestType eRequestType
     1
 include/unotools/nativenumberwrapper.hxx:46
     class rtl::OUString NativeNumberWrapper::getNativeNumberString(const class rtl::OUString &,const struct com::sun::star::lang::Locale &,short) const
     short nNativeNumberMode
     0
-include/unotools/sharedunocomponent.hxx:162
+include/unotools/sharedunocomponent.hxx:163
     void utl::SharedUNOComponent::SharedUNOComponent<INTERFACE, COMPONENT>(const class com::sun::star::uno::BaseReference &,enum com::sun::star::uno::UnoReference_QueryThrow)
     enum com::sun::star::uno::UnoReference_QueryThrow _queryThrow
     0
-include/unotools/sharedunocomponent.hxx:179
+include/unotools/sharedunocomponent.hxx:180
     _Bool utl::SharedUNOComponent::set(const class com::sun::star::uno::BaseReference &,enum com::sun::star::uno::UnoReference_Query)
     enum com::sun::star::uno::UnoReference_Query _query
     0
-include/unotools/sharedunocomponent.hxx:183
+include/unotools/sharedunocomponent.hxx:184
     void utl::SharedUNOComponent::set(const Reference<type-parameter-?-?> &,enum com::sun::star::uno::UnoReference_SetThrow)
     enum com::sun::star::uno::UnoReference_SetThrow _setThrow
     0
-include/unotools/sharedunocomponent.hxx:184
+include/unotools/sharedunocomponent.hxx:185
     void utl::SharedUNOComponent::set(const SharedUNOComponent<INTERFACE, COMPONENT> &,enum com::sun::star::uno::UnoReference_SetThrow)
     enum com::sun::star::uno::UnoReference_SetThrow _setThrow
     0
+include/unotools/streamwrap.hxx:163
+    void utl::OStreamWrapper::OStreamWrapper(class SvStream *,_Bool)
+    _Bool _bOwner
+    0
 include/unotools/transliterationwrapper.hxx:82
     class rtl::OUString utl::TransliterationWrapper::transliterate(const class rtl::OUString &,int,int) const
     int nStart
     0
 include/unotools/transliterationwrapper.hxx:98
     _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
-    int nPos1
-    0
-include/unotools/transliterationwrapper.hxx:98
-    _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
     int nPos2
     0
-include/vbahelper/vbaeventshelperbase.hxx:90
+include/vbahelper/vbaeventshelperbase.hxx:92
     void VbaEventsHelperBase::checkArgumentType(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int)
     int nIndex
     0
-include/vbahelper/vbahelper.hxx:118
+include/vbahelper/vbahelper.hxx:119
     class rtl::OUString extractStringFromAny(const class com::sun::star::uno::Any &,const class rtl::OUString &,_Bool)
     _Bool bUppercaseBool
     1
-include/vcl/accessibletableprovider.hxx:114
-    _Bool vcl::IAccessibleTableProvider::GetGlyphBoundRects(const class Point &,const class rtl::OUString &,int,int,class std::__debug::vector<class tools::Rectangle, class std::allocator<class tools::Rectangle> > &)
-    int nIndex
+include/vcl/abstdlg.hxx:108
+    void AbstractPasswordToOpenModifyDialog::Response(int)
+    int 
     0
-include/vcl/alpha.hxx:54
-    void AlphaMask::Replace(unsigned char,unsigned char)
-    unsigned char cSearchTransparency
+include/vcl/accessibletableprovider.hxx:113
+    _Bool vcl::IAccessibleTableProvider::GetGlyphBoundRects(const class Point &,const class rtl::OUString &,int,int,class std::vector<class tools::Rectangle> &)
+    int nIndex
     0
+include/vcl/alpha.hxx:85
+    _Bool AlphaMask::Scale(const class Size &,enum BmpScaleFlag)
+    enum BmpScaleFlag nScaleFlag
+    1
+include/vcl/alpha.hxx:90
+    _Bool AlphaMask::Convert(enum BmpConversion)
+    enum BmpConversion eConversion
+    1
+include/vcl/bitmap.hxx:398
+    class Bitmap Bitmap::CreateMask(const class Color &,unsigned char) const
+    unsigned char nTol
+    1
 include/vcl/BitmapBasicMorphologyFilter.hxx:46
     void BitmapErodeFilter::BitmapErodeFilter(int)
     int nRadius
     1
+include/vcl/BitmapBuffer.hxx:48
+    class std::optional<struct BitmapBuffer> StretchAndConvert(const struct BitmapBuffer &,const struct SalTwoRect &,enum ScanlineFormat,class std::optional<class BitmapPalette>,const class ColorMask *)
+    const class ColorMask * pDstMask
+    0
+include/vcl/BitmapColor.hxx:31
+    void BitmapColor::BitmapColor(enum ColorTransparencyTag,unsigned char,unsigned char,unsigned char,unsigned char)
+    enum ColorTransparencyTag 
+    0
+include/vcl/BitmapColor.hxx:32
+    void BitmapColor::BitmapColor(enum ColorAlphaTag,unsigned char,unsigned char,unsigned char,unsigned char)
+    enum ColorAlphaTag 
+    0
 include/vcl/BitmapFilter.hxx:30
     void generateStripRanges(long,long,class std::function<void (long, long, _Bool)>)
     long nFirst
@@ -1554,95 +1750,91 @@ include/vcl/dibtools.hxx:40
     _Bool ReadDIB(class Bitmap &,class SvStream &,_Bool,_Bool)
     _Bool bMSOFormat
     0
-include/vcl/dibtools.hxx:46
-    _Bool ReadDIBBitmapEx(class BitmapEx &,class SvStream &,_Bool,_Bool)
-    _Bool bFileHeader
-    1
-include/vcl/dibtools.hxx:46
-    _Bool ReadDIBBitmapEx(class BitmapEx &,class SvStream &,_Bool,_Bool)
-    _Bool bMSOFormat
-    0
-include/vcl/embeddedfontshelper.hxx:52
-    class rtl::OUString EmbeddedFontsHelper::fontFileUrl(const class rtl::OUString &,enum FontFamily,enum FontItalic,enum FontWeight,enum FontPitch,enum EmbeddedFontsHelper::FontRights)
+include/vcl/embeddedfontshelper.hxx:54
+    class rtl::OUString EmbeddedFontsHelper::fontFileUrl(class std::basic_string_view<char16_t>,enum FontFamily,enum FontItalic,enum FontWeight,enum FontPitch,enum EmbeddedFontsHelper::FontRights)
     enum EmbeddedFontsHelper::FontRights rights
     0
-include/vcl/errcode.hxx:66
-    void ErrCode::ErrCode(enum WarningFlag,enum ErrCodeArea,enum ErrCodeClass,unsigned short)
-    enum WarningFlag 
-    0
-include/vcl/fieldvalues.hxx:33
+include/vcl/fieldvalues.hxx:38
     _Bool TextToValue(const class rtl::OUString &,double &,long,unsigned short,const class LocaleDataWrapper &,enum FieldUnit)
     long nBaseValue
     0
-include/vcl/fieldvalues.hxx:53
-    double ConvertDoubleValue(long,long,unsigned short,enum FieldUnit,enum FieldUnit)
-    long nBaseValue
-    0
-include/vcl/fieldvalues.hxx:53
-    double ConvertDoubleValue(long,long,unsigned short,enum FieldUnit,enum FieldUnit)
-    unsigned short nDecDigits
-    0
-include/vcl/filter/PDFiumLibrary.hxx:62
-    class std::unique_ptr<class vcl::pdf::PDFiumBitmap, struct std::default_delete<class vcl::pdf::PDFiumBitmap> > vcl::pdf::PDFium::createBitmap(int,int,int)
+include/vcl/filter/PDFiumLibrary.hxx:65
+    class std::unique_ptr<class vcl::pdf::PDFiumBitmap> vcl::pdf::PDFium::createBitmap(int &,int &,int)
     int nAlpha
     1
-include/vcl/filter/PDFiumLibrary.hxx:79
+include/vcl/filter/PDFiumLibrary.hxx:74
     void vcl::pdf::PDFiumBitmap::fillRect(int,int,int,int,unsigned int)
     int left
     0
-include/vcl/filter/PDFiumLibrary.hxx:79
+include/vcl/filter/PDFiumLibrary.hxx:74
     void vcl::pdf::PDFiumBitmap::fillRect(int,int,int,int,unsigned int)
     int top
     0
-include/vcl/filter/PDFiumLibrary.hxx:80
-    void vcl::pdf::PDFiumBitmap::renderPageBitmap(class vcl::pdf::PDFiumPage *,int,int,int,int)
+include/vcl/filter/PDFiumLibrary.hxx:75
+    void vcl::pdf::PDFiumBitmap::renderPageBitmap(class vcl::pdf::PDFiumDocument *,class vcl::pdf::PDFiumPage *,int,int,int,int)
     int nStartX
     0
-include/vcl/filter/PDFiumLibrary.hxx:80
-    void vcl::pdf::PDFiumBitmap::renderPageBitmap(class vcl::pdf::PDFiumPage *,int,int,int,int)
+include/vcl/filter/PDFiumLibrary.hxx:75
+    void vcl::pdf::PDFiumBitmap::renderPageBitmap(class vcl::pdf::PDFiumDocument *,class vcl::pdf::PDFiumPage *,int,int,int,int)
     int nStartY
     0
-include/vcl/graphicfilter.hxx:303
-    class ErrCode GraphicFilter::ImportGraphic(class Graphic &,const class rtl::OUString &,class SvStream &,unsigned short,unsigned short *,enum GraphicFilterImportFlags,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *,const struct WmfExternal *)
-    const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> * pFilterData
+include/vcl/font/Feature.hxx:49
+    void vcl::font::FeatureParameter::FeatureParameter(unsigned int,class rtl::OUString)
+    unsigned int nCode
+    0
+include/vcl/glyphitemcache.hxx:46
+    const class SalLayoutGlyphs * SalLayoutGlyphsCache::GetLayoutGlyphs(const class VclPtr<const class OutputDevice> &,const class rtl::OUString &,const class vcl::text::TextLayoutCache *)
+    const class vcl::text::TextLayoutCache * layoutCache
     0
 include/vcl/image.hxx:47
     void Image::Image(enum StockImage,const class rtl::OUString &)
     enum StockImage 
     0
-include/vcl/InterimItemWindow.hxx:39
-    void InterimItemWindow::InterimItemWindow(class vcl::Window *,const class rtl::OUString &,const class rtl::OString &,_Bool,unsigned long)
-    unsigned long nLOKWindowId
+include/vcl/kernarray.hxx:88
+    void KernArray::resize(unsigned long,int)
+    int nDefault
+    0
+include/vcl/lazydelete.hxx:80
+    void vcl::DeleteOnDeinit::DeleteOnDeinit<T>(enum vcl::DeleteOnDeinitFlag)
+    enum vcl::DeleteOnDeinitFlag 
     0
-include/vcl/mtfxmldump.hxx:34
+include/vcl/menu.hxx:256
+    _Bool Menu::HasValidEntries(_Bool) const
+    _Bool bCheckPopups
+    1
+include/vcl/mtfxmldump.hxx:53
     void MetafileXmlDump::filterActionType(const enum MetaActionType,_Bool)
     _Bool bShouldFilter
     0
-include/vcl/outdev.hxx:531
-    _Bool OutputDevice::SupportsOperation(enum OutDevSupportType) const
-    enum OutDevSupportType 
+include/vcl/outdev.hxx:1052
+    void OutputDevice::GetCaretPositions(const class rtl::OUString &,class KernArray &,int,int,const class SalLayoutGlyphs *) const
+    int nIndex
+    0
+include/vcl/outdev.hxx:1052
+    void OutputDevice::GetCaretPositions(const class rtl::OUString &,class KernArray &,int,int,const class SalLayoutGlyphs *) const
+    const class SalLayoutGlyphs * pGlyphs
     0
-include/vcl/outdev.hxx:1213
+include/vcl/outdev.hxx:1094
     void OutputDevice::ImplDrawWaveTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1214
+include/vcl/outdev.hxx:1095
     void OutputDevice::ImplDrawStraightTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1215
+include/vcl/outdev.hxx:1096
     void OutputDevice::ImplDrawStrikeoutLine(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1216
+include/vcl/outdev.hxx:1097
     void OutputDevice::ImplDrawStrikeoutChar(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1238
+include/vcl/outdev.hxx:1117
     void OutputDevice::RefreshFontData(const _Bool)
     const _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1363
+include/vcl/outdev.hxx:1259
     _Bool OutputDevice::GetTextIsRTL(const class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1651,30 +1843,34 @@ include/vcl/outdev/ScopedStates.hxx:25
     _Bool bAAState
     1
 include/vcl/pdfread.hxx:33
-    unsigned long RenderPDFBitmaps(const void *,int,class std::__debug::vector<class BitmapEx, class std::allocator<class BitmapEx> > &,unsigned long,int,const class basegfx::B2DTuple *)
+    unsigned long RenderPDFBitmaps(const void *,int,class std::vector<class BitmapEx> &,unsigned long,int,const class basegfx::B2DTuple *)
     int nPages
     1
-include/vcl/settings.hxx:703
+include/vcl/print.hxx:226
+    void Printer::ResetPrintArea(_Bool)
+    _Bool bReset
+    1
+include/vcl/settings.hxx:729
     void AllSettings::SetLanguageTag(const class rtl::OUString &,_Bool)
     _Bool bCanonicalize
     1
-include/vcl/splitwin.hxx:136
+include/vcl/splitwin.hxx:139
     void SplitWindow::InsertItem(unsigned short,long,unsigned short,unsigned short,enum SplitWindowItemFlags)
     unsigned short nIntoSetId
     0
-include/vcl/splitwin.hxx:157
+include/vcl/splitwin.hxx:160
     long SplitWindow::GetItemSize(unsigned short,enum SplitWindowItemFlags) const
     enum SplitWindowItemFlags nBits
     1
 include/vcl/status.hxx:36
-    void DrawProgress(class vcl::Window *,class OutputDevice &,const class Point &,long,long,long,unsigned short,unsigned short,unsigned short,const class tools::Rectangle &)
+    void DrawProgress(class vcl::Window *,class OutputDevice &,const class Point &,long,long,long,unsigned short,unsigned short,unsigned short,const class tools::Rectangle &,enum ControlType)
     unsigned short nPercent1
     0
 include/vcl/syschild.hxx:51
     void SystemChildWindow::EnableEraseBackground(_Bool)
     _Bool bEnable
     0
-include/vcl/TaskStopwatch.hxx:76
+include/vcl/TaskStopwatch.hxx:75
     void TaskStopwatch::TaskStopwatch(_Bool)
     _Bool bConciderLastIterTime
     1
@@ -1686,52 +1882,56 @@ include/vcl/timer.hxx:55
     void Timer::Invoke(class Timer *)
     class Timer * arg
     0
+include/vcl/toolbox.hxx:305
+    void ToolBox::InsertItem(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,const class Image &,const class rtl::OUString &,enum ToolBoxItemBits,unsigned long)
+    enum ToolBoxItemBits nBits
+    0
 include/vcl/toolbox.hxx:313
-    void ToolBox::InsertWindow(unsigned short,class vcl::Window *,enum ToolBoxItemBits,unsigned long)
+    void ToolBox::InsertWindow(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,class vcl::Window *,enum ToolBoxItemBits,unsigned long)
     enum ToolBoxItemBits nBits
     0
 include/vcl/toolbox.hxx:362
-    void ToolBox::SetItemWindowNonInteractive(unsigned short,_Bool)
+    void ToolBox::SetItemWindowNonInteractive(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,_Bool)
     _Bool bNonInteractive
     1
-include/vcl/toolbox.hxx:420
+include/vcl/toolbox.hxx:424
     class Size ToolBox::CalcWindowSizePixel(unsigned long,enum WindowAlign)
     unsigned long nCalcLines
     1
-include/vcl/toolbox.hxx:441
+include/vcl/toolbox.hxx:445
     void ToolBox::EnableCustomize(_Bool)
     _Bool bEnable
     1
-include/vcl/toolkit/edit.hxx:98
+include/vcl/toolkit/edit.hxx:99
     void Edit::ImplClearBackground(class OutputDevice &,const class tools::Rectangle &,long,long)
     long nXStart
     0
-include/vcl/toolkit/field.hxx:82
+include/vcl/toolkit/field.hxx:89
     void FormatterBase::EnableEmptyFieldValue(_Bool)
     _Bool bEnable
     1
-include/vcl/toolkit/treelistbox.hxx:553
-    class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,class SvTreeListEntry *,_Bool,unsigned long,void *)
+include/vcl/toolkit/treelistbox.hxx:554
+    class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,class SvTreeListEntry *,_Bool,unsigned int,void *)
     _Bool bChildrenOnDemand
     0
-include/vcl/toolkit/treelistbox.hxx:557
-    class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,const class Image &,const class Image &,class SvTreeListEntry *,_Bool,unsigned long,void *)
-    _Bool bChildrenOnDemand
-    0
-include/vcl/toolkit/treelistbox.hxx:622
+include/vcl/toolkit/treelistbox.hxx:616
     void SvTreeListBox::MakeVisible(class SvTreeListEntry *,_Bool)
     _Bool bMoveToTop
     1
-include/vcl/toolkit/treelistbox.hxx:645
-    unsigned long SvTreeListBox::SelectChildren(class SvTreeListEntry *,_Bool)
+include/vcl/toolkit/treelistbox.hxx:628
+    struct std::pair<long, long> SvTreeListBox::GetItemPos(class SvTreeListEntry *,unsigned short)
+    unsigned short nTabIdx
+    0
+include/vcl/toolkit/treelistbox.hxx:636
+    unsigned int SvTreeListBox::SelectChildren(class SvTreeListEntry *,_Bool)
     _Bool bSelect
     0
-include/vcl/toolkit/treelistbox.hxx:655
+include/vcl/toolkit/treelistbox.hxx:644
     void SvTreeListBox::SetHighlightRange(unsigned short,unsigned short)
     unsigned short nFirstTab
     0
-include/vcl/toolkit/treelistentry.hxx:104
-    void SvTreeListEntry::ReplaceItem(class std::unique_ptr<class SvLBoxItem, struct std::default_delete<class SvLBoxItem> >,unsigned long)
+include/vcl/toolkit/treelistentry.hxx:103
+    void SvTreeListEntry::ReplaceItem(class std::unique_ptr<class SvLBoxItem>,unsigned long)
     unsigned long nPos
     0
 include/vcl/vclptr.hxx:43
@@ -1739,122 +1939,130 @@ include/vcl/vclptr.hxx:43
     int (*)[sizeof(T)] 
     0
 include/vcl/vclptr.hxx:81
-    void VclPtr::VclPtr<T>(type-parameter-?-? *,enum __sal_NoAcquire)
-    enum __sal_NoAcquire 
-    0
-include/vcl/vclptr.hxx:81
     void VclPtr::VclPtr<reference_type>(type-parameter-?-? *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
     0
 include/vcl/vclptr.hxx:94
-    void VclPtr::VclPtr<T>(const VclPtr<type-parameter-?-?> &,typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type)
-    typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type 
-    0
-include/vcl/vclptr.hxx:94
     void VclPtr::VclPtr<reference_type>(const VclPtr<type-parameter-?-?> &,typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type)
     typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type 
     0
-include/vcl/vclptr.hxx:341
+include/vcl/vclptr.hxx:342
     void ScopedVclPtr::ScopedVclPtr<reference_type>(const VclPtr<type-parameter-?-?> &,typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type)
     typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type 
     0
-include/vcl/vclptr.hxx:388
+include/vcl/vclptr.hxx:389
     void ScopedVclPtr::ScopedVclPtr<reference_type>(type-parameter-?-? *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
     0
-include/vcl/vectorgraphicdata.hxx:94
+include/vcl/vectorgraphicdata.hxx:37
+    class BitmapEx convertPrimitive2DSequenceToBitmapEx(const class std::deque<class com::sun::star::uno::Reference<class com::sun::star::graphic::XPrimitive2D> > &,const class basegfx::B2DRange &,const unsigned int,const enum o3tl::Length,const class std::optional<class Size> &)
+    const enum o3tl::Length eTargetUnit
+    0
+include/vcl/vectorgraphicdata.hxx:84
     void VectorGraphicData::VectorGraphicData(const class rtl::OUString &,enum VectorGraphicDataType)
     enum VectorGraphicDataType eVectorDataType
     0
-include/vcl/weld.hxx:322
-    void weld::ScrolledWindow::hadjustment_configure(int,int,int,int,int,int)
-    int step_increment
-    1
-include/vcl/weld.hxx:341
-    void weld::ScrolledWindow::vadjustment_configure(int,int,int,int,int,int)
-    int lower
-    0
-include/vcl/weld.hxx:353
+include/vcl/weld.hxx:447
     void weld::ScrolledWindow::vadjustment_set_lower(int)
     int upper
     0
-include/vcl/weld.hxx:937
+include/vcl/weld.hxx:1088
     void weld::TreeView::set_image(int,class VirtualDevice &,int)
     int col
     1
-include/vcl/weld.hxx:942
+include/vcl/weld.hxx:1093
     void weld::TreeView::set_text_emphasis(int,_Bool,int)
     int col
     0
-include/vcl/weld.hxx:943
+include/vcl/weld.hxx:1094
     _Bool weld::TreeView::get_text_emphasis(int,int) const
     int col
     0
-include/vcl/weld.hxx:944
+include/vcl/weld.hxx:1095
     void weld::TreeView::set_text_align(int,double,int)
     int col
     0
-include/vcl/weld.hxx:1034
-    _Bool weld::TreeView::get_text_emphasis(const class weld::TreeIter &,int) const
+include/vcl/weld.hxx:1179
+    _Bool weld::TreeView::get_sensitive(const class weld::TreeIter &,int) const
     int col
     0
-include/vcl/weld.hxx:1172
-    void weld::TreeView::set_column_custom_renderer(int,_Bool)
-    int nColumn
+include/vcl/weld.hxx:1181
+    _Bool weld::TreeView::get_text_emphasis(const class weld::TreeIter &,int) const
+    int col
     0
-include/vcl/weld.hxx:1243
-    class std::unique_ptr<class weld::TreeIter, struct std::default_delete<class weld::TreeIter> > weld::IconView::make_iterator(const class weld::TreeIter *) const
+include/vcl/weld.hxx:1473
+    class std::unique_ptr<class weld::TreeIter> weld::IconView::make_iterator(const class weld::TreeIter *) const
     const class weld::TreeIter * pOrig
     0
-include/vcl/window.hxx:615
+include/vcl/weld.hxx:2411
+    class rtl::OUString weld::Menu::popup_at_rect(class weld::Widget *,const class tools::Rectangle &,enum weld::Placement)
+    enum weld::Placement ePlace
+    0
+include/vcl/window.hxx:585
     void vcl::Window::ImplSetMouseTransparent(_Bool)
     _Bool bTransparent
     1
-include/vcl/window.hxx:952
+include/vcl/window.hxx:888
     void vcl::Window::Disable(_Bool)
     _Bool bChild
     1
-include/xmloff/numehelp.hxx:92
-    void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(class SvXMLExport &,const class rtl::OUString &,const class rtl::OUString &,_Bool,_Bool)
+include/vcl/window.hxx:1497
+    void vcl::Window::SetSettings(const class AllSettings &,_Bool)
+    _Bool bChild
+    1
+include/vcl/window.hxx:1499
+    class tools::Rectangle vcl::Window::GetTextRect(const class tools::Rectangle &,const class rtl::OUString &,enum DrawTextFlags,class TextRectInfo *,const class vcl::TextLayoutCommon *) const
+    const class vcl::TextLayoutCommon * _pTextLayout
+    0
+include/vcl/window.hxx:1523
+    long vcl::Window::GetTextWidth(const class rtl::OUString &,int,int,const class vcl::text::TextLayoutCache *,const class SalLayoutGlyphs *const) const
+    const class vcl::text::TextLayoutCache * 
+    0
+include/vcl/wmf.hxx:33
+    _Bool ConvertGraphicToWMF(const class Graphic &,class SvStream &,const class FilterConfigItem *,_Bool)
+    _Bool bPlaceable
+    1
+include/xmloff/maptype.hxx:120
+    void XMLPropertyMapEntry::XMLPropertyMapEntry(nullptr_t)
+    nullptr_t 
+    0
+include/xmloff/numehelp.hxx:93
+    void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(class SvXMLExport &,const class rtl::OUString &,class std::basic_string_view<char16_t>,_Bool,_Bool)
     _Bool bExportTypeAttribute
     1
 include/xmloff/ProgressBarHelper.hxx:47
-    void ProgressBarHelper::ProgressBarHelper(const class com::sun::star::uno::Reference<class com::sun::star::task::XStatusIndicator> &,const _Bool)
+    void ProgressBarHelper::ProgressBarHelper(class com::sun::star::uno::Reference<class com::sun::star::task::XStatusIndicator>,const _Bool)
     const _Bool bStrict
     1
-include/xmloff/SchXMLImportHelper.hxx:129
+include/xmloff/SchXMLImportHelper.hxx:100
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> SchXMLImportHelper::GetNewDataSeries(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,const class rtl::OUString &,_Bool)
     int nCoordinateSystemIndex
     0
-include/xmloff/styleexp.hxx:103
-    void XMLStyleExport::exportStyleFamily(const char *,const class rtl::OUString &,const class rtl::Reference<class SvXMLExportPropertyMapper> &,_Bool,enum XmlStyleFamily,const class rtl::OUString *)
-    const class rtl::OUString * pPrefix
-    0
-include/xmloff/txtparae.hxx:222
+include/xmloff/txtparae.hxx:226
     void XMLTextParagraphExport::exportText(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool,_Bool,_Bool)
     _Bool bExportParagraph
     1
-include/xmloff/XMLCharContext.hxx:45
-    void XMLCharContext::XMLCharContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,short)
-    short nControl
-    1
 include/xmloff/XMLEventExport.hxx:89
     void XMLEventExport::Export(const class com::sun::star::uno::Reference<class com::sun::star::document::XEventsSupplier> &,_Bool)
     _Bool bUseWhitespace
     1
-include/xmloff/xmlnumi.hxx:71
+include/xmloff/xmlnumi.hxx:70
     void SvxXMLListStyleContext::SetDefaultStyle(const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexReplace> &,short,_Bool)
     _Bool bOrdered
     0
-l10ntools/inc/common.hxx:49
-    void writePoEntry(const class rtl::OString &,class PoOfstream &,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const enum PoEntry::TYPE)
+include/xmloff/XMLPageExport.hxx:87
+    void XMLPageExport::collectAutoStyles(_Bool)
+    _Bool bUsed
+    0
+l10ntools/inc/common.hxx:50
+    void writePoEntry(const class rtl::OString &,class PoOfstream &,const class rtl::OString &,class std::basic_string_view<char>,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,const enum PoEntry::TYPE)
     const enum PoEntry::TYPE eType
     0
-l10ntools/inc/po.hxx:110
+l10ntools/inc/po.hxx:112
     void PoOfstream::PoOfstream(const class rtl::OString &,enum PoOfstream::OpenMode)
     enum PoOfstream::OpenMode aMode
     1
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:52
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:54
     void gtv_main_toolbar_doc_loaded(struct GtvMainToolbar *,LibreOfficeKitDocumentType,_Bool)
     _Bool bEditMode
     1
@@ -1866,23 +2074,27 @@ libreofficekit/qa/tilebench/tilebench.cxx:72
     void dumpTile(const char *,const int,const int,const int,const unsigned char *,const int,const int,int)
     const int nOffY
     0
-libreofficekit/qa/tilebench/tilebench.cxx:148
+libreofficekit/qa/tilebench/tilebench.cxx:155
     void testTile(class lok::Document *,int,int,_Bool)
     _Bool dump
     1
-lotuswordpro/inc/xfilter/xfborders.hxx:90
-    void XFBorder::SetDoubleLine(_Bool,_Bool)
-    _Bool bSameWidth
-    0
+lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx:192
+    class std::basic_string<char> makeHttpRequest(class std::basic_string_view<char16_t>,enum (anonymous namespace)::HTTP_METHOD,const class rtl::OString &,long &)
+    enum (anonymous namespace)::HTTP_METHOD method
+    1
 lotuswordpro/inc/xfilter/xfborders.hxx:90
     void XFBorder::SetDoubleLine(_Bool,_Bool)
     _Bool dual
     1
+lotuswordpro/inc/xfilter/xfborders.hxx:90
+    void XFBorder::SetDoubleLine(_Bool,_Bool)
+    _Bool bSameWidth
+    0
 lotuswordpro/inc/xfilter/xfcellstyle.hxx:108
     void XFCellStyle::SetAlignType(enum enumXFAlignType,enum enumXFAlignType)
     enum enumXFAlignType hori
     0
-lotuswordpro/inc/xfilter/xfdrawstyle.hxx:117
+lotuswordpro/inc/xfilter/xfdrawstyle.hxx:118
     void XFDrawStyle::SetFontWorkStyle(enum enumXFFWStyle,enum enumXFFWAdjust)
     enum enumXFFWAdjust eAdjust
     0
@@ -1892,11 +2104,11 @@ lotuswordpro/inc/xfilter/xfframestyle.hxx:127
     1
 lotuswordpro/inc/xfilter/xfframestyle.hxx:127
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool pos
+    _Bool size
     1
 lotuswordpro/inc/xfilter/xfframestyle.hxx:127
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool size
+    _Bool pos
     1
 lotuswordpro/inc/xfilter/xfindex.hxx:100
     void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
@@ -1916,21 +2128,21 @@ lotuswordpro/source/filter/bento.hxx:203
     0
 lotuswordpro/source/filter/clone.hxx:26
     char & detail::has_clone::check_sig(type-parameter-?-? *,test<type-parameter-?-? *(type-parameter-?-?::*)(void) const, &U::clone> *)
-    test<type-parameter-?-? *(type-parameter-?-?::*)(void) const, &U::clone> * 
+    type-parameter-?-? * 
     0
 lotuswordpro/source/filter/clone.hxx:26
     char & detail::has_clone::check_sig(type-parameter-?-? *,test<type-parameter-?-? *(type-parameter-?-?::*)(void) const, &U::clone> *)
-    type-parameter-?-? * 
+    test<type-parameter-?-? *(type-parameter-?-?::*)(void) const, &U::clone> * 
     0
-lotuswordpro/source/filter/lwpnumericfmt.hxx:112
-    void LwpCurrencyInfo::LwpCurrencyInfo(const class rtl::OUString &,_Bool,_Bool)
+lotuswordpro/source/filter/lwpnumericfmt.hxx:113
+    void LwpCurrencyInfo::LwpCurrencyInfo(class rtl::OUString,_Bool,_Bool)
     _Bool bShowSpace_
     1
 o3tl/qa/cow_wrapper_clients.hxx:41
     void o3tltests::cow_wrapper_client1::cow_wrapper_client1(int)
     int nVal
     1
-oox/inc/drawingml/chart/typegroupconverter.hxx:153
+oox/inc/drawingml/chart/typegroupconverter.hxx:157
     void oox::drawingml::chart::TypeGroupConverter::convertLineSmooth(class oox::PropertySet &,_Bool) const
     _Bool bOoxSmooth
     1
@@ -1938,59 +2150,59 @@ oox/inc/drawingml/textspacing.hxx:42
     void oox::drawingml::TextSpacing::TextSpacing(int)
     int nPoints
     0
-oox/qa/unit/drawingml.cxx:38
+oox/qa/unit/drawingml.cxx:46
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> getChildShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,int)
+    int nIndex
+    0
+oox/qa/unit/shape.cxx:48
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> getChildShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,int)
     int nIndex
     0
-oox/source/drawingml/lineproperties.cxx:44
+oox/qa/unit/testscene3d.cxx:43
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> TestScene3d::getShape(unsigned char,unsigned char)
+    unsigned char nPageIndex
+    0
+oox/source/drawingml/lineproperties.cxx:48
     void lclSetDashData(struct com::sun::star::drawing::LineDash &,short,int,short,int,int)
     short nDots
     1
-oox/source/export/chartexport.cxx:256
+oox/source/export/chartexport.cxx:269
     int lcl_getCategoryAxisType(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDiagram> &,int,int)
     int nDimensionIndex
     0
-oox/source/export/chartexport.cxx:433
-    int lcl_getAlphaFromTransparenceGradient(const struct com::sun::star::awt::Gradient &,_Bool)
-    _Bool bStart
-    1
-oox/source/export/ColorPropertySet.hxx:40
-    void oox::drawingml::ColorPropertySet::ColorPropertySet(class Color,_Bool)
-    _Bool bFillColor
-    1
-oox/source/ppt/pptshape.cxx:511
+oox/source/ppt/pptshape.cxx:703
     _Bool Placeholders::hasByPrio(unsigned long) const
     unsigned long aIndex
     0
-oox/source/ppt/timenodelistcontext.cxx:104
+oox/source/ppt/timenodelistcontext.cxx:105
     void oox::ppt::(anonymous namespace)::AnimColor::AnimColor(short,int,int,int)
     short cs
     0
-oox/source/ppt/timenodelistcontext.cxx:104
+oox/source/ppt/timenodelistcontext.cxx:105
     void oox::ppt::(anonymous namespace)::AnimColor::AnimColor(short,int,int,int)
     int o
     0
-oox/source/ppt/timenodelistcontext.cxx:104
+oox/source/ppt/timenodelistcontext.cxx:105
     void oox::ppt::(anonymous namespace)::AnimColor::AnimColor(short,int,int,int)
     int t
     0
-oox/source/ppt/timenodelistcontext.cxx:104
+oox/source/ppt/timenodelistcontext.cxx:105
     void oox::ppt::(anonymous namespace)::AnimColor::AnimColor(short,int,int,int)
     int th
     0
-oox/source/vml/vmlformatting.cxx:542
-    long lclGetEmu(const class oox::GraphicHelper &,const class oox::OptValue<class rtl::OUString> &,long)
+oox/source/vml/vmlformatting.cxx:560
+    long lclGetEmu(const class oox::GraphicHelper &,const class std::optional<class rtl::OUString> &,long)
     long nDefValue
     1
-oox/source/vml/vmlshapecontext.cxx:129
-    _Bool lclDecodeVmlxBool(const class rtl::OUString &,_Bool)
+oox/source/vml/vmlshapecontext.cxx:134
+    _Bool lclDecodeVmlxBool(class std::basic_string_view<char16_t>,_Bool)
     _Bool bDefaultForEmpty
     1
-opencl/source/opencl_device.cxx:115
+opencl/source/opencl_device.cxx:114
     double random(double,double)
     double min
     0
-opencl/source/openclwrapper.cxx:528
+opencl/source/openclwrapper.cxx:526
     _Bool initOpenCLRunEnv(int)
     int argc
     0
@@ -2007,18 +2219,18 @@ pyuno/inc/pyuno.hxx:88
     enum pyuno::NotNull 
     0
 pyuno/source/module/pyuno_impl.hxx:79
-    void log(struct pyuno::RuntimeCargo *,int,const class rtl::OUString &)
+    void log(struct pyuno::RuntimeCargo *,int,class std::basic_string_view<char16_t>)
     int level
     1
-reportdesign/inc/RptModel.hxx:57
+reportdesign/inc/RptModel.hxx:56
     void rptui::OReportModel::OReportModel(class reportdesign::OReportDefinition *)
     class reportdesign::OReportDefinition * _pReportDefinition
     0
 reportdesign/source/core/inc/Tools.hxx:48
-    void throwIllegallArgumentException(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,short)
+    void throwIllegallArgumentException(class std::basic_string_view<char16_t>,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,short)
     short ArgumentPosition_
     1
-reportdesign/source/filter/xml/xmlFixedContent.cxx:52
+reportdesign/source/filter/xml/xmlFixedContent.cxx:54
     void rptxml::(anonymous namespace)::OXMLCharContent::OXMLCharContent(class SvXMLImport &,class rptxml::OXMLFixedContent *,short)
     short nControl
     1
@@ -2030,331 +2242,311 @@ reportdesign/source/ui/inc/DesignView.hxx:228
     void rptui::ODesignView::setMarked(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Reference<class com::sun::star::report::XReportComponent> > &,_Bool)
     _Bool _bMark
     1
-reportdesign/source/ui/inc/GeometryHandler.hxx:95
-    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const char **,_Bool,_Bool)
+reportdesign/source/ui/inc/GeometryHandler.hxx:96
+    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const struct TranslateId *,_Bool,_Bool)
     _Bool _bReadOnlyControl
     0
-reportdesign/source/ui/inc/GeometryHandler.hxx:95
-    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const char **,_Bool,_Bool)
+reportdesign/source/ui/inc/GeometryHandler.hxx:96
+    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const struct TranslateId *,_Bool,_Bool)
     _Bool _bTrueIfListBoxFalseIfComboBox
     1
 reportdesign/source/ui/inc/UITools.hxx:142
-    class SdrObject * isOver(const class tools::Rectangle &,const class SdrPage &,const class SdrView &,_Bool,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> *,int)
+    class SdrObject * isOver(const class tools::Rectangle &,const class SdrPage &,const class SdrView &,_Bool,class rtl::Reference<class SdrUnoObj> *,int)
     _Bool _bAllObjects
     1
 reportdesign/source/ui/report/SectionWindow.cxx:360
     void lcl_setOrigin(class vcl::Window &,long,long)
     long _nY
     0
-sal/osl/unx/file.cxx:111
-    void (anonymous namespace)::FileHandle_Impl::FileHandle_Impl(int,enum (anonymous namespace)::FileHandle_Impl::Kind,const char *)
+sal/osl/unx/file.cxx:122
+    void (anonymous namespace)::FileHandle_Impl::FileHandle_Impl(int,enum (anonymous namespace)::FileHandle_Impl::Kind,class rtl::OString)
     enum (anonymous namespace)::FileHandle_Impl::Kind kind
     1
-sal/qa/osl/file/osl_File.cxx:426
+sal/qa/osl/file/osl_File.cxx:433
     void osl_FileBase::getAbsoluteFileURL::check_getAbsoluteFileURL(const class rtl::OUString &,const class rtl::OString &,enum osl::FileBase::RC,const class rtl::OUString &)
     enum osl::FileBase::RC _nAssumeError
     0
-sal/qa/osl/pipe/osl_Pipe.cxx:737
+sal/qa/osl/pipe/osl_Pipe.cxx:732
     void thread_sleep(unsigned int)
     unsigned int _nSec
     1
-sal/qa/osl/process/osl_Thread.cxx:160
+sal/qa/osl/process/osl_Thread.cxx:155
     void (anonymous namespace)::ThreadSafeValue::ThreadSafeValue<T>(type-parameter-?-?)
     type-parameter-?-? n
     0
-sal/qa/rtl/random/rtl_random.cxx:172
+sal/qa/rtl/random/rtl_random.cxx:171
     void rtl_random::(anonymous namespace)::Statistics::addValue(unsigned char,int)
     int _nValue
     1
-sc/inc/address.hxx:334
+sal/rtl/strtmpl.hxx:201
+    _Bool rtl::str::NoShortening::operator>=(int)
+     ###1
+    0
+sal/rtl/strtmpl.hxx:202
+    _Bool rtl::str::NoShortening::operator==(int)
+     ###1
+    0
+sc/inc/address.hxx:346
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     const class ScDocument * pDocument
     0
-sc/inc/address.hxx:507
+sc/inc/address.hxx:504
     void ScRange::ScRange(enum ScAddress::Uninitialized)
     enum ScAddress::Uninitialized eUninitialized
     0
-sc/inc/address.hxx:510
+sc/inc/address.hxx:507
     void ScRange::ScRange(enum ScAddress::InitializeInvalid)
     enum ScAddress::InitializeInvalid eInvalid
     0
-sc/inc/attarray.hxx:143
-    const class ScPatternAttr * ScAttrArray::SetPattern(int,class std::unique_ptr<class ScPatternAttr, struct std::default_delete<class ScPatternAttr> >,_Bool)
-    _Bool bPutToPool
-    1
-sc/inc/attarray.hxx:145
-    void ScAttrArray::SetPatternArea(int,int,class std::unique_ptr<class ScPatternAttr, struct std::default_delete<class ScPatternAttr> >,_Bool,class ScEditDataArray *)
-    _Bool bPutToPool
-    1
-sc/inc/attarray.hxx:145
-    void ScAttrArray::SetPatternArea(int,int,class std::unique_ptr<class ScPatternAttr, struct std::default_delete<class ScPatternAttr> >,_Bool,class ScEditDataArray *)
-    class ScEditDataArray * pDataArray
-    0
 sc/inc/cellform.hxx:41
-    class rtl::OUString ScCellFormat::GetString(class ScDocument &,const class ScAddress &,unsigned int,const class Color **,class SvNumberFormatter &,_Bool,_Bool)
+    class rtl::OUString ScCellFormat::GetString(class ScDocument &,const class ScAddress &,unsigned int,const class Color **,struct ScInterpreterContext *,_Bool,_Bool)
     _Bool bFormula
     0
-sc/inc/cellform.hxx:41
-    class rtl::OUString ScCellFormat::GetString(class ScDocument &,const class ScAddress &,unsigned int,const class Color **,class SvNumberFormatter &,_Bool,_Bool)
-    _Bool bNullVals
-    1
-sc/inc/ChartTools.hxx:48
+sc/inc/cellform.hxx:52
+    class rtl::OUString ScCellFormat::GetInputString(const struct ScRefCellValue &,unsigned int,struct ScInterpreterContext *,const class ScDocument &,_Bool,_Bool)
+    _Bool bForceSystemLocale
+    0
+sc/inc/ChartTools.hxx:46
     class SdrOle2Obj * getChartByIndex(class ScDocShell *,short,long,enum sc::tools::ChartSourceType)
     enum sc::tools::ChartSourceType eChartSourceType
     1
-sc/inc/chgtrack.hxx:712
+sc/inc/chgtrack.hxx:705
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
     short nDx
     0
-sc/inc/chgtrack.hxx:712
+sc/inc/chgtrack.hxx:705
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
     int nDy
     0
-sc/inc/column.hxx:221
-    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockConstPosition &,int,_Bool,_Bool) const
-    _Bool bConsiderCellDrawObjects
-    0
-sc/inc/column.hxx:221
-    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockConstPosition &,int,_Bool,_Bool) const
-    _Bool bConsiderCellNotes
-    0
-sc/inc/column.hxx:223
-    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockPosition &,int,_Bool,_Bool)
-    _Bool bConsiderCellDrawObjects
-    0
-sc/inc/column.hxx:223
-    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockPosition &,int,_Bool,_Bool)
-    _Bool bConsiderCellNotes
+sc/inc/colcontainer.hxx:33
+    void ScColContainer::ScColContainer(const struct ScSheetLimits &,const unsigned long)
+    const unsigned long nSize
+    1
+sc/inc/column.hxx:301
+    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockConstPosition &,int,struct ScDataAreaExtras *) const
+    struct ScDataAreaExtras * pDataAreaExtras
     0
-sc/inc/column.hxx:250
+sc/inc/column.hxx:331
     void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
     int nStartRow
     0
-sc/inc/column.hxx:337
+sc/inc/column.hxx:416
     class ScFormulaCell * ScColumn::SetFormulaCell(int,class ScFormulaCell *,enum sc::StartListeningType,_Bool)
     _Bool bInheritNumFormatIfNeeded
     1
-sc/inc/column.hxx:367
-    void ScColumn::GetString(struct sc::ColumnBlockConstPosition &,int,class rtl::OUString &,const struct ScInterpreterContext *) const
-    const struct ScInterpreterContext * pContext
+sc/inc/column.hxx:451
+    class rtl::OUString ScColumn::GetString(struct sc::ColumnBlockConstPosition &,int,struct ScInterpreterContext *) const
+    struct ScInterpreterContext * pContext
     0
-sc/inc/column.hxx:670
-    void ScColumn::DetachFormulaCells(class sc::EndListeningContext &,int,int,class std::__debug::vector<int, class std::allocator<int> > *)
-    class std::__debug::vector<int, class std::allocator<int> > * pNewSharedRows
+sc/inc/column.hxx:458
+    class rtl::OUString ScColumn::GetInputString(struct sc::ColumnBlockConstPosition &,int,_Bool) const
+    _Bool bForceSystemLocale
     0
-sc/inc/column.hxx:726
-    void ScColumn::AttachNewFormulaCell(const class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > &,int,class ScFormulaCell &,const class std::__debug::vector<int, class std::allocator<int> > &,_Bool,enum sc::StartListeningType)
+sc/inc/column.hxx:811
+    void ScColumn::AttachNewFormulaCell(const class mdds::mtv::soa::detail::iterator_base<struct mdds::mtv::soa::multi_type_vector<struct sc::CellStoreTraits>::iterator_trait> &,int,class ScFormulaCell &,const class std::vector<int> &,_Bool,enum sc::StartListeningType)
     _Bool bJoin
     1
-sc/inc/columnspanset.hxx:60
-    void sc::ColumnSpanSet::ColumnType::ColumnType(int,int,_Bool)
-    _Bool bInit
-    0
-sc/inc/columnspanset.hxx:60
-    void sc::ColumnSpanSet::ColumnType::ColumnType(int,int,_Bool)
-    int nStart
-    0
-sc/inc/columnspanset.hxx:84
-    void sc::ColumnSpanSet::ColumnAction::executeSum(int,int,_Bool,double &)
-    _Bool 
-    1
-sc/inc/columnspanset.hxx:92
+sc/inc/columnspanset.hxx:94
     void sc::ColumnSpanSet::set(const class ScDocument &,short,short,int,_Bool)
     _Bool bVal
     1
-sc/inc/columnspanset.hxx:94
+sc/inc/columnspanset.hxx:96
     void sc::ColumnSpanSet::set(const class ScDocument &,const class ScRange &,_Bool)
     _Bool bVal
     1
-sc/inc/columnspanset.hxx:96
+sc/inc/columnspanset.hxx:98
     void sc::ColumnSpanSet::set(const class ScDocument &,short,short,const class sc::SingleColumnSpanSet &,_Bool)
     _Bool bVal
     1
-sc/inc/columnspanset.hxx:102
+sc/inc/columnspanset.hxx:104
     void sc::ColumnSpanSet::scan(const class ScDocument &,short,short,int,short,int,_Bool)
     _Bool bVal
     1
-sc/inc/compiler.hxx:362
-    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,const struct ScInterpreterContext *)
+sc/inc/compiler.hxx:385
+    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,struct ScInterpreterContext *)
     _Bool bComputeII
     0
-sc/inc/compiler.hxx:362
-    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,const struct ScInterpreterContext *)
+sc/inc/compiler.hxx:385
+    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,struct ScInterpreterContext *)
     _Bool bMatrixFlag
     0
-sc/inc/compiler.hxx:362
-    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,const struct ScInterpreterContext *)
-    const struct ScInterpreterContext * pContext
+sc/inc/compiler.hxx:385
+    void ScCompiler::ScCompiler(class sc::CompileFormulaContext &,const class ScAddress &,_Bool,_Bool,struct ScInterpreterContext *)
+    struct ScInterpreterContext * pContext
     0
-sc/inc/compiler.hxx:367
-    void ScCompiler::ScCompiler(class ScDocument &,const class ScAddress &,enum formula::FormulaGrammar::Grammar,_Bool,_Bool,const struct ScInterpreterContext *)
-    const struct ScInterpreterContext * pContext
+sc/inc/compiler.hxx:390
+    void ScCompiler::ScCompiler(class ScDocument &,const class ScAddress &,enum formula::FormulaGrammar::Grammar,_Bool,_Bool,struct ScInterpreterContext *)
+    struct ScInterpreterContext * pContext
     0
-sc/inc/compressedarray.hxx:189
+sc/inc/compressedarray.hxx:186
     void ScBitMaskCompressedArray::ScBitMaskCompressedArray<A, D>(type-parameter-?-?,const type-parameter-?-? &)
     const type-parameter-?-? & rValue
     0
-sc/inc/compressedarray.hxx:199
+sc/inc/compressedarray.hxx:196
     void ScBitMaskCompressedArray::CopyFromAnded(const ScBitMaskCompressedArray<A, D> &,type-parameter-?-?,type-parameter-?-?,const type-parameter-?-? &)
     type-parameter-?-? nStart
     0
-sc/inc/dapiuno.hxx:297
-    void ScFieldIdentifier::ScFieldIdentifier(const class rtl::OUString &,_Bool)
+sc/inc/dapiuno.hxx:288
+    void ScFieldIdentifier::ScFieldIdentifier(class rtl::OUString,_Bool)
     _Bool bDataLayout
     1
-sc/inc/dociter.hxx:563
+sc/inc/dociter.hxx:412
     void ScUsedAreaIterator::ScUsedAreaIterator(class ScDocument &,short,short,int,short,int)
     short nCol1
     0
-sc/inc/dociter.hxx:563
+sc/inc/dociter.hxx:412
     void ScUsedAreaIterator::ScUsedAreaIterator(class ScDocument &,short,short,int,short,int)
     int nRow1
     0
-sc/inc/dociter.hxx:599
+sc/inc/dociter.hxx:448
     void ScDocRowHeightUpdater::TabRanges::TabRanges(short,int)
     short nTab
     0
-sc/inc/document.hxx:974
+sc/inc/document.hxx:615
+    void ScDocument::ScDocument(enum ScDocumentMode,class ScDocShell *)
+    class ScDocShell * pDocShell
+    0
+sc/inc/document.hxx:1005
     void ScDocument::SetPendingRowHeights(short,_Bool)
     _Bool bSet
     0
-sc/inc/document.hxx:978
+sc/inc/document.hxx:1010
     void ScDocument::SetScenario(short,_Bool)
     _Bool bFlag
     1
-sc/inc/document.hxx:1174
-    class rtl::OUString ScDocument::GetString(short,int,short,const struct ScInterpreterContext *) const
-    const struct ScInterpreterContext * pContext
+sc/inc/document.hxx:1206
+    class rtl::OUString ScDocument::GetString(short,int,short,struct ScInterpreterContext *) const
+    struct ScInterpreterContext * pContext
     0
-sc/inc/document.hxx:1314
+sc/inc/document.hxx:1367
     void ScDocument::GetBorderLines(short,int,short,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **) const
     short nTab
     0
-sc/inc/document.hxx:1549
+sc/inc/document.hxx:1627
     void ScDocument::EnableUserInteraction(_Bool)
     _Bool bVal
     0
-sc/inc/document.hxx:1636
+sc/inc/document.hxx:1726
     void ScDocument::CopyMultiRangeFromClip(const class ScAddress &,const class ScMarkData &,enum InsertDeleteFlags,class ScDocument *,_Bool,_Bool,_Bool,_Bool)
     _Bool bResetCut
     1
-sc/inc/document.hxx:1685
+sc/inc/document.hxx:1776
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    _Bool bMarked
+    short nCol1
     0
-sc/inc/document.hxx:1685
+sc/inc/document.hxx:1776
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    short nCol1
+    _Bool bMarked
     0
-sc/inc/document.hxx:1692
+sc/inc/document.hxx:1783
     void ScDocument::UndoToDocument(const class ScRange &,enum InsertDeleteFlags,_Bool,class ScDocument &)
     _Bool bMarked
     0
-sc/inc/document.hxx:1737
+sc/inc/document.hxx:1838
     const class ScPatternAttr * ScDocument::GetMostUsedPattern(short,int,int,short) const
     int nStartRow
     0
-sc/inc/document.hxx:1930
+sc/inc/document.hxx:2002
+    long ScDocument::GetColOffset(short,short,_Bool) const
+    _Bool bHiddenAsZero
+    1
+sc/inc/document.hxx:2003
+    long ScDocument::GetRowOffset(int,short,_Bool) const
+    _Bool bHiddenAsZero
+    1
+sc/inc/document.hxx:2032
     void ScDocument::ShowRow(int,short,_Bool)
     _Bool bShow
     0
-sc/inc/document.hxx:1933
+sc/inc/document.hxx:2035
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     int nStartRow
     0
-sc/inc/document.hxx:1938
-    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
-    _Bool bManual
-    1
-sc/inc/document.hxx:1938
-    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
-    _Bool bPage
-    0
-sc/inc/document.hxx:1939
-    void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
-    _Bool bManual
-    1
-sc/inc/document.hxx:1939
-    void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
+sc/inc/document.hxx:2044
+    void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1942
+sc/inc/document.hxx:2044
     void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1942
-    void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
+sc/inc/document.hxx:2045
+    void ScDocument::SetColBreak(short,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1943
+sc/inc/document.hxx:2045
     void ScDocument::SetColBreak(short,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1943
-    void ScDocument::SetColBreak(short,short,_Bool,_Bool)
+sc/inc/document.hxx:2046
+    void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1944
+sc/inc/document.hxx:2046
     void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1944
-    void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
+sc/inc/document.hxx:2047
+    void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1945
+sc/inc/document.hxx:2047
     void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1945
-    void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
-    _Bool bPage
+sc/inc/document.hxx:2310
+    class std::set<short> ScDocument::QueryColumnsWithFormulaCells(short) const
+    short nTab
+    0
+sc/inc/document.hxx:2318
+    void ScDocument::CheckIntegrity(short) const
+    short nTab
     0
-sc/inc/document.hxx:2265
+sc/inc/document.hxx:2376
     void ScDocument::UpdateBroadcastAreas(enum UpdateRefMode,const class ScRange &,short,int,short)
     enum UpdateRefMode eUpdateRefMode
     0
-sc/inc/document.hxx:2295
+sc/inc/document.hxx:2408
     void ScDocument::CalcFormulaTree(_Bool,_Bool,_Bool)
     _Bool bSetAllDirty
     1
-sc/inc/document.hxx:2517
+sc/inc/document.hxx:2629
     void ScDocument::StoreTabToCache(short,class SvStream &) const
     short nTab
     0
-sc/inc/document.hxx:2518
+sc/inc/document.hxx:2630
     void ScDocument::RestoreTabFromCache(short,class SvStream &)
     short nTab
     0
-sc/inc/document.hxx:2609
-    void ScDocument::EndListeningIntersectedGroup(class sc::EndListeningContext &,const class ScAddress &,class std::__debug::vector<class ScAddress, class std::allocator<class ScAddress> > *)
-    class std::__debug::vector<class ScAddress, class std::allocator<class ScAddress> > * pGroupPos
+sc/inc/document.hxx:2726
+    void ScDocument::EndListeningIntersectedGroup(class sc::EndListeningContext &,const class ScAddress &,class std::vector<class ScAddress> *)
+    class std::vector<class ScAddress> * pGroupPos
     0
-sc/inc/document.hxx:2629
+sc/inc/document.hxx:2748
     void ScMutationDisable::ScMutationDisable(class ScDocument &,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
-sc/inc/document.hxx:2662
+sc/inc/document.hxx:2781
     void ScMutationGuard::ScMutationGuard(class ScDocument &,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
-sc/inc/documentimport.hxx:89
+sc/inc/documentimport.hxx:94
     void ScDocumentImport::setSheetName(short,const class rtl::OUString &)
     short nTab
     0
-sc/inc/documentimport.hxx:124
+sc/inc/documentimport.hxx:129
     void ScDocumentImport::setRowsVisible(short,int,int,_Bool)
     _Bool bVisible
     0
-sc/inc/documentlinkmgr.hxx:65
+sc/inc/documentlinkmgr.hxx:66
     _Bool sc::DocumentLinkManager::hasDdeOrOleOrWebServiceLinks(_Bool,_Bool,_Bool) const
     _Bool bDde
     1
-sc/inc/dpdimsave.hxx:175
-    class rtl::OUString ScDPDimensionSaveData::CreateDateGroupDimName(int,const class ScDPObject &,_Bool,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > *)
+sc/inc/dpdimsave.hxx:179
+    class rtl::OUString ScDPDimensionSaveData::CreateDateGroupDimName(int,const class ScDPObject &,_Bool,const class std::vector<class rtl::OUString> *)
     _Bool bAllowSource
     1
-sc/inc/dpglobal.hxx:54
+sc/inc/dpglobal.hxx:53
     void ScDPValue::Set(double,enum ScDPValue::Type)
     enum ScDPValue::Type eT
     0
@@ -2362,328 +2554,396 @@ sc/inc/dpsave.hxx:230
     void ScDPSaveDimension::Dump(int) const
     int nIndent
     0
-sc/inc/dptabdat.hxx:131
+sc/inc/dptabdat.hxx:130
     const class ScDPItemData * ScDPTableData::GetMemberByIndex(int,int)
     int nIndex
     0
-sc/inc/dptabres.hxx:140
+sc/inc/dptabres.hxx:139
     void ScDPRelativePos::ScDPRelativePos(long,long)
     long nBase
     0
-sc/inc/drwlayer.hxx:103
-    void ScDrawLayer::ResizeLastRectFromAnchor(const class SdrObject *,class ScDrawObjData &,_Bool,_Bool,_Bool,_Bool)
-    _Bool bHiddenAsZero
-    1
-sc/inc/drwlayer.hxx:161
-    class tools::Rectangle ScDrawLayer::GetCellRect(const class ScDocument &,const class ScAddress &,_Bool)
-    _Bool bMergedCell
-    1
-sc/inc/filter.hxx:79
+sc/inc/filter.hxx:80
     class ErrCode ScFormatFilterPlugin::ScExportExcel5(class SfxMedium &,class ScDocument *,enum ExportFormatExcel,unsigned short)
     unsigned short eDest
     1
-sc/inc/filter.hxx:82
+sc/inc/filter.hxx:83
     void ScFormatFilterPlugin::ScExportHTML(class SvStream &,const class rtl::OUString &,class ScDocument *,const class ScRange &,const unsigned short,_Bool,const class rtl::OUString &,class rtl::OUString &,const class rtl::OUString &)
     const unsigned short eDest
     0
-sc/inc/filter.hxx:84
+sc/inc/filter.hxx:85
     void ScFormatFilterPlugin::ScExportRTF(class SvStream &,class ScDocument *,const class ScRange &,const unsigned short)
     const unsigned short eDest
     0
-sc/inc/formulacell.hxx:188
-    void ScFormulaCell::ScFormulaCell(class ScDocument &,const class ScAddress &,class std::unique_ptr<class ScTokenArray, struct std::default_delete<class ScTokenArray> >,const enum formula::FormulaGrammar::Grammar,enum ScMatrixMode)
+sc/inc/formulacell.hxx:204
+    void ScFormulaCell::ScFormulaCell(class ScDocument &,const class ScAddress &,class std::unique_ptr<class ScTokenArray>,const enum formula::FormulaGrammar::Grammar,enum ScMatrixMode)
     enum ScMatrixMode cMatInd
     0
-sc/inc/formulacell.hxx:222
-    class rtl::OUString ScFormulaCell::GetFormula(class sc::CompileFormulaContext &,const struct ScInterpreterContext *) const
-    const struct ScInterpreterContext * pContext
+sc/inc/formulacell.hxx:233
+    class rtl::OUString ScFormulaCell::GetFormula(class sc::CompileFormulaContext &,struct ScInterpreterContext *) const
+    struct ScInterpreterContext * pContext
+    0
+sc/inc/interpretercontext.hxx:72
+    unsigned int ScInterpreterContext::NFGetTimeFormat(double,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,_Bool) const
+    _Bool bForceDuration
+    1
+sc/inc/interpretercontext.hxx:105
+    class rtl::OUString ScInterpreterContext::NFGenerateFormat(unsigned int,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,_Bool,_Bool,unsigned short,unsigned short)
+    _Bool IsRed
     0
-sc/inc/markarr.hxx:57
+sc/inc/interpretercontext.hxx:105
+    class rtl::OUString ScInterpreterContext::NFGenerateFormat(unsigned int,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,_Bool,_Bool,unsigned short,unsigned short)
+    unsigned short nLeadingCnt
+    1
+sc/inc/markarr.hxx:55
     void ScMarkArray::Reset(_Bool,unsigned long)
     unsigned long nNeeded
     1
-sc/inc/miscuno.hxx:155
+sc/inc/miscuno.hxx:142
     short ScUnoHelpFunctions::GetShortProperty(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,short)
     short nDefault
     0
-sc/inc/miscuno.hxx:160
+sc/inc/miscuno.hxx:147
     type-parameter-?-? ScUnoHelpFunctions::GetEnumProperty(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,type-parameter-?-?)
     type-parameter-?-? nDefault
     0
-sc/inc/pivot.hxx:125
+sc/inc/patattr.hxx:184
+    void ScPatternAttr::fillColor(class model::ComplexColor &,enum ScAutoFontColorMode,const class SfxItemSet *,const class Color *,const class Color *) const
+    enum ScAutoFontColorMode eAutoMode
+    0
+sc/inc/patattr.hxx:184
+    void ScPatternAttr::fillColor(class model::ComplexColor &,enum ScAutoFontColorMode,const class SfxItemSet *,const class Color *,const class Color *) const
+    const class SfxItemSet * pCondSet
+    0
+sc/inc/patattr.hxx:184
+    void ScPatternAttr::fillColor(class model::ComplexColor &,enum ScAutoFontColorMode,const class SfxItemSet *,const class Color *,const class Color *) const
+    const class Color * pBackConfigColor
+    0
+sc/inc/patattr.hxx:184
+    void ScPatternAttr::fillColor(class model::ComplexColor &,enum ScAutoFontColorMode,const class SfxItemSet *,const class Color *,const class Color *) const
+    const class Color * pTextConfigColor
+    0
+sc/inc/pivot.hxx:124
     void ScPivotField::ScPivotField(short)
     short nNewCol
     0
-sc/inc/postit.hxx:167
+sc/inc/postit.hxx:64
     void ScPostIt::ScPostIt(class ScDocument &,const class ScAddress &,unsigned int)
     unsigned int nPostItId
     0
-sc/inc/queryparam.hxx:60
+sc/inc/queryiter.hxx:366
+    void ScQueryCellIteratorSortedCache::ScQueryCellIteratorSortedCache(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bMod
+    0
+sc/inc/queryiter.hxx:366
+    void ScQueryCellIteratorSortedCache::ScQueryCellIteratorSortedCache(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bReverse
+    0
+sc/inc/queryiter.hxx:416
+    void ScCountIfCellIteratorSortedCache::ScCountIfCellIteratorSortedCache(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bMod
+    0
+sc/inc/queryiter.hxx:416
+    void ScCountIfCellIteratorSortedCache::ScCountIfCellIteratorSortedCache(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bReverse
+    0
+sc/inc/queryparam.hxx:59
     struct ScQueryEntry * ScQueryParamBase::FindEntryByField(int,_Bool)
     _Bool bNew
     1
-sc/inc/rangeutl.hxx:52
-    _Bool ScRangeUtil::IsAbsTabArea(const class rtl::OUString &,const class ScDocument *,class std::unique_ptr<class ScArea [], struct std::default_delete<class ScArea []> > *,unsigned short *,_Bool,const struct ScAddress::Details &)
+sc/inc/rangeutl.hxx:58
+    _Bool ScRangeUtil::IsAbsTabArea(const class rtl::OUString &,const class ScDocument *,class std::unique_ptr<class ScArea[]> *,unsigned short *,_Bool,const struct ScAddress::Details &)
     _Bool bAcceptCellRef
     1
-sc/inc/rangeutl.hxx:120
-    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
+sc/inc/rangeutl.hxx:127
+    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
     enum formula::FormulaGrammar::AddressConvention eConv
     0
-sc/inc/rangeutl.hxx:144
-    _Bool ScRangeStringConverter::GetAreaFromString(class ScArea &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
+sc/inc/rangeutl.hxx:151
+    _Bool ScRangeStringConverter::GetAreaFromString(class ScArea &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
     enum formula::FormulaGrammar::AddressConvention eConv
     0
-sc/inc/rangeutl.hxx:178
+sc/inc/rangeutl.hxx:185
     void ScRangeStringConverter::GetStringFromRangeList(class rtl::OUString &,const class ScRangeList *,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t)
     enum formula::FormulaGrammar::AddressConvention eConv
     0
-sc/inc/rangeutl.hxx:185
+sc/inc/rangeutl.hxx:192
+    void ScRangeStringConverter::GetStringFromArea(class rtl::OUString &,const class ScArea &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
+    enum formula::FormulaGrammar::AddressConvention eConv
+    0
+sc/inc/rangeutl.hxx:192
     void ScRangeStringConverter::GetStringFromArea(class rtl::OUString &,const class ScArea &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
     _Bool bAppendStr
     1
-sc/inc/rangeutl.hxx:185
-    void ScRangeStringConverter::GetStringFromArea(class rtl::OUString &,const class ScArea &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
+sc/inc/rangeutl.hxx:202
+    void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString &,const struct com::sun::star::table::CellAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool)
     enum formula::FormulaGrammar::AddressConvention eConv
     0
-sc/inc/rangeutl.hxx:195
+sc/inc/rangeutl.hxx:202
     void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString &,const struct com::sun::star::table::CellAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool)
     _Bool bAppendStr
     0
-sc/inc/rangeutl.hxx:195
-    void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString &,const struct com::sun::star::table::CellAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool)
-    enum formula::FormulaGrammar::AddressConvention eConv
-    0
-sc/inc/rangeutl.hxx:210
+sc/inc/rangeutl.hxx:217
     void ScRangeStringConverter::GetStringFromRangeList(class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::table::CellRangeAddress> &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t)
     enum formula::FormulaGrammar::AddressConvention eConv
     0
-sc/inc/scabstdlg.hxx:462
-    class VclPtr<class AbstractScMetricInputDlg> ScAbstractDialogFactory::CreateScMetricInputDlg(class weld::Window *,const class rtl::OString &,long,long,enum FieldUnit,unsigned short,long,long)
+sc/inc/scabstdlg.hxx:297
+    void AbstractScDPFunctionDlg::Response(int)
+    int nResponse
+    0
+sc/inc/scabstdlg.hxx:307
+    void AbstractScDPSubtotalDlg::Response(int)
+    int nResponse
+    0
+sc/inc/scabstdlg.hxx:477
+    class VclPtr<class AbstractScMetricInputDlg> ScAbstractDialogFactory::CreateScMetricInputDlg(class weld::Window *,const class rtl::OUString &,long,long,enum FieldUnit,unsigned short,long,long)
     long nMinimum
     0
-sc/inc/scmatrix.hxx:150
-    void ScMatrix::IterateResult::IterateResult(double,double,unsigned long)
+sc/inc/scmatrix.hxx:153
+    void ScMatrix::IterateResult::IterateResult<tRes>(type-parameter-?-?,unsigned long)
     unsigned long nCount
     0
-sc/inc/scmatrix.hxx:330
+sc/inc/scmatrix.hxx:338
     _Bool ScMatrix::IsEmptyResult(unsigned long,unsigned long) const
     unsigned long nC
     0
-sc/inc/scmatrix.hxx:330
+sc/inc/scmatrix.hxx:338
     _Bool ScMatrix::IsEmptyResult(unsigned long,unsigned long) const
     unsigned long nR
     0
-sc/inc/scmatrix.hxx:369
+sc/inc/scmatrix.hxx:377
     unsigned long ScMatrix::MatchDoubleInColumns(double,unsigned long,unsigned long) const
     unsigned long nCol1
     0
-sc/inc/scmatrix.hxx:369
+sc/inc/scmatrix.hxx:377
     unsigned long ScMatrix::MatchDoubleInColumns(double,unsigned long,unsigned long) const
     unsigned long nCol2
     0
-sc/inc/scmatrix.hxx:370
+sc/inc/scmatrix.hxx:378
     unsigned long ScMatrix::MatchStringInColumns(const class svl::SharedString &,unsigned long,unsigned long) const
     unsigned long nCol1
     0
-sc/inc/scmatrix.hxx:370
+sc/inc/scmatrix.hxx:378
     unsigned long ScMatrix::MatchStringInColumns(const class svl::SharedString &,unsigned long,unsigned long) const
     unsigned long nCol2
     0
-sc/inc/scopetools.hxx:53
+sc/inc/scopetools.hxx:57
     void sc::UndoSwitch::UndoSwitch(class ScDocument &,_Bool)
     _Bool bUndo
     1
-sc/inc/scopetools.hxx:62
+sc/inc/scopetools.hxx:67
     void sc::IdleSwitch::IdleSwitch(class ScDocument &,_Bool)
     _Bool bEnableIdle
     0
-sc/inc/scopetools.hxx:72
+sc/inc/scopetools.hxx:78
     void sc::DelayFormulaGroupingSwitch::DelayFormulaGroupingSwitch(class ScDocument &,_Bool)
     _Bool delay
     1
-sc/inc/stringutil.hxx:154
+sc/inc/simpleformulacalc.hxx:38
+    void ScSimpleFormulaCalculator::ScSimpleFormulaCalculator(class ScDocument &,const class ScAddress &,const class rtl::OUString &,_Bool,enum formula::FormulaGrammar::Grammar)
+    _Bool bMatrixFormula
+    1
+sc/inc/stringutil.hxx:158
     class rtl::OUString ScStringUtil::GetQuotedToken(const class rtl::OUString &,int,const class rtl::OUString &,char16_t,int &)
     int nToken
     0
-sc/inc/table.hxx:785
+sc/inc/table.hxx:853
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nStartRow
     0
-sc/inc/table.hxx:901
+sc/inc/table.hxx:977
     _Bool ScTable::RowHiddenLeaf(int,int *,int *) const
     int * pFirstRow
     0
-sc/inc/table.hxx:906
+sc/inc/table.hxx:982
     void ScTable::CopyColHidden(const class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:907
+sc/inc/table.hxx:983
     void ScTable::CopyRowHidden(const class ScTable &,int,int)
     int nStartRow
     0
-sc/inc/table.hxx:917
+sc/inc/table.hxx:995
     _Bool ScTable::ColFiltered(short,short *,short *) const
     short * pFirstCol
     0
-sc/inc/table.hxx:919
+sc/inc/table.hxx:997
     void ScTable::CopyColFiltered(const class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:920
+sc/inc/table.hxx:998
     void ScTable::CopyRowFiltered(const class ScTable &,int,int)
     int nStartRow
     0
-sc/inc/token.hxx:268
+sc/inc/token.hxx:267
     void ScRefListToken::ScRefListToken(_Bool)
     _Bool bArrayResult
     1
-sc/inc/types.hxx:107
+sc/inc/typedstrdata.hxx:37
+    void ScTypedStrData::ScTypedStrData(const class rtl::OUString &,double,double,enum ScTypedStrData::StringType,_Bool,_Bool)
+    _Bool bDate
+    0
+sc/inc/typedstrdata.hxx:37
+    void ScTypedStrData::ScTypedStrData(const class rtl::OUString &,double,double,enum ScTypedStrData::StringType,_Bool,_Bool)
+    _Bool bIsHiddenByFilter
+    0
+sc/inc/types.hxx:106
     void sc::MultiDataCellState::MultiDataCellState(enum sc::MultiDataCellState::StateType)
     enum sc::MultiDataCellState::StateType eState
     1
-sc/qa/extras/new_cond_format.cxx:183
+sc/qa/extras/new_cond_format.cxx:173
     void testShowValue(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool)
     _Bool bShowVal
     1
-sc/qa/extras/scpdfexport.cxx:51
+sc/qa/extras/scpdfexport.cxx:55
     void ScPDFExportTest::setFont(class ScFieldEditEngine &,int,int,const class rtl::OUString &)
     int nStart
     0
-sc/qa/unit/copy_paste_test.cxx:69
-    class tools::SvRef<class ScDocShell> ScCopyPasteTest::loadDocAndSetupModelViewController(const class rtl::OUString &,int,_Bool)
-    _Bool bReadWrite
-    1
-sc/qa/unit/copy_paste_test.cxx:69
-    class tools::SvRef<class ScDocShell> ScCopyPasteTest::loadDocAndSetupModelViewController(const class rtl::OUString &,int,_Bool)
-    int nFormat
-    0
-sc/qa/unit/copy_paste_test.cxx:443
+sc/qa/unit/copy_paste_test.cxx:298
     enum ScMF lcl_getMergeFlagOfCell(const class ScDocument &,short,int,short)
     short nTab
     0
-sc/qa/unit/copy_paste_test.cxx:450
+sc/qa/unit/copy_paste_test.cxx:305
     class ScAddress lcl_getMergeSizeOfCell(const class ScDocument &,short,int,short)
     short nTab
     0
-sc/qa/unit/helper/qahelper.hxx:196
-    class tools::SvRef<class ScDocShell> ScBootstrapFixture::saveAndReloadPassword(class ScDocShell *,int)
-    int nFormat
+sc/qa/unit/helper/qahelper.hxx:128
+    void ScUcalcTestBase::printFormula(class ScDocument *,short,int,short,const char *)
+    short nTab
+    0
+sc/qa/unit/helper/qahelper.hxx:128
+    void ScUcalcTestBase::printFormula(class ScDocument *,short,int,short,const char *)
+    const char * pCaption
     0
-sc/qa/unit/helper/qahelper.hxx:216
-    void testFormats(class ScBootstrapFixture *,class ScDocument *,int)
-    int nFormat
+sc/qa/unit/helper/qahelper.hxx:135
+    void ScUcalcTestBase::clearSheet(class ScDocument *,short)
+    short nTab
     0
-sc/qa/unit/mark_test.cxx:129
+sc/qa/unit/mark_test.cxx:133
     void Test::testScMarkArraySearch_check(const class ScMarkArray &,int,_Bool,unsigned long)
     _Bool expectStatus
     1
-sc/qa/unit/opencl-test.cxx:506
-    _Bool ScOpenCLTest::initTestEnv(const class rtl::OUString &,int,_Bool)
-    _Bool bReadWrite
-    0
-sc/qa/unit/parallelism.cxx:76
-    class ScUndoCut * ScParallelismTest::cutToClip(class ScDocShell &,const class ScRange &,class ScDocument *,_Bool)
-    _Bool bCreateUndo
-    0
-sc/qa/unit/scshapetest.cxx:46
-    class rtl::OUString lcl_compareRectWithTolerance(const class tools::Rectangle &,const class tools::Rectangle &,const int)
-    const int nTolerance
-    1
-sc/qa/unit/subsequent_export-test.cxx:1528
+sc/qa/unit/subsequent_export_test.cxx:1151
     void setAttribute(class ScFieldEditEngine &,int,int,int,unsigned short,class Color)
     int nPara
     0
-sc/qa/unit/subsequent_export-test.cxx:1585
+sc/qa/unit/subsequent_export_test.cxx:1208
     void setFont(class ScFieldEditEngine &,int,int,int,const class rtl::OUString &)
     int nPara
     0
-sc/qa/unit/subsequent_export-test.cxx:1598
+sc/qa/unit/subsequent_export_test.cxx:1223
     void setEscapement(class ScFieldEditEngine &,int,int,int,short,unsigned char)
     int nPara
     0
-sc/qa/unit/ucalc.hxx:51
-    void Test::clearSheet(class ScDocument *,short)
-    short nTab
+sc/qa/unit/tiledrendering/tiledrendering.cxx:432
+    class tools::Rectangle (anonymous namespace)::TextSelectionMessage::getBounds(unsigned long)
+    unsigned long nIndex
     0
-sc/source/core/data/dociter.cxx:1277
-    void BoolResetter::BoolResetter(_Bool &,_Bool)
-    _Bool b
+sc/qa/unit/ucalc_copypaste.cxx:49
+    void TestCopyPaste::executeCopyPasteSpecial(_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,enum ScClipParam::Direction,enum TestCopyPaste::CalcMode,enum InsertDeleteFlags)
+    _Bool bAsLink
+    0
+sc/qa/unit/ucalc_copypaste.cxx:49
+    void TestCopyPaste::executeCopyPasteSpecial(_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,enum ScClipParam::Direction,enum TestCopyPaste::CalcMode,enum InsertDeleteFlags)
+    _Bool bCut
+    0
+sc/qa/unit/ucalc_copypaste.cxx:56
+    void TestCopyPaste::executeCopyPasteSpecial(const short,const short,_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,class std::unique_ptr<class ScUndoCut> &,class std::unique_ptr<class ScUndoPaste> &,_Bool,enum ScClipParam::Direction,enum TestCopyPaste::CalcMode,enum InsertDeleteFlags)
+    const short srcSheet
+    0
+sc/qa/unit/ucalc_copypaste.cxx:56
+    void TestCopyPaste::executeCopyPasteSpecial(const short,const short,_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,class std::unique_ptr<class ScUndoCut> &,class std::unique_ptr<class ScUndoPaste> &,_Bool,enum ScClipParam::Direction,enum TestCopyPaste::CalcMode,enum InsertDeleteFlags)
+    const short destSheet
+    1
+sc/qa/unit/ucalc_copypaste.cxx:79
+    void TestCopyPaste::executeReferencedCutRangesRow(const _Bool,const short,const short,const _Bool,class std::unique_ptr<class ScUndoCut> &,class std::unique_ptr<class ScUndoPaste> &)
+    const _Bool bUndo
+    1
+sc/qa/unit/ucalc_copypaste.cxx:84
+    void TestCopyPaste::checkReferencedCutRangesRow(const short,const short)
+    const short nSrcTab
+    0
+sc/qa/unit/ucalc_copypaste.cxx:86
+    void TestCopyPaste::executeReferencedCutRangesCol(const _Bool,const short,const short,const _Bool,class std::unique_ptr<class ScUndoCut> &,class std::unique_ptr<class ScUndoPaste> &)
+    const _Bool bUndo
     1
-sc/source/core/data/drwlayer.cxx:2150
+sc/qa/unit/ucalc_copypaste.cxx:92
+    void TestCopyPaste::checkReferencedCutRangesCol(const short,const short)
+    const short nSrcTab
+    0
+sc/qa/unit/ucalc_copypaste.cxx:99
+    void TestCopyPaste::prepareUndoAfterPaste(class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> > &,class std::unique_ptr<class ScDocument> &,const class ScMarkData &,const class ScRange &,class std::unique_ptr<class ScRefUndoData> &,class std::unique_ptr<class ScUndoPaste> &,_Bool,_Bool,_Bool,enum ScPasteFunc,enum InsCellCmd)
+    enum ScPasteFunc nFunction
+    0
+sc/qa/unit/ucalc_sort.cxx:1974
+    void (anonymous namespace)::TestQueryIterator::TestQueryIterator(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    short nTable
+    0
+sc/qa/unit/ucalc_sort.cxx:1974
+    void (anonymous namespace)::TestQueryIterator::TestQueryIterator(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bMod
+    0
+sc/qa/unit/ucalc_sort.cxx:1974
+    void (anonymous namespace)::TestQueryIterator::TestQueryIterator(class ScDocument &,struct ScInterpreterContext &,short,const struct ScQueryParam &,_Bool,_Bool)
+    _Bool bReverse
+    0
+sc/source/core/data/drwlayer.cxx:2534
     void DeleteFirstUserDataOfType(class SdrObject *,unsigned short)
     unsigned short nId
     1
-sc/source/core/data/postit.cxx:410
-    void (anonymous namespace)::ScNoteCaptionCreator::ScNoteCaptionCreator(class ScDocument &,const class ScAddress &,class ScCaptionPtr &,_Bool)
+sc/source/core/data/postit.cxx:369
+    void (anonymous namespace)::ScNoteCaptionCreator::ScNoteCaptionCreator(class ScDocument &,const class ScAddress &,class rtl::Reference<class SdrCaptionObj> &,_Bool)
     _Bool bShown
     1
-sc/source/core/inc/interpre.hxx:159
-    _Bool ScInterpreter::MayBeRegExp(const class rtl::OUString &,_Bool)
-    _Bool bIgnoreWildcards
-    0
-sc/source/core/inc/interpre.hxx:440
+sc/source/core/inc/interpre.hxx:491
     int ScInterpreter::GetInt32WithDefault(int)
     int nDefault
     1
-sc/source/core/opencl/formulagroupcl.cxx:1071
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowDeclRef(_Bool) const
-    _Bool nested
+sc/source/core/opencl/opbase.hxx:375
+    void sc::opencl::SlidingFunctionBase::GenerateArgWithDefault(const char *,int,double,class std::vector<class std::shared_ptr<class sc::opencl::DynamicKernelArgument> > &,class sc::opencl::outputstream &,enum sc::opencl::SlidingFunctionBase::EmptyArgType)
+    enum sc::opencl::SlidingFunctionBase::EmptyArgType empty
     0
-sc/source/core/opencl/opbase.hxx:129
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::DynamicKernelArgument::GenDoubleSlidingWindowDeclRef(_Bool) const
-    _Bool 
+sc/source/core/opencl/opbase.hxx:401
+    void sc::opencl::SlidingFunctionBase::GenerateRangeArgElement(const char *,int,const char *,class std::vector<class std::shared_ptr<class sc::opencl::DynamicKernelArgument> > &,class sc::opencl::outputstream &,enum sc::opencl::SlidingFunctionBase::EmptyArgType)
+    enum sc::opencl::SlidingFunctionBase::EmptyArgType empty
     0
-sc/source/core/opencl/opbase.hxx:132
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::DynamicKernelArgument::GenStringSlidingWindowDeclRef(_Bool) const
-    _Bool 
+sc/source/core/opencl/opbase.hxx:449
+    class std::basic_string<char> sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowDeclRef(_Bool) const
+    _Bool nested
     0
-sc/source/core/tool/compiler.cxx:791
+sc/source/core/tool/compiler.cxx:810
     void (anonymous namespace)::ConventionOOO_A1::ConventionOOO_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     1
-sc/source/core/tool/interpr1.cxx:4726
-    void lcl_GetLastMatch(unsigned long &,const class (anonymous namespace)::VectorMatrixAccessor &,unsigned long,_Bool)
-    _Bool bReverse
-    0
-sc/source/core/tool/scmatrix.cxx:3331
-    double matop::(anonymous namespace)::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
-    type-parameter-?-? aOp
-    0
-sc/source/core/tool/scmatrix.cxx:3331
-    double matop::(anonymous namespace)::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
-    double b
-    0
-sc/source/filter/excel/xeformula.cxx:389
+sc/source/filter/excel/xeformula.cxx:390
     void XclExpFmlaCompImpl::ConvertRefData(struct ScComplexRefData &,struct XclRange &,_Bool) const
     _Bool bNatLangRef
     0
-sc/source/filter/excel/xeformula.cxx:407
+sc/source/filter/excel/xeformula.cxx:408
     void XclExpFmlaCompImpl::Append(unsigned char,unsigned long)
     unsigned char nData
     0
-sc/source/filter/excel/xeformula.cxx:409
+sc/source/filter/excel/xeformula.cxx:410
     void XclExpFmlaCompImpl::Append(unsigned int)
     unsigned int nData
     0
-sc/source/filter/excel/xeformula.cxx:449
+sc/source/filter/excel/xeformula.cxx:450
     void XclExpFmlaCompImpl::AppendExt(unsigned char,unsigned long)
     unsigned char nData
     0
-sc/source/filter/excel/xihelper.cxx:141
-    class std::unique_ptr<class EditTextObject, struct std::default_delete<class EditTextObject> > lclCreateTextObject(const class XclImpRoot &,const class XclImpString &,enum XclFontItemType,unsigned short)
+sc/source/filter/excel/xihelper.cxx:149
+    class std::unique_ptr<class EditTextObject> lclCreateTextObject(const class XclImpRoot &,const class XclImpString &,enum XclFontItemType,unsigned short)
     enum XclFontItemType eType
     1
-sc/source/filter/html/htmlpars.cxx:1642
+sc/source/filter/html/htmlpars.cxx:1805
     type-parameter-?-? getLimitedValue(const type-parameter-?-? &,const type-parameter-?-? &,const type-parameter-?-? &)
     const type-parameter-?-? & rMin
     1
 sc/source/filter/inc/addressconverter.hxx:145
-    _Bool oox::xls::AddressConverter::parseOoxRange2d(int &,int &,int &,int &,const class rtl::OUString &,int)
+    _Bool oox::xls::AddressConverter::parseOoxRange2d(int &,int &,int &,int &,class std::basic_string_view<char16_t>,int)
     int nStart
     0
 sc/source/filter/inc/addressconverter.hxx:234
-    _Bool oox::xls::AddressConverter::convertToCellAddress(class ScAddress &,const char *,short,_Bool)
+    _Bool oox::xls::AddressConverter::convertToCellAddress(class ScAddress &,class std::basic_string_view<char>,short,_Bool)
     _Bool bTrackOverflow
     1
 sc/source/filter/inc/addressconverter.hxx:245
@@ -2691,7 +2951,7 @@ sc/source/filter/inc/addressconverter.hxx:245
     _Bool bTrackOverflow
     0
 sc/source/filter/inc/addressconverter.hxx:375
-    _Bool oox::xls::AddressConverter::convertToCellRange(class ScRange &,const class rtl::OUString &,short,_Bool,_Bool)
+    _Bool oox::xls::AddressConverter::convertToCellRange(class ScRange &,class std::basic_string_view<char16_t>,short,_Bool,_Bool)
     _Bool bAllowOverflow
     1
 sc/source/filter/inc/addressconverter.hxx:415
@@ -2703,10 +2963,14 @@ sc/source/filter/inc/addressconverter.hxx:431
     _Bool bTrackOverflow
     0
 sc/source/filter/inc/autofilterbuffer.hxx:51
-    void oox::xls::ApiFilterSettings::appendField(_Bool,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
+    void oox::xls::ApiFilterSettings::appendField(_Bool,int,_Bool)
+    _Bool bAnd
+    1
+sc/source/filter/inc/autofilterbuffer.hxx:52
+    void oox::xls::ApiFilterSettings::appendField(_Bool,const class std::vector<struct std::pair<class rtl::OUString, _Bool> > &)
     _Bool bAnd
     1
-sc/source/filter/inc/excrecds.hxx:180
+sc/source/filter/inc/excrecds.hxx:179
     void XclExpSheetProtection::XclExpSheetProtection(_Bool,short)
     _Bool bValue
     1
@@ -2714,59 +2978,59 @@ sc/source/filter/inc/formel.hxx:101
     enum ConvErr ExcelConverterBase::Convert(class ScRangeListTabs &,class XclImpStream &,unsigned long,short,const enum FORMULA_TYPE)
     const enum FORMULA_TYPE eFT
     1
-sc/source/filter/inc/formulabase.hxx:641
+sc/source/filter/inc/formulabase.hxx:640
     class rtl::OUString oox::xls::FormulaProcessorBase::generateAddress2dString(const class ScAddress &,_Bool)
     _Bool bAbsolute
     0
-sc/source/filter/inc/formulabase.hxx:773
+sc/source/filter/inc/formulabase.hxx:763
     void oox::xls::FormulaProcessorBase::convertStringToStringList(class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> &,char16_t,_Bool) const
     _Bool bTrimLeadingSpaces
     1
-sc/source/filter/inc/ftools.hxx:197
+sc/source/filter/inc/ftools.hxx:199
     class ScStyleSheet & ScfTools::MakeCellStyleSheet(class ScStyleSheetPool &,const class rtl::OUString &,_Bool)
     _Bool bForceName
     1
-sc/source/filter/inc/ftools.hxx:204
+sc/source/filter/inc/ftools.hxx:206
     class ScStyleSheet & ScfTools::MakePageStyleSheet(class ScStyleSheetPool &,const class rtl::OUString &,_Bool)
     _Bool bForceName
     0
-sc/source/filter/inc/htmlpars.hxx:189
-    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
-    unsigned short nOffsetTol
-    0
-sc/source/filter/inc/htmlpars.hxx:189
-    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
+sc/source/filter/inc/htmlpars.hxx:193
+    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long> *,unsigned short,unsigned short,unsigned short,unsigned short)
     unsigned short nWidth
     0
-sc/source/filter/inc/htmlpars.hxx:189
-    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
+sc/source/filter/inc/htmlpars.hxx:193
+    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long> *,unsigned short,unsigned short,unsigned short,unsigned short)
+    unsigned short nOffsetTol
+    0
+sc/source/filter/inc/htmlpars.hxx:193
+    void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long> *,unsigned short,unsigned short,unsigned short,unsigned short)
     unsigned short nWidthTol
     0
-sc/source/filter/inc/tool.h:36
+sc/source/filter/inc/tool.h:37
     void SetFormat(struct LotusContext &,short,int,short,unsigned char,unsigned char)
     short nTab
     0
-sc/source/filter/inc/workbookhelper.hxx:160
+sc/source/filter/inc/workbookhelper.hxx:211
     class com::sun::star::uno::Reference<class com::sun::star::style::XStyle> oox::xls::WorkbookHelper::getStyleObject(const class rtl::OUString &,_Bool) const
     _Bool bPageStyle
     1
-sc/source/filter/inc/workbookhelper.hxx:199
+sc/source/filter/inc/workbookhelper.hxx:251
     class com::sun::star::uno::Reference<class com::sun::star::style::XStyle> oox::xls::WorkbookHelper::createStyleObject(class rtl::OUString &,_Bool) const
     _Bool bPageStyle
     1
-sc/source/filter/inc/xechart.hxx:197
+sc/source/filter/inc/xechart.hxx:196
     void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
     enum XclFutureRecType eRecType
     1
-sc/source/filter/inc/xechart.hxx:338
+sc/source/filter/inc/xechart.hxx:337
     void XclExpChFrameBase::SetDefaultFrameBase(const class XclExpChRoot &,enum XclChFrameType,_Bool)
     enum XclChFrameType eDefFrameType
     1
-sc/source/filter/inc/xechart.hxx:366
+sc/source/filter/inc/xechart.hxx:365
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
     _Bool bAutoPos
     0
-sc/source/filter/inc/xechart.hxx:366
+sc/source/filter/inc/xechart.hxx:365
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
     _Bool bAutoSize
     0
@@ -2774,58 +3038,62 @@ sc/source/filter/inc/xeextlst.hxx:200
     class XclExpExt * XclExtLst::GetItem(enum XclExpExtType)
     enum XclExpExtType eType
     0
-sc/source/filter/inc/xehelper.hxx:107
+sc/source/filter/inc/xehelper.hxx:109
     struct XclAddress XclExpAddressConverter::CreateValidAddress(const class ScAddress &,_Bool)
     _Bool bWarn
     0
-sc/source/filter/inc/xehelper.hxx:147
+sc/source/filter/inc/xehelper.hxx:149
     void XclExpAddressConverter::ValidateRangeList(class ScRangeList &,_Bool)
     _Bool bWarn
     0
-sc/source/filter/inc/xehelper.hxx:279
+sc/source/filter/inc/xehelper.hxx:281
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateCellString(const class XclExpRoot &,const class rtl::OUString &,const class ScPatternAttr *,enum XclStrFlags,unsigned short)
     enum XclStrFlags nFlags
     0
-sc/source/filter/inc/xehelper.hxx:295
+sc/source/filter/inc/xehelper.hxx:297
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateCellString(const class XclExpRoot &,const class EditTextObject &,const class ScPatternAttr *,class XclExpHyperlinkHelper &,enum XclStrFlags,unsigned short)
     enum XclStrFlags nFlags
     0
-sc/source/filter/inc/xehelper.hxx:309
+sc/source/filter/inc/xehelper.hxx:311
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,const class SdrTextObj &,enum XclStrFlags)
     enum XclStrFlags nFlags
     0
-sc/source/filter/inc/xehelper.hxx:318
+sc/source/filter/inc/xehelper.hxx:320
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,const class EditTextObject &,enum XclStrFlags)
     enum XclStrFlags nFlags
     0
-sc/source/filter/inc/xepivot.hxx:271
-    unsigned short XclExpPTField::GetItemIndex(const class rtl::OUString &,unsigned short) const
+sc/source/filter/inc/xepivot.hxx:270
+    unsigned short XclExpPTField::GetItemIndex(class std::basic_string_view<char16_t>,unsigned short) const
     unsigned short nDefaultIdx
     0
-sc/source/filter/inc/xestream.hxx:299
+sc/source/filter/inc/xestream.hxx:300
     void XclExpXmlStream::WriteAttributes(int,type-parameter-?-? &&,type-parameter-?-? &&...)
      ###27
     0
-sc/source/filter/inc/xestring.hxx:74
+sc/source/filter/inc/xestring.hxx:78
     void XclExpString::Assign(char16_t)
     char16_t cChar
     0
-sc/source/filter/inc/xestring.hxx:103
+sc/source/filter/inc/xestring.hxx:107
     void XclExpString::AppendTrailingFormat(unsigned short)
     unsigned short nFontIdx
     0
-sc/source/filter/inc/xestring.hxx:141
+sc/source/filter/inc/xestring.hxx:145
     unsigned short XclExpString::GetChar(unsigned short) const
     unsigned short nCharIdx
     0
-sc/source/filter/inc/xestyle.hxx:225
-    unsigned short XclExpFontBuffer::Insert(const class SvxFont &,enum XclExpColorType)
+sc/source/filter/inc/xestyle.hxx:224
+    unsigned short XclExpFontBuffer::Insert(const class SvxFont &,const class model::ComplexColor &,enum XclExpColorType)
     enum XclExpColorType eColorType
     0
-sc/source/filter/inc/xestyle.hxx:231
+sc/source/filter/inc/xestyle.hxx:229
     unsigned short XclExpFontBuffer::Insert(const class SfxItemSet &,short,enum XclExpColorType,_Bool)
     enum XclExpColorType eColorType
     0
+sc/source/filter/inc/xestyle.hxx:389
+    void XclExpCellArea::XclExpCellArea(class Color,class Color)
+    class Color aBackColor
+    0
 sc/source/filter/inc/xetable.hxx:333
     void XclExpSingleCellBase::XclExpSingleCellBase(unsigned short,unsigned long,const struct XclAddress &,unsigned int)
     unsigned long nContSize
@@ -2834,227 +3102,231 @@ sc/source/filter/inc/xetable.hxx:336
     void XclExpSingleCellBase::XclExpSingleCellBase(const class XclExpRoot &,unsigned short,unsigned long,const struct XclAddress &,const class ScPatternAttr *,short,unsigned int)
     short nScript
     1
-sc/source/filter/inc/xiescher.hxx:479
+sc/source/filter/inc/xiescher.hxx:481
     void XclImpControlHelper::ReadSourceRangeFormula(class XclImpStream &,_Bool)
     _Bool bWithBoundSize
     1
-sc/source/filter/inc/xihelper.hxx:70
+sc/source/filter/inc/xihelper.hxx:69
     class ScAddress XclImpAddressConverter::CreateValidAddress(const struct XclAddress &,short,_Bool)
     _Bool bWarn
     0
-sc/source/filter/inc/xipage.hxx:59
+sc/source/filter/inc/xipage.hxx:58
     void XclImpPageSettings::SetPaperSize(unsigned short,_Bool)
-    _Bool bPortrait
+    unsigned short nXclPaperSize
     0
-sc/source/filter/inc/xipage.hxx:59
+sc/source/filter/inc/xipage.hxx:58
     void XclImpPageSettings::SetPaperSize(unsigned short,_Bool)
-    unsigned short nXclPaperSize
+    _Bool bPortrait
     0
 sc/source/filter/inc/xladdress.hxx:63
     void XclRange::XclRange(enum ScAddress::Uninitialized)
     enum ScAddress::Uninitialized e
     0
-sc/source/filter/inc/xlescher.hxx:294
+sc/source/filter/inc/xlescher.hxx:293
     class tools::Rectangle XclObjAnchor::GetRect(const class XclRoot &,short,enum MapUnit) const
     enum MapUnit eMapUnit
     0
-sc/source/filter/inc/xlformula.hxx:381
+sc/source/filter/inc/xlformula.hxx:380
     void XclTokenArray::XclTokenArray(_Bool)
     _Bool bVolatile
     0
-sc/source/filter/inc/xlformula.hxx:443
+sc/source/filter/inc/xlformula.hxx:442
     void XclTokenArrayIterator::XclTokenArrayIterator(const class ScTokenArray &,_Bool)
     _Bool bSkipSpaces
     1
-sc/source/filter/inc/xlformula.hxx:445
+sc/source/filter/inc/xlformula.hxx:444
     void XclTokenArrayIterator::XclTokenArrayIterator(const class XclTokenArrayIterator &,_Bool)
     _Bool bSkipSpaces
     1
-sc/source/filter/inc/xltools.hxx:62
+sc/source/filter/inc/xlstyle.hxx:550
+    void XclCellArea::XclCellArea(unsigned char)
+    unsigned char nPattern
+    1
+sc/source/filter/inc/xltools.hxx:64
     void XclGuid::XclGuid(unsigned int,unsigned short,unsigned short,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
     unsigned char nData43
     0
-sc/source/filter/inc/xltools.hxx:62
+sc/source/filter/inc/xltools.hxx:64
     void XclGuid::XclGuid(unsigned int,unsigned short,unsigned short,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
     unsigned char nData45
     0
-sc/source/filter/inc/xltools.hxx:109
-    int XclTools::GetScRotation(unsigned short,int)
-    int nRotForStacked
-    0
-sc/source/filter/oox/formulaparser.cxx:463
+sc/source/filter/oox/formulaparser.cxx:464
     struct com::sun::star::sheet::FormulaToken & oox::xls::FormulaParserImpl::getOperandToken(unsigned long,unsigned long)
     unsigned long nOpIndex
     0
-sc/source/filter/oox/formulaparser.cxx:463
+sc/source/filter/oox/formulaparser.cxx:464
     struct com::sun::star::sheet::FormulaToken & oox::xls::FormulaParserImpl::getOperandToken(unsigned long,unsigned long)
     unsigned long nTokenIndex
     0
 sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx:75
-    void ScMyGenerated::ScMyGenerated(class ScBigRange,unsigned int,class std::unique_ptr<struct ScMyCellInfo, struct std::default_delete<struct ScMyCellInfo> >)
+    void ScMyGenerated::ScMyGenerated(class ScBigRange,unsigned int,class std::unique_ptr<struct ScMyCellInfo>)
     unsigned int id
     0
-sc/source/filter/xml/XMLExportSharedData.hxx:69
+sc/source/filter/xml/XMLExportSharedData.hxx:68
     void ScMySharedData::SetDrawPageHasForms(const int,_Bool)
     _Bool bHasForms
     1
-sc/source/ui/dbgui/csvgrid.cxx:57
+sc/source/ui/dbgui/csvgrid.cxx:60
     void (anonymous namespace)::Func_SetType::Func_SetType(int)
     int nType
     0
-sc/source/ui/dbgui/csvgrid.cxx:65
+sc/source/ui/dbgui/csvgrid.cxx:68
     void (anonymous namespace)::Func_Select::Func_Select(_Bool)
     _Bool bSelect
     0
-sc/source/ui/inc/AccessibleDocument.hxx:249
+sc/source/ui/inc/AccessibleDocument.hxx:246
     void ScAccessibleDocument::RemoveChild(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,_Bool)
     _Bool bFireEvent
     1
-sc/source/ui/inc/AccessibleEditObject.hxx:56
+sc/source/ui/inc/AccessibleEditObject.hxx:55
     void ScAccessibleEditObject::ScAccessibleEditObject(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class EditView *,class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,enum ScAccessibleEditObject::EditObjectType)
     enum ScAccessibleEditObject::EditObjectType eObjectType
     0
-sc/source/ui/inc/acredlin.hxx:118
-    class std::unique_ptr<class weld::TreeIter, struct std::default_delete<class weld::TreeIter> > ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,_Bool,const class weld::TreeIter *,_Bool,_Bool)
+sc/source/ui/inc/acredlin.hxx:119
+    class std::unique_ptr<class weld::TreeIter> ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,_Bool,const class weld::TreeIter *,_Bool,_Bool)
     _Bool bDelMaster
     0
-sc/source/ui/inc/acredlin.hxx:118
-    class std::unique_ptr<class weld::TreeIter, struct std::default_delete<class weld::TreeIter> > ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,_Bool,const class weld::TreeIter *,_Bool,_Bool)
+sc/source/ui/inc/acredlin.hxx:119
+    class std::unique_ptr<class weld::TreeIter> ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,_Bool,const class weld::TreeIter *,_Bool,_Bool)
     _Bool bDisabled
     0
-sc/source/ui/inc/anyrefdg.hxx:74
+sc/source/ui/inc/anyrefdg.hxx:71
     void ScFormulaReferenceHelper::EnableSpreadsheets(_Bool)
     _Bool bFlag
     1
-sc/source/ui/inc/anyrefdg.hxx:147
-    void ScRefHdlrControllerImpl::ScRefHdlrControllerImpl<TBase, bBindRef>(class weld::Window *,const class rtl::OUString &,const class rtl::OString &,const class SfxItemSet *,class SfxBindings *)
+sc/source/ui/inc/anyrefdg.hxx:144
+    void ScRefHdlrControllerImpl::ScRefHdlrControllerImpl<TBase, bBindRef>(class weld::Window *,const class rtl::OUString &,const class rtl::OUString &,const class SfxItemSet *,class SfxBindings *)
     class SfxBindings * pB
     0
-sc/source/ui/inc/cliputil.hxx:23
-    void PasteFromClipboard(class ScViewData *,class ScTabViewShell *,_Bool)
+sc/source/ui/inc/cliputil.hxx:24
+    void PasteFromClipboard(class ScViewData &,class ScTabViewShell *,_Bool)
     _Bool bShowDialog
     1
-sc/source/ui/inc/datatransformation.hxx:149
-    void sc::NumberTransformation::NumberTransformation(const class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,const enum sc::NUMBER_TRANSFORM_TYPE,int)
+sc/source/ui/inc/datatransformation.hxx:151
+    void sc::NumberTransformation::NumberTransformation(class std::set<short> &&,const enum sc::NUMBER_TRANSFORM_TYPE,int)
     const enum sc::NUMBER_TRANSFORM_TYPE rType
     0
-sc/source/ui/inc/dbdocfun.hxx:80
+sc/source/ui/inc/dbdocfun.hxx:79
     _Bool ScDBDocFunc::RepeatDB(const class rtl::OUString &,_Bool,_Bool,short)
     _Bool bApi
     1
-sc/source/ui/inc/docfunc.hxx:101
-    void ScDocFunc::SetValueCells(const class ScAddress &,const class std::__debug::vector<double, class std::allocator<double> > &,_Bool)
+sc/source/ui/inc/docfunc.hxx:110
+    void ScDocFunc::SetValueCells(const class ScAddress &,const class std::vector<double> &,_Bool)
     _Bool bInteraction
     1
-sc/source/ui/inc/docfunc.hxx:112
-    _Bool ScDocFunc::SetFormulaCells(const class ScAddress &,class std::__debug::vector<class ScFormulaCell *, class std::allocator<class ScFormulaCell *> > &,_Bool)
+sc/source/ui/inc/docfunc.hxx:121
+    _Bool ScDocFunc::SetFormulaCells(const class ScAddress &,class std::vector<class ScFormulaCell *> &,_Bool)
     _Bool bInteraction
     1
-sc/source/ui/inc/docfunc.hxx:113
+sc/source/ui/inc/docfunc.hxx:122
     void ScDocFunc::PutData(const class ScAddress &,class ScEditEngineDefaulter &,_Bool)
     _Bool bApi
     1
-sc/source/ui/inc/docfunc.hxx:114
+sc/source/ui/inc/docfunc.hxx:123
     _Bool ScDocFunc::SetCellText(const class ScAddress &,const class rtl::OUString &,_Bool,_Bool,_Bool,const enum formula::FormulaGrammar::Grammar)
     _Bool bApi
     1
-sc/source/ui/inc/docfunc.hxx:120
+sc/source/ui/inc/docfunc.hxx:129
     void ScDocFunc::SetNoteText(const class ScAddress &,const class rtl::OUString &,_Bool)
     _Bool bApi
     0
-sc/source/ui/inc/docfunc.hxx:143
-    _Bool ScDocFunc::SetTabBgColor(class std::__debug::vector<struct ScUndoTabColorInfo, class std::allocator<struct ScUndoTabColorInfo> > &,_Bool)
+sc/source/ui/inc/docfunc.hxx:154
+    _Bool ScDocFunc::SetTabBgColor(class std::vector<struct ScUndoTabColorInfo> &,_Bool)
     _Bool bApi
     0
-sc/source/ui/inc/docfunc.hxx:145
+sc/source/ui/inc/docfunc.hxx:156
     void ScDocFunc::SetTableVisible(short,_Bool,_Bool)
     _Bool bApi
     1
-sc/source/ui/inc/docfunc.hxx:178
+sc/source/ui/inc/docfunc.hxx:189
     _Bool ScDocFunc::FillSimple(const class ScRange &,const class ScMarkData *,enum FillDir,_Bool)
     _Bool bApi
     0
-sc/source/ui/inc/docfunc.hxx:187
+sc/source/ui/inc/docfunc.hxx:198
     _Bool ScDocFunc::FillAuto(class ScRange &,const class ScMarkData *,enum FillDir,enum FillCmd,enum FillDateCmd,unsigned long,double,double,_Bool,_Bool)
     _Bool bRecord
     1
-sc/source/ui/inc/drawutil.hxx:32
+sc/source/ui/inc/docsh.hxx:273
+    void ScDocShell::UpdateAllRowHeights(const _Bool)
+    const _Bool bOnlyUsedRows
+    1
+sc/source/ui/inc/drawutil.hxx:31
     void ScDrawUtil::CalcScale(const class ScDocument &,short,short,int,short,int,const class OutputDevice *,const class Fraction &,const class Fraction &,double,double,class Fraction &,class Fraction &)
     short nStartCol
     0
-sc/source/ui/inc/drawutil.hxx:32
+sc/source/ui/inc/drawutil.hxx:31
     void ScDrawUtil::CalcScale(const class ScDocument &,short,short,int,short,int,const class OutputDevice *,const class Fraction &,const class Fraction &,double,double,class Fraction &,class Fraction &)
     int nStartRow
     0
-sc/source/ui/inc/pvfundlg.hxx:143
-    int ScDPSubtotalOptDlg::FindListBoxEntry(const class weld::ComboBox &,const class rtl::OUString &,int) const
+sc/source/ui/inc/pvfundlg.hxx:151
+    int ScDPSubtotalOptDlg::FindListBoxEntry(const class weld::ComboBox &,class std::basic_string_view<char16_t>,int) const
     int nStartPos
     1
-sc/source/ui/inc/RegressionDialog.hxx:56
+sc/source/ui/inc/RegressionDialog.hxx:55
     class rtl::OUString ScRegressionDialog::GetYVariableNameFormula(_Bool)
     _Bool bWithLog
     0
-sc/source/ui/inc/spellparam.hxx:37
+sc/source/ui/inc/spellparam.hxx:36
     void ScConversionParam::ScConversionParam(enum ScConversionType)
     enum ScConversionType eConvType
     0
-sc/source/ui/inc/spellparam.hxx:40
-    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
-    _Bool bIsInteractive
-    1
-sc/source/ui/inc/spellparam.hxx:40
+sc/source/ui/inc/spellparam.hxx:39
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     enum ScConversionType eConvType
     1
-sc/source/ui/inc/spellparam.hxx:40
+sc/source/ui/inc/spellparam.hxx:39
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     int nOptions
     0
-sc/source/ui/inc/spellparam.hxx:47
-    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font &,int,_Bool)
+sc/source/ui/inc/spellparam.hxx:39
+    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
+    _Bool bIsInteractive
+    1
+sc/source/ui/inc/spellparam.hxx:46
+    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::Font,int,_Bool)
     _Bool bIsInteractive
     0
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx:69
     void AddressWalker::push(short,int,short)
     short aRelativeTab
     0
-sc/source/ui/inc/tabview.hxx:380
+sc/source/ui/inc/tabview.hxx:400
     void ScTabView::ClickCursor(short,int,_Bool)
     _Bool bControl
     0
-sc/source/ui/inc/tabview.hxx:421
+sc/source/ui/inc/tabview.hxx:441
     void ScTabView::MoveCursorAbs(short,int,enum ScFollowMode,_Bool,_Bool,_Bool,_Bool)
     _Bool bControl
     0
-sc/source/ui/inc/tabview.hxx:432
+sc/source/ui/inc/tabview.hxx:453
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
-    _Bool bShift
+    short nMovX
     0
-sc/source/ui/inc/tabview.hxx:432
+sc/source/ui/inc/tabview.hxx:453
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
     enum ScFollowMode eMode
     1
-sc/source/ui/inc/tabview.hxx:432
+sc/source/ui/inc/tabview.hxx:453
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
-    short nMovX
+    _Bool bShift
     0
-sc/source/ui/inc/undoblk.hxx:323
+sc/source/ui/inc/undoblk.hxx:322
     void ScUndoSelectionAttr::ScUndoSelectionAttr(class ScDocShell *,const class ScMarkData &,short,int,short,short,int,short,class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> >,_Bool,const class ScPatternAttr *,const class SvxBoxItem *,const class SvxBoxInfoItem *,const class ScRange *)
-    const class SvxBoxInfoItem * pNewInner
+    const class SvxBoxItem * pNewOuter
     0
-sc/source/ui/inc/undoblk.hxx:323
+sc/source/ui/inc/undoblk.hxx:322
     void ScUndoSelectionAttr::ScUndoSelectionAttr(class ScDocShell *,const class ScMarkData &,short,int,short,short,int,short,class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> >,_Bool,const class ScPatternAttr *,const class SvxBoxItem *,const class SvxBoxInfoItem *,const class ScRange *)
-    const class SvxBoxItem * pNewOuter
+    const class SvxBoxInfoItem * pNewInner
     0
-sc/source/ui/inc/undoblk.hxx:323
+sc/source/ui/inc/undoblk.hxx:322
     void ScUndoSelectionAttr::ScUndoSelectionAttr(class ScDocShell *,const class ScMarkData &,short,int,short,short,int,short,class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> >,_Bool,const class ScPatternAttr *,const class SvxBoxItem *,const class SvxBoxInfoItem *,const class ScRange *)
     const class ScRange * pRangeCover
     0
-sc/source/ui/inc/undotab.hxx:120
+sc/source/ui/inc/undotab.hxx:119
     void ScUndoRenameTab::ScUndoRenameTab(class ScDocShell *,short,const class rtl::OUString &,const class rtl::OUString &)
     short nT
     0
-sc/source/ui/inc/undotab.hxx:200
+sc/source/ui/inc/undotab.hxx:199
     void ScUndoTabColor::ScUndoTabColor(class ScDocShell *,short,const class Color &,const class Color &)
     short nT
     0
@@ -3062,100 +3334,104 @@ sc/source/ui/inc/viewdata.hxx:146
     void ScPositionHelper::invalidateByPosition(long)
     long nPos
     0
-sc/source/ui/inc/viewdata.hxx:600
+sc/source/ui/inc/viewdata.hxx:622
     class Point ScViewData::GetScrPos(short,int,enum ScHSplitPos) const
     int nWhereY
     0
-sc/source/ui/inc/viewdata.hxx:601
+sc/source/ui/inc/viewdata.hxx:623
     class Point ScViewData::GetScrPos(short,int,enum ScVSplitPos) const
     short nWhereX
     0
-sc/source/ui/inc/viewdata.hxx:677
+sc/source/ui/inc/viewdata.hxx:699
     void ScViewData::AddPixelsWhileBackward(long &,long,int &,int,double,const class ScDocument *,short)
     int nStartRow
     0
-sc/source/ui/inc/viewfunc.hxx:174
-    void ScViewFunc::ApplyAttributes(const class SfxItemSet *,const class SfxItemSet *,_Bool)
+sc/source/ui/inc/viewfunc.hxx:175
+    void ScViewFunc::ApplyAttributes(const class SfxItemSet &,const class SfxItemSet &,_Bool)
     _Bool bAdjustBlockHeight
     1
-sc/source/ui/inc/viewutil.hxx:69
+sc/source/ui/inc/viewfunc.hxx:218
+    _Bool ScViewFunc::AdjustRowHeight(int,int,_Bool)
+    _Bool bApi
+    1
+sc/source/ui/inc/viewutil.hxx:68
     void ScViewUtil::SetFullScreen(const class SfxViewShell &,_Bool)
     _Bool bSet
     0
-sc/source/ui/pagedlg/tptable.cxx:46
-    _Bool lcl_PutScaleItem(unsigned short,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::MetricSpinButton &,unsigned short)
+sc/source/ui/pagedlg/tptable.cxx:41
+    _Bool lcl_PutScaleItem(class TypedWhichId<class SfxUInt16Item>,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::MetricSpinButton &,unsigned short)
     unsigned short nLBEntry
     0
-sc/source/ui/pagedlg/tptable.cxx:54
-    _Bool lcl_PutScaleItem2(unsigned short,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::SpinButton &,unsigned short,const class weld::SpinButton &,unsigned short)
+sc/source/ui/pagedlg/tptable.cxx:49
+    _Bool lcl_PutScaleItem2(class TypedWhichId<class ScPageScaleToItem>,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::SpinButton &,unsigned short,const class weld::SpinButton &,unsigned short)
     unsigned short nLBEntry
     1
-sc/source/ui/vba/vbacondition.hxx:44
+sc/source/ui/vba/vbacondition.hxx:43
     int ScVbaCondition::Operator(_Bool)
     _Bool _bIncludeFormulaValue
     1
-sc/source/ui/vba/vbaeventshelper.hxx:54
+sc/source/ui/vba/vbaeventshelper.hxx:53
     _Bool ScVbaEventsHelper::isSelectionChanged(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int)
     int nIndex
     0
-sc/source/ui/vba/vbaeventshelper.hxx:60
+sc/source/ui/vba/vbaeventshelper.hxx:59
     class com::sun::star::uno::Any ScVbaEventsHelper::createWorksheet(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int) const
     int nIndex
     0
-sc/source/ui/vba/vbaeventshelper.hxx:65
+sc/source/ui/vba/vbaeventshelper.hxx:64
     class com::sun::star::uno::Any ScVbaEventsHelper::createRange(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int) const
     int nIndex
     0
-sc/source/ui/vba/vbaeventshelper.hxx:70
+sc/source/ui/vba/vbaeventshelper.hxx:69
     class com::sun::star::uno::Any ScVbaEventsHelper::createHyperlink(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int) const
     int nIndex
     0
-sc/source/ui/vba/vbaeventshelper.hxx:75
+sc/source/ui/vba/vbaeventshelper.hxx:74
     class com::sun::star::uno::Any ScVbaEventsHelper::createWindow(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int) const
     int nIndex
     0
-sc/source/ui/vba/vbarange.hxx:108
+sc/source/ui/vba/vbarange.hxx:110
     class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaRange::getArea(int)
     int nIndex
     0
-sc/source/ui/view/olinewin.cxx:728
+sc/source/ui/view/olinewin.cxx:729
     _Bool lcl_RotateValue(unsigned long &,unsigned long,unsigned long,_Bool)
     unsigned long nMin
     0
-sc/source/ui/view/prevloc.cxx:266
-    struct ScPreviewLocationEntry * lcl_GetEntryByAddress(const class std::__debug::list<class std::unique_ptr<struct ScPreviewLocationEntry, struct std::default_delete<struct ScPreviewLocationEntry> >, class std::allocator<class std::unique_ptr<struct ScPreviewLocationEntry, struct std::default_delete<struct ScPreviewLocationEntry> > > > &,const class ScAddress &,const enum (anonymous namespace)::ScPreviewLocationType)
+sc/source/ui/view/prevloc.cxx:267
+    struct ScPreviewLocationEntry * lcl_GetEntryByAddress(const class std::list<class std::unique_ptr<struct ScPreviewLocationEntry> > &,const class ScAddress &,const enum (anonymous namespace)::ScPreviewLocationType)
     const enum (anonymous namespace)::ScPreviewLocationType eType
     0
-sc/source/ui/view/tabview.cxx:2442
+sc/source/ui/view/tabview.cxx:2637
     void (anonymous namespace)::ScRangeProvider::ScRangeProvider(const class tools::Rectangle &,_Bool,class ScViewData &)
     _Bool bInPixels
     0
-scaddins/source/analysis/analysishelper.hxx:70
+scaddins/source/analysis/analysishelper.hxx:66
     int GetDiffDate360(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,int,int,_Bool)
     _Bool bUSAMethod
     1
-scaddins/source/analysis/analysishelper.hxx:84
+scaddins/source/analysis/analysishelper.hxx:80
     int GetDaysInYear(int,int,int)
-    int nDate
+    int nNullDate
     0
-scaddins/source/analysis/analysishelper.hxx:84
+scaddins/source/analysis/analysishelper.hxx:80
     int GetDaysInYear(int,int,int)
-    int nNullDate
+    int nDate
     0
-scaddins/source/analysis/analysishelper.hxx:263
+scaddins/source/analysis/analysishelper.hxx:259
     void sca::analysis::SortedIndividualInt32List::InsertHolidayList(const class sca::analysis::ScaAnyConverter &,const class com::sun::star::uno::Any &,int,_Bool)
     _Bool bInsertOnWeekend
     0
-scaddins/source/analysis/analysishelper.hxx:901
+scaddins/source/analysis/analysishelper.hxx:897
     int sca::analysis::ScaAnyConverter::getInt32(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Any &,int)
     int nDefault
     0
 sd/inc/CustomAnimationEffect.hxx:130
-    class com::sun::star::uno::Any sd::CustomAnimationEffect::getProperty(int,const class rtl::OUString &,enum sd::EValue)
+    class com::sun::star::uno::Any sd::CustomAnimationEffect::getProperty(int,class std::basic_string_view<char16_t>,enum sd::EValue)
     enum sd::EValue eValue
     0
 sd/inc/CustomAnimationEffect.hxx:131
-    _Bool sd::CustomAnimationEffect::setProperty(int,const class rtl::OUString &,enum sd::EValue,const class com::sun::star::uno::Any &)
+    _Bool sd::CustomAnimationEffect::setProperty(int,class std::basic_string_view<char16_t>,enum sd::EValue,const class com::sun::star::uno::Any &)
     enum sd::EValue eValue
     0
 sd/inc/CustomAnimationEffect.hxx:133
@@ -3170,18 +3446,30 @@ sd/inc/shapelist.hxx:57
     void sd::ShapeList::seekShape(unsigned int)
     unsigned int nIndex
     0
-sd/qa/unit/sdmodeltestbase.hxx:421
-    class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
-    int nPara
+sd/qa/unit/sdmodeltestbase.hxx:49
+    void SdModelTestBase::createSdImpressDoc(const char *,const char *)
+    const char * pPassword
+    0
+sd/qa/unit/sdmodeltestbase.hxx:63
+    void SdModelTestBase::createSdDrawDoc(const char *,const char *)
+    const char * pPassword
     0
-sd/qa/unit/sdmodeltestbase.hxx:421
-    class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
+sd/qa/unit/sdmodeltestbase.hxx:155
+    class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int)
     int nRun
     0
-sd/qa/unit/tiledrendering/LOKitSearchTest.cxx:853
+sd/qa/unit/sdmodeltestbase.hxx:155
+    class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int)
+    int nPara
+    0
+sd/qa/unit/tiledrendering/LOKitSearchTest.cxx:854
     class rtl::OUString getShapeText(class SdXImpressDocument *,unsigned int,unsigned int)
     unsigned int nShape
     0
+sd/source/console/PresenterTextView.hxx:231
+    void sdext::presenter::PresenterTextView::SetOffset(const double,const double)
+    const double nLeft
+    0
 sd/source/filter/eppt/epptbase.hxx:394
     unsigned int PPTWriterBase::GetMasterIndex(enum PageType)
     enum PageType ePageType
@@ -3190,39 +3478,55 @@ sd/source/filter/eppt/pptexanimations.hxx:96
     void ppt::AnimationExporter::exportNode(class SvStream &,const class com::sun::star::uno::Reference<class com::sun::star::animations::XAnimationNode> &,const unsigned short,const unsigned short,const int,const _Bool,const short)
     const unsigned short nInstance
     1
-sd/source/filter/eppt/text.hxx:107
+sd/source/filter/eppt/text.hxx:106
     void FieldEntry::FieldEntry(unsigned int,unsigned int,unsigned int)
     unsigned int nStart
     0
-sd/source/filter/ppt/pptinanimations.hxx:100
+sd/source/filter/html/htmlex.cxx:570
+    class rtl::OUString CreateTextForPage(class SdrOutliner *,const class SdPage *,_Bool)
+    _Bool bHeadLine
+    1
+sd/source/filter/html/htmlex.hxx:74
+    _Bool HtmlExport::WriteHtml(const class rtl::OUString &,_Bool,class std::basic_string_view<char16_t>)
+    _Bool bAddExtension
+    0
+sd/source/filter/ppt/pptinanimations.hxx:99
     void ppt::AnimationImporter::dump_atom_header(const class ppt::Atom *,_Bool,_Bool)
     _Bool bAppend
     0
-sd/source/filter/ppt/pptinanimations.hxx:101
+sd/source/filter/ppt/pptinanimations.hxx:100
     void ppt::AnimationImporter::dump_atom(const class ppt::Atom *,_Bool)
     _Bool bNewLine
     1
-sd/source/ui/inc/DrawDocShell.hxx:64
+sd/source/ui/inc/DrawDocShell.hxx:67
     void sd::DrawDocShell::DrawDocShell(enum SfxModelFlags,_Bool,enum DocumentType)
     _Bool bSdDataObj
     0
-sd/source/ui/inc/DrawDocShell.hxx:69
-    void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum SfxObjectCreateMode,_Bool,enum DocumentType)
-    _Bool bSdDataObj
-    1
-sd/source/ui/inc/DrawDocShell.hxx:69
+sd/source/ui/inc/DrawDocShell.hxx:72
     void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum SfxObjectCreateMode,_Bool,enum DocumentType)
     enum SfxObjectCreateMode eMode
     0
+sd/source/ui/inc/DrawDocShell.hxx:72
+    void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum SfxObjectCreateMode,_Bool,enum DocumentType)
+    _Bool bSdDataObj
+    1
 sd/source/ui/inc/DrawViewShell.hxx:90
     void sd::DrawViewShell::DrawViewShell(class sd::ViewShellBase &,class vcl::Window *,enum PageKind,class sd::FrameView *)
     enum PageKind ePageKind
     0
+sd/source/ui/inc/navigatr.hxx:115
+    void SdNavigatorWin::SdNavigatorWin(class weld::Widget *,class SfxBindings *,class SfxNavigator *)
+    class SfxNavigator * pNavigatorDlg
+    0
+sd/source/ui/inc/NotesPanelView.hxx:71
+    void sd::NotesPanelView::onUpdateStyleSettings(_Bool)
+    _Bool bForceUpdate
+    1
 sd/source/ui/inc/RemoteServer.hxx:40
-    void sd::ClientInfo::ClientInfo(const class rtl::OUString &,const _Bool)
+    void sd::ClientInfo::ClientInfo(class rtl::OUString,const _Bool)
     const _Bool bIsAlreadyAuthorised
     0
-sd/source/ui/inc/slideshow.hxx:148
+sd/source/ui/inc/slideshow.hxx:157
     void sd::SlideShow::pause(_Bool)
     _Bool bPause
     0
@@ -3230,95 +3534,59 @@ sd/source/ui/inc/ToolBarManager.hxx:226
     void sd::ToolBarManager::SetToolBarShell(enum sd::ToolBarManager::ToolBarGroup,enum ToolbarId)
     enum sd::ToolBarManager::ToolBarGroup eGroup
     1
-sd/source/ui/inc/tools/ConfigurationAccess.hxx:58
-    void sd::tools::ConfigurationAccess::ConfigurationAccess(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const enum sd::tools::ConfigurationAccess::WriteMode)
-    const enum sd::tools::ConfigurationAccess::WriteMode eMode
-    1
 sd/source/ui/inc/unomodel.hxx:131
     void SdXImpressDocument::SdXImpressDocument(class SdDrawDocument *,_Bool)
     _Bool bClipBoard
     1
-sd/source/ui/inc/View.hxx:172
+sd/source/ui/inc/View.hxx:180
     _Bool sd::View::IsPresObjSelected(_Bool,_Bool,_Bool,_Bool) const
     _Bool bOnMasterPage
     1
-sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx:44
+sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx:43
     void sd::slidesorter::cache::BitmapCache::CacheEntry::CacheEntry(int,_Bool)
     _Bool bIsPrecious
     1
+sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx:100
+    _Bool sd::slidesorter::controller::PageSelector::IsPageExcluded(int)
+    int nPageIndex
+    0
 sdext/source/minimizer/configurationaccess.hxx:90
     short ConfigurationAccess::GetConfigProperty(const enum PPPOptimizerTokenEnum,const short) const
     const short nDefault
     0
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    _Bool bMultiLine
-    1
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    short nTabIndex
-    0
-sdext/source/minimizer/informationdialog.hxx:32
-    class rtl::OUString InsertImage(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool)
-    _Bool bScale
-    0
-sdext/source/minimizer/informationdialog.hxx:35
-    class rtl::OUString InsertCheckBox(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XItemListener> &,const class rtl::OUString &,int,int,int,short)
-    short nTabIndex
-    1
-sdext/source/minimizer/optimizerdialogcontrols.cxx:91
-    class rtl::OUString InsertButton(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,_Bool,enum PPPOptimizerTokenEnum,enum com::sun::star::awt::PushButtonType)
-    enum com::sun::star::awt::PushButtonType nPushButtonType
-    0
-sdext/source/minimizer/optimizerdialogcontrols.cxx:200
-    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
-    double fEffectiveMin
-    0
-sdext/source/minimizer/optimizerdialogcontrols.cxx:248
-    class rtl::OUString InsertComboBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const _Bool,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,int,short)
-    const _Bool bEnabled
-    1
-sdext/source/minimizer/optimizerdialogcontrols.cxx:326
-    class rtl::OUString InsertListBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,const _Bool,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,int,int,short)
-    const _Bool bEnabled
-    1
-sdext/source/pdfimport/wrapper/wrapper.cxx:970
+sdext/source/pdfimport/wrapper/wrapper.cxx:1019
     oslFileError pdfi::(anonymous namespace)::Buffering::read(char *,short,unsigned long *)
     short count
     1
-sdext/source/presenter/PresenterTextView.hxx:231
-    void sdext::presenter::PresenterTextView::SetOffset(const double,const double)
-    const double nLeft
+sfx2/source/appl/appcfg.cxx:120
+    _Bool toSet_withDefault(class SfxItemSet &,TypedWhichId<type-parameter-?-?>,type-parameter-?-? &&)
+    type-parameter-?-? && defVal
     0
-sfx2/inc/sidebar/SidebarToolBox.hxx:55
-    void sfx2::sidebar::SidebarToolBox::SetController(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XToolbarController> &)
-    const unsigned short nItemId
-    1
-sfx2/source/inc/workwin.hxx:277
+sfx2/source/inc/workwin.hxx:276
     void SfxWorkWindow::SetChildWindowVisible_Impl(unsigned int,_Bool,enum SfxVisibilityFlags)
     _Bool 
     1
 slideshow/source/engine/opengl/Operation.hxx:226
     class std::shared_ptr<class SEllipseTranslate> makeSEllipseTranslate(double,double,double,double,_Bool,double,double)
+    _Bool bInter
+    1
+slideshow/source/engine/opengl/Operation.hxx:226
+    class std::shared_ptr<class SEllipseTranslate> makeSEllipseTranslate(double,double,double,double,_Bool,double,double)
     double T0
     0
 slideshow/source/engine/opengl/Operation.hxx:226
     class std::shared_ptr<class SEllipseTranslate> makeSEllipseTranslate(double,double,double,double,_Bool,double,double)
     double T1
     1
-slideshow/source/engine/opengl/Operation.hxx:226
-    class std::shared_ptr<class SEllipseTranslate> makeSEllipseTranslate(double,double,double,double,_Bool,double,double)
-    _Bool bInter
-    1
 slideshow/source/engine/opengl/Operation.hxx:262
-    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float, glm::packed_highp> &,const struct glm::vec<3, float, glm::packed_highp> &,double,_Bool,_Bool,double,double)
-    _Bool bInter
+    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float> &,const struct glm::vec<3, float> &,double,_Bool,_Bool,double,double)
+    _Bool bScale
     1
 slideshow/source/engine/opengl/Operation.hxx:262
-    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float, glm::packed_highp> &,const struct glm::vec<3, float, glm::packed_highp> &,double,_Bool,_Bool,double,double)
-    _Bool bScale
+    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float> &,const struct glm::vec<3, float> &,double,_Bool,_Bool,double,double)
+    _Bool bInter
     1
-slideshow/source/engine/slide/layer.hxx:219
+slideshow/source/engine/slide/layer.hxx:220
     void slideshow::internal::Layer::Layer(enum slideshow::internal::Layer::Dummy)
     enum slideshow::internal::Layer::Dummy eFlag
     0
@@ -3338,55 +3606,79 @@ slideshow/source/inc/animationfactory.hxx:136
     class std::shared_ptr<class slideshow::internal::NumberAnimation> createPhysicsAnimation(const class std::shared_ptr<class box2d::utils::box2DWorld> &,const double,const class std::shared_ptr<class slideshow::internal::ShapeManager> &,const class basegfx::B2DVector &,const class basegfx::B2DVector &,const double,const double,int)
     int nFlags
     0
-slideshow/source/inc/box2dtools.hxx:232
+slideshow/source/inc/box2dtools.hxx:231
     void box2d::utils::box2DWorld::queueAngularVelocityUpdate(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const double,const int)
     const int nDelayForSteps
     1
-starmath/inc/rect.hxx:175
-    class SmRect & SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,_Bool)
-    _Bool bKeepVerAlignParams
+starmath/inc/cfgitem.hxx:88
+    class rtl::OUString SmFontFormatList::GetFontFormatId(const struct SmFontFormat &,_Bool)
+    _Bool bAdd
     1
-starmath/inc/rect.hxx:175
+starmath/inc/mathml/mathmlimport.hxx:57
+    void SmXMLImportWrapper::useHTMLMLEntities(_Bool)
+    _Bool bUseHTMLMLEntities
+    1
+starmath/inc/mathml/starmathdatabase.hxx:218
+    struct SmToken Identify_SmXMLOperatorContext_Impl(class std::basic_string_view<char16_t>,_Bool,int)
+    int nIndex
+    0
+starmath/inc/mathml/starmathdatabase.hxx:231
+    struct SmToken Identify_PrefixPostfix_SmXMLOperatorContext_Impl(class std::basic_string_view<char16_t>,int)
+    int nIndex
+    0
+starmath/inc/mathml/starmathdatabase.hxx:244
+    struct SmToken Identify_Prefix_SmXMLOperatorContext_Impl(class std::basic_string_view<char16_t>,int)
+    int nIndex
+    0
+starmath/inc/mathml/starmathdatabase.hxx:256
+    struct SmToken Identify_Postfix_SmXMLOperatorContext_Impl(class std::basic_string_view<char16_t>,int)
+    int nIndex
+    0
+starmath/inc/rect.hxx:174
     class SmRect & SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,_Bool)
     enum RectCopyMBL eCopyMode
     0
-starmath/inc/cfgitem.hxx:85
-    class rtl::OUString SmFontFormatList::GetFontFormatId(const struct SmFontFormat &,_Bool)
-    _Bool bAdd
+starmath/inc/rect.hxx:174
+    class SmRect & SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,_Bool)
+    _Bool bKeepVerAlignParams
     1
-store/source/object.hxx:56
+starmath/source/mathml/mathmlexport.cxx:79
+    unsigned int ConvertMathToMathML(class std::basic_string_view<char16_t>,int)
+    int nIndex
+    0
+store/source/object.hxx:50
     type-parameter-?-? * query(class store::OStoreObject *,type-parameter-?-? *)
     type-parameter-?-? * 
     0
-svl/source/crypto/cryptosign.cxx:396
+svl/source/crypto/cryptosign.cxx:387
     enum _SECStatus my_SEC_StringToOID(struct SECItemStr *,const char *,unsigned int)
     unsigned int len
     0
-svl/source/crypto/cryptosign.cxx:489
+svl/source/crypto/cryptosign.cxx:480
     struct NSSCMSAttributeStr * my_NSS_CMSAttributeArray_FindAttrByOidTag(struct NSSCMSAttributeStr **,SECOidTag,int)
     int only
     0
-svl/source/crypto/cryptosign.cxx:1645
+svl/source/crypto/cryptosign.cxx:1662
     struct NSSCMSAttributeStr * CMSAttributeArray_FindAttrByOidData(struct NSSCMSAttributeStr **,const struct SECOidDataStr *,int)
     int only
     1
-svl/source/crypto/cryptosign.cxx:1684
+svl/source/crypto/cryptosign.cxx:1701
     enum _SECStatus StringToOID(struct SECItemStr *,const char *,unsigned int)
     unsigned int len
     0
-svl/source/numbers/zforfind.hxx:240
+svl/source/numbers/zforfind.hxx:243
     _Bool ImpSvNumberInputScan::StringPtrContains(const class rtl::OUString &,const char16_t *,int)
     int nPos
     0
-svl/source/numbers/zforfind.hxx:393
+svl/source/numbers/zforfind.hxx:397
     _Bool ImpSvNumberInputScan::IsDatePatternNumberOfType(unsigned short,char16_t)
     unsigned short nNumber
     0
-svl/source/passwordcontainer/passwordcontainer.hxx:151
-    void NamePassRecord::RemovePasswords(signed char)
+svl/source/passwordcontainer/passwordcontainer.hxx:170
+    void NamePasswordRecord::RemovePasswords(signed char)
     signed char nStatus
     1
-svtools/source/control/valueimp.hxx:213
+svtools/source/control/valueimp.hxx:207
     void ValueItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
     1
@@ -3394,314 +3686,378 @@ svx/inc/sdginitm.hxx:34
     void SdrGrafInvertItem::SdrGrafInvertItem(_Bool)
     _Bool bInvert
     0
-svx/inc/sxcaitm.hxx:37
-    void SdrCaptionAngleItem::SdrCaptionAngleItem(long)
-    long nAngle
-    0
 svx/inc/sxmtaitm.hxx:30
     void SdrMeasureTextAutoAngleItem::SdrMeasureTextAutoAngleItem(_Bool)
     _Bool bOn
     1
+svx/inc/verttexttbxctrl.hxx:30
+    void SvxVertCTLTextTbxCtrl_Base::ImplInheritanceHelper(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,nullptr_t &&,class rtl::OUString &&)
+    nullptr_t && 
+    0
 svx/inc/xftshtit.hxx:33
     void XFormTextShadowTranspItem::XFormTextShadowTranspItem(unsigned short)
     unsigned short nShdwTransparence
     0
-svx/qa/unit/classicshapes.cxx:34
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> (anonymous namespace)::ClassicshapesTest::getShape(unsigned char,unsigned char)
+svx/qa/unit/gluepointTest.cxx:37
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> (anonymous namespace)::GluePointTest::getShape(unsigned char)
     unsigned char nShapeIndex
     0
-svx/source/customshapes/EnhancedCustomShape3d.cxx:129
+svx/source/customshapes/EnhancedCustomShape3d.cxx:139
     enum com::sun::star::drawing::ShadeMode GetShadeMode(const class SdrCustomShapeGeometryItem &,const enum com::sun::star::drawing::ShadeMode)
     const enum com::sun::star::drawing::ShadeMode eDefault
     0
-svx/source/customshapes/EnhancedCustomShape3d.cxx:138
-    _Bool GetBool(const class SdrCustomShapeGeometryItem &,const class rtl::OUString &,const _Bool)
-    const _Bool bDefault
+svx/source/customshapes/EnhancedCustomShape3d.cxx:191
+    short GetMetalType(const class SdrCustomShapeGeometryItem &,const short)
+    const short eDefault
     0
-svx/source/dialog/srchdlg.cxx:744
+svx/source/dialog/srchdlg.cxx:743
     void (anonymous namespace)::ToggleSaveToModule::ToggleSaveToModule(class SvxSearchDialog &,_Bool)
     _Bool bValue
     0
-svx/source/gallery2/galbrws1.hxx:86
-    void GalleryBrowser1::SelectTheme(unsigned short)
-    unsigned short nThemePos
-    0
-svx/source/inc/celltypes.hxx:59
+svx/source/inc/celltypes.hxx:48
     void sdr::table::RangeIterator::RangeIterator<T>(const type-parameter-?-? &,const type-parameter-?-? &,_Bool)
     const type-parameter-?-? & rStart
     0
-svx/source/inc/fmexpl.hxx:498
+svx/source/inc/fmexpl.hxx:497
     signed char svxform::NavigatorTree::implExecuteDataTransfer(const class svxform::OControlTransferData &,signed char,const class Point &,_Bool)
     _Bool _bDnD
     1
-svx/source/inc/fmshimp.hxx:254
+svx/source/inc/fmshimp.hxx:257
     void FmXFormShell::didPrepareClose_Lock(_Bool)
     _Bool bDid
     1
 svx/source/inc/fmvwimp.hxx:264
-    _Bool FmXFormView::createControlLabelPair(const class OutputDevice &,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,const class rtl::OUString &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDataSource> &,const class rtl::OUString &,const class rtl::OUString &,const int)
+    _Bool FmXFormView::createControlLabelPair(const class OutputDevice &,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,enum SdrObjKind,class std::basic_string_view<char16_t>,class rtl::Reference<class SdrUnoObj> &,class rtl::Reference<class SdrUnoObj> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDataSource> &,const class rtl::OUString &,const class rtl::OUString &,const int)
     int _nXOffsetMM
     0
-svx/source/svdraw/svdoole2.cxx:628
+svx/source/inc/galbrws1.hxx:184
+    void GalleryBrowser1::SelectTheme(unsigned short)
+    unsigned short nThemePos
+    0
+svx/source/svdraw/svdoole2.cxx:660
     void SdrOle2ObjImpl::SdrOle2ObjImpl(_Bool,const class svt::EmbeddedObjectRef &)
     _Bool bFrame
     0
-svx/source/tbxctrls/tbcontrl.cxx:145
+svx/source/tbxctrls/tbcontrl.cxx:166
     void (anonymous namespace)::SvxStyleBox_Base::insert_separator(int,const class rtl::OUString &)
     int pos
     1
-sw/inc/authfld.hxx:162
+sw/inc/AnnotationWin.hxx:124
+    void sw::annotation::SwAnnotationWin::LockView(_Bool)
+    _Bool bLock
+    0
+sw/inc/authfld.hxx:184
     class rtl::OUString SwAuthorityField::ExpandCitation(enum ToxAuthorityField,const class SwRootFrame *) const
     const class SwRootFrame * pLayout
     0
-sw/inc/calc.hxx:116
+sw/inc/calc.hxx:119
     void SwSbxValue::SwSbxValue(long)
     long n
     0
-sw/inc/charfmt.hxx:30
-    void SwCharFormat::SwCharFormat(class SwAttrPool &,const char *,class SwCharFormat *)
-    class SwCharFormat * pDerivedFrom
-    0
-sw/inc/crsrsh.hxx:560
+sw/inc/charformats.hxx:101
+    void SwCharFormats::DeleteAndDestroyAll(_Bool)
+    _Bool keepDefault
+    1
+sw/inc/crsrsh.hxx:588
     _Bool SwCursorShell::GotoMark(const class sw::mark::IMark *const,_Bool)
     _Bool bAtStart
     1
-sw/inc/crsrsh.hxx:824
+sw/inc/crsrsh.hxx:594
+    class sw::mark::IFieldmark * SwCursorShell::GetFieldmarkAfter(_Bool)
+    _Bool bLoop
+    1
+sw/inc/crsrsh.hxx:595
+    class sw::mark::IFieldmark * SwCursorShell::GetFieldmarkBefore(_Bool)
+    _Bool bLoop
+    1
+sw/inc/crsrsh.hxx:868
     void SwCursorShell::FireSectionChangeEvent(unsigned short,unsigned short)
     unsigned short nNewSection
     1
-sw/inc/crsrsh.hxx:825
+sw/inc/crsrsh.hxx:869
     void SwCursorShell::FireColumnChangeEvent(unsigned short,unsigned short)
     unsigned short nNewColumn
     1
-sw/inc/dbfld.hxx:83
+sw/inc/dbfld.hxx:84
     void SwDBField::ChgValue(double,_Bool)
     _Bool bVal
     1
-sw/inc/doc.hxx:994
-    void SwDoc::CorrAbs(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
+sw/inc/doc.hxx:1013
+    void SwDoc::CorrAbs(const class SwNode &,const struct SwPosition &,const int,_Bool)
     _Bool bMoveCursor
     1
-sw/inc/doc.hxx:1008
+sw/inc/doc.hxx:1027
     void SwDoc::CorrAbs(const class SwPaM &,const struct SwPosition &,_Bool)
     _Bool bMoveCursor
     1
-sw/inc/doc.hxx:1014
-    void SwDoc::CorrRel(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
+sw/inc/doc.hxx:1033
+    void SwDoc::CorrRel(const class SwNode &,const struct SwPosition &,const int,_Bool)
     const int nOffset
     0
-sw/inc/doc.hxx:1053
+sw/inc/doc.hxx:1072
     void SwDoc::SetCounted(const class SwPaM &,_Bool,const class SwRootFrame *)
     _Bool bCounted
     1
-sw/inc/doc.hxx:1122
+sw/inc/doc.hxx:1141
     const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const class SwRootFrame *,const _Bool)
     const _Bool bForward
     0
-sw/inc/doc.hxx:1122
+sw/inc/doc.hxx:1141
     const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const class SwRootFrame *,const _Bool)
     const _Bool bOutline
     0
-sw/inc/doc.hxx:1414
+sw/inc/doc.hxx:1438
     const class SvNumberFormatter * SwDoc::GetNumberFormatter(_Bool) const
     _Bool bCreate
     1
-sw/inc/doc.hxx:1629
+sw/inc/doc.hxx:1669
     void SwDoc::dumpAsXml(struct _xmlTextWriter *) const
     struct _xmlTextWriter * 
     0
-sw/inc/docary.hxx:296
+sw/inc/docary.hxx:308
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,enum RedlineType)
     _Bool bSaveInUndo
     1
-sw/inc/docary.hxx:297
+sw/inc/docary.hxx:309
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,enum RedlineType)
     _Bool bSaveInUndo
     1
-sw/inc/docufld.hxx:283
+sw/inc/docufld.hxx:288
     void SwHiddenTextFieldType::SwHiddenTextFieldType(_Bool)
     _Bool bSetHidden
     1
-sw/inc/docufld.hxx:308
-    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,enum SwFieldTypesEnum)
+sw/inc/docufld.hxx:314
+    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,class rtl::OUString,const class rtl::OUString &,_Bool,enum SwFieldTypesEnum)
     _Bool bConditional
     1
-sw/inc/docufld.hxx:308
-    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,enum SwFieldTypesEnum)
+sw/inc/docufld.hxx:314
+    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,class rtl::OUString,const class rtl::OUString &,_Bool,enum SwFieldTypesEnum)
     _Bool bHidden
     0
-sw/inc/docufld.hxx:525
-    void SwDocInfoField::SwDocInfoField(class SwDocInfoFieldType *,unsigned short,const class rtl::OUString &,const class rtl::OUString &,unsigned int)
-    unsigned int nFormat
-    0
-sw/inc/fesh.hxx:420
-    const class SwFrameFormat * SwFEShell::GetFlyNum(unsigned long,enum FlyCntType,_Bool) const
-    _Bool bIgnoreTextBoxes
+sw/inc/editsh.hxx:290
+    class SwFrameFormat & SwEditShell::GetTableFrameFormat(unsigned long,_Bool) const
+    _Bool bUsed
     0
-sw/inc/fesh.hxx:420
-    const class SwFrameFormat * SwFEShell::GetFlyNum(unsigned long,enum FlyCntType,_Bool) const
-    enum FlyCntType eType
+sw/inc/editsh.hxx:534
+    _Bool SwEditShell::NumOrNoNum(_Bool,_Bool)
+    _Bool bChkStart
     1
-sw/inc/fesh.hxx:422
-    class std::__debug::vector<const class SwFrameFormat *, class std::allocator<const class SwFrameFormat *> > SwFEShell::GetFlyFrameFormats(enum FlyCntType,_Bool)
+sw/inc/editsh.hxx:545
+    _Bool SwEditShell::IsNoNum(_Bool) const
+    _Bool bChkStart
+    1
+sw/inc/editsh.hxx:678
+    void SwEditShell::GetGrfNms(class rtl::OUString *,class rtl::OUString *,const class SwFlyFrameFormat *) const
+    const class SwFlyFrameFormat * 
+    0
+sw/inc/EnhancedPDFExportHelper.hxx:182
+    void SwTaggedPDFHelper::SwTaggedPDFHelper(const struct Num_Info *,const struct Frame_Info *,const struct Por_Info *,const class OutputDevice &)
+    const struct Num_Info * pNumInfo
+    0
+sw/inc/fesh.hxx:426
+    class std::vector<const class SwFrameFormat *> SwFEShell::GetFlyFrameFormats(enum FlyCntType,_Bool)
     _Bool bIgnoreTextBoxes
     1
-sw/inc/fmtcol.hxx:70
+sw/inc/fmtcol.hxx:78
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     class SwTextFormatColl * pDerFrom
     0
-sw/inc/fmtcol.hxx:142
+sw/inc/fmtcol.hxx:180
     void SwGrfFormatColl::SwGrfFormatColl(class SwAttrPool &,const char *,class SwGrfFormatColl *)
     class SwGrfFormatColl * pDerFrom
     0
-sw/inc/frmfmt.hxx:85
-    void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
-    const unsigned short * pWhichRange
+sw/inc/IDocumentMarkAccess.hxx:91
+    class IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator++(int)
+     ###1
     0
-sw/inc/IDocumentMarkAccess.hxx:100
+sw/inc/IDocumentMarkAccess.hxx:99
     class IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator-(long) const
      ###1
     1
-sw/inc/IDocumentRedlineAccess.hxx:189
-    _Bool IDocumentRedlineAccess::RejectRedline(unsigned long,_Bool)
+sw/inc/IDocumentMarkAccess.hxx:361
+    class sw::mark::IMark * IDocumentMarkAccess::makeAnnotationBookmark(const class SwPaM &,const class rtl::OUString &,enum IDocumentMarkAccess::MarkType,enum sw::mark::InsertMode,const struct SwPosition *)
+    enum sw::mark::InsertMode eMode
+    0
+sw/inc/IDocumentMarkAccess.hxx:361
+    class sw::mark::IMark * IDocumentMarkAccess::makeAnnotationBookmark(const class SwPaM &,const class rtl::OUString &,enum IDocumentMarkAccess::MarkType,enum sw::mark::InsertMode,const struct SwPosition *)
+    const struct SwPosition * pSepPos
+    0
+sw/inc/IDocumentRedlineAccess.hxx:202
+    _Bool IDocumentRedlineAccess::RejectRedline(unsigned long,_Bool,_Bool)
     _Bool bCallDelete
     1
-sw/inc/IDocumentUndoRedo.hxx:209
+sw/inc/IDocumentUndoRedo.hxx:208
     unsigned long IDocumentUndoRedo::GetUndoActionCount(const _Bool) const
     const _Bool bCurrentLevel
     1
-sw/inc/index.hxx:62
-    int SwIndex::operator--(int)
-     ###1
-    0
-sw/inc/ndgrf.hxx:64
-    void SwGrfNode::SwGrfNode(const class SwNodeIndex &,const class GraphicObject &,class SwGrfFormatColl *,const class SwAttrSet *)
-    const class SwAttrSet * pAutoAttr
-    0
-sw/inc/ndindex.hxx:83
-    unsigned long SwNodeIndex::operator++(int)
-     ###1
+sw/inc/istyleaccess.hxx:42
+    class std::shared_ptr<class SfxItemSet> IStyleAccess::getAutomaticStyle(const class SfxItemSet &,enum IStyleAccess::SwAutoStyleFamily,const class rtl::OUString *)
+    enum IStyleAccess::SwAutoStyleFamily eFamily
     0
-sw/inc/ndindex.hxx:84
-    unsigned long SwNodeIndex::operator--(int)
-     ###1
+sw/inc/istyleaccess.hxx:42
+    class std::shared_ptr<class SfxItemSet> IStyleAccess::getAutomaticStyle(const class SfxItemSet &,enum IStyleAccess::SwAutoStyleFamily,const class rtl::OUString *)
+    const class rtl::OUString * pParentName
     0
-sw/inc/ndindex.hxx:140
-    void SwNodeRange::SwNodeRange(class SwNodes &,unsigned long,unsigned long)
-    unsigned long nEndIdx
+sw/inc/ndarr.hxx:191
+    class SwContentNode * SwNodes::GoPrevious(class SwNodeIndex *,_Bool)
+    _Bool canCrossBoundary
     0
-sw/inc/ndole.hxx:96
-    void SwOLENode::SwOLENode(const class SwNodeIndex &,const class svt::EmbeddedObjectRef &,class SwGrfFormatColl *,const class SwAttrSet *)
+sw/inc/ndole.hxx:103
+    void SwOLENode::SwOLENode(class SwNode &,const class svt::EmbeddedObjectRef &,class SwGrfFormatColl *,const class SwAttrSet *)
     const class SwAttrSet * pAutoAttr
     0
-sw/inc/ndtxt.hxx:325
-    void SwTextNode::CopyText(class SwTextNode *const,const class SwIndex &,const int,const _Bool)
+sw/inc/ndtxt.hxx:290
+    void SwTextNode::EraseText(const struct SwPosition &,const int,const enum SwInsertFlags)
+    const enum SwInsertFlags nMode
+    0
+sw/inc/ndtxt.hxx:364
+    void SwTextNode::CopyText(class SwTextNode *const,const class SwContentIndex &,const int,const _Bool)
     const _Bool bForceCopyOfAllAttrs
     1
-sw/inc/ndtxt.hxx:695
-    _Bool SwTextNode::CopyExpandText(class SwTextNode &,const class SwIndex *,int,int,const class SwRootFrame *,_Bool,_Bool,_Bool) const
+sw/inc/ndtxt.hxx:373
+    void SwTextNode::CopyText(class SwTextNode *const,const class SwContentIndex &,const struct SwPosition &,int,const _Bool)
+    const _Bool bForceCopyOfAllAttrs
+    0
+sw/inc/ndtxt.hxx:480
+    class std::vector<long> SwTextNode::GetNumberVector(const class SwRootFrame *,enum SwListRedlineType) const
+    enum SwListRedlineType eRedline
+    0
+sw/inc/ndtxt.hxx:746
+    _Bool SwTextNode::CopyExpandText(class SwTextNode &,const class SwContentIndex *,int,int,const class SwRootFrame *,_Bool,_Bool,_Bool) const
     _Bool bWithNum
     0
-sw/inc/ndtxt.hxx:705
+sw/inc/ndtxt.hxx:756
     int SwTextNode::GetDropLen(int) const
     int nWishLen
     0
-sw/inc/pam.hxx:149
-    void SwPaM::SwPaM(const class SwNodeIndex &,const class SwNodeIndex &,long,long,class SwPaM *)
+sw/inc/node.hxx:438
+    _Bool SwContentNode::GoNext(struct SwPosition *,enum SwCursorSkipMode) const
+    enum SwCursorSkipMode nMode
+    0
+sw/inc/pam.hxx:200
+    void SwPaM::SwPaM(const class SwNodeIndex &,const class SwNodeIndex &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,class SwPaM *)
     class SwPaM * pRing
     0
-sw/inc/pam.hxx:153
+sw/inc/pam.hxx:204
+    void SwPaM::SwPaM(const class SwNodeIndex &,int,const class SwNodeIndex &,int,class SwPaM *)
+    int nMkContent
+    0
+sw/inc/pam.hxx:204
     void SwPaM::SwPaM(const class SwNodeIndex &,int,const class SwNodeIndex &,int,class SwPaM *)
     class SwPaM * pRing
     0
-sw/inc/pam.hxx:158
+sw/inc/pam.hxx:208
+    void SwPaM::SwPaM(const class SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int,const class SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int,class SwPaM *)
+    int nMkContent
+    0
+sw/inc/pam.hxx:208
+    void SwPaM::SwPaM(const class SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int,const class SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int,class SwPaM *)
+    class SwPaM * pRing
+    0
+sw/inc/pam.hxx:210
+    void SwPaM::SwPaM(const class SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int,class SwPaM *)
+    class SwPaM * pRing
+    0
+sw/inc/pam.hxx:212
     void SwPaM::SwPaM(const class SwNodeIndex &,int,class SwPaM *)
     class SwPaM * pRing
     0
-sw/inc/shellio.hxx:514
+sw/inc/pam.hxx:213
+    void SwPaM::SwPaM(class SwNodes &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,class SwPaM *)
+    class SwPaM * pRing
+    0
+sw/inc/redline.hxx:220
+    unsigned int SwRangeRedline::GetMovedID(unsigned short) const
+    unsigned short nPos
+    0
+sw/inc/reffld.hxx:152
+    class rtl::OUString SwGetRefField::GetExpandedTextOfReferencedTextNode(const class SwRootFrame &,class SwTextNode *,class SwFrame *) const
+    class SwTextNode * pTextNode
+    0
+sw/inc/reffld.hxx:152
+    class rtl::OUString SwGetRefField::GetExpandedTextOfReferencedTextNode(const class SwRootFrame &,class SwTextNode *,class SwFrame *) const
+    class SwFrame * pFrame
+    0
+sw/inc/shellio.hxx:516
     void SwWriter::SwWriter(class SvStream &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:516
+sw/inc/shellio.hxx:518
     void SwWriter::SwWriter(class SvStream &,class SwPaM &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:520
-    void SwWriter::SwWriter(class SfxMedium &,class SwCursorShell &,_Bool)
-    _Bool bWriteAll
-    1
-sw/inc/swabstdlg.hxx:298
+sw/inc/swabstdlg.hxx:322
     void AbstractSwSelGlossaryDlg::SelectEntryPos(int)
     int nIdx
     0
-sw/inc/swcrsr.hxx:124
-    unsigned long SwCursor::FindFormat(const class SwTextFormatColl &,enum SwDocPositions,enum SwDocPositions,_Bool &,enum FindRanges,const class SwTextFormatColl *,const class SwRootFrame *const)
+sw/inc/swcrsr.hxx:127
+    int SwCursor::FindFormat(const class SwTextFormatColl &,enum SwDocPositions,enum SwDocPositions,_Bool &,enum FindRanges,const class SwTextFormatColl *,const class SwRootFrame *const)
     const class SwRootFrame *const pLayout
     0
-sw/inc/swcrsr.hxx:151
+sw/inc/swcrsr.hxx:154
     _Bool SwCursor::SelectWordWT(const class SwViewShell *,short,const class Point *)
     short nWordType
     1
-sw/inc/swmodule.hxx:159
+sw/inc/swmodule.hxx:157
     void SwModule::ApplyRulerMetric(enum FieldUnit,_Bool,_Bool)
     _Bool bWeb
     0
-sw/inc/undobj.hxx:325
-    void SwUndoInsLayFormat::SwUndoInsLayFormat(class SwFrameFormat *,unsigned long,int)
-    int nCntIdx
+sw/inc/textboxhelper.hxx:243
+    void SwTextBoxNode::DelTextBox(const class SdrObject *,_Bool)
+    _Bool bDelFromDoc
+    1
+sw/inc/textboxhelper.hxx:248
+    void SwTextBoxNode::DelTextBox(const class SwFrameFormat *,_Bool)
+    _Bool bDelFromDoc
     0
-sw/inc/undobj.hxx:325
-    void SwUndoInsLayFormat::SwUndoInsLayFormat(class SwFrameFormat *,unsigned long,int)
-    unsigned long nNodeIdx
+sw/inc/undobj.hxx:327
+    void SwUndoInsLayFormat::SwUndoInsLayFormat(class SwFrameFormat *,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,int)
+    int nCntIdx
     0
-sw/inc/undobj.hxx:348
+sw/inc/undobj.hxx:350
     void SwUndoDelLayFormat::ChgShowSel(_Bool)
     _Bool bNew
     0
-sw/inc/unocrsrhelper.hxx:156
-    void SetPropertyValue(class SwPaM &,const class SfxItemPropertySet &,const class rtl::OUString &,const class com::sun::star::uno::Any &,const enum SetAttrMode)
-    const enum SetAttrMode nAttrMode
+sw/qa/extras/mailmerge/mailmerge2.cxx:85
+    void (anonymous namespace)::MMTest2::executeMailMergeTest(const char *,const char *,const char *,const char *const,int,const char *)
+    int selection
     0
-sw/qa/extras/ooxmlimport/ooxmlimport.cxx:94
-    void FailTest::executeImportTest(const char *,const char *)
-    const char * 
+sw/qa/extras/mailmerge/mailmerge2.cxx:85
+    void (anonymous namespace)::MMTest2::executeMailMergeTest(const char *,const char *,const char *,const char *const,int,const char *)
+    const char * column
     0
-sw/qa/extras/ooxmlimport/ooxmlimport.cxx:732
+sw/qa/extras/ooxmlimport/ooxmlimport.cxx:771
     void lcl_countTextFrames(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,int)
     int nExpected
     1
-sw/qa/inc/swmodeltestbase.hxx:177
-    void SwModelTestBase::executeImportTest(const char *,const char *)
-    const char * pPassword
-    0
-sw/qa/inc/swmodeltestbase.hxx:191
-    void SwModelTestBase::executeLoadReloadVerify(const char *,const char *)
-    const char * pPassword
-    0
-sw/qa/inc/swmodeltestbase.hxx:199
-    void SwModelTestBase::executeImportExport(const char *,const char *)
-    const char * pPassword
-    0
-sw/source/core/access/accmap.cxx:455
-    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,class SwAccessibleContext *,const class sw::access::SwAccessibleChild &,const enum AccessibleStates)
+sw/source/core/access/accmap.cxx:429
+    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,class SwAccessibleContext *,class sw::access::SwAccessibleChild,const enum AccessibleStates)
     enum SwAccessibleEvent_Impl::EventType eT
     0
-sw/source/core/crsr/swcrsr.cxx:72
+sw/source/core/crsr/swcrsr.cxx:74
     void (anonymous namespace)::PercentHdl::PercentHdl(unsigned long,unsigned long,class SwDocShell *)
     unsigned long nStt
     0
-sw/source/core/doc/doccomp.cxx:155
+sw/source/core/doc/doccomp.cxx:157
     void (anonymous namespace)::CompareMainText::CompareMainText(class SwDoc &,_Bool)
     _Bool bRecordDiff
     0
-sw/source/core/inc/drawfont.hxx:107
-    void SwDrawTextInfo::SwDrawTextInfo(const class SwViewShell *,class OutputDevice &,const class rtl::OUString &,const int,const int,unsigned short,_Bool)
-    _Bool bBullet
+sw/source/core/doc/DocumentRedlineManager.cxx:1003
+    _Bool lcl_AcceptInnerInsertRedline(class SwRedlineTable &,unsigned long &,int)
+    int nDepth
+    1
+sw/source/core/fields/textapi.cxx:93
+    void (anonymous namespace)::SwTextAPIForwarder::SvxOutlinerForwarder(class Outliner &,_Bool)
+    _Bool 
     0
-sw/source/core/inc/drawfont.hxx:107
+sw/source/core/inc/drawfont.hxx:111
     void SwDrawTextInfo::SwDrawTextInfo(const class SwViewShell *,class OutputDevice &,const class rtl::OUString &,const int,const int,unsigned short,_Bool)
     unsigned short nWidth
     0
+sw/source/core/inc/drawfont.hxx:111
+    void SwDrawTextInfo::SwDrawTextInfo(const class SwViewShell *,class OutputDevice &,const class rtl::OUString &,const int,const int,unsigned short,_Bool)
+    _Bool bBullet
+    0
 sw/source/core/inc/ftnfrm.hxx:55
     class SwFootnoteFrame * SwFootnoteContFrame::AppendChained(class SwFrame *,_Bool)
     _Bool bDefaultFormat
@@ -3710,67 +4066,83 @@ sw/source/core/inc/ftnfrm.hxx:56
     class SwFootnoteFrame * SwFootnoteContFrame::PrependChained(class SwFrame *,_Bool)
     _Bool bDefaultFormat
     0
-sw/source/core/inc/rolbck.hxx:400
-    void SwHistory::CopyAttr(const class SwpHints *,const unsigned long,const int,const int,const _Bool)
+sw/source/core/inc/rolbck.hxx:402
+    void SwHistory::CopyAttr(const class SwpHints *,const struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,const int,const int,const _Bool)
     const int nStart
     0
-sw/source/core/inc/scriptinfo.hxx:388
+sw/source/core/inc/scriptinfo.hxx:386
     enum SwFontScript SwScriptInfo::WhichFont(int,const class rtl::OUString &)
     int nIdx
     0
-sw/source/core/inc/swfont.hxx:287
+sw/source/core/inc/swfont.hxx:296
     const class rtl::OUString & SwFont::GetName(const enum SwFontScript) const
     const enum SwFontScript nWhich
     0
-sw/source/core/inc/txmsrt.hxx:113
+sw/source/core/inc/txmsrt.hxx:116
     class rtl::OUString SwTOXInternational::ToUpper(const class rtl::OUString &,int) const
     int nPos
     0
-sw/source/core/inc/UndoDelete.hxx:68
-    void SwUndoDelete::SwUndoDelete(class SwPaM &,_Bool,_Bool)
+sw/source/core/inc/UndoDelete.hxx:71
+    void SwUndoDelete::SwUndoDelete(class SwPaM &,enum SwDeleteFlags,_Bool,_Bool)
+    enum SwDeleteFlags flags
+    0
+sw/source/core/inc/UndoDelete.hxx:71
+    void SwUndoDelete::SwUndoDelete(class SwPaM &,enum SwDeleteFlags,_Bool,_Bool)
     _Bool bCalledByTableCpy
     0
-sw/source/core/inc/UndoTable.hxx:254
+sw/source/core/inc/UndoTable.hxx:263
     void SwUndoTableNumFormat::SwUndoTableNumFormat(const class SwTableBox &,const class SfxItemSet *)
     const class SfxItemSet * pNewSet
     0
-sw/source/core/inc/wrong.hxx:347
+sw/source/core/inc/wrong.hxx:346
     void SwWrongList::InsertSubList(int,int,unsigned short,class SwWrongList *)
     int nNewLen
     1
-sw/source/core/txtnode/txtedt.cxx:179
+sw/source/core/text/inftxt.hxx:727
+    void SwFontSave::SwFontSave(const class SwTextSizeInfo &,class SwFont *,class SwAttrIter *)
+    class SwAttrIter * pItr
+    0
+sw/source/core/text/porfld.cxx:405
+    _Bool (lambda at /home/noel/libo-plugin/sw/source/core/text/porfld.cxx:405:27)::operator()(const char16_t,const _Bool) const
+     ###2
+    1
+sw/source/core/txtnode/fntcache.cxx:754
+    void GetTextArray(const class OutputDevice &,const class SwDrawTextInfo &,class KernArray &,_Bool)
+    _Bool bCaret
+    0
+sw/source/core/txtnode/txtedt.cxx:214
     _Bool lcl_MaskRedlinesAndHiddenText(const class SwTextNode &,class rtl::OUStringBuffer &,int,int,const char16_t)
     int nStt
     0
-sw/source/core/undo/untbl.cxx:2195
+sw/source/core/undo/untbl.cxx:2192
     void (anonymous namespace)::RedlineFlagsInternGuard::RedlineFlagsInternGuard(class SwDoc &,enum RedlineFlags,enum RedlineFlags)
     enum RedlineFlags eNewRedlineFlags
     0
-sw/source/filter/html/htmltab.cxx:480
+sw/source/filter/html/htmltab.cxx:485
     unsigned short HTMLTable::GetBottomCellSpace(unsigned short,unsigned short) const
     unsigned short nRowSpan
     1
-sw/source/filter/html/htmltab.cxx:496
+sw/source/filter/html/htmltab.cxx:501
     class SwTableLine * HTMLTable::MakeTableLine(class SwTableBox *,unsigned short,unsigned short,unsigned short,unsigned short)
     unsigned short nLeftCol
     0
-sw/source/filter/html/swhtml.hxx:832
+sw/source/filter/html/swhtml.hxx:843
     void SwHTMLParser::BuildTableCell(class HTMLTable *,_Bool,_Bool)
     _Bool bReadOptions
     1
-sw/source/filter/html/wrthtml.hxx:470
+sw/source/filter/html/wrthtml.hxx:501
     void SwHTMLWriter::OutBackground(const class SfxItemSet &,_Bool)
     _Bool bGraphic
     0
-sw/source/filter/inc/fltshell.hxx:316
+sw/source/filter/inc/fltshell.hxx:297
     void ImportProgress::ImportProgress(class SwDocShell *,long,long)
     long nStartVal
     0
-sw/source/filter/inc/wrtswtbl.hxx:280
+sw/source/filter/inc/wrtswtbl.hxx:282
     unsigned short SwWriteTable::GetRelWidth(unsigned short,unsigned short) const
     unsigned short nColSpan
     1
-sw/source/filter/ww8/docxattributeoutput.hxx:733
+sw/source/filter/ww8/docxattributeoutput.hxx:814
     void DocxAttributeOutput::CmdEndField_Impl(const class SwTextNode *,int,_Bool)
     _Bool bWriteRun
     1
@@ -3778,39 +4150,43 @@ sw/source/filter/ww8/needed_cast.hxx:27
     type-parameter-?-? checking_cast(type-parameter-?-?,type-parameter-?-?)
     type-parameter-?-? 
     0
-sw/source/filter/ww8/writerwordglue.cxx:330
+sw/source/filter/ww8/rtfexport.hxx:191
+    void RtfExport::OutPageDescription(const class SwPageDesc &,_Bool)
+    _Bool bCheckForFirstPage
+    1
+sw/source/filter/ww8/writerwordglue.cxx:344
     void myImplHelpers::(anonymous namespace)::IfBeforeStart::IfBeforeStart(int)
     int nStart
     0
-sw/source/filter/ww8/wrtww8.hxx:177
+sw/source/filter/ww8/wrtww8.hxx:183
     void WW8_SepInfo::WW8_SepInfo(const class SwPageDesc *,const class SwSectionFormat *,unsigned long,class std::optional<unsigned short>,const class SwNode *,_Bool)
     _Bool bIsFirstPara
     0
-sw/source/filter/ww8/wrtww8.hxx:637
+sw/source/filter/ww8/wrtww8.hxx:649
     void MSWordExportBase::OutputItemSet(const class SfxItemSet &,_Bool,_Bool,unsigned short,_Bool)
     unsigned short nScript
     1
-sw/source/filter/ww8/wrtww8.hxx:885
+sw/source/filter/ww8/wrtww8.hxx:905
     void MSWordExportBase::NearestAnnotationMark(int &,const int,_Bool)
     _Bool bNextPositionOnly
     0
-sw/source/filter/ww8/wrtww8.hxx:1368
+sw/source/filter/ww8/wrtww8.hxx:1395
     void WW8_WrMagicTable::Append(int,unsigned long)
     int nCp
     0
-sw/source/filter/ww8/wrtww8.hxx:1368
+sw/source/filter/ww8/wrtww8.hxx:1395
     void WW8_WrMagicTable::Append(int,unsigned long)
     unsigned long nData
     0
-sw/source/filter/ww8/ww8par.cxx:438
+sw/source/filter/ww8/ww8par.cxx:439
     class rtl::OUString (anonymous namespace)::Sttb::getStringAtIndex(unsigned int)
     unsigned int 
     1
-sw/source/filter/ww8/ww8par.hxx:1686
+sw/source/filter/ww8/ww8par.hxx:1725
     _Bool SwWW8ImplReader::SetUpperSpacing(class SwPaM &,int)
     int nSpace
     0
-sw/source/filter/ww8/ww8scan.hxx:169
+sw/source/filter/ww8/ww8scan.hxx:170
     class rtl::OUString read_uInt8_BeltAndBracesString(class SvStream &,unsigned short)
     unsigned short eEnc
     1
@@ -3826,38 +4202,38 @@ sw/source/filter/ww8/ww8scan.hxx:704
     void WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(class SvStream *,const class WW8Fib &,int,long,long,long,long,long)
     int nStartCp
     0
-sw/source/filter/ww8/WW8TableInfo.hxx:303
-    class ww8::WW8TableNodeInfo * ww8::WW8TableInfo::processTableLine(const class SwTable *,const class SwTableLine *,unsigned int,unsigned int,class ww8::WW8TableNodeInfo *,class std::__debug::map<unsigned int, class ww8::WW8TableNodeInfoInner *, struct std::greater<unsigned int>, class std::allocator<struct std::pair<const unsigned int, class ww8::WW8TableNodeInfoInner *> > > &)
+sw/source/filter/ww8/WW8TableInfo.hxx:302
+    class ww8::WW8TableNodeInfo * ww8::WW8TableInfo::processTableLine(const class SwTable *,const class SwTableLine *,unsigned int,unsigned int,class ww8::WW8TableNodeInfo *,class std::map<unsigned int, class ww8::WW8TableNodeInfoInner *, struct std::greater<unsigned int> > &)
     unsigned int nDepth
     1
-sw/source/filter/xml/xmlfmt.cxx:383
+sw/source/filter/xml/xmlfmt.cxx:380
     void (anonymous namespace)::SwXMLCellStyleContext::XMLPropStyleContext(class SvXMLImport &,class SvXMLStylesContext &,enum XmlStyleFamily,_Bool)
     _Bool 
     0
-sw/source/ui/misc/impfnote.hxx:64
+sw/source/ui/inc/condedit.hxx:114
+    void ConditionEdit::ShowBrackets(_Bool)
+    _Bool bShow
+    0
+sw/source/ui/misc/impfnote.hxx:62
     void SwEndNoteOptionPage::SwEndNoteOptionPage(class weld::Container *,class weld::DialogController *,_Bool,const class SfxItemSet &)
     _Bool bEndNote
     0
-sw/source/ui/table/instable.cxx:173
+sw/source/ui/table/instable.cxx:174
     void lcl_SetProperties(class SwTableAutoFormat *,_Bool)
     _Bool bVal
     0
 sw/source/ui/vba/vbarangehelper.hxx:32
-    void SwVbaRangeHelper::insertString(const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class rtl::OUString &,_Bool)
+    void SwVbaRangeHelper::insertString(const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,class std::basic_string_view<char16_t>,_Bool)
     _Bool _bAbsorb
     1
-sw/source/uibase/inc/condedit.hxx:61
-    void ConditionEdit::ShowBrackets(_Bool)
-    _Bool bShow
+sw/source/uibase/inc/conttree.hxx:195
+    class std::unique_ptr<class weld::TreeIter> SwContentTree::GetEntryAtAbsPos(unsigned long) const
+    unsigned long nAbsPos
     0
 sw/source/uibase/inc/dbtree.hxx:59
-    class std::unique_ptr<class weld::TreeIter, struct std::default_delete<class weld::TreeIter> > SwDBTreeList::make_iterator(const class weld::TreeIter *) const
+    class std::unique_ptr<class weld::TreeIter> SwDBTreeList::make_iterator(const class weld::TreeIter *) const
     const class weld::TreeIter * pOrig
     0
-sw/source/uibase/inc/edtwin.hxx:216
-    void SwEditWin::StdDrawMode(enum SdrObjKind,_Bool)
-    enum SdrObjKind eSdrObjectKind
-    0
 sw/source/uibase/inc/frmmgr.hxx:99
     void SwFlyFrameAttrMgr::SetLRSpace(long,long)
     long nLeft
@@ -3868,51 +4244,91 @@ sw/source/uibase/inc/frmmgr.hxx:99
     0
 sw/source/uibase/inc/frmmgr.hxx:101
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
-    long nBottom
+    long nTop
     0
 sw/source/uibase/inc/frmmgr.hxx:101
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
-    long nTop
+    long nBottom
     0
-sw/source/uibase/inc/mmconfigitem.hxx:135
+sw/source/uibase/inc/mmconfigitem.hxx:137
     void SwMailMergeConfigItem::SetIndividualGreeting(_Bool,_Bool)
     _Bool bInEMail
     0
-sw/source/uibase/inc/numfmtlb.hxx:132
+sw/source/uibase/inc/numfmtlb.hxx:133
     void SwNumFormatTreeView::select(int)
     int nPos
     0
 sw/source/uibase/inc/prcntfld.hxx:69
-    int SwPercentField::get_min(enum FieldUnit) const
+    long SwPercentField::get_min(enum FieldUnit) const
     enum FieldUnit eOutUnit
     0
+sw/source/uibase/inc/swmodalredlineacceptdlg.hxx:34
+    void SwModalRedlineAcceptDlg::AcceptAll(_Bool)
+    _Bool bAccept
+    0
 sw/source/uibase/inc/swuipardlg.hxx:34
-    void SwParaDlg::SwParaDlg(class weld::Window *,class SwView &,const class SfxItemSet &,unsigned char,const class rtl::OUString *,_Bool,const class rtl::OString &)
+    void SwParaDlg::SwParaDlg(class weld::Window *,class SwView &,const class SfxItemSet &,unsigned char,const class rtl::OUString *,_Bool,const class rtl::OUString &)
     _Bool bDraw
     0
-sw/source/uibase/inc/wrtsh.hxx:119
+sw/source/uibase/inc/usrpref.hxx:291
+    void SwMasterUsrPref::SetEncloseWithCharactersOn(_Bool,_Bool)
+    _Bool noModify
+    0
+sw/source/uibase/inc/wrtsh.hxx:125
     void SwWrtShell::EndDrag(const class Point *,_Bool)
     _Bool bProp
     0
-sw/source/uibase/inc/wrtsh.hxx:120
+sw/source/uibase/inc/wrtsh.hxx:126
     long SwWrtShell::KillSelection(const class Point *,_Bool)
-    _Bool bProp
+    const class Point * pPt
     0
-sw/source/uibase/inc/wrtsh.hxx:120
+sw/source/uibase/inc/wrtsh.hxx:126
     long SwWrtShell::KillSelection(const class Point *,_Bool)
-    const class Point * pPt
+    _Bool bProp
+    0
+sw/source/uibase/inc/wrtsh.hxx:242
+    void SwWrtShell::EndSentence(_Bool)
+    _Bool bSelect
     0
-sw/source/uibase/inc/wrtsh.hxx:414
+sw/source/uibase/inc/wrtsh.hxx:427
     _Bool SwWrtShell::GotoMark(const class sw::mark::IMark *const,_Bool)
     _Bool bSelect
     0
-sw/source/uibase/inc/wrtsh.hxx:484
+sw/source/uibase/inc/wrtsh.hxx:498
+    _Bool SwWrtShell::GotoRefMark(const class rtl::OUString &,unsigned short,unsigned short,unsigned short)
+    unsigned short nFlags
+    0
+sw/source/uibase/inc/wrtsh.hxx:503
     const class SwRangeRedline * SwWrtShell::GotoRedline(unsigned long,_Bool)
     _Bool bSelect
     1
-sw/source/uibase/inc/wrtsh.hxx:493
-    void SwWrtShell::ToggleOutlineContentVisibility(class SwNode *,_Bool)
-    _Bool bForceFold
+sw/source/uibase/uiview/view2.cxx:191
+    void (anonymous namespace)::SwNumberInputDlg::SwNumberInputDlg(class weld::Window *,const class rtl::OUString &,const class rtl::OUString &,const long,const long,const long,class rtl::OUString)
+    const long min
+    1
+sw/source/writerfilter/dmapper/DomainMapper.hxx:122
+    void writerfilter::dmapper::DomainMapper::hasControls(const _Bool)
+    const _Bool bSet
+    1
+sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx:321
+    _Bool writerfilter::dmapper::FieldContext::GetCommandIsEmpty(_Bool) const
+    _Bool bType
+    0
+sw/source/writerfilter/inc/dmapper/resourcemodel.hxx:255
+    void writerfilter::Stream::text(const unsigned char *,unsigned long)
+    unsigned long len
+    1
+sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx:133
+    void writerfilter::ooxml::OOXMLDocument::resolveFootnote(class writerfilter::Stream &,unsigned int,const int)
+    unsigned int aNoteType
+    0
+sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx:146
+    void writerfilter::ooxml::OOXMLDocument::resolveEndnote(class writerfilter::Stream &,unsigned int,const int)
+    unsigned int aNoteType
+    0
+sw/source/writerfilter/ooxml/OOXMLStreamImpl.hxx:62
+    void writerfilter::ooxml::OOXMLStreamImpl::OOXMLStreamImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream>,enum writerfilter::ooxml::OOXMLStream::StreamType_t,_Bool)
+    enum writerfilter::ooxml::OOXMLStream::StreamType_t nType
     1
 test/source/sheet/xdatapilottable2.cxx:237
     struct com::sun::star::table::CellAddress getLastUsedCellAddress(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheet> &,int,int)
@@ -3922,33 +4338,45 @@ test/source/sheet/xdatapilottable2.cxx:237
     struct com::sun::star::table::CellAddress getLastUsedCellAddress(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheet> &,int,int)
     int nRow
     0
-ucb/source/ucp/tdoc/tdoc_provider.hxx:111
+ucb/source/core/ucbcmds.cxx:70
+    struct com::sun::star::beans::Property makeProperty(const class rtl::OUString &,int,class com::sun::star::uno::Type,short)
+    short a
+    0
+ucb/source/ucp/tdoc/tdoc_provider.hxx:106
     class com::sun::star::uno::Reference<class com::sun::star::io::XOutputStream> tdoc_ucp::ContentProvider::queryOutputStream(const class rtl::OUString &,const class rtl::OUString &,_Bool) const
     _Bool bTruncate
     1
-ucb/source/ucp/tdoc/tdoc_provider.hxx:118
+ucb/source/ucp/tdoc/tdoc_provider.hxx:113
     class com::sun::star::uno::Reference<class com::sun::star::io::XStream> tdoc_ucp::ContentProvider::queryStream(const class rtl::OUString &,const class rtl::OUString &,_Bool) const
     _Bool bTruncate
     0
-ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx:106
-    void webdav_ucp::DAVResourceAccess::PROPFIND(const enum webdav_ucp::Depth,class std::__debug::vector<struct webdav_ucp::DAVResourceInfo, class std::allocator<struct webdav_ucp::DAVResourceInfo> > &,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &)
-    const enum webdav_ucp::Depth nDepth
+ucb/source/ucp/webdav-curl/CurlSession.cxx:211
+    void (anonymous namespace)::CurlOption::CurlOption(const CURLoption,const long,const char *const,const enum (anonymous namespace)::CurlOption::Type)
+    const char *const i_pExceptionString
     0
-ucb/source/ucp/webdav-neon/DAVTypes.hxx:180
-    void webdav_ucp::DAVOptionsCache::setHeadAllowed(const class rtl::OUString &,_Bool)
+ucb/source/ucp/webdav-curl/DAVAuthListener.hxx:32
+    int http_dav_ucp::DAVAuthListener::authenticate(const class rtl::OUString &,const class rtl::OUString &,class rtl::OUString &,class rtl::OUString &,_Bool,_Bool)
+    _Bool bUsePreviousCredentials
+    1
+ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx:97
+    void http_dav_ucp::DAVResourceAccess::PROPFIND(const enum http_dav_ucp::Depth,class std::vector<struct http_dav_ucp::DAVResourceInfo> &,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &)
+    const enum http_dav_ucp::Depth nDepth
+    0
+ucb/source/ucp/webdav-curl/DAVTypes.hxx:171
+    void http_dav_ucp::DAVOptionsCache::setHeadAllowed(const class rtl::OUString &,_Bool)
     _Bool HeadAllowed
     0
-ucb/source/ucp/webdav-neon/NeonSession.hxx:251
-    int webdav_ucp::NeonSession::GET0(struct ne_session_s *,const char *,_Bool,void *)
-    _Bool getheaders
+unotools/source/ucbhelper/ucblockbytes.hxx:108
+    _Bool utl::UcbLockBytes::setInputStream(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,_Bool)
+    _Bool bSetXSeekable
     1
 vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:36
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateMenuItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,_Bool)
-    _Bool isEnabled
+    _Bool isVisible
     1
 vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:36
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateMenuItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,_Bool)
-    _Bool isVisible
+    _Bool isEnabled
     1
 vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:43
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateToolbarItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,int)
@@ -3958,407 +4386,383 @@ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:43
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateToolbarItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,int)
     int nStyle
     0
-vcl/backendtest/outputdevice/common.cxx:204
+vcl/backendtest/outputdevice/common.cxx:59
+    void checkValue(class BitmapScopedWriteAccess &,const class Point &,class Color,int &,int &,_Bool,int)
+    _Bool bQuirkMode
+    0
+vcl/backendtest/outputdevice/common.cxx:59
+    void checkValue(class BitmapScopedWriteAccess &,const class Point &,class Color,int &,int &,_Bool,int)
+    int nColorDeltaThresh
+    0
+vcl/backendtest/outputdevice/common.cxx:283
     enum vcl::test::TestResult checkDiamondLine(class Bitmap &,int,class Color)
     int aLayerNumber
     1
-vcl/backendtest/VisualBackendTest.cxx:53
+vcl/backendtest/VisualBackendTest.cxx:51
     void drawBitmapScaledAndCentered(const class tools::Rectangle &,class Bitmap,class OutputDevice &,enum BmpScaleFlag)
     enum BmpScaleFlag aFlag
     1
-vcl/headless/svpgdi.cxx:400
-    void (anonymous namespace)::BitmapHelper::BitmapHelper(const class SalBitmap &,const _Bool)
-    const _Bool bForceARGB32
-    1
 vcl/inc/driverblocklist.hxx:28
-    _Bool IsDeviceBlocked(const class rtl::OUString &,enum DriverBlocklist::VersionType,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    _Bool IsDeviceBlocked(const class rtl::OUString &,enum DriverBlocklist::VersionType,class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>,const class rtl::OUString &)
     enum DriverBlocklist::VersionType versionType
     1
-vcl/inc/jsdialog/jsdialogbuilder.hxx:131
-    void JSDialog::JSDialog(class VclPtr<class vcl::Window>,class Dialog *,class SalInstanceBuilder *,_Bool)
+vcl/inc/FileDefinitionWidgetDraw.hxx:60
+    void vcl::FileDefinitionWidgetDraw::drawPolyLine(class SalGraphics &,const class basegfx::B2DHomMatrix &,const class basegfx::B2DPolygon &,double,double,const class std::vector<double> *,enum basegfx::B2DLineJoin,enum com::sun::star::drawing::LineCap,double,_Bool)
+    const class std::vector<double> * i_pStroke
+    0
+vcl/inc/FileDefinitionWidgetDraw.hxx:60
+    void vcl::FileDefinitionWidgetDraw::drawPolyLine(class SalGraphics &,const class basegfx::B2DHomMatrix &,const class basegfx::B2DPolygon &,double,double,const class std::vector<double> *,enum basegfx::B2DLineJoin,enum com::sun::star::drawing::LineCap,double,_Bool)
+    enum com::sun::star::drawing::LineCap i_eLineCap
+    1
+vcl/inc/FileDefinitionWidgetDraw.hxx:60
+    void vcl::FileDefinitionWidgetDraw::drawPolyLine(class SalGraphics &,const class basegfx::B2DHomMatrix &,const class basegfx::B2DPolygon &,double,double,const class std::vector<double> *,enum basegfx::B2DLineJoin,enum com::sun::star::drawing::LineCap,double,_Bool)
+    _Bool bPixelSnapHairline
+    0
+vcl/inc/font/PhysicalFontFace.hxx:188
+    class rtl::OUString vcl::font::PhysicalFontFace::GetName(vcl::font::NameID) const
+    vcl::font::NameID aNameID
+    1
+vcl/inc/fontsubset.hxx:56
+    _Bool FontSubsetInfo::CreateFontSubset(enum FontType,class SvStream *,const char *,const unsigned int *,const unsigned char *,int)
+    const char * pOutFontName
+    0
+vcl/inc/graphic/MemoryManaged.hxx:97
+    void vcl::graphic::MemoryManaged::swappedOut(long)
+    long nNewSize
+    0
+vcl/inc/headless/BitmapHelper.hxx:35
+    void BitmapHelper::BitmapHelper(const class SalBitmap &,const _Bool)
+    const _Bool bForceARGB32
+    1
+vcl/inc/impgraph.hxx:92
+    void ImpGraphic::ImpGraphic(_Bool)
+    _Bool bDefault
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:384
+    void JSWidget::JSWidget<BaseInstanceClass, VclClass>(class JSDialogSender *,type-parameter-?-? *,class SalInstanceBuilder *,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class std::function<class std::unique_ptr<class UIObject> (class vcl::Window *)>,void *,_Bool)
     _Bool bTakeOwnership
     0
-vcl/inc/jsdialog/jsdialogbuilder.hxx:211
-    void JSMessageDialog::JSMessageDialog(class MessageDialog *,class SalInstanceBuilder *,_Bool)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:511
+    void JSDialog::JSDialog(class JSDialogSender *,class Dialog *,class SalInstanceBuilder *,_Bool)
     _Bool bTakeOwnership
-    1
-vcl/inc/jsdialog/jsdialogbuilder.hxx:211
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:528
+    void JSAssistant::JSAssistant(class JSDialogSender *,class vcl::RoadmapWizard *,class SalInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:581
+    void JSButton::JSButton(class JSDialogSender *,class Button *,class SalInstanceBuilder *,_Bool)
+    class SalInstanceBuilder * pBuilder
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:581
+    void JSButton::JSButton(class JSDialogSender *,class Button *,class SalInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:693
+    void JSMessageDialog::JSMessageDialog(class JSDialogSender *,class MessageDialog *,class SalInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
+    0
+vcl/inc/jsdialog/jsdialogbuilder.hxx:695
     void JSMessageDialog::JSMessageDialog(class MessageDialog *,class SalInstanceBuilder *,_Bool)
     class SalInstanceBuilder * pBuilder
     0
-vcl/inc/listbox.hxx:143
+vcl/inc/jsdialog/jsdialogbuilder.hxx:695
+    void JSMessageDialog::JSMessageDialog(class MessageDialog *,class SalInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
+    1
+vcl/inc/jsdialog/jsdialogbuilder.hxx:860
+    void JSPopover::JSPopover(class JSDialogSender *,class DockingWindow *,class SalInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
+    0
+vcl/inc/listbox.hxx:145
     class rtl::OUString ImplEntryList::GetSelectedEntry(int) const
     int nIndex
     0
-vcl/inc/listbox.hxx:334
+vcl/inc/listbox.hxx:336
     void ImplListBoxWindow::EnableMouseMoveSelect(_Bool)
     _Bool bMouseMoveSelect
     1
-vcl/inc/opengl/gdiimpl.hxx:107
-    void OpenGLSalGraphicsImpl::ImplSetClipBit(const class vcl::Region &,unsigned int)
-    unsigned int nMask
-    1
-vcl/inc/opengl/gdiimpl.hxx:119
-    _Bool OpenGLSalGraphicsImpl::UseLine(class Color,double,float,_Bool)
-    _Bool bUseAA
-    1
-vcl/inc/opengl/gdiimpl.hxx:125
-    void OpenGLSalGraphicsImpl::DrawConvexPolygon(const class tools::Polygon &,_Bool)
-    _Bool blockAA
+vcl/inc/ppdparser.hxx:175
+    class rtl::OUString psp::PPDParser::matchPaperImpl(int,int,_Bool,enum psp::orientation *) const
+    _Bool bDontSwap
     1
-vcl/inc/opengl/gdiimpl.hxx:134
-    void OpenGLSalGraphicsImpl::DrawTexture(class OpenGLTexture &,const struct SalTwoRect &,_Bool)
-    _Bool bInverted
-    0
-vcl/inc/opengl/gdiimpl.hxx:136
-    void OpenGLSalGraphicsImpl::DrawAlphaTexture(class OpenGLTexture &,const struct SalTwoRect &,_Bool,_Bool)
-    _Bool bInverted
-    1
-vcl/inc/opengl/gdiimpl.hxx:136
-    void OpenGLSalGraphicsImpl::DrawAlphaTexture(class OpenGLTexture &,const struct SalTwoRect &,_Bool,_Bool)
-    _Bool pPremultiplied
+vcl/inc/qt5/QtGraphics_Controls.hxx:95
+    class QSize QtGraphics_Controls::downscale(const class QSize &,enum QtGraphics_Controls::Round)
+    enum QtGraphics_Controls::Round eRound
     1
-vcl/inc/opengl/program.hxx:112
-    void OpenGLProgram::SetVertexAttrib(unsigned int &,const class rtl::OString &,int,unsigned int,unsigned char,int,const void *)
-    unsigned char bNormalized
-    0
-vcl/inc/opengl/texture.hxx:90
-    void OpenGLTexture::OpenGLTexture(int,int,_Bool)
-    _Bool bAllocate
+vcl/inc/qt5/QtGraphics_Controls.hxx:96
+    class QSize QtGraphics_Controls::upscale(const class QSize &,enum QtGraphics_Controls::Round)
+    enum QtGraphics_Controls::Round eRound
     1
-vcl/inc/qt5/Qt5FilePicker.hxx:87
-    void Qt5FilePicker::Qt5FilePicker(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,enum QFileDialog::FileMode,_Bool)
-    _Bool bUseNative
+vcl/inc/qt5/QtInstance.hxx:89
+    _Bool QtInstance::ImplYieldSignal(_Bool,_Bool)
+    _Bool bWait
     0
-vcl/inc/qt5/Qt5Graphics_Controls.hxx:94
-    class QSize Qt5Graphics_Controls::downscale(const class QSize &,enum Qt5Graphics_Controls::Round)
-    enum Qt5Graphics_Controls::Round eRound
-    1
-vcl/inc/qt5/Qt5Graphics_Controls.hxx:95
-    class QSize Qt5Graphics_Controls::upscale(const class QSize &,enum Qt5Graphics_Controls::Round)
-    enum Qt5Graphics_Controls::Round eRound
-    1
-vcl/inc/qt5/Qt5VirtualDevice.hxx:42
-    void Qt5VirtualDevice::Qt5VirtualDevice(enum DeviceFormat,double)
+vcl/inc/qt5/QtVirtualDevice.hxx:41
+    void QtVirtualDevice::QtVirtualDevice(double)
     double fScale
     1
-vcl/inc/qt5/Qt5Widget.hxx:49
-    _Bool Qt5Widget::handleKeyEvent(class Qt5Frame &,const class QWidget &,class QKeyEvent *,const enum Qt5Widget::ButtonKeyState)
-    const enum Qt5Widget::ButtonKeyState 
-    1
-vcl/inc/salgdi.hxx:136
-    void SalGraphics::GetFontMetric(class tools::SvRef<class ImplFontMetricData> &,int)
+vcl/inc/salgdi.hxx:143
+    void SalGraphics::GetFontMetric(class tools::SvRef<class FontMetricData> &,int)
     int nFallbackLevel
     0
-vcl/inc/salgdi.hxx:502
+vcl/inc/salgdi.hxx:487
     void SalGraphics::copyArea(long,long,long,long,long,long,_Bool)
     _Bool bWindowInvalidate
     1
-vcl/inc/salgdi.hxx:627
-    _Bool SalGraphics::CreateTTFfontSubset(class vcl::AbstractTrueTypeFont &,const class rtl::OString &,const _Bool,const unsigned short *,const unsigned char *,int *,int)
-    const _Bool bVertical
-    0
-vcl/inc/salvtables.hxx:1116
-    void SalInstanceDrawingArea::SalInstanceDrawingArea(class VclDrawingArea *,class SalInstanceBuilder *,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class std::function<class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > (class vcl::Window *)>,void *,_Bool)
-    _Bool bTakeOwnership
-    0
-vcl/inc/scrptrun.h:68
+vcl/inc/scrptrun.h:71
     void vcl::ScriptRun::reset(const char16_t *,int,int)
     int start
     0
-vcl/inc/sft.hxx:478
+vcl/inc/sft.hxx:482
     enum vcl::SFErrCodes OpenTTFontBuffer(const void *,unsigned int,unsigned int,class vcl::TrueTypeFont **,const class tools::SvRef<class FontCharMap>)
     unsigned int facenum
     0
-vcl/inc/sft.hxx:594
-    enum vcl::SFErrCodes CreateT3FromTTGlyphs(class vcl::TrueTypeFont *,struct _IO_FILE *,const char *,const unsigned short *,unsigned char *,int,int)
-    int wmode
-    0
-vcl/inc/skia/gdiimpl.hxx:223
-    void SkiaSalGraphicsImpl::drawGenericLayout(const class GenericSalLayout &,class Color,const class SkFont &,enum SkiaSalGraphicsImpl::GlyphOrientation)
-    enum SkiaSalGraphicsImpl::GlyphOrientation glyphOrientation
-    0
-vcl/inc/skia/utils.hxx:36
-    void disableRenderMethod(enum SkiaHelper::RenderMethod)
-    enum SkiaHelper::RenderMethod method
+vcl/inc/skia/utils.hxx:61
+    class sk_sp<class SkSurface> createSkSurface(const class Size &,enum SkColorType,enum SkAlphaType)
+    enum SkColorType type
+    1
+vcl/inc/skia/utils.hxx:200
+    struct SkSamplingOptions makeSamplingOptions(enum BmpScaleFlag,const class Size &,class Size,int)
+    int scalingFactor
+    1
+vcl/inc/strhelper.hxx:35
+    class rtl::OUString WhitespaceToSpace(class std::basic_string_view<char16_t>,_Bool)
+    _Bool bProtect
     1
-vcl/inc/svimpbox.hxx:258
+vcl/inc/svimpbox.hxx:257
     void SvImpLBox::SelectEntry(class SvTreeListEntry *,_Bool)
     _Bool bSelect
     0
-vcl/inc/unx/gendisp.hxx:45
+vcl/inc/test/outputdevice.hxx:101
+    enum vcl::test::TestResult vcl::test::OutputDeviceTestCommon::checkOpenPolygon(class Bitmap &,_Bool)
+    _Bool aEnableAA
+    0
+vcl/inc/test/outputdevice.hxx:115
+    class Bitmap vcl::test::OutputDeviceTestBitmap::setupComplexDrawTransformedBitmap(enum vcl::PixelFormat,_Bool)
+    _Bool isBitmapGreyScale
+    0
+vcl/inc/unx/fontmanager.hxx:90
+    class std::vector<struct psp::PrintFontManager::PrintFont> psp::PrintFontManager::analyzeFontFile(int,const class rtl::OString &,const char *) const
+    const char * pFormat
+    0
+vcl/inc/unx/gendisp.hxx:44
     _Bool SalGenericDisplay::DispatchInternalEvent(_Bool)
     _Bool bHandleAllCurrentEvent
     0
-vcl/inc/unx/gtk/gloactiongroup.h:51
+vcl/inc/unx/gtk/gloactiongroup.h:50
     void g_lo_action_group_insert(struct GLOActionGroup *,const char *,int,int)
     int submenu
     0
-vcl/inc/unx/gtk/gloactiongroup.h:56
+vcl/inc/unx/gtk/gloactiongroup.h:55
     void g_lo_action_group_insert_stateful(struct GLOActionGroup *,const char *,int,int,const struct _GVariantType *,const struct _GVariantType *,struct _GVariant *,struct _GVariant *)
     struct _GVariant * state_hint
     0
-vcl/inc/unx/gtk/glomenu.h:49
+vcl/inc/unx/gtk/glomenu.h:48
     void g_lo_menu_new_section(struct GLOMenu *,int,const char *)
     const char * label
     0
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:39
-    void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void (*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void *)) const
-    void (*)(struct _GtkPrintJob *, void *, const struct _GError *) callback
-    0
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:39
-    void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void (*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void *)) const
-    void (*)(void *) dnotify
-    0
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:39
-    void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void (*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void *)) const
-    void * user_data
-    0
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:58
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_support_selection(struct _GtkPrintUnixDialog *,int) const
-    int support_selection
-    1
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:59
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_has_selection(struct _GtkPrintUnixDialog *,int) const
-    int has_selection
-    1
-vcl/inc/unx/gtk/gtkprn.hxx:34
-    _Bool GtkSalPrinter::impl_doJob(const class rtl::OUString *,const class rtl::OUString &,const class rtl::OUString &,class ImplJobSetup *,_Bool,class vcl::PrinterController &)
-    _Bool i_bCollate
-    0
-vcl/inc/unx/gtk/hudawareness.h:20
-    unsigned int hud_awareness_register(struct _GDBusConnection *,const char *,void (*)(int, void *),void *,void (*)(void *),struct _GError **)
-    struct _GError ** error
+vcl/inc/unx/gtk/gtkdata.hxx:166
+    _Bool surface_get_device_position(struct _GdkWindow *,struct _GdkDevice *,double &,double &,GdkModifierType *)
+    GdkModifierType * pMask
     0
-vcl/inc/unx/gtk/hudawareness.h:20
+vcl/inc/unx/gtk/hudawareness.h:19
     unsigned int hud_awareness_register(struct _GDBusConnection *,const char *,void (*)(int, void *),void *,void (*)(void *),struct _GError **)
     void (*)(void *) notify
     0
-vcl/inc/unx/printergfx.hxx:226
-    void psp::PrinterGfx::PSSetFont(const class rtl::OString &,unsigned short)
-    unsigned short nEncoding
-    0
-vcl/inc/unx/printergfx.hxx:252
-    void psp::PrinterGfx::PSHexString(const unsigned char *,short)
-    short nLen
-    1
-vcl/inc/unx/salbmp.h:49
-    class std::unique_ptr<struct BitmapBuffer, struct std::default_delete<struct BitmapBuffer> > X11SalBitmap::ImplCreateDIB(unsigned long,class SalX11Screen,long,long,long,long,long,_Bool)
-    long nX
-    0
-vcl/inc/unx/salbmp.h:49
-    class std::unique_ptr<struct BitmapBuffer, struct std::default_delete<struct BitmapBuffer> > X11SalBitmap::ImplCreateDIB(unsigned long,class SalX11Screen,long,long,long,long,long,_Bool)
-    long nY
+vcl/inc/unx/gtk/hudawareness.h:19
+    unsigned int hud_awareness_register(struct _GDBusConnection *,const char *,void (*)(int, void *),void *,void (*)(void *),struct _GError **)
+    struct _GError ** error
     0
-vcl/inc/unx/wmadaptor.hxx:182
-    const class tools::Rectangle & vcl_sal::WMAdaptor::getWorkArea(int) const
+vcl/inc/unx/wmadaptor.hxx:179
+    const class AbsoluteScreenPixelRectangle & vcl_sal::WMAdaptor::getWorkArea(int) const
     int n
     0
-vcl/inc/unx/wmadaptor.hxx:240
-    void vcl_sal::WMAdaptor::shade(class X11SalFrame *,_Bool) const
-    _Bool bToShaded
-    1
-vcl/inc/unx/x11/xrender_peer.hxx:45
-    XRenderPictFormat * XRenderPeer::FindStandardFormat(int) const
-    int nFormat
+vcl/inc/window.h:431
+    _Bool ImplLOKHandleMouseEvent(const class VclPtr<class vcl::Window> &,enum NotifyEventType,_Bool,long,long,unsigned long,unsigned short,enum MouseEventModifiers,unsigned short)
+    _Bool bMouseLeave
     0
-vcl/inc/unx/x11/xrender_peer.hxx:61
-    void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
-    int nXSrc
-    0
-vcl/inc/unx/x11/xrender_peer.hxx:61
-    void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
-    int nYSrc
-    0
-vcl/inc/unx/x11/xrender_peer.hxx:64
-    void XRenderPeer::CompositeTriangles(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTriangle *,int) const
-    int nXSrc
-    0
-vcl/inc/unx/x11/xrender_peer.hxx:64
-    void XRenderPeer::CompositeTriangles(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTriangle *,int) const
-    int nYSrc
-    0
-vcl/inc/wizdlg.hxx:123
-    _Bool vcl::RoadmapWizard::Finish(long)
+vcl/inc/wizdlg.hxx:121
+    void vcl::RoadmapWizard::Finish(long)
     long nResult
     1
-vcl/qa/cppunit/BitmapTest.cxx:70
-    void assertColorsAreSimilar(int,const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,const class BitmapColor &,const class BitmapColor &)
+vcl/qa/cppunit/BitmapTest.cxx:72
+    void assertColorsAreSimilar(int,const class std::basic_string<char> &,const class BitmapColor &,const class BitmapColor &)
     int maxDifference
     1
-vcl/source/app/salvtables.cxx:1711
-    void (anonymous namespace)::SalInstanceAssistant::SalInstanceAssistant(class vcl::RoadmapWizard *,class SalInstanceBuilder *,_Bool)
-    _Bool bTakeOwnership
+vcl/qa/cppunit/GraphicMemoryTest.cxx:61
+    class Graphic makeUnloadedGraphic(class std::basic_string_view<char16_t>,class Size,_Bool)
+    _Bool bAlpha
     0
-vcl/source/app/salvtables.cxx:1910
-    void (anonymous namespace)::SalInstanceFrame::SalInstanceFrame(class VclFrame *,class SalInstanceBuilder *,_Bool)
-    _Bool bTakeOwnership
+vcl/qa/cppunit/PDFDocumentTest.cxx:179
+    class vcl::filter::PDFObjectElement * addObjectElement(class std::vector<class std::unique_ptr<class vcl::filter::PDFElement> > &,class vcl::filter::PDFDocument &,int,int)
+    int nObjectNumber
+    1
+vcl/qa/cppunit/PDFDocumentTest.cxx:179
+    class vcl::filter::PDFObjectElement * addObjectElement(class std::vector<class std::unique_ptr<class vcl::filter::PDFElement> > &,class vcl::filter::PDFDocument &,int,int)
+    int nGenerationNumber
     0
-vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx:225
-    void runFilter(class Bitmap &,const long,const _Bool,_Bool,unsigned char)
+vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx:224
+    void runFilter(class Bitmap &,const int,const _Bool,_Bool,unsigned char)
     const _Bool bParallel
     1
-vcl/source/bitmap/BitmapFilterStackBlur.cxx:148
-    void (anonymous namespace)::SumFunction24::set(long *&,long)
-    long nConstant
+vcl/source/bitmap/BitmapFilterStackBlur.cxx:147
+    void (anonymous namespace)::SumFunction24::set(int *&,int)
+    int nConstant
     0
-vcl/source/bitmap/BitmapFilterStackBlur.cxx:206
-    void (anonymous namespace)::SumFunction8::set(long *&,long)
-    long nConstant
+vcl/source/bitmap/BitmapFilterStackBlur.cxx:202
+    void (anonymous namespace)::SumFunction8::set(int *&,int)
+    int nConstant
     0
-vcl/source/bitmap/BitmapFilterStackBlur.cxx:479
-    void runStackBlur(class Bitmap &,const long,const long,const long,void (*)(const struct (anonymous namespace)::BlurSharedData &, long, long),void (*)(const struct (anonymous namespace)::BlurSharedData &, long, long),const _Bool)
+vcl/source/bitmap/BitmapFilterStackBlur.cxx:475
+    void runStackBlur(class Bitmap &,const int,const int,const int,void (*)(const struct (anonymous namespace)::BlurSharedData &, int, int),void (*)(const struct (anonymous namespace)::BlurSharedData &, int, int),const _Bool)
     const _Bool bParallel
     1
-vcl/source/control/imivctl.hxx:350
+vcl/source/bitmap/bmpfast.cxx:34
+    void (anonymous namespace)::BasePixelPtr::BasePixelPtr(unsigned char *)
+    unsigned char * p
+    0
+vcl/source/control/imivctl.hxx:358
     const class Size & SvxIconChoiceCtrl_Impl::GetItemSize(enum IcnViewFieldType) const
     enum IcnViewFieldType 
     1
-vcl/source/control/imivctl.hxx:396
+vcl/source/control/imivctl.hxx:404
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     unsigned short nIndex
     0
-vcl/source/control/imivctl.hxx:397
+vcl/source/control/imivctl.hxx:405
     const class SvxIconChoiceCtrlColumnInfo * SvxIconChoiceCtrl_Impl::GetColumn(unsigned short) const
     unsigned short nIndex
     0
-vcl/source/filter/FilterConfigCache.hxx:96
+vcl/source/filter/eps/eps.cxx:94
+    enum (anonymous namespace)::NMode operator|(enum (anonymous namespace)::NMode,enum (anonymous namespace)::NMode)
+    enum (anonymous namespace)::NMode a
+    1
+vcl/source/filter/eps/eps.cxx:214
+    void (anonymous namespace)::PSWriter::ImplWriteLineColor(enum (anonymous namespace)::NMode)
+    enum (anonymous namespace)::NMode nMode
+    1
+vcl/source/filter/eps/eps.cxx:215
+    void (anonymous namespace)::PSWriter::ImplWriteFillColor(enum (anonymous namespace)::NMode)
+    enum (anonymous namespace)::NMode nMode
+    1
+vcl/source/filter/FilterConfigCache.hxx:88
     class rtl::OUString FilterConfigCache::GetExportWildcard(unsigned short,int)
     int nEntry
     0
-vcl/source/filter/jpeg/Exif.cxx:170
+vcl/source/filter/jpeg/Exif.cxx:167
     void write32(unsigned int,unsigned char (&)[4],_Bool)
     unsigned int value
     1
-vcl/source/filter/wmf/wmfwr.hxx:162
+vcl/source/filter/wmf/wmfwr.hxx:161
     void WMFWriter::WMFRecord_SetBkMode(_Bool)
     _Bool bTransparent
     1
-vcl/source/fontsubset/list.h:64
-    int listSkipForward(struct list_ *,int)
-    int n
-    1
-vcl/source/gdi/bmpfast.cxx:34
-    void (anonymous namespace)::BasePixelPtr::BasePixelPtr(unsigned char *)
-    unsigned char * p
+vcl/source/fontsubset/sft.cxx:177
+    int GetTTGlyphOutline(class vcl::AbstractTrueTypeFont *,unsigned int,class std::vector<vcl::ControlPoint> &,struct vcl::(anonymous namespace)::TTGlyphMetrics *,class std::vector<unsigned int> *)
+    struct vcl::(anonymous namespace)::TTGlyphMetrics * 
     0
-vcl/source/gdi/FileDefinitionWidgetDraw.cxx:98
-    _Bool getSettingValueBool(const class rtl::OString &,_Bool)
+vcl/source/gdi/FileDefinitionWidgetDraw.cxx:103
+    _Bool getSettingValueBool(class std::basic_string_view<char>,_Bool)
     _Bool bDefault
     1
-vcl/source/window/menufloatingwindow.hxx:107
+vcl/source/window/menufloatingwindow.hxx:106
     void MenuFloatingWindow::EnableScrollMenu(_Bool)
     _Bool b
     1
-vcl/source/window/menuitemlist.hxx:111
-    struct MenuItemData * MenuItemList::Insert(unsigned short,enum MenuItemType,enum MenuItemBits,const class rtl::OUString &,class Menu *,unsigned long,const class rtl::OString &)
+vcl/source/window/menuitemlist.hxx:112
+    struct MenuItemData * MenuItemList::Insert(unsigned short,enum MenuItemType,enum MenuItemBits,const class rtl::OUString &,class Menu *,unsigned long,const class rtl::OUString &)
     enum MenuItemType eType
     1
-vcl/source/window/window2.cxx:577
-    void lcl_HandleScrollHelper(class ScrollBar *,double,_Bool)
+vcl/source/window/window2.cxx:615
+    double lcl_HandleScrollHelper(class Scrollable *,double,_Bool)
     _Bool isMultiplyByLineSize
     1
 vcl/unx/generic/app/randrwrapper.cxx:55
     void (anonymous namespace)::RandRWrapper::XRRSelectInput(struct _XDisplay *,unsigned long,int)
     int i_nMask
     1
-vcl/unx/generic/print/psputil.hxx:46
-    _Bool WritePS(class osl::File *,const char *,unsigned long)
-    unsigned long nInLength
-    1
-vcl/unx/gtk3/gtk3gtkinst.cxx:4784
-    void (anonymous namespace)::GtkInstanceMessageDialog::GtkInstanceMessageDialog(struct _GtkMessageDialog *,class (anonymous namespace)::GtkInstanceBuilder *,_Bool)
-    _Bool bTakeOwnership
-    1
-vcl/unx/gtk3/gtk3gtkinst.cxx:4784
+vcl/unx/gtk3/gtkinst.cxx:4892
+    struct _GdkPixbuf * getPixbuf(const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,_Bool)
+    _Bool bMirror
+    0
+vcl/unx/gtk3/gtkinst.cxx:7331
     void (anonymous namespace)::GtkInstanceMessageDialog::GtkInstanceMessageDialog(struct _GtkMessageDialog *,class (anonymous namespace)::GtkInstanceBuilder *,_Bool)
     class (anonymous namespace)::GtkInstanceBuilder * pBuilder
     0
-vcl/unx/gtk3/gtk3gtkinst.cxx:14829
-    int (anonymous namespace)::GtkInstanceComboBox::find_text_including_mru(const class rtl::OUString &,_Bool) const
-    _Bool bSearchMRU
-    0
-workdir/../vcl/inc/qt5/Qt5Instance.hxx:78
-    _Bool Qt5Instance::ImplYieldSignal(_Bool,_Bool)
-    _Bool bWait
-    0
-writerfilter/inc/dmapper/resourcemodel.hxx:241
-    void writerfilter::Stream::text(const unsigned char *,unsigned long)
-    unsigned long len
+vcl/unx/gtk3/gtkinst.cxx:7331
+    void (anonymous namespace)::GtkInstanceMessageDialog::GtkInstanceMessageDialog(struct _GtkMessageDialog *,class (anonymous namespace)::GtkInstanceBuilder *,_Bool)
+    _Bool bTakeOwnership
     1
-writerfilter/inc/ooxml/OOXMLDocument.hxx:132
-    void writerfilter::ooxml::OOXMLDocument::resolveFootnote(class writerfilter::Stream &,unsigned int,const int)
-    unsigned int aNoteType
-    0
-writerfilter/inc/ooxml/OOXMLDocument.hxx:145
-    void writerfilter::ooxml::OOXMLDocument::resolveEndnote(class writerfilter::Stream &,unsigned int,const int)
-    unsigned int aNoteType
+vcl/unx/gtk3/gtkinst.cxx:21964
+    int (anonymous namespace)::GtkInstanceComboBox::find_text_including_mru(class std::basic_string_view<char16_t>,_Bool) const
+    _Bool bSearchMRU
     0
-writerfilter/source/dmapper/DomainMapper.hxx:118
-    void writerfilter::dmapper::DomainMapper::hasControls(const _Bool)
-    const _Bool bSet
-    1
-writerfilter/source/ooxml/OOXMLStreamImpl.hxx:63
-    void writerfilter::ooxml::OOXMLStreamImpl::OOXMLStreamImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum writerfilter::ooxml::OOXMLStream::StreamType_t,_Bool)
-    enum writerfilter::ooxml::OOXMLStream::StreamType_t nType
-    1
-xmlhelp/source/cxxhelp/provider/databases.hxx:360
+xmlhelp/source/cxxhelp/provider/databases.hxx:372
     void chelp::DataBaseIterator::DataBaseIterator(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class chelp::Databases &,const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bHelpText
     1
-xmlhelp/source/cxxhelp/provider/databases.hxx:365
+xmlhelp/source/cxxhelp/provider/databases.hxx:377
     void chelp::DataBaseIterator::DataBaseIterator(class chelp::Databases &,const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bHelpText
     0
-xmloff/inc/txtflde.hxx:254
+xmloff/inc/txtflde.hxx:260
     void XMLTextFieldExport::ProcessIntegerDef(enum xmloff::token::XMLTokenEnum,int,int)
     int nDefault
     0
-xmloff/inc/txtflde.hxx:325
+xmloff/inc/txtflde.hxx:331
     void XMLTextFieldExport::ProcessDateTime(enum xmloff::token::XMLTokenEnum,double,_Bool,_Bool,_Bool,unsigned short)
     _Bool bOmitDurationIfZero
     1
-xmloff/inc/txtflde.hxx:334
+xmloff/inc/txtflde.hxx:340
     void XMLTextFieldExport::ProcessDateTime(enum xmloff::token::XMLTokenEnum,int,_Bool,_Bool)
     _Bool bIsDuration
     1
-xmloff/source/chart/SchXMLTools.hxx:91
-    void CreateCategories(const class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataProvider> &,const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,const class rtl::OUString &,int,int,class std::__debug::multimap<struct std::pair<int, enum SchXMLLabeledSequencePart>, class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XLabeledDataSequence>, struct std::less<struct std::pair<int, enum SchXMLLabeledSequencePart> >, class std::allocator<struct std::pair<const struct std::pair<int, enum SchXMLLabeledSequencePart>, class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XLabeledDataSequence> > > > *)
+xmloff/qa/unit/draw.cxx:45
+    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> XmloffDrawTest::getShapeTextPortion(unsigned int,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &)
+    unsigned int nIndex
+    0
+xmloff/qa/unit/style.cxx:34
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> XmloffStyleTest::getShape(unsigned char)
+    unsigned char nShapeIndex
+    0
+xmloff/source/chart/SchXMLTools.hxx:90
+    void CreateCategories(const class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataProvider> &,const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,const class rtl::OUString &,int,int,class std::multimap<struct std::pair<int, enum SchXMLLabeledSequencePart>, class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XLabeledDataSequence> > *)
     int nCooSysIndex
     0
-xmloff/source/chart/SchXMLTools.hxx:122
+xmloff/source/chart/SchXMLTools.hxx:121
     _Bool getXMLRangePropertyFromDataSequence(const class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XDataSequence> &,class rtl::OUString &,_Bool)
     _Bool bClearProp
     1
-xmloff/source/chart/transporttypes.hxx:184
-    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> &,int,int,const class rtl::OUString &,int)
+xmloff/source/chart/transporttypes.hxx:202
+    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries>,int,int,class rtl::OUString,int)
     int nPointRepeat
     1
-xmloff/source/chart/transporttypes.hxx:200
-    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,const class rtl::OUString &,int)
+xmloff/source/chart/transporttypes.hxx:218
+    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,class rtl::OUString,int)
     int nAttachedAxis
     0
 xmloff/source/text/txtflde.cxx:276
     _Bool GetOptionalBoolProperty(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySetInfo> &,_Bool)
     _Bool bDefault
     0
-xmloff/source/text/XMLIndexTemplateContext.hxx:87
-    void XMLIndexTemplateContext::XMLIndexTemplateContext(class SvXMLImport &,class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,unsigned short,const class rtl::OUString &,const SvXMLEnumMapEntry<type-parameter-?-?> *,enum xmloff::token::XMLTokenEnum,const char **,const _Bool *,_Bool)
+xmloff/source/text/XMLIndexTemplateContext.hxx:86
+    void XMLIndexTemplateContext::XMLIndexTemplateContext(class SvXMLImport &,class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const SvXMLEnumMapEntry<type-parameter-?-?> *,enum xmloff::token::XMLTokenEnum,const char **,const _Bool *,_Bool)
     _Bool bTOC_
     0
-xmloff/source/text/XMLSectionExport.hxx:105
+xmloff/source/text/XMLSectionExport.hxx:104
     _Bool XMLSectionExport::IsMuteSection(const class com::sun::star::uno::Reference<class com::sun::star::text::XTextContent> &,_Bool) const
     _Bool bDefault
     0
-xmloff/source/transform/TransformerBase.hxx:170
+xmloff/source/transform/TransformerBase.hxx:169
     const class XMLTransformerContext * XMLTransformerBase::GetAncestorContext(unsigned int) const
     unsigned int i
     1
-xmlscript/source/xmldlg_imexp/exp_share.hxx:223
+xmlscript/source/xmldlg_imexp/exp_share.hxx:224
     void xmlscript::ElementDescriptor::read(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool forceAttribute
     0
-xmlsecurity/source/component/documentdigitalsignatures.cxx:95
+xmlsecurity/source/component/documentdigitalsignatures.cxx:88
     void (anonymous namespace)::DocumentDigitalSignatures::ImplViewSignatures(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum DocumentSignatureMode,_Bool)
     _Bool bReadOnly
     1
diff --git a/compilerplugins/clang/constantparam.constructors.results b/compilerplugins/clang/constantparam.constructors.results
index ee70e78d6211..29db2a07b967 100644
--- a/compilerplugins/clang/constantparam.constructors.results
+++ b/compilerplugins/clang/constantparam.constructors.results
@@ -1,4 +1,4 @@
-accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx:120
+accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx:116
     class tools::Rectangle getRectangle(class vcl::IAccessibleTableProvider *,int,_Bool,_Bool)
     _Bool _bRowBar
     isRowBarCell()
@@ -6,50 +6,58 @@ basctl/source/inc/dlged.hxx:201
     void basctl::DlgEditor::printPage(int,class Printer *,const class rtl::OUString &)
     const class rtl::OUString & 
     CreateQualifiedName()
-basic/inc/sbobjmod.hxx:89
+basic/inc/sbobjmod.hxx:88
     void SbUserFormModuleInstance::SbUserFormModuleInstance(class SbUserFormModule *,const class rtl::OUString &,const struct com::sun::star::script::ModuleInfo &,_Bool)
     _Bool bIsVBACompat
-    IsVBACompat()
-binaryurp/source/bridge.hxx:102
+    IsVBASupport()
+basic/source/sbx/sbxexec.cxx:234
+    class tools::SvRef<class SbxVariable> Assign(class SbxObject *,class SbxObject *,const char16_t **,_Bool)
+    _Bool bCompatible
+    IsOptionCompatible()
+binaryurp/source/bridge.hxx:103
     class com::sun::star::uno::UnoInterfaceReference binaryurp::Bridge::registerIncomingInterface(const class rtl::OUString &,const class com::sun::star::uno::TypeDescription &)
     const class rtl::OUString & oid
     readOid()
-bridges/source/jni_uno/nativethreadpool.cxx:40
-    void (anonymous namespace)::Pool::Pool(const class rtl::Reference<class jvmaccess::VirtualMachine> &,struct _jmethodID *,struct _uno_ThreadPool *)
+bridges/source/jni_uno/nativethreadpool.cxx:41
+    void (anonymous namespace)::Pool::Pool(class rtl::Reference<class jvmaccess::VirtualMachine>,struct _jmethodID *,struct _uno_ThreadPool *)
     struct _uno_ThreadPool * thePool
     uno_threadpool_create()
-chart2/source/controller/inc/CommandDispatchContainer.hxx:81
-    void chart::CommandDispatchContainer::setChartDispatch(const class com::sun::star::uno::Reference<class com::sun::star::frame::XDispatch> &,const class o3tl::sorted_vector<class rtl::OUString, struct std::less<class rtl::OUString>, find_unique, true> &)
-    const class o3tl::sorted_vector<class rtl::OUString, struct std::less<class rtl::OUString>, find_unique, true> & rChartCommands
-    impl_getAvailableCommands()
-chart2/source/view/axes/VCartesianAxis.cxx:416
+chart2/source/view/axes/VCartesianAxis.cxx:408
     class rtl::OUString getTextLabelString(const class chart::FixedNumberFormatter &,const class com::sun::star::uno::Sequence<class rtl::OUString> *,const struct chart::TickInfo *,_Bool,class Color &,_Bool &)
     _Bool bComplexCat
     isComplexCategoryAxis()
-configmgr/source/dconf.cxx:120
-    void configmgr::dconf::(anonymous namespace)::GObjectHolder::GObjectHolder<T>(type-parameter-?-? *)
-    type-parameter-?-? * object
-    dconf_client_new()
-configmgr/source/dconf.cxx:201
-    void configmgr::dconf::(anonymous namespace)::ChangesetHolder::ChangesetHolder(struct _DConfChangeset *)
-    struct _DConfChangeset * changeset
-    dconf_changeset_new()
-connectivity/inc/sdbcx/VKeyColumn.hxx:38
+chart2/source/view/inc/ShapeFactory.hxx:83
+    class rtl::Reference<class SvxShapeGroup> chart::ShapeFactory::createGroup2D(const class rtl::Reference<class SvxDrawPage> &,const class rtl::OUString &)
+    const class rtl::OUString & aName
+    ""
+connectivity/inc/sdbcx/VKeyColumn.hxx:37
     void connectivity::sdbcx::OKeyColumn::OKeyColumn(_Bool)
     _Bool _bCase
     isCaseSensitive()
-connectivity/inc/sdbcx/VKeyColumn.hxx:39
-    void connectivity::sdbcx::OKeyColumn::OKeyColumn(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+connectivity/inc/sdbcx/VKeyColumn.hxx:38
+    void connectivity::sdbcx::OKeyColumn::OKeyColumn(class rtl::OUString,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     _Bool _bCase
     isCaseSensitive()
-connectivity/source/commontools/TColumnsHelper.cxx:47
+connectivity/source/commontools/TColumnsHelper.cxx:45
     void connectivity::OColumnsHelperImpl::OColumnsHelperImpl(_Bool)
     _Bool _bCase
     isCaseSensitive()
-connectivity/source/inc/calc/CTable.hxx:55
-    void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+connectivity/source/drivers/evoab2/NTable.hxx:34
+    void connectivity::evoab::OEvoabTable::OEvoabTable(class connectivity::sdbcx::OCollection *,class connectivity::evoab::OEvoabConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & SchemaName
+    ""
+connectivity/source/drivers/evoab2/NTable.hxx:34
+    void connectivity::evoab::OEvoabTable::OEvoabTable(class connectivity::sdbcx::OCollection *,class connectivity::evoab::OEvoabConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & CatalogName
     ""
+connectivity/source/drivers/firebird/View.hxx:27
+    void connectivity::firebird::View::View(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool,const class rtl::OUString &,const class rtl::OUString &)
+    _Bool _bCaseSensitive
+    isCaseSensitive()
+connectivity/source/drivers/mysqlc/mysqlc_view.hxx:38
+    void connectivity::mysqlc::View::View(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool,const class rtl::OUString &,const class rtl::OUString &)
+    _Bool _bCaseSensitive
+    isCaseSensitive()
 connectivity/source/inc/calc/CTable.hxx:55
     void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & Description
@@ -58,51 +66,63 @@ connectivity/source/inc/calc/CTable.hxx:55
     void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & SchemaName
     ""
-connectivity/source/inc/dbase/DTable.hxx:146
-    void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+connectivity/source/inc/calc/CTable.hxx:55
+    void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & CatalogName
     ""
-connectivity/source/inc/dbase/DTable.hxx:146
+connectivity/source/inc/dbase/DTable.hxx:145
     void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & Description
     ""
-connectivity/source/inc/dbase/DTable.hxx:146
+connectivity/source/inc/dbase/DTable.hxx:145
     void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & SchemaName
     ""
-connectivity/source/inc/flat/ETable.hxx:77
-    void connectivity::flat::OFlatTable::OFlatTable(class connectivity::sdbcx::OCollection *,class connectivity::flat::OFlatConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+connectivity/source/inc/dbase/DTable.hxx:145
+    void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & CatalogName
     ""
-connectivity/source/inc/flat/ETable.hxx:77
+connectivity/source/inc/flat/ETable.hxx:76
     void connectivity::flat::OFlatTable::OFlatTable(class connectivity::sdbcx::OCollection *,class connectivity::flat::OFlatConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & Description
     ""
-connectivity/source/inc/flat/ETable.hxx:77
+connectivity/source/inc/flat/ETable.hxx:76
     void connectivity::flat::OFlatTable::OFlatTable(class connectivity::sdbcx::OCollection *,class connectivity::flat::OFlatConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & SchemaName
     ""
-connectivity/source/inc/hsqldb/HView.hxx:41
+connectivity/source/inc/flat/ETable.hxx:76
+    void connectivity::flat::OFlatTable::OFlatTable(class connectivity::sdbcx::OCollection *,class connectivity::flat::OFlatConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & CatalogName
+    ""
+connectivity/source/inc/hsqldb/HView.hxx:40
     void connectivity::hsqldb::HView::HView(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool,const class rtl::OUString &,const class rtl::OUString &)
     _Bool _bCaseSensitive
     isCaseSensitive()
 connectivity/source/inc/OColumn.hxx:68
-    void connectivity::OColumn::OColumn(const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,int)
-    const class rtl::OUString & _aTableName
+    void connectivity::OColumn::OColumn(class rtl::OUString,const class rtl::OUString &,int,int,int,int,int)
+    class rtl::OUString _aTableName
     ""
-connectivity/source/manager/mdrivermanager.cxx:144
+connectivity/source/manager/mdrivermanager.cxx:140
     const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> & drivermanager::(anonymous namespace)::ExtractDriverFromAccess::operator()(const struct drivermanager::DriverAccess &) const
     const struct drivermanager::DriverAccess & _rAccess
     ExtractDriverFromAccess()
-connectivity/source/manager/mdrivermanager.cxx:152
+connectivity/source/manager/mdrivermanager.cxx:148
     const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> & drivermanager::(anonymous namespace)::ExtractDriverFromCollectionElement::operator()(const struct std::pair<const class rtl::OUString, class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> > &) const
     const struct std::pair<const class rtl::OUString, class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDriver> > & _rElement
     ExtractDriverFromCollectionElement()
-dbaccess/source/core/api/RowSetRow.hxx:39
-    void dbaccess::ORowSetOldRowHelper::ORowSetOldRowHelper(const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > &)
-    const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > & _rRow
+cppuhelper/inc/compbase2.hxx:71
+    class com::sun::star::uno::Any WeakComponentImplHelper_query(const class com::sun::star::uno::Type &,struct cppu::class_data *,class cppuhelper::WeakComponentImplHelperBase2 *)
+    struct cppu::class_data * cd
+    class_data_get()
+cui/inc/dlgname.hxx:39
+    void SvxNameDialog::SvxNameDialog(class weld::Window *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & rTitle
+    ""
+dbaccess/source/core/api/RowSetRow.hxx:40
+    void dbaccess::ORowSetOldRowHelper::ORowSetOldRowHelper(class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> >)
+    class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > _aRow
     ORowSetRow()
-dbaccess/source/core/inc/ModelImpl.hxx:311
+dbaccess/source/core/inc/ModelImpl.hxx:374
     void dbaccess::ODatabaseModelImpl::modelIsDisposing(const _Bool,struct dbaccess::ODatabaseModelImpl::ResetModelAccess)
     const _Bool _wasInitialized
     impl_isInitialized()
@@ -119,18 +139,18 @@ dbaccess/source/ui/inc/indexes.hxx:74
     const struct dbaui::GrantIndexAccess & 
     GrantIndexAccess()
 dbaccess/source/ui/inc/sqlmessage.hxx:88
-    void dbaui::OSQLMessageBox::OSQLMessageBox(class weld::Window *,const class dbtools::SQLExceptionInfo &,enum dbaui::MessBoxStyle,const class rtl::OUString &)
-    const class rtl::OUString & _rHelpURL
+    void dbaui::OSQLMessageBox::OSQLMessageBox(class weld::Window *,const class dbtools::SQLExceptionInfo &,enum dbaui::MessBoxStyle,class rtl::OUString)
+    class rtl::OUString _sHelpURL
     ""
 dbaccess/source/ui/inc/TableCopyHelper.hxx:98
-    void dbaui::OTableCopyHelper::pasteTable(const class TransferableDataHelper &,const class rtl::OUString &,const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection, class utl::DisposableComponent> &)
-    const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection, class utl::DisposableComponent> & _xConnection
+    void dbaui::OTableCopyHelper::pasteTable(const class TransferableDataHelper &,class std::basic_string_view<char16_t>,const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection> &)
+    const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection> & _xConnection
     ensureConnection()
 dbaccess/source/ui/inc/TableWindowData.hxx:65
     _Bool dbaui::OTableWindowData::init(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool)
     _Bool _bAllowQueries
     allowQueries()
-dbaccess/source/ui/inc/WCPage.hxx:56
+dbaccess/source/ui/inc/WCPage.hxx:55
     void dbaui::OCopyTable::OCopyTable(class weld::Container *,class dbaui::OCopyTableWizard *)
     class weld::Container * pParent
     CreatePageContainer()
@@ -138,35 +158,35 @@ dbaccess/source/ui/uno/copytablewizard.cxx:196
     void dbaui::(anonymous namespace)::CopyTableWizard::impl_dialogToAttributes_nothrow(const class dbaui::OCopyTableWizard &)
     const class dbaui::OCopyTableWizard & _rDialog
     impl_getDialog_throw()
-desktop/source/deployment/gui/dp_gui_dependencydialog.hxx:35
-    void dp_gui::DependencyDialog::DependencyDialog(class weld::Window *,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
+desktop/source/deployment/gui/dp_gui_dependencydialog.hxx:38
+    void dp_gui::DependencyDialog::DependencyDialog(class weld::Window *,const class std::vector<class rtl::OUString> &)
     class weld::Window * parent
     activeDialog()
-desktop/source/deployment/inc/dp_interact.h:57
+desktop/source/deployment/inc/dp_interact.h:58
     void dp_misc::ProgressLevel::update(const class com::sun::star::uno::Any &) const
     const class com::sun::star::uno::Any & status
     Any()
-editeng/source/editeng/impedit3.cxx:155
-    void lcl_DrawRedLines(class OutputDevice *,long,const class Point &,unsigned long,unsigned long,const long *,const class WrongList *,struct o3tl::strong_int<short, struct Degree10Tag>,const class Point &,_Bool,_Bool)
+editeng/source/editeng/impedit3.cxx:145
+    void lcl_DrawRedLines(class OutputDevice &,long,const class Point &,unsigned long,unsigned long,class std::span<const int>,const class WrongList *,struct o3tl::strong_int<short, struct FractionTag<10> >,const class Point &,_Bool,_Bool)
     _Bool bVertical
-    IsVertical()
-editeng/source/misc/svxacorr.cxx:2802
+    IsEffectivelyVertical()
+editeng/source/misc/svxacorr.cxx:2899
     _Bool SvxAutocorrWordList::CompareSvxAutocorrWordList::operator()(const class SvxAutocorrWord &,const class SvxAutocorrWord &) const
     const class SvxAutocorrWord & lhs
     CompareSvxAutocorrWordList()
-emfio/inc/mtftools.hxx:639
+emfio/inc/mtftools.hxx:782
+    void emfio::MtfTools::DrawRoundRect(const class tools::Rectangle &,const class Size &)
+    const class tools::Rectangle & rRect
+    ReadRectangle()
+emfio/inc/mtftools.hxx:820
     void emfio::MtfTools::ExcludeClipRect(const class tools::Rectangle &)
     const class tools::Rectangle & rRect
     ReadRectangle()
-extensions/source/abpilot/datasourcehandling.hxx:178
-    void abp::ODataSource::setDataSource(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,struct abp::PackageAccessControl)
-    struct abp::PackageAccessControl 
-    PackageAccessControl()
-extensions/source/dbpilots/controlwizard.hxx:111
+extensions/source/dbpilots/controlwizard.hxx:109
     _Bool dbp::OControlWizard::updateContext(const struct dbp::OAccessRegulator &)
     const struct dbp::OAccessRegulator & 
     OAccessRegulator()
-extensions/source/dbpilots/controlwizard.hxx:112
+extensions/source/dbpilots/controlwizard.hxx:110
     void dbp::OControlWizard::setFormConnection(const struct dbp::OAccessRegulator &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool)
     const struct dbp::OAccessRegulator & 
     OAccessRegulator()
@@ -190,91 +210,107 @@ extensions/source/propctrlr/fontdialog.hxx:36
     void pcr::ControlCharacterDialog::ControlCharacterDialog(class weld::Window *,const class SfxItemSet &)
     class weld::Window * pParent
     impl_getDefaultDialogFrame_nothrow()
-extensions/source/propctrlr/formlinkdialog.hxx:65
-    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+extensions/source/propctrlr/formlinkdialog.hxx:64
+    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,class rtl::OUString,class rtl::OUString)
     class weld::Window * _pParent
     impl_getDefaultDialogFrame_nothrow()
-extensions/source/propctrlr/formlinkdialog.hxx:65
-    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & _sDetailLabel
-    ""
-extensions/source/propctrlr/formlinkdialog.hxx:65
-    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+extensions/source/propctrlr/formlinkdialog.hxx:64
+    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,class rtl::OUString,class rtl::OUString)
     const class rtl::OUString & _sExplanation
     ""
-extensions/source/propctrlr/formlinkdialog.hxx:65
-    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & _sMasterLabel
+extensions/source/propctrlr/formlinkdialog.hxx:64
+    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,class rtl::OUString,class rtl::OUString)
+    class rtl::OUString _sDetailLabel
     ""
-extensions/source/propctrlr/listselectiondlg.hxx:38
-    void pcr::ListSelectionDialog::ListSelectionDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class rtl::OUString &)
+extensions/source/propctrlr/formlinkdialog.hxx:64
+    void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,class rtl::OUString,class rtl::OUString)
+    class rtl::OUString _sMasterLabel
+    ""
+extensions/source/propctrlr/listselectiondlg.hxx:37
+    void pcr::ListSelectionDialog::ListSelectionDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,class rtl::OUString,const class rtl::OUString &)
     class weld::Window * _pParent
     impl_getDefaultDialogFrame_nothrow()
-extensions/source/propctrlr/taborder.hxx:59
-    void pcr::TabOrderDialog::TabOrderDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTabControllerModel> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XControlContainer> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::awt::XControlContainer> & _rxControlCont
-    impl_getContextControlContainer_nothrow()
-extensions/source/propctrlr/taborder.hxx:59
+extensions/source/propctrlr/taborder.hxx:58
     void pcr::TabOrderDialog::TabOrderDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTabControllerModel> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XControlContainer> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     class weld::Window * pParent
     impl_getDefaultDialogFrame_nothrow()
-forms/source/component/ListBox.cxx:1541
-    class com::sun::star::uno::Any lcl_getSingleSelectedEntryAny(const class com::sun::star::uno::Sequence<short> &,const class std::__debug::vector<class connectivity::ORowSetValue, class std::allocator<class connectivity::ORowSetValue> > &)
-    const class std::__debug::vector<class connectivity::ORowSetValue, class std::allocator<class connectivity::ORowSetValue> > & _rStringList
+extensions/source/propctrlr/taborder.hxx:58
+    void pcr::TabOrderDialog::TabOrderDialog(class weld::Window *,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTabControllerModel> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XControlContainer> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
+    const class com::sun::star::uno::Reference<class com::sun::star::awt::XControlContainer> & _rxControlCont
+    impl_getContextControlContainer_nothrow()
+extensions/source/update/check/updatecheck.hxx:146
+    _Bool UpdateCheck::storeReleaseNote(signed char,const class rtl::OUString &)
+    const class rtl::OUString & rURL
+    ""
+extensions/source/update/check/updateprotocol.hxx:33
+    _Bool checkForUpdates(struct UpdateInfo &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::task::XInteractionHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::deployment::XUpdateInformationProvider> &)
+    const class com::sun::star::uno::Reference<class com::sun::star::deployment::XUpdateInformationProvider> & rxProvider
+    createProvider()
+forms/source/component/ListBox.cxx:1549
+    class com::sun::star::uno::Any lcl_getSingleSelectedEntryAny(const class com::sun::star::uno::Sequence<short> &,const class std::vector<class connectivity::ORowSetValue> &)
+    const class std::vector<class connectivity::ORowSetValue> & _rStringList
     impl_getValues()
-forms/source/component/ListBox.cxx:1557
-    class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> lcl_getMultiSelectedEntriesAny(const class com::sun::star::uno::Sequence<short> &,const class std::__debug::vector<class connectivity::ORowSetValue, class std::allocator<class connectivity::ORowSetValue> > &)
-    const class std::__debug::vector<class connectivity::ORowSetValue, class std::allocator<class connectivity::ORowSetValue> > & _rStringList
+forms/source/component/ListBox.cxx:1565
+    class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> lcl_getMultiSelectedEntriesAny(const class com::sun::star::uno::Sequence<short> &,const class std::vector<class connectivity::ORowSetValue> &)
+    const class std::vector<class connectivity::ORowSetValue> & _rStringList
     impl_getValues()
-forms/source/xforms/computedexpression.hxx:75
+forms/source/xforms/computedexpression.hxx:74
     _Bool xforms::ComputedExpression::_evaluate(const class xforms::EvaluationContext &,const class rtl::OUString &)
     const class rtl::OUString & sExpression
     _getExpressionForEvaluation()
-idl/inc/parser.hxx:66
+idl/inc/parser.hxx:65
     void SvIdlParser::Read(const class SvStringHashEntry *)
     const class SvStringHashEntry * 
     SvHash_module()
-include/avmedia/mediaplayer.hxx:51
+include/avmedia/mediaplayer.hxx:49
     void avmedia::MediaFloater::setURL(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     const class rtl::OUString & rReferer
     ""
-include/comphelper/propertybag.hxx:109
+include/basegfx/utils/bgradient.hxx:41
+    void basegfx::BColorStop::BColorStop(const class basegfx::BColorStop &)
+    const class basegfx::BColorStop & 
+    front()
+include/comphelper/compbase.hxx:117
+    class com::sun::star::uno::Any WeakComponentImplHelper_query(const class com::sun::star::uno::Type &,struct cppu::class_data *,class comphelper::WeakComponentImplHelperBase *)
+    struct cppu::class_data * cd
+    class_data_get()
+include/comphelper/compbase.hxx:174
+    class com::sun::star::uno::Any WeakImplHelper_query(const class com::sun::star::uno::Type &,struct cppu::class_data *,class comphelper::WeakImplHelperBase *)
+    struct cppu::class_data * cd
+    class_data_get()
+include/comphelper/propertybag.hxx:107
     void comphelper::PropertyBag::addVoidProperty(const class rtl::OUString &,const class com::sun::star::uno::Type &,int,int)
     int _nHandle
     findFreeHandle()
-include/connectivity/dbtools.hxx:177
-    class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> getConnection_withFeedback(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XWindow> &)
-    const class rtl::OUString & _rPwd
-    ""
-include/connectivity/dbtools.hxx:177
+include/connectivity/dbtools.hxx:181
     class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> getConnection_withFeedback(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XWindow> &)
     const class rtl::OUString & _rUser
     ""
-include/connectivity/dbtools.hxx:619
-    class rtl::OUString createStandardCreateStatement(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,class dbtools::ISQLStatementHelper *,const class rtl::OUString &)
-    const class rtl::OUString & _sCreatePattern
+include/connectivity/dbtools.hxx:181
+    class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> getConnection_withFeedback(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XWindow> &)
+    const class rtl::OUString & _rPwd
     ""
-include/connectivity/dbtools.hxx:695
+include/connectivity/dbtools.hxx:703
     class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> createSDBCXColumn(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class rtl::OUString &,_Bool,_Bool,_Bool,_Bool,int)
     _Bool _bCase
     isCaseSensitive()
-include/connectivity/PColumn.hxx:126
+include/connectivity/PColumn.hxx:124
     void connectivity::parse::OOrderColumn::OOrderColumn(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,_Bool,_Bool)
     _Bool _bCase
     isCaseSensitive()
-include/connectivity/PColumn.hxx:133
+include/connectivity/PColumn.hxx:131
     void connectivity::parse::OOrderColumn::OOrderColumn(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool)
     _Bool _bCase
     isCaseSensitive()
-include/connectivity/sdbcx/VView.hxx:65
-    void connectivity::sdbcx::OView::OView(_Bool,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDatabaseMetaData> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & _rCommand
+include/connectivity/sdbcx/VView.hxx:64
+    void connectivity::sdbcx::OView::OView(_Bool,const class rtl::OUString &,class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDatabaseMetaData>,class rtl::OUString,class rtl::OUString,class rtl::OUString)
+    class rtl::OUString _sCommand
     ""
-include/drawinglayer/tools/primitive2dxmldump.hxx:42
+include/drawinglayer/tools/primitive2dxmldump.hxx:45
     class std::unique_ptr<struct _xmlDoc, struct xmlDocDeleter> drawinglayer::Primitive2dXmlDump::dumpAndParse(const class drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
     const class rtl::OUString & rStreamName
     ""
-include/editeng/editview.hxx:346
+include/editeng/editview.hxx:387
     void EditView::InitLOKSpecialPositioning(enum MapUnit,const class tools::Rectangle &,const class Point &)
     const class Point & rVisDocStartPos
     Point()
@@ -282,171 +318,183 @@ include/editeng/scripttypeitem.hxx:36
     const class SfxPoolItem * SvxScriptSetItem::GetItemOfScript(unsigned short,const class SfxItemSet &,enum SvtScriptType)
     unsigned short nSlotId
     Which()
-include/editeng/svxacorr.hxx:46
-    _Bool CompareSvStringsISortDtor::operator()(const class rtl::OUString &,const class rtl::OUString &) const
-    const class rtl::OUString & lhs
+include/editeng/svxacorr.hxx:50
+    _Bool CompareSvStringsISortDtor::operator()(class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>) const
+    class std::basic_string_view<char16_t> lhs
     Compare()
-include/editeng/swafopt.hxx:47
+include/editeng/swafopt.hxx:48
     _Bool editeng::CompareAutoCompleteString::operator()(class editeng::IAutoCompleteString *const &,class editeng::IAutoCompleteString *const &) const
     class editeng::IAutoCompleteString *const & lhs
     Compare()
-include/formula/FormulaCompiler.hxx:292
-    void formula::FormulaCompiler::fillAddInToken(class std::__debug::vector<struct com::sun::star::sheet::FormulaOpCodeMapEntry, class std::allocator<struct com::sun::star::sheet::FormulaOpCodeMapEntry> > &,_Bool) const
+include/formula/FormulaCompiler.hxx:342
+    void formula::FormulaCompiler::fillAddInToken(class std::vector<struct com::sun::star::sheet::FormulaOpCodeMapEntry> &,_Bool) const
     _Bool _bIsEnglish
     isEnglish()
-include/i18nlangtag/languagetagicu.hxx:49
-    class icu_67::Locale LanguageTagIcu::getIcuLocale(const class LanguageTag &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rVariant
+include/i18nutil/searchopt.hxx:116
+    void i18nutil::SearchOptions2::SearchOptions2(const int,class rtl::OUString,class rtl::OUString,struct com::sun::star::lang::Locale,const int,const int,const int,const enum TransliterationFlags &,const short,const int)
+    class rtl::OUString replaceString_
     ""
-include/o3tl/sorted_vector.hxx:331
-    _Bool o3tl::less_ptr_to::operator()(type-parameter-?-? *const &,type-parameter-?-? *const &) const
-    type-parameter-?-? *const & lhs
-    Compare()
-include/o3tl/sorted_vector.hxx:339
-    _Bool o3tl::less_uniqueptr_to::operator()(const unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> > &,const unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> > &) const
-    const unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> > & lhs
-    Compare()
-include/o3tl/sorted_vector.hxx:353
-    pair<typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_unique, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator, _Bool> o3tl::find_unique::operator()(typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_unique, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator,typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_unique, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator,const type-parameter-?-? &)
-    typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_unique, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator first
+include/o3tl/sorted_vector.hxx:30
+    auto o3tl::find_unique::operator()(type-parameter-?-?,type-parameter-?-?,const type-parameter-?-? &)
+    type-parameter-?-? first
     Find_t()
-include/o3tl/sorted_vector.hxx:370
-    pair<typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_partialorder_ptrequals, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator, _Bool> o3tl::find_partialorder_ptrequals::operator()(typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_partialorder_ptrequals, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator,typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_partialorder_ptrequals, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator,const type-parameter-?-? &)
-    typename sorted_vector<type-parameter-?-?, type-parameter-?-?, find_partialorder_ptrequals, std::is_copy_constructible<type-parameter-?-?>::value>::const_iterator first
+include/o3tl/sorted_vector.hxx:318
+    _Bool o3tl::less_ptr_to::operator()(const type-parameter-?-? &,const type-parameter-?-? &) const
+    const type-parameter-?-? & lhs
+    Compare()
+include/o3tl/sorted_vector.hxx:330
+    auto o3tl::find_partialorder_ptrequals::operator()(type-parameter-?-?,type-parameter-?-?,const type-parameter-?-? &)
+    type-parameter-?-? first
     Find_t()
-include/oox/helper/attributelist.hxx:140
+include/oox/helper/attributelist.hxx:145
     class rtl::OUString oox::AttributeList::getXString(int,const class rtl::OUString &) const
     const class rtl::OUString & rDefault
     ""
-include/oox/mathml/importutils.hxx:207
+include/oox/mathml/importutils.hxx:212
     void oox::formulaimport::XmlStream::skipElementInternal(int,_Bool)
     int token
     currentToken()
-include/opencl/openclconfig.hxx:36
-    void OpenCLConfig::ImplMatcher::ImplMatcher(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rDevice
+include/opencl/openclconfig.hxx:37
+    void OpenCLConfig::ImplMatcher::ImplMatcher(class rtl::OUString,class rtl::OUString,class rtl::OUString,class rtl::OUString,class rtl::OUString)
+    class rtl::OUString aOSVersion
     ""
-include/opencl/openclconfig.hxx:36
-    void OpenCLConfig::ImplMatcher::ImplMatcher(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rOSVersion
+include/opencl/openclconfig.hxx:37
+    void OpenCLConfig::ImplMatcher::ImplMatcher(class rtl::OUString,class rtl::OUString,class rtl::OUString,class rtl::OUString,class rtl::OUString)
+    class rtl::OUString aDevice
     ""
 include/opencl/openclwrapper.hxx:61
     _Bool buildProgramFromBinary(const char *,struct openclwrapper::GPUEnv *,const char *,int)
     const char * buildOption
     ""
-include/registry/registry.hxx:409
+include/registry/registry.hxx:154
+    enum RegError Registry::destroy(const class rtl::OUString &)
+    const class rtl::OUString & registryName
+    ""
+include/registry/registry.hxx:391
     enum RegError RegistryKey::getKeyNames(const class rtl::OUString &,class RegistryKeyNames &)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:435
+include/registry/registry.hxx:414
     enum RegError RegistryKey::setValue(const class rtl::OUString &,enum RegValueType,void *,unsigned int)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:449
+include/registry/registry.hxx:428
     enum RegError RegistryKey::setLongListValue(const class rtl::OUString &,const int *,unsigned int)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:462
+include/registry/registry.hxx:441
     enum RegError RegistryKey::setStringListValue(const class rtl::OUString &,char **,unsigned int)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:475
+include/registry/registry.hxx:454
     enum RegError RegistryKey::setUnicodeListValue(const class rtl::OUString &,char16_t **,unsigned int)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:488
+include/registry/registry.hxx:467
     enum RegError RegistryKey::getValueInfo(const class rtl::OUString &,enum RegValueType *,unsigned int *)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:500
+include/registry/registry.hxx:479
     enum RegError RegistryKey::getValue(const class rtl::OUString &,void *)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:511
+include/registry/registry.hxx:490
     enum RegError RegistryKey::getLongListValue(const class rtl::OUString &,class RegistryValueList<int> &)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:522
+include/registry/registry.hxx:501
     enum RegError RegistryKey::getStringListValue(const class rtl::OUString &,class RegistryValueList<char *> &)
     const class rtl::OUString & keyName
     ""
-include/registry/registry.hxx:533
+include/registry/registry.hxx:512
     enum RegError RegistryKey::getUnicodeListValue(const class rtl::OUString &,class RegistryValueList<char16_t *> &)
     const class rtl::OUString & keyName
     ""
-include/registry/writer.hxx:72
-    void typereg::Writer::Writer(enum typereg_Version,const class rtl::OUString &,const class rtl::OUString &,enum RTTypeClass,_Bool,const class rtl::OUString &,unsigned short,unsigned short,unsigned short,unsigned short)
-    const class rtl::OUString & fileName
-    ""
-include/registry/writer.hxx:131
-    void typereg::Writer::setFieldData(unsigned short,const class rtl::OUString &,const class rtl::OUString &,enum RTFieldAccess,const class rtl::OUString &,const class rtl::OUString &,const class RTConstValue &)
-    const class rtl::OUString & fileName
-    ""
-include/sfx2/dinfdlg.hxx:85
-    void SfxDocumentInfoItem::SfxDocumentInfoItem(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::document::XDocumentProperties> &,const class com::sun::star::uno::Sequence<struct com::sun::star::document::CmisProperty> &,_Bool,_Bool)
-    _Bool bUseThumbnailSave
-    IsUseThumbnailSave()
-include/sfx2/dinfdlg.hxx:85
-    void SfxDocumentInfoItem::SfxDocumentInfoItem(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::document::XDocumentProperties> &,const class com::sun::star::uno::Sequence<struct com::sun::star::document::CmisProperty> &,_Bool,_Bool)
+include/sfx2/dinfdlg.hxx:96
+    void SfxDocumentInfoItem::SfxDocumentInfoItem(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::document::XDocumentProperties> &,const class com::sun::star::uno::Sequence<struct com::sun::star::document::CmisProperty> &,_Bool,_Bool,long)
     _Bool bUseUserData
     IsUseUserData()
-include/sfx2/dinfdlg.hxx:384
+include/sfx2/dinfdlg.hxx:96
+    void SfxDocumentInfoItem::SfxDocumentInfoItem(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::document::XDocumentProperties> &,const class com::sun::star::uno::Sequence<struct com::sun::star::document::CmisProperty> &,_Bool,_Bool,long)
+    _Bool bUseThumbnailSave
+    IsUseThumbnailSave()
+include/sfx2/dinfdlg.hxx:445
     void CustomPropertiesWindow::AddLine(const class rtl::OUString &,const class com::sun::star::uno::Any &)
     const class rtl::OUString & sName
     ""
-include/sfx2/docfile.hxx:257
+include/sfx2/docfile.hxx:276
     _Bool SfxMedium::SignContents_Impl(class weld::Window *,_Bool,_Bool,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::security::XCertificate> &,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,const class rtl::OUString &)
     _Bool bHasValidDocumentSignature
     HasValidSignatures()
-include/sfx2/docfile.hxx:268
+include/sfx2/docfile.hxx:287
     _Bool SfxMedium::SignDocumentContentUsingCertificate(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::security::XCertificate> &)
     _Bool bHasValidDocumentSignature
     HasValidSignatures()
-include/sfx2/lokhelper.hxx:102
-    void SfxLokHelper::notifyAllViews(int,const class rtl::OString &)
-    const class rtl::OString & rPayload
-    ""
-include/sfx2/objsh.hxx:658
-    void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short)
+include/sfx2/objsh.hxx:675
+    void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short,_Bool)
     const class JobSetup & rSetup
     JobSetup()
-include/sfx2/sfxhelp.hxx:34
-    _Bool SfxHelp::Start_Impl(const class rtl::OUString &,class weld::Widget *,const class rtl::OUString &)
-    const class rtl::OUString & rKeyword
-    ""
-include/sfx2/sidebar/ResourceManager.hxx:95
-    void sfx2::sidebar::ResourceManager::StorePanelExpansionState(const class rtl::OUString &,const _Bool,const class sfx2::sidebar::Context &)
+include/sfx2/sidebar/ResourceManager.hxx:96
+    void sfx2::sidebar::ResourceManager::StorePanelExpansionState(class std::basic_string_view<char16_t>,const _Bool,const class sfx2::sidebar::Context &)
     const class sfx2::sidebar::Context & rContext
     maContextAccess()
+include/svl/itemprop.hxx:74
+    _Bool SfxItemPropertyMapCompare::operator()(const struct SfxItemPropertyMapEntry *,const struct SfxItemPropertyMapEntry *) const
+    const struct SfxItemPropertyMapEntry * lhs
+    Compare()
+include/svl/itemprop.hxx:170
+    _Bool SfxItemPropertyMapCompare2::operator()(const struct SfxItemPropertyMapEntry &,const struct SfxItemPropertyMapEntry &) const
+    const struct SfxItemPropertyMapEntry & lhs
+    Compare()
 include/svl/sharecontrolfile.hxx:62
     void svt::ShareControlFile::RemoveEntry(const class o3tl::enumarray<enum LockFileComponent, class rtl::OUString> &)
     const class o3tl::enumarray<enum LockFileComponent, class rtl::OUString> & aOptionalSpecification
     GenerateOwnEntry()
-include/svtools/ehdl.hxx:36
-    void SfxErrorContext::SfxErrorContext(unsigned short,class weld::Window *,const struct std::pair<const char *, class ErrCode> *,const class std::locale &)
+include/svtools/ehdl.hxx:35
+    void SfxErrorContext::SfxErrorContext(unsigned short,class weld::Window *,const struct std::pair<struct TranslateId, class ErrCode> *,const class std::locale &)
     const class std::locale & rResLocaleP
     SvtResLocale()
-include/svx/charmap.hxx:150
+include/svx/charmap.hxx:152
     void SvxShowCharSet::DrawChars_Impl(class OutputDevice &,int,int)
     int n1
     FirstInView()
-include/svx/charmap.hxx:150
+include/svx/charmap.hxx:152
     void SvxShowCharSet::DrawChars_Impl(class OutputDevice &,int,int)
     int n2
     LastInView()
-include/svx/colorwindow.hxx:115
-    void ColorWindow::ColorWindow(const class rtl::OUString &,const class std::shared_ptr<class PaletteManager> &,class ColorStatus &,unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,class weld::Window *,const class MenuOrToolMenuButton &,const class std::function<void (const class rtl::OUString &, const struct std::pair<class Color, class rtl::OUString> &)> &)
-    const class rtl::OUString & rCommand
+include/svx/colorwindow.hxx:112
+    void ColorWindow::ColorWindow(class rtl::OUString,class std::shared_ptr<class PaletteManager>,class ColorStatus &,unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,const class MenuOrToolMenuButton &,class std::function<class weld::Window *(void)>,class std::function<void (const class rtl::OUString &, const struct NamedColor &)>)
+    class rtl::OUString rCommand
     ""
-include/svx/svdtrans.hxx:62
+include/svx/hlnkitem.hxx:67
+    void SvxHyperlinkItem::SvxHyperlinkItem(class TypedWhichId<class SvxHyperlinkItem>,class rtl::OUString,class rtl::OUString,class rtl::OUString,class rtl::OUString,enum SvxLinkInsertMode,enum HyperDialogEvent,const class SvxMacroTableDtor *,class rtl::OUString)
+    class rtl::OUString aReplacementText
+    ""
+include/svx/svdtrans.hxx:49
     void RotateXPoly(class XPolyPolygon &,const class Point &,double,double)
     const class Point & rRef
     Point()
-include/unotools/wincodepage.hxx:31
-    unsigned short utl_getWinTextEncodingFromLangStr(const class rtl::OUString &,_Bool)
-    const class rtl::OUString & sLanguage
-    utl_getLocaleForGlobalDefaultEncoding()
-include/vbahelper/vbahelper.hxx:118
+include/svx/unoshape.hxx:603
+    void SvxOle2Shape::SvxOle2Shape(class SdrObject *,class rtl::OUString)
+    class rtl::OUString referer
+    ""
+include/svx/xftshcit.hxx:37
+    void XFormTextShadowColorItem::XFormTextShadowColorItem(const class rtl::OUString &,const class Color &)
+    const class rtl::OUString & rName
+    ""
+include/svx/xsflclit.hxx:28
+    void XSecondaryFillColorItem::XSecondaryFillColorItem(const class rtl::OUString &,const class Color &)
+    const class rtl::OUString & rName
+    ""
+include/tools/bigint.hxx:48
+    void BigInt::MultBig(const class BigInt &,class BigInt &) const
+    const class BigInt & rB
+    MakeBig()
+include/unotools/charclass.hxx:157
+    struct com::sun::star::i18n::ParseResult CharClass::parsePredefinedToken(int,const class rtl::OUString &,int,int,const class rtl::OUString &,int,const class rtl::OUString &) const
+    const class rtl::OUString & userDefinedCharactersStart
+    ""
+include/vbahelper/vbahelper.hxx:119
     class rtl::OUString extractStringFromAny(const class com::sun::star::uno::Any &,const class rtl::OUString &,_Bool)
     const class rtl::OUString & rDefault
     ""
@@ -454,111 +502,111 @@ include/vcl/accessibletable.hxx:87
     class tools::Rectangle vcl::table::IAccessibleTable::calcHeaderRect(_Bool)
     _Bool _bIsColumnBar
     isColumnBar()
-include/vcl/dockwin.hxx:37
+include/vcl/dockwin.hxx:39
     void DockingData::DockingData(const class Point &,const class tools::Rectangle &,_Bool)
     _Bool b
     IsFloatingMode()
-include/vcl/dockwin.hxx:48
+include/vcl/dockwin.hxx:50
     void EndDockingData::EndDockingData(const class tools::Rectangle &,_Bool,_Bool)
     _Bool b
     IsFloatingMode()
-include/vcl/dockwin.hxx:48
+include/vcl/dockwin.hxx:50
     void EndDockingData::EndDockingData(const class tools::Rectangle &,_Bool,_Bool)
     _Bool bCancelled
     IsDockingCanceled()
-include/vcl/FilterConfigItem.hxx:75
+include/vcl/FilterConfigItem.hxx:81
     class rtl::OUString FilterConfigItem::ReadString(const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rDefault
     ""
+include/vcl/glyphitemcache.hxx:98
+    unsigned long SalLayoutGlyphsCache::GlyphsCost::operator()(const class SalLayoutGlyphs &) const
+    const class SalLayoutGlyphs & 
+    ValueSize()
 include/vcl/graphictools.hxx:278
-    void SvtGraphicFill::SvtGraphicFill(const class tools::PolyPolygon &,class Color,double,enum SvtGraphicFill::FillRule,enum SvtGraphicFill::FillType,const struct SvtGraphicFill::Transform &,_Bool,enum SvtGraphicFill::HatchType,class Color,enum SvtGraphicFill::GradientType,class Color,class Color,int,const class Graphic &)
+    void SvtGraphicFill::SvtGraphicFill(class tools::PolyPolygon,class Color,double,enum SvtGraphicFill::FillRule,enum SvtGraphicFill::FillType,const struct SvtGraphicFill::Transform &,_Bool,enum SvtGraphicFill::HatchType,class Color,enum SvtGraphicFill::GradientType,class Color,class Color,int,class Graphic)
     class Color aFillColor
     Color()
-include/vcl/outdev.hxx:1576
-    class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const class Point &,const class Size &,const class Bitmap &,long,long)
-    const class Point & rSrcPt
-    Point()
-include/vcl/print.hxx:630
+include/vcl/opengl/OpenGLHelper.hxx:57
+    int OpenGLHelper::LoadShaders(const class rtl::OUString &,const class rtl::OUString &,class std::basic_string_view<char>,class std::basic_string_view<char>)
+    class std::basic_string_view<char> rDigest
+    ""
+include/vcl/print.hxx:583
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setSubgroupControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rHelpId
     ""
-include/vcl/print.hxx:646
+include/vcl/print.hxx:599
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,const class com::sun::star::uno::Sequence<unsigned char> &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:657
+include/vcl/print.hxx:610
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:665
+include/vcl/print.hxx:618
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setEditControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
 include/vcl/toolbox.hxx:410
-    void ToolBox::SetHelpText(unsigned short,const class rtl::OUString &)
+    void ToolBox::SetHelpText(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,const class rtl::OUString &)
     const class rtl::OUString & rText
     ""
-include/vcl/toolkit/field.hxx:313
-    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
+include/vcl/toolkit/field.hxx:320
+    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,class std::basic_string_view<char16_t>,int,const class LocaleDataWrapper &)
     _Bool bDuration
     IsDuration()
-include/vcl/toolkit/field.hxx:313
-    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
+include/vcl/toolkit/field.hxx:320
+    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,class std::basic_string_view<char16_t>,int,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-include/vcl/toolkit/field.hxx:418
-    int DateFormatter::GetDateArea(enum ExtDateFieldFormat,const class rtl::OUString &,int,const class LocaleDataWrapper &)
+include/vcl/toolkit/field.hxx:426
+    int DateFormatter::GetDateArea(enum ExtDateFieldFormat &,class std::basic_string_view<char16_t>,int,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
 include/vcl/toolkit/svlbitm.hxx:115
-    void SvLBoxString::SvLBoxString(const class rtl::OUString &)
-    const class rtl::OUString & rText
+    void SvLBoxString::SvLBoxString(class rtl::OUString)
+    class rtl::OUString aText
     ""
-include/vcl/toolkit/unowrap.hxx:66
+include/vcl/toolkit/unowrap.hxx:70
     class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> UnoWrapperBase::CreateAccessible(class Menu *,_Bool)
     _Bool bIsMenuBar
     IsMenuBar()
-include/vcl/transfer.hxx:319
+include/vcl/transfer.hxx:313
     class com::sun::star::uno::Any TransferableDataHelper::GetAny(enum SotClipboardFormatId,const class rtl::OUString &) const
     const class rtl::OUString & rDestDoc
     ""
-include/vcl/transfer.hxx:357
-    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
-    const class rtl::OUString & rDestDoc
-    ""
-include/vcl/virdev.hxx:162
-    _Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(const class Size &,const class Fraction &,const class Point &,unsigned char *)
+include/vcl/virdev.hxx:128
+    _Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndLOKBuffer(const class Size &,const class Fraction &,const class Point &,unsigned char *)
     const class Point & rNewOffset
     Point()
-include/vcl/weld.hxx:569
-    void weld::ComboBoxEntry::ComboBoxEntry(const class rtl::OUString &)
-    const class rtl::OUString & rString
+include/vcl/weld.hxx:685
+    void weld::ComboBoxEntry::ComboBoxEntry(class rtl::OUString)
+    class rtl::OUString _aString
     ""
-include/vcl/weld.hxx:647
-    void weld::ComboBox::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
+include/vcl/weld.hxx:2525
+    void weld::Toolbar::append_separator(const class rtl::OUString &)
     const class rtl::OUString & rId
     ""
-include/xmloff/txtparae.hxx:407
+include/xmloff/txtparae.hxx:417
     void XMLTextParagraphExport::exportTextStyles(_Bool,_Bool)
     _Bool bProg
     IsShowProgress()
-include/xmloff/txtparae.hxx:457
+include/xmloff/txtparae.hxx:467
     void XMLTextParagraphExport::collectTextAutoStyles(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool)
     _Bool bIsProgress
     IsShowProgress()
-include/xmloff/txtparae.hxx:487
+include/xmloff/txtparae.hxx:497
     void XMLTextParagraphExport::exportText(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool)
     _Bool bIsProgress
     IsShowProgress()
-include/xmloff/xmlexp.hxx:279
-    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit,enum SvXMLExportFlags)
-    const class rtl::OUString & implementationName
+include/xmloff/xmlexp.hxx:283
+    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class rtl::OUString,class rtl::OUString,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit,enum SvXMLExportFlags)
+    class rtl::OUString implementationName
     ""
-include/xmloff/xmlexp.hxx:279
-    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit,enum SvXMLExportFlags)
-    const class rtl::OUString & rFileName
+include/xmloff/xmlexp.hxx:283
+    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class rtl::OUString,class rtl::OUString,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit,enum SvXMLExportFlags)
+    class rtl::OUString fileName
     ""
-include/xmloff/XMLFontStylesContext.hxx:54
+include/xmloff/XMLFontStylesContext.hxx:51
     void XMLFontStylesContext::XMLFontStylesContext(class SvXMLImport &,unsigned short)
     unsigned short eDfltEnc
     osl_getThreadTextEncoding()
@@ -606,43 +654,59 @@ lotuswordpro/source/filter/lwpbreaksoverride.hxx:128
     void LwpBreaksOverride::OverrideUseNextStyle(_Bool)
     _Bool bVal
     IsUseNextStyle()
-opencl/source/opencl_device.cxx:431
-    void (anonymous namespace)::LogWriter::text(const class rtl::OString &)
-    const class rtl::OString & rText
-    ""
-opencl/source/openclwrapper.cxx:706
-    struct _cl_device_id * findDeviceIdByDeviceString(const class rtl::OUString &,const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > &)
-    const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > & rPlatforms
+o3tl/qa/test-lru_map.cxx:312
+    unsigned long cost_is_value::operator()(int)
+    int i
+    ValueSize()
+opencl/source/opencl_device.cxx:430
+    void (anonymous namespace)::LogWriter::text(class std::basic_string_view<char>)
+    class std::basic_string_view<char> rText
+    ""
+opencl/source/openclwrapper.cxx:704
+    struct _cl_device_id * findDeviceIdByDeviceString(class std::basic_string_view<char16_t>,const class std::vector<struct OpenCLPlatformInfo> &)
+    const class std::vector<struct OpenCLPlatformInfo> & rPlatforms
     fillOpenCLInfo()
-reportdesign/source/ui/dlg/Condition.hxx:128
+reportdesign/source/ui/dlg/Condition.hxx:129
     void rptui::Condition::setConditionIndex(unsigned long,unsigned long)
     unsigned long _nCondCount
     impl_getConditionCount()
-sal/qa/osl/file/osl_File.cxx:379
+sal/qa/osl/file/osl_File.cxx:373
     class rtl::OString outputError(const class rtl::OString &,const class rtl::OString &,const char *)
     const char * msg
     ""
-sc/inc/table.hxx:785
+sc/inc/formularesult.hxx:44
+    void sc::FormulaResultValue::FormulaResultValue(class svl::SharedString,_Bool)
+    _Bool bMultiLine
+    IsMultiline()
+sc/inc/table.hxx:516
+    void ScTable::CommentNotifyAddressChange(short,int,short,int)
+    int nRow2
+    MaxRow()
+sc/inc/table.hxx:853
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nEndRow
     MaxRow()
-sc/inc/typedstrdata.hxx:43
+sc/inc/typedstrdata.hxx:64
     _Bool ScTypedStrData::LessCaseInsensitive::operator()(const class ScTypedStrData &,const class ScTypedStrData &) const
     const class ScTypedStrData & left
     LessCaseInsensitive()
-sc/qa/extras/check_xcell_ranges_query.cxx:38
+sc/inc/viewopti.hxx:113
+    void ScViewOptions::SetGridColor(const class Color &,const class rtl::OUString &)
+    const class rtl::OUString & rName
+    ""
+sc/qa/extras/sccheck_xcell_ranges_query.cxx:36
     void sc_apitest::CheckXCellRangesQuery::_queryEmptyCells(const class rtl::OUString &)
     const class rtl::OUString & expected
     ""
-sc/qa/unit/helper/qahelper.hxx:192
-    class tools::SvRef<class ScDocShell> ScBootstrapFixture::saveAndReload(class ScDocShell *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum SfxFilterFlags,const class rtl::OUString *)
-    const class rtl::OUString & rUserData
+sc/qa/unit/helper/scfiltertestbase.hxx:54
+    class rtl::Reference<class ScDocShell> ScFilterTestBase::loadDoc(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum SfxFilterFlags,enum SotClipboardFormatId,int)
+    const class rtl::OUString & rTypeName
     ""
-sc/source/core/data/documen3.cxx:1739
+sc/source/core/data/documen3.cxx:1757
     _Bool lcl_AddTwipsWhile(long &,long,int &,int,const class ScTable *,_Bool)
     int nEndRow
     MaxRow()
-sc/source/core/tool/token.cxx:4825
+sc/source/core/tool/token.cxx:4968
     void appendTokenByType(struct ScSheetLimits &,struct sc::TokenStringContext &,class rtl::OUStringBuffer &,const class formula::FormulaToken &,const class ScAddress &,_Bool)
     _Bool bFromRangeName
     IsFromRangeName()
@@ -650,23 +714,15 @@ sc/source/filter/excel/xeformula.cxx:150
     void (anonymous namespace)::XclExpFuncData::FinishParam(unsigned short)
     unsigned short nTokPos
     PopOperandPos()
-sc/source/filter/excel/xltoolbar.hxx:47
+sc/source/filter/excel/xltoolbar.hxx:46
     _Bool ScTBC::ImportToolBarControl(class ScCTBWrapper &,const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> &,class CustomToolBarImportHelper &,_Bool)
     _Bool bIsMenuBar
     IsMenuToolbar()
-sc/source/filter/inc/workbookhelper.hxx:165
-    class ScRangeData * oox::xls::WorkbookHelper::createNamedRangeObject(class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> &,int,int) const
-    const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> & rTokens
-    ApiTokenSequence()
-sc/source/filter/inc/workbookhelper.hxx:174
-    class ScRangeData * oox::xls::WorkbookHelper::createLocalNamedRangeObject(class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> &,int,int,int) const
-    const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> & rTokens
-    ApiTokenSequence()
-sc/source/filter/inc/xechart.hxx:799
+sc/source/filter/inc/xechart.hxx:798
     void XclExpChChart3d::Convert(const class ScfPropertySet &,_Bool)
     _Bool b3dWallChart
     Is3dWallChart()
-sc/source/filter/inc/xestream.hxx:286
+sc/source/filter/inc/xestream.hxx:287
     void XclExpXmlStream::XclExpXmlStream(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,_Bool,_Bool)
     _Bool bExportTemplate
     isExportTemplate()
@@ -674,106 +730,86 @@ sc/source/filter/inc/xestyle.hxx:147
     _Bool CheckItems(const class XclExpRoot &,const class SfxItemSet &,short,_Bool)
     _Bool bDeep
     IsStyleXF()
-sc/source/filter/inc/xichart.hxx:894
+sc/source/filter/inc/xichart.hxx:893
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XCoordinateSystem> XclImpChType::CreateCoordSystem(_Bool) const
     _Bool b3dChart
     Is3dChart()
-sc/source/filter/inc/xichart.hxx:897
+sc/source/filter/inc/xichart.hxx:896
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartType> XclImpChType::CreateChartType(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDiagram> &,_Bool) const
     _Bool b3dChart
     Is3dChart()
-sc/source/filter/inc/xichart.hxx:914
+sc/source/filter/inc/xichart.hxx:913
     void XclImpChChart3d::Convert(class ScfPropertySet &,_Bool) const
     _Bool b3dWallChart
     Is3dWallChart()
-sc/source/filter/inc/xistream.hxx:446
+sc/source/filter/inc/xistream.hxx:445
     void XclImpStream::IgnoreUniString(unsigned short,unsigned char)
     unsigned char nFlags
     ReaduInt8()
-sc/source/filter/inc/xlescher.hxx:424
+sc/source/filter/inc/xlescher.hxx:423
     _Bool XclControlHelper::FillMacroDescriptor(struct com::sun::star::script::ScriptEventDescriptor &,enum XclTbxEventType,const class rtl::OUString &,class SfxObjectShell *)
     enum XclTbxEventType eEventType
     DoGetEventType()
-sc/source/filter/oox/formulabuffer.cxx:317
-    void processSheetFormulaCells(class ScDocumentImport &,struct oox::xls::FormulaBuffer::SheetItem &,class SvNumberFormatter &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::ExternalLinkInfo> &,_Bool)
-    _Bool bGeneratorKnownGood
-    isGeneratorKnownGood()
-sc/source/filter/oox/querytablebuffer.cxx:102
-    class com::sun::star::uno::Reference<class com::sun::star::sheet::XAreaLink> lclFindAreaLink(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XAreaLinks> &,const class ScAddress &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rFilterOptions
-    ""
-sc/source/ui/inc/AccessibleCsvControl.hxx:447
-    void ScAccessibleCsvCell::ScAccessibleCsvCell(class ScCsvGrid &,const class rtl::OUString &,int,int)
+sc/source/ui/inc/AccessibleCsvControl.hxx:417
+    void ScAccessibleCsvCell::ScAccessibleCsvCell(class ScCsvGrid &,class rtl::OUString,int,int)
     class ScCsvGrid & rGrid
     implGetGrid()
-sc/source/ui/vba/vbasheetobject.hxx:175
+sc/source/ui/inc/docfunc.hxx:180
+    _Bool ScDocFunc::EnterMatrix(const class ScRange &,const class ScMarkData *,const class ScTokenArray *,const class rtl::OUString &,_Bool,_Bool,const class rtl::OUString &,const enum formula::FormulaGrammar::Grammar)
+    const class rtl::OUString & rFormulaNmsp
+    ""
+sc/source/ui/inc/viewfunc.hxx:283
+    void ScViewFunc::InsertTableLink(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,class std::basic_string_view<char16_t>)
+    const class rtl::OUString & rFilter
+    ""
+sc/source/ui/inc/viewfunc.hxx:283
+    void ScViewFunc::InsertTableLink(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,class std::basic_string_view<char16_t>)
+    const class rtl::OUString & rOptions
+    ""
+sc/source/ui/inc/viewfunc.hxx:286
+    void ScViewFunc::InsertAreaLink(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & rFilter
+    ""
+sc/source/ui/inc/viewfunc.hxx:286
+    void ScViewFunc::InsertAreaLink(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & rOptions
+    ""
+sc/source/ui/vba/vbasheetobject.hxx:174
     void ScVbaButton::ScVbaButton(const class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> &,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> &)
     const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> & rxFormIC
     createForm()
-sc/source/ui/vba/vbawindows.cxx:106
-    void (anonymous namespace)::WindowEnumImpl::WindowEnumImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Any &)
-    const class com::sun::star::uno::Any & aApplication
+sc/source/ui/vba/vbawindows.cxx:111
+    void (anonymous namespace)::WindowEnumImpl::WindowEnumImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class com::sun::star::uno::Any)
+    class com::sun::star::uno::Any aApplication
     Application()
-sd/source/filter/eppt/eppt.hxx:177
-    unsigned int PPTWriter::ImplInsertBookmarkURL(const class rtl::OUString &,const unsigned int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rStringVer2
+sd/source/console/PresenterConfigurationAccess.hxx:116
+    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> sdext::presenter::PresenterConfigurationAccess::GetNodeProperties(const class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameAccess> &,const class rtl::OUString &)
+    const class rtl::OUString & rsPathToNode
     ""
-sd/source/filter/eppt/pptx-animations.cxx:559
-    void (anonymous namespace)::NodeContext::initValid(_Bool,_Bool)
+sd/source/filter/eppt/pptx-animations-nodectx.hxx:49
+    void oox::core::NodeContext::initValid(_Bool,_Bool)
     _Bool bHasValidChild
     initChildNodes()
-sd/source/filter/xml/sdxmlwrp.cxx:138
+sd/source/filter/xml/sdxmlwrp.cxx:137
     const struct (anonymous namespace)::XML_SERVICES * getServices(_Bool,_Bool,unsigned long)
     _Bool bDraw
     IsDraw()
-sd/source/ui/annotations/annotationtag.cxx:163
-    void sd::(anonymous namespace)::AnnotationHdl::AnnotationHdl(const class rtl::Reference<class sd::SmartTag> &,const class com::sun::star::uno::Reference<class com::sun::star::office::XAnnotation> &,const class Point &)
+sd/source/ui/annotations/annotationtag.cxx:162
+    void sd::(anonymous namespace)::AnnotationHdl::AnnotationHdl(const class rtl::Reference<class sd::SmartTag> &,const class rtl::Reference<class sd::Annotation> &,const class Point &)
     const class Point & rPnt
     Point()
-sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx:32
+sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx:31
     void sd::slidesorter::cache::RequestFactory::operator()(class sd::slidesorter::cache::RequestQueue &,const class std::shared_ptr<class sd::slidesorter::cache::CacheContext> &)
     class sd::slidesorter::cache::RequestQueue & rRequestQueue
     RequestFactory()
-sdext/source/pdfimport/inc/contentsink.hxx:130
-    void pdfi::ContentSink::strokePath(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> & rPath
-    readPath()
-sdext/source/pdfimport/inc/contentsink.hxx:132
-    void pdfi::ContentSink::fillPath(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> & rPath
-    readPath()
-sdext/source/pdfimport/inc/contentsink.hxx:134
-    void pdfi::ContentSink::eoFillPath(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> & rPath
-    readPath()
-sdext/source/pdfimport/inc/contentsink.hxx:137
-    void pdfi::ContentSink::intersectClip(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> & rPath
-    readPath()
-sdext/source/pdfimport/inc/contentsink.hxx:139
-    void pdfi::ContentSink::intersectEoClip(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> &)
-    const class com::sun::star::uno::Reference<class com::sun::star::rendering::XPolyPolygon2D> & rPath
-    readPath()
 sdext/source/pdfimport/inc/contentsink.hxx:151
     void pdfi::ContentSink::drawMask(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool)
     const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> & xBitmap
     readImageImpl()
-sdext/source/presenter/PresenterConfigurationAccess.hxx:116
-    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> sdext::presenter::PresenterConfigurationAccess::GetNodeProperties(const class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameAccess> &,const class rtl::OUString &)
-    const class rtl::OUString & rsPathToNode
-    ""
-sfx2/source/inc/versdlg.hxx:51
+sfx2/source/inc/versdlg.hxx:52
     void SfxVersionDialog::SfxVersionDialog(class weld::Window *,class SfxViewFrame *,_Bool)
     _Bool 
     IsSaveVersionOnClose()
-slideshow/source/engine/opengl/TransitionImpl.cxx:636
-    class std::shared_ptr<class OGLTransitionImpl> makeSimpleTransition(const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class std::shared_ptr<class Operation>, class std::allocator<class std::shared_ptr<class Operation> > > &,const struct TransitionSettings &)
-    const struct TransitionSettings & rSettings
-    TransitionSettings()
-slideshow/source/engine/opengl/TransitionImpl.cxx:2038
-    class std::shared_ptr<class OGLTransitionImpl> makeGlitterTransition(const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const struct TransitionSettings &)
-    const struct TransitionSettings & rSettings
-    TransitionSettings()
 slideshow/source/inc/transitionfactory.hxx:61
     class std::shared_ptr<class slideshow::internal::AnimationActivity> createShapeTransition(const struct slideshow::internal::ActivitiesFactory::CommonParameters &,const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeManager> &,const class basegfx::B2DVector &,const class com::sun::star::uno::Reference<class com::sun::star::animations::XTransitionFilter> &)
     const struct slideshow::internal::ActivitiesFactory::CommonParameters & rParms
@@ -782,30 +818,54 @@ soltools/cpp/cpp.h:212
     void peektokens(struct tokenrow *,char *)
     char * 
     ""
-starmath/inc/cursor.hxx:185
+starmath/inc/cursor.hxx:187
     void SmCursor::Draw(class OutputDevice &,class Point,_Bool)
     _Bool isCaretVisible
     IsCursorVisible()
-store/source/lockbyte.cxx:269
+starmath/inc/token.hxx:195
+    void SmColorTokenTableEntry::SmColorTokenTableEntry(class rtl::OUString,enum SmTokenType,unsigned int)
+    class rtl::OUString name
+    ""
+starmath/source/mathtype.hxx:42
+    _Bool LessMathTypeFont::operator()(const class MathTypeFont &,const class MathTypeFont &) const
+    const class MathTypeFont & rValue1
+    Compare()
+store/source/lockbyte.cxx:258
     void store::(anonymous namespace)::FileHandle::CloseFile::operator()(struct store::(anonymous namespace)::FileHandle &) const
     struct store::(anonymous namespace)::FileHandle & rFile
     destructor_type()
-store/source/lockbyte.cxx:495
+store/source/lockbyte.cxx:484
     void store::(anonymous namespace)::FileMapping::UnmapFile::operator()(struct store::(anonymous namespace)::FileMapping &) const
     struct store::(anonymous namespace)::FileMapping & rMapping
     destructor_type()
-store/source/lockbyte.cxx:827
+store/source/lockbyte.cxx:806
     void store::(anonymous namespace)::ResourceHolder::ResourceHolder<T>(const type-parameter-?-? &)
     const type-parameter-?-? & value
     T()
-svx/inc/dragmt3d.hxx:91
+svl/source/items/itemprop.cxx:62
+    _Bool Compare::operator()(class std::basic_string_view<char16_t>,const struct SfxItemPropertyMapEntry *) const
+    class std::basic_string_view<char16_t> lhs
+    Compare()
+svl/source/items/itemprop.cxx:348
+    _Bool Compare::operator()(class std::basic_string_view<char16_t>,const struct SfxItemPropertyMapEntry &) const
+    class std::basic_string_view<char16_t> lhs
+    Compare()
+svx/inc/dragmt3d.hxx:90
     void E3dDragRotate::E3dDragRotate(class SdrDragView &,const class SdrMarkList &,enum E3dDragConstraint,_Bool)
     _Bool bFull
     IsSolidDragging()
-svx/inc/dragmt3d.hxx:108
+svx/inc/dragmt3d.hxx:107
     void E3dDragMove::E3dDragMove(class SdrDragView &,const class SdrMarkList &,enum SdrHdlKind,enum E3dDragConstraint,_Bool)
     _Bool bFull
     IsSolidDragging()
+svx/source/dialog/langbox.cxx:204
+    _Bool NaturalStringSorterCompare::operator()(const class rtl::OUString &,const class rtl::OUString &) const
+    const class rtl::OUString & rLHS
+    NaturalStringSorterCompare()
+svx/source/dialog/langbox.cxx:221
+    _Bool GenericFirst::operator()(const struct EntryData &,const struct EntryData &) const
+    const struct EntryData & e1
+    Compare()
 svx/source/inc/treevisitor.hxx:29
     void TreeVisitor::TreeVisitor<ELEMENT, NODEINFO, PROCESSOR>(type-parameter-?-?)
     type-parameter-?-? _nodeInfo
@@ -818,143 +878,123 @@ svx/source/inc/xmlxtimp.hxx:42
     _Bool SvxXMLXTableImport::load(const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> &,_Bool *)
     const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> & xTable
     createInstance()
-svx/source/svdraw/svdmodel.cxx:1881
-    void addPair(class std::__debug::vector<struct std::pair<class rtl::OUString, class com::sun::star::uno::Any>, class std::allocator<struct std::pair<class rtl::OUString, class com::sun::star::uno::Any> > > &,const class rtl::OUString &,const type-parameter-?-?)
-    const type-parameter-?-? val
-    IsAnchoredTextOverflowLegacy()
-sw/inc/doc.hxx:918
-    const class SwTOXMark & SwDoc::GotoTOXMark(const class SwTOXMark &,enum SwTOXSearch,_Bool)
-    _Bool bInReadOnly
-    IsReadOnlyAvailable()
-sw/inc/ftnidx.hxx:38
+sw/inc/ftnidx.hxx:39
     _Bool CompareSwFootnoteIdxs::operator()(class SwTextFootnote *const &,class SwTextFootnote *const &) const
     class SwTextFootnote *const & lhs
     Compare()
-sw/inc/ndarr.hxx:73
-    _Bool CompareSwOutlineNodes::operator()(class SwNode *const &,class SwNode *const &) const
-    class SwNode *const & lhs
+sw/inc/ndarr.hxx:75
+    _Bool CompareSwOutlineNodes::operator()(const class SwNode *,const class SwNode *) const
+    const class SwNode * lhs
     Compare()
-sw/inc/shellio.hxx:165
-    void SwReader::SwReader(class SvStream &,const class rtl::OUString &,const class rtl::OUString &,class SwPaM &)
-    const class rtl::OUString & rFilename
-    ""
 sw/inc/shellio.hxx:167
-    void SwReader::SwReader(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class rtl::OUString &,class SwPaM &)
-    const class rtl::OUString & rFilename
+    void SwReader::SwReader(class SvStream &,class rtl::OUString,const class rtl::OUString &,class SwPaM &)
+    class rtl::OUString aFilename
+    ""
+sw/inc/shellio.hxx:169
+    void SwReader::SwReader(class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage>,class rtl::OUString,class SwPaM &)
+    class rtl::OUString aFilename
     ""
-sw/inc/shellio.hxx:461
-    class SvStream & Writer::OutLong(class SvStream &,long)
-    class SvStream & rStrm
-    Strm()
-sw/inc/shellio.hxx:462
-    class SvStream & Writer::OutULong(class SvStream &,unsigned long)
-    class SvStream & rStrm
-    Strm()
 sw/inc/tblsel.hxx:47
     _Bool CompareSwSelBoxes::operator()(class SwTableBox *const &,class SwTableBox *const &) const
     class SwTableBox *const & lhs
     Compare()
-sw/inc/tox.hxx:188
-    class SwContentFrame * SwTOXType::FindContentFrame(const class SwDoc &,const class SwRootFrame &,const _Bool) const
-    const _Bool isReadOnlyAvailable
-    IsReadOnlyAvailable()
-sw/source/core/access/acctable.cxx:103
+sw/source/core/access/acctable.cxx:101
     void SwAccessibleTableData_Impl::SwAccessibleTableData_Impl(class SwAccessibleMap &,const class SwTabFrame *,_Bool,_Bool)
     _Bool bIsInPagePreview
     IsInPagePreview()
-sw/source/core/crsr/crstrvl.cxx:625
+sw/source/core/crsr/crstrvl.cxx:615
     void lcl_MakeFieldLst(class SetGetExpFields &,const class SwFieldType &,const _Bool,const _Bool)
     const _Bool bInReadOnly
     IsReadOnlyAvailable()
-sw/source/core/graphic/grfatr.cxx:47
+sw/source/core/graphic/grfatr.cxx:48
     _Bool lcl_IsHoriOnEvenPages(enum MirrorGraph,_Bool)
     _Bool bToggle
     IsGrfToggle()
-sw/source/core/inc/anchoredobjectposition.hxx:182
+sw/source/core/inc/anchoredobjectposition.hxx:183
     long objectpositioning::SwAnchoredObjectPosition::AdjustVertRelPos(const long,const _Bool,const _Bool,const class SwFrame &,const long,const _Bool,const _Bool) const
     const _Bool bFollowTextFlow
     DoesObjFollowsTextFlow()
-sw/source/core/inc/layact.hxx:201
+sw/source/core/inc/layact.hxx:223
     void SwLayIdle::SwLayIdle(class SwRootFrame *,class SwViewShellImp *)
     class SwViewShellImp * pImp
     Imp()
-sw/source/core/inc/swfont.hxx:77
+sw/source/core/inc/swfont.hxx:80
     void SwSubFont::DrawText_(class SwDrawTextInfo &,const _Bool)
     const _Bool bGrey
     IsGreyWave()
-sw/source/core/inc/wrong.hxx:83
-    void SwWrongArea::SwWrongArea(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::container::XStringKeyMap> &,int,int,class SwWrongList *)
-    const class rtl::OUString & rType
+sw/source/core/inc/wrong.hxx:82
+    void SwWrongArea::SwWrongArea(class rtl::OUString,const class com::sun::star::uno::Reference<class com::sun::star::container::XStringKeyMap> &,int,int,class SwWrongList *)
+    class rtl::OUString aType
     ""
-sw/source/core/inc/wrong.hxx:325
+sw/source/core/inc/wrong.hxx:324
     void SwWrongList::Insert(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::container::XStringKeyMap> &,int,int,unsigned short)
     const class rtl::OUString & rType
     ""
-sw/source/core/layout/laycache.cxx:951
+sw/source/core/layout/laycache.cxx:947
     _Bool (anonymous namespace)::SdrObjectCompare::operator()(const class SdrObject *,const class SdrObject *) const
     const class SdrObject * pF1
     Compare()
-sw/source/core/layout/laycache.cxx:959
+sw/source/core/layout/laycache.cxx:955
     _Bool (anonymous namespace)::FlyCacheCompare::operator()(const class SwFlyCache *,const class SwFlyCache *) const
     const class SwFlyCache * pC1
     Compare()
-sw/source/core/text/guess.hxx:47
-    _Bool SwTextGuess::Guess(const class SwTextPortion &,class SwTextFormatInfo &,const unsigned short)
+sw/source/core/text/guess.hxx:48
+    _Bool SwTextGuess::Guess(const class SwTextPortion &,class SwTextFormatInfo &,const unsigned short,int)
     const unsigned short nHeight
     Height()
-sw/source/core/text/inftxt.hxx:408
+sw/source/core/text/inftxt.hxx:405
     void SwTextPaintInfo::DrawPostIts(_Bool) const
     _Bool bScript
     IsScript()
-sw/source/core/text/inftxt.hxx:549
+sw/source/core/text/inftxt.hxx:560
     void SwTextFormatInfo::Left(const long)
     const long nNew
     Left()
-sw/source/core/text/inftxt.hxx:551
+sw/source/core/text/inftxt.hxx:562
     void SwTextFormatInfo::Right(const long)
     const long nNew
     Right()
-sw/source/core/text/inftxt.hxx:553
+sw/source/core/text/inftxt.hxx:564
     void SwTextFormatInfo::First(const long)
     const long nNew
     FirstLeft()
-sw/source/core/text/inftxt.hxx:573
+sw/source/core/text/inftxt.hxx:584
     void SwTextFormatInfo::ChkNoHyph(const unsigned char,const unsigned char)
     const unsigned char bEnd
     CntEndHyph()
-sw/source/core/text/inftxt.hxx:573
+sw/source/core/text/inftxt.hxx:584
     void SwTextFormatInfo::ChkNoHyph(const unsigned char,const unsigned char)
     const unsigned char bMid
     CntMidHyph()
-sw/source/core/text/itrpaint.hxx:48
-    void SwTextPainter::DrawTextLine(const class SwRect &,class SwSaveClip &,const _Bool)
+sw/source/core/text/itrpaint.hxx:51
+    void SwTextPainter::DrawTextLine(const class SwRect &,class SwSaveClip &,const _Bool,class std::optional<class SwTaggedPDFHelper> &,class std::optional<class SwTaggedPDFHelper> &,_Bool)
     const _Bool bUnderSz
     IsUndersized()
-sw/source/core/txtnode/modeltoviewhelper.cxx:52
+sw/source/core/txtnode/modeltoviewhelper.cxx:54
     _Bool (anonymous namespace)::sortfieldresults::operator()(const struct (anonymous namespace)::FieldResult &,const struct (anonymous namespace)::FieldResult &) const
     const struct (anonymous namespace)::FieldResult & rOne
     Compare()
-sw/source/filter/html/swcss1.hxx:80
+sw/source/filter/html/swcss1.hxx:84
     void SwCSS1Parser::SwCSS1Parser(class SwDoc *,const class SwHTMLParser &,const unsigned int *,const class rtl::OUString &,_Bool)
     _Bool bNewDoc
     IsNewDoc()
-sw/source/filter/html/swhtml.hxx:912
-    void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream &,const class rtl::OUString &,const class rtl::OUString &,_Bool,class SfxMedium *,_Bool,_Bool,const class rtl::OUString &)
+sw/source/filter/html/swhtml.hxx:921
+    void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream &,class rtl::OUString,class rtl::OUString,_Bool,class SfxMedium *,_Bool,_Bool,const class rtl::OUString &)
     _Bool bReadUTF8
     IsReadUTF8()
-sw/source/filter/inc/wrtswtbl.hxx:203
-    _Bool SwWriteTableColLess::operator()(const class std::unique_ptr<class SwWriteTableCol, struct std::default_delete<class SwWriteTableCol> > &,const class std::unique_ptr<class SwWriteTableCol, struct std::default_delete<class SwWriteTableCol> > &)
-    const class std::unique_ptr<class SwWriteTableCol, struct std::default_delete<class SwWriteTableCol> > & lhs
+sw/source/filter/inc/wrtswtbl.hxx:205
+    _Bool SwWriteTableColLess::operator()(const type-parameter-?-? &,const type-parameter-?-? &) const
+    const type-parameter-?-? & lhs
     Compare()
-sw/source/filter/ww8/docxattributeoutput.cxx:6291
-    _Bool (anonymous namespace)::OUStringIgnoreCase::operator()(const class rtl::OUString &,const class rtl::OUString &) const
-    const class rtl::OUString & lhs
+sw/source/filter/ww8/docxattributeoutput.cxx:6650
+    _Bool (anonymous namespace)::OUStringIgnoreCase::operator()(class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>) const
+    class std::basic_string_view<char16_t> lhs
     Compare()
-sw/source/filter/ww8/docxexport.hxx:276
+sw/source/filter/ww8/docxexport.hxx:300
     void DocxExport::DocxExport(class DocxExportFilter &,class SwDoc &,class std::shared_ptr<class SwUnoCursor> &,class SwPaM &,_Bool,_Bool)
     _Bool bTemplate
     isExportTemplate()
-sw/source/filter/ww8/wrtww8.hxx:265
+sw/source/filter/ww8/wrtww8.hxx:271
     void WW8_WrPlcSepx::WriteSepx(class SvStream &) const
     class SvStream & rStrm
     Strm()
@@ -962,46 +1002,50 @@ sw/source/filter/ww8/ww8scan.hxx:1539
     void WW8Fib::Write(class SvStream &)
     class SvStream & rStrm
     Strm()
-sw/source/filter/xml/xmlimp.hxx:129
+sw/source/filter/xml/xmlimp.hxx:123
     void SwXMLImport::InsertStyles(_Bool)
     _Bool bAuto
     IsAutomaticStyle()
-sw/source/filter/xml/xmltble.cxx:88
+sw/source/filter/xml/xmltble.cxx:91
     _Bool (anonymous namespace)::SwXMLTableColumnCmpWidth_Impl::operator()(class SwXMLTableColumn_Impl *const &,class SwXMLTableColumn_Impl *const &) const
     class SwXMLTableColumn_Impl *const & lhs
     Compare()
 sw/source/filter/xml/xmltexti.hxx:38
-    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SvXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
-    _Bool bBlockM
-    IsBlockMode()
-sw/source/filter/xml/xmltexti.hxx:38
-    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SvXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
+    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SwXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
     _Bool bInsertM
     IsInsertMode()
 sw/source/filter/xml/xmltexti.hxx:38
-    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SvXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
+    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SwXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
     _Bool bStylesOnlyM
     IsStylesOnlyMode()
-sw/source/ui/vba/vbadocuments.cxx:51
-    void (anonymous namespace)::DocumentEnumImpl::DocumentEnumImpl(const class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XEnumeration> &,const class com::sun::star::uno::Any &)
-    const class com::sun::star::uno::Any & aApplication
+sw/source/filter/xml/xmltexti.hxx:38
+    void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SwXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
+    _Bool bBlockM
+    IsBlockMode()
+sw/source/ui/vba/vbadocuments.cxx:52
+    void (anonymous namespace)::DocumentEnumImpl::DocumentEnumImpl(const class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XEnumeration> &,class com::sun::star::uno::Any)
+    class com::sun::star::uno::Any aApplication
     Application()
-sw/source/uibase/docvw/AnnotationWin2.cxx:98
-    void lcl_translateTwips(const class vcl::Window &,class vcl::Window &,class MouseEvent *)
-    const class vcl::Window & rParent
-    EditWin()
-sw/source/uibase/inc/swuipardlg.hxx:34
-    void SwParaDlg::SwParaDlg(class weld::Window *,class SwView &,const class SfxItemSet &,unsigned char,const class rtl::OUString *,_Bool,const class rtl::OString &)
-    const class rtl::OString & sDefPage
-    ""
-sw/source/uibase/lingu/sdrhhcwrap.hxx:43
+sw/source/uibase/lingu/sdrhhcwrap.hxx:42
     void SdrHHCWrapper::SdrHHCWrapper(class SwView *,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font *,int,_Bool)
     _Bool bInteractive
     IsInteractive()
-toolkit/inc/helper/unopropertyarrayhelper.hxx:38
+sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx:1688
+    void lcl_MoveBorderPropertiesToFrame(class std::vector<struct com::sun::star::beans::PropertyValue> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &,_Bool)
+    _Bool bIsRTFImport
+    IsRTFImport()
+sw/source/writerfilter/rtftok/rtflookahead.hxx:28
+    void writerfilter::rtftok::RTFLookahead::RTFLookahead(class SvStream &,unsigned long)
+    class SvStream & rStream
+    Strm()
+toolkit/inc/helper/unopropertyarrayhelper.hxx:37
     void UnoPropertyArrayHelper::UnoPropertyArrayHelper(const class com::sun::star::uno::Sequence<int> &)
     const class com::sun::star::uno::Sequence<int> & rIDs
     ImplGetPropertyIds()
+ucb/source/ucp/file/filtask.hxx:193
+    _Bool fileaccess::TaskManager::MyPropertyLess::operator()(const class fileaccess::TaskManager::MyProperty &,const class fileaccess::TaskManager::MyProperty &) const
+    const class fileaccess::TaskManager::MyProperty & rKey1
+    Compare()
 vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:36
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateMenuItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,_Bool)
     const class rtl::OUString & sHelpURL
@@ -1010,107 +1054,107 @@ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:43
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateToolbarItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,int)
     const class rtl::OUString & sHelpURL
     ""
-vcl/inc/fontinstance.hxx:78
-    _Bool LogicalFontInstance::GetGlyphBoundRect(unsigned short,class tools::Rectangle &,_Bool) const
-    _Bool 
-    IsVertical()
-vcl/inc/fontinstance.hxx:79
-    _Bool LogicalFontInstance::GetGlyphOutline(unsigned short,class basegfx::B2DPolyPolygon &,_Bool) const
+vcl/inc/font/LogicalFontInstance.hxx:108
+    _Bool LogicalFontInstance::GetGlyphOutline(unsigned int,class basegfx::B2DPolyPolygon &,_Bool) const
     _Bool 
     IsVertical()
-vcl/inc/unx/fc_fontoptions.hxx:33
-    void FontConfigFontOptions::SyncPattern(const class rtl::OString &,unsigned int,unsigned int,_Bool)
-    _Bool bEmbolden
-    NeedsArtificialBold()
-vcl/inc/WidgetDrawInterface.hxx:88
-    _Bool vcl::WidgetDrawInterface::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &)
-    const class rtl::OUString & aCaption
-    ""
-vcl/qa/cppunit/svm/svmtest.cxx:44
-    class GDIMetaFile SvmTest::writeAndReadStream(class GDIMetaFile &,const class rtl::OUString &)
-    const class rtl::OUString & rName
-    ""
-vcl/skia/gdiimpl.cxx:891
+vcl/inc/iconview.hxx:64
+    void IconView::DumpEntryAndSiblings(class tools::JsonWriter &,class SvTreeListEntry *)
+    class SvTreeListEntry * pEntry
+    First()
+vcl/inc/qt5/QtFrame.hxx:139
+    void QtFrame::QtFrame(class QtFrame *,enum SalFrameStyleFlags,_Bool)
+    _Bool bUseCairo
+    useCairo()
+vcl/inc/skia/utils.hxx:175
+    struct SkSamplingOptions makeSamplingOptions(enum BmpScaleFlag,class SkMatrix,int)
+    enum BmpScaleFlag scalingType
+    goodScalingQuality()
+vcl/inc/skia/utils.hxx:224
+    struct SkSamplingOptions makeSamplingOptions(const struct SalTwoRect &,int,int,_Bool)
+    _Bool isGPU
+    isGPU()
+vcl/skia/gdiimpl.cxx:943
     _Bool (anonymous namespace)::LessThan::operator()(const class basegfx::B2DPoint &,const class basegfx::B2DPoint &) const
     const class basegfx::B2DPoint & point1
     Compare()
-vcl/source/control/field2.cxx:393
-    void ImplPatternProcessStrictModify(class Edit *,const class rtl::OString &,const class rtl::OUString &,_Bool)
+vcl/source/control/field2.cxx:398
+    void ImplPatternProcessStrictModify(class Edit *,const class rtl::OString &,class std::basic_string_view<char16_t>,_Bool)
     _Bool bSameMask
     ImplIsSameMask()
-vcl/source/control/field2.cxx:1230
+vcl/source/control/field2.cxx:1302
     _Bool ImplDateProcessKeyInput(const class KeyEvent &,enum ExtDateFieldFormat,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field2.cxx:2228
-    _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
-    _Bool bDuration
-    IsDuration()
-vcl/source/control/field2.cxx:2228
+vcl/source/control/field2.cxx:2271
     _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
     _Bool bStrictFormat
     IsStrictFormat()
-vcl/source/control/field2.cxx:2228
+vcl/source/control/field2.cxx:2271
+    _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
+    _Bool bDuration
+    IsDuration()
+vcl/source/control/field2.cxx:2271
     _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:914
+vcl/source/control/field.cxx:923
     _Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     _Bool bUseThousandSep
     IsUseThousandSep()
-vcl/source/control/field.cxx:914
+vcl/source/control/field.cxx:923
     _Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:1710
+vcl/source/control/field.cxx:1645
     _Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     _Bool bUseThousandSep
     IsUseThousandSep()
-vcl/source/control/field.cxx:1710
+vcl/source/control/field.cxx:1645
     _Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:1717
+vcl/source/control/field.cxx:1652
     _Bool ImplCurrencyGetValue(const class rtl::OUString &,long &,unsigned short,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/imivctl.hxx:396
+vcl/source/control/imivctl.hxx:404
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     const class SvxIconChoiceCtrlColumnInfo & 
     SvxIconChoiceCtrlColumnInfo()
-vcl/source/edit/vclmedit.cxx:99
+vcl/source/edit/vclmedit.cxx:103
     void ImpVclMEdit::Enable(_Bool)
     _Bool bEnable
     IsEnabled()
-vcl/unx/gtk3/gtk3gtkinst.cxx:9435
+vcl/source/text/TextLayoutCache.cxx:46
+    unsigned long vcl::text::(anonymous namespace)::TextLayoutCacheCost::operator()(const class std::shared_ptr<const class vcl::text::TextLayoutCache> &) const
+    const class std::shared_ptr<const class vcl::text::TextLayoutCache> & item
+    ValueSize()
+vcl/unx/gtk3/gtkinst.cxx:13878
     _Bool (anonymous namespace)::CompareGtkTreePath::operator()(const struct _GtkTreePath *,const struct _GtkTreePath *) const
     const struct _GtkTreePath * lhs
     Compare()
-writerfilter/source/rtftok/rtflookahead.hxx:29
-    void writerfilter::rtftok::RTFLookahead::RTFLookahead(class SvStream &,unsigned long)
-    class SvStream & rStream
-    Strm()
-writerperfect/qa/unit/WpftLoader.hxx:71
+writerperfect/qa/unit/WpftLoader.hxx:70
     void writerperfect::test::WpftLoader::WpftLoader(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::document::XFilter> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XDesktop2> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> & rxInputStream
     createDummyInput()
-xmlhelp/source/cxxhelp/provider/urlparameter.cxx:291
+xmlhelp/source/cxxhelp/provider/urlparameter.cxx:295
     void (anonymous namespace)::InputStreamTransformer::InputStreamTransformer(class chelp::URLParameter *,class chelp::Databases *,_Bool)
     _Bool isRoot
     isRoot()
-xmlhelp/source/cxxhelp/provider/urlparameter.hxx:215
+xmlhelp/source/cxxhelp/provider/urlparameter.hxx:214
     _Bool chelp::URLParameter::name(_Bool)
     _Bool modulePresent
     module()
-xmloff/source/style/xmlexppr.cxx:97
+xmloff/source/style/xmlexppr.cxx:95
     _Bool (anonymous namespace)::ComparePropertyState::operator()(const struct XMLPropertyState &,const struct XMLPropertyState &)
     const struct XMLPropertyState & lhs
     Compare()
-xmloff/source/style/XMLFontAutoStylePool.cxx:122
-    _Bool (anonymous namespace)::XMLFontAutoStylePoolEntryCmp_Impl::operator()(const class std::unique_ptr<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl, struct std::default_delete<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl> > &,const class std::unique_ptr<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl, struct std::default_delete<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl> > &) const
-    const class std::unique_ptr<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl, struct std::default_delete<class (anonymous namespace)::XMLFontAutoStylePoolEntry_Impl> > & r1
+xmloff/source/style/XMLFontAutoStylePool.cxx:126
+    _Bool (anonymous namespace)::XMLFontAutoStylePoolEntryCmp_Impl::operator()(const type-parameter-?-? &,const type-parameter-?-? &) const
+    const type-parameter-?-? & r1
     Compare()
 xmloff/source/text/XMLTextListAutoStylePool.cxx:123
-    _Bool (anonymous namespace)::XMLTextListAutoStylePoolEntryCmp_Impl::operator()(const class std::unique_ptr<class XMLTextListAutoStylePoolEntry_Impl, struct std::default_delete<class XMLTextListAutoStylePoolEntry_Impl> > &,const class std::unique_ptr<class XMLTextListAutoStylePoolEntry_Impl, struct std::default_delete<class XMLTextListAutoStylePoolEntry_Impl> > &) const
-    const class std::unique_ptr<class XMLTextListAutoStylePoolEntry_Impl, struct std::default_delete<class XMLTextListAutoStylePoolEntry_Impl> > & r1
+    _Bool (anonymous namespace)::XMLTextListAutoStylePoolEntryCmp_Impl::operator()(const type-parameter-?-? &,const type-parameter-?-? &) const
+    const type-parameter-?-? & r1
     Compare()
diff --git a/compilerplugins/clang/constantparam.cxx b/compilerplugins/clang/constantparam.cxx
index 71c0f69da61a..fd8f8f4e7992 100644
--- a/compilerplugins/clang/constantparam.cxx
+++ b/compilerplugins/clang/constantparam.cxx
@@ -22,7 +22,7 @@
 
  The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='constantparam' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='constantparam' check
   $ ./compilerplugins/clang/constantparam.py
 
   TODO look for OUString and OString params and check for call-params that are always either "" or default constructed
@@ -61,6 +61,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         // ignore some files that make clang crash inside EvaluateAsInt
         std::string fn(handler.getMainFileName());
         loplugin::normalizeDotDotInFilePath(fn);
@@ -104,10 +106,6 @@ void ConstantParam::addToCallSet(const FunctionDecl* functionDecl, int paramInde
 {
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 
@@ -115,18 +113,19 @@ void ConstantParam::addToCallSet(const FunctionDecl* functionDecl, int paramInde
         return;
     if (functionDecl->isVariadic())
         return;
-    if (ignoreLocation(functionDecl))
-        return;
     // ignore stuff that forms part of the stable URE interface
     if (isInUnoIncludeFile(functionDecl))
         return;
+
     SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( functionDecl->getLocation() );
-    StringRef filename = getFilenameOfLocation(expansionLoc);
+    std::string filename = getFilenameOfLocation(expansionLoc).str();
+    loplugin::normalizeDotDotInFilePath(filename);
     if (!loplugin::hasPathnamePrefix(filename, SRCDIR "/"))
         return;
+    if (loplugin::hasPathnamePrefix(filename, WORKDIR "/"))
+        return;
     filename = filename.substr(strlen(SRCDIR)+1);
 
-
     MyCallSiteInfo aInfo;
     aInfo.returnType = functionDecl->getReturnType().getCanonicalType().getAsString();
 
@@ -152,10 +151,9 @@ void ConstantParam::addToCallSet(const FunctionDecl* functionDecl, int paramInde
     aInfo.paramIndex = paramIndex;
     if (paramIndex < (int)functionDecl->getNumParams())
         aInfo.paramType = functionDecl->getParamDecl(paramIndex)->getType().getCanonicalType().getAsString();
-    aInfo.callValue = callValue;
 
-    aInfo.sourceLocation = filename.str() + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
-    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
+    aInfo.callValue = callValue;
+    aInfo.sourceLocation = filename + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
 
     callSet.insert(aInfo);
 }
@@ -175,7 +173,7 @@ std::string ConstantParam::getCallValue(const Expr* arg)
     APSInt x1;
     if (compat::EvaluateAsInt(arg, x1, compiler.getASTContext()))
     {
-        return x1.toString(10);
+        return compat::toString(x1, 10);
     }
     if (isa<CXXNullPtrLiteralExpr>(arg)) {
         return "0";
@@ -202,8 +200,8 @@ std::string ConstantParam::getCallValue(const Expr* arg)
     // Get the expression contents.
     // This helps us find params which are always initialised with something like "OUString()".
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = compat::getBeginLoc(arg);
-    SourceLocation endLoc = compat::getEndLoc(arg);
+    SourceLocation startLoc = arg->getBeginLoc();
+    SourceLocation endLoc = arg->getEndLoc();
     const char *p1 = SM.getCharacterData( startLoc );
     const char *p2 = SM.getCharacterData( endLoc );
     if (!p1 || !p2 || (p2 - p1) < 0 || (p2 - p1) > 40) {
@@ -211,22 +209,16 @@ std::string ConstantParam::getCallValue(const Expr* arg)
     }
     unsigned n = Lexer::MeasureTokenLength( endLoc, SM, compiler.getLangOpts());
     std::string s( p1, p2 - p1 + n);
-    // strip linefeed and tab characters so they don't interfere with the parsing of the log file
-    std::replace( s.begin(), s.end(), '\r', ' ');
-    std::replace( s.begin(), s.end(), '\n', ' ');
-    std::replace( s.begin(), s.end(), '\t', ' ');
+    // sanitize call value, makes using command line tools (and python) much less error prone
+    for (auto const & ch : s)
+        if (ch < 32)
+            return "sanitised";
 
     // now normalize the value. For some params, like OUString, we can pass it as OUString() or "" and they are the same thing
     if (s == "OUString()")
         s = "\"\"";
     else if (s == "OString()")
         s = "\"\"";
-    else if (s == "aEmptyOUStr") //sw
-        s = "\"\"";
-    else if (s == "EMPTY_OUSTRING")//sc
-        s = "\"\"";
-    else if (s == "GetEmptyOUString()") //sc
-        s = "\"\"";
     return s;
 }
 
@@ -255,10 +247,6 @@ bool ConstantParam::VisitCallExpr(const CallExpr * callExpr) {
     // work our way back to the root definition for template methods
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index 07016070b487..dd9f0411e61c 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -3,85 +3,97 @@ basctl/source/inc/dlged.hxx:76
     enum basctl::DlgEdHint::Kind 
     2
 basctl/source/inc/sbxitem.hxx:47
-    void basctl::SbxItem::SbxItem(unsigned short,const class basctl::ScriptDocument &,const class rtl::OUString &,const class rtl::OUString &,enum basctl::ItemType)
+    void basctl::SbxItem::SbxItem(unsigned short,class basctl::ScriptDocument,class rtl::OUString,class rtl::OUString,enum basctl::ItemType)
     unsigned short nWhich
     30799
 basctl/source/inc/sbxitem.hxx:48
-    void basctl::SbxItem::SbxItem(unsigned short,const class basctl::ScriptDocument &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum basctl::ItemType)
+    void basctl::SbxItem::SbxItem(unsigned short,class basctl::ScriptDocument,class rtl::OUString,class rtl::OUString,class rtl::OUString,enum basctl::ItemType)
     unsigned short nWhich
     30799
-basic/source/classes/sbunoobj.cxx:3208
+basic/source/classes/sbunoobj.cxx:3192
     class com::sun::star::uno::Reference<class com::sun::star::reflection::XTypeDescriptionEnumeration> getTypeDescriptorEnumeration(const class rtl::OUString &,const class com::sun::star::uno::Sequence<enum com::sun::star::uno::TypeClass> &,enum com::sun::star::reflection::TypeDescriptionSearchDepth)
     enum com::sun::star::reflection::TypeDescriptionSearchDepth depth
     -1
-basic/source/inc/codegen.hxx:36
-    void SbiCodeGen::SbiCodeGen(class SbModule &,class SbiParser *,short)
-    short 
-    1024
-basic/source/inc/expr.hxx:177
+basic/source/inc/expr.hxx:196
     void SbiExpression::SbiExpression(class SbiParser *,double,enum SbxDataType)
     enum SbxDataType 
     2
-basic/source/inc/runtime.hxx:346
+basic/source/inc/runtime.hxx:349
     _Bool SbiRuntime::IsImageFlag(enum SbiImageFlags) const
     enum SbiImageFlags n
     2
-basic/source/inc/sbjsmeth.hxx:32
+basic/source/inc/sbjsmeth.hxx:31
     void SbJScriptMethod::SbJScriptMethod(enum SbxDataType)
     enum SbxDataType 
     12
+basic/source/runtime/methods.cxx:3173
+    short GetOptionalIntegerParamOrDefault(class SbxArray &,const unsigned int,const short)
+    const unsigned int i
+    2
+basic/source/runtime/methods.cxx:3179
+    class rtl::OUString GetOptionalOUStringParamOrDefault(class SbxArray &,const unsigned int,const class rtl::OUString &)
+    const unsigned int i
+    3
 canvas/inc/verifyinput.hxx:103
     void verifyInput(const struct com::sun::star::geometry::Matrix2D &,const char *,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,short)
     short nArgPos
     2
-canvas/workben/canvasdemo.cxx:146
+canvas/workben/canvasdemo.cxx:141
     void (anonymous namespace)::DemoRenderer::drawStringAt(class rtl::OString,double,double)
     double y
     15
-canvas/workben/canvasdemo.cxx:485
+canvas/workben/canvasdemo.cxx:479
     void (anonymous namespace)::DemoRenderer::drawRegularPolygon(double,double,int,double)
     double centery
     35
-canvas/workben/canvasdemo.cxx:485
+canvas/workben/canvasdemo.cxx:479
     void (anonymous namespace)::DemoRenderer::drawRegularPolygon(double,double,int,double)
     double r
     15
-chart2/qa/extras/chart2export.cxx:505
+chart2/qa/extras/chart2export3.cxx:541
+    void checkSheetForGapWidthAndOverlap(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
+    int nExpectedGapWidth
+    100
+chart2/qa/extras/chart2export.cxx:125
     void checkPolynomialTrendline(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XRegressionCurve> &,const class rtl::OUString &,int,double,double,double)
     int aExpectedDegree
     3
-chart2/qa/extras/chart2export.cxx:527
+chart2/qa/extras/chart2export.cxx:147
     void checkMovingAverageTrendline(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XRegressionCurve> &,const class rtl::OUString &,int)
     int aExpectedPeriod
     3
-chart2/qa/extras/chart2export.cxx:1011
-    void ::change(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,short)
+chart2/qa/extras/chart2export.cxx:724
+    void (unnamed struct at /home/noel/libo-plugin/chart2/qa/extras/chart2export.cxx:700:5)::change(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,short)
     short nNumFmtTypeFlag
     16
-chart2/qa/extras/PivotChartTest.cxx:78
-    void lclModifyFunction(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotDescriptor> &,const class rtl::OUString &,enum com::sun::star::sheet::GeneralFunction)
+chart2/qa/extras/PivotChartTest.cxx:79
+    void lclModifyFunction(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotDescriptor> &,class std::basic_string_view<char16_t>,enum com::sun::star::sheet::GeneralFunction)
     enum com::sun::star::sheet::GeneralFunction eFunction
     2
 chart2/source/controller/inc/AccessibleBase.hxx:145
-    void chart::AccessibleBase::RemoveState(short)
-    short aState
-    23
+    void chart::AccessibleBase::RemoveState(long)
+    long aState
+    4194304
 chart2/source/inc/LinePropertiesHelper.hxx:62
     void SetLineColor(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,int)
     int nColor
     14540253
-chart2/source/inc/ObjectIdentifier.hxx:176
-    class rtl::OUString chart::ObjectIdentifier::createSeriesSubObjectStub(enum chart::ObjectType,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+chart2/source/inc/ObjectIdentifier.hxx:189
+    class rtl::OUString chart::ObjectIdentifier::createSeriesSubObjectStub(enum chart::ObjectType,class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>,class std::basic_string_view<char16_t>)
     enum chart::ObjectType eSubObjectType
     12
-chart2/source/inc/StatisticsHelper.hxx:75
-    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> addErrorBars(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> &,int,_Bool)
+chart2/source/inc/StatisticsHelper.hxx:79
+    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> addErrorBars(const class rtl::Reference<class chart::DataSeries> &,int,_Bool)
     int nStyle
     2
-chart2/source/tools/RangeHighlighter.cxx:48
+chart2/source/tools/RangeHighlighter.cxx:50
     void lcl_fillRanges(class com::sun::star::uno::Sequence<struct com::sun::star::chart2::data::HighlightedRange> &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,class Color,int)
     int nIndex
     -1
+chart2/source/view/charttypes/PieChart.hxx:219
+    void chart::PieChart::createOneBar(enum chart::SubPieType,struct chart::PieChart::ShapeParam &,const class rtl::Reference<class SvxShapeGroupAnyD> &,const class rtl::Reference<class SvxShapeGroup> &,class chart::VDataSeries *,const class chart::PieDataSrcBase *,int)
+    enum chart::SubPieType eType
+    2
 codemaker/source/javamaker/classfile.cxx:86
     void writeU4(class FileStream &,unsigned int)
     unsigned int data
@@ -90,67 +102,71 @@ comphelper/qa/unit/variadictemplates.cxx:57
     void extract(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,optional<type-parameter-?-?> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
     int nArg
     4
-connectivity/source/drivers/firebird/StatementCommonBase.hxx:89
+connectivity/source/drivers/firebird/StatementCommonBase.hxx:90
     short connectivity::firebird::OStatementCommonBase::getSqlInfoItem(char)
     char aInfoItem
     21
-connectivity/source/drivers/firebird/Util.hxx:122
-    class rtl::OUString escapeWith(const class rtl::OUString &,const char,const char)
-    const char aEscapeChar
-    39
-connectivity/source/drivers/firebird/Util.hxx:122
-    class rtl::OUString escapeWith(const class rtl::OUString &,const char,const char)
-    const char aKey
-    39
-connectivity/source/inc/java/sql/ConnectionLog.hxx:106
+connectivity/source/drivers/postgresql/pq_connection.cxx:372
+    void properties2arrays(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,const class com::sun::star::uno::Reference<class com::sun::star::script::XTypeConverter> &,unsigned short,class pq_sdbc_driver::(anonymous namespace)::cstr_vector &,class pq_sdbc_driver::(anonymous namespace)::cstr_vector &)
+    unsigned short enc
+    76
+connectivity/source/drivers/postgresql/pq_statics.cxx:80
+    void pq_sdbc_driver::(anonymous namespace)::PropertyDefEx::PropertyDefEx(const class rtl::OUString &,const class com::sun::star::uno::Type &,int)
+    int a
+    16
+connectivity/source/drivers/postgresql/pq_statics.cxx:100
+    class cppu::IPropertyArrayHelper * createPropertyArrayHelper(const struct pq_sdbc_driver::(anonymous namespace)::PropertyDefEx *,int)
+    int count
+    12
+connectivity/source/inc/java/sql/ConnectionLog.hxx:105
     void connectivity::java::sql::ConnectionLog::log(const int,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
     const int _nLogLevel
     300
-connectivity/source/inc/java/sql/ConnectionLog.hxx:112
+connectivity/source/inc/java/sql/ConnectionLog.hxx:111
     void connectivity::java::sql::ConnectionLog::log(const int,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
     const int _nLogLevel
     300
-connectivity/source/inc/java/sql/ConnectionLog.hxx:118
+connectivity/source/inc/java/sql/ConnectionLog.hxx:117
     void connectivity::java::sql::ConnectionLog::log(const int,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
     const int _nLogLevel
     300
-connectivity/source/inc/mysql/YTable.hxx:80
+connectivity/source/inc/mysql/YTable.hxx:83
     void connectivity::mysql::OMySQLTable::OMySQLTable(class connectivity::sdbcx::OCollection *,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int)
     int _nPrivileges
     511
-connectivity/source/inc/odbc/OPreparedStatement.hxx:76
+connectivity/source/inc/odbc/OPreparedStatement.hxx:75
     void connectivity::odbc::OPreparedStatement::setParameter(int,int,const class com::sun::star::uno::Sequence<signed char> &)
     int _nType
     -2
-connectivity/source/inc/odbc/OTools.hxx:198
+connectivity/source/inc/odbc/OTools.hxx:197
     class com::sun::star::uno::Sequence<signed char> connectivity::odbc::OTools::getBytesValue(const class connectivity::odbc::OConnection *,void *,int,short,_Bool &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
     short _fSqlType
     -2
-cppcanvas/source/inc/implrenderer.hxx:181
+cppcanvas/source/inc/implrenderer.hxx:183
     _Bool cppcanvas::internal::ImplRenderer::isActionContained(class GDIMetaFile &,const char *,enum MetaActionType)
     enum MetaActionType nType
     147
-cui/source/inc/autocdlg.hxx:303
+cui/source/inc/autocdlg.hxx:312
     void OfaQuoteTabPage::CreateEntry(class weld::TreeView &,const class rtl::OUString &,unsigned short,unsigned short)
     unsigned short nCol
     2
-cui/source/inc/autocdlg.hxx:303
+cui/source/inc/autocdlg.hxx:312
     void OfaQuoteTabPage::CreateEntry(class weld::TreeView &,const class rtl::OUString &,unsigned short,unsigned short)
     unsigned short nTextCol
     2
-cui/source/inc/chardlg.hxx:273
+cui/source/inc/chardlg.hxx:275
     void SvxCharPositionPage::UpdatePreview_Impl(unsigned char,unsigned char,short)
     unsigned char nProp
     100
-cui/source/inc/cuihyperdlg.hxx:48
+cui/source/inc/cuihyperdlg.hxx:49
     void SvxHlinkCtrl::SvxHlinkCtrl(unsigned short,class SfxBindings &,class SvxHpLinkDlg *)
     unsigned short nId
     10361
-cui/source/inc/optlingu.hxx:145
+cui/source/inc/optlingu.hxx:153
     void SvxLinguTabPage::HideGroups(unsigned short)
     unsigned short nGrp
     8
-cui/source/inc/SpellDialog.hxx:110
+cui/source/inc/SpellDialog.hxx:118
     void svx::SentenceEditWindow_Impl::UndoActionStart(unsigned short)
     unsigned short nId
     205
@@ -158,20 +174,20 @@ cui/source/inc/SvxToolbarConfigPage.hxx:63
     void SvxToolbarConfigPage::AddFunction(int)
     int nTarget
     -1
-cui/source/options/cfgchart.hxx:89
-    void SvxChartColorTableItem::SvxChartColorTableItem(unsigned short,const class SvxChartColorTable &)
+cui/source/options/cfgchart.hxx:68
+    void SvxChartColorTableItem::SvxChartColorTableItem(unsigned short,class SvxChartColorTable)
     unsigned short nWhich
     10437
 cui/source/options/connpoolsettings.hxx:75
-    void offapp::DriverPoolingSettingsItem::DriverPoolingSettingsItem(unsigned short,const class offapp::DriverPoolingSettings &)
+    void offapp::DriverPoolingSettingsItem::DriverPoolingSettingsItem(unsigned short,class offapp::DriverPoolingSettings)
     unsigned short _nId
     17148
-cui/source/options/dbregistersettings.hxx:67
-    void svx::DatabaseMapItem::DatabaseMapItem(unsigned short,const class std::__debug::map<class rtl::OUString, struct svx::DatabaseRegistration, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, struct svx::DatabaseRegistration> > > &)
+cui/source/options/dbregistersettings.hxx:68
+    void svx::DatabaseMapItem::DatabaseMapItem(unsigned short,class std::map<class rtl::OUString, struct svx::DatabaseRegistration> &&)
     unsigned short _nId
     17149
-cui/source/tabpages/align.cxx:60
-    void lcl_MaybeResetAlignToDistro(class weld::ComboBox &,unsigned short,const class SfxItemSet &,unsigned short,unsigned short,type-parameter-?-?)
+cui/source/tabpages/align.cxx:58
+    void lcl_MaybeResetAlignToDistro(class weld::ComboBox &,unsigned short,const class SfxItemSet &,class TypedWhichId<class SfxEnumItemInterface>,class TypedWhichId<class SfxEnumItemInterface>,type-parameter-?-?)
     type-parameter-?-? eBlock
     4
 dbaccess/source/core/dataaccess/documentdefinition.hxx:183
@@ -182,66 +198,66 @@ dbaccess/source/core/inc/columnsettings.hxx:39
     void dbaccess::IPropertyContainer::registerMayBeVoidProperty(const class rtl::OUString &,int,int,class com::sun::star::uno::Any *,const class com::sun::star::uno::Type &)
     int _nAttributes
     3
-dbaccess/source/ui/dlg/adminpages.hxx:219
-    void dbaui::OGenericAdministrationPage::fillString(class SfxItemSet &,const class dbaui::OConnectionURLEdit *,unsigned short,_Bool &)
-    unsigned short _nID
-    3
 dbaccess/source/ui/dlg/dsnItem.hxx:38
     void dbaui::DbuTypeCollectionItem::DbuTypeCollectionItem(short,class dbaccess::ODsnTypeCollection *)
     short nWhich
     5
-dbaccess/source/ui/inc/charsetlistbox.hxx:36
-    _Bool dbaui::CharSetListBox::StoreSelectedCharSet(class SfxItemSet &,const unsigned short)
-    const unsigned short _nItemId
-    11
-dbaccess/source/ui/inc/FieldDescControl.hxx:139
+dbaccess/source/ui/inc/FieldDescControl.hxx:140
     void dbaui::OFieldDescControl::CellModified(int,unsigned short)
     int nRow
     -1
-dbaccess/source/ui/inc/JAccess.hxx:57
+dbaccess/source/ui/inc/JAccess.hxx:51
     void dbaui::OJoinDesignViewAccess::notifyAccessibleEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     const short _nEventId
     7
-dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx:84
+dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx:88
     class rtl::Reference<class dbaui::OTableFieldDesc> dbaui::OSelectionBrowseBox::InsertField(const class rtl::Reference<class dbaui::OTableFieldDesc> &,unsigned short,_Bool,_Bool)
     unsigned short _nColumnPosition
     65535
-drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:111
+drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:106
     class drawinglayer::primitive3d::Primitive3DContainer getLineTubeSegments(unsigned int,const class drawinglayer::attribute::MaterialAttribute3D &)
     unsigned int nSegments
     8
-drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:189
+drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:180
     class drawinglayer::primitive3d::Primitive3DContainer getLineCapSegments(unsigned int,const class drawinglayer::attribute::MaterialAttribute3D &)
     unsigned int nSegments
     8
-drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:285
+drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:272
     class drawinglayer::primitive3d::Primitive3DContainer getLineCapRoundSegments(unsigned int,const class drawinglayer::attribute::MaterialAttribute3D &)
     unsigned int nSegments
     8
-drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:294
+drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx:281
     class drawinglayer::primitive3d::Primitive3DContainer getLineJoinSegments(unsigned int,const class drawinglayer::attribute::MaterialAttribute3D &,double,double,enum basegfx::B2DLineJoin)
     unsigned int nSegments
     8
-editeng/source/editeng/impedit.hxx:700
+editeng/inc/ContentNode.hxx:80
+    class EditCharAttrib * CharAttribList::FindAttribRightOpen(unsigned short,int)
+    unsigned short nWhich
+    4041
+editeng/inc/outleeng.hxx:81
+    class std::optional<_Bool> OutlinerEditEng::GetCompatFlag(enum SdrCompatibilityFlag) const
+    enum SdrCompatibilityFlag eFlag
+    3
+editeng/source/editeng/impedit.hxx:756
     _Bool ImpEditEngine::HasScriptType(int,unsigned short) const
     unsigned short nType
     3
-editeng/source/editeng/impedit.hxx:1018
-    void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
-    unsigned short nFontWhichId
-    4042
-editeng/source/editeng/impedit.hxx:1018
+editeng/source/editeng/impedit.hxx:1207
     void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
-    4040
-editeng/source/editeng/textconv.hxx:87
-    void TextConvWrapper::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
+    4056
+editeng/source/editeng/impedit.hxx:1207
+    void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nFontWhichId
-    4042
+    4058
 editeng/source/editeng/textconv.hxx:87
     void TextConvWrapper::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
-    4040
+    4056
+editeng/source/editeng/textconv.hxx:87
+    void TextConvWrapper::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
+    unsigned short nFontWhichId
+    4058
 editeng/source/outliner/outlundo.hxx:31
     void OutlinerUndoBase::OutlinerUndoBase(unsigned short,class Outliner *)
     unsigned short nId
@@ -250,71 +266,55 @@ filter/source/config/cache/filtercache.hxx:331
     _Bool filter::config::FilterCache::isFillState(enum filter::config::FilterCache::EFillState) const
     enum filter::config::FilterCache::EFillState eRequired
     2
-filter/source/graphicfilter/eps/eps.cxx:91
-    enum (anonymous namespace)::NMode operator|(enum (anonymous namespace)::NMode,enum (anonymous namespace)::NMode)
-    enum (anonymous namespace)::NMode b
-    4
-filter/source/graphicfilter/eps/eps.cxx:186
-    void (anonymous namespace)::PSWriter::ImplCurveTo(const class Point &,const class Point &,const class Point &,enum (anonymous namespace)::NMode)
-    enum (anonymous namespace)::NMode nMode
-    4
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:107
-    _Bool DXF2GDIMetaFile::Convert(const class DXFRepresentation &,class GDIMetaFile &,unsigned short,unsigned short)
-    unsigned short nMaxPercent
-    100
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:107
-    _Bool DXF2GDIMetaFile::Convert(const class DXFRepresentation &,class GDIMetaFile &,unsigned short,unsigned short)
-    unsigned short nMinPercent
-    60
-filter/source/msfilter/mscodec.cxx:57
+filter/source/msfilter/mscodec.cxx:58
     void lclRotateLeft(type-parameter-?-? &,unsigned char,unsigned char)
     unsigned char nWidth
     15
-filter/source/msfilter/mscodec.cxx:72
+filter/source/msfilter/mscodec.cxx:73
     unsigned short lclGetKey(const unsigned char *,unsigned long)
     unsigned long nBufferSize
     16
-filter/source/msfilter/mscodec.cxx:97
+filter/source/msfilter/mscodec.cxx:98
     unsigned short lclGetHash(const unsigned char *,unsigned long)
     unsigned long nBufferSize
     16
-forms/source/richtext/richtextcontrol.cxx:83
+forms/source/richtext/richtextcontrol.cxx:81
     void implAdjustTriStateFlag(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,long &,long,long)
     long _nPositiveFlag
     256
-forms/source/richtext/richtextcontrol.cxx:83
+forms/source/richtext/richtextcontrol.cxx:81
     void implAdjustTriStateFlag(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,long &,long,long)
     long nNegativeFlag
     512
-forms/source/richtext/rtattributes.hxx:52
+forms/source/richtext/rtattributes.hxx:51
     void frm::AttributeState::AttributeState(enum frm::AttributeCheckState)
     enum frm::AttributeCheckState _eCheckState
     2
-formula/source/core/api/FormulaCompiler.cxx:254
+formula/source/core/api/FormulaCompiler.cxx:304
     const char16_t * lcl_UnicodeStrChr(const char16_t *,char16_t)
     char16_t c
     34
-fpicker/source/office/autocmpledit.hxx:40
+fpicker/source/office/autocmpledit.hxx:41
     void AutocompleteEdit::select_region(int,int)
     int nEndPos
     -1
-fpicker/source/office/iodlg.hxx:206
+fpicker/source/office/iodlg.hxx:203
     void SvtFileDialog::displayIOException(const class rtl::OUString &,enum com::sun::star::ucb::IOErrorCode)
     enum com::sun::star::ucb::IOErrorCode _eCode
     5
-framework/inc/uielement/macrosmenucontroller.hxx:52
-    void framework::MacrosMenuController::addScriptItems(class PopupMenu *,unsigned short)
+framework/inc/uielement/macrosmenucontroller.hxx:49
+    void framework::MacrosMenuController::addScriptItems(const class com::sun::star::uno::Reference<class com::sun::star::awt::XPopupMenu> &,unsigned short)
     unsigned short startItemId
     4
-framework/source/uielement/thesaurusmenucontroller.cxx:48
-    void (anonymous namespace)::ThesaurusMenuController::getMeanings(class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &,const class rtl::OUString &,const struct com::sun::star::lang::Locale &,unsigned long)
+framework/source/uielement/thesaurusmenucontroller.cxx:50
+    void (anonymous namespace)::ThesaurusMenuController::getMeanings(class std::vector<class rtl::OUString> &,const class rtl::OUString &,const struct com::sun::star::lang::Locale &,unsigned long)
     unsigned long nMaxSynonms
     7
 hwpfilter/source/hgzip.h:90
     int gz_flush(struct gz_stream *,int)
     int flush
     4
-hwpfilter/source/hwpfile.h:253
+hwpfilter/source/hwpfile.h:250
     _Bool HWPFile::already_importing_type(unsigned char) const
     unsigned char scflag
     16
@@ -322,46 +322,6 @@ hwpfilter/source/lexer.cxx:202
     struct (anonymous namespace)::yy_buffer_state * yy_create_buffer(struct _IO_FILE *,int)
     int size
     16384
-hwpfilter/source/mzstring.h:124
-    int MzString::rfind(char)
-    char c
-    125
-hwpfilter/source/mzstring.h:128
-    void MzString::replace(int,char)
-    char c
-    32
-idlc/inc/astattribute.hxx:39
-    void AstAttribute::AstAttribute(enum NodeType,unsigned int,const class AstType *,const class rtl::OString &,class AstScope *)
-    enum NodeType nodeType
-    12
-idlc/inc/astconstant.hxx:30
-    void AstConstant::AstConstant(const enum ExprType,const enum NodeType,class AstExpression *,const class rtl::OString &,class AstScope *)
-    const enum NodeType nodeType
-    20
-idlc/inc/astconstant.hxx:30
-    void AstConstant::AstConstant(const enum ExprType,const enum NodeType,class AstExpression *,const class rtl::OString &,class AstScope *)
-    const enum ExprType type
-    2
-idlc/inc/astexpression.hxx:97
-    void AstExpression::AstExpression(int,enum ExprType)
-    enum ExprType et
-    10
-idlc/inc/astmember.hxx:37
-    void AstMember::AstMember(enum NodeType,const class AstType *,const class rtl::OString &,class AstScope *)
-    enum NodeType type
-    14
-idlc/inc/astservice.hxx:35
-    void AstService::AstService(const enum NodeType,const class rtl::OString &,class AstScope *)
-    const enum NodeType type
-    24
-idlc/inc/aststruct.hxx:37
-    void AstStruct::AstStruct(const enum NodeType,const class rtl::OString &,const class AstStruct *,class AstScope *)
-    const enum NodeType type
-    10
-idlc/inc/errorhandler.hxx:83
-    void ErrorHandler::error3(enum ErrorCode,const class AstDeclaration *,const class AstDeclaration *,const class AstDeclaration *)
-    enum ErrorCode e
-    3
 include/basegfx/curve/b2dbeziertools.hxx:44
     void basegfx::B2DCubicBezierHelper::B2DCubicBezierHelper(const class basegfx::B2DCubicBezier &,unsigned int)
     unsigned int nDivisions
@@ -376,29 +336,33 @@ include/basegfx/range/b2ibox.hxx:71
     10
 include/basegfx/utils/tools.hxx:118
     class basegfx::B2DPolyPolygon number2PolyPolygon(double,int,int,_Bool)
-    int nDecPlaces
-    3
-include/basegfx/utils/tools.hxx:118
-    class basegfx::B2DPolyPolygon number2PolyPolygon(double,int,int,_Bool)
     int nTotalDigits
     10
-include/basic/sbxcore.hxx:65
+include/basegfx/utils/tools.hxx:118
+    class basegfx::B2DPolyPolygon number2PolyPolygon(double,int,int,_Bool)
+    int nDecPlaces
+    3
+include/basic/sbxcore.hxx:69
     _Bool SbxBase::IsReset(enum SbxFlagBits) const
     enum SbxFlagBits n
     256
-include/comphelper/docpasswordhelper.hxx:267
-    class rtl::OUString comphelper::DocPasswordHelper::GetOoxHashAsBase64(const class rtl::OUString &,const class rtl::OUString &,unsigned int,enum comphelper::Hash::IterCount,const class rtl::OUString &)
+include/comphelper/accessiblecomponenthelper.hxx:127
+    void comphelper::OCommonAccessibleComponent::NotifyAccessibleEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &,int)
+    int nIndexHint
+    -1
+include/comphelper/docpasswordhelper.hxx:286
+    class rtl::OUString comphelper::DocPasswordHelper::GetOoxHashAsBase64(const class rtl::OUString &,class std::basic_string_view<char16_t>,unsigned int,enum comphelper::Hash::IterCount,class std::basic_string_view<char16_t>)
     enum comphelper::Hash::IterCount eIterCount
     2
-include/comphelper/docpasswordhelper.hxx:323
+include/comphelper/docpasswordhelper.hxx:342
     class com::sun::star::uno::Sequence<signed char> comphelper::DocPasswordHelper::GenerateRandomByteSequence(int)
     int nLength
     16
-include/comphelper/propagg.hxx:124
+include/comphelper/propagg.hxx:120
     void comphelper::OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class comphelper::IPropertyInfoService *,int)
     int _nFirstAggregateId
     10000
-include/comphelper/propagg.hxx:290
+include/comphelper/propagg.hxx:286
     void comphelper::OPropertySetAggregationHelper::declareForwardedProperty(int)
     int _nHandle
     194
@@ -406,79 +370,95 @@ include/comphelper/property.hxx:52
     void ModifyPropertyAttributes(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,const class rtl::OUString &,short,short)
     short _nRemoveAttrib
     8
-include/comphelper/seqstream.hxx:104
+include/comphelper/seqstream.hxx:117
     void comphelper::OSequenceOutputStream::OSequenceOutputStream(class com::sun::star::uno::Sequence<signed char> &,double,int)
     int _nMinimumResize
     128
-include/comphelper/storagehelper.hxx:117
+include/comphelper/storagehelper.hxx:118
     class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> comphelper::OStorageHelper::GetStorageFromStream(const class com::sun::star::uno::Reference<class com::sun::star::io::XStream> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     int nStorageMode
     7
-include/comphelper/threadpool.hxx:60
-    void comphelper::ThreadPool::ThreadPool(int)
-    int nWorkers
-    4
-include/connectivity/dbtools.hxx:299
+include/comphelper/string.hxx:74
+    class std::basic_string_view<char> stripStart(class std::basic_string_view<char>,char)
+    char c
+    32
+include/comphelper/string.hxx:122
+    class std::basic_string_view<char> strip(class std::basic_string_view<char>,char)
+    char c
+    32
+include/comphelper/string.hxx:134
+    class std::basic_string_view<char16_t> strip(class std::basic_string_view<char16_t>,char16_t)
+    char16_t c
+    32
+include/comphelper/traceevent.hxx:100
+    void comphelper::TraceEvent::setBufferSizeAndCallback(unsigned long,void (*)(void))
+    unsigned long bufferSize
+    100
+include/connectivity/dbtools.hxx:303
     class com::sun::star::sdbc::SQLException prependErrorInfo(const class com::sun::star::sdbc::SQLException &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class rtl::OUString &,const enum dbtools::StandardSQLState)
     const enum dbtools::StandardSQLState _eSQLState
     2147483647
-include/connectivity/sqlerror.hxx:82
+include/connectivity/sqlerror.hxx:83
     class rtl::OUString connectivity::SQLError::getErrorMessage(const int) const
     const int _eCondition
     300
-include/connectivity/sqlerror.hxx:93
+include/connectivity/sqlerror.hxx:94
     int connectivity::SQLError::getErrorCode(const int)
     const int _eCondition
     550
-include/connectivity/sqlerror.hxx:161
+include/connectivity/sqlerror.hxx:162
     void connectivity::SQLError::raiseException(const int) const
     const int _eCondition
     200
-include/connectivity/sqlerror.hxx:186
+include/connectivity/sqlerror.hxx:187
     void connectivity::SQLError::raiseTypedException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class com::sun::star::uno::Type &) const
     const int _eCondition
     100
-include/dbaccess/genericcontroller.hxx:311
+include/dbaccess/genericcontroller.hxx:304
     _Bool dbaui::OGenericUnoController::isFeatureSupported(int)
     int _nId
     5502
-include/drawinglayer/attribute/fillhatchattribute.hxx:62
+include/drawinglayer/attribute/fillhatchattribute.hxx:51
     void drawinglayer::attribute::FillHatchAttribute::FillHatchAttribute(enum drawinglayer::attribute::HatchStyle,double,double,const class basegfx::BColor &,unsigned int,_Bool)
     unsigned int nMinimalDiscreteDistance
     3
+include/drawinglayer/converters.hxx:34
+    class AlphaMask createAlphaMask(class drawinglayer::primitive2d::Primitive2DContainer &&,const class drawinglayer::geometry::ViewInformation2D &,unsigned int,unsigned int,unsigned int,_Bool)
+    unsigned int nMaxSquarePixels
+    250000
 include/drawinglayer/primitive2d/mediaprimitive2d.hxx:63
-    void drawinglayer::primitive2d::MediaPrimitive2D::MediaPrimitive2D(const class basegfx::B2DHomMatrix &,const class rtl::OUString &,const class basegfx::BColor &,unsigned int,const class Graphic &)
+    void drawinglayer::primitive2d::MediaPrimitive2D::MediaPrimitive2D(class basegfx::B2DHomMatrix,class rtl::OUString,const class basegfx::BColor &,unsigned int,class Graphic)
     unsigned int nDiscreteBorder
     4
-include/editeng/AccessibleParaManager.hxx:128
+include/editeng/AccessibleParaManager.hxx:127
     void accessibility::AccessibleParaManager::FireEvent(int,const short) const
     const short nEventId
     21
 include/editeng/AccessibleParaManager.hxx:242
-    void accessibility::AccessibleParaManager::SetState(int,const short)
-    const short nStateId
-    11
+    void accessibility::AccessibleParaManager::SetState(int,const long)
+    const long nStateId
+    1024
 include/editeng/AccessibleParaManager.hxx:244
-    void accessibility::AccessibleParaManager::UnSetState(int,const short)
-    const short nStateId
-    11
+    void accessibility::AccessibleParaManager::UnSetState(int,const long)
+    const long nStateId
+    1024
 include/editeng/bulletitem.hxx:60
     void SvxBulletItem::SvxBulletItem(unsigned short)
     unsigned short nWhich
-    4017
-include/editeng/editeng.hxx:299
+    4033
+include/editeng/editeng.hxx:307
     struct ESelection EditEngine::GetWord(const struct ESelection &,unsigned short) const
     unsigned short nWordType
     2
-include/editeng/editeng.hxx:311
+include/editeng/editeng.hxx:319
     void EditEngine::InsertParagraph(int,const class EditTextObject &,const _Bool)
     int nPara
     2147483647
-include/editeng/editeng.hxx:344
+include/editeng/editeng.hxx:352
     void EditEngine::UndoActionStart(unsigned short,const struct ESelection &)
     unsigned short nId
     111
-include/editeng/editstat.hxx:89
+include/editeng/editstat.hxx:91
     void SetFlags(enum EVControlBits &,enum EVControlBits,_Bool)
     enum EVControlBits nMask
     16
@@ -486,26 +466,26 @@ include/editeng/editund2.hxx:38
     void EditUndoManager::EditUndoManager(unsigned short)
     unsigned short nMaxUndoActionCount
     20
-include/editeng/editview.hxx:244
+include/editeng/editview.hxx:275
     void EditView::RemoveCharAttribs(int,unsigned short)
     unsigned short nWhich
-    4029
-include/editeng/editview.hxx:346
+    4045
+include/editeng/editview.hxx:387
     void EditView::InitLOKSpecialPositioning(enum MapUnit,const class tools::Rectangle &,const class Point &)
     enum MapUnit eUnit
     9
-include/editeng/fhgtitem.hxx:72
+include/editeng/fhgtitem.hxx:73
     void SvxFontHeightItem::SetHeight(unsigned int,unsigned short,enum MapUnit,enum MapUnit)
     enum MapUnit eUnit
     8
 include/editeng/flditem.hxx:73
-    void SvxFieldItem::SvxFieldItem(class std::unique_ptr<class SvxFieldData, struct std::default_delete<class SvxFieldData> >,const unsigned short)
+    void SvxFieldItem::SvxFieldItem(class std::unique_ptr<class SvxFieldData>,const unsigned short)
     const unsigned short nId
-    4061
+    4076
 include/editeng/flditem.hxx:74
     void SvxFieldItem::SvxFieldItem(const class SvxFieldData &,const unsigned short)
     const unsigned short nId
-    4061
+    4076
 include/editeng/justifyitem.hxx:33
     void SvxHorJustifyItem::SvxHorJustifyItem(const unsigned short)
     const unsigned short nId
@@ -526,176 +506,216 @@ include/editeng/legacyitem.hxx:186
     void Create(class SvxShadowItem &,class SvStream &,unsigned short)
     unsigned short nItemVersion
     5050
-include/editeng/nhypitem.hxx:29
-    void SvxNoHyphenItem::SvxNoHyphenItem(const unsigned short)
+include/editeng/lrspitem.hxx:59
+    void SvxLeftMarginItem::SetLeft(const long,const unsigned short)
+    const unsigned short nProp
+    100
+include/editeng/lrspitem.hxx:66
+    void SvxLeftMarginItem::SvxLeftMarginItem(const unsigned short)
     const unsigned short nId
-    19
+    94
+include/editeng/lrspitem.hxx:109
+    void SvxTextLeftMarginItem::SvxTextLeftMarginItem(const long,const unsigned short)
+    const unsigned short nId
+    92
+include/editeng/lrspitem.hxx:155
+    void SvxFirstLineIndentItem::SvxFirstLineIndentItem(const short,const unsigned short)
+    const unsigned short nId
+    91
+include/editeng/lrspitem.hxx:194
+    void SvxRightMarginItem::SvxRightMarginItem(const long,const unsigned short)
+    const unsigned short nId
+    93
+include/editeng/lrspitem.hxx:227
+    void SvxGutterLeftMarginItem::SvxGutterLeftMarginItem(const unsigned short)
+    const unsigned short nId
+    95
+include/editeng/lrspitem.hxx:259
+    void SvxGutterRightMarginItem::SvxGutterRightMarginItem(const unsigned short)
+    const unsigned short nId
+    96
+include/editeng/lrspitem.hxx:323
+    void SvxLRSpaceItem::SetLeft(const long,const unsigned short)
+    const unsigned short nProp
+    100
+include/editeng/numitem.hxx:318
+    void SvxNumBulletItem::SvxNumBulletItem(class SvxNumRule &&,unsigned short)
+    unsigned short nWhich
+    4026
 include/editeng/opaqitem.hxx:36
     void SvxOpaqueItem::SvxOpaqueItem(const unsigned short,const _Bool)
     const unsigned short nId
-    99
-include/editeng/outliner.hxx:153
+    105
+include/editeng/optitems.hxx:35
+    void SfxHyphenRegionItem::SfxHyphenRegionItem(const unsigned short)
+    const unsigned short nId
+    12012
+include/editeng/outliner.hxx:156
     void Paragraph::RemoveFlag(enum ParaFlag)
     enum ParaFlag nFlag
     256
-include/editeng/outliner.hxx:373
+include/editeng/outliner.hxx:387
     void OutlinerViewShell::NotifyOtherView(class OutlinerViewShell *,int,const class rtl::OString &,const class rtl::OString &)
     int nType
     25
-include/editeng/outliner.hxx:846
+include/editeng/outliner.hxx:870
     void Outliner::SetParaFlag(class Paragraph *,enum ParaFlag)
     enum ParaFlag nFlag
     256
-include/editeng/outliner.hxx:847
+include/editeng/outliner.hxx:871
     _Bool Outliner::HasParaFlag(const class Paragraph *,enum ParaFlag)
     enum ParaFlag nFlag
     256
-include/editeng/outlobj.hxx:111
+include/editeng/outlobj.hxx:120
     void OutlinerParaObject::SetStyleSheets(unsigned short,const class rtl::OUString &,const enum SfxStyleFamily &)
     const enum SfxStyleFamily & rNewFamily
     8
 include/editeng/prntitem.hxx:38
     void SvxPrintItem::SvxPrintItem(const unsigned short,const _Bool)
     const unsigned short nId
-    98
-include/editeng/svxrtf.hxx:223
-    class rtl::OUString & SvxRTFParser::DelCharAtEnd(class rtl::OUString &,const char16_t)
+    104
+include/editeng/svxrtf.hxx:159
+    void SvxRTFParser::DelCharAtEnd(class rtl::OUStringBuffer &,const char16_t)
     const char16_t cDel
     59
-include/editeng/txtrange.hxx:61
+include/editeng/txtrange.hxx:60
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned short,_Bool,_Bool,_Bool)
     unsigned short nCacheSize
     30
-include/editeng/txtrange.hxx:61
+include/editeng/txtrange.hxx:60
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned short,_Bool,_Bool,_Bool)
     unsigned short nLeft
     2
-include/editeng/txtrange.hxx:61
+include/editeng/txtrange.hxx:60
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned short,_Bool,_Bool,_Bool)
     unsigned short nRight
     2
-include/editeng/unoedhlp.hxx:45
+include/editeng/unoedhlp.hxx:44
     void SvxEditSourceHint::SvxEditSourceHint(enum SfxHintId)
     enum SfxHintId nId
-    30
-include/editeng/unoedhlp.hxx:46
-    void SvxEditSourceHint::SvxEditSourceHint(enum SfxHintId,unsigned long,int,int)
+    31
+include/editeng/unoedhlp.hxx:45
+    void SvxEditSourceHint::SvxEditSourceHint(enum SfxHintId,int,int,int)
     enum SfxHintId nId
-    29
-include/editeng/writingmodeitem.hxx:31
-    void SvxWritingModeItem::SvxWritingModeItem(enum com::sun::star::text::WritingMode,unsigned short)
-    unsigned short nWhich
-    1162
+    30
 include/filter/msfilter/dffpropset.hxx:64
     class rtl::OUString DffPropSet::GetPropertyString(unsigned int,class SvStream &) const
     unsigned int nId
     896
-include/filter/msfilter/escherex.hxx:726
+include/filter/msfilter/escherex.hxx:728
     void EscherPropertyContainer::Commit(class SvStream &,unsigned short,unsigned short)
     unsigned short nVersion
     3
-include/filter/msfilter/msdffimp.hxx:567
+include/filter/msfilter/msdffimp.hxx:569
     _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
     unsigned short nRecId1
     4008
-include/filter/msfilter/msdffimp.hxx:567
+include/filter/msfilter/msdffimp.hxx:569
     _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
     unsigned short nRecId2
     4000
-include/filter/msfilter/rtfutil.hxx:28
+include/filter/msfilter/rtfutil.hxx:27
     class rtl::OString OutHex(unsigned long,unsigned char)
     unsigned char nLen
     2
-include/filter/msfilter/rtfutil.hxx:64
+include/filter/msfilter/rtfutil.hxx:63
     class rtl::OString WriteHex(const unsigned char *,unsigned int,class SvStream *,unsigned int)
     unsigned int nLimit
     64
-include/filter/msfilter/util.hxx:103
+include/filter/msfilter/util.hxx:106
     _Bool msfilter::util::WW8ReadFieldParams::GetTokenSttFromTo(int *,int *,int)
     int _nMax
     9
-include/formula/tokenarray.hxx:286
+include/formula/tokenarray.hxx:287
     unsigned short formula::FormulaTokenArray::RemoveToken(unsigned short,unsigned short)
     unsigned short nCount
     2
-include/formula/tokenarray.hxx:534
+include/formula/tokenarray.hxx:543
     void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
     short pc
     -1
-include/formula/tokenarray.hxx:534
+include/formula/tokenarray.hxx:543
     void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
     short stop
     32767
-include/formula/tokenarray.hxx:657
+include/formula/tokenarray.hxx:666
     void formula::FormulaTokenArrayPlainIterator::AfterRemoveToken(unsigned short,unsigned short)
     unsigned short nCount
     2
+include/i18nutil/searchopt.hxx:116
+    void i18nutil::SearchOptions2::SearchOptions2(const int,class rtl::OUString,class rtl::OUString,struct com::sun::star::lang::Locale,const int,const int,const int,const enum TransliterationFlags &,const short,const int)
+    const int WildcardEscapeCharacter_
+    92
+include/i18nutil/unicode.hxx:42
+    short unicode::getUnicodeScriptType(const char16_t,const struct ScriptTypeList *,short)
+    short unknownType
+    87
 include/linguistic/spelldta.hxx:87
     class com::sun::star::uno::Reference<class com::sun::star::linguistic2::XSpellAlternatives> linguistic::SpellAlternatives::CreateSpellAlternatives(const class rtl::OUString &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,short,const class com::sun::star::uno::Sequence<class rtl::OUString> &)
     short nTypeP
     4
-include/o3tl/typed_flags_set.hxx:136
+include/o3tl/string_view.hxx:493
+    long toInt64(class std::basic_string_view<char16_t>,short)
+    short radix
+    10
+include/o3tl/string_view.hxx:497
+    long toInt64(class std::basic_string_view<char>,short)
+    short radix
+    10
+include/o3tl/typed_flags_set.hxx:135
     typename typed_flags<type-parameter-?-?>::Wrap operator^(type-parameter-?-?,typename typed_flags<type-parameter-?-?>::Wrap)
     type-parameter-?-? lhs
     1535
 include/oox/core/contexthandler2.hxx:168
     _Bool oox::core::ContextHandler2Helper::isParentElement(int,int) const
-    int nCountBack
-    4
+    int nElement
+    656467
 include/oox/core/contexthandler2.hxx:168
     _Bool oox::core::ContextHandler2Helper::isParentElement(int,int) const
-    int nElement
-    525390
-include/oox/drawingml/drawingmltypes.hxx:228
+    int nCountBack
+    4
+include/oox/drawingml/color.hxx:116
+    class model::ComplexColor oox::drawingml::Color::createComplexColor(const class oox::GraphicHelper &,short) const
+    short nPhClrTheme
+    -1
+include/oox/drawingml/drawingmltypes.hxx:231
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nHeight
+    long nX
     -1
-include/oox/drawingml/drawingmltypes.hxx:228
+include/oox/drawingml/drawingmltypes.hxx:231
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nWidth
+    long nY
     -1
-include/oox/drawingml/drawingmltypes.hxx:228
+include/oox/drawingml/drawingmltypes.hxx:231
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nX
+    long nWidth
     -1
-include/oox/drawingml/drawingmltypes.hxx:228
+include/oox/drawingml/drawingmltypes.hxx:231
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nY
+    long nHeight
     -1
-include/oox/export/drawingml.hxx:174
-    _Bool oox::drawingml::DrawingML::HasEnhancedCustomShapeSegmentCommand(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const short)
-    const short nCommand
-    6
-include/oox/export/drawingml.hxx:200
+include/oox/export/drawingml.hxx:380
     void oox::drawingml::DrawingML::WriteSolidFill(const class Color,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,int)
     int nAlpha
     100000
-include/oox/export/drawingml.hxx:213
-    void oox::drawingml::DrawingML::WriteBlipFill(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,int)
+include/oox/export/drawingml.hxx:400
+    void oox::drawingml::DrawingML::WriteBlipFill(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const struct com::sun::star::awt::Size &,const class rtl::OUString &,int)
     int nXmlNamespace
     421
-include/oox/export/vmlexport.hxx:158
-    void oox::vml::VMLExport::AddShapeAttribute(int,const class rtl::OString &)
-    int nAttribute
-    5458
-include/oox/helper/attributelist.hxx:98
+include/oox/helper/attributelist.hxx:100
     class oox::drawingml::Color oox::AttributeList::getHighlightColor(int) const
     int nAttrToken
-    988639
-include/oox/helper/attributelist.hxx:142
-    const char * oox::AttributeList::getChar(int) const
-    int nAttrToken
-    4179
-include/oox/helper/attributelist.hxx:165
+    1119755
+include/oox/helper/attributelist.hxx:170
     unsigned int oox::AttributeList::getUnsignedHex(int,unsigned int) const
     int nAttrToken
-    4318
-include/oox/helper/attributelist.hxx:165
+    4354
+include/oox/helper/attributelist.hxx:170
     unsigned int oox::AttributeList::getUnsignedHex(int,unsigned int) const
     unsigned int nDefault
     4294967295
 include/oox/helper/binaryoutputstream.hxx:86
-    void oox::BinaryOutputStream::writeCharArrayUC(const class rtl::OUString &,unsigned short)
+    void oox::BinaryOutputStream::writeCharArrayUC(class std::basic_string_view<char16_t>,unsigned short)
     unsigned short eTextEnc
     12
 include/oox/helper/binarystreambase.hxx:103
@@ -706,78 +726,86 @@ include/oox/helper/containerhelper.hxx:193
     class rtl::OUString oox::ContainerHelper::insertByUnusedName(const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> &,const class rtl::OUString &,char16_t,const class com::sun::star::uno::Any &)
     char16_t cSeparator
     32
-include/oox/helper/helper.hxx:115
+include/oox/helper/containerhelper.hxx:258
+    const typename type-parameter-?-?::value_type & oox::ContainerHelper::getVectorElement(const type-parameter-?-? &,int,const typename type-parameter-?-?::value_type &)
+    const typename type-parameter-?-?::value_type & rDefault
+    -1
+include/oox/helper/helper.hxx:116
     type-parameter-?-? getIntervalValue(type-parameter-?-?,type-parameter-?-?,type-parameter-?-?)
     type-parameter-?-? nEnd
     360
 include/oox/helper/propertyset.hxx:110
     _Bool oox::PropertySet::setProperty(int,class Color)
     int nPropId
-    515
+    568
 include/oox/helper/textinputstream.hxx:42
     void oox::TextInputStream::TextInputStream(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,unsigned short)
     unsigned short eTextEnc
     76
-include/oox/mathml/importutils.hxx:119
+include/oox/mathml/importutils.hxx:123
     class rtl::OUString & oox::formulaimport::XmlStream::AttributeList::operator[](int)
      ###1
-    1512927
-include/oox/mathml/importutils.hxx:132
+    1644043
+include/oox/mathml/importutils.hxx:136
     void oox::formulaimport::XmlStream::Tag::Tag(int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &)
     int token
     -1
-include/oox/mathml/importutils.hxx:147
+include/oox/mathml/importutils.hxx:151
     _Bool oox::formulaimport::XmlStream::Tag::attribute(int,_Bool) const
     int token
-    1512927
-include/oox/mathml/importutils.hxx:151
+    1644043
+include/oox/mathml/importutils.hxx:155
     char16_t oox::formulaimport::XmlStream::Tag::attribute(int,char16_t) const
     int token
-    1512927
-include/oox/ole/axcontrol.hxx:949
+    1644043
+include/oox/ole/axcontrol.hxx:950
     type-parameter-?-? & oox::ole::EmbeddedControl::createModel(const type-parameter-?-? &)
     const type-parameter-?-? & rParam
     6
 include/oox/ole/olehelper.hxx:77
-    void oox::ole::StdFontInfo::StdFontInfo(const class rtl::OUString &,unsigned int)
+    void oox::ole::StdFontInfo::StdFontInfo(class rtl::OUString,unsigned int)
     unsigned int nHeight
     82500
-include/oox/ole/vbaproject.hxx:153
+include/oox/ole/vbaproject.hxx:154
     void oox::ole::VbaProject::addDummyModule(const class rtl::OUString &,int)
     int nType
     4
-include/sfx2/app.hxx:87
+include/package/Deflater.hxx:49
+    void ZipUtils::Deflater::Deflater(int,_Bool)
+    int nSetLevel
+    -1
+include/sax/fastattribs.hxx:100
+    void sax_fastparser::FastAttributeList::addNS(int,int,class std::basic_string_view<char16_t>)
+    int nToken
+    573
+include/sfx2/app.hxx:82
     void SfxLinkItem::SfxLinkItem(unsigned short,const class Link<const class SfxPoolItem *, void> &)
     unsigned short nWhichId
     5646
-include/sfx2/childwin.hxx:138
-    void SfxChildWindowContext::RegisterChildWindowContext(class SfxModule *,unsigned short,class std::unique_ptr<struct SfxChildWinContextFactory, struct std::default_delete<struct SfxChildWinContextFactory> >)
-    unsigned short 
-    10366
-include/sfx2/ctrlitem.hxx:85
+include/sfx2/ctrlitem.hxx:91
     void SfxStatusForwarder::SfxStatusForwarder(unsigned short,class SfxControllerItem &)
     unsigned short nSlotId
     10930
-include/sfx2/evntconf.hxx:72
+include/sfx2/evntconf.hxx:73
     void SfxEventNamesItem::SfxEventNamesItem(const unsigned short)
     const unsigned short nId
     6101
 include/sfx2/fcontnr.hxx:54
     class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetAnyFilter(enum SfxFilterFlags,enum SfxFilterFlags) const
-    enum SfxFilterFlags nDont
-    393216
-include/sfx2/fcontnr.hxx:54
-    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetAnyFilter(enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nMust
     3
-include/sfx2/fcontnr.hxx:55
-    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
+include/sfx2/fcontnr.hxx:54
+    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetAnyFilter(enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nDont
     393216
 include/sfx2/fcontnr.hxx:55
     class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nMust
     2
+include/sfx2/fcontnr.hxx:55
+    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
+    enum SfxFilterFlags nDont
+    393216
 include/sfx2/fcontnr.hxx:56
     class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4Extension(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nDont
@@ -794,79 +822,67 @@ include/sfx2/fcontnr.hxx:109
     void SfxFilterMatcherIter::SfxFilterMatcherIter(const class SfxFilterMatcher &,enum SfxFilterFlags,enum SfxFilterFlags)
     enum SfxFilterFlags nNotMask
     393216
-include/sfx2/frame.hxx:192
-    void SfxUnoFrameItem::SfxUnoFrameItem(unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &)
+include/sfx2/frame.hxx:190
+    void SfxUnoFrameItem::SfxUnoFrameItem(unsigned short,class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame>)
     unsigned short nWhich
     6516
-include/sfx2/linkmgr.hxx:63
+include/sfx2/linkmgr.hxx:64
     _Bool sfx2::LinkManager::InsertLink(class sfx2::SvBaseLink *,enum sfx2::SvBaseLinkObjectType,enum SfxLinkUpdateMode,const class rtl::OUString *)
     enum SfxLinkUpdateMode nUpdateType
     3
-include/sfx2/lokhelper.hxx:32
+include/sfx2/lokhelper.hxx:70
     void LokMouseEventData::LokMouseEventData(int,class Point,int,enum MouseEventModifiers,int,int)
     enum MouseEventModifiers eModifiers
     256
-include/sfx2/lokhelper.hxx:81
-    void SfxLokHelper::notifyOtherViews(class SfxViewShell *,int,const class boost::property_tree::basic_ptree<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, struct std::less<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > > > &)
+include/sfx2/lokhelper.hxx:152
+    void SfxLokHelper::notifyOtherViews(const class SfxViewShell *,int,const class boost::property_tree::basic_ptree<class std::basic_string<char>, class std::basic_string<char> > &)
     int nType
     24
-include/sfx2/lokhelper.hxx:102
-    void SfxLokHelper::notifyAllViews(int,const class rtl::OString &)
-    int nType
-    38
-include/sfx2/objsh.hxx:450
-    class BitmapEx SfxObjectShell::GetPreviewBitmap(_Bool,enum BmpConversion,enum BmpScaleFlag) const
-    enum BmpConversion nColorConversion
-    6
-include/sfx2/objsh.hxx:450
-    class BitmapEx SfxObjectShell::GetPreviewBitmap(_Bool,enum BmpConversion,enum BmpScaleFlag) const
-    enum BmpScaleFlag nScaleFlag
-    2
-include/sfx2/objsh.hxx:685
-    void SfxObjectShell::AppendInfoBarWhenReady(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum InfobarType,_Bool)
-    enum InfobarType aInfobarType
-    2
-include/sfx2/opengrf.hxx:38
+include/sfx2/msg.hxx:209
+    void SfxSlot::SfxSlot(unsigned short,enum SfxGroupId,enum SfxSlotMode,unsigned short,unsigned short,void (*)(class SfxShell *, class SfxRequest &),void (*)(class SfxShell *, class SfxItemSet &),const struct SfxType *,const class SfxSlot *,const struct SfxFormalArgument *,unsigned short,enum SfxDisableFlags,const char (&)[_ArrayExtent])
+    unsigned short masterSlotId
+    65535
+include/sfx2/opengrf.hxx:37
     void SvxOpenGraphicDialog::SvxOpenGraphicDialog(const class rtl::OUString &,class weld::Window *,short)
     short nDialogType
     13
-include/sfx2/request.hxx:65
+include/sfx2/request.hxx:63
     void SfxRequest::SfxRequest(unsigned short,enum SfxCallMode,const class SfxAllItemSet &,const class SfxAllItemSet &)
     unsigned short nSlot
-    5904
-include/sfx2/sfxhtml.hxx:64
-    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,enum SvMacroItemId,enum SvMacroItemId)
-    enum SvMacroItemId nEventMouseOut
-    5102
-include/sfx2/sfxhtml.hxx:64
-    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,enum SvMacroItemId,enum SvMacroItemId)
+    5925
+include/sfx2/sfxhtml.hxx:63
+    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,class std::basic_string_view<char16_t>,enum SvMacroItemId,enum SvMacroItemId)
     enum SvMacroItemId nEventMouseOver
     5100
-include/sfx2/sidebar/Theme.hxx:135
-    _Bool sfx2::sidebar::Theme::GetBoolean(const enum sfx2::sidebar::Theme::ThemeItem)
-    const enum sfx2::sidebar::Theme::ThemeItem eItem
-    50
-include/sfx2/tabdlg.hxx:49
+include/sfx2/sfxhtml.hxx:63
+    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,class std::basic_string_view<char16_t>,enum SvMacroItemId,enum SvMacroItemId)
+    enum SvMacroItemId nEventMouseOut
+    5102
+include/sfx2/sidebar/SidebarController.hxx:131
+    _Bool sfx2::sidebar::SidebarController::IsDeckOpen(const int)
+    const int nIndex
+    -1
+include/sfx2/tabdlg.hxx:53
     void SfxTabDialogItem::SfxTabDialogItem(unsigned short,const class SfxItemSet &)
     unsigned short nId
     11022
-include/sot/stg.hxx:99
+include/sot/stg.hxx:98
     class BaseStorage * BaseStorage::OpenUCBStorage(const class rtl::OUString &,enum StreamMode,_Bool)
     enum StreamMode 
     2050
-include/sot/stg.hxx:102
+include/sot/stg.hxx:101
     class BaseStorage * BaseStorage::OpenOLEStorage(const class rtl::OUString &,enum StreamMode,_Bool)
     enum StreamMode 
     2050
-include/sot/storage.hxx:50
-    void SotStorageStream::SotStorageStream(const class rtl::OUString &,enum StreamMode)
+include/sot/storage.hxx:40
+    class std::unique_ptr<class SvStream> Create(const class rtl::OUString &,enum StreamMode)
     enum StreamMode 
     2051
-include/store/store.h:63
+include/store/store.h:62
     storeError store_createMemoryFile(unsigned short,void **)
     unsigned short nPageSize
     1024
-include/store/store.h:80
+include/store/store.h:79
     storeError store_openFile(struct _rtl_uString *,enum storeAccessMode,unsigned short,void **)
     unsigned short nPageSize
     1024
@@ -876,20 +892,20 @@ include/svl/globalnameitem.hxx:34
     5561
 include/svl/int64item.hxx:21
     void SfxInt64Item::SfxInt64Item(unsigned short,long)
-    long nVal
-    75
-include/svl/int64item.hxx:21
-    void SfxInt64Item::SfxInt64Item(unsigned short,long)
     unsigned short nWhich
     11141
-include/svl/itemset.hxx:206
+include/svl/int64item.hxx:21
+    void SfxInt64Item::SfxInt64Item(unsigned short,long)
+    long nVal
+    75
+include/svl/itemset.hxx:39
+    void listSfxPoolItemsWithHighestUsage(unsigned short)
+    unsigned short 
+    20
+include/svl/itemset.hxx:272
     void SfxItemSet::PutExtended(const class SfxItemSet &,enum SfxItemState,enum SfxItemState)
     enum SfxItemState eDontCareAs
     16
-include/svl/languageoptions.hxx:120
-    _Bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(short) const
-    short scriptType
-    2
 include/svl/svdde.hxx:157
     void DdePoke::DdePoke(class DdeConnection &,const class rtl::OUString &,const class DdeData &,long)
     long 
@@ -910,218 +926,134 @@ include/svl/urihelper.hxx:116
     class rtl::OUString FindFirstURLInText(const class rtl::OUString &,int &,int &,const class CharClass &,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/svl/urihelper.hxx:148
-    class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
-    unsigned short eCharset
-    76
-include/svl/urihelper.hxx:148
+include/svl/urihelper.hxx:153
     class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::DecodeMechanism eDecodeMechanism
     3
-include/svl/zformat.hxx:396
+include/svl/urihelper.hxx:153
+    class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
+    unsigned short eCharset
+    76
+include/svl/zformat.hxx:407
     _Bool SvNumberformat::IsInQuote(const class rtl::OUString &,int,char16_t,char16_t,char16_t)
     char16_t cEscOut
     92
-include/svl/zformat.hxx:411
+include/svl/zformat.hxx:422
     int SvNumberformat::GetQuoteEnd(const class rtl::OUString &,int,char16_t,char16_t)
     char16_t cQuote
     34
-include/svtools/brwbox.hxx:642
+include/svtools/brwbox.hxx:647
     void BrowseBox::commitBrowseBoxEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
     7
-include/svtools/ctrlbox.hxx:381
+include/svtools/ctrlbox.hxx:379
     void FontNameBox::set_size_request(int,int)
     int nHeight
     -1
-include/svtools/ctrlbox.hxx:461
-    void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
-    unsigned short nMax
-    995
-include/svtools/ctrlbox.hxx:461
+include/svtools/ctrlbox.hxx:460
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nMin
     5
-include/svtools/ctrlbox.hxx:461
+include/svtools/ctrlbox.hxx:460
+    void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
+    unsigned short nMax
+    995
+include/svtools/ctrlbox.hxx:460
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nStep
     5
-include/svtools/ctrlbox.hxx:462
+include/svtools/ctrlbox.hxx:461
     void FontSizeBox::EnablePtRelativeMode(short,short,short)
     short nStep
     10
-include/svtools/htmlout.hxx:66
-    class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned long,unsigned char)
+include/svtools/htmlout.hxx:54
+    class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned int,unsigned char)
     unsigned char nLen
     2
-include/svtools/unitconv.hxx:43
+include/svtools/unitconv.hxx:42
     long ControlToItem(long,enum FieldUnit,enum MapUnit)
     enum FieldUnit eCtrl
     5
-include/svx/AccessibleShape.hxx:208
-    _Bool accessibility::AccessibleShape::GetState(short)
-    short aState
-    11
-include/svx/chrtitem.hxx:83
-    void SvxChartRegressItem::SvxChartRegressItem(enum SvxChartRegress,unsigned short)
-    unsigned short nId
-    89
-include/svx/chrtitem.hxx:94
-    void SvxChartTextOrderItem::SvxChartTextOrderItem(enum SvxChartTextOrder,unsigned short)
-    unsigned short nId
-    67
-include/svx/chrtitem.hxx:108
-    void SvxChartKindErrorItem::SvxChartKindErrorItem(enum SvxChartKindError,unsigned short)
-    unsigned short nId
-    19
-include/svx/chrtitem.hxx:119
-    void SvxChartIndicateItem::SvxChartIndicateItem(enum SvxChartIndicate,unsigned short)
-    unsigned short nId
-    24
-include/svx/dbaexchange.hxx:57
+include/svx/AccessibleShape.hxx:207
+    _Bool accessibility::AccessibleShape::GetState(long)
+    long aState
+    1024
+include/svx/dbaexchange.hxx:58
     void svx::OColumnTransferable::OColumnTransferable(enum ColumnTransferFormatFlags)
     enum ColumnTransferFormatFlags nFormats
     7
-include/svx/dbaexchange.hxx:97
+include/svx/dbaexchange.hxx:98
     void svx::OColumnTransferable::OColumnTransferable(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,enum ColumnTransferFormatFlags)
     enum ColumnTransferFormatFlags _nFormats
     5
-include/svx/dlgctrl.hxx:105
-    void SvxRectCtl::SvxRectCtl(class SvxTabPage *,enum RectPoint,unsigned short)
-    enum RectPoint eRpt
-    4
-include/svx/dlgctrl.hxx:105
-    void SvxRectCtl::SvxRectCtl(class SvxTabPage *,enum RectPoint,unsigned short)
-    unsigned short nBorder
-    200
-include/svx/dlgctrl.hxx:106
+include/svx/dlgctrl.hxx:104
     void SvxRectCtl::SetControlSettings(enum RectPoint,unsigned short)
     enum RectPoint eRpt
     4
-include/svx/dlgctrl.hxx:106
+include/svx/dlgctrl.hxx:104
     void SvxRectCtl::SetControlSettings(enum RectPoint,unsigned short)
     unsigned short nBorder
     240
-include/svx/drawitem.hxx:59
-    void SvxGradientListItem::SvxGradientListItem(const class rtl::Reference<class XGradientList> &,unsigned short)
-    unsigned short nWhich
-    10180
-include/svx/drawitem.hxx:83
-    void SvxHatchListItem::SvxHatchListItem(const class rtl::Reference<class XHatchList> &,unsigned short)
-    unsigned short nWhich
-    10181
-include/svx/drawitem.hxx:108
-    void SvxBitmapListItem::SvxBitmapListItem(const class rtl::Reference<class XBitmapList> &,unsigned short)
-    unsigned short nWhich
-    10182
-include/svx/drawitem.hxx:133
-    void SvxPatternListItem::SvxPatternListItem(const class rtl::Reference<class XPatternList> &,unsigned short)
-    unsigned short nWhich
-    10183
-include/svx/drawitem.hxx:157
-    void SvxDashListItem::SvxDashListItem(const class rtl::Reference<class XDashList> &,unsigned short)
-    unsigned short nWhich
-    10184
-include/svx/drawitem.hxx:182
-    void SvxLineEndListItem::SvxLineEndListItem(const class rtl::Reference<class XLineEndList> &,unsigned short)
-    unsigned short nWhich
-    10185
-include/svx/float3d.hxx:267
+include/svx/float3d.hxx:265
     void Svx3DCtrlItem::Svx3DCtrlItem(unsigned short,class SfxBindings *)
     unsigned short 
     10645
-include/svx/fmgridcl.hxx:42
+include/svx/fmgridcl.hxx:40
     void FmGridHeader::FmGridHeader(class BrowseBox *,long)
     long nWinBits
     1051648
 include/svx/fmview.hxx:88
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,enum SdrObjKind,enum SdrInventor,enum SdrObjKind,class SdrModel &,class rtl::Reference<class SdrUnoObj> &,class rtl::Reference<class SdrUnoObj> &)
     enum SdrInventor _nInventor
     827609170
 include/svx/fmview.hxx:88
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
-    unsigned short _nLabelObjectID
-    37
-include/svx/fontworkgallery.hxx:61
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,enum SdrObjKind,enum SdrInventor,enum SdrObjKind,class SdrModel &,class rtl::Reference<class SdrUnoObj> &,class rtl::Reference<class SdrUnoObj> &)
+    enum SdrObjKind _nLabelObjectID
+    501
+include/svx/fontworkgallery.hxx:65
     void svx::FontWorkGalleryDialog::initFavorites(unsigned short)
     unsigned short nThemeId
     37
-include/svx/fontworkgallery.hxx:63
+include/svx/fontworkgallery.hxx:67
     void svx::FontWorkGalleryDialog::fillFavorites(unsigned short)
     unsigned short nThemeId
     37
-include/svx/framelink.hxx:119
+include/svx/framelink.hxx:117
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle,double)
     double nP
     3
-include/svx/gallery.hxx:110
-    _Bool GalleryExplorer::FillObjListTitle(const unsigned int,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
-    const unsigned int nThemeId
-    16
 include/svx/gallery.hxx:117
     _Bool GalleryExplorer::GetGraphicObj(unsigned int,unsigned int,class Graphic *)
     unsigned int nThemeId
     3
 include/svx/galmisc.hxx:188
-    void GalleryHint::GalleryHint(enum GalleryHintType,const class rtl::OUString &,const class rtl::OUString &)
+    void GalleryHint::GalleryHint(enum GalleryHintType,class rtl::OUString,class rtl::OUString)
     enum GalleryHintType nType
     2
-include/svx/grfcrop.hxx:33
-    void SvxGrfCrop::SvxGrfCrop(unsigned short)
-    unsigned short 
-    132
-include/svx/langbox.hxx:72
-    void SvxLanguageBox::InsertLanguage(const struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,short)
-    short nType
-    4
-include/svx/numinf.hxx:33
-    void SvxNumberInfoItem::SvxNumberInfoItem(const unsigned short)
-    const unsigned short nId
-    10086
-include/svx/numinf.hxx:38
-    void SvxNumberInfoItem::SvxNumberInfoItem(class SvNumberFormatter *,const double &,const unsigned short)
-    const unsigned short nId
-    10086
-include/svx/numinf.hxx:41
-    void SvxNumberInfoItem::SvxNumberInfoItem(class SvNumberFormatter *,const double &,const class rtl::OUString &,const unsigned short)
-    const unsigned short nId
-    10086
-include/svx/ofaitem.hxx:32
+include/svx/ofaitem.hxx:33
     void OfaPtrItem::OfaPtrItem(unsigned short,void *)
     unsigned short nWhich
     11021
 include/svx/ofaitem.hxx:46
-    void OfaRefItem::OfaRefItem<reference_type>(unsigned short,const Reference<type-parameter-?-?> &)
+    void OfaXColorListItem::OfaXColorListItem(unsigned short,class rtl::Reference<class XColorList>)
     unsigned short _nWhich
     10441
-include/svx/optgrid.hxx:77
-    void SvxGridItem::SvxGridItem(unsigned short)
-    unsigned short _nWhich
-    10298
+include/svx/RectangleAlignmentItem.hxx:30
+    void SvxRectangleAlignmentItem::SvxRectangleAlignmentItem(unsigned short,enum model::RectangleAlignment)
+    unsigned short nWhich
+    1058
 include/svx/relfld.hxx:43
     void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short)
     unsigned short nMax
     999
-include/svx/ruler.hxx:244
+include/svx/ruler.hxx:245
     _Bool SvxRuler::IsActLastColumn(_Bool,unsigned short) const
     unsigned short nAct
     65535
-include/svx/ruler.hxx:247
+include/svx/ruler.hxx:248
     _Bool SvxRuler::IsActFirstColumn(_Bool,unsigned short) const
     unsigned short nAct
     65535
-include/svx/sdtaitm.hxx:38
-    void SdrTextVertAdjustItem::SdrTextVertAdjustItem(enum SdrTextVertAdjust,unsigned short)
-    unsigned short nWhich
-    130
-include/svx/svdetc.hxx:104
-    class std::unique_ptr<unsigned short [], struct std::default_delete<unsigned short []> > RemoveWhichRange(const unsigned short *,unsigned short,unsigned short)
-    unsigned short nRangeBeg
-    4006
-include/svx/svdetc.hxx:104
-    class std::unique_ptr<unsigned short [], struct std::default_delete<unsigned short []> > RemoveWhichRange(const unsigned short *,unsigned short,unsigned short)
-    unsigned short nRangeEnd
-    4061
 include/svx/svdhdl.hxx:349
     void SdrHdlLine::SdrHdlLine(class SdrHdl &,class SdrHdl &,enum SdrHdlKind)
     enum SdrHdlKind eNewKind
@@ -1138,86 +1070,98 @@ include/svx/svdhdl.hxx:409
     void ImpMeasureHdl::ImpMeasureHdl(const class Point &,enum SdrHdlKind)
     enum SdrHdlKind eNewKind
     20
-include/svx/svdmodel.hxx:118
+include/svx/svdmodel.hxx:134
     void SdrHint::SdrHint(enum SdrHintKind,const class SdrPage *)
     enum SdrHintKind eNewHint
     2
-include/svx/svdmrkv.hxx:292
+include/svx/svdmrkv.hxx:301
     _Bool SdrMarkView::PickMarkedObj(const class Point &,class SdrObject *&,class SdrPageView *&,enum SdrSearchOptions) const
     enum SdrSearchOptions nOptions
     128
-include/svx/svdpage.hxx:114
-    void SdrObjList::InsertObjectThenMakeNameUnique(class SdrObject *,class std::__debug::unordered_set<class rtl::OUString, struct std::hash< ::rtl::OUString>, struct std::equal_to<class rtl::OUString>, class std::allocator<class rtl::OUString> > &,unsigned long)
+include/svx/svdpage.hxx:110
+    void SdrObjList::InsertObjectThenMakeNameUnique(class SdrObject *,class std::unordered_set<class rtl::OUString> &,unsigned long)
     unsigned long nPos
     18446744073709551615
-include/svx/txencbox.hxx:151
+include/svx/txencbox.hxx:140
     int SvxTextEncodingTreeView::get_height_rows(int) const
     int nRows
     6
-include/svx/txencbox.hxx:155
+include/svx/txencbox.hxx:144
     void SvxTextEncodingTreeView::set_size_request(int,int)
     int nWidth
     -1
-include/svx/unoapi.hxx:43
-    class SvxShape * CreateSvxShapeByTypeAndInventor(unsigned short,enum SdrInventor,const class rtl::OUString &)
+include/svx/unoapi.hxx:45
+    class rtl::Reference<class SvxShape> CreateSvxShapeByTypeAndInventor(enum SdrObjKind,enum SdrInventor,const class rtl::OUString &)
     enum SdrInventor nInventor
     1917081171
 include/svx/xflclit.hxx:37
     void XFillColorItem::XFillColorItem(int,const class Color &)
     int nIndex
     -1
-include/svx/xflgrit.hxx:39
-    void XFillGradientItem::XFillGradientItem(int,const class XGradient &)
+include/svx/xflgrit.hxx:38
+    void XFillGradientItem::XFillGradientItem(int,const class basegfx::BGradient &)
     int nIndex
     -1
 include/svx/xlnclit.hxx:33
     void XLineColorItem::XLineColorItem(int,const class Color &)
     int nIndex
     -1
-include/svx/xpoly.hxx:73
+include/svx/xpoly.hxx:74
     void XPolygon::Insert(unsigned short,const class XPolygon &)
     unsigned short nPos
     65535
-include/test/helper/form.hxx:37
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-    const int nHeight
+include/test/a11y/AccessibilityTools.hxx:239
+    _Bool AccessibilityTools::Await(const class std::function<_Bool (void)> &,unsigned long)
+    unsigned long nTimeoutMs
     3000
-include/test/helper/form.hxx:37
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-    const int nWidth
-    4500
-include/test/helper/form.hxx:37
+include/test/a11y/AccessibilityTools.hxx:255
+    void AccessibilityTools::Wait(unsigned long)
+    unsigned long nTimeoutMs
+    500
+include/test/a11y/accessibletestbase.hxx:232
+    _Bool test::AccessibleTestBase::DialogWaiter::waitEndDialog(unsigned long)
+    unsigned long nTimeoutMs
+    3000
+include/test/helper/form.hxx:40
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nX
     15000
-include/test/helper/form.hxx:37
+include/test/helper/form.hxx:40
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nY
     10000
-include/test/helper/shape.hxx:52
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
+include/test/helper/form.hxx:40
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nHeight
-    3500
-include/test/helper/shape.hxx:52
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
+    3000
+include/test/helper/form.hxx:40
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nWidth
-    5000
-include/test/helper/shape.hxx:52
+    4500
+include/test/helper/shape.hxx:55
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nX
     7500
-include/test/helper/shape.hxx:52
+include/test/helper/shape.hxx:55
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nY
     10000
-include/test/helper/shape.hxx:66
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createRectangle(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
+include/test/helper/shape.hxx:55
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nWidth
     5000
-include/test/helper/shape.hxx:66
+include/test/helper/shape.hxx:55
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
+    const int nHeight
+    3500
+include/test/helper/shape.hxx:69
     class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createRectangle(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
     const int nY
     5000
+include/test/helper/shape.hxx:69
+    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> createRectangle(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
+    const int nWidth
+    5000
 include/test/unoapi_property_testers.hxx:85
     void testLongOptionalProperty(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const int &)
     const int & nValue
@@ -1226,59 +1170,67 @@ include/test/unoapi_property_testers.hxx:166
     void testColorProperty(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const int &)
     const int & rValue
     305419896
+include/test/xmltesttools.hxx:82
+    void XmlTestTools::assertXPathDoubleValue(const class std::unique_ptr<struct _xmlDoc, struct xmlDocDeleter> &,const class rtl::OString &,const class rtl::OString &,double,double)
+    double delta
+    30
 include/toolkit/controls/unocontrolbase.hxx:47
     int UnoControlBase::ImplGetPropertyValue_INT32(unsigned short)
     unsigned short nProp
     74
-include/tools/b3dtrans.hxx:113
-    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
-    double fB
-    -2
-include/tools/b3dtrans.hxx:113
+include/tools/b3dtrans.hxx:112
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fL
     -2
-include/tools/b3dtrans.hxx:113
+include/tools/b3dtrans.hxx:112
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fR
     2
-include/tools/b3dtrans.hxx:113
+include/tools/b3dtrans.hxx:112
+    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
+    double fB
+    -2
+include/tools/b3dtrans.hxx:112
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fT
     2
-include/tools/datetime.hxx:87
+include/tools/datetime.hxx:97
     class DateTime operator+(const class DateTime &,int)
     int nDays
     10
-include/tools/fract.hxx:71
+include/tools/fract.hxx:70
     class Fraction & Fraction::operator*=(double)
      ###1
     -1
-include/tools/gen.hxx:92
-    class Point & Point::operator*=(const long)
+include/tools/fract.hxx:102
+    class Fraction operator+(double,const class Fraction &)
+    double v1
+    21600
+include/tools/fract.hxx:103
+    class Fraction operator-(double,const class Fraction &)
+    double v1
+    21600
+include/tools/gen.hxx:133
+    type-parameter-?-? & PointTemplate::operator*=(const long)
      ###1
     -1
-include/tools/gen.hxx:93
-    class Point & Point::operator/=(const long)
+include/tools/gen.hxx:139
+    type-parameter-?-? & PointTemplate::operator/=(const long)
      ###1
     2
-include/tools/gen.hxx:97
-    class Point operator*(const class Point &,const long)
-    const long nVal2
-    -1
-include/tools/gen.hxx:98
-    class Point operator/(const class Point &,const long)
-    const long nVal2
-    2
-include/tools/gen.hxx:203
-    void Size::extendBy(long,long)
+include/tools/gen.hxx:296
+    void SizeTemplate::extendBy(long,long)
     long x
     10
-include/tools/gen.hxx:203
-    void Size::extendBy(long,long)
-    long y
-    10
-include/tools/poly.hxx:96
+include/tools/gen.hxx:326
+    type-parameter-?-? & SizeTemplate::operator/=(const long)
+     ###1
+    2
+include/tools/gen.hxx:406
+    class Size operator/(const class Size &,const long)
+    const long nVal2
+    2
+include/tools/poly.hxx:98
     void tools::Polygon::Polygon(const class Point &,const class Point &,const class Point &,const class Point &,unsigned short)
     unsigned short nPoints
     25
@@ -1288,177 +1240,169 @@ include/tools/urlobj.hxx:271
     76
 include/tools/urlobj.hxx:276
     class rtl::OUString INetURLObject::getAbbreviated(const class com::sun::star::uno::Reference<class com::sun::star::util::XStringWidth> &,int,enum INetURLObject::DecodeMechanism,unsigned short) const
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:276
-    class rtl::OUString INetURLObject::getAbbreviated(const class com::sun::star::uno::Reference<class com::sun::star::util::XStringWidth> &,int,enum INetURLObject::DecodeMechanism,unsigned short) const
     enum INetURLObject::DecodeMechanism eMechanism
     3
+include/tools/urlobj.hxx:276
+    class rtl::OUString INetURLObject::getAbbreviated(const class com::sun::star::uno::Reference<class com::sun::star::util::XStringWidth> &,int,enum INetURLObject::DecodeMechanism,unsigned short) const
+    unsigned short eCharset
+    76
 include/tools/urlobj.hxx:294
-    _Bool INetURLObject::SetURL(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+    _Bool INetURLObject::SetURL(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
 include/tools/urlobj.hxx:344
-    class rtl::OUString INetURLObject::GetAbsURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
+    class rtl::OUString INetURLObject::GetAbsURL(class std::basic_string_view<char16_t>,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     unsigned short eCharset
     76
 include/tools/urlobj.hxx:351
-    class rtl::OUString INetURLObject::GetRelURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
+    class rtl::OUString INetURLObject::GetRelURL(class std::basic_string_view<char16_t>,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
     unsigned short eCharset
     76
 include/tools/urlobj.hxx:351
-    class rtl::OUString INetURLObject::GetRelURL(const class rtl::OUString &,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
+    class rtl::OUString INetURLObject::GetRelURL(class std::basic_string_view<char16_t>,const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
     enum FSysStyle eStyle
     7
 include/tools/urlobj.hxx:362
-    _Bool INetURLObject::translateToExternal(const class rtl::OUString &,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:369
-    _Bool INetURLObject::translateToInternal(const class rtl::OUString &,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
+    _Bool INetURLObject::translateToExternal(class std::basic_string_view<char16_t>,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
     unsigned short eCharset
     76
 include/tools/urlobj.hxx:369
-    _Bool INetURLObject::translateToInternal(const class rtl::OUString &,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
+    _Bool INetURLObject::translateToInternal(class std::basic_string_view<char16_t>,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::DecodeMechanism eDecodeMechanism
     3
-include/tools/urlobj.hxx:416
+include/tools/urlobj.hxx:369
+    _Bool INetURLObject::translateToInternal(class std::basic_string_view<char16_t>,class rtl::OUString &,enum INetURLObject::DecodeMechanism,unsigned short)
+    unsigned short eCharset
+    76
+include/tools/urlobj.hxx:415
     class rtl::OUString INetURLObject::GetUser(enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:421
+include/tools/urlobj.hxx:420
     class rtl::OUString INetURLObject::GetPass(enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:438
+include/tools/urlobj.hxx:434
     class rtl::OUString INetURLObject::GetHost(enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:443
-    class rtl::OUString INetURLObject::GetHostPort(enum INetURLObject::DecodeMechanism,unsigned short) const
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:443
+include/tools/urlobj.hxx:439
     class rtl::OUString INetURLObject::GetHostPort(enum INetURLObject::DecodeMechanism,unsigned short) const
     enum INetURLObject::DecodeMechanism eMechanism
     2
-include/tools/urlobj.hxx:462
-    _Bool INetURLObject::SetURLPath(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:439
+    class rtl::OUString INetURLObject::GetHostPort(enum INetURLObject::DecodeMechanism,unsigned short) const
+    unsigned short eCharset
+    76
+include/tools/urlobj.hxx:458
+    _Bool INetURLObject::SetURLPath(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:516
+include/tools/urlobj.hxx:512
     _Bool INetURLObject::removeSegment(int,_Bool)
     int nIndex
     -1
-include/tools/urlobj.hxx:586
-    _Bool INetURLObject::setName(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:582
+    _Bool INetURLObject::setName(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:606
-    class rtl::OUString INetURLObject::getBase(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:606
+include/tools/urlobj.hxx:602
     class rtl::OUString INetURLObject::getBase(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     int nIndex
     -1
-include/tools/urlobj.hxx:630
-    _Bool INetURLObject::setBase(const class rtl::OUString &,int,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:602
+    class rtl::OUString INetURLObject::getBase(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:630
-    _Bool INetURLObject::setBase(const class rtl::OUString &,int,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:626
+    _Bool INetURLObject::setBase(class std::basic_string_view<char16_t>,int,enum INetURLObject::EncodeMechanism,unsigned short)
     int nIndex
     -1
-include/tools/urlobj.hxx:659
-    class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
+include/tools/urlobj.hxx:626
+    _Bool INetURLObject::setBase(class std::basic_string_view<char16_t>,int,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:659
+include/tools/urlobj.hxx:655
     class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     int nIndex
     -1
-include/tools/urlobj.hxx:683
-    _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
+include/tools/urlobj.hxx:655
+    class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:683
-    _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
+include/tools/urlobj.hxx:679
+    _Bool INetURLObject::setExtension(class std::basic_string_view<char16_t>,int,_Bool,unsigned short)
     int nIndex
     -1
-include/tools/urlobj.hxx:702
+include/tools/urlobj.hxx:679
+    _Bool INetURLObject::setExtension(class std::basic_string_view<char16_t>,int,_Bool,unsigned short)
+    unsigned short eCharset
+    76
+include/tools/urlobj.hxx:698
     _Bool INetURLObject::removeExtension(int,_Bool)
     int nIndex
     -1
-include/tools/urlobj.hxx:735
+include/tools/urlobj.hxx:731
     class rtl::OUString INetURLObject::GetParam(unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:739
-    _Bool INetURLObject::SetParam(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:735
+    _Bool INetURLObject::SetParam(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:747
+include/tools/urlobj.hxx:743
     class rtl::OUString INetURLObject::GetMark(enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:752
-    _Bool INetURLObject::SetMark(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:748
+    _Bool INetURLObject::SetMark(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:897
-    _Bool INetURLObject::Append(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,unsigned short)
+include/tools/urlobj.hxx:889
+    _Bool INetURLObject::Append(class std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:1031
-    _Bool INetURLObject::setUser(const class rtl::OUString &,unsigned short)
+include/tools/urlobj.hxx:1028
+    _Bool INetURLObject::setUser(class std::basic_string_view<char16_t>,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:1037
-    _Bool INetURLObject::setPassword(const class rtl::OUString &,unsigned short)
+include/tools/urlobj.hxx:1034
+    _Bool INetURLObject::setPassword(class std::basic_string_view<char16_t>,unsigned short)
     unsigned short eCharset
     76
-include/tools/urlobj.hxx:1052
-    _Bool INetURLObject::setHost(const class rtl::OUString &,unsigned short)
+include/tools/urlobj.hxx:1049
+    _Bool INetURLObject::setHost(class std::basic_string_view<char16_t>,unsigned short)
     unsigned short eCharset
     76
-include/ucbhelper/simpleinteractionrequest.hxx:76
+include/ucbhelper/simpleinteractionrequest.hxx:79
     void ucbhelper::SimpleInteractionRequest::SimpleInteractionRequest(const class com::sun::star::uno::Any &,const enum ContinuationFlags)
     const enum ContinuationFlags nContinuations
     12
-include/unotools/compatibility.hxx:210
-    void SvtCompatibilityOptions::SetDefault(enum SvtCompatibilityEntry::Index,_Bool)
-    enum SvtCompatibilityEntry::Index rIdx
-    12
 include/unotools/confignode.hxx:254
     class utl::OConfigurationTreeRoot utl::OConfigurationTreeRoot::tryCreateWithComponentContext(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,int,enum utl::OConfigurationTreeRoot::CREATION_MODE)
     int _nDepth
     -1
-include/unotools/configvaluecontainer.hxx:83
-    void utl::OConfigurationValueContainer::OConfigurationValueContainer(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class osl::Mutex &,const char *,const int)
+include/unotools/configvaluecontainer.hxx:84
+    void utl::OConfigurationValueContainer::OConfigurationValueContainer(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class std::mutex &,const char *,const int)
     const int _nLevels
     2
-include/unotools/fontdefs.hxx:39
-    class rtl::OUString GetSubsFontName(const class rtl::OUString &,enum SubsFontFlags)
+include/unotools/fontdefs.hxx:43
+    class rtl::OUString GetSubsFontName(class std::basic_string_view<char16_t>,enum SubsFontFlags)
     enum SubsFontFlags nFlags
     3
-include/unotools/ucbstreamhelper.hxx:43
-    class std::unique_ptr<class SvStream, struct std::default_delete<class SvStream> > utl::UcbStreamHelper::CreateStream(const class rtl::OUString &,enum StreamMode,const class com::sun::star::uno::Reference<class com::sun::star::task::XInteractionHandler> &)
-    enum StreamMode eOpenMode
-    261
-include/unotools/useroptions.hxx:90
+include/unotools/useroptions.hxx:88
     void SvtUserOptions::SetBoolValue(enum UserOptToken,_Bool)
     enum UserOptToken nToken
     19
-include/vcl/accessiblefactory.hxx:113
-    class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> vcl::IAccessibleFactory::createAccessibleBrowseBoxHeaderBar(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class vcl::IAccessibleTableProvider &,enum vcl::AccessibleBrowseBoxObjType) const
-    enum vcl::AccessibleBrowseBoxObjType _eObjType
+include/vcl/accessibility/AccessibleTextAttributeHelper.hxx:63
+    class rtl::OUString GetIAccessible2TextAttributes(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessibleText> &,enum IA2AttributeType,int,int &,int &)
+    enum IA2AttributeType eAttributeType
     3
-include/vcl/alpha.hxx:53
-    void AlphaMask::Replace(const class Bitmap &,unsigned char)
-    unsigned char rReplaceTransparency
-    255
-include/vcl/BitmapAlphaClampFilter.hxx:21
+include/vcl/accessiblefactory.hxx:119
+    class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> vcl::IAccessibleFactory::createAccessibleBrowseBoxHeaderBar(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class vcl::IAccessibleTableProvider &,enum AccessibleBrowseBoxObjType) const
+    enum AccessibleBrowseBoxObjType _eObjType
+    3
+include/vcl/BitmapAlphaClampFilter.hxx:22
     void BitmapAlphaClampFilter::BitmapAlphaClampFilter(unsigned char)
     unsigned char cThreshold
     253
@@ -1466,99 +1410,107 @@ include/vcl/BitmapBasicMorphologyFilter.hxx:50
     void BitmapErodeFilter::BitmapErodeFilter(int,unsigned char)
     unsigned char nValueOutside
     255
-include/vcl/bitmapex.hxx:52
-    void BitmapEx::BitmapEx(class Size,unsigned short)
-    unsigned short nBitCount
+include/vcl/BitmapBuffer.hxx:48
+    class std::optional<struct BitmapBuffer> StretchAndConvert(const struct BitmapBuffer &,const struct SalTwoRect &,enum ScanlineFormat,class std::optional<class BitmapPalette>,const class ColorMask *)
+    enum ScanlineFormat nDstBitmapFormat
+    7
+include/vcl/bitmapex.hxx:45
+    void BitmapEx::BitmapEx(class Size,enum vcl::PixelFormat)
+    enum vcl::PixelFormat ePixelFormat
     24
-include/vcl/bitmapex.hxx:451
-    void BitmapEx::CombineMaskOr(class Color,unsigned char)
-    unsigned char nTol
-    9
-include/vcl/dockwin.hxx:147
-    void ImplDockingWindowWrapper::ShowTitleButton(enum TitleButton,_Bool)
-    enum TitleButton nButton
-    4
-include/vcl/errinf.hxx:181
-    void TwoStringErrorInfo::TwoStringErrorInfo(class ErrCode,const class rtl::OUString &,const class rtl::OUString &,enum DialogMask)
-    enum DialogMask nMask
-    4097
-include/vcl/fieldvalues.hxx:60
+include/vcl/BitmapReadAccess.hxx:36
+    void BitmapReadAccess::BitmapReadAccess(const class AlphaMask &,enum BitmapAccessMode)
+    enum BitmapAccessMode nMode
+    2
+include/vcl/DocWindow.hxx:21
+    void vcl::DocWindow::Window(class vcl::Window *,long)
+    long 
+    3
+include/vcl/fieldvalues.hxx:65
     double ConvertDoubleValue(long,unsigned short,enum FieldUnit,enum MapUnit)
     enum MapUnit eOutUnit
     9
-include/vcl/fieldvalues.hxx:66
+include/vcl/fieldvalues.hxx:71
     double ConvertDoubleValue(long,unsigned short,enum MapUnit,enum FieldUnit)
     enum MapUnit eInUnit
     9
-include/vcl/filter/PDFiumLibrary.hxx:246
+include/vcl/filter/PDFiumLibrary.hxx:110
+    class rtl::OUString vcl::pdf::PDFiumAnnotation::getFormAdditionalActionJavaScript(class vcl::pdf::PDFiumDocument *,enum vcl::pdf::PDFAnnotAActionType)
+    enum vcl::pdf::PDFAnnotAActionType eEvent
+    12
+include/vcl/filter/PDFiumLibrary.hxx:231
     _Bool vcl::pdf::PDFiumDocument::saveWithVersion(class SvMemoryStream &,int)
     int nFileVersion
     16
-include/vcl/floatwin.hxx:158
-    class Point FloatingWindow::CalcFloatingPosition(class vcl::Window *,const class tools::Rectangle &,enum FloatWinPopupFlags,unsigned short &)
-    enum FloatWinPopupFlags nFlags
-    16
-include/vcl/font.hxx:94
+include/vcl/font.hxx:90
     void vcl::Font::IncreaseQualityBy(int)
     int 
     50
-include/vcl/font.hxx:95
+include/vcl/font.hxx:91
     void vcl::Font::DecreaseQualityBy(int)
     int 
     100
-include/vcl/font/Feature.hxx:75
-    void vcl::font::FeatureDefinition::FeatureDefinition(unsigned int,const char *,class std::__debug::vector<struct vcl::font::FeatureParameter, class std::allocator<struct vcl::font::FeatureParameter> >)
-    unsigned int nCode
-    1718772067
+include/vcl/gdimtf.hxx:186
+    _Bool GDIMetaFile::CreateThumbnail(class BitmapEx &,enum BmpConversion,enum BmpScaleFlag) const
+    enum BmpConversion nColorConversion
+    4
+include/vcl/gdimtf.hxx:186
+    _Bool GDIMetaFile::CreateThumbnail(class BitmapEx &,enum BmpConversion,enum BmpScaleFlag) const
+    enum BmpScaleFlag nScaleFlag
+    2
 include/vcl/imap.hxx:117
     unsigned long ImageMap::Read(class SvStream &,enum IMapFormat)
     enum IMapFormat nFormat
     15
-include/vcl/outdev.hxx:1190
-    int OutputDevice::GetTextBreak(const class rtl::OUString &,long,char16_t,int &,int,int,long,const class vcl::TextLayoutCache *) const
+include/vcl/outdev.hxx:1063
+    int OutputDevice::GetTextBreak(const class rtl::OUString &,long,char16_t,int &,int,int,long,const class vcl::text::TextLayoutCache *,const class SalLayoutGlyphs *) const
     char16_t nExtraChar
     45
-include/vcl/print.hxx:657
-    class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
-    int i_nMaxValue
-    1000
-include/vcl/print.hxx:657
+include/vcl/print.hxx:610
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     int i_nMinValue
     10
-include/vcl/svapp.hxx:745
-    struct ImplSVEvent * Application::PostGestureEvent(enum VclEventId,class vcl::Window *,const class GestureEvent *)
+include/vcl/print.hxx:610
+    class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
+    int i_nMaxValue
+    1000
+include/vcl/svapp.hxx:758
+    struct ImplSVEvent * Application::PostGestureEvent(enum VclEventId,class vcl::Window *,const class GestureEventPan *)
     enum VclEventId nEvent
-    130
+    131
 include/vcl/texteng.hxx:132
     class TextPaM TextEngine::ImpInsertText(const class TextSelection &,char16_t,_Bool)
     char16_t c
     9
+include/vcl/toolbox.hxx:305
+    void ToolBox::InsertItem(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,const class Image &,const class rtl::OUString &,enum ToolBoxItemBits,unsigned long)
+    unsigned long nPos
+    18446744073709551615
 include/vcl/toolbox.hxx:318
     void ToolBox::InsertBreak(unsigned long)
     unsigned long nPos
     18446744073709551615
-include/vcl/toolkit/lstbox.hxx:118
+include/vcl/toolkit/lstbox.hxx:117
     void ListBox::ListBox(enum WindowType)
     enum WindowType nType
     331
-include/vcl/toolkit/svtabbx.hxx:84
-    class rtl::OUString SvTabListBox::GetEntryText(unsigned long,unsigned short) const
+include/vcl/toolkit/svtabbx.hxx:76
+    class rtl::OUString SvTabListBox::GetEntryText(unsigned int,unsigned short) const
     unsigned short nCol
     65535
-include/vcl/toolkit/svtabbx.hxx:89
+include/vcl/toolkit/svtabbx.hxx:81
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
     enum SvTabJustify 
     8
-include/vcl/toolkit/treelistbox.hxx:496
+include/vcl/toolkit/treelistbox.hxx:504
     class SvLBoxTab * SvTreeListBox::GetFirstTab(enum SvLBoxTabFlags,unsigned short &)
     enum SvLBoxTabFlags nFlagMask
     16
-include/vcl/toolkit/treelistbox.hxx:497
+include/vcl/toolkit/treelistbox.hxx:505
     void SvTreeListBox::GetLastTab(enum SvLBoxTabFlags,unsigned short &)
     enum SvLBoxTabFlags nFlagMask
     16
-include/vcl/toolkit/treelistbox.hxx:655
+include/vcl/toolkit/treelistbox.hxx:644
     void SvTreeListBox::SetHighlightRange(unsigned short,unsigned short)
     unsigned short nLastTab
     65535
@@ -1566,59 +1518,51 @@ include/vcl/transfer.hxx:227
     void TransferableHelper::RemoveFormat(enum SotClipboardFormatId)
     enum SotClipboardFormatId nFormat
     59
-include/vcl/transfer.hxx:325
-    _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &)
+include/vcl/transfer.hxx:319
+    _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &) const
     enum SotClipboardFormatId nFormat
     2
-include/vcl/transfer.hxx:336
-    _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long)
+include/vcl/transfer.hxx:330
+    _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long) const
     enum SotClipboardFormatId nFormat
     3
-include/vcl/transfer.hxx:342
-    _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &)
+include/vcl/transfer.hxx:336
+    _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &) const
     enum SotClipboardFormatId nFormat
     13
-include/vcl/transfer.hxx:357
-    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
+include/vcl/transfer.hxx:351
+    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &) const
     enum SotClipboardFormatId nFormat
     59
-include/vcl/uitest/logger.hxx:47
+include/vcl/TypeSerializer.hxx:29
+    unsigned int createMagic(char,char,char,char)
+    char char4
+    48
+include/vcl/uitest/logger.hxx:51
     void UITestLogger::logAction(class vcl::Window *const &,enum VclEventId)
     enum VclEventId nEvent
-    85
-include/vcl/weld.hxx:890
-    void weld::TreeView::insert_separator(int,const class rtl::OUString &)
-    int pos
-    -1
-include/vcl/weld.hxx:928
-    void weld::TreeView::set_sensitive(int,_Bool,int)
-    int col
-    -1
-include/vcl/weld.hxx:1045
-    void weld::TreeView::set_image(const class weld::TreeIter &,const class rtl::OUString &,int)
-    int col
-    -1
-include/vcl/weld.hxx:1208
-    void weld::IconView::insert(int,const class rtl::OUString *,const class rtl::OUString *,const class rtl::OUString *,class weld::TreeIter *)
-    int pos
-    -1
-include/vcl/weld.hxx:1239
-    void weld::IconView::select(int)
+    86
+include/vcl/vectorgraphicdata.hxx:37
+    class BitmapEx convertPrimitive2DSequenceToBitmapEx(const class std::deque<class com::sun::star::uno::Reference<class com::sun::star::graphic::XPrimitive2D> > &,const class basegfx::B2DRange &,const unsigned int,const enum o3tl::Length,const class std::optional<class Size> &)
+    const unsigned int nMaximumQuadraticPixels
+    500000
+include/vcl/weld.hxx:751
+    void weld::ComboBox::insert(int,const struct weld::ComboBoxEntry &)
     int pos
     -1
-include/vcl/weld.hxx:1240
-    void weld::IconView::unselect(int)
+include/vcl/weld.hxx:1038
+    void weld::TreeView::insert_separator(int,const class rtl::OUString &)
     int pos
     -1
-include/vcl/weld.hxx:2138
-    void weld::Menu::insert(int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString *,class VirtualDevice *,enum TriState)
+include/vcl/weld.hxx:1611
+    void weld::MenuButton::insert_item(int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString *,class VirtualDevice *,enum TriState)
     int pos
     -1
-include/vcl/weld.hxx:2147
-    void weld::Menu::insert_separator(int,const class rtl::OUString &)
+include/vcl/weld.hxx:1635
+    void weld::MenuButton::insert_separator(int,const class rtl::OUString &)
     int pos
     -1
-include/vcl/window.hxx:1533
+include/vcl/window.hxx:1449
     void vcl::Window::SimulateKeyPress(unsigned short) const
     unsigned short nKeyCode
     1312
@@ -1630,11 +1574,11 @@ include/vcl/wrkwin.hxx:67
     void WorkWindow::WorkWindow(class vcl::Window *,const class com::sun::star::uno::Any &,long)
     long nStyle
     1312
-include/xmloff/txtparae.hxx:349
+include/xmloff/txtparae.hxx:355
     void XMLTextParagraphExport::exportListAndSectionChange(class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,class MultiPropertySetHelper &,short,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextContent> &,const class XMLTextNumRuleInfo &,const class XMLTextNumRuleInfo &,_Bool)
     short nTextSectionId
     5
-include/xmloff/txtparae.hxx:381
+include/xmloff/txtparae.hxx:391
     void XMLTextParagraphExport::Add(enum XmlStyleFamily,class MultiPropertySetHelper &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
     enum XmlStyleFamily nFamily
     100
@@ -1646,51 +1590,47 @@ include/xmloff/xmlaustp.hxx:101
     void SvXMLAutoStylePoolP::RegisterDefinedName(enum XmlStyleFamily,const class rtl::OUString &)
     enum XmlStyleFamily nFamily
     204
+include/xmloff/XMLComplexColorExport.hxx:37
+    void XMLComplexColorExport::exportComplexColor(const class model::ComplexColor &,unsigned short,enum xmloff::token::XMLTokenEnum)
+    unsigned short nPrefix
+    54
 include/xmloff/xmlerror.hxx:135
     void XMLErrors::ThrowErrorAsSAXException(int)
     int nIdMask
     1073741824
-include/xmloff/xmlexp.hxx:272
-    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const short,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &)
+include/xmloff/xmlexp.hxx:276
+    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class rtl::OUString,class rtl::OUString,const short,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &)
     const short eDefaultMeasureUnit
     3
-include/xmloff/xmlexp.hxx:337
-    void SvXMLExport::AddAttributeASCII(unsigned short,const char *,const char *)
-    unsigned short nPrefix
-    34
 include/xmloff/xmlexp.hxx:512
     void SvXMLExport::SetError(int,const class com::sun::star::uno::Sequence<class rtl::OUString> &)
     int nId
     1074266113
-include/xmloff/xmlexppr.hxx:135
-    void SvXMLExportPropertyMapper::exportXML(class SvXMLExport &,const class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,enum SvXmlExportFlags,_Bool) const
+include/xmloff/xmlexppr.hxx:138
+    void SvXMLExportPropertyMapper::exportXML(class SvXMLExport &,const class std::vector<struct XMLPropertyState> &,enum SvXmlExportFlags,_Bool) const
     enum SvXmlExportFlags nFlags
     8
-include/xmloff/xmlimp.hxx:482
-    void SvXMLImport::SetError(int,const class rtl::OUString &,const class rtl::OUString &)
-    int nId
-    268566538
-include/xmloff/xmlnumfi.hxx:191
-    _Bool SvXMLNumFormatContext::ReplaceNfKeyword(unsigned short,unsigned short)
-    unsigned short nNew
-    25
-include/xmloff/xmlnumfi.hxx:191
+include/xmloff/xmlnumfi.hxx:206
     _Bool SvXMLNumFormatContext::ReplaceNfKeyword(unsigned short,unsigned short)
     unsigned short nOld
     24
+include/xmloff/xmlnumfi.hxx:206
+    _Bool SvXMLNumFormatContext::ReplaceNfKeyword(unsigned short,unsigned short)
+    unsigned short nNew
+    25
 include/xmloff/XMLSettingsExportContext.hxx:37
     void xmloff::XMLSettingsExportContext::AddAttribute(enum xmloff::token::XMLTokenEnum,const class rtl::OUString &)
     enum xmloff::token::XMLTokenEnum i_eName
-    1222
+    1291
 include/xmloff/XMLSettingsExportContext.hxx:39
     void xmloff::XMLSettingsExportContext::AddAttribute(enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum)
     enum xmloff::token::XMLTokenEnum i_eName
-    1870
+    1982
 libreofficekit/qa/tilebench/tilebench.cxx:72
     void dumpTile(const char *,const int,const int,const int,const unsigned char *,const int,const int,int)
     int nTotalWidth
     -1
-libreofficekit/qa/tilebench/tilebench.cxx:345
+libreofficekit/qa/tilebench/tilebench.cxx:352
     int testJoinsAt(class lok::Document *,long,long,const long,const long)
     const long nTilePixelSize
     256
@@ -1698,7 +1638,7 @@ lotuswordpro/inc/xfilter/xfdrawstyle.hxx:95
     void XFDrawStyle::SetLineDashStyle(enum enumXFLineStyle,double,double,double)
     enum enumXFLineStyle style
     3
-lotuswordpro/inc/xfilter/xfdrawstyle.hxx:117
+lotuswordpro/inc/xfilter/xfdrawstyle.hxx:118
     void XFDrawStyle::SetFontWorkStyle(enum enumXFFWStyle,enum enumXFFWAdjust)
     enum enumXFFWStyle eStyle
     4
@@ -1712,17 +1652,17 @@ lotuswordpro/inc/xfilter/xffont.hxx:203
     58
 lotuswordpro/inc/xfilter/xfindex.hxx:100
     void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
-    char16_t delimiter
-    100
-lotuswordpro/inc/xfilter/xfindex.hxx:100
-    void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
     enum enumXFTab type
     3
+lotuswordpro/inc/xfilter/xfindex.hxx:100
+    void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
+    char16_t delimiter
+    100
 lotuswordpro/source/filter/bento.hxx:215
     void OpenStormBento::LtcBenContainer::SeekFromEnd(long)
     long Offset
     -24
-lotuswordpro/source/filter/tocread.hxx:86
+lotuswordpro/source/filter/tocread.hxx:87
     enum OpenStormBento::BenError OpenStormBento::CBenTOCReader::GetData(void *,unsigned long)
     unsigned long Amt
     4
@@ -1738,28 +1678,32 @@ o3tl/qa/cow_wrapper_clients.hxx:132
     void o3tltests::cow_wrapper_client4::cow_wrapper_client4(int)
     int 
     4
-oox/source/core/xmlfilterbase.cxx:595
+oox/source/core/xmlfilterbase.cxx:601
     void writeElement(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,int,const class com::sun::star::uno::Sequence<class rtl::OUString> &)
     int nXmlElement
-    93588338
-oox/source/core/xmlfilterbase.cxx:612
+    94636939
+oox/source/core/xmlfilterbase.cxx:615
     void writeElement(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,int,const class LanguageTag &)
     int nXmlElement
-    110037902
-oox/source/export/vmlexport.cxx:332
+    111217575
+oox/source/drawingml/table/predefined-table-styles.cxx:213
+    void setBorderLineType(const class std::shared_ptr<struct oox::drawingml::LineProperties> &,int)
+    int nToken
+    4856
+oox/source/export/vmlexport.cxx:333
     void impl_AddInt(class sax_fastparser::FastAttributeList *,int,unsigned int)
     int nElement
-    5722
-package/inc/ThreadedDeflater.hxx:55
+    5767
+package/inc/ThreadedDeflater.hxx:53
     void ZipUtils::ThreadedDeflater::ThreadedDeflater(int)
     int nSetLevel
     -1
-reportdesign/source/filter/xml/xmlExport.hxx:124
-    void rptxml::ORptExport::collectStyleNames(enum XmlStyleFamily,const class std::__debug::vector<int, class std::allocator<int> > &,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
+reportdesign/source/filter/xml/xmlExport.hxx:120
+    void rptxml::ORptExport::collectStyleNames(enum XmlStyleFamily,const class std::vector<int> &,class std::vector<class rtl::OUString> &)
     enum XmlStyleFamily _nFamily
     202
-reportdesign/source/filter/xml/xmlExport.hxx:125
-    void rptxml::ORptExport::collectStyleNames(enum XmlStyleFamily,const class std::__debug::vector<int, class std::allocator<int> > &,const class std::__debug::vector<int, class std::allocator<int> > &,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
+reportdesign/source/filter/xml/xmlExport.hxx:121
+    void rptxml::ORptExport::collectStyleNames(enum XmlStyleFamily,const class std::vector<int> &,const class std::vector<int> &,class std::vector<class rtl::OUString> &)
     enum XmlStyleFamily _nFamily
     203
 reportdesign/source/filter/xml/xmlStyleImport.hxx:60
@@ -1767,14 +1711,14 @@ reportdesign/source/filter/xml/xmlStyleImport.hxx:60
     short nContextID
     28673
 reportdesign/source/ui/inc/UITools.hxx:142
-    class SdrObject * isOver(const class tools::Rectangle &,const class SdrPage &,const class SdrView &,_Bool,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> *,int)
+    class SdrObject * isOver(const class tools::Rectangle &,const class SdrPage &,const class SdrView &,_Bool,class rtl::Reference<class SdrUnoObj> *,int)
     int _nIgnoreListLength
     2
-sal/osl/unx/file_path_helper.cxx:173
-    void (anonymous namespace)::path_list_iterator::path_list_iterator(const class rtl::OUString &,char16_t)
+sal/osl/unx/file_path_helper.cxx:175
+    void (anonymous namespace)::path_list_iterator::path_list_iterator(class rtl::OUString,char16_t)
     char16_t list_separator
     58
-sal/osl/unx/file_url.cxx:503
+sal/osl/unx/file_url.cxx:483
     _Bool _islastchr(char16_t *,char16_t)
     char16_t Chr
     47
@@ -1782,11 +1726,11 @@ sal/osl/unx/file_url.hxx:36
     int TextToUnicode(const char *,unsigned long,char16_t *,int)
     int unic_text_buffer_size
     4096
-sal/osl/unx/nlsupport.cxx:106
+sal/osl/unx/nlsupport.cxx:105
     char * compose_locale(struct _rtl_Locale *,char *,unsigned long)
     unsigned long n
     64
-sal/osl/unx/profile.cxx:137
+sal/osl/unx/profile.cxx:140
     void osl_ProfileGenerateExtension(const char *,const char *,char *,int)
     int BufferMaxLen
     4096
@@ -1798,7 +1742,7 @@ sal/osl/unx/uunxapi.hxx:74
     int mkdir(const class rtl::OString &,unsigned int)
     unsigned int aMode
     511
-sal/qa/osl/file/osl_File.cxx:107
+sal/qa/osl/file/osl_File.cxx:102
     _Bool t_compareTime(struct TimeValue *,struct TimeValue *,int)
     int nDelta
     2000
@@ -1806,11 +1750,19 @@ sax/inc/xml2utf.hxx:96
     int sax_expatwrap::XMLFile2UTFConverter::readAndConvert(class com::sun::star::uno::Sequence<signed char> &,int)
     int nMaxToRead
     16384
-sax/source/tools/converter.cxx:995
-    enum sax::(anonymous namespace)::Result readUnsignedNumberMaxDigits(int,const class rtl::OUString &,int &,int &)
+sax/source/tools/converter.cxx:57
+    long toInt64_WithLength(const char16_t *,short,int)
+    short radix
+    10
+sax/source/tools/converter.cxx:61
+    long toInt64_WithLength(const char *,short,int)
+    short radix
+    10
+sax/source/tools/converter.cxx:1156
+    enum sax::(anonymous namespace)::Result readUnsignedNumberMaxDigits(int,type-parameter-?-?,unsigned long &,int &)
     int maxDigits
     9
-sc/inc/address.hxx:334
+sc/inc/address.hxx:346
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     enum ScRefFlags nFlags
     32768
@@ -1826,83 +1778,83 @@ sc/inc/autoform.hxx:173
     _Bool ScAutoFormatData::Save(class SvStream &,unsigned short)
     unsigned short fileVersion
     5050
-sc/inc/cellsuno.hxx:492
+sc/inc/cellsuno.hxx:494
     void ScCellRangeObj::SetArrayFormula_Impl(const class rtl::OUString &,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
-sc/inc/chgtrack.hxx:220
-    void ScChangeAction::ScChangeAction(enum ScChangeActionType,const class ScBigRange &,const unsigned long)
+sc/inc/chgtrack.hxx:217
+    void ScChangeAction::ScChangeAction(enum ScChangeActionType,class ScBigRange,const unsigned long)
     enum ScChangeActionType 
     8
-sc/inc/colcontainer.hxx:34
-    void ScColContainer::ScColContainer(const struct ScSheetLimits &,const unsigned long)
-    const unsigned long nSize
-    64
-sc/inc/column.hxx:264
-    void ScColumn::DeleteRanges(const class std::__debug::vector<struct sc::RowSpan, class std::allocator<struct sc::RowSpan> > &,enum InsertDeleteFlags)
+sc/inc/column.hxx:345
+    void ScColumn::DeleteRanges(const class std::vector<struct sc::RowSpan> &,enum InsertDeleteFlags)
     enum InsertDeleteFlags nDelFlag
     2071
-sc/inc/column.hxx:525
+sc/inc/column.hxx:594
     unsigned short ScColumn::GetOptimalColWidth(class OutputDevice *,double,double,const class Fraction &,const class Fraction &,_Bool,unsigned short,const class ScMarkData *,const struct ScColWidthParam *) const
     unsigned short nOldWidth
     1167
-sc/inc/column.hxx:612
+sc/inc/column.hxx:679
     void ScColumn::BroadcastRows(int,int,enum SfxHintId)
     enum SfxHintId nHint
-    51
-sc/inc/compressedarray.hxx:193
+    53
+sc/inc/compressedarray.hxx:190
     void ScBitMaskCompressedArray::AndValue(type-parameter-?-?,const type-parameter-?-? &)
     const type-parameter-?-? & rValueToAnd
     7
-sc/inc/compressedarray.hxx:199
+sc/inc/compressedarray.hxx:196
     void ScBitMaskCompressedArray::CopyFromAnded(const ScBitMaskCompressedArray<A, D> &,type-parameter-?-?,type-parameter-?-?,const type-parameter-?-? &)
     const type-parameter-?-? & rValueToAnd
     8
-sc/inc/compressedarray.hxx:206
+sc/inc/compressedarray.hxx:203
     type-parameter-?-? ScBitMaskCompressedArray::GetLastAnyBitAccess(const type-parameter-?-? &) const
     const type-parameter-?-? & rBitMask
     15
-sc/inc/document.hxx:1342
+sc/inc/docoptio.hxx:134
+    void ScTpCalcItem::ScTpCalcItem(unsigned short,const class ScDocOptions &)
+    unsigned short nWhich
+    26040
+sc/inc/document.hxx:1399
     _Bool ScDocument::CompileErrorCells(enum FormulaError)
     enum FormulaError nErrCode
     525
-sc/inc/document.hxx:1685
+sc/inc/document.hxx:1776
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
     enum InsertDeleteFlags nFlags
-    2303
-sc/inc/document.hxx:1875
+    18943
+sc/inc/document.hxx:1977
     void ScDocument::DeleteSelectionTab(short,enum InsertDeleteFlags,const class ScMarkData &)
     enum InsertDeleteFlags nDelFlag
-    2303
-sc/inc/document.hxx:1933
+    18943
+sc/inc/document.hxx:2035
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     enum CRFlags nNewFlags
     8
-sc/inc/document.hxx:2260
+sc/inc/document.hxx:2371
     void ScDocument::BroadcastCells(const class ScRange &,enum SfxHintId,_Bool)
     enum SfxHintId nHint
-    31
-sc/inc/dpsave.hxx:318
+    32
+sc/inc/dpsave.hxx:324
     class ScDPSaveDimension * ScDPSaveData::GetFirstDimension(enum com::sun::star::sheet::DataPilotFieldOrientation)
     enum com::sun::star::sheet::DataPilotFieldOrientation eOrientation
     4
-sc/inc/externalrefmgr.hxx:790
+sc/inc/externalrefmgr.hxx:804
     void ScExternalRefManager::purgeStaleSrcDocument(int)
     int nTimeOut
     30000
-sc/inc/formulacell.hxx:375
+sc/inc/formulacell.hxx:388
     void ScFormulaCell::AddRecalcMode(enum ScRecalcMode)
     enum ScRecalcMode 
     4
-sc/inc/global.hxx:640
+sc/inc/global.hxx:654
     void ScGlobal::AddQuotes(class rtl::OUString &,char16_t,_Bool)
     char16_t cQuote
     34
-sc/inc/global.hxx:663
+sc/inc/global.hxx:677
     const char16_t * ScGlobal::FindUnquoted(const char16_t *,char16_t)
     char16_t cChar
     46
-sc/inc/nameuno.hxx:64
+sc/inc/nameuno.hxx:61
     void ScNamedRangeObj::Modify_Impl(const class rtl::OUString *,const class ScTokenArray *,const class rtl::OUString *,const class ScAddress *,const enum ScRangeData::Type *,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
@@ -1910,234 +1862,258 @@ sc/inc/optutil.hxx:44
     void ScLinkConfigItem::ScLinkConfigItem(const class rtl::OUString &,enum ConfigItemMode)
     enum ConfigItemMode nMode
     2
-sc/inc/rangeutl.hxx:104
-    int ScRangeStringConverter::GetTokenCount(const class rtl::OUString &,char16_t)
+sc/inc/rangeutl.hxx:111
+    int ScRangeStringConverter::GetTokenCount(class std::basic_string_view<char16_t>,char16_t)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:120
-    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
-    char16_t cQuote
-    39
-sc/inc/rangeutl.hxx:120
-    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
+sc/inc/rangeutl.hxx:127
+    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:136
-    _Bool ScRangeStringConverter::GetRangeListFromString(class ScRangeList &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,char16_t,char16_t)
+sc/inc/rangeutl.hxx:127
+    _Bool ScRangeStringConverter::GetAddressFromString(class ScAddress &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t,char16_t)
+    char16_t cQuote
+    39
+sc/inc/rangeutl.hxx:143
+    _Bool ScRangeStringConverter::GetRangeListFromString(class ScRangeList &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,char16_t,char16_t)
     char16_t cQuote
     39
-sc/inc/rangeutl.hxx:144
-    _Bool ScRangeStringConverter::GetAreaFromString(class ScArea &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
+sc/inc/rangeutl.hxx:151
+    _Bool ScRangeStringConverter::GetAreaFromString(class ScArea &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:153
-    _Bool ScRangeStringConverter::GetRangeFromString(struct com::sun::star::table::CellRangeAddress &,const class rtl::OUString &,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
+sc/inc/rangeutl.hxx:160
+    _Bool ScRangeStringConverter::GetRangeFromString(struct com::sun::star::table::CellRangeAddress &,class std::basic_string_view<char16_t>,const class ScDocument &,enum formula::FormulaGrammar::AddressConvention,int &,char16_t)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:178
+sc/inc/rangeutl.hxx:185
     void ScRangeStringConverter::GetStringFromRangeList(class rtl::OUString &,const class ScRangeList *,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:185
+sc/inc/rangeutl.hxx:192
     void ScRangeStringConverter::GetStringFromArea(class rtl::OUString &,const class ScArea &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:185
+sc/inc/rangeutl.hxx:192
     void ScRangeStringConverter::GetStringFromArea(class rtl::OUString &,const class ScArea &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
     enum ScRefFlags nFormatFlags
     32776
-sc/inc/rangeutl.hxx:195
+sc/inc/rangeutl.hxx:202
     void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString &,const struct com::sun::star::table::CellAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool)
     char16_t cSeparator
     32
-sc/inc/rangeutl.hxx:202
+sc/inc/rangeutl.hxx:209
     void ScRangeStringConverter::GetStringFromRange(class rtl::OUString &,const struct com::sun::star::table::CellRangeAddress &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
     enum ScRefFlags nFormatFlags
     32776
-sc/inc/rangeutl.hxx:210
+sc/inc/rangeutl.hxx:217
     void ScRangeStringConverter::GetStringFromRangeList(class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::table::CellRangeAddress> &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t)
     char16_t cSeparator
     32
-sc/inc/scmod.hxx:243
+sc/inc/scabstdlg.hxx:477
+    class VclPtr<class AbstractScMetricInputDlg> ScAbstractDialogFactory::CreateScMetricInputDlg(class weld::Window *,const class rtl::OUString &,long,long,enum FieldUnit,unsigned short,long,long)
+    unsigned short nDecimals
+    2
+sc/inc/scmod.hxx:237
     void ScModule::RegisterRefController(unsigned short,class std::shared_ptr<class SfxDialogController> &,class weld::Window *)
     unsigned short nSlotId
     26161
-sc/inc/scmod.hxx:244
+sc/inc/scmod.hxx:238
     void ScModule::UnregisterRefController(unsigned short,const class std::shared_ptr<class SfxDialogController> &)
     unsigned short nSlotId
     26161
-sc/inc/scmod.hxx:245
+sc/inc/scmod.hxx:239
     class std::shared_ptr<class SfxDialogController> ScModule::Find1RefWindow(unsigned short,const class weld::Window *)
     unsigned short nSlotId
     26161
-sc/inc/simpleformulacalc.hxx:39
+sc/inc/sheetlimits.hxx:32
+    void ScSheetLimits::ScSheetLimits(short,int)
+    short nMaxCol
+    16383
+sc/inc/simpleformulacalc.hxx:38
     void ScSimpleFormulaCalculator::ScSimpleFormulaCalculator(class ScDocument &,const class ScAddress &,const class rtl::OUString &,_Bool,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGram
     65539
-sc/inc/stlpool.hxx:54
+sc/inc/stlpool.hxx:55
     class ScStyleSheet * ScStyleSheetPool::FindCaseIns(const class rtl::OUString &,enum SfxStyleFamily)
     enum SfxStyleFamily eFam
     2
-sc/inc/stringutil.hxx:151
+sc/inc/stringutil.hxx:155
     _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
     char dsep
     46
-sc/inc/stringutil.hxx:151
+sc/inc/stringutil.hxx:155
     _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
     char gsep
     44
-sc/inc/table.hxx:416
+sc/inc/table.hxx:438
     void ScTable::SetFormula(short,int,const class ScTokenArray &,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGram
     65539
-sc/inc/table.hxx:679
+sc/inc/table.hxx:735
     _Bool ScTable::HasAttribSelection(const class ScMarkData &,enum HasAttrFlags) const
     enum HasAttrFlags nMask
     8
-sc/inc/tokenarray.hxx:262
+sc/inc/tokenarray.hxx:264
     void ScTokenArray::WrapReference(const class ScAddress &,short,int)
     short nMaxCol
     255
-sc/inc/tokenarray.hxx:262
+sc/inc/tokenarray.hxx:264
     void ScTokenArray::WrapReference(const class ScAddress &,short,int)
     int nMaxRow
     65535
-sc/inc/tokenarray.hxx:263
-    _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) const
-    short nMaxCol
-    255
-sc/inc/tokenarray.hxx:263
-    _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) const
-    int nMaxRow
-    65535
 sc/inc/zforauto.hxx:38
     void ScNumFormatAbbrev::Save(class SvStream &,unsigned short) const
     unsigned short eByteStrSet
     76
-sc/qa/extras/new_cond_format.cxx:375
+sc/qa/extras/new_cond_format.cxx:365
     void testColorScaleEntries(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,int,int,const class rtl::OUString &,class Color,int,const class rtl::OUString &,class Color,int,const class rtl::OUString &,class Color)
     int nMediumType
     2
-sc/qa/extras/scpdfexport.cxx:51
+sc/qa/extras/scpdfexport.cxx:55
     void ScPDFExportTest::setFont(class ScFieldEditEngine &,int,int,const class rtl::OUString &)
     int nEnd
     4
-sc/qa/unit/filters-test.cxx:491
+sc/qa/unit/helper/qahelper.hxx:118
+    void ScUcalcTestBase::pasteOneCellFromClip(class ScDocument *,const class ScRange &,class ScDocument *,enum InsertDeleteFlags)
+    enum InsertDeleteFlags eFlags
+    18943
+sc/qa/unit/subsequent_export_test3.cxx:1761
     void impl_testLegacyCellAnchoredRotatedShape(class ScDocument &,const class tools::Rectangle &,const class ScDrawObjData &,long)
     long TOLERANCE
     30
-sc/qa/unit/parallelism.cxx:404
-    void lcl_setupCommon(class ScDocument *,unsigned long,unsigned long)
-    unsigned long nConstCellValue
-    20
-sc/qa/unit/parallelism.cxx:404
-    void lcl_setupCommon(class ScDocument *,unsigned long,unsigned long)
-    unsigned long nNumRows
-    1048
-sc/qa/unit/parallelism.cxx:534
-    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
-    unsigned long nNumFG
-    50
-sc/qa/unit/parallelism.cxx:534
-    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
-    unsigned long nNumRowsInBlock
-    200
-sc/qa/unit/parallelism.cxx:534
-    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
-    unsigned long nOffset
-    100
-sc/qa/unit/subsequent_export-test.cxx:206
-    class std::unique_ptr<struct _xmlDoc, struct xmlDocDeleter> ScExportTest::testTdf95640(const class rtl::OUString &,int,int)
-    int nDestFormat
-    2
-sc/qa/unit/subsequent_export-test.cxx:1689
-    _Bool ::isOverline(const struct editeng::Section &,enum FontLineStyle)
+sc/qa/unit/subsequent_export_test.cxx:1337
+    _Bool (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:1307:5)::isOverline(const struct editeng::Section &,enum FontLineStyle)
     enum FontLineStyle eStyle
     2
-sc/qa/unit/subsequent_export-test.cxx:1696
-    _Bool ::isUnderline(const struct editeng::Section &,enum FontLineStyle)
+sc/qa/unit/subsequent_export_test.cxx:1347
+    _Bool (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:1307:5)::isUnderline(const struct editeng::Section &,enum FontLineStyle)
     enum FontLineStyle eStyle
     2
-sc/qa/unit/ucalc.cxx:1196
+sc/qa/unit/subsequent_filters_test4.cxx:1299
+    void (lambda at /home/noel/libo-plugin/sc/qa/unit/subsequent_filters_test4.cxx:1299:28)::operator()(const class rtl::OUString &,enum FontWeight) const
+     ###2
+    8
+sc/qa/unit/ucalc.cxx:1400
     _Bool checkRelativeRefToken(class ScDocument &,const class ScAddress &,short,int)
     short nRelCol
     -1
-sc/qa/unit/ucalc.hxx:32
-    void FormulaGrammarSwitch::FormulaGrammarSwitch(class ScDocument *,enum formula::FormulaGrammar::Grammar)
-    enum formula::FormulaGrammar::Grammar eGrammar
-    17104900
-sc/qa/unit/ucalc.hxx:57
-    void Test::pasteOneCellFromClip(class ScDocument *,const class ScRange &,class ScDocument *,enum InsertDeleteFlags)
-    enum InsertDeleteFlags eFlags
-    2303
-sc/qa/unit/ucalc_formula.cxx:8349
-    void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nEnd1
-    159
-sc/qa/unit/ucalc_formula.cxx:8349
+sc/qa/unit/ucalc_copypaste.cxx:49
+    void TestCopyPaste::executeCopyPasteSpecial(_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,_Bool,enum ScClipParam::Direction,enum TestCopyPaste::CalcMode,enum InsertDeleteFlags)
+    enum InsertDeleteFlags aFlags
+    18559
+sc/qa/unit/ucalc_copypaste.cxx:84
+    void TestCopyPaste::checkReferencedCutRangesRow(const short,const short)
+    const short nDestTab
+    2
+sc/qa/unit/ucalc_copypaste.cxx:92
+    void TestCopyPaste::checkReferencedCutRangesCol(const short,const short)
+    const short nDestTab
+    2
+sc/qa/unit/ucalc_copypaste.cxx:99
+    void TestCopyPaste::prepareUndoAfterPaste(class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> > &,class std::unique_ptr<class ScDocument> &,const class ScMarkData &,const class ScRange &,class std::unique_ptr<class ScRefUndoData> &,class std::unique_ptr<class ScUndoPaste> &,_Bool,_Bool,_Bool,enum ScPasteFunc,enum InsCellCmd)
+    enum InsCellCmd eMoveMode
+    4
+sc/qa/unit/ucalc_formula2.cxx:93
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nEnd2
-    319
-sc/qa/unit/ucalc_formula.cxx:8349
+    int nTotalRows
+    330
+sc/qa/unit/ucalc_formula2.cxx:93
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nStart1
     9
-sc/qa/unit/ucalc_formula.cxx:8349
+sc/qa/unit/ucalc_formula2.cxx:93
+    void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
+    int nEnd1
+    159
+sc/qa/unit/ucalc_formula2.cxx:93
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nStart2
     169
-sc/qa/unit/ucalc_formula.cxx:8349
+sc/qa/unit/ucalc_formula2.cxx:93
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nTotalRows
-    330
-sc/source/core/data/documen8.cxx:510
+    int nEnd2
+    319
+sc/qa/unit/ucalc_parallelism.cxx:326
+    void lcl_setupCommon(class ScDocument *,unsigned long,unsigned long)
+    unsigned long nNumRows
+    1048
+sc/qa/unit/ucalc_parallelism.cxx:326
+    void lcl_setupCommon(class ScDocument *,unsigned long,unsigned long)
+    unsigned long nConstCellValue
+    20
+sc/qa/unit/ucalc_parallelism.cxx:456
+    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
+    unsigned long nNumRowsInBlock
+    200
+sc/qa/unit/ucalc_parallelism.cxx:456
+    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
+    unsigned long nNumFG
+    50
+sc/qa/unit/ucalc_parallelism.cxx:456
+    void lcl_setupMultipleFGColumn(class ScDocument *,unsigned long,unsigned long,unsigned long)
+    unsigned long nOffset
+    100
+sc/source/core/data/documen8.cxx:514
     void (anonymous namespace)::IdleCalcTextWidthScope::incCol(short)
     short nInc
     -1
-sc/source/core/data/dpoutput.cxx:315
+sc/source/core/data/dpoutput.cxx:303
     void lcl_SetFrame(class ScDocument *,short,short,int,short,int,unsigned short)
     unsigned short nWidth
     20
-sc/source/core/tool/compiler.cxx:1293
+sc/source/core/opencl/opbase.hxx:383
+    void sc::opencl::SlidingFunctionBase::GenerateRangeArgs(class std::vector<class std::shared_ptr<class sc::opencl::DynamicKernelArgument> > &,class sc::opencl::outputstream &,enum sc::opencl::SlidingFunctionBase::EmptyArgType,const char *)
+    enum sc::opencl::SlidingFunctionBase::EmptyArgType empty
+    2
+sc/source/core/opencl/opbase.hxx:386
+    void sc::opencl::SlidingFunctionBase::GenerateRangeArg(int,class std::vector<class std::shared_ptr<class sc::opencl::DynamicKernelArgument> > &,class sc::opencl::outputstream &,enum sc::opencl::SlidingFunctionBase::EmptyArgType,const char *)
+    enum sc::opencl::SlidingFunctionBase::EmptyArgType empty
+    2
+sc/source/core/tool/compiler.cxx:1306
     void (anonymous namespace)::ConventionXL_A1::ConventionXL_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     4
-sc/source/core/tool/compiler.cxx:2056
+sc/source/core/tool/compiler.cxx:2068
     _Bool lcl_isUnicodeIgnoreAscii(const char16_t *,const char *,unsigned long)
     unsigned long n
     4
-sc/source/core/tool/editutil.cxx:88
+sc/source/core/tool/editutil.cxx:93
     class rtl::OUString lcl_GetDelimitedString(const class EditTextObject &,const char)
     const char c
     10
-sc/source/core/tool/scmatrix.cxx:361
+sc/source/core/tool/scmatrix.cxx:374
     unsigned long GetElementsMax(unsigned long)
     unsigned long nMemory
     6442450944
-sc/source/filter/excel/xechart.cxx:134
+sc/source/filter/excel/xechart.cxx:133
     void lclSaveRecord(class XclExpStream &,const class rtl::Reference<class XclExpRecordBase> &,unsigned short,type-parameter-?-?)
     unsigned short nRecId
     4129
-sc/source/filter/excel/xechart.cxx:144
+sc/source/filter/excel/xechart.cxx:143
     void lclSaveRecord(class XclExpStream &,type-parameter-?-? *,unsigned short,type-parameter-?-?)
     unsigned short nRecId
     4124
-sc/source/filter/excel/xechart.cxx:561
+sc/source/filter/excel/xechart.cxx:560
     class rtl::Reference<class XclExpChLineFormat> lclCreateLineFormat(const class XclExpChRoot &,const class ScfPropertySet &,enum XclChObjectType)
     enum XclChObjectType eObjType
     9
-sc/source/filter/excel/xelink.cxx:296
+sc/source/filter/excel/xelink.cxx:299
     void (anonymous namespace)::XclExpSupbook::XclExpSupbook(const class XclExpRoot &,const class rtl::OUString &,enum XclSupbookType)
     enum XclSupbookType 
     5
-sc/source/filter/excel/xepage.cxx:377
-    void (anonymous namespace)::XclExpXmlStartHeaderFooterElementRecord::XclExpXmlStartHeaderFooterElementRecord(const int,const _Bool)
+sc/source/filter/excel/xepage.cxx:402
+    void (anonymous namespace)::XclExpXmlStartHeaderFooterElementRecord::XclExpXmlStartHeaderFooterElementRecord(const int,const _Bool,const _Bool)
     const int nElement
-    2613
-sc/source/filter/excel/xepivotxml.cxx:713
+    2638
+sc/source/filter/excel/xepivotxml.cxx:715
     void WriteGrabBagItemToStream(class XclExpXmlStream &,int,const class com::sun::star::uno::Any &)
     int tokenId
-    4009
+    4045
+sc/source/filter/inc/addressconverter.hxx:489
+    void oox::xls::AddressConverter::initializeMaxPos(short,int,int)
+    short nMaxXlsTab
+    32767
 sc/source/filter/inc/addressconverter.hxx:489
     void oox::xls::AddressConverter::initializeMaxPos(short,int,int)
     int nMaxXlsCol
@@ -2146,23 +2122,19 @@ sc/source/filter/inc/addressconverter.hxx:489
     void oox::xls::AddressConverter::initializeMaxPos(short,int,int)
     int nMaxXlsRow
     1048575
-sc/source/filter/inc/addressconverter.hxx:489
-    void oox::xls::AddressConverter::initializeMaxPos(short,int,int)
-    short nMaxXlsTab
-    32767
-sc/source/filter/inc/formulabase.hxx:277
+sc/source/filter/inc/formulabase.hxx:276
     void oox::xls::ApiTokenVector::reserve(unsigned long)
     unsigned long n
     8192
-sc/source/filter/inc/formulabase.hxx:773
+sc/source/filter/inc/formulabase.hxx:763
     void oox::xls::FormulaProcessorBase::convertStringToStringList(class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> &,char16_t,_Bool) const
     char16_t cStringSep
     44
-sc/source/filter/inc/ftools.hxx:46
+sc/source/filter/inc/ftools.hxx:48
     type-parameter-?-? llimit_cast(type-parameter-?-?,type-parameter-?-?)
     type-parameter-?-? nMin
     8
-sc/source/filter/inc/pivottablebuffer.hxx:118
+sc/source/filter/inc/pivottablebuffer.hxx:121
     void oox::xls::PivotTableField::PivotTableField(class oox::xls::PivotTable &,int)
     int nFieldIndex
     -2
@@ -2170,67 +2142,59 @@ sc/source/filter/inc/tokstack.hxx:256
     _Bool TokenPool::IsSingleOp(const struct TokenId &,const enum OpCode) const
     const enum OpCode eId
     13
-sc/source/filter/inc/unitconverter.hxx:71
-    double oox::xls::UnitConverter::scaleValue(double,enum oox::xls::Unit,enum oox::xls::Unit) const
-    enum oox::xls::Unit eToUnit
-    3
-sc/source/filter/inc/unitconverter.hxx:76
-    double oox::xls::UnitConverter::scaleFromMm100(int,enum oox::xls::Unit) const
-    enum oox::xls::Unit eUnit
-    6
-sc/source/filter/inc/xechart.hxx:197
+sc/source/filter/inc/xechart.hxx:196
     void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
     unsigned short nRecId
     2155
-sc/source/filter/inc/xechart.hxx:197
+sc/source/filter/inc/xechart.hxx:196
     void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
     unsigned long nRecSize
     4
 sc/source/filter/inc/xeescher.hxx:152
-    void XclExpImgData::XclExpImgData(const class Graphic &,unsigned short)
+    void XclExpImgData::XclExpImgData(class Graphic,unsigned short)
     unsigned short nRecId
     233
-sc/source/filter/inc/xeformula.hxx:64
+sc/source/filter/inc/xeformula.hxx:63
     class std::shared_ptr<class XclTokenArray> XclExpFormulaCompiler::CreateFormula(enum XclFormulaType,const class ScAddress &)
     enum XclFormulaType eType
     7
-sc/source/filter/inc/xeformula.hxx:70
+sc/source/filter/inc/xeformula.hxx:69
     class std::shared_ptr<class XclTokenArray> XclExpFormulaCompiler::CreateFormula(enum XclFormulaType,const class ScRangeList &)
     enum XclFormulaType eType
     5
-sc/source/filter/inc/xehelper.hxx:243
+sc/source/filter/inc/xehelper.hxx:245
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,char16_t,enum XclStrFlags,unsigned short)
     enum XclStrFlags nFlags
     2
-sc/source/filter/inc/xehelper.hxx:243
+sc/source/filter/inc/xehelper.hxx:245
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,char16_t,enum XclStrFlags,unsigned short)
     unsigned short nMaxLen
     32767
-sc/source/filter/inc/xelink.hxx:174
+sc/source/filter/inc/xelink.hxx:173
     unsigned short XclExpLinkManager::FindExtSheet(char16_t)
     char16_t cCode
     4
-sc/source/filter/inc/xepivot.hxx:235
+sc/source/filter/inc/xepivot.hxx:234
     void XclExpPTItem::XclExpPTItem(unsigned short,unsigned short)
     unsigned short nCacheIdx
     65535
-sc/source/filter/inc/xepivot.hxx:337
+sc/source/filter/inc/xepivot.hxx:336
     unsigned short XclExpPivotTable::GetDataFieldIndex(const class rtl::OUString &,unsigned short) const
     unsigned short nDefaultIdx
     65535
-sc/source/filter/inc/xerecord.hxx:399
+sc/source/filter/inc/xerecord.hxx:410
     void XclExpSubStream::XclExpSubStream(unsigned short)
     unsigned short nSubStrmType
     32
-sc/source/filter/inc/xestream.hxx:299
+sc/source/filter/inc/xestream.hxx:300
     void XclExpXmlStream::WriteAttributes(int,type-parameter-?-? &&,type-parameter-?-? &&...)
      ###26
-    4071
-sc/source/filter/inc/xestring.hxx:51
+    4107
+sc/source/filter/inc/xestring.hxx:55
     void XclExpString::XclExpString(enum XclStrFlags,unsigned short)
     unsigned short nMaxLen
     32767
-sc/source/filter/inc/xestyle.hxx:590
+sc/source/filter/inc/xestyle.hxx:602
     unsigned int XclExpXFBuffer::InsertWithFont(const class ScPatternAttr *,short,unsigned short,_Bool)
     short nScript
     4
@@ -2238,219 +2202,227 @@ sc/source/filter/inc/xetable.hxx:80
     void XclExpRangeFmlaBase::XclExpRangeFmlaBase(unsigned short,unsigned int,const class ScRange &)
     unsigned short nRecId
     545
-sc/source/filter/inc/xiescher.hxx:1198
+sc/source/filter/inc/xiescher.hxx:1203
     unsigned int XclImpDffPropSet::GetPropertyValue(unsigned short) const
     unsigned short nPropId
     384
-sc/source/filter/inc/xiformula.hxx:41
+sc/source/filter/inc/xiformula.hxx:40
     void XclImpFormulaCompiler::CreateRangeList(class ScRangeList &,enum XclFormulaType,const class XclTokenArray &,class XclImpStream &)
     enum XclFormulaType eType
     7
-sc/source/filter/inc/xiformula.hxx:48
-    class std::unique_ptr<class ScTokenArray, struct std::default_delete<class ScTokenArray> > XclImpFormulaCompiler::CreateFormula(enum XclFormulaType,const class XclTokenArray &)
+sc/source/filter/inc/xiformula.hxx:47
+    class std::unique_ptr<class ScTokenArray> XclImpFormulaCompiler::CreateFormula(enum XclFormulaType,const class XclTokenArray &)
     enum XclFormulaType eType
     6
-sc/source/filter/inc/xipivot.hxx:224
+sc/source/filter/inc/xipivot.hxx:223
     void XclImpPTField::XclImpPTField(const class XclImpPivotTable &,unsigned short)
     unsigned short nCacheIdx
     65534
-sc/source/filter/inc/xlformula.hxx:518
+sc/source/filter/inc/xlformula.hxx:517
     _Bool XclTokenArrayHelper::GetStringList(class rtl::OUString &,const class ScTokenArray &,char16_t)
     char16_t cSep
     10
-sc/source/filter/inc/xlformula.hxx:526
+sc/source/filter/inc/xlformula.hxx:525
     void XclTokenArrayHelper::ConvertStringToList(class ScTokenArray &,class svl::SharedStringPool &,char16_t)
     char16_t cStringSep
     10
-sc/source/filter/xcl97/XclExpChangeTrack.cxx:1375
+sc/source/filter/xcl97/XclExpChangeTrack.cxx:1449
     void (anonymous namespace)::EndXmlElement::EndXmlElement(int)
     int nElement
-    2621
+    2646
 sc/source/filter/xml/xmlfonte.cxx:41
     void (anonymous namespace)::ScXMLFontAutoStylePool_Impl::AddFontItems(const unsigned short *,unsigned char,const class SfxItemPool *,const _Bool)
     unsigned char nIdCount
     3
-sc/source/filter/xml/xmlstyli.cxx:269
-    void (anonymous namespace)::XMLTableCellPropsContext::XMLTableCellPropsContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,unsigned int,class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,const class rtl::Reference<class SvXMLImportPropertyMapper> &)
+sc/source/filter/xml/xmlstyli.cxx:272
+    void (anonymous namespace)::XMLTableCellPropsContext::XMLTableCellPropsContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,unsigned int,class std::vector<struct XMLPropertyState> &,const class rtl::Reference<class SvXMLImportPropertyMapper> &)
     unsigned int nFamily
     196608
-sc/source/ui/Accessibility/AccessibleCsvControl.cxx:218
+sc/source/ui/Accessibility/AccessibleCsvControl.cxx:217
     int lcl_ExpandSequence(class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,int)
     int nExp
     7
 sc/source/ui/dbgui/pvfundlg.cxx:72
-    _Bool lclFillListBox(class weld::ComboBox &,const class std::__debug::vector<struct ScDPLabelData::Member, class std::allocator<struct ScDPLabelData::Member> > &,int)
+    _Bool lclFillListBox(class weld::ComboBox &,const class std::vector<struct ScDPLabelData::Member> &,int)
     int nEmptyPos
     2
-sc/source/ui/inc/AccessibleCell.hxx:157
+sc/source/ui/inc/AccessibleCell.hxx:154
     void ScAccessibleCell::AddRelation(const class ScAddress &,const unsigned short,class utl::AccessibleRelationSetHelper *)
     const unsigned short aRelationType
     4
-sc/source/ui/inc/AccessibleSpreadsheet.hxx:84
-    _Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(class ScRangeList *,class ScRangeList *,int,class std::__debug::vector<class ScMyAddress, class std::allocator<class ScMyAddress> > &)
+sc/source/ui/inc/AccessibleSpreadsheet.hxx:83
+    _Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(class ScRangeList *,class ScRangeList *,int,class std::vector<class ScMyAddress> &)
     int nMax
     10
-sc/source/ui/inc/content.hxx:161
-    void ScContentTree::SelectEntryByName(const enum ScContentId,const class rtl::OUString &)
+sc/source/ui/inc/content.hxx:148
+    void ScContentTree::SelectEntryByName(const enum ScContentId,class std::basic_string_view<char16_t>)
     const enum ScContentId nRoot
     8
-sc/source/ui/inc/datatransformation.hxx:83
-    void sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
-    char16_t cSeparator
-    44
-sc/source/ui/inc/datatransformation.hxx:83
+sc/source/ui/inc/datatransformation.hxx:85
     void sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
     short nCol
     2
-sc/source/ui/inc/datatransformation.hxx:149
-    void sc::NumberTransformation::NumberTransformation(const class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,const enum sc::NUMBER_TRANSFORM_TYPE,int)
+sc/source/ui/inc/datatransformation.hxx:85
+    void sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
+    char16_t cSeparator
+    44
+sc/source/ui/inc/datatransformation.hxx:151
+    void sc::NumberTransformation::NumberTransformation(class std::set<short> &&,const enum sc::NUMBER_TRANSFORM_TYPE,int)
     int nPrecision
     4
-sc/source/ui/inc/docfunc.hxx:114
+sc/source/ui/inc/docfunc.hxx:123
     _Bool ScDocFunc::SetCellText(const class ScAddress &,const class rtl::OUString &,_Bool,_Bool,_Bool,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
-sc/source/ui/inc/imoptdlg.hxx:32
+sc/source/ui/inc/imoptdlg.hxx:31
     void ScImportOptions::ScImportOptions(char16_t,char16_t,unsigned short)
     char16_t nTextSep
     34
-sc/source/ui/inc/pvfundlg.hxx:45
+sc/source/ui/inc/pvfundlg.hxx:44
     int ScDPFunctionListBox::get_height_rows(int) const
     int nRows
     8
-sc/source/ui/inc/pvfundlg.hxx:46
+sc/source/ui/inc/pvfundlg.hxx:45
     void ScDPFunctionListBox::set_size_request(int,int)
     int nWidth
     -1
-sc/source/ui/inc/select.hxx:34
+sc/source/ui/inc/select.hxx:33
     void ScViewSelectionEngine::ScViewSelectionEngine(class vcl::Window *,class ScTabView *,enum ScSplitPos)
     enum ScSplitPos eSplitPos
     2
-sc/source/ui/inc/spellparam.hxx:47
-    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font &,int,_Bool)
+sc/source/ui/inc/spellparam.hxx:46
+    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::Font,int,_Bool)
     enum ScConversionType eConvType
     2
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx:44
-    void FormulaTemplate::applyRangeList(const class rtl::OUString &,const class ScRangeList &,char16_t)
+    void FormulaTemplate::applyRangeList(class std::basic_string_view<char16_t>,const class ScRangeList &,char16_t)
     char16_t cDelimiter
     59
-sc/source/ui/inc/tabview.hxx:426
+sc/source/ui/inc/tabview.hxx:446
     void ScTabView::MoveCursorPage(short,int,enum ScFollowMode,_Bool,_Bool)
     enum ScFollowMode eMode
     2
-sc/source/ui/inc/tabview.hxx:428
-    void ScTabView::MoveCursorArea(short,int,enum ScFollowMode,_Bool,_Bool)
+sc/source/ui/inc/tabview.hxx:448
+    void ScTabView::MoveCursorArea(short,int,enum ScFollowMode,_Bool,_Bool,_Bool)
     enum ScFollowMode eMode
     3
-sc/source/ui/inc/uiitems.hxx:55
-    void ScInputStatusItem::ScInputStatusItem(unsigned short,const class ScAddress &,const class ScAddress &,const class ScAddress &,const class rtl::OUString &,const class EditTextObject *)
+sc/source/ui/inc/uiitems.hxx:54
+    void ScInputStatusItem::ScInputStatusItem(unsigned short,const class ScAddress &,const class ScAddress &,const class ScAddress &,class rtl::OUString,const class EditTextObject *)
     unsigned short nWhich
     26100
-sc/source/ui/inc/uiitems.hxx:120
+sc/source/ui/inc/uiitems.hxx:119
     void ScIndexHint::ScIndexHint(enum SfxHintId,unsigned short)
     enum SfxHintId nNewId
-    42
-sc/source/ui/inc/uiitems.hxx:131
+    44
+sc/source/ui/inc/uiitems.hxx:130
     void ScSortItem::ScSortItem(unsigned short,class ScViewData *,const struct ScSortParam *)
     unsigned short nWhich
     1102
-sc/source/ui/inc/uiitems.hxx:134
+sc/source/ui/inc/uiitems.hxx:133
     void ScSortItem::ScSortItem(unsigned short,const struct ScSortParam *)
     unsigned short nWhich
     1102
-sc/source/ui/inc/uiitems.hxx:152
+sc/source/ui/inc/uiitems.hxx:151
     void ScQueryItem::ScQueryItem(unsigned short,class ScViewData *,const struct ScQueryParam *)
     unsigned short nWhich
     1103
-sc/source/ui/inc/uiitems.hxx:179
-    void ScSubTotalItem::ScSubTotalItem(unsigned short,class ScViewData *,const struct ScSubTotalParam *)
-    unsigned short nWhich
-    1104
-sc/source/ui/inc/uiitems.hxx:253
+sc/source/ui/inc/uiitems.hxx:250
     void ScSolveItem::ScSolveItem(unsigned short,const struct ScSolveParam *)
     unsigned short nWhich
     1107
-sc/source/ui/inc/uiitems.hxx:268
+sc/source/ui/inc/uiitems.hxx:265
     void ScTabOpItem::ScTabOpItem(unsigned short,const struct ScTabOpParam *)
     unsigned short nWhich
-    26345
-sc/source/ui/inc/viewdata.hxx:653
+    26346
+sc/source/ui/inc/viewdata.hxx:675
     _Bool ScViewData::SetLOKSheetFreezeIndex(const int,_Bool,short)
     short nForTab
     -1
-sc/source/ui/inc/viewfunc.hxx:201
-    void ScViewFunc::Protect(short,const class rtl::OUString &)
-    short nTab
-    32767
-sc/source/ui/pagedlg/tptable.cxx:64
-    _Bool lcl_PutScaleItem3(unsigned short,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::SpinButton &,unsigned short)
+sc/source/ui/pagedlg/tptable.cxx:59
+    _Bool lcl_PutScaleItem3(class TypedWhichId<class SfxUInt16Item>,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::SpinButton &,unsigned short)
     unsigned short nLBEntry
     2
-sc/source/ui/unoobj/cellsuno.cxx:1235
+sc/source/ui/unoobj/cellsuno.cxx:1180
     _Bool lcl_PutFormulaArray(class ScDocShell &,const class ScRange &,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<class rtl::OUString> > &,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
-sc/source/ui/vba/vbarange.hxx:160
+sc/source/ui/vba/vbarange.hxx:165
     class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaRange::getRangeObjectForName(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,class ScDocShell *,enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     3
-sc/source/ui/view/printfun.cxx:78
+sc/source/ui/view/printfun.cxx:79
     unsigned short lcl_GetUShort(const class SfxItemSet *,unsigned short)
     unsigned short nWhich
     176
-sc/source/ui/view/tabview.cxx:2495
+sc/source/ui/view/tabview.cxx:2690
     void (anonymous namespace)::ScRangeProvider::calculateDimensionBounds(const long,const long,_Bool,int &,int &,long &,long &,int,class ScViewData &)
     int nEnlarge
     2
-sc/source/ui/view/viewfun3.cxx:831
+sc/source/ui/view/viewfun3.cxx:828
     _Bool lcl_SelHasAttrib(const class ScDocument &,short,int,short,int,const class ScMarkData &,enum HasAttrFlags)
     enum HasAttrFlags nMask
     4
-scaddins/source/analysis/analysishelper.hxx:96
+scaddins/source/analysis/analysishelper.hxx:92
     double ConvertToDec(const class rtl::OUString &,unsigned short,unsigned short)
     unsigned short nCharLim
     10
-scaddins/source/analysis/analysishelper.hxx:99
+scaddins/source/analysis/analysishelper.hxx:95
     class rtl::OUString ConvertFromDec(double,double,double,unsigned short,int,int,_Bool)
     int nMaxPlaces
     10
-scaddins/source/analysis/analysishelper.hxx:105
+scaddins/source/analysis/analysishelper.hxx:101
     class rtl::OUString GetString(double,_Bool,unsigned short)
     unsigned short nMaxNumOfDigits
     15
-scaddins/source/analysis/analysishelper.hxx:538
+scaddins/source/analysis/analysishelper.hxx:534
     void sca::analysis::ConvertDataLinear::ConvertDataLinear(const char *,double,double,enum sca::analysis::ConvertDataClass,_Bool)
     enum sca::analysis::ConvertDataClass eClass
     8
-sccomp/source/solver/DifferentialEvolution.hxx:49
+sccomp/source/solver/DifferentialEvolution.hxx:48
     void DifferentialEvolutionAlgorithm::DifferentialEvolutionAlgorithm<DataProvider>(type-parameter-?-? &,unsigned long)
     unsigned long nPopulationSize
     50
-sccomp/source/solver/ParticelSwarmOptimization.hxx:68
+sccomp/source/solver/ParticelSwarmOptimization.hxx:67
     void ParticleSwarmOptimizationAlgorithm::ParticleSwarmOptimizationAlgorithm<DataProvider>(type-parameter-?-? &,unsigned long)
     unsigned long nNumOfParticles
     100
-sd/inc/Annotation.hxx:63
-    void LOKCommentNotify(enum sd::CommentNotificationType,const class SfxViewShell *,const class com::sun::star::uno::Reference<class com::sun::star::office::XAnnotation> &)
+sd/inc/Annotation.hxx:55
+    void LOKCommentNotify(enum sd::CommentNotificationType,const class SfxViewShell *,const class rtl::Reference<class sd::Annotation> &)
     enum sd::CommentNotificationType nType
     2
 sd/inc/CustomAnimationEffect.hxx:75
     void sd::CustomAnimationEffect::setPresetClassAndId(short,const class rtl::OUString &)
     short nPresetClass
     4
-sd/inc/sdpage.hxx:350
+sd/inc/sdpage.hxx:348
     class SdStyleSheet * SdPage::getPresentationStyle(unsigned int) const
     unsigned int nHelpId
     59865
-sd/qa/unit/tiledrendering/CallbackRecorder.hxx:20
-    class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > lcl_convertSeparated(const class rtl::OUString &,char16_t)
+sd/qa/unit/export-tests.cxx:171
+    void checkFontAttributes(const class SdrTextObj *,type-parameter-?-?,unsigned int)
+    unsigned int nId
+    4072
+sd/qa/unit/PNGExportTests.cxx:33
+    void assertColorsAreSimilar(const class std::basic_string<char> &,const class BitmapColor &,const class BitmapColor &,int)
+    int nDelta
+    5
+sd/qa/unit/tiledrendering/CallbackRecorder.hxx:26
+    class std::vector<class rtl::OUString> lcl_convertSeparated(class std::basic_string_view<char16_t>,char16_t)
     char16_t nSeparator
     59
-sd/qa/unit/tiledrendering/tiledrendering.cxx:259
-    class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > lcl_convertSeparated(const class rtl::OUString &,char16_t)
+sd/qa/unit/tiledrendering/tiledrendering.cxx:160
+    class std::vector<class rtl::OUString> lcl_convertSeparated(class std::basic_string_view<char16_t>,char16_t)
     char16_t nSeparator
     59
-sd/source/core/sdpage.cxx:1210
+sd/qa/unit/tiledrendering/tiledrendering.cxx:2444
+    void assertTilePixelColor(class SdXImpressDocument *,int,int,class Color)
+    int nPixelX
+    255
+sd/qa/unit/tiledrendering/tiledrendering.cxx:2444
+    void assertTilePixelColor(class SdXImpressDocument *,int,int,class Color)
+    int nPixelY
+    255
+sd/source/core/sdpage.cxx:1211
     enum PresObjKind operator|(enum PresObjKind,int)
     int x
     32768
@@ -2458,10 +2430,6 @@ sd/source/filter/eppt/pptexanimations.hxx:84
     void ppt::AnimationExporter::exportAnimPropertyByte(class SvStream &,const unsigned short,const unsigned char)
     const unsigned short nPropertyId
     13
-sd/source/ui/animations/CustomAnimationList.hxx:111
-    int sd::CustomAnimationList::get_height_rows(int)
-    int nRows
-    8
 sd/source/ui/animations/STLPropertySet.hxx:62
     void sd::STLPropertySet::setPropertyState(int,enum sd::STLPropertyState)
     enum sd::STLPropertyState nState
@@ -2470,195 +2438,107 @@ sd/source/ui/inc/animobjs.hxx:152
     void sd::AnimationControllerItem::AnimationControllerItem(unsigned short,class sd::AnimationWindow *,class SfxBindings *)
     unsigned short 
     27112
-sd/source/ui/inc/assclass.hxx:47
-    void Assistent::Assistent(int)
-    int nNoOfPage
-    6
-sd/source/ui/inc/assclass.hxx:49
-    _Bool Assistent::IsEnabled(int) const
-    int nPage
-    4
-sd/source/ui/inc/assclass.hxx:50
-    void Assistent::EnablePage(int)
-    int nPage
-    4
-sd/source/ui/inc/assclass.hxx:51
-    void Assistent::DisablePage(int)
-    int nPage
+sd/source/ui/inc/CustomAnimationList.hxx:109
+    int sd::CustomAnimationList::get_height_rows(int)
+    int nRows
     4
-sd/source/ui/inc/navigatr.hxx:156
-    void SdNavigatorControllerItem::SdNavigatorControllerItem(unsigned short,class SdNavigatorWin *,class SfxBindings *,const class std::function<void (void)> &)
+sd/source/ui/inc/navigatr.hxx:186
+    void SdNavigatorControllerItem::SdNavigatorControllerItem(unsigned short,class SdNavigatorWin *,class SfxBindings *,class std::function<void (void)>)
     unsigned short 
     27288
-sd/source/ui/inc/navigatr.hxx:174
+sd/source/ui/inc/navigatr.hxx:204
     void SdPageNameControllerItem::SdPageNameControllerItem(unsigned short,class SdNavigatorWin *,class SfxBindings *)
     unsigned short 
     27287
-sd/source/ui/inc/sdtreelb.hxx:188
+sd/source/ui/inc/sdtreelb.hxx:214
     int SdPageObjsTLV::get_height_rows(int) const
     int nRows
     12
 sd/source/ui/inc/smarttag.hxx:160
-    void sd::SmartHdl::SmartHdl(const class rtl::Reference<class sd::SmartTag> &,const class Point &,enum SdrHdlKind)
+    void sd::SmartHdl::SmartHdl(class rtl::Reference<class sd::SmartTag>,const class Point &,enum SdrHdlKind)
     enum SdrHdlKind eNewKind
     23
-sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:51
-    class std::shared_ptr<class sd::tools::TimerBasedTaskExecution> sd::tools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class sd::tools::AsynchronousTask> &,unsigned int,unsigned int)
-    unsigned int nMaxTimePerStep
-    50
-sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:51
+sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:50
     class std::shared_ptr<class sd::tools::TimerBasedTaskExecution> sd::tools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class sd::tools::AsynchronousTask> &,unsigned int,unsigned int)
     unsigned int nMillisecondsBetweenSteps
     5
-sd/source/ui/inc/ViewShellManager.hxx:160
+sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:50
+    class std::shared_ptr<class sd::tools::TimerBasedTaskExecution> sd::tools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class sd::tools::AsynchronousTask> &,unsigned int,unsigned int)
+    unsigned int nMaxTimePerStep
+    50
+sd/source/ui/inc/ViewShellManager.hxx:155
     class SfxShell * sd::ViewShellManager::GetShell(enum ToolbarId) const
     enum ToolbarId nId
     23016
-sd/source/ui/remotecontrol/ImagePreparer.hxx:37
-    class com::sun::star::uno::Sequence<signed char> sd::ImagePreparer::preparePreview(unsigned int,unsigned int,unsigned int,unsigned long &)
-    unsigned int aHeight
-    240
-sd/source/ui/remotecontrol/ImagePreparer.hxx:37
+sd/source/ui/remotecontrol/AvahiNetworkService.hxx:19
+    void sd::AvahiNetworkService::AvahiNetworkService(const class std::basic_string<char> &,unsigned int)
+    unsigned int aport
+    1599
+sd/source/ui/remotecontrol/ImagePreparer.hxx:35
     class com::sun::star::uno::Sequence<signed char> sd::ImagePreparer::preparePreview(unsigned int,unsigned int,unsigned int,unsigned long &)
     unsigned int aWidth
     320
-sd/source/ui/sidebar/LayoutMenu.hxx:153
+sd/source/ui/remotecontrol/ImagePreparer.hxx:35
+    class com::sun::star::uno::Sequence<signed char> sd::ImagePreparer::preparePreview(unsigned int,unsigned int,unsigned int,unsigned long &)
+    unsigned int aHeight
+    240
+sd/source/ui/sidebar/LayoutMenu.hxx:138
     class SfxRequest sd::sidebar::LayoutMenu::CreateRequest(unsigned short,enum AutoLayout)
     unsigned short nSlotId
     27014
-sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:108
+sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:109
     void sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(unsigned int,const struct AcceptDropEvent &,const signed char,const class sd::slidesorter::SlideSorter &)
     unsigned int nEventType
     2048
-sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx:136
+sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx:135
     class tools::Rectangle sd::slidesorter::view::PageObjectLayouter::CalculatePreviewBoundingBox(class Size &,const class Size &,const int,const int)
     const int nFocusIndicatorWidth
     3
-sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx:62
+sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx:61
     void sd::slidesorter::view::LayeredDevice::RemovePainter(const class std::shared_ptr<class sd::slidesorter::view::ILayerPainter> &,const int)
     const int nLayer
     2
-sd/source/ui/slidesorter/view/SlsLayouter.cxx:145
+sd/source/ui/slidesorter/view/SlsLayouter.cxx:146
     int sd::slidesorter::view::Layouter::Implementation::ResolvePositionInGap(int,enum sd::slidesorter::view::Layouter::Implementation::GapMembership,int,int)
     int nGap
     4
 sdext/source/minimizer/configurationaccess.hxx:90
     short ConfigurationAccess::GetConfigProperty(const enum PPPOptimizerTokenEnum,const short) const
     const enum PPPOptimizerTokenEnum 
-    38
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    int nHeight
-    24
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    int nWidth
-    199
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    int nXPos
-    35
-sdext/source/minimizer/informationdialog.hxx:29
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    int nYPos
-    6
-sdext/source/minimizer/informationdialog.hxx:32
-    class rtl::OUString InsertImage(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool)
-    int nHeight
-    25
-sdext/source/minimizer/informationdialog.hxx:32
-    class rtl::OUString InsertImage(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool)
-    int nPosX
-    5
-sdext/source/minimizer/informationdialog.hxx:32
-    class rtl::OUString InsertImage(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool)
-    int nPosY
-    5
-sdext/source/minimizer/informationdialog.hxx:32
-    class rtl::OUString InsertImage(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool)
-    int nWidth
-    25
-sdext/source/minimizer/informationdialog.hxx:35
-    class rtl::OUString InsertCheckBox(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XItemListener> &,const class rtl::OUString &,int,int,int,short)
-    int nWidth
-    199
-sdext/source/minimizer/informationdialog.hxx:35
-    class rtl::OUString InsertCheckBox(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XItemListener> &,const class rtl::OUString &,int,int,int,short)
-    int nXPos
-    35
-sdext/source/minimizer/informationdialog.hxx:35
-    class rtl::OUString InsertCheckBox(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XItemListener> &,const class rtl::OUString &,int,int,int,short)
-    int nYPos
-    42
-sdext/source/minimizer/informationdialog.hxx:39
-    class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
-    short nTabIndex
-    2
-sdext/source/minimizer/informationdialog.hxx:39
-    class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
-    int nWidth
-    50
-sdext/source/minimizer/informationdialog.hxx:39
-    class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
-    int nXPos
-    95
-sdext/source/minimizer/optimizerdialog.hxx:108
-    void OptimizerDialog::EnablePage(short)
-    short nStep
-    4
-sdext/source/minimizer/optimizerdialog.hxx:109
-    void OptimizerDialog::DisablePage(short)
+    20
+sdext/source/minimizer/optimizerdialog.hxx:232
+    void OptimizerDialog::UpdateControlStates(short)
     short nStep
-    4
-sdext/source/minimizer/optimizerdialogcontrols.cxx:163
-    class rtl::OUString InsertCheckBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XItemListener> &,const class rtl::OUString &,int,int,int,short)
-    int nXPos
-    97
-sdext/source/minimizer/optimizerdialogcontrols.cxx:200
-    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
-    double fEffectiveMax
-    100
-sdext/source/minimizer/optimizerdialogcontrols.cxx:200
-    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
-    int nXPos
-    197
-sdext/source/minimizer/optimizerdialogcontrols.cxx:200
-    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
-    int nYPos
-    46
-sdext/source/minimizer/optimizerdialogcontrols.cxx:248
-    class rtl::OUString InsertComboBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const _Bool,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,int,short)
-    int nXPos
-    197
+    -1
 sfx2/inc/SfxRedactionHelper.hxx:63
     class rtl::OUString SfxRedactionHelper::getStringParam(const class SfxRequest &,unsigned short)
     unsigned short nParamId
     6734
-sfx2/source/dialog/filedlghelper.cxx:1918
-    void SetToken(class rtl::OUString &,int,char16_t,const class rtl::OUString &)
+sfx2/source/dialog/filedlghelper.cxx:1954
+    void SetToken(class rtl::OUString &,int,char16_t,class std::basic_string_view<char16_t>)
     char16_t cTok
     32
 sfx2/source/dialog/mgetempl.hxx:83
     _Bool SfxManageStyleSheetPage::Execute_Impl(unsigned short,const class rtl::OUString &,unsigned short)
     unsigned short nId
     5550
-sfx2/source/doc/oleprops.cxx:100
+sfx2/source/doc/oleprops.cxx:101
     void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,const class SfxOleTextEncoding &)
     int nPropType
     30
-sfx2/source/doc/oleprops.cxx:103
-    void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,const class SfxOleTextEncoding &,const class rtl::OUString &)
+sfx2/source/doc/oleprops.cxx:104
+    void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,const class SfxOleTextEncoding &,class rtl::OUString)
     int nPropType
     30
-sfx2/source/doc/oleprops.cxx:106
-    void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,unsigned short)
-    unsigned short eTextEnc
-    65535
-sfx2/source/doc/oleprops.cxx:106
+sfx2/source/doc/oleprops.cxx:107
     void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,unsigned short)
     int nPropType
     31
-sfx2/source/doc/oleprops.hxx:304
+sfx2/source/doc/oleprops.cxx:107
+    void (anonymous namespace)::SfxOleStringPropertyBase::SfxOleStringPropertyBase(int,int,unsigned short)
+    unsigned short eTextEnc
+    65535
+sfx2/source/doc/oleprops.hxx:306
     void SfxOleSection::SetThumbnailValue(int,const class com::sun::star::uno::Sequence<signed char> &)
     int nPropId
     17
@@ -2666,55 +2546,55 @@ sfx2/source/doc/syspath.hxx:27
     _Bool GetUserTemplateLocation(char16_t *,int)
     int nSize
     16000
-slideshow/source/engine/eventmultiplexer.cxx:107
+slideshow/source/engine/eventmultiplexer.cxx:106
     void slideshow::internal::ListenerOperations::pruneListeners(type-parameter-?-? &,unsigned long)
     unsigned long nSizeThreshold
     16
 slideshow/source/engine/opengl/Operation.hxx:262
-    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float, glm::packed_highp> &,const struct glm::vec<3, float, glm::packed_highp> &,double,_Bool,_Bool,double,double)
+    class std::shared_ptr<class RotateAndScaleDepthByHeight> makeRotateAndScaleDepthByHeight(const struct glm::vec<3, float> &,const struct glm::vec<3, float> &,double,_Bool,_Bool,double,double)
     double Angle
     -120
-slideshow/source/engine/opengl/TransitionImpl.cxx:1830
-    class std::shared_ptr<class OGLTransitionImpl> makeVortexTransition(const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const struct TransitionSettings &,int,int)
+slideshow/source/engine/opengl/TransitionImpl.cxx:1829
+    class std::shared_ptr<class OGLTransitionImpl> makeVortexTransition(class std::vector<class Primitive> &&,class std::vector<class Primitive> &&,const struct TransitionSettings &,int,int)
     int NX
     96
-slideshow/source/engine/opengl/TransitionImpl.cxx:1830
-    class std::shared_ptr<class OGLTransitionImpl> makeVortexTransition(const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const class std::__debug::vector<class Primitive, class std::allocator<class Primitive> > &,const struct TransitionSettings &,int,int)
+slideshow/source/engine/opengl/TransitionImpl.cxx:1829
+    class std::shared_ptr<class OGLTransitionImpl> makeVortexTransition(class std::vector<class Primitive> &&,class std::vector<class Primitive> &&,const struct TransitionSettings &,int,int)
     int NY
     96
-slideshow/source/engine/opengl/TransitionImpl.cxx:1944
+slideshow/source/engine/opengl/TransitionImpl.cxx:1943
     void createHexagon(class Primitive &,const int,const int,const int,const int)
     const int NX
     80
-slideshow/source/engine/opengl/TransitionImpl.cxx:1944
+slideshow/source/engine/opengl/TransitionImpl.cxx:1943
     void createHexagon(class Primitive &,const int,const int,const int,const int)
     const int NY
     106
-slideshow/source/engine/opengl/TransitionImpl.hxx:254
+slideshow/source/engine/opengl/TransitionImpl.hxx:250
     class std::shared_ptr<class OGLTransitionImpl> makeRevolvingCircles(unsigned short,unsigned short)
     unsigned short nCircles
     8
-slideshow/source/engine/opengl/TransitionImpl.hxx:254
+slideshow/source/engine/opengl/TransitionImpl.hxx:250
     class std::shared_ptr<class OGLTransitionImpl> makeRevolvingCircles(unsigned short,unsigned short)
     unsigned short nPointsOnCircles
     128
-slideshow/source/engine/opengl/TransitionImpl.hxx:255
+slideshow/source/engine/opengl/TransitionImpl.hxx:251
     class std::shared_ptr<class OGLTransitionImpl> makeHelix(unsigned short)
     unsigned short nRows
     20
-slideshow/source/inc/box2dtools.hxx:258
-    double box2d::utils::box2DWorld::stepAmount(const double,const float,const int,const int)
-    const int nPositionIterations
-    2
-slideshow/source/inc/box2dtools.hxx:258
+slideshow/source/inc/box2dtools.hxx:257
     double box2d::utils::box2DWorld::stepAmount(const double,const float,const int,const int)
     const int nVelocityIterations
     6
+slideshow/source/inc/box2dtools.hxx:257
+    double box2d::utils::box2DWorld::stepAmount(const double,const float,const int,const int)
+    const int nPositionIterations
+    2
 slideshow/source/inc/listenercontainer.hxx:103
     void slideshow::internal::ListenerOperations::pruneListeners(type-parameter-?-? &,unsigned long)
     unsigned long 
     16
-solenv/bin/concat-deps.c:443
+solenv/bin/concat-deps.c:439
     struct hash * hash_create(unsigned int)
     unsigned int size
     4096
@@ -2730,23 +2610,23 @@ sot/source/sdstor/stgstrms.hxx:141
     void StgSmallStrm::StgSmallStrm(class StgIo &,int)
     int nBgn
     -2
-starmath/inc/node.hxx:814
+starmath/inc/node.hxx:880
     void SmSpecialNode::SmSpecialNode(enum SmNodeType,const struct SmToken &,unsigned short)
     unsigned short _nFontDesc
     7
-starmath/inc/node.hxx:1115
+starmath/inc/node.hxx:1180
     void SmLineNode::SmLineNode(enum SmNodeType,const struct SmToken &)
     enum SmNodeType eNodeType
     21
-starmath/inc/rect.hxx:173
+starmath/inc/rect.hxx:172
     void SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,long)
     enum RectCopyMBL eCopyMode
     2
-starmath/inc/view.hxx:138
-    void SmGraphicController::SmGraphicController(class SmGraphicWindow &,unsigned short,class SfxBindings &)
+starmath/inc/view.hxx:173
+    void SmGraphicController::SmGraphicController(class SmGraphicWidget &,unsigned short,class SfxBindings &)
     unsigned short 
     30357
-starmath/inc/view.hxx:149
+starmath/inc/view.hxx:184
     void SmEditController::SmEditController(class SmEditWindow &,unsigned short,class SfxBindings &)
     unsigned short 
     30356
@@ -2754,83 +2634,83 @@ store/source/storbase.hxx:260
     void store::PageData::location(unsigned int)
     unsigned int nAddr
     -1
-store/source/stordir.cxx:46
+store/source/stordir.cxx:38
     unsigned long convertTextToUnicode(void *,const char *,unsigned long,char16_t *,unsigned long)
     unsigned long nDstLength
     255
-svl/source/items/itemset.cxx:1552
-    unsigned short * AddRanges_Impl(unsigned short *,long,unsigned short)
-    unsigned short nIncr
-    10
-svl/source/numbers/zforfind.hxx:393
+svgio/inc/svgtools.hxx:98
+    void skip_char(class std::basic_string_view<char16_t>,char16_t,char16_t,int &,const int)
+    char16_t aCharA
+    32
+svl/source/config/itemholder2.hxx:41
+    void ItemHolder2::holdConfigItem(enum EItem)
+    enum EItem eItem
+    2
+svl/source/config/languageoptions.cxx:98
+    _Bool isKeyboardLayoutTypeInstalled(short)
+    short scriptType
+    2
+svl/source/numbers/zforfind.hxx:397
     _Bool ImpSvNumberInputScan::IsDatePatternNumberOfType(unsigned short,char16_t)
     char16_t cType
     89
-svl/source/numbers/zforscan.hxx:281
+svl/source/numbers/zforscan.hxx:287
     _Bool ImpSvNumberformatScan::InsertSymbol(unsigned short &,enum svt::NfSymbolType,const class rtl::OUString &)
     enum svt::NfSymbolType eType
     -7
-svtools/inc/table/tablecontrol.hxx:126
-    void svt::table::TableControl::commitCellEventIfAccessibleAlive(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
-    const short i_eventID
-    4
-svtools/inc/table/tablecontrolinterface.hxx:221
-    void svt::table::ITableControl::showTracking(const class tools::Rectangle &,const enum ShowTrackFlags)
-    const enum ShowTrackFlags i_flags
-    4099
-svtools/source/dialogs/ServerDetailsControls.hxx:73
-    void HostDetailsContainer::HostDetailsContainer(class PlaceEditDialog *,unsigned short,const class rtl::OUString &)
+svtools/source/dialogs/ServerDetailsControls.hxx:74
+    void HostDetailsContainer::HostDetailsContainer(class PlaceEditDialog *,unsigned short,class rtl::OUString)
     unsigned short nPort
     80
-svtools/source/misc/sampletext.cxx:608
+svtools/source/misc/sampletext.cxx:566
     class rtl::OUString makeMinimalTextForScript(enum UScriptCode)
     enum UScriptCode eScript
     19
-svtools/source/svhtml/htmlout.cxx:394
-    unsigned long lcl_FlushContext(struct HTMLOutContext &,char *,unsigned int)
+svtools/source/svhtml/htmlout.cxx:43
+    unsigned long convertUnicodeToText(const char16_t *,unsigned long,char *,unsigned long,unsigned int,unsigned int *,unsigned long *)
+    unsigned long nDestBytes
+    20
+svtools/source/svhtml/htmlout.cxx:57
+    const char * lcl_svhtml_GetEntityForChar(unsigned int,unsigned short)
+    unsigned short eDestEnc
+    76
+svtools/source/svhtml/htmlout.cxx:390
+    unsigned long lcl_FlushContext(char *,unsigned int)
     unsigned int nFlags
     6161
 svtools/source/svrtf/rtfout.cxx:29
     class SvStream & Out_Hex(class SvStream &,unsigned long,unsigned char)
     unsigned char nLen
     2
-svtools/source/table/tablecontrol_impl.hxx:241
-    void svt::table::TableControl_Impl::commitAccessibleEvent(const short)
-    const short i_eventID
-    9
 svx/inc/AccessibleTableShape.hxx:121
-    _Bool accessibility::AccessibleTableShape::ResetStateDirectly(short)
-    short aState
-    11
-svx/inc/sxmoitm.hxx:29
+    _Bool accessibility::AccessibleTableShape::ResetStateDirectly(long)
+    long aState
+    1024
+svx/inc/sxmoitm.hxx:30
     void SdrMeasureOverhangItem::SdrMeasureOverhangItem(long)
     long nVal
     600
-svx/inc/sxmtaitm.hxx:41
-    void SdrMeasureTextAutoAngleViewItem::SdrMeasureTextAutoAngleViewItem(long)
-    long nVal
-    31500
 svx/inc/xpolyimp.hxx:41
     void ImpXPolygon::ImpXPolygon(unsigned short,unsigned short)
     unsigned short nResize
     16
-svx/source/dialog/fntctrl.cxx:495
+svx/source/dialog/fntctrl.cxx:465
     void SetPrevFontEscapement(class SvxFont &,unsigned char,unsigned char,short)
     unsigned char nProp
     100
-svx/source/inc/AccessibleFrameSelector.hxx:111
+svx/source/inc/AccessibleFrameSelector.hxx:106
     void svx::a11y::AccFrameSelectorChild::NotifyAccessibleEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     const short _nEventId
     4
-svx/source/inc/charmapacc.hxx:209
+svx/source/inc/charmapacc.hxx:195
     void svx::SvxShowCharSetItemAcc::fireEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     const short _nEventId
     4
-svx/source/inc/fmcontrolbordermanager.hxx:70
+svx/source/inc/fmcontrolbordermanager.hxx:71
     void svxform::UnderlineDescriptor::UnderlineDescriptor(short,class Color)
     short _nUnderlineType
     10
-svx/source/inc/fmshimp.hxx:465
+svx/source/inc/fmshimp.hxx:468
     void FmXFormShell::UpdateSlot_Lock(short)
     short nId
     10636
@@ -2838,6 +2718,10 @@ svx/source/inc/GraphCtlAccessibleContext.hxx:157
     void SvxGraphCtrlAccessibleContext::CommitChange(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short aEventId
     7
+svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx:28
+    enum MapUnit GetUnit(const class SfxBindings *,unsigned short)
+    unsigned short nWhich
+    1247
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:68
     void textconversiondlgs::DictionaryList::set_size_request(int,int)
     int nWidth
@@ -2846,247 +2730,283 @@ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:78
     int textconversiondlgs::DictionaryList::get_height_rows(int) const
     int nRows
     8
-sw/inc/authfld.hxx:126
+sw/inc/authfld.hxx:134
     void SwAuthorityFieldType::SetSortKeys(unsigned short,const struct SwTOXSortKey *)
     unsigned short nKeyCount
     3
-sw/inc/crsrsh.hxx:824
+sw/inc/crsrsh.hxx:868
     void SwCursorShell::FireSectionChangeEvent(unsigned short,unsigned short)
     unsigned short nOldSection
     2
-sw/inc/crsrsh.hxx:825
+sw/inc/crsrsh.hxx:869
     void SwCursorShell::FireColumnChangeEvent(unsigned short,unsigned short)
     unsigned short nOldColumn
     2
-sw/inc/docary.hxx:295
+sw/inc/docary.hxx:307
     _Bool SwExtraRedlineTable::DeleteAllTableRedlines(class SwDoc &,const class SwTable &,_Bool,enum RedlineType)
     enum RedlineType nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:296
+sw/inc/docary.hxx:308
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,enum RedlineType)
     enum RedlineType nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:297
+sw/inc/docary.hxx:309
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,enum RedlineType)
     enum RedlineType nRedlineTypeToDelete
     65535
-sw/inc/editsh.hxx:163
+sw/inc/editsh.hxx:164
     void SwEditShell::Insert(char16_t,_Bool)
     char16_t 
     32
-sw/inc/editsh.hxx:240
-    class std::__debug::vector<struct std::pair<const class SfxPoolItem *, class std::unique_ptr<class SwPaM, struct std::default_delete<class SwPaM> > >, class std::allocator<struct std::pair<const class SfxPoolItem *, class std::unique_ptr<class SwPaM, struct std::default_delete<class SwPaM> > > > > SwEditShell::GetItemWithPaM(unsigned short)
+sw/inc/editsh.hxx:245
+    class std::vector<struct std::pair<const class SfxPoolItem *, class std::unique_ptr<class SwPaM> > > SwEditShell::GetItemWithPaM(unsigned short)
     unsigned short nWhich
     8
-sw/inc/fesh.hxx:532
-    _Bool SwFEShell::BeginCreate(unsigned short,enum SdrInventor,const class Point &)
+sw/inc/fesh.hxx:537
+    _Bool SwFEShell::BeginCreate(enum SdrObjKind,enum SdrInventor,const class Point &)
     enum SdrInventor eObjInventor
     825249094
-sw/inc/fmtcol.hxx:70
+sw/inc/fmtcol.hxx:78
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     unsigned short nFormatWh
-    155
-sw/inc/fmteiro.hxx:32
+    163
+sw/inc/fmteiro.hxx:37
     void SwFormatEditInReadonly::SwFormatEditInReadonly(unsigned short,_Bool)
     unsigned short nId
-    112
-sw/inc/frmfmt.hxx:85
-    void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
+    118
+sw/inc/frmfmt.hxx:100
+    void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const class WhichRangesContainer &)
     unsigned short nFormatWhich
-    153
-sw/inc/IDocumentRedlineAccess.hxx:164
+    161
+sw/inc/IDocumentMarkAccess.hxx:361
+    class sw::mark::IMark * IDocumentMarkAccess::makeAnnotationBookmark(const class SwPaM &,const class rtl::OUString &,enum IDocumentMarkAccess::MarkType,enum sw::mark::InsertMode,const struct SwPosition *)
+    enum IDocumentMarkAccess::MarkType eMark
+    2
+sw/inc/IDocumentRedlineAccess.hxx:163
     _Bool IDocumentRedlineAccess::DeleteRedline(const class SwStartNode &,_Bool,enum RedlineType)
     enum RedlineType nDelType
     65535
-sw/inc/ndtxt.hxx:160
-    void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
-    unsigned short nFontWhichId
-    22
-sw/inc/ndtxt.hxx:160
+sw/inc/IDocumentRedlineAccess.hxx:172
+    unsigned long IDocumentRedlineAccess::GetRedlineEndPos(unsigned long,const class SwNode &,enum RedlineType) const
+    enum RedlineType nType
+    65535
+sw/inc/ndtxt.hxx:194
     void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
     24
+sw/inc/ndtxt.hxx:194
+    void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
+    unsigned short nFontWhichId
+    22
+sw/inc/ndtxt.hxx:446
+    class SwTextAttr * SwTextNode::GetTextAttrForEndCharAt(int,unsigned short) const
+    unsigned short nWhich
+    56
 sw/inc/swfltopt.hxx:31
     void SwFilterOptions::SwFilterOptions(unsigned short,const char **,unsigned long *)
     unsigned short nCnt
     13
-sw/inc/tblafmt.hxx:249
+sw/inc/swregion.hxx:46
+    void SwRegionRects::SwRegionRects(unsigned short)
+    unsigned short nInit
+    20
+sw/inc/tblafmt.hxx:248
     _Bool SwTableAutoFormat::Save(class SvStream &,unsigned short) const
     unsigned short fileVersion
     5050
 sw/inc/unostyle.hxx:97
     void sw::ICoreFrameStyle::SetItem(unsigned short,const class SfxPoolItem &)
     unsigned short eAtr
-    108
+    114
 sw/inc/unostyle.hxx:98
     const class SfxPoolItem * sw::ICoreFrameStyle::GetItem(unsigned short)
     unsigned short eAtr
-    108
-sw/inc/unotextcursor.hxx:86
-    void SwXTextCursor::SwXTextCursor(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class SwPaM &,const enum CursorType)
+    114
+sw/inc/unotextcursor.hxx:97
+    void SwXTextCursor::SwXTextCursor(class com::sun::star::uno::Reference<class com::sun::star::text::XText>,const class SwPaM &,const enum CursorType)
     const enum CursorType eType
     7
-sw/qa/core/Test-BigPtrArray.cxx:55
-    void fillBigPtrArray(class BigPtrArray &,unsigned long)
-    unsigned long numEntries
+sw/qa/core/Test-BigPtrArray.cxx:53
+    void fillBigPtrArray(class BigPtrArray &,int)
+    int numEntries
     10
-sw/source/core/access/accmap.cxx:419
-    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class sw::access::SwAccessibleChild &)
+sw/qa/extras/ooxmlexport/ooxmlexport12.cxx:2186
+    _Bool lcl_nearEqual(const int,const int,int)
+    int nMaxDiff
+    5
+sw/qa/extras/tiledrendering/tiledrendering.cxx:1766
+    void assertTilePixelColor(class SwXTextDocument *,int,int,class Color)
+    int nPixelX
+    255
+sw/qa/extras/tiledrendering/tiledrendering.cxx:1766
+    void assertTilePixelColor(class SwXTextDocument *,int,int,class Color)
+    int nPixelY
+    255
+sw/source/core/access/accmap.cxx:393
+    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,class sw::access::SwAccessibleChild)
     enum SwAccessibleEvent_Impl::EventType eT
     5
-sw/source/core/access/accmap.cxx:430
+sw/source/core/access/accmap.cxx:404
     void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType)
     enum SwAccessibleEvent_Impl::EventType eT
     4
-sw/source/core/access/accmap.cxx:469
-    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class SwFrame *,const class sw::access::SwAccessibleChild &,const class SwRect &)
+sw/source/core/access/accmap.cxx:443
+    void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class SwFrame *,class sw::access::SwAccessibleChild,const class SwRect &)
     enum SwAccessibleEvent_Impl::EventType eT
     3
-sw/source/core/crsr/bookmrk.cxx:161
+sw/source/core/crsr/bookmark.cxx:169
     void lcl_SetFieldMarks(class sw::mark::Fieldmark &,class SwDoc &,const char16_t,const char16_t,const struct SwPosition *const)
     const char16_t aStartMark
     7
-sw/source/core/crsr/bookmrk.cxx:217
+sw/source/core/crsr/bookmark.cxx:232
     void lcl_RemoveFieldMarks(const class sw::mark::Fieldmark &,class SwDoc &,const char16_t,const char16_t)
     const char16_t aStartMark
     7
-sw/source/core/doc/doclay.cxx:94
+sw/source/core/doc/doclay.cxx:98
     _Bool lcl_IsItemSet(const class SwContentNode &,unsigned short)
     unsigned short which
     64
-sw/source/core/doc/docredln.cxx:299
-    void lcl_LOKInvalidateFrames(const class SwModify &,const class SwRootFrame *,const enum SwFrameType,const class Point *)
+sw/source/core/doc/docredln.cxx:282
+    void lcl_LOKInvalidateFrames(const class sw::BroadcastingModify &,const class SwRootFrame *,const enum SwFrameType,const class Point *)
     const enum SwFrameType nFrameType
     49152
-sw/source/core/doc/DocumentStylePoolManager.cxx:121
+sw/source/core/doc/DocumentStylePoolManager.cxx:124
     void lcl_SetDfltFont(enum DefaultFontType,class SfxItemSet &)
     enum DefaultFontType nFntType
     4
-sw/source/core/doc/DocumentStylePoolManager.cxx:144
+sw/source/core/doc/DocumentStylePoolManager.cxx:147
+    void lcl_SetDfltFont(enum DefaultFontType,enum DefaultFontType,enum DefaultFontType,class SfxItemSet &)
+    enum DefaultFontType nLatinFntType
+    2000
+sw/source/core/doc/DocumentStylePoolManager.cxx:147
     void lcl_SetDfltFont(enum DefaultFontType,enum DefaultFontType,enum DefaultFontType,class SfxItemSet &)
     enum DefaultFontType nCJKFntType
     3000
-sw/source/core/doc/DocumentStylePoolManager.cxx:144
+sw/source/core/doc/DocumentStylePoolManager.cxx:147
     void lcl_SetDfltFont(enum DefaultFontType,enum DefaultFontType,enum DefaultFontType,class SfxItemSet &)
     enum DefaultFontType nCTLFntType
     4000
-sw/source/core/doc/DocumentStylePoolManager.cxx:144
-    void lcl_SetDfltFont(enum DefaultFontType,enum DefaultFontType,enum DefaultFontType,class SfxItemSet &)
-    enum DefaultFontType nLatinFntType
-    2000
-sw/source/core/doc/SwStyleNameMapper.cxx:90
-    class std::__debug::unordered_map<class rtl::OUString, unsigned short, struct std::hash< ::rtl::OUString>, struct std::equal_to<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, unsigned short> > > HashFromRange(unsigned short,unsigned short,unsigned short,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &(*)(void),type-parameter-?-?...)
+sw/source/core/doc/SwStyleNameMapper.cxx:81
+    class std::unordered_map<class rtl::OUString, unsigned short> HashFromRange(unsigned short,unsigned short,unsigned short,const class std::vector<class rtl::OUString> &(*)(void),type-parameter-?-?...)
      ###16
     12288
-sw/source/core/doc/SwStyleNameMapper.cxx:90
-    class std::__debug::unordered_map<class rtl::OUString, unsigned short, struct std::hash< ::rtl::OUString>, struct std::equal_to<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, unsigned short> > > HashFromRange(unsigned short,unsigned short,unsigned short,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &(*)(void),type-parameter-?-?...)
+sw/source/core/doc/SwStyleNameMapper.cxx:81
+    class std::unordered_map<class rtl::OUString, unsigned short> HashFromRange(unsigned short,unsigned short,unsigned short,const class std::vector<class rtl::OUString> &(*)(void),type-parameter-?-?...)
      ###17
     12293
-sw/source/core/doc/tblafmt.cxx:179
+sw/source/core/doc/tblafmt.cxx:183
     void SwAfVersions::Write(class SvStream &,unsigned short)
     unsigned short fileVersion
     5050
-sw/source/core/inc/swcache.hxx:113
+sw/source/core/fields/reffld.cxx:407
+    class rtl::OUString lcl_formatStringByCombiningCharacter(class std::basic_string_view<char16_t>,const char16_t)
+    const char16_t cChar
+    822
+sw/source/core/inc/swcache.hxx:115
     void SwCache::DecreaseMax(const unsigned short)
     const unsigned short nSub
     100
-sw/source/core/inc/txtfrm.hxx:490
+sw/source/core/inc/txtfrm.hxx:512
     long SwTextFrame::GrowTst(const long)
     const long nGrow
     9223372036854775807
-sw/source/core/inc/UndoAttribute.hxx:72
-    void SwUndoResetAttr::SwUndoResetAttr(const struct SwPosition &,unsigned short)
-    unsigned short nFormatId
-    47
-sw/source/core/inc/UndoCore.hxx:250
-    class rtl::OUString ShortenString(const class rtl::OUString &,int,const class rtl::OUString &)
+sw/source/core/inc/UndoCore.hxx:273
+    class rtl::OUString ShortenString(const class rtl::OUString &,int,class std::basic_string_view<char16_t>)
     int nLength
     20
 sw/source/core/inc/UndoNumbering.hxx:39
     void SwUndoInsNum::SwUndoInsNum(const class SwNumRule &,const class SwNumRule &,const class SwDoc &,enum SwUndoId)
     enum SwUndoId nUndoId
     10
-sw/source/core/layout/dbg_lay.cxx:493
+sw/source/core/inc/unocontentcontrol.hxx:60
+    void SwXContentControl::AttachImpl(const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &,unsigned short)
+    unsigned short nWhich
+    56
+sw/source/core/layout/dbg_lay.cxx:495
     void lcl_Padded(class rtl::OStringBuffer &,const long,unsigned long)
     unsigned long length
     5
 sw/source/core/layout/objectformattertxtfrm.hxx:96
-    class SwAnchoredObject * SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor(const short,unsigned int &,_Bool &)
+    class SwAnchoredObject * SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor(const short,unsigned int &,_Bool &,_Bool &)
     const short _nWrapInfluenceOnPosition
     2
-sw/source/core/txtnode/txtedt.cxx:179
+sw/source/core/txtnode/txtedt.cxx:214
     _Bool lcl_MaskRedlinesAndHiddenText(const class SwTextNode &,class rtl::OUStringBuffer &,int,int,const char16_t)
     const char16_t cChar
     65529
-sw/source/core/undo/untbl.cxx:2195
+sw/source/core/undo/untbl.cxx:2192
     void (anonymous namespace)::RedlineFlagsInternGuard::RedlineFlagsInternGuard(class SwDoc &,enum RedlineFlags,enum RedlineFlags)
     enum RedlineFlags eRedlineFlagsMask
     2
-sw/source/filter/html/htmlatr.cxx:1149
+sw/source/filter/html/htmlatr.cxx:1169
     _Bool (anonymous namespace)::HTMLEndPosLst::IsHTMLMode(unsigned long) const
     unsigned long nMode
     32
-sw/source/filter/html/svxcss1.hxx:159
+sw/source/filter/html/svxcss1.hxx:162
     void SvxCSS1PropertyInfo::SetBoxItem(class SfxItemSet &,unsigned short,const class SvxBoxItem *)
     unsigned short nMinBorderDist
     28
-sw/source/filter/html/swhtml.hxx:637
+sw/source/filter/html/swhtml.hxx:650
     void SwHTMLParser::NewStdAttr(enum HtmlTokenId)
     enum HtmlTokenId nToken
-    414
-sw/source/filter/inc/fltshell.hxx:173
+    416
+sw/source/filter/inc/fltshell.hxx:153
     class SfxPoolItem * SwFltControlStack::GetFormatStackAttr(unsigned short,unsigned short *)
     unsigned short nWhich
     6
-sw/source/filter/inc/fltshell.hxx:174
+sw/source/filter/inc/fltshell.hxx:154
     const class SfxPoolItem * SwFltControlStack::GetOpenStackAttr(const struct SwPosition &,unsigned short)
     unsigned short nWhich
     14
-sw/source/filter/ww8/docxattributeoutput.cxx:3762
-    class rtl::OString lcl_padStartToLength(const class rtl::OString &,int,char)
-    char cFill
-    48
-sw/source/filter/ww8/docxattributeoutput.cxx:3762
+sw/source/filter/ww8/docxattributeoutput.hxx:1149
+    void DocxAttributeOutput::AddToAttrList(class rtl::Reference<class sax_fastparser::FastAttributeList> &,type-parameter-?-? &&...)
+     ###7
+    374604737
+sw/source/filter/ww8/docxexport.hxx:208
+    int DocxExport::WriteOutliner(const class OutlinerParaObject &,unsigned char,_Bool)
+    unsigned char nTyp
+    5
+sw/source/filter/ww8/docxtableexport.cxx:52
     class rtl::OString lcl_padStartToLength(const class rtl::OString &,int,char)
     int nLen
     4
-sw/source/filter/ww8/docxexport.hxx:193
-    void DocxExport::WriteOutliner(const class OutlinerParaObject &,unsigned char)
-    unsigned char nTyp
-    5
-sw/source/filter/ww8/escher.hxx:124
+sw/source/filter/ww8/docxtableexport.cxx:52
+    class rtl::OString lcl_padStartToLength(const class rtl::OString &,int,char)
+    char cFill
+    48
+sw/source/filter/ww8/escher.hxx:125
     void SwBasicEscherEx::WriteEmptyFlyFrame(const class SwFrameFormat &,unsigned int)
     unsigned int nShapeId
     1025
-sw/source/filter/ww8/writerhelper.hxx:473
-    const type-parameter-?-? * HasItem(const class std::__debug::map<unsigned short, const class SfxPoolItem *, class sw::util::ItemSort, class std::allocator<struct std::pair<const unsigned short, const class SfxPoolItem *> > > &,unsigned short)
+sw/source/filter/ww8/writerhelper.hxx:323
+    const type-parameter-?-? * HasItem(const class std::map<unsigned short, const class SfxPoolItem *, class sw::util::ItemSort> &,unsigned short)
     unsigned short eType
     52
-sw/source/filter/ww8/wrtww8.hxx:1353
+sw/source/filter/ww8/wrtww8.hxx:1380
     void WW8_WrPlcField::WW8_WrPlcField(unsigned short,unsigned char)
     unsigned short nStructSz
     2
-sw/source/filter/ww8/wrtww8.hxx:1410
+sw/source/filter/ww8/wrtww8.hxx:1437
     void SwWW8WrGrf::WritePICBulletFHeader(class SvStream &,const class Graphic &,unsigned short,unsigned short,unsigned short)
     unsigned short mm
     100
-sw/source/filter/ww8/wrtww8.hxx:1523
-    void SwWW8AttrIter::handleToggleProperty(class SfxItemSet &,const class SwFormatCharFormat *,unsigned short,const class SfxPoolItem *)
-    unsigned short nWhich
-    15
 sw/source/filter/ww8/ww8glsy.hxx:63
-    void WW8Glossary::WW8Glossary(class tools::SvRef<class SotStorageStream> &,unsigned char,class SotStorage *)
+    void WW8Glossary::WW8Glossary(class rtl::Reference<class SotStorageStream> &,unsigned char,class SotStorage *)
     unsigned char nVersion
     8
-sw/source/filter/ww8/ww8par.hxx:1597
-    class std::unique_ptr<class OutlinerParaObject, struct std::default_delete<class OutlinerParaObject> > SwWW8ImplReader::ImportAsOutliner(class rtl::OUString &,int,int,enum ManTypes)
+sw/source/filter/ww8/ww8par.hxx:1637
+    class std::optional<OutlinerParaObject> SwWW8ImplReader::ImportAsOutliner(class rtl::OUString &,int,int,enum ManTypes)
     enum ManTypes eType
     4
-sw/source/filter/ww8/ww8scan.cxx:7188
+sw/source/filter/ww8/ww8scan.cxx:7186
     _Bool readS16(const unsigned char *,unsigned long,const unsigned char *,short *)
     unsigned long offset
     2
-sw/source/filter/ww8/ww8scan.hxx:997
+sw/source/filter/ww8/ww8scan.cxx:7201
+    int getStringLengthWithMax(const unsigned char *,unsigned long,const unsigned char *,unsigned long)
+    unsigned long maxchars
+    65
+sw/source/filter/ww8/ww8scan.hxx:996
     struct SprmResult WW8PLCFMan::HasCharSprm(unsigned short) const
     unsigned short nId
     2138
@@ -3097,35 +3017,67 @@ sw/source/filter/ww8/ww8scan.hxx:1536
 sw/source/filter/xml/xmlbrshi.hxx:58
     void SwXMLBrushItemImportContext::SwXMLBrushItemImportContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,const class SvXMLUnitConverter &,unsigned short)
     unsigned short nWhich
-    105
+    111
 sw/source/uibase/inc/frmmgr.hxx:121
     void SwFlyFrameAttrMgr::DelAttr(unsigned short)
     unsigned short nId
     89
-sw/source/uibase/inc/mailmergehelper.hxx:99
+sw/source/uibase/inc/mailmergehelper.hxx:100
     void SwAddressPreview::SetLayout(unsigned short,unsigned short)
     unsigned short nColumns
     2
-sw/source/uibase/inc/numpara.hxx:61
-    _Bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
-    enum SfxStyleFamily nFamily
-    16
-sw/source/uibase/inc/numpara.hxx:61
-    _Bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
+sw/source/uibase/inc/numpara.hxx:64
+    void SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
     unsigned short nId
     5550
+sw/source/uibase/inc/numpara.hxx:64
+    void SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
+    enum SfxStyleFamily nFamily
+    16
 sw/source/uibase/inc/prcntfld.hxx:66
-    void SwPercentField::set_min(int,enum FieldUnit)
+    void SwPercentField::set_min(long,enum FieldUnit)
     enum FieldUnit eInUnit
     5
 sw/source/uibase/inc/prcntfld.hxx:67
-    void SwPercentField::set_max(int,enum FieldUnit)
+    void SwPercentField::set_max(long,enum FieldUnit)
     enum FieldUnit eInUnit
     5
 sw/source/uibase/inc/swuipardlg.hxx:34
-    void SwParaDlg::SwParaDlg(class weld::Window *,class SwView &,const class SfxItemSet &,unsigned char,const class rtl::OUString *,_Bool,const class rtl::OString &)
+    void SwParaDlg::SwParaDlg(class weld::Window *,class SwView &,const class SfxItemSet &,unsigned char,const class rtl::OUString *,_Bool,const class rtl::OUString &)
     unsigned char nDialogMode
     2
+sw/source/uibase/uiview/view2.cxx:191
+    void (anonymous namespace)::SwNumberInputDlg::SwNumberInputDlg(class weld::Window *,const class rtl::OUString &,const class rtl::OUString &,const long,const long,const long,class rtl::OUString)
+    const long max
+    10
+sw/source/writerfilter/dmapper/NumberingManager.hxx:79
+    short writerfilter::dmapper::ListLevel::GetNumberingType(short) const
+    short nDefault
+    5
+sw/source/writerfilter/ooxml/OOXMLFastContextHandler.hxx:174
+    void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(unsigned int)
+    unsigned int nId
+    92500
+sw/source/writerfilter/ooxml/OOXMLFastContextHandler.hxx:512
+    void writerfilter::ooxml::OOXMLFastContextHandlerWrapper::addToken(int)
+    int Element
+    2299042
+sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx:676
+    class tools::SvRef<class writerfilter::rtftok::RTFValue> getNestedSprm(class writerfilter::rtftok::RTFSprms &,unsigned int,unsigned int)
+    unsigned int nParent
+    92188
+sw/source/writerfilter/rtftok/rtfsprm.hxx:58
+    void writerfilter::rtftok::RTFSprms::eraseLast(unsigned int)
+    unsigned int nKeyword
+    92727
+toolkit/inc/controls/table/tablecontrol.hxx:125
+    void svt::table::TableControl::commitCellEventIfAccessibleAlive(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
+    const short i_eventID
+    4
+toolkit/inc/controls/table/tablecontrolinterface.hxx:215
+    void svt::table::ITableControl::showTracking(const class tools::Rectangle &,const enum ShowTrackFlags)
+    const enum ShowTrackFlags i_flags
+    4099
 toolkit/inc/helper/btndlg.hxx:61
     void ButtonDialog::RemoveButton(unsigned short)
     unsigned short nId
@@ -3134,347 +3086,371 @@ toolkit/inc/helper/btndlg.hxx:64
     void ButtonDialog::ButtonDialog(enum WindowType)
     enum WindowType nType
     304
-toolkit/source/awt/vclxspinbutton.cxx:40
+toolkit/source/awt/vclxspinbutton.cxx:39
     void lcl_modifyStyle(class vcl::Window *,long,_Bool)
     long _nStyleBits
     4096
-toolkit/source/awt/vclxwindows.cxx:6572
+toolkit/source/awt/vclxwindows.cxx:6261
     void lcl_setWinBits(class vcl::Window *,long,_Bool)
     long _nBits
     68719476736
-tools/source/stream/strmunx.cxx:104
+toolkit/source/controls/table/tablecontrol_impl.hxx:242
+    void svt::table::TableControl_Impl::commitAccessibleEvent(const short)
+    const short i_eventID
+    9
+tools/source/stream/strmunx.cxx:95
     class ErrCode GetSvError(int)
     int nErrno
     21
-ucbhelper/source/provider/resultset.cxx:100
+ucb/source/core/ucbcmds.cxx:70
+    struct com::sun::star::beans::Property makeProperty(const class rtl::OUString &,int,class com::sun::star::uno::Type,short)
+    int h
+    -1
+ucb/source/ucp/webdav-curl/CurlSession.cxx:201
+    void (anonymous namespace)::CurlOption::CurlOption(const CURLoption,const void *const,const char *const)
+    const CURLoption i_Option
+    10036
+ucb/source/ucp/webdav-curl/PropfindCache.hxx:73
+    void http_dav_ucp::PropertyNamesCache::addCachePropertyNames(class http_dav_ucp::PropertyNames &,const unsigned int)
+    const unsigned int nLifeTime
+    10
+ucbhelper/source/provider/resultset.cxx:98
     void ucbhelper_impl::(anonymous namespace)::PropertySetInfo::PropertySetInfo(const struct ucbhelper_impl::(anonymous namespace)::PropertyInfo *,int)
     int nProps
     2
-unotools/source/config/useroptions.cxx:98
+unotools/source/config/useroptions.cxx:97
     _Bool SvtUserOptions::Impl::GetBoolValue(enum UserOptToken) const
     enum UserOptToken nToken
     19
-unotools/source/misc/datetime.cxx:72
-    _Bool convertNumber64(long &,const class rtl::OUString &,long,long)
+unotools/source/misc/datetime.cxx:74
+    _Bool convertNumber64(long &,class std::basic_string_view<char16_t>,long,long)
     long 
     -1
-vcl/backendtest/outputdevice/rectangle.cxx:24
+vcl/backendtest/outputdevice/common.cxx:109
+    void checkValueAA(class BitmapScopedWriteAccess &,int,int,class Color,int &,int &,int)
+    int nColorDeltaThresh
+    64
+vcl/backendtest/outputdevice/common.cxx:147
+    _Bool checkConvexHullProperty(class Bitmap &,class Color,int,int)
+    int nWidthOffset
+    2
+vcl/backendtest/outputdevice/rectangle.cxx:25
     void drawInvertOffset(class OutputDevice &,const class tools::Rectangle &,int,enum InvertFlags)
     int nOffset
     2
-vcl/inc/driverblocklist.hxx:153
+vcl/backendtest/VisualBackendTest.cxx:144
+    class std::vector<class tools::Rectangle> (anonymous namespace)::VisualBackendTestWindow::setupRegions(int,int,int,int)
+    int nPartitionsY
+    2
+vcl/inc/driverblocklist.hxx:155
     unsigned long OpenGLVersion(unsigned int,unsigned int,unsigned int,unsigned int)
     unsigned int a
     10
-vcl/inc/driverblocklist.hxx:153
+vcl/inc/driverblocklist.hxx:155
     unsigned long OpenGLVersion(unsigned int,unsigned int,unsigned int,unsigned int)
     unsigned int b
     20
-vcl/inc/driverblocklist.hxx:153
+vcl/inc/driverblocklist.hxx:155
     unsigned long OpenGLVersion(unsigned int,unsigned int,unsigned int,unsigned int)
     unsigned int c
     30
-vcl/inc/driverblocklist.hxx:153
+vcl/inc/driverblocklist.hxx:155
     unsigned long OpenGLVersion(unsigned int,unsigned int,unsigned int,unsigned int)
     unsigned int d
     40
-vcl/inc/fontsubset.hxx:54
+vcl/inc/FileDefinitionWidgetDraw.hxx:60
+    void vcl::FileDefinitionWidgetDraw::drawPolyLine(class SalGraphics &,const class basegfx::B2DHomMatrix &,const class basegfx::B2DPolygon &,double,double,const class std::vector<double> *,enum basegfx::B2DLineJoin,enum com::sun::star::drawing::LineCap,double,_Bool)
+    enum basegfx::B2DLineJoin i_eLineJoin
+    4
+vcl/inc/fontsubset.hxx:53
     void FontSubsetInfo::LoadFont(enum FontType,const unsigned char *,int)
     enum FontType eInFontType
     32
-vcl/inc/headless/svpgdi.hxx:251
-    void SvpSalGraphics::drawBitmap(const struct SalTwoRect &,const struct BitmapBuffer *,enum _cairo_operator)
+vcl/inc/fontsubset.hxx:56
+    _Bool FontSubsetInfo::CreateFontSubset(enum FontType,class SvStream *,const char *,const unsigned int *,const unsigned char *,int)
+    enum FontType nOutFontTypeMask
+    16
+vcl/inc/headless/SvpGraphicsBackend.hxx:135
+    void SvpGraphicsBackend::drawBitmapBuffer(const struct SalTwoRect &,const struct BitmapBuffer *,enum _cairo_operator)
     enum _cairo_operator eOp
     2
-vcl/inc/listbox.hxx:486
-    void ImplListBox::SetMRUEntries(const class rtl::OUString &,char16_t)
+vcl/inc/listbox.hxx:489
+    void ImplListBox::SetMRUEntries(class std::basic_string_view<char16_t>,char16_t)
     char16_t cSep
     59
-vcl/inc/listbox.hxx:487
+vcl/inc/listbox.hxx:490
     class rtl::OUString ImplListBox::GetMRUEntries(char16_t) const
     char16_t cSep
     59
-vcl/inc/opengl/program.hxx:86
-    void OpenGLProgram::SetUniform1fv(const class rtl::OString &,int,const float *)
-    int nCount
-    16
-vcl/inc/opengl/program.hxx:87
-    void OpenGLProgram::SetUniform2fv(const class rtl::OString &,int,const float *)
-    int nCount
+vcl/inc/pdf/pdfwriter_impl.hxx:1101
+    _Bool vcl::PDFWriterImpl::computeODictionaryValue(const unsigned char *,const unsigned char *,class std::vector<unsigned char> &,int)
+    int i_nKeyLength
     16
-vcl/inc/opengl/program.hxx:108
-    void OpenGLProgram::DrawElements(unsigned int,unsigned int)
-    unsigned int aMode
-    4
-vcl/inc/skia/utils.hxx:43
+vcl/inc/pdf/pdfwriter_impl.hxx:1150
+    void vcl::PDFWriterImpl::insertError(enum vcl::PDFWriter::ErrorCode)
+    enum vcl::PDFWriter::ErrorCode eErr
+    3
+vcl/inc/skia/utils.hxx:61
     class sk_sp<class SkSurface> createSkSurface(const class Size &,enum SkColorType,enum SkAlphaType)
     enum SkAlphaType alpha
     2
-vcl/inc/test/outputdevice.hxx:77
+vcl/inc/test/outputdevice.hxx:67
     void vcl::test::OutputDeviceTestCommon::createDiamondPoints(class tools::Rectangle,int,class Point &,class Point &,class Point &,class Point &)
     int nOffset
     4
-vcl/inc/TypeSerializer.hxx:29
-    unsigned int createMagic(char,char,char,char)
-    char char4
-    48
-vcl/inc/unx/gendisp.hxx:44
+vcl/inc/test/outputdevice.hxx:115
+    class Bitmap vcl::test::OutputDeviceTestBitmap::setupComplexDrawTransformedBitmap(enum vcl::PixelFormat,_Bool)
+    enum vcl::PixelFormat aBitmapFormat
+    24
+vcl/inc/unx/gendisp.hxx:43
     void SalGenericDisplay::CancelInternalEvent(class SalFrame *,void *,enum SalEvent)
     enum SalEvent nEvent
     21
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:53
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_manual_capabilities(struct _GtkPrintUnixDialog *,GtkPrintCapabilities) const
-    GtkPrintCapabilities capabilities
-    846
-vcl/inc/unx/saldata.hxx:47
-    void X11SalData::X11SalData(enum GenericUnixSalDataType,class SalInstance *)
-    enum GenericUnixSalDataType t
-    3
-vcl/inc/unx/x11/xrender_peer.hxx:51
-    void XRenderPeer::ChangePicture(unsigned long,unsigned long,const struct _XRenderPictureAttributes *) const
-    unsigned long nValueMask
-    64
-vcl/inc/unx/x11/xrender_peer.hxx:54
-    void XRenderPeer::CompositePicture(int,unsigned long,unsigned long,unsigned long,int,int,int,int,unsigned int,unsigned int) const
-    int nOp
-    3
-vcl/inc/unx/x11/xrender_peer.hxx:61
-    void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
-    int nOp
-    3
-vcl/inc/unx/x11/xrender_peer.hxx:64
-    void XRenderPeer::CompositeTriangles(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTriangle *,int) const
-    int nOp
-    3
+vcl/inc/unx/gtk/gtkdata.hxx:139
+    struct _cairo_surface * surface_create_similar_surface(struct _GdkWindow *,enum _cairo_content,int,int)
+    enum _cairo_content eContent
+    12288
 vcl/inc/WidgetDrawInterface.hxx:47
     _Bool vcl::WidgetDrawInterface::hitTestNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,const class Point &,_Bool &)
     enum ControlType eType
     60
-vcl/inc/wizdlg.hxx:88
-    long vcl::RoadmapWizard::LogicalCoordinateToPixel(int)
+vcl/inc/wizdlg.hxx:86
+    long vcl::RoadmapWizard::LogicalCoordinateToPixel(int) const
     int iCoordinate
     6
-vcl/inc/wizdlg.hxx:288
+vcl/inc/wizdlg.hxx:131
+    void vcl::RoadmapWizard::AddButtonResponse(class Button *,int)
+    int response
+    10
+vcl/inc/wizdlg.hxx:258
     void vcl::RoadmapWizard::implConstruct(const enum WizardButtonFlags)
     const enum WizardButtonFlags _nButtonFlags
     31
-vcl/qa/cppunit/BitmapScaleTest.cxx:75
+vcl/qa/cppunit/BitmapScaleTest.cxx:58
     void assertColorsAreSimilar(int,int,const class BitmapColor &,const class BitmapColor &)
     int maxDifference
     2
-vcl/qa/cppunit/jpeg/JpegReaderTest.cxx:48
+vcl/qa/cppunit/gradient.cxx:52
+    unsigned long TestLinearStripes(class GDIMetaFile &,unsigned long,unsigned long)
+    unsigned long nTimes
+    3
+vcl/qa/cppunit/gradient.cxx:117
+    unsigned long TestAxialStripes(class GDIMetaFile &,unsigned long,unsigned long)
+    unsigned long nTimes
+    3
+vcl/qa/cppunit/gradient.cxx:192
+    unsigned long TestComplexStripes(class GDIMetaFile &,unsigned long,unsigned long)
+    unsigned long nTimes
+    40
+vcl/qa/cppunit/jpeg/JpegReaderTest.cxx:54
     _Bool checkRect(class Bitmap &,int,long,long,class Color,int)
     long nAreaHeight
     8
-vcl/qa/cppunit/jpeg/JpegReaderTest.cxx:48
+vcl/qa/cppunit/jpeg/JpegReaderTest.cxx:54
     _Bool checkRect(class Bitmap &,int,long,long,class Color,int)
     long nAreaWidth
     8
+vcl/qa/cppunit/outdev.cxx:1908
+    unsigned long ClipGradientTest(class GDIMetaFile &,unsigned long)
+    unsigned long nIndex
+    5
 vcl/qa/cppunit/timer.cxx:37
     void (anonymous namespace)::WatchDog::WatchDog(int)
     int nSeconds
     120
-vcl/qa/cppunit/timer.cxx:343
+vcl/qa/cppunit/timer.cxx:342
     void (anonymous namespace)::YieldTimer::YieldTimer(unsigned long)
     unsigned long nMS
     5
-vcl/qa/cppunit/timer.cxx:373
+vcl/qa/cppunit/timer.cxx:372
     void (anonymous namespace)::SlowCallbackTimer::SlowCallbackTimer(unsigned long,_Bool &)
     unsigned long nMS
     250
+vcl/source/filter/eps/eps.cxx:94
+    enum (anonymous namespace)::NMode operator|(enum (anonymous namespace)::NMode,enum (anonymous namespace)::NMode)
+    enum (anonymous namespace)::NMode b
+    4
+vcl/source/filter/eps/eps.cxx:188
+    void (anonymous namespace)::PSWriter::ImplCurveTo(const class Point &,const class Point &,const class Point &,enum (anonymous namespace)::NMode)
+    enum (anonymous namespace)::NMode nMode
+    4
+vcl/source/filter/idxf/dxf2mtf.hxx:110
+    _Bool DXF2GDIMetaFile::Convert(const class DXFRepresentation &,class GDIMetaFile &,unsigned short,unsigned short)
+    unsigned short nMinPercent
+    60
+vcl/source/filter/idxf/dxf2mtf.hxx:110
+    _Bool DXF2GDIMetaFile::Convert(const class DXFRepresentation &,class GDIMetaFile &,unsigned short,unsigned short)
+    unsigned short nMaxPercent
+    100
 vcl/source/filter/jpeg/JpegReader.cxx:55
     long StreamRead(class SvStream *,void *,long)
     long nBufferSize
     4096
-vcl/source/filter/wmf/emfwr.hxx:57
+vcl/source/filter/png/PngImageWriter.cxx:62
+    void writeFctlChunk(class std::vector<unsigned char> &,unsigned int,class Size,class Point,unsigned short,unsigned short,enum Disposal,enum Blend)
+    unsigned short nDelayDen
+    100
+vcl/source/filter/wmf/emfwr.hxx:56
     void EMFWriter::ImplBeginCommentRecord(int)
     int nCommentType
     726027589
-vcl/source/filter/wmf/wmfwr.hxx:144
+vcl/source/filter/wmf/wmfwr.hxx:143
     void WMFWriter::WMFRecord_Escape(unsigned int,unsigned int,const signed char *)
     unsigned int nEsc
     2
-vcl/source/fontsubset/ttcr.hxx:61
-    void TrueTypeCreatorNewEmpty(unsigned int,struct vcl::TrueTypeCreator **)
+vcl/source/fontsubset/ttcr.hxx:60
+    void vcl::TrueTypeCreator::TrueTypeCreator(unsigned int)
     unsigned int tag
     1953658213
-vcl/source/fontsubset/ttcr.hxx:174
-    struct vcl::TrueTypeTable * TrueTypeTableNew_post(int,int,short,short,unsigned int)
-    int format
-    196608
-vcl/source/fontsubset/ttcr.hxx:185
-    void cmapAdd(struct vcl::TrueTypeTable *,unsigned int,unsigned int,unsigned int)
+vcl/source/fontsubset/ttcr.hxx:243
+    void vcl::TrueTypeTableCmap::cmapAdd(unsigned int,unsigned int,unsigned int)
     unsigned int id
     65536
-vcl/source/gdi/pdfwriter_impl.hxx:1021
-    _Bool vcl::PDFWriterImpl::computeODictionaryValue(const unsigned char *,const unsigned char *,class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,int)
-    int i_nKeyLength
-    16
-vcl/source/gdi/pdfwriter_impl.hxx:1069
-    void vcl::PDFWriterImpl::insertError(enum vcl::PDFWriter::ErrorCode)
-    enum vcl::PDFWriter::ErrorCode eErr
-    3
-vcl/source/graphic/GraphicObject.cxx:134
+vcl/source/fontsubset/ttcr.hxx:271
+    void vcl::TrueTypeTablePost::TrueTypeTablePost(int,int,short,short,unsigned int)
+    int format
+    196608
+vcl/source/graphic/GraphicObject.cxx:136
     void lclImplAdjust(class BitmapEx &,const class GraphicAttr &,enum GraphicAdjustmentFlags)
     enum GraphicAdjustmentFlags nAdjustmentFlags
     31
-vcl/source/graphic/GraphicObject.cxx:185
+vcl/source/graphic/GraphicObject.cxx:187
     void lclImplAdjust(class GDIMetaFile &,const class GraphicAttr &,enum GraphicAdjustmentFlags)
     enum GraphicAdjustmentFlags nAdjustmentFlags
     31
-vcl/source/graphic/GraphicObject.cxx:236
+vcl/source/graphic/GraphicObject.cxx:238
     void lclImplAdjust(class Animation &,const class GraphicAttr &,enum GraphicAdjustmentFlags)
     enum GraphicAdjustmentFlags nAdjustmentFlags
     31
-vcl/source/opengl/OpenGLHelper.cxx:170
-    class rtl::OString getHexString(const unsigned char *,unsigned int)
-    unsigned int nLength
-    16
-vcl/source/window/menu.cxx:534
+vcl/source/window/menu.cxx:525
     void ImplCopyItem(class Menu *,const class Menu &,unsigned short,unsigned short)
     unsigned short nNewPos
     65535
-vcl/unx/generic/app/saldisp.cxx:693
+vcl/unx/generic/app/saldisp.cxx:598
     unsigned int GetKeySymMask(struct _XDisplay *,unsigned long)
     unsigned long nKeySym
     65509
-vcl/unx/generic/dtrans/X11_selection.hxx:382
+vcl/unx/generic/dtrans/X11_selection.hxx:381
     unsigned long x11::SelectionManager::createCursor(const unsigned char *,const unsigned char *,int,int,int,int)
-    int height
+    int width
     32
-vcl/unx/generic/dtrans/X11_selection.hxx:382
+vcl/unx/generic/dtrans/X11_selection.hxx:381
     unsigned long x11::SelectionManager::createCursor(const unsigned char *,const unsigned char *,int,int,int,int)
-    int width
+    int height
     32
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:174
-    void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(unsigned int)
-    unsigned int nId
-    92465
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:513
-    void writerfilter::ooxml::OOXMLFastContextHandlerWrapper::addToken(int)
-    int Element
-    2167927
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:662
-    class tools::SvRef<class writerfilter::rtftok::RTFValue> getNestedSprm(class writerfilter::rtftok::RTFSprms &,unsigned int,unsigned int)
-    unsigned int nParent
-    92165
-writerfilter/source/rtftok/rtfsprm.hxx:59
-    void writerfilter::rtftok::RTFSprms::eraseLast(unsigned int)
-    unsigned int nKeyword
-    92680
-xmloff/inc/txtflde.hxx:254
+xmloff/inc/txtflde.hxx:260
     void XMLTextFieldExport::ProcessIntegerDef(enum xmloff::token::XMLTokenEnum,int,int)
     enum xmloff::token::XMLTokenEnum eXmlName
-    1321
-xmloff/inc/txtflde.hxx:280
-    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,unsigned short,const class rtl::OUString &,const class rtl::OUString &)
+    1394
+xmloff/inc/txtflde.hxx:286
+    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,unsigned short,const class rtl::OUString &,class std::basic_string_view<char16_t>)
     enum xmloff::token::XMLTokenEnum eXmlName
-    810
-xmloff/inc/txtflde.hxx:280
-    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,unsigned short,const class rtl::OUString &,const class rtl::OUString &)
+    857
+xmloff/inc/txtflde.hxx:286
+    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,unsigned short,const class rtl::OUString &,class std::basic_string_view<char16_t>)
     unsigned short nValuePrefix
     30
-xmloff/inc/txtflde.hxx:293
-    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum)
-    enum xmloff::token::XMLTokenEnum eDefault
-    1777
-xmloff/inc/txtflde.hxx:293
+xmloff/inc/txtflde.hxx:299
     void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum)
     enum xmloff::token::XMLTokenEnum eXmlName
-    1444
-xmloff/inc/txtflde.hxx:325
+    1523
+xmloff/inc/txtflde.hxx:299
+    void XMLTextFieldExport::ProcessString(enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum)
+    enum xmloff::token::XMLTokenEnum eDefault
+    1886
+xmloff/inc/txtflde.hxx:331
     void XMLTextFieldExport::ProcessDateTime(enum xmloff::token::XMLTokenEnum,double,_Bool,_Bool,_Bool,unsigned short)
     unsigned short nPrefix
     2
-xmloff/inc/txtflde.hxx:341
+xmloff/inc/txtflde.hxx:347
     void XMLTextFieldExport::ProcessDateTime(enum xmloff::token::XMLTokenEnum,const struct com::sun::star::util::DateTime &)
     enum xmloff::token::XMLTokenEnum eXMLName
-    514
-xmloff/inc/txtflde.hxx:346
+    553
+xmloff/inc/txtflde.hxx:352
     void XMLTextFieldExport::ProcessTimeOrDateTime(enum xmloff::token::XMLTokenEnum,const struct com::sun::star::util::DateTime &)
     enum xmloff::token::XMLTokenEnum eXMLName
-    1830
-xmloff/inc/XMLBase64Export.hxx:39
+    1941
+xmloff/inc/XMLBase64Export.hxx:38
     _Bool XMLBase64Export::exportElement(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum xmloff::token::XMLTokenEnum)
     enum xmloff::token::XMLTokenEnum eName
-    2037
-xmloff/source/chart/transporttypes.hxx:200
-    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,const class rtl::OUString &,int)
+    2152
+xmloff/source/chart/transporttypes.hxx:218
+    void DataRowPointStyle::DataRowPointStyle(enum DataRowPointStyle::StyleType,class rtl::OUString,int)
     enum DataRowPointStyle::StyleType eType
     5
-xmloff/source/draw/ximpcustomshape.cxx:87
-    void GetInt32(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+xmloff/source/draw/ximpcustomshape.cxx:85
+    void GetInt32(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    80
-xmloff/source/draw/ximpcustomshape.cxx:100
-    void GetDouble(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    82
+xmloff/source/draw/ximpcustomshape.cxx:98
+    void GetDouble(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    65
-xmloff/source/draw/ximpcustomshape.cxx:113
-    void GetString(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    67
+xmloff/source/draw/ximpcustomshape.cxx:111
+    void GetString(class std::vector<struct com::sun::star::beans::PropertyValue> &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    61
-xmloff/source/draw/ximpcustomshape.cxx:123
-    void GetEnum(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum,const SvXMLEnumMapEntry<type-parameter-?-?> &)
+    63
+xmloff/source/draw/ximpcustomshape.cxx:121
+    void GetEnum(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum,const SvXMLEnumMapEntry<type-parameter-?-?> &)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    114
-xmloff/source/draw/ximpcustomshape.cxx:426
-    void GetPosition3D(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum,class SvXMLUnitConverter &)
+    117
+xmloff/source/draw/ximpcustomshape.cxx:425
+    void GetPosition3D(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum,const class SvXMLUnitConverter &)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    96
-xmloff/source/draw/ximpcustomshape.cxx:440
-    void GetDoubleSequence(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    99
+xmloff/source/draw/ximpcustomshape.cxx:439
+    void GetDoubleSequence(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    113
-xmloff/source/draw/ximpcustomshape.cxx:465
-    void GetSizeSequence(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    116
+xmloff/source/draw/ximpcustomshape.cxx:464
+    void GetSizeSequence(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    120
-xmloff/source/draw/ximpcustomshape.cxx:531
-    int GetEnhancedParameterPairSequence(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    123
+xmloff/source/draw/ximpcustomshape.cxx:530
+    int GetEnhancedParameterPairSequence(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char16_t>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    112
-xmloff/source/draw/ximpcustomshape.cxx:553
-    void GetEnhancedRectangleSequence(class std::__debug::vector<struct com::sun::star::beans::PropertyValue, class std::allocator<struct com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
+    115
+xmloff/source/draw/ximpcustomshape.cxx:552
+    void GetEnhancedRectangleSequence(class std::vector<struct com::sun::star::beans::PropertyValue> &,class std::basic_string_view<char16_t>,const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum eDestProp
-    111
-xmloff/source/forms/elementimport.cxx:1363
+    114
+xmloff/source/forms/elementimport.cxx:1364
     void xmloff::(anonymous namespace)::EqualHandle::EqualHandle(int)
     int _nHandle
     2
 xmloff/source/forms/property_description.hxx:81
-    void xmloff::PropertyDescription::PropertyDescription(const class rtl::OUString &,const unsigned short,const enum xmloff::token::XMLTokenEnum,class rtl::Reference<class xmloff::PropertyHandlerBase> (*const)(enum xmloff::PropertyId),const enum xmloff::PropertyId)
+    void xmloff::PropertyDescription::PropertyDescription(class rtl::OUString,const unsigned short,const enum xmloff::token::XMLTokenEnum,class rtl::Reference<class xmloff::PropertyHandlerBase> (*const)(enum xmloff::PropertyId),const enum xmloff::PropertyId)
     const unsigned short i_namespacePrefix
     15
-xmloff/source/script/xmlbasicscript.hxx:36
+xmloff/source/script/xmlbasicscript.hxx:33
     _Bool xmloff::BasicElementBase::getBoolAttr(_Bool *,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &)
     int nToken
-    1968625
-xmloff/source/style/xmlbahdl.hxx:51
+    1968746
+xmloff/source/style/xmlbahdl.hxx:50
     void XMLNumberNonePropHdl::XMLNumberNonePropHdl(enum xmloff::token::XMLTokenEnum,signed char)
     enum xmloff::token::XMLTokenEnum eZeroString
-    402
-xmloff/source/style/xmlbahdl.hxx:51
+    432
+xmloff/source/style/xmlbahdl.hxx:50
     void XMLNumberNonePropHdl::XMLNumberNonePropHdl(enum xmloff::token::XMLTokenEnum,signed char)
     signed char nB
     2
-xmloff/source/style/xmlbahdl.hxx:117
+xmloff/source/style/xmlbahdl.hxx:125
     void XMLMeasurePxPropHdl::XMLMeasurePxPropHdl(signed char)
     signed char nB
     4
-xmloff/source/text/XMLIndexMarkExport.cxx:182
+xmloff/source/text/XMLIndexMarkExport.cxx:178
     void lcl_ExportPropertyBool(class SvXMLExport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,enum xmloff::token::XMLTokenEnum,class com::sun::star::uno::Any &)
     enum xmloff::token::XMLTokenEnum eToken
-    2147
-xmloff/source/transform/TransformerContext.hxx:58
+    2263
+xmloff/source/transform/TransformerContext.hxx:57
     _Bool XMLTransformerContext::HasNamespace(unsigned short) const
     unsigned short nPrefix
     15
-xmlsecurity/inc/xsecctl.hxx:86
+xmlsecurity/inc/xsecctl.hxx:85
     void InternalSignatureInformation::addReference(enum SignatureReferenceType,int,const class rtl::OUString &,int,const class rtl::OUString &)
     int keeperId
     -1
-xmlsecurity/source/framework/elementmark.hxx:57
+xmlsecurity/source/framework/elementmark.hxx:56
     void ElementMark::ElementMark(int,int)
     int nSecurityId
     -1
diff --git a/compilerplugins/clang/constantparam.py b/compilerplugins/clang/constantparam.py
index 9e1c7e74aa9b..3df25994c3f5 100755
--- a/compilerplugins/clang/constantparam.py
+++ b/compilerplugins/clang/constantparam.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -13,7 +12,7 @@ def normalizeTypeParams( line ):
     return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
 
 # reading as binary (since we known it is pure ascii) is much faster than reading as unicode
-with io.open("constantparam.1", "r") as txt:
+with io.open("workdir/loplugin.constantparam.log", "r") as txt:
     line_no = 1;
     try:
         for line in txt:
@@ -21,6 +20,8 @@ with io.open("constantparam.1", "r") as txt:
             returnType = normalizeTypeParams(tokens[0])
             nameAndParams = normalizeTypeParams(tokens[1])
             sourceLocation = tokens[2]
+            # the cxx should actually ignore these
+            if sourceLocation.startswith("workdir/"): continue
             paramName = tokens[3]
             paramType = normalizeTypeParams(tokens[4])
             callValue = tokens[5]
diff --git a/compilerplugins/clang/constexprliteral.cxx b/compilerplugins/clang/constexprliteral.cxx
new file mode 100644
index 000000000000..86bba13e090c
--- /dev/null
+++ b/compilerplugins/clang/constexprliteral.cxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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 LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <stack>
+
+#include "check.hxx"
+#include "plugin.hxx"
+#include "config_clang.h"
+
+namespace
+{
+class ConstexprLiteral final : public loplugin::FilteringPlugin<ConstexprLiteral>
+{
+public:
+    explicit ConstexprLiteral(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool VisitVarDecl(const VarDecl* varDecl)
+    {
+        if (ignoreLocation(varDecl))
+            return true;
+        if (varDecl->isConstexpr())
+            return true;
+        if (!loplugin::TypeCheck(varDecl->getType())
+                 .Class("OUStringLiteral")
+                 .Namespace("rtl")
+                 .GlobalNamespace())
+            return true;
+        report(DiagnosticsEngine::Warning, "OUStringLiteral should be declared constexpr",
+               varDecl->getBeginLoc())
+            << varDecl->getSourceRange();
+        return true;
+    }
+
+    bool preRun() override
+    {
+        if (!compiler.getLangOpts().CPlusPlus)
+            return false;
+        return true;
+    }
+
+private:
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+};
+
+loplugin::Plugin::Registration<ConstexprLiteral> constexprliteral("constexprliteral");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/constmethod.cxx b/compilerplugins/clang/constmethod.cxx
index 45451152dc99..bd9c4db18d17 100644
--- a/compilerplugins/clang/constmethod.cxx
+++ b/compilerplugins/clang/constmethod.cxx
@@ -16,13 +16,10 @@
 #include "config_clang.h"
 
 #include "plugin.hxx"
-#include "compat.hxx"
 #include "check.hxx"
 #include "functionaddress.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
    Find methods that can be declared const.
@@ -43,6 +40,41 @@ public:
     explicit ConstMethod(loplugin::InstantiationData const & data): FunctionAddress(data) {}
 
     virtual void run() override {
+        std::string fn(handler.getMainFileName());
+        loplugin::normalizeDotDotInFilePath(fn);
+        // things I'm not sure about
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/unx/source/svdde/ddedummy.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/numbers/zformat.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/numbers/zforscan.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/numbers/zforlist.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/gdi/impgraph.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/image/ImplImage.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/filter/wmf/wmfwr.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/generic/app/i18n_im.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/generic/app/randrwrapper.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/gtkinst.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/gtkframe.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/skia/gdiimpl.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qt5/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/package/source/xstor/owriteablestream.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/package/source/zippackage/ZipPackage.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/toolkit/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/canvas/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/accessibility/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/framework/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/basic/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/sfx2/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/xmloff/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/connectivity/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/editeng/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/scripting/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/ucb/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/basctl/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/chart2/")
+            )
+            return;
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         for (const CXXMethodDecl *pMethodDecl : interestingMethodSet) {
@@ -52,19 +84,32 @@ public:
             if (getFunctionsWithAddressTaken().find((FunctionDecl const *)canonicalDecl)
                     != getFunctionsWithAddressTaken().end())
                 continue;
-            StringRef aFileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(canonicalDecl)));
+            // things that I don't think should be logically const
+            std::string fqn = pMethodDecl->getQualifiedNameAsString();
+            if (fqn == "comphelper::EmbeddedObjectContainer::CommitImageSubStorage"
+                || fqn == "SvtLinguConfig::SetProperty"
+                || fqn == "SvtLinguConfig::ReplaceSetProperties"
+                || fqn == "SystemWindow::UpdatePositionData"
+                || fqn == "OutputDevice::SelectClipRegion"
+                || fqn == "OutputDevice::BlendBitmap")
+                continue;
+            StringRef aFileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(canonicalDecl->getBeginLoc()));
+            // leave the kit API alone
             if (loplugin::isSamePathname(aFileName, SRCDIR "/include/LibreOfficeKit/LibreOfficeKit.hxx"))
                 continue;
+            // don't feel like touching this right now
+            if (loplugin::isSamePathname(aFileName, SRCDIR "/include/vcl/weld.hxx"))
+                continue;
             report(
                 DiagnosticsEngine::Warning,
                 "this method can be const",
-                compat::getBeginLoc(pMethodDecl))
+                pMethodDecl->getBeginLoc())
                 << pMethodDecl->getSourceRange();
             if (canonicalDecl->getLocation() != pMethodDecl->getLocation()) {
                 report(
                     DiagnosticsEngine::Note,
                     "canonical method declaration here",
-                    compat::getBeginLoc(canonicalDecl))
+                    canonicalDecl->getBeginLoc())
                     << canonicalDecl->getSourceRange();
             }
         }
@@ -140,8 +185,8 @@ bool ConstMethod::VisitCXXMethodDecl(const CXXMethodDecl * cxxMethodDecl)
 
     if (!cxxMethodDecl->getIdentifier())
         return true;
-    if (cxxMethodDecl->getNumParams() > 0)
-        return true;
+//    if (cxxMethodDecl->getNumParams() > 0)
+//        return true;
     // returning pointers or refs to non-const stuff, and then having the whole method
     // be const doesn't seem like a good idea
     auto tc = loplugin::TypeCheck(cxxMethodDecl->getReturnType());
@@ -153,11 +198,11 @@ bool ConstMethod::VisitCXXMethodDecl(const CXXMethodDecl * cxxMethodDecl)
     if (tc.Void())
         return true;
 
-    StringRef name = cxxMethodDecl->getName();
-    if (!name.startswith("get") && !name.startswith("Get")
-        && !name.startswith("is") && !name.startswith("Is")
-        && !name.startswith("has") && !name.startswith("Has"))
-        return true;
+//    StringRef name = cxxMethodDecl->getName();
+//    if (!name.startswith("get") && !name.startswith("Get")
+//        && !name.startswith("is") && !name.startswith("Is")
+//        && !name.startswith("has") && !name.startswith("Has"))
+//        return true;
 
     // something lacking in my analysis here
     if (loplugin::DeclCheck(cxxMethodDecl).Function("GetDescr").Class("SwRangeRedline").GlobalNamespace())
@@ -175,7 +220,7 @@ bool ConstMethod::VisitCXXThisExpr( const CXXThisExpr* cxxThisExpr )
     if (ignoreLocation(cxxThisExpr))
         return true;
     // ignore stuff that forms part of the stable URE interface
-    if (isInUnoIncludeFile(compat::getBeginLoc(cxxThisExpr)))
+    if (isInUnoIncludeFile(cxxThisExpr->getBeginLoc()))
         return true;
     if (interestingMethodSet.find(currCXXMethodDecl) == interestingMethodSet.end())
         return true;
@@ -203,7 +248,7 @@ bool ConstMethod::checkIfCanBeConst(const Stmt* stmt, const CXXMethodDecl* cxxMe
             report(
                  DiagnosticsEngine::Warning,
                  "no parent?",
-                  compat::getBeginLoc(stmt))
+                  stmt->getBeginLoc())
                   << stmt->getSourceRange();
             return false;
         }
@@ -214,11 +259,11 @@ bool ConstMethod::checkIfCanBeConst(const Stmt* stmt, const CXXMethodDecl* cxxMe
 
     if (auto unaryOperator = dyn_cast<UnaryOperator>(parent)) {
         UnaryOperator::Opcode op = unaryOperator->getOpcode();
-        if (op == UO_AddrOf || op == UO_PreInc || op == UO_PostInc
+        if (op == UO_PreInc || op == UO_PostInc
             || op == UO_PreDec || op == UO_PostDec) {
             return false;
         }
-        if (op == UO_Deref) {
+        if (op == UO_Deref || op == UO_AddrOf) {
             return checkIfCanBeConst(parent, cxxMethodDecl);
         }
         return true;
@@ -486,7 +531,7 @@ bool ConstMethod::checkIfCanBeConst(const Stmt* stmt, const CXXMethodDecl* cxxMe
     report(
          DiagnosticsEngine::Warning,
          "oh dear, what can the matter be?",
-          compat::getBeginLoc(parent))
+          parent->getBeginLoc())
           << parent->getSourceRange();
     return false;
 }
diff --git a/compilerplugins/clang/constmove.cxx b/compilerplugins/clang/constmove.cxx
new file mode 100644
index 000000000000..63bafa188979
--- /dev/null
+++ b/compilerplugins/clang/constmove.cxx
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// Find occurrences of std::move on const-qualified types.  While there might theoretically be
+// legitimate uses for such (for which this plugin would generate false positives and would need to
+// be updated), in practice they tend to point at suspicious code that should be cleaned up in some
+// way.
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+namespace
+{
+class ConstMove final : public loplugin::FilteringPlugin<ConstMove>
+{
+public:
+    explicit ConstMove(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitCallExpr(CallExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const t = expr->getType();
+        if (!t.isConstQualified())
+        {
+            return true;
+        }
+        auto const d = expr->getDirectCallee();
+        if (d == nullptr)
+        {
+            return true;
+        }
+        if (!loplugin::DeclCheck(d).Function("move").StdNamespace())
+        {
+            return true;
+        }
+        switch (expr->getNumArgs())
+        {
+            case 0:
+                return true;
+            case 1:
+                break;
+            default:
+                if (!isa<CXXDefaultArgExpr>(expr->getArg(1)))
+                {
+                    return true;
+                }
+                break;
+        }
+        report(DiagnosticsEngine::Warning, "suspicious 'std::move' from %0 to const-qualified %1",
+               expr->getExprLoc())
+            << expr->getArg(0)->IgnoreImplicit()->getType() << t << expr->getSourceRange();
+        return true;
+    }
+};
+
+static loplugin::Plugin::Registration<ConstMove> constmove("constmove");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/consttobool.cxx b/compilerplugins/clang/consttobool.cxx
index 4f4755cd8c3c..124ab4efbaaa 100644
--- a/compilerplugins/clang/consttobool.cxx
+++ b/compilerplugins/clang/consttobool.cxx
@@ -15,9 +15,8 @@
 
 #include "clang/Basic/Builtins.h"
 
-#include "config_clang.h"
-
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 // Find implicit conversions from non-'bool' constants (e.g., 'sal_False') to 'bool'.
@@ -87,10 +86,6 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
-#endif
-
     bool PreTraverseBinaryOperator(BinaryOperator* expr)
     {
         if (expr->getOpcode() == BO_LAnd)
@@ -121,10 +116,6 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
-#endif
-
     bool VisitImplicitCastExpr(ImplicitCastExpr const* expr)
     {
         if (ignoreLocation(expr))
@@ -155,7 +146,7 @@ public:
         {
             if (auto const e = dyn_cast<clang::StringLiteral>(sub->IgnoreParenImpCasts()))
             {
-                if (e->isAscii()) // somewhat randomly restrict to plain literals
+                if (compat::isOrdinary(e)) // somewhat randomly restrict to plain literals
                 {
                     if (compiler.getSourceManager().isMacroArgExpansion(l)
                         && Lexer::getImmediateMacroName(l, compiler.getSourceManager(),
@@ -275,9 +266,10 @@ private:
     bool isFromCIncludeFile(SourceLocation spellingLocation) const
     {
         return !compiler.getSourceManager().isInMainFile(spellingLocation)
-               && (StringRef(
-                       compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename())
-                       .endswith(".h"));
+               && compat::ends_with(StringRef(compiler.getSourceManager()
+                                                  .getPresumedLoc(spellingLocation)
+                                                  .getFilename()),
+                                    ".h");
     }
 
     bool isSharedCAndCppCode(SourceLocation location) const
diff --git a/compilerplugins/clang/cow_wrapper.cxx b/compilerplugins/clang/cow_wrapper.cxx
new file mode 100644
index 000000000000..073a4fa9fb89
--- /dev/null
+++ b/compilerplugins/clang/cow_wrapper.cxx
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include <unordered_set>
+#include "plugin.hxx"
+#include "check.hxx"
+
+/*
+Look for places where we are using cow_wrapper, but we are calling a const method on the impl object
+with a non-const pointer, which means we will unnecessarily trigger a copy.
+*/
+
+namespace
+{
+class Cow_Wrapper : public loplugin::FilteringPlugin<Cow_Wrapper>
+{
+public:
+    explicit Cow_Wrapper(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool shouldVisitTemplateInstantiations() const { return true; }
+
+    virtual bool preRun() override { return true; }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXMemberCallExpr(const CXXMemberCallExpr*);
+};
+
+bool Cow_Wrapper::VisitCXXMemberCallExpr(const CXXMemberCallExpr* memberCallExpr)
+{
+    if (ignoreLocation(memberCallExpr))
+        return true;
+    auto methodDecl = memberCallExpr->getMethodDecl();
+    if (!methodDecl || !methodDecl->isConst())
+        return true;
+
+    auto expr = memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit()->IgnoreParens();
+    auto operatorCallExpr = dyn_cast<CXXOperatorCallExpr>(expr);
+
+    if (operatorCallExpr && operatorCallExpr->getOperator() == OO_Arrow)
+    {
+        auto arrowMethodDecl = dyn_cast_or_null<CXXMethodDecl>(operatorCallExpr->getDirectCallee());
+        if (!arrowMethodDecl)
+            return true;
+        if (arrowMethodDecl->isConst())
+            return true;
+        auto dc = loplugin::DeclCheck(arrowMethodDecl->getParent())
+                      .Class("cow_wrapper")
+                      .Namespace("o3tl")
+                      .GlobalNamespace();
+        if (!dc)
+            return true;
+    }
+    else if (operatorCallExpr)
+    {
+        auto methodDecl2 = dyn_cast_or_null<CXXMethodDecl>(operatorCallExpr->getDirectCallee());
+        if (!methodDecl2)
+            return true;
+        auto dc = loplugin::DeclCheck(methodDecl2->getParent())
+                      .Class("cow_wrapper")
+                      .Namespace("o3tl")
+                      .GlobalNamespace();
+        if (!dc)
+            return true;
+    }
+    else if (auto callExpr = dyn_cast<CallExpr>(expr))
+    {
+        if (!isa<ImplicitCastExpr>(callExpr->getCallee())) // std::as_const shows up as this
+            return true;
+        if (callExpr->getNumArgs() < 1)
+            return true;
+        auto arg0 = dyn_cast<CXXOperatorCallExpr>(callExpr->getArg(0));
+        if (!arg0)
+            return true;
+        auto starMethodDecl = dyn_cast_or_null<CXXMethodDecl>(arg0->getDirectCallee());
+        if (!starMethodDecl)
+            return true;
+        auto dc = loplugin::DeclCheck(starMethodDecl->getParent())
+                      .Class("cow_wrapper")
+                      .Namespace("o3tl")
+                      .GlobalNamespace();
+        if (!dc)
+            return true;
+    }
+    else
+        return true;
+
+    report(DiagnosticsEngine::Warning,
+           "calling const method on o3tl::cow_wrapper impl class via non-const pointer, rather use "
+           "std::as_const to prevent triggering an unnecessary copy",
+           memberCallExpr->getBeginLoc())
+        << memberCallExpr->getSourceRange();
+    return true;
+}
+
+loplugin::Plugin::Registration<Cow_Wrapper> cow_wrapper("cow_wrapper", true);
+
+} // namespace
+
+#endif // LO_CLANG_SHARED_PLUGINS
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/cppunitassertequals.cxx b/compilerplugins/clang/cppunitassertequals.cxx
index 3647540baf8a..df50f57537bc 100644
--- a/compilerplugins/clang/cppunitassertequals.cxx
+++ b/compilerplugins/clang/cppunitassertequals.cxx
@@ -132,6 +132,71 @@ bool CppunitAssertEquals::VisitCallExpr(const CallExpr* callExpr)
                 callExpr->getExprLoc())
                 << callExpr->getSourceRange();
     }
+    if (loplugin::DeclCheck(decl).Function("assertDoubleEquals").
+             Namespace("CppUnit").GlobalNamespace())
+    {
+        // can happen in template test code that both params are compile time constants
+        if (isCompileTimeConstant(callExpr->getArg(0)))
+            return true;
+        if (isCompileTimeConstant(callExpr->getArg(1)))
+            report(
+                DiagnosticsEngine::Warning,
+                "CPPUNIT_ASSERT_DOUBLES_EQUALS parameters look switched, expected value should be first param",
+                callExpr->getExprLoc())
+                << callExpr->getSourceRange();
+    }
+    if (loplugin::DeclCheck(decl).Function("assertLess").
+             Namespace("CppUnit").GlobalNamespace())
+    {
+        // can happen in template test code that both params are compile time constants
+        if (isCompileTimeConstant(callExpr->getArg(0)))
+            return true;
+        if (isCompileTimeConstant(callExpr->getArg(1)))
+            report(
+                DiagnosticsEngine::Warning,
+                "CPPUNIT_ASSERT_LESS parameters look switched, expected value should be first param",
+                callExpr->getExprLoc())
+                << callExpr->getSourceRange();
+    }
+    if (loplugin::DeclCheck(decl).Function("assertLessEqual").
+             Namespace("CppUnit").GlobalNamespace())
+    {
+        // can happen in template test code that both params are compile time constants
+        if (isCompileTimeConstant(callExpr->getArg(0)))
+            return true;
+        if (isCompileTimeConstant(callExpr->getArg(1)))
+            report(
+                DiagnosticsEngine::Warning,
+                "CPPUNIT_ASSERT_LESSEQUAL parameters look switched, expected value should be first param",
+                callExpr->getExprLoc())
+                << callExpr->getSourceRange();
+    }
+    if (loplugin::DeclCheck(decl).Function("assertGreater").
+             Namespace("CppUnit").GlobalNamespace())
+    {
+        // can happen in template test code that both params are compile time constants
+        if (isCompileTimeConstant(callExpr->getArg(0)))
+            return true;
+        if (isCompileTimeConstant(callExpr->getArg(1)))
+            report(
+                DiagnosticsEngine::Warning,
+                "CPPUNIT_ASSERT_GREATER parameters look switched, expected value should be first param",
+                callExpr->getExprLoc())
+                << callExpr->getSourceRange();
+    }
+    if (loplugin::DeclCheck(decl).Function("assertGreaterEqual").
+             Namespace("CppUnit").GlobalNamespace())
+    {
+        // can happen in template test code that both params are compile time constants
+        if (isCompileTimeConstant(callExpr->getArg(0)))
+            return true;
+        if (isCompileTimeConstant(callExpr->getArg(1)))
+            report(
+                DiagnosticsEngine::Warning,
+                "CPPUNIT_ASSERT_GREATEREQUAL parameters look switched, expected value should be first param",
+                callExpr->getExprLoc())
+                << callExpr->getSourceRange();
+    }
     return true;
 }
 
@@ -167,7 +232,7 @@ Expr const * stripConstructor(Expr const * expr) {
 
 bool CppunitAssertEquals::isCompileTimeConstant(Expr const * expr)
 {
-    if (expr->isIntegerConstantExpr(compiler.getASTContext()))
+    if (expr->isCXX11ConstantExpr(compiler.getASTContext()))
         return true;
     // is string literal ?
     expr = expr->IgnoreParenImpCasts();
@@ -191,7 +256,6 @@ void CppunitAssertEquals::checkExpr(
             reportEquals(range, name, op == BO_NE, e->getLHS(), e->getRHS());
             return;
         }
-#if 0 // TODO: enable later
         if ((!negated && op == BO_LAnd) || (negated && op == BO_LOr)) {
             report(
                 DiagnosticsEngine::Warning,
@@ -199,7 +263,6 @@ void CppunitAssertEquals::checkExpr(
                 << name << range;
             return;
         }
-#endif
         return;
     }
     if (auto const e = dyn_cast<CXXOperatorCallExpr>(expr)) {
@@ -225,11 +288,12 @@ void CppunitAssertEquals::reportEquals(
     report(
         DiagnosticsEngine::Warning,
         ("rather call"
-         " %select{CPPUNIT_ASSERT_EQUAL|CPPUNIT_ASSERT_EQUAL_MESSAGE}0 (or"
-         " rewrite as an explicit operator %select{==|!=}1 call when the"
+         " %select{CPPUNIT_ASSERT_EQUAL|CPPUNIT_ASSERT_EQUAL_MESSAGE}0 when comparing %1 and %2 (or"
+         " rewrite as an explicit operator %select{==|!=}3 call when the"
          " operator itself is the topic)"),
         range.getBegin())
-        << (name == "CPPUNIT_ASSERT_MESSAGE") << negative << range;
+        << (name == "CPPUNIT_ASSERT_MESSAGE") << lhs->IgnoreImpCasts()->getType()
+        << rhs->IgnoreImpCasts()->getType() << negative << range;
 }
 
 loplugin::Plugin::Registration< CppunitAssertEquals > cppunitassertequals("cppunitassertequals");
diff --git a/compilerplugins/clang/crosscast.cxx b/compilerplugins/clang/crosscast.cxx
new file mode 100644
index 000000000000..293b8646d152
--- /dev/null
+++ b/compilerplugins/clang/crosscast.cxx
@@ -0,0 +1,166 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// Find uses of dynamic_cast that cast between unrelated classes, which is suspicious and might
+// indicate a bug.  The heuristic used to consider two classes unrelated is that neither derives
+// from the other (directly or indirectly) and they do not both virtually derive (directly or
+// indirectly) from a common third class.  Additionally, class definitions can be attributed with
+// SAL_LOPLUGIN_ANNOTATE("crosscast") (from sal/types.h) to suppress false warnings about known-good
+// cases casting from or to such a class.
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <set>
+
+#include "compat.hxx"
+#include "plugin.hxx"
+
+namespace
+{
+void computeVirtualBases(CXXRecordDecl const* decl, std::set<CXXRecordDecl const*>* vbases)
+{
+    assert(vbases != nullptr);
+    for (auto const& i : decl->bases())
+    {
+        auto const d = i.getType()->getAsCXXRecordDecl();
+        if (d == nullptr)
+        {
+            continue;
+        }
+        if (i.isVirtual())
+        {
+            if (!vbases->insert(d->getCanonicalDecl()).second)
+            {
+                // As we track the already computed virtual bases in vbases anyway, we can cheaply
+                // optimize the case where we see a virtual base again, even though we don't bother
+                // to optimize the case where we see a non-virtual base multiple times:
+                continue;
+            }
+        }
+        computeVirtualBases(d, vbases);
+    }
+}
+
+bool compareVirtualBases(CXXRecordDecl const* decl, std::set<CXXRecordDecl const*>& vbases)
+{
+    for (auto const& i : decl->bases())
+    {
+        auto const d = i.getType()->getAsCXXRecordDecl();
+        if (d == nullptr)
+        {
+            continue;
+        }
+        if (i.isVirtual() && vbases.count(d->getCanonicalDecl()) == 1)
+        {
+            return true;
+        }
+        if (compareVirtualBases(d, vbases))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool haveCommonVirtualBase(CXXRecordDecl const* decl1, CXXRecordDecl const* decl2)
+{
+    std::set<CXXRecordDecl const*> vbases;
+    computeVirtualBases(decl1, &vbases);
+    return compareVirtualBases(decl2, vbases);
+}
+
+bool isAllowedInCrossCasts(CXXRecordDecl const* decl)
+{
+    auto const def = decl->getDefinition();
+    if (def == nullptr)
+    {
+        return false;
+    }
+    for (auto const attr : def->specific_attrs<AnnotateAttr>())
+    {
+        if (attr->getAnnotation() == "loplugin:crosscast")
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+class CrossCast final : public loplugin::FilteringPlugin<CrossCast>
+{
+public:
+    explicit CrossCast(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitCXXDynamicCastExpr(CXXDynamicCastExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const t2 = expr->getTypeAsWritten();
+        if (t2->isVoidPointerType())
+        {
+            return true;
+        }
+        auto const d2 = t2->getPointeeCXXRecordDecl();
+        if (d2 == nullptr)
+        {
+            return true;
+        }
+        auto const t1 = compat::getSubExprAsWritten(expr)->getType();
+        auto t1a = t1;
+        if (auto const t = t1a->getAs<clang::PointerType>())
+        {
+            t1a = t->getPointeeType();
+        }
+        auto const d1 = t1a->getAsCXXRecordDecl();
+        if (d1 == nullptr)
+        {
+            return true;
+        }
+        if (d1->getCanonicalDecl() == d2->getCanonicalDecl() || d1->isDerivedFrom(d2)
+            || d2->isDerivedFrom(d1) || haveCommonVirtualBase(d1, d2))
+        {
+            return true;
+        }
+        if (isAllowedInCrossCasts(d1) || isAllowedInCrossCasts(d2))
+        {
+            return true;
+        }
+        if (suppressWarningAt(expr->getBeginLoc()))
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning, "suspicious dynamic cross cast from %0 to %1",
+               expr->getExprLoc())
+            << t1 << t2 << expr->getSourceRange();
+        return true;
+    }
+};
+
+loplugin::Plugin::Registration<CrossCast> crosscast("crosscast");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx
index 7fa2ce0ae1b0..a516144a6141 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -161,7 +161,7 @@ bool canBeUsedForFunctionalCast(TypeSourceInfo const * info) {
         return true;
     }
     if (auto const t = dyn_cast<ElaboratedType>(type)) {
-        return t->getKeyword() == ETK_None;
+        return t->getKeyword() == compat::ElaboratedTypeKeyword::None;
     }
     return false;
 }
@@ -240,7 +240,7 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * expr) {
     if( expr->getCastKind() == CK_ToVoid ) {
         return true;
     }
-    if (isSharedCAndCppCode(compat::getBeginLoc(expr))) {
+    if (isSharedCAndCppCode(expr->getBeginLoc())) {
         return true;
     }
     char const * perf = nullptr;
@@ -319,10 +319,9 @@ bool CStyleCast::isConstCast(QualType from, QualType to) {
 
 bool CStyleCast::isFromCIncludeFile(SourceLocation spellingLocation) const {
     return !compiler.getSourceManager().isInMainFile(spellingLocation)
-        && (StringRef(
-                compiler.getSourceManager().getPresumedLoc(spellingLocation)
-                .getFilename())
-            .endswith(".h"));
+        && compat::ends_with(
+            StringRef(compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename()),
+            ".h");
 }
 
 bool CStyleCast::isSharedCAndCppCode(SourceLocation location) const {
@@ -346,7 +345,7 @@ bool CStyleCast::isLastTokenOfImmediateMacroBodyExpansion(
     auto const spell = compiler.getSourceManager().getSpellingLoc(loc);
     auto name = Lexer::getImmediateMacroName(
         loc, compiler.getSourceManager(), compiler.getLangOpts());
-    while (name.startswith("\\\n")) {
+    while (compat::starts_with(name, "\\\n")) {
         name = name.drop_front(2);
         while (!name.empty()
                && (name.front() == ' ' || name.front() == '\t' || name.front() == '\n'
@@ -416,8 +415,8 @@ bool CStyleCast::rewriteArithmeticCast(CStyleCastExpr const * expr, char const *
         firstBegin = compiler.getSourceManager().getSpellingLoc(firstBegin);
         secondBegin = compiler.getSourceManager().getSpellingLoc(secondBegin);
     }
-    auto third = compat::getBeginLoc(sub);
-    auto fourth = compat::getEndLoc(sub);
+    auto third = sub->getBeginLoc();
+    auto fourth = sub->getEndLoc();
     bool macro = false;
     // Ensure that
     //
diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx
index 7a5bf4bc3e87..93f65de66726 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -15,6 +15,7 @@
 #include <set>
 
 #include "plugin.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 
 /**
@@ -47,7 +48,7 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
         return true;
     }
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(fieldDecl)));
+        compiler.getSourceManager().getSpellingLoc(fieldDecl->getBeginLoc()));
 
     // FIXME complex stuff to fix later
 
@@ -99,13 +100,13 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
             sPath += baseCXXRecordDecl->getNameAsString();
             report(DiagnosticsEngine::Warning,
                     "data member %0 is shadowing member in superclass, through inheritance path %1",
-                    compat::getBeginLoc(fieldDecl))
+                    fieldDecl->getBeginLoc())
                 << fieldDecl->getName()
                 << sPath
                 << fieldDecl->getSourceRange();
             report(DiagnosticsEngine::Note,
                     "superclass member here",
-                    compat::getBeginLoc(baseFieldDecl))
+                    baseFieldDecl->getBeginLoc())
                 << baseFieldDecl->getSourceRange();
         }
         return false;
diff --git a/compilerplugins/clang/dbgunhandledexception.cxx b/compilerplugins/clang/dbgunhandledexception.cxx
index d1406c18a9dd..e6c1f157cc9d 100644
--- a/compilerplugins/clang/dbgunhandledexception.cxx
+++ b/compilerplugins/clang/dbgunhandledexception.cxx
@@ -88,7 +88,7 @@ bool DbgUnhandledException::VisitCallExpr(const CallExpr* call)
     if (currCatchStmt.empty())
     {
         report(DiagnosticsEngine::Warning, "DBG_UNHANDLED_EXCEPTION outside catch block",
-               compat::getBeginLoc(call));
+               call->getBeginLoc());
         return true;
     }
     auto catchBlock = dyn_cast<CompoundStmt>(currCatchStmt.top()->getHandlerBlock());
@@ -96,14 +96,14 @@ bool DbgUnhandledException::VisitCallExpr(const CallExpr* call)
     {
         report(DiagnosticsEngine::Warning,
                "something wrong with DBG_UNHANDLED_EXCEPTION, no CompoundStmt?",
-               compat::getBeginLoc(call));
+               call->getBeginLoc());
         return true;
     }
     if (catchBlock->size() < 1)
     {
         report(DiagnosticsEngine::Warning,
                "something wrong with DBG_UNHANDLED_EXCEPTION, CompoundStmt size == 0?",
-               compat::getBeginLoc(call));
+               call->getBeginLoc());
         return true;
     }
 
@@ -114,7 +114,7 @@ bool DbgUnhandledException::VisitCallExpr(const CallExpr* call)
     {
         report(DiagnosticsEngine::Warning,
                "DBG_UNHANDLED_EXCEPTION must be first statement in catch block",
-               compat::getBeginLoc(call));
+               call->getBeginLoc());
     }
     return true;
 }
diff --git a/compilerplugins/clang/derefnullptr.cxx b/compilerplugins/clang/derefnullptr.cxx
index b1c9d6da6747..35c4c7adcf6c 100644
--- a/compilerplugins/clang/derefnullptr.cxx
+++ b/compilerplugins/clang/derefnullptr.cxx
@@ -37,7 +37,7 @@ bool DerefNullPtr::VisitUnaryOperator(UnaryOperator const * op) {
     {
         report(
             DiagnosticsEngine::Warning, "null pointer dereference",
-            compat::getBeginLoc(op))
+            op->getBeginLoc())
             << op->getSourceRange();
     }
     return true;
diff --git a/compilerplugins/clang/dyncastvisibility.cxx b/compilerplugins/clang/dyncastvisibility.cxx
index 3c54f7cf8929..7259374c98ea 100644
--- a/compilerplugins/clang/dyncastvisibility.cxx
+++ b/compilerplugins/clang/dyncastvisibility.cxx
@@ -15,6 +15,8 @@
 #include <set>
 #include <string>
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 
 namespace {
diff --git a/compilerplugins/clang/dynexcspec.cxx b/compilerplugins/clang/dynexcspec.cxx
index af733ec4f10f..483230e8cf31 100644
--- a/compilerplugins/clang/dynexcspec.cxx
+++ b/compilerplugins/clang/dynexcspec.cxx
@@ -13,6 +13,7 @@
 
 #include "clang/AST/Comment.h"
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 // Remove dynamic exception specifications.  See the mail thread starting at
@@ -79,7 +80,7 @@ public:
                 << decl->getSourceRange();
         }
         if (rewriter != nullptr) {
-            if (!(decl->isDefined() || decl->isPure())) {
+            if (!(decl->isDefined() || compat::isPureVirtual(decl))) {
                 return true;
             }
             if (auto m = dyn_cast<CXXMethodDecl>(decl)) {
@@ -115,7 +116,7 @@ public:
                         auto s = StringRef(
                             compiler.getSourceManager().getCharacterData(prev),
                             n);
-                        while (s.startswith("\\\n")) {
+                        while (compat::starts_with(s, "\\\n")) {
                             s = s.drop_front(2);
                             while (!s.empty()
                                    && (s.front() == ' ' || s.front() == '\t'
@@ -126,7 +127,7 @@ public:
                             }
                         }
                         if (!s.empty() && s != "\\") {
-                            if (s.startswith("//")) {
+                            if (compat::starts_with(s, "//")) {
                                 beg = source.getBegin();
                             }
                             break;
diff --git a/compilerplugins/clang/elidestringvar.cxx b/compilerplugins/clang/elidestringvar.cxx
index 412fa8cb09db..c14eaf027b0f 100644
--- a/compilerplugins/clang/elidestringvar.cxx
+++ b/compilerplugins/clang/elidestringvar.cxx
@@ -62,8 +62,8 @@ public:
             {
                 continue;
             }
-            if (containsPreprocessingConditionalInclusion(SourceRange(
-                    compat::getBeginLoc(var.first), compat::getEndLoc(*var.second.singleUse))))
+            if (containsPreprocessingConditionalInclusion(
+                    SourceRange(var.first->getBeginLoc(), (*var.second.singleUse)->getEndLoc())))
             {
                 // This is not perfect, as additional uses can be hidden in conditional blocks that
                 // only start after the (would-be) single use (as was the case in
@@ -446,7 +446,7 @@ private:
         {
         }
         Stmt const* innermostLoop;
-        llvm::Optional<Expr const*> singleUse;
+        compat::optional<Expr const*> singleUse;
     };
 
     std::stack<Stmt const*> innermostLoop_;
diff --git a/compilerplugins/clang/empty.cxx b/compilerplugins/clang/empty.cxx
index c3cc86520f47..d5129d29dd3c 100644
--- a/compilerplugins/clang/empty.cxx
+++ b/compilerplugins/clang/empty.cxx
@@ -12,7 +12,6 @@
 #include <cassert>
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 // Warn about checks whether a container is empty done via an (expensive) call to obtain the
@@ -77,7 +76,7 @@ private:
         {
             return;
         }
-        auto const val = compat::getIntegerConstantExpr(rhs, compiler.getASTContext());
+        auto const val = rhs->getIntegerConstantExpr(compiler.getASTContext());
         if (!val)
         {
             return;
diff --git a/compilerplugins/clang/emptyif.cxx b/compilerplugins/clang/emptyif.cxx
index ef7eac50d048..5412188f8d52 100644
--- a/compilerplugins/clang/emptyif.cxx
+++ b/compilerplugins/clang/emptyif.cxx
@@ -71,15 +71,14 @@ bool EmptyIf::VisitIfStmt(IfStmt const* ifStmt)
 
     if (ifStmt->getElse() && empty(ifStmt->getElse()) && !ContainsComment(ifStmt->getElse()))
     {
-        report(DiagnosticsEngine::Warning, "empty else body",
-               compat::getBeginLoc(ifStmt->getElse()))
+        report(DiagnosticsEngine::Warning, "empty else body", ifStmt->getElse()->getBeginLoc())
             << ifStmt->getElse()->getSourceRange();
         return true;
     }
 
     if (!ifStmt->getElse() && empty(ifStmt->getThen()) && !ContainsComment(ifStmt->getThen()))
     {
-        report(DiagnosticsEngine::Warning, "empty if body", compat::getBeginLoc(ifStmt))
+        report(DiagnosticsEngine::Warning, "empty if body", ifStmt->getBeginLoc())
             << ifStmt->getSourceRange();
     }
 
diff --git a/compilerplugins/clang/expandablemethods.cxx b/compilerplugins/clang/expandablemethods.cxx
index d40dadd90247..825c09705dd5 100644
--- a/compilerplugins/clang/expandablemethods.cxx
+++ b/compilerplugins/clang/expandablemethods.cxx
@@ -17,8 +17,9 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
-#include "compat.hxx"
 
 /**
  Find methods that are only called from inside their own class, and are only called from one spot.
@@ -64,6 +65,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -114,10 +117,6 @@ MyFuncInfo ExpandableMethods::niceName(const FunctionDecl* functionDecl)
 {
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 
@@ -270,7 +269,7 @@ void ExpandableMethods::functionTouchedFromExpr( const FunctionDecl* calleeFunct
         return;
     }
 
-    calledFromSet.emplace(toString(compat::getBeginLoc(expr)), niceName(canonicalFunctionDecl));
+    calledFromSet.emplace(toString(expr->getBeginLoc()), niceName(canonicalFunctionDecl));
 
     if (const UnaryOperator* unaryOp = dyn_cast_or_null<UnaryOperator>(getParentStmt(expr))) {
         if (unaryOp->getOpcode() == UO_AddrOf) {
diff --git a/compilerplugins/clang/expandablemethods.py b/compilerplugins/clang/expandablemethods.py
index 0fa61747d368..707215f96828 100755
--- a/compilerplugins/clang/expandablemethods.py
+++ b/compilerplugins/clang/expandablemethods.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import sys
 import re
 import io
 
diff --git a/compilerplugins/clang/expressionalwayszero.cxx b/compilerplugins/clang/expressionalwayszero.cxx
index 24e7287615ba..f741d30c426b 100644
--- a/compilerplugins/clang/expressionalwayszero.cxx
+++ b/compilerplugins/clang/expressionalwayszero.cxx
@@ -72,7 +72,7 @@ bool ExpressionAlwaysZero::VisitBinaryOperator(BinaryOperator const* binaryOpera
 {
     if (ignoreLocation(binaryOperator))
         return true;
-    if (compat::getBeginLoc(binaryOperator).isMacroID())
+    if (binaryOperator->getBeginLoc().isMacroID())
         return true;
 
     auto op = binaryOperator->getOpcode();
@@ -90,9 +90,10 @@ bool ExpressionAlwaysZero::VisitBinaryOperator(BinaryOperator const* binaryOpera
     else
         return true;
     report(DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1",
-           compat::getBeginLoc(binaryOperator))
-        << (lhsValue ? lhsValue->toString(10) : "unknown")
-        << (rhsValue ? rhsValue->toString(10) : "unknown") << binaryOperator->getSourceRange();
+           binaryOperator->getBeginLoc())
+        << (lhsValue ? compat::toString(*lhsValue, 10) : "unknown")
+        << (rhsValue ? compat::toString(*rhsValue, 10) : "unknown")
+        << binaryOperator->getSourceRange();
     return true;
 }
 
@@ -100,7 +101,7 @@ bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* c
 {
     if (ignoreLocation(cxxOperatorCallExpr))
         return true;
-    if (compat::getBeginLoc(cxxOperatorCallExpr).isMacroID())
+    if (cxxOperatorCallExpr->getBeginLoc().isMacroID())
         return true;
 
     auto op = cxxOperatorCallExpr->getOperator();
@@ -120,9 +121,10 @@ bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* c
     else
         return true;
     report(DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1",
-           compat::getBeginLoc(cxxOperatorCallExpr))
-        << (lhsValue ? lhsValue->toString(10) : "unknown")
-        << (rhsValue ? rhsValue->toString(10) : "unknown") << cxxOperatorCallExpr->getSourceRange();
+           cxxOperatorCallExpr->getBeginLoc())
+        << (lhsValue ? compat::toString(*lhsValue, 10) : "unknown")
+        << (rhsValue ? compat::toString(*rhsValue, 10) : "unknown")
+        << cxxOperatorCallExpr->getSourceRange();
     return true;
 }
 
diff --git a/compilerplugins/clang/external.cxx b/compilerplugins/clang/external.cxx
index e3bc67f19c46..8c8733553907 100644
--- a/compilerplugins/clang/external.cxx
+++ b/compilerplugins/clang/external.cxx
@@ -17,6 +17,7 @@
 #include "clang/Sema/SemaDiagnostic.h"
 
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace
@@ -77,7 +78,8 @@ bool mentions(QualType type1, QualType type2)
     }
     if (auto const t2 = t1->getAs<TemplateSpecializationType>())
     {
-        for (auto a = t2->begin(); a != t2->end(); ++a)
+        auto const args = t2->template_arguments();
+        for (auto a = args.begin(); a != args.end(); ++a)
         {
             if (a->getKind() != TemplateArgument::Type)
             {
@@ -467,7 +469,7 @@ private:
         {
             return true;
         }
-        if (decl->getLinkageInternal() < ModuleLinkage)
+        if (decl->getLinkageInternal() < compat::Linkage::Module)
         {
             return true;
         }
diff --git a/compilerplugins/clang/externandnotdefined.cxx b/compilerplugins/clang/externandnotdefined.cxx
index 5d65579a6af1..8b04670b99bb 100644
--- a/compilerplugins/clang/externandnotdefined.cxx
+++ b/compilerplugins/clang/externandnotdefined.cxx
@@ -11,6 +11,7 @@
 
 #include <string>
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 // Having an extern prototype for a method in a module and not actually declaring that method is dodgy.
@@ -33,9 +34,9 @@ bool ExternAndNotDefined::VisitFunctionDecl(const FunctionDecl * functionDecl) {
     if (ignoreLocation(functionDecl)) {
         return true;
     }
-    if (functionDecl->isDefined() || functionDecl->isPure()
+    if (functionDecl->isDefined() || compat::isPureVirtual(functionDecl)
       || (functionDecl->getLinkageAndVisibility().getLinkage()
-          != ExternalLinkage)) {
+          != compat::Linkage::External)) {
         return true;
     }
     //TODO, filtering out anything template for now:
@@ -59,11 +60,6 @@ bool ExternAndNotDefined::VisitFunctionDecl(const FunctionDecl * functionDecl) {
     {
         return true;
     }
-    StringRef fileName { getFilenameOfLocation(functionDecl->getLocation()) };
-    // the filters use some kind of dynamic loading stunt
-    if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/filter/qa/")) {
-        return true;
-    }
     report(
         DiagnosticsEngine::Warning,
         "extern prototype in main file without definition",
diff --git a/compilerplugins/clang/faileddyncast.cxx b/compilerplugins/clang/faileddyncast.cxx
index 03d4feb48550..078d5c884b27 100644
--- a/compilerplugins/clang/faileddyncast.cxx
+++ b/compilerplugins/clang/faileddyncast.cxx
@@ -122,7 +122,7 @@ bool FailedDynCast::VisitCXXDynamicCastExpr(CXXDynamicCastExpr const * expr) {
     if (isAlwaysNull(expr)) {
         report(
             DiagnosticsEngine::Warning,
-            "dynamic_cast from %0 to %1 always fails", compat::getBeginLoc(expr))
+            "dynamic_cast from %0 to %1 always fails", expr->getBeginLoc())
             << expr->getSubExpr()->getType() << expr->getType()
             << expr->getSourceRange();
     }
diff --git a/compilerplugins/clang/fakebool.cxx b/compilerplugins/clang/fakebool.cxx
index 277dd915bf0d..274b9ef3d729 100644
--- a/compilerplugins/clang/fakebool.cxx
+++ b/compilerplugins/clang/fakebool.cxx
@@ -16,6 +16,8 @@
 #include "clang/AST/Attr.h"
 #include "clang/Basic/Builtins.h"
 
+#include "config_clang.h"
+
 #include "check.hxx"
 #include "compat.hxx"
 #include "functionaddress.hxx"
@@ -212,8 +214,6 @@ public:
 
     bool VisitValueDecl(ValueDecl const * decl);
 
-    bool TraverseStaticAssertDecl(StaticAssertDecl * decl);
-
     bool TraverseLinkageSpecDecl(LinkageSpecDecl * decl);
 
 private:
@@ -221,8 +221,6 @@ private:
 
     bool isSharedCAndCppCode(SourceLocation location) const;
 
-    bool isInSpecialMainFile(SourceLocation spellingLocation) const;
-
     bool rewrite(SourceLocation location, FakeBoolKind kind);
 
     std::map<VarDecl const *, FakeBoolKind> varDecls_;
@@ -237,7 +235,7 @@ void FakeBool::run() {
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
         for (auto const & dcl: varDecls_) {
             auto const decl = dcl.first; auto const fbk = dcl.second;
-            SourceLocation loc { compat::getBeginLoc(decl) };
+            SourceLocation loc { decl->getBeginLoc() };
             TypeSourceInfo * tsi = decl->getTypeSourceInfo();
             if (tsi != nullptr) {
                 SourceLocation l {
@@ -269,7 +267,7 @@ void FakeBool::run() {
                     }
                 }
             }
-            if (!rewrite(loc, fbk)) {
+            if (!(suppressWarningAt(loc) || rewrite(loc, fbk))) {
                 report(
                     DiagnosticsEngine::Warning,
                     "VarDecl, use \"bool\" instead of %0", loc)
@@ -279,7 +277,7 @@ void FakeBool::run() {
         }
         for (auto const & dcl: fieldDecls_) {
             auto const decl = dcl.first; auto const fbk = dcl.second;
-            SourceLocation loc { compat::getBeginLoc(decl) };
+            SourceLocation loc { decl->getBeginLoc() };
             TypeSourceInfo * tsi = decl->getTypeSourceInfo();
             if (tsi != nullptr) {
                 SourceLocation l {
@@ -311,7 +309,7 @@ void FakeBool::run() {
                     }
                 }
             }
-            if (!rewrite(loc, fbk)) {
+            if (!(suppressWarningAt(loc) || rewrite(loc, fbk))) {
                 report(
                     DiagnosticsEngine::Warning,
                     "FieldDecl, use \"bool\" instead of %0", loc)
@@ -325,7 +323,7 @@ void FakeBool::run() {
             if (ignoredFns.find(f) != ignoredFns.end()) {
                 continue;
             }
-            SourceLocation loc { compat::getBeginLoc(decl) };
+            SourceLocation loc { decl->getBeginLoc() };
             TypeSourceInfo * tsi = decl->getTypeSourceInfo();
             if (tsi != nullptr) {
                 SourceLocation l {
@@ -376,7 +374,7 @@ void FakeBool::run() {
                            dyn_cast<FunctionDecl>(
                                decl->getDeclContext())
                            ->getNameInfo().getLoc()))
-                   || f->isDefined() || f->isPure())
+                   || f->isDefined() || compat::isPureVirtual(f))
                   && k != OverrideKind::MAYBE && rewrite(loc, fbk)))
             {
                 report(
@@ -399,7 +397,7 @@ void FakeBool::run() {
             if (ignoredFns.find(f) != ignoredFns.end()) {
                 continue;
             }
-            SourceLocation loc { compat::getBeginLoc(decl) };
+            SourceLocation loc { decl->getBeginLoc() };
             SourceLocation l { compiler.getSourceManager().getExpansionLoc(
                 loc) };
             SourceLocation end { compiler.getSourceManager().getExpansionLoc(
@@ -427,7 +425,7 @@ void FakeBool::run() {
             if (!((compiler.getSourceManager().isInMainFile(
                        compiler.getSourceManager().getSpellingLoc(
                            decl->getNameInfo().getLoc()))
-                   || f->isDefined() || f->isPure())
+                   || f->isDefined() || compat::isPureVirtual(f))
                   && rewrite(loc, fbk)))
             {
                 report(
@@ -454,9 +452,10 @@ bool FakeBool::VisitUnaryOperator(UnaryOperator * op) {
     Expr const * e1 = op->getSubExpr()->IgnoreParenCasts();
     if (isFakeBool(e1->getType()) != FBK_No) {
         if (DeclRefExpr const * e2 = dyn_cast<DeclRefExpr>(e1)) {
-            VarDecl const * d = dyn_cast<VarDecl>(e2->getDecl());
-            if (d != nullptr) {
+            if (auto const d = dyn_cast<VarDecl>(e2->getDecl())) {
                 varDecls_.erase(d);
+            } else if (auto const d = dyn_cast<FieldDecl>(e2->getDecl())) {
+                fieldDecls_.erase(d);
             }
         } else if (auto const e3 = dyn_cast<MemberExpr>(e1)) {
             if (auto const d = dyn_cast<FieldDecl>(e3->getMemberDecl())) {
@@ -536,7 +535,7 @@ bool FakeBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
     }
     auto const k = isFakeBool(expr->getType());
     if (k != FBK_No) {
-        SourceLocation loc { compat::getBeginLoc(expr) };
+        SourceLocation loc { expr->getBeginLoc() };
         while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
             loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
         }
@@ -549,7 +548,7 @@ bool FakeBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
                 if (!isSharedCAndCppCode(callLoc)) {
                     SourceLocation argLoc;
                     if (compiler.getSourceManager().isMacroArgExpansion(
-                            compat::getBeginLoc(expr), &argLoc)
+                            expr->getBeginLoc(), &argLoc)
                         //TODO: check it's the complete (first) arg to the macro
                         && (Lexer::getImmediateMacroName(
                                 argLoc, compiler.getSourceManager(),
@@ -560,6 +559,9 @@ bool FakeBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
                         // arguments to CPPUNIT_ASSERT_EQUAL:
                         return true;
                     }
+                    if (suppressWarningAt(callLoc)) {
+                        return true;
+                    }
                     bool b = k == FBK_sal_Bool && name == "sal_True";
                     if (rewriter != nullptr) {
                         auto callSpellLoc = compiler.getSourceManager()
@@ -591,7 +593,7 @@ bool FakeBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
         report(
             DiagnosticsEngine::Warning,
             "CStyleCastExpr, suspicious cast from %0 to %1",
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << expr->getSubExpr()->IgnoreParenImpCasts()->getType()
             << expr->getType() << expr->getSourceRange();
     }
@@ -602,20 +604,16 @@ bool FakeBool::VisitCXXStaticCastExpr(CXXStaticCastExpr * expr) {
     if (ignoreLocation(expr)) {
         return true;
     }
-    auto const k = isFakeBool(expr->getType());
-    if (k == FBK_No) {
+    if (isFakeBool(expr->getType()) == FBK_No) {
         return true;
     }
-    if (k == FBK_sal_Bool
-        && isInSpecialMainFile(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr))))
-    {
+    if (suppressWarningAt(expr->getBeginLoc())) {
         return true;
     }
     report(
         DiagnosticsEngine::Warning,
         "CXXStaticCastExpr, suspicious cast from %0 to %1",
-        compat::getBeginLoc(expr))
+        expr->getBeginLoc())
         << expr->getSubExpr()->IgnoreParenImpCasts()->getType()
         << expr->getType() << expr->getSourceRange();
     return true;
@@ -629,7 +627,7 @@ bool FakeBool::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr * expr) {
         report(
             DiagnosticsEngine::Warning,
             "CXXFunctionalCastExpr, suspicious cast from %0 to %1",
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << expr->getSubExpr()->IgnoreParenImpCasts()->getType()
             << expr->getType() << expr->getSourceRange();
     }
@@ -644,7 +642,7 @@ bool FakeBool::VisitImplicitCastExpr(ImplicitCastExpr * expr) {
     if (isFakeBool(expr->getType()) == FBK_No) {
         return true;
     }
-    auto l = compat::getBeginLoc(expr);
+    auto l = expr->getBeginLoc();
     while (compiler.getSourceManager().isMacroArgExpansion(l)) {
         l = compiler.getSourceManager().getImmediateMacroCallerLoc(l);
     }
@@ -675,7 +673,7 @@ bool FakeBool::VisitImplicitCastExpr(ImplicitCastExpr * expr) {
     }
     report(
         DiagnosticsEngine::Warning, "conversion from %0 to %1",
-        compat::getBeginLoc(expr))
+        expr->getBeginLoc())
         << t << expr->getType() << expr->getSourceRange();
     return true;
 }
@@ -776,14 +774,7 @@ bool FakeBool::VisitVarDecl(VarDecl const * decl) {
     if (k == FBK_No) {
         return true;
     }
-    auto const loc = compat::getBeginLoc(decl);
-    if (k == FBK_sal_Bool
-        && isInSpecialMainFile(
-            compiler.getSourceManager().getSpellingLoc(loc)))
-    {
-        return true;
-    }
-    auto l = loc;
+    auto l = decl->getBeginLoc();
     while (compiler.getSourceManager().isMacroArgExpansion(l)) {
         l = compiler.getSourceManager().getImmediateMacroCallerLoc(l);
     }
@@ -814,12 +805,6 @@ bool FakeBool::VisitFieldDecl(FieldDecl const * decl) {
     if (!handler.isAllRelevantCodeDefined(decl)) {
         return true;
     }
-    if (k == FBK_sal_Bool
-        && isInSpecialMainFile(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(decl))))
-    {
-        return true;
-    }
     TagDecl const * td = dyn_cast<TagDecl>(decl->getDeclContext());
     if (td == nullptr) {
         //TODO: ObjCInterface
@@ -866,29 +851,16 @@ bool FakeBool::VisitValueDecl(ValueDecl const * decl) {
         return true;
     }
     auto const k = isFakeBool(decl->getType());
-    if (k != FBK_No && !rewrite(compat::getBeginLoc(decl), k)) {
+    if (k != FBK_No && !rewrite(decl->getBeginLoc(), k)) {
         report(
             DiagnosticsEngine::Warning,
             "ValueDecl, use \"bool\" instead of %0",
-            compat::getBeginLoc(decl))
+            decl->getBeginLoc())
             << decl->getType() << decl->getSourceRange();
     }
     return true;
 }
 
-bool FakeBool::TraverseStaticAssertDecl(StaticAssertDecl * decl) {
-    // Ignore special code like
-    //
-    //   static_cast<sal_Bool>(true) == sal_True
-    //
-    // inside static_assert in cppu/source/uno/check.cxx:
-    return
-        loplugin::isSamePathname(
-            getFilenameOfLocation(decl->getLocation()),
-            SRCDIR "/cppu/source/uno/check.cxx")
-        || RecursiveASTVisitor::TraverseStaticAssertDecl(decl);
-}
-
 bool FakeBool::TraverseLinkageSpecDecl(LinkageSpecDecl * decl) {
     assert(externCContexts_ != std::numeric_limits<unsigned int>::max()); //TODO
     ++externCContexts_;
@@ -900,10 +872,9 @@ bool FakeBool::TraverseLinkageSpecDecl(LinkageSpecDecl * decl) {
 
 bool FakeBool::isFromCIncludeFile(SourceLocation spellingLocation) const {
     return !compiler.getSourceManager().isInMainFile(spellingLocation)
-        && (StringRef(
-                compiler.getSourceManager().getPresumedLoc(spellingLocation)
-                .getFilename())
-            .endswith(".h"));
+        && compat::ends_with(
+            StringRef(compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename()),
+            ".h");
 }
 
 bool FakeBool::isSharedCAndCppCode(SourceLocation location) const {
@@ -916,16 +887,6 @@ bool FakeBool::isSharedCAndCppCode(SourceLocation location) const {
             || compiler.getSourceManager().isMacroBodyExpansion(location));
 }
 
-bool FakeBool::isInSpecialMainFile(SourceLocation spellingLocation) const {
-    if (!compiler.getSourceManager().isInMainFile(spellingLocation)) {
-        return false;
-    }
-    auto f = getFilenameOfLocation(spellingLocation);
-    return loplugin::isSamePathname(f, SRCDIR "/cppu/qa/test_any.cxx")
-        || loplugin::isSamePathname(f, SRCDIR "/cppu/source/uno/check.cxx");
-        // TODO: the offset checks
-}
-
 bool FakeBool::rewrite(SourceLocation location, FakeBoolKind kind) {
     if (rewriter != nullptr) {
         //TODO: "::sal_Bool" -> "bool", not "::bool"
diff --git a/compilerplugins/clang/fieldcanbelocal.cxx b/compilerplugins/clang/fieldcanbelocal.cxx
new file mode 100644
index 000000000000..9d4b60fd094b
--- /dev/null
+++ b/compilerplugins/clang/fieldcanbelocal.cxx
@@ -0,0 +1,464 @@
+/* -*- 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/.
+ */
+
+#if !defined _WIN32 //TODO, #include <sys/file.h>
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <unordered_set>
+#include <vector>
+#include <algorithm>
+#include <sys/file.h>
+#include <unistd.h>
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include "check.hxx"
+
+#include "clang/AST/ParentMapContext.h"
+
+/**
+ Look for fields on objects that can be local variables.
+ Not a particularly smart plugin, generates a lot of false positives, and requires review of the output.
+ Mostly looks for fields that are only accessed within a single method.
+*/
+
+namespace
+{
+struct MyFuncInfo
+{
+    std::string returnType;
+    std::string nameAndParams;
+    std::string sourceLocation;
+};
+
+struct MyFieldInfo
+{
+    std::string parentClass;
+    std::string fieldName;
+    std::string fieldType;
+    std::string sourceLocation;
+};
+
+// try to limit the voluminous output a little
+// if the value is nullptr, that indicates that we touched that field from more than one function
+static std::unordered_map<const FieldDecl*, const FunctionDecl*> touchedMap;
+
+class FieldCanBeLocal : public loplugin::FilteringPlugin<FieldCanBeLocal>
+{
+public:
+    explicit FieldCanBeLocal(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual void run() override;
+
+    bool shouldVisitTemplateInstantiations() const { return true; }
+    bool shouldVisitImplicitCode() const { return true; }
+
+    bool TraverseCXXConstructorDecl(CXXConstructorDecl*);
+    bool TraverseCXXMethodDecl(CXXMethodDecl*);
+    bool TraverseFunctionDecl(FunctionDecl*);
+
+    bool VisitMemberExpr(const MemberExpr*);
+    bool VisitDeclRefExpr(const DeclRefExpr*);
+    bool VisitInitListExpr(const InitListExpr*);
+    bool VisitCXXConstructorDecl(const CXXConstructorDecl*);
+
+private:
+    MyFieldInfo niceName(const FieldDecl*);
+    MyFuncInfo niceName(const FunctionDecl*);
+    std::string toString(SourceLocation loc);
+    void checkTouched(const FieldDecl* fieldDecl, const FunctionDecl*);
+    bool isSomeKindOfConstant(const Expr* arg);
+
+    RecordDecl* insideMoveOrCopyOrCloneDeclParent = nullptr;
+    RecordDecl* insideStreamOutputOperator = nullptr;
+    // For reasons I do not understand, parentFunctionDecl() is not reliable, so
+    // we store the parent function on the way down the AST.
+    FunctionDecl* insideFunctionDecl = nullptr;
+};
+
+void FieldCanBeLocal::run()
+{
+    handler.enableTreeWideAnalysisMode();
+
+    TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+    if (!isUnitTestMode())
+    {
+        // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
+        // writing to the same logfile
+        std::string output;
+        output.reserve(64 * 1024);
+        for (const auto& pair : touchedMap)
+        {
+            if (pair.first->getParent()->isLambda())
+                continue;
+            MyFieldInfo s = niceName(pair.first);
+            output += "definition:\t" + s.parentClass //
+                      + "\t" + s.fieldName //
+                      + "\t" + s.fieldType //
+                      + "\t" + s.sourceLocation //
+                      + "\n";
+            // we have to output a negative, in case, in some other file, it is touched only once
+            if (!pair.second)
+                output += "touched:\t" + s.parentClass //
+                          + "\t" + s.fieldName //
+                          + "\tNegative" //
+                          + "\tnowhere.cxx" //
+                          + "\n";
+            else
+            {
+                MyFuncInfo s2 = niceName(pair.second);
+                output += "touched:\t" + s.parentClass //
+                          + "\t" + s.fieldName //
+                          + "\t" + s2.returnType + " " + s2.nameAndParams //
+                          + "\t" + s2.sourceLocation //
+                          + "\n";
+            }
+        }
+        std::ofstream myfile;
+        myfile.open(WORKDIR "/loplugin.fieldcanbelocal.log", std::ios::app | std::ios::out);
+        myfile << output;
+        myfile.close();
+    }
+    else
+    {
+        //        for (const MyFieldInfo & s : readFromSet)
+        //            report(
+        //                DiagnosticsEngine::Warning,
+        //                "read %0",
+        //                s.parentRecord->getBeginLoc())
+        //                << s.fieldName;
+    }
+}
+
+MyFieldInfo FieldCanBeLocal::niceName(const FieldDecl* fieldDecl)
+{
+    MyFieldInfo aInfo;
+
+    const RecordDecl* recordDecl = fieldDecl->getParent();
+
+    if (const CXXRecordDecl* cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl))
+    {
+        if (cxxRecordDecl->getTemplateInstantiationPattern())
+            cxxRecordDecl = cxxRecordDecl->getTemplateInstantiationPattern();
+        aInfo.parentClass = cxxRecordDecl->getQualifiedNameAsString();
+    }
+    else
+    {
+        aInfo.parentClass = recordDecl->getQualifiedNameAsString();
+    }
+
+    aInfo.fieldName = fieldDecl->getNameAsString();
+    // sometimes the name (if it's an anonymous thing) contains the full path of the build folder, which we don't need
+    size_t idx = aInfo.fieldName.find(SRCDIR);
+    if (idx != std::string::npos)
+    {
+        aInfo.fieldName = aInfo.fieldName.replace(idx, strlen(SRCDIR), "");
+    }
+    aInfo.fieldType = fieldDecl->getType().getAsString();
+
+    SourceLocation expansionLoc
+        = compiler.getSourceManager().getExpansionLoc(fieldDecl->getLocation());
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    aInfo.sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
+
+    return aInfo;
+}
+
+MyFuncInfo FieldCanBeLocal::niceName(const FunctionDecl* functionDecl)
+{
+    if (functionDecl->getInstantiatedFromMemberFunction())
+        functionDecl = functionDecl->getInstantiatedFromMemberFunction();
+    else if (functionDecl->getTemplateInstantiationPattern())
+        functionDecl = functionDecl->getTemplateInstantiationPattern();
+
+    MyFuncInfo aInfo;
+    if (!isa<CXXConstructorDecl>(functionDecl))
+    {
+        aInfo.returnType = functionDecl->getReturnType().getCanonicalType().getAsString();
+    }
+    else
+    {
+        aInfo.returnType = "";
+    }
+
+    if (isa<CXXMethodDecl>(functionDecl))
+    {
+        const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
+        aInfo.nameAndParams += recordDecl->getQualifiedNameAsString();
+        aInfo.nameAndParams += "::";
+    }
+    aInfo.nameAndParams += functionDecl->getNameAsString() + "(";
+    bool bFirst = true;
+    for (const ParmVarDecl* pParmVarDecl : functionDecl->parameters())
+    {
+        if (bFirst)
+            bFirst = false;
+        else
+            aInfo.nameAndParams += ",";
+        aInfo.nameAndParams += pParmVarDecl->getType().getCanonicalType().getAsString();
+    }
+    aInfo.nameAndParams += ")";
+    if (isa<CXXMethodDecl>(functionDecl) && dyn_cast<CXXMethodDecl>(functionDecl)->isConst())
+    {
+        aInfo.nameAndParams += " const";
+    }
+
+    aInfo.sourceLocation = toString(functionDecl->getLocation());
+
+    return aInfo;
+}
+
+std::string FieldCanBeLocal::toString(SourceLocation loc)
+{
+    SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc(loc);
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    std::string sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(sourceLocation);
+    return sourceLocation;
+}
+
+bool FieldCanBeLocal::TraverseCXXConstructorDecl(CXXConstructorDecl* cxxConstructorDecl)
+{
+    auto copy = insideMoveOrCopyOrCloneDeclParent;
+    if (!ignoreLocation(cxxConstructorDecl->getBeginLoc())
+        && cxxConstructorDecl->isThisDeclarationADefinition())
+    {
+        if (cxxConstructorDecl->isCopyOrMoveConstructor())
+            insideMoveOrCopyOrCloneDeclParent = cxxConstructorDecl->getParent();
+    }
+    bool ret = RecursiveASTVisitor::TraverseCXXConstructorDecl(cxxConstructorDecl);
+    insideMoveOrCopyOrCloneDeclParent = copy;
+    return ret;
+}
+
+bool FieldCanBeLocal::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl)
+{
+    auto copy1 = insideMoveOrCopyOrCloneDeclParent;
+    auto copy2 = insideFunctionDecl;
+    if (!ignoreLocation(cxxMethodDecl->getBeginLoc())
+        && cxxMethodDecl->isThisDeclarationADefinition())
+    {
+        if (cxxMethodDecl->isCopyAssignmentOperator() || cxxMethodDecl->isMoveAssignmentOperator()
+            || (cxxMethodDecl->getIdentifier()
+                && (compat::starts_with(cxxMethodDecl->getName(), "Clone")
+                    || compat::starts_with(cxxMethodDecl->getName(), "clone")
+                    || compat::starts_with(cxxMethodDecl->getName(), "createClone"))))
+            insideMoveOrCopyOrCloneDeclParent = cxxMethodDecl->getParent();
+        // these are similar in that they tend to simply enumerate all the fields of an object without putting
+        // them to some useful purpose
+        auto op = cxxMethodDecl->getOverloadedOperator();
+        if (op == OO_EqualEqual || op == OO_ExclaimEqual)
+            insideMoveOrCopyOrCloneDeclParent = cxxMethodDecl->getParent();
+    }
+    insideFunctionDecl = cxxMethodDecl;
+    bool ret = RecursiveASTVisitor::TraverseCXXMethodDecl(cxxMethodDecl);
+    insideMoveOrCopyOrCloneDeclParent = copy1;
+    insideFunctionDecl = copy2;
+    return ret;
+}
+
+bool FieldCanBeLocal::TraverseFunctionDecl(FunctionDecl* functionDecl)
+{
+    auto copy1 = insideStreamOutputOperator;
+    auto copy2 = insideFunctionDecl;
+    auto copy3 = insideMoveOrCopyOrCloneDeclParent;
+    if (functionDecl->getLocation().isValid() && !ignoreLocation(functionDecl->getBeginLoc())
+        && functionDecl->isThisDeclarationADefinition())
+    {
+        auto op = functionDecl->getOverloadedOperator();
+        if (op == OO_LessLess && functionDecl->getNumParams() == 2)
+        {
+            QualType qt = functionDecl->getParamDecl(1)->getType();
+            insideStreamOutputOperator
+                = qt.getNonReferenceType().getUnqualifiedType()->getAsCXXRecordDecl();
+        }
+        // these are similar in that they tend to simply enumerate all the fields of an object without putting
+        // them to some useful purpose
+        if (op == OO_EqualEqual || op == OO_ExclaimEqual)
+        {
+            QualType qt = functionDecl->getParamDecl(1)->getType();
+            insideMoveOrCopyOrCloneDeclParent
+                = qt.getNonReferenceType().getUnqualifiedType()->getAsCXXRecordDecl();
+        }
+    }
+    insideFunctionDecl = functionDecl;
+    bool ret = RecursiveASTVisitor::TraverseFunctionDecl(functionDecl);
+    insideStreamOutputOperator = copy1;
+    insideFunctionDecl = copy2;
+    insideMoveOrCopyOrCloneDeclParent = copy3;
+    return ret;
+}
+
+bool FieldCanBeLocal::VisitMemberExpr(const MemberExpr* memberExpr)
+{
+    const ValueDecl* decl = memberExpr->getMemberDecl();
+    const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(decl);
+    if (!fieldDecl)
+    {
+        return true;
+    }
+    fieldDecl = fieldDecl->getCanonicalDecl();
+    if (ignoreLocation(fieldDecl->getBeginLoc()))
+    {
+        return true;
+    }
+    // ignore stuff that forms part of the stable URE interface
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation())))
+    {
+        return true;
+    }
+
+    if (insideMoveOrCopyOrCloneDeclParent || insideStreamOutputOperator)
+    {
+        RecordDecl const* cxxRecordDecl1 = fieldDecl->getParent();
+        // we don't care about reads from a field when inside the copy/move constructor/operator= for that field
+        if (cxxRecordDecl1 && (cxxRecordDecl1 == insideMoveOrCopyOrCloneDeclParent))
+            return true;
+        // we don't care about reads when the field is being used in an output operator, this is normally
+        // debug stuff
+        if (cxxRecordDecl1 && (cxxRecordDecl1 == insideStreamOutputOperator))
+            return true;
+    }
+
+    checkTouched(fieldDecl, insideFunctionDecl);
+
+    return true;
+}
+
+bool FieldCanBeLocal::VisitDeclRefExpr(const DeclRefExpr* declRefExpr)
+{
+    const Decl* decl = declRefExpr->getDecl();
+    const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(decl);
+    if (!fieldDecl)
+    {
+        return true;
+    }
+    fieldDecl = fieldDecl->getCanonicalDecl();
+    if (ignoreLocation(fieldDecl->getBeginLoc()))
+    {
+        return true;
+    }
+    // ignore stuff that forms part of the stable URE interface
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation())))
+    {
+        return true;
+    }
+
+    checkTouched(fieldDecl, insideFunctionDecl);
+
+    return true;
+}
+
+// fields that are assigned via member initialisers do not get visited in VisitDeclRef, so
+// have to do it here
+bool FieldCanBeLocal::VisitCXXConstructorDecl(const CXXConstructorDecl* cxxConstructorDecl)
+{
+    if (ignoreLocation(cxxConstructorDecl->getBeginLoc()))
+    {
+        return true;
+    }
+    // ignore stuff that forms part of the stable URE interface
+    if (isInUnoIncludeFile(
+            compiler.getSourceManager().getSpellingLoc(cxxConstructorDecl->getLocation())))
+    {
+        return true;
+    }
+
+    // templates make EvaluateAsInt crash inside clang
+    if (cxxConstructorDecl->isDependentContext())
+        return true;
+
+    // we don't care about writes to a field when inside the copy/move constructor/operator= for that field
+    if (insideMoveOrCopyOrCloneDeclParent
+        && cxxConstructorDecl->getParent() == insideMoveOrCopyOrCloneDeclParent)
+        return true;
+
+    for (auto it = cxxConstructorDecl->init_begin(); it != cxxConstructorDecl->init_end(); ++it)
+    {
+        const CXXCtorInitializer* init = *it;
+        const FieldDecl* fieldDecl = init->getMember();
+        if (!fieldDecl)
+            continue;
+        if (init->getInit() && isSomeKindOfConstant(init->getInit()))
+            checkTouched(fieldDecl, cxxConstructorDecl);
+        else
+            touchedMap[fieldDecl] = nullptr;
+    }
+    return true;
+}
+
+// Fields that are assigned via init-list-expr do not get visited in VisitDeclRef, so
+// have to do it here.
+bool FieldCanBeLocal::VisitInitListExpr(const InitListExpr* initListExpr)
+{
+    if (ignoreLocation(initListExpr->getBeginLoc()))
+        return true;
+
+    QualType varType = initListExpr->getType().getDesugaredType(compiler.getASTContext());
+    auto recordType = varType->getAs<RecordType>();
+    if (!recordType)
+        return true;
+
+    auto recordDecl = recordType->getDecl();
+    for (auto it = recordDecl->field_begin(); it != recordDecl->field_end(); ++it)
+    {
+        checkTouched(*it, insideFunctionDecl);
+    }
+
+    return true;
+}
+
+void FieldCanBeLocal::checkTouched(const FieldDecl* fieldDecl, const FunctionDecl* functionDecl)
+{
+    auto methodDecl = dyn_cast_or_null<CXXMethodDecl>(functionDecl);
+    if (!methodDecl)
+    {
+        touchedMap[fieldDecl] = nullptr;
+        return;
+    }
+    if (methodDecl->getParent() != fieldDecl->getParent())
+    {
+        touchedMap[fieldDecl] = nullptr;
+        return;
+    }
+    auto it = touchedMap.find(fieldDecl);
+    if (it == touchedMap.end())
+        touchedMap.emplace(fieldDecl, functionDecl);
+    else if (it->second != functionDecl)
+        it->second = nullptr;
+}
+
+bool FieldCanBeLocal::isSomeKindOfConstant(const Expr* arg)
+{
+    assert(arg);
+    if (arg->isValueDependent())
+        return false;
+    return arg->isCXX11ConstantExpr(compiler.getASTContext());
+}
+
+loplugin::Plugin::Registration<FieldCanBeLocal> X("fieldcanbelocal", false);
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/fieldcanbelocal.py b/compilerplugins/clang/fieldcanbelocal.py
new file mode 100755
index 000000000000..3266574445c5
--- /dev/null
+++ b/compilerplugins/clang/fieldcanbelocal.py
@@ -0,0 +1,123 @@
+#!/usr/bin/python3
+
+import re
+import io
+
+definitionSet = set()
+definitionToSourceLocationMap = dict()
+definitionToTypeMap = dict()
+touchedMap = dict()
+excludeSet = set()
+sourceLocationSet = set()
+
+# clang does not always use exactly the same numbers in the type-parameter vars it generates
+# so I need to substitute them to ensure we can match correctly.
+normalizeTypeParamsRegex = re.compile(r"type-parameter-\d+-\d+")
+def normalizeTypeParams( line ):
+    return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
+
+
+with io.open("workdir/loplugin.fieldcanbelocal.log", "r", buffering=1024*1024) as txt:
+    for line in txt:
+        tokens = line.strip().split("\t")
+        if tokens[0] == "definition:":
+            fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+            fieldType = tokens[3]
+            srcLoc = tokens[4]
+            # ignore external source code
+            if srcLoc.startswith("external/"):
+                continue
+            # ignore build folder
+            if srcLoc.startswith("workdir/"):
+                continue
+            definitionSet.add(fieldInfo)
+            definitionToTypeMap[fieldInfo] = fieldType
+            definitionToSourceLocationMap[fieldInfo] = srcLoc
+        elif tokens[0] == "touched:":
+            fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+            touchedByFunction = normalizeTypeParams(tokens[3])
+            touchedByFunctionSrcLoc = tokens[4]
+            if fieldInfo in excludeSet:
+                continue
+            if touchedByFunction == "Negative":
+                excludeSet.add(fieldInfo)
+                if fieldInfo in touchedMap:
+                    touchedMap.pop(fieldInfo)
+            elif fieldInfo in touchedMap:
+                if touchedMap[fieldInfo] != touchedByFunction:
+                    excludeSet.add(fieldInfo)
+                    touchedMap.pop(fieldInfo)
+            else:
+                touchedMap[fieldInfo] = touchedByFunction
+        else:
+            print( "unknown line: " + line)
+
+outputSet = set()
+for d in definitionSet:
+    if not d in touchedMap:
+        continue
+    fieldType = definitionToTypeMap[d]
+    # ignore some types that are known false+
+    if (fieldType.startswith("std::unique_ptr<")
+        or fieldType == "std::mutex"
+        or "Mutex" in fieldType
+        or "union" in fieldType
+        or "anonymous namespace" in fieldType
+        or "unnamed struct" in fieldType):
+        continue
+    # ignore some field names that are known false+
+    if (d[1] == "mbDisposing"
+        or d[1] == "bInDispose"
+        or d[1] == "m_bDisposing"
+        or d[1].startswith("m_bIn")):
+        continue
+    srcLoc = definitionToSourceLocationMap[d]
+    # ignore some types in the system libraries we somehow pick up
+    if srcLoc.startswith(".") or srcLoc.startswith("/") or srcLoc.startswith("lib/"):
+        continue
+    # part of the URE
+    if srcLoc.startswith("include/cppuhelper/"):
+        continue
+    # on-disk structures
+    if srcLoc.startswith("hwpfilter/"):
+        continue
+    if srcLoc.startswith("include/osl/"):
+        continue
+    if srcLoc.startswith("include/sal/"):
+        continue
+    if srcLoc.startswith("sw/source/filter/ww8/ww8struc.hxx"):
+        continue
+    if srcLoc.startswith("sd/source/filter/ppt/ppt97animations.hxx"):
+        continue
+    if srcLoc.startswith("lotuswordpro/"):
+        continue
+    if srcLoc.startswith("include/filter/msfilter/svdfppt.hxx"):
+        continue
+    if srcLoc.startswith("filter/source/graphicfilter/icgm/chart.hxx"):
+        continue
+    # most of this code is only compiled on windows, so we don't have decent results
+    if srcLoc.startswith("include/svl/svdde.hxx"):
+        continue
+    touchedByFunction = touchedMap[d]
+    outputSet.add((d[0] + " " + d[1] + " " + definitionToTypeMap[d], srcLoc, touchedByFunction))
+
+# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
+def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+    return [int(text) if text.isdigit() else text.lower()
+            for text in re.split(_nsre, s)]
+# sort by both the source-line and the datatype, so the output file ordering is stable
+# when we have multiple items on the same source line
+def v_sort_key(v):
+    return natural_sort_key(v[1]) + [v[0]]
+
+# sort results by name and line number
+tmp1list = sorted(outputSet, key=lambda v: v_sort_key(v))
+
+# print out the results
+with open("compilerplugins/clang/fieldcanbelocal.results", "wt") as f:
+    for t in tmp1list:
+        f.write( t[1] + "\n" )
+        f.write( "    " + t[0] + "\n" )
+        f.write( "    " + t[2] + "\n" )
+
+
diff --git a/compilerplugins/clang/fieldcanbelocal.results b/compilerplugins/clang/fieldcanbelocal.results
new file mode 100644
index 000000000000..6b5ae55214e1
--- /dev/null
+++ b/compilerplugins/clang/fieldcanbelocal.results
@@ -0,0 +1,123 @@
+chart2/source/inc/CachedDataSequence.hxx:128
+    chart::CachedDataSequence m_nNumberFormatKey sal_Int32
+    void chart::CachedDataSequence::registerProperties()
+connectivity/source/drivers/firebird/ResultSet.hxx:85
+    connectivity::firebird::OResultSet m_statusVector ISC_STATUS_ARRAY
+    unsigned char connectivity::firebird::OResultSet::next()
+connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:114
+    connectivity::ODatabaseMetaDataResultSet m_nFetchSize sal_Int32
+    void connectivity::ODatabaseMetaDataResultSet::construct()
+connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:115
+    connectivity::ODatabaseMetaDataResultSet m_nResultSetType sal_Int32
+    void connectivity::ODatabaseMetaDataResultSet::construct()
+connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:116
+    connectivity::ODatabaseMetaDataResultSet m_nFetchDirection sal_Int32
+    void connectivity::ODatabaseMetaDataResultSet::construct()
+connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:117
+    connectivity::ODatabaseMetaDataResultSet m_nResultSetConcurrency sal_Int32
+    void connectivity::ODatabaseMetaDataResultSet::construct()
+cppuhelper/inc/interfacecontainer4.hxx:267
+    cppuhelper::OInterfaceContainerHelper4::NotifySingleListener m_rEvent const EventT &
+    void cppuhelper::OInterfaceContainerHelper4::NotifySingleListener::operator()(const Reference<type-parameter-?-?> &) const
+cui/source/inc/chardlg.hxx:170
+    SvxCharEffectsPage m_nHtmlMode sal_uInt16
+    void SvxCharEffectsPage::Initialize()
+embeddedobj/source/msole/olecomponent.hxx:73
+    OleComponent m_bWorkaroundActive _Bool
+    _Bool OleComponent::IsWorkaroundActive() const
+include/editeng/adjustitem.hxx:37
+    SvxAdjustItem bLeft _Bool
+    void SvxAdjustItem::SetAdjust(const enum SvxAdjust)
+include/o3tl/enumarray.hxx:130
+    o3tl::enumarray_const_iterator m_buf const EA *
+    const typename type-parameter-?-?::value_type & o3tl::enumarray_const_iterator::operator*() const
+include/oox/dump/oledumper.hxx:743
+    oox::dump::VbaDirStreamObject mnCurrOffset sal_Int32
+    void oox::dump::VbaDirStreamObject::implDumpRecordBody()
+include/salhelper/dynload.hxx:82
+    salhelper::ORealDynamicLoader m_refCount sal_uInt32
+     salhelper::ORealDynamicLoader::ORealDynamicLoader(class salhelper::ORealDynamicLoader **,const class rtl::OUString &,const class rtl::OUString &,void *,void *)
+include/sfx2/msg.hxx:104
+    SfxType createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    class std::unique_ptr<class SfxPoolItem> SfxType::CreateItem() const
+include/sfx2/msg.hxx:105
+    SfxType pType const std::type_info *
+    const class std::type_info * SfxType::Type() const
+include/sfx2/msg.hxx:117
+    SfxType0 pType const std::type_info *
+    const class std::type_info * SfxType0::Type() const
+include/test/sheet/xdatapilottable.hxx:31
+    apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell>
+    void apitest::XDataPilotTable::testRefresh()
+include/test/sheet/xdatapilottable.hxx:32
+    apitest::XDataPilotTable xCellForCheck css::uno::Reference<css::table::XCell>
+    void apitest::XDataPilotTable::testRefresh()
+include/vcl/tabpage.hxx:43
+    TabPage mbHasHoriBar _Bool
+    void TabPage::ImplInit(class vcl::Window *,long)
+include/vcl/tabpage.hxx:44
+    TabPage mbHasVertBar _Bool
+    void TabPage::ImplInit(class vcl::Window *,long)
+jvmfwk/plugins/sunmajor/pluginlib/util.cxx:205
+    jfw_plugin::(anonymous namespace)::FileHandleReader m_aBuffer char[1024]
+    enum jfw_plugin::(anonymous namespace)::FileHandleReader::Result jfw_plugin::(anonymous namespace)::FileHandleReader::readLine(class rtl::OString *)
+sc/source/ui/inc/datastream.hxx:104
+    sc::DataStream mnSettings sal_uInt32
+    void sc::DataStream::Decode(const class rtl::OUString &,const class ScRange &,int,enum sc::DataStream::MoveType,const unsigned int)
+sc/source/ui/inc/tabvwsh.hxx:99
+    ScTabViewShell eFormObjKind SdrObjKind
+    void ScTabViewShell::ExecDraw(class SfxRequest &)
+sc/source/ui/inc/tabvwsh.hxx:144
+    ScTabViewShell bActiveEditSh _Bool
+    void ScTabViewShell::SetEditShell(class EditView *,_Bool)
+sd/source/filter/html/htmlex.hxx:59
+    HtmlExport mnPagesWritten sal_uInt16
+    void HtmlExport::ExportSingleDocument()
+sfx2/source/appl/lnkbase2.cxx:82
+    sfx2::(anonymous namespace)::ImplDdeItem aData DdeData
+    class DdeData * sfx2::(anonymous namespace)::ImplDdeItem::Get(enum SotClipboardFormatId)
+sfx2/source/appl/lnkbase2.cxx:83
+    sfx2::(anonymous namespace)::ImplDdeItem aSeq Sequence<sal_Int8>
+    class DdeData * sfx2::(anonymous namespace)::ImplDdeItem::Get(enum SotClipboardFormatId)
+svl/source/misc/inethist.cxx:45
+    INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
+    void INetURLHistory_Impl::head_entry::initialize()
+sw/inc/viewopt.hxx:50
+    ViewOptFlags1 bRef _Bool
+     ViewOptFlags1::ViewOptFlags1()
+sw/source/core/text/txtdrop.cxx:702
+    SwDropCapCache m_aFactor sal_uInt16[10]
+    void SwDropCapCache::CalcFontSize(class SwDropPortion *,class SwTextFormatInfo &)
+sw/source/core/text/txtdrop.cxx:704
+    SwDropCapCache m_aDescent short[10]
+    void SwDropCapCache::CalcFontSize(class SwDropPortion *,class SwTextFormatInfo &)
+sw/source/filter/ww8/ww8par.hxx:663
+    WW8FormulaControl mfUnknown sal_uInt8
+     WW8FormulaControl::WW8FormulaControl(class rtl::OUString,class SwWW8ImplReader &)
+sw/source/filter/ww8/ww8par.hxx:1067
+    WW8TabBandDesc bCantSplit90 _Bool
+     WW8TabBandDesc::WW8TabBandDesc()
+sw/source/filter/ww8/ww8scan.hxx:440
+    WW8PLCFx_PCDAttrs m_aShortSprm SVBT32
+    void WW8PLCFx_PCDAttrs::GetSprms(struct WW8PLCFxDesc *)
+sw/source/uibase/inc/fldmgr.hxx:112
+    SwFieldMgr m_nCurFormat sal_uInt32
+    class SwField * SwFieldMgr::GetCurField()
+unoidl/source/unoidlprovider.cxx:89
+    unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char[2]
+    unsigned short unoidl::detail::(anonymous namespace)::Memory16::getUnsigned16() const
+vcl/inc/sft.hxx:178
+    vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
+     vcl::TTGlobalFontInfo_::TTGlobalFontInfo_()
+vcl/inc/unx/sessioninhibitor.hxx:46
+    SessionManagerInhibitor mbDPMSWasEnabled BOOL
+    void SessionManagerInhibitor::inhibitDPMS(_Bool,struct _XDisplay *)
+vcl/inc/unx/sessioninhibitor.hxx:47
+    SessionManagerInhibitor mnDPMSStandbyTimeout CARD16
+    void SessionManagerInhibitor::inhibitDPMS(_Bool,struct _XDisplay *)
+vcl/inc/unx/sessioninhibitor.hxx:48
+    SessionManagerInhibitor mnDPMSSuspendTimeout CARD16
+    void SessionManagerInhibitor::inhibitDPMS(_Bool,struct _XDisplay *)
+vcl/inc/unx/sessioninhibitor.hxx:49
+    SessionManagerInhibitor mnDPMSOffTimeout CARD16
+    void SessionManagerInhibitor::inhibitDPMS(_Bool,struct _XDisplay *)
diff --git a/compilerplugins/clang/fieldcast.cxx b/compilerplugins/clang/fieldcast.cxx
new file mode 100644
index 000000000000..0807aef9b3c3
--- /dev/null
+++ b/compilerplugins/clang/fieldcast.cxx
@@ -0,0 +1,206 @@
+/* -*- 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/.
+ */
+
+#if !defined _WIN32 //TODO, #include <sys/file.h>
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <unordered_set>
+#include <vector>
+#include <algorithm>
+#include <sys/file.h>
+#include <unistd.h>
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include "check.hxx"
+
+#include "clang/AST/ParentMapContext.h"
+
+/**
+  Look for class fields that are always cast to some subtype,
+  which indicates that they should probably just be declared to be that subtype.
+
+  TODO add checking for dynamic_cast/static_cast on
+      unique_ptr
+      shared_ptr
+*/
+
+namespace
+{
+struct MyFieldInfo
+{
+    std::string parentClass;
+    std::string fieldName;
+    std::string fieldType;
+    std::string sourceLocation;
+};
+
+// try to limit the voluminous output a little
+static std::unordered_multimap<const FieldDecl*, const CXXRecordDecl*> castMap;
+
+class FieldCast : public loplugin::FilteringPlugin<FieldCast>
+{
+public:
+    explicit FieldCast(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual void run() override;
+
+    bool VisitCXXStaticCastExpr(const CXXStaticCastExpr*);
+    bool VisitCXXDynamicCastExpr(const CXXDynamicCastExpr*);
+    bool VisitCXXReinterpretCastExpr(const CXXReinterpretCastExpr*);
+
+private:
+    MyFieldInfo niceName(const FieldDecl*);
+    void checkCast(const CXXNamedCastExpr*);
+};
+
+void FieldCast::run()
+{
+    handler.enableTreeWideAnalysisMode();
+
+    TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+    if (!isUnitTestMode())
+    {
+        // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
+        // writing to the same logfile
+        std::string output;
+        output.reserve(64 * 1024);
+        for (const auto& pair : castMap)
+        {
+            MyFieldInfo s = niceName(pair.first);
+            output += "cast:\t" + s.parentClass //
+                      + "\t" + s.fieldName //
+                      + "\t" + s.fieldType //
+                      + "\t" + s.sourceLocation //
+                      + "\t" + pair.second->getQualifiedNameAsString() //
+                      + "\n";
+        }
+        std::ofstream myfile;
+        myfile.open(WORKDIR "/loplugin.fieldcast.log", std::ios::app | std::ios::out);
+        myfile << output;
+        myfile.close();
+    }
+    else
+    {
+        for (const auto& pair : castMap)
+            report(DiagnosticsEngine::Warning, "cast %0", pair.first->getBeginLoc())
+                << pair.second->getQualifiedNameAsString();
+    }
+}
+
+MyFieldInfo FieldCast::niceName(const FieldDecl* fieldDecl)
+{
+    MyFieldInfo aInfo;
+
+    const RecordDecl* recordDecl = fieldDecl->getParent();
+
+    if (const CXXRecordDecl* cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl))
+    {
+        if (cxxRecordDecl->getTemplateInstantiationPattern())
+            cxxRecordDecl = cxxRecordDecl->getTemplateInstantiationPattern();
+        aInfo.parentClass = cxxRecordDecl->getQualifiedNameAsString();
+    }
+    else
+    {
+        aInfo.parentClass = recordDecl->getQualifiedNameAsString();
+    }
+
+    aInfo.fieldName = fieldDecl->getNameAsString();
+    // sometimes the name (if it's an anonymous thing) contains the full path of the build folder, which we don't need
+    size_t idx = aInfo.fieldName.find(SRCDIR);
+    if (idx != std::string::npos)
+    {
+        aInfo.fieldName = aInfo.fieldName.replace(idx, strlen(SRCDIR), "");
+    }
+    aInfo.fieldType = fieldDecl->getType().getAsString();
+
+    SourceLocation expansionLoc
+        = compiler.getSourceManager().getExpansionLoc(fieldDecl->getLocation());
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    aInfo.sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
+
+    return aInfo;
+}
+
+bool FieldCast::VisitCXXDynamicCastExpr(const CXXDynamicCastExpr* expr)
+{
+    checkCast(expr);
+    return true;
+}
+
+bool FieldCast::VisitCXXStaticCastExpr(const CXXStaticCastExpr* expr)
+{
+    checkCast(expr);
+    return true;
+}
+
+bool FieldCast::VisitCXXReinterpretCastExpr(const CXXReinterpretCastExpr* expr)
+{
+    checkCast(expr);
+    return true;
+}
+
+void FieldCast::checkCast(const CXXNamedCastExpr* expr)
+{
+    if (ignoreLocation(expr))
+        return;
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc())))
+        return;
+    auto castToType = expr->getTypeAsWritten()->getPointeeCXXRecordDecl();
+    if (!castToType)
+        return;
+    const Expr* subExpr = compat::getSubExprAsWritten(expr);
+    const FieldDecl* fieldDecl = nullptr;
+    if (const MemberExpr* memberExpr = dyn_cast_or_null<MemberExpr>(subExpr->IgnoreImplicit()))
+    {
+        fieldDecl = dyn_cast_or_null<FieldDecl>(memberExpr->getMemberDecl());
+    }
+    else if (const CXXMemberCallExpr* memberCallExpr
+             = dyn_cast_or_null<CXXMemberCallExpr>(subExpr->IgnoreImplicit()))
+    {
+        if (!memberCallExpr->getMethodDecl()->getIdentifier()
+            || memberCallExpr->getMethodDecl()->getName() != "get")
+            return;
+        const MemberExpr* memberExpr = dyn_cast_or_null<MemberExpr>(
+            memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit());
+        if (!memberExpr)
+            return;
+        fieldDecl = dyn_cast_or_null<FieldDecl>(memberExpr->getMemberDecl());
+    }
+    if (!fieldDecl)
+        return;
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(fieldDecl->getBeginLoc())))
+        return;
+
+    // ignore casting to a less specific type
+    auto castFromType = subExpr->getType()->getPointeeCXXRecordDecl();
+    if (castFromType && castFromType->isDerivedFrom(castToType))
+        return;
+
+    castMap.emplace(fieldDecl, castToType);
+}
+
+loplugin::Plugin::Registration<FieldCast> X("fieldcast", false);
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/fieldcast.py b/compilerplugins/clang/fieldcast.py
new file mode 100755
index 000000000000..fc09063571ee
--- /dev/null
+++ b/compilerplugins/clang/fieldcast.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python3
+
+import re
+import io
+
+definitionSet = set()
+definitionToSourceLocationMap = dict()
+definitionToTypeMap = dict()
+castMap = dict()
+
+# clang does not always use exactly the same numbers in the type-parameter vars it generates
+# so I need to substitute them to ensure we can match correctly.
+normalizeTypeParamsRegex = re.compile(r"type-parameter-\d+-\d+")
+def normalizeTypeParams( line ):
+    return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
+
+
+with io.open("workdir/loplugin.fieldcast.log", "r", buffering=1024*1024) as txt:
+    for line in txt:
+        tokens = line.strip().split("\t")
+        if tokens[0] == "cast:":
+            fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+            fieldType = tokens[3]
+            srcLoc = tokens[4]
+            castToType = tokens[5]
+            # ignore external source code
+            if srcLoc.startswith("external/"):
+                continue
+            # ignore build folder
+            if srcLoc.startswith("workdir/"):
+                continue
+            definitionSet.add(fieldInfo)
+            definitionToTypeMap[fieldInfo] = fieldType
+            definitionToSourceLocationMap[fieldInfo] = srcLoc
+
+            if not (fieldInfo in castMap):
+                castMap[fieldInfo] = castToType
+            elif castMap[fieldInfo] != "": # if we are not ignoring it
+                # if it is cast to more than one type, mark it as being ignored
+                if castMap[fieldInfo] != castToType:
+                    castMap[fieldInfo] = ""
+        else:
+            print( "unknown line: " + line)
+
+outputSet = set()
+for k, v in castMap.items():
+    if v == "":
+        continue
+    srcLoc = definitionToSourceLocationMap[k]
+    outputSet.add((k[0] + " " + k[1] + " " + definitionToTypeMap[k], srcLoc, v))
+
+# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
+def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+    return [int(text) if text.isdigit() else text.lower()
+            for text in re.split(_nsre, s)]
+# sort by both the source-line and the datatype, so the output file ordering is stable
+# when we have multiple fields declared on the same source line
+def v_sort_key(v):
+    return natural_sort_key(v[1]) + [v[0]]
+
+# sort results by name and line number
+tmp1list = sorted(outputSet, key=lambda v: v_sort_key(v))
+
+# print out the results
+with open("compilerplugins/clang/fieldcast.results", "wt") as f:
+    for t in tmp1list:
+        f.write( t[1] + "\n" )
+        f.write( "    " + t[0] + "\n" )
+        f.write( "    " + t[2] + "\n" )
+
+
diff --git a/compilerplugins/clang/fieldcast.results b/compilerplugins/clang/fieldcast.results
new file mode 100644
index 000000000000..7be14a330da5
--- /dev/null
+++ b/compilerplugins/clang/fieldcast.results
@@ -0,0 +1,681 @@
+accessibility/inc/extended/accessibletabbarbase.hxx:53
+    accessibility::AccessibleTabBarBase m_pTabBar VclPtr<TabBar>
+    vcl::Window
+basctl/source/inc/accessibledialogwindow.hxx:67
+    basctl::AccessibleDialogWindow m_pDialogWindow VclPtr<basctl::DialogWindow>
+    vcl::Window
+basctl/source/inc/basidesh.hxx:87
+    basctl::Shell pLayout VclPtr<Layout>
+    basctl::ModulWindowLayout
+basctl/source/inc/basidesh.hxx:97
+    basctl::Shell m_xLibListener css::uno::Reference<css::container::XContainerListener>
+    basctl::ContainerListenerImpl
+basic/source/inc/errobject.hxx:27
+    SbxErrObject m_xErr css::uno::Reference<ooo::vba::XErrObject>
+    ErrObject
+basic/source/inc/runtime.hxx:220
+    SbiRuntime pMod SbModule *
+    SbClassModuleObject
+bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx:70
+    (anonymous namespace)::GeneratedPad pad_ std::unique_ptr<char[]>
+    std::type_info
+bridges/source/jni_uno/jni_info.h:96
+    jni_uno::JNI_compound_type_info m_base const JNI_type_info *
+    jni_uno::JNI_compound_type_info
+bxml/parser.h:258
+    _xmlParserCtxt _private void *
+    DOM::CDocumentBuilder
+bxml/tree.h:390
+    _xmlNs next struct _xmlNs *
+    _xmlNode
+bxml/xpath.h:338
+    _xmlXPathContext funcLookupData void *
+    CLibxml2XFormsExtension
+chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx:108
+    chart::CreationWizardUnoDlg m_xParentWindow css::uno::Reference<css::awt::XWindow>
+    weld::TransportAsXWindow
+chart2/source/controller/inc/SelectionHelper.hxx:110
+    chart::SelectionHelper m_pMarkObj SdrObject *
+    SdrPathObj
+chart2/source/view/inc/PlotterBase.hxx:75
+    chart::PlotterBase m_pPosHelper PlottingPositionHelper *
+    chart::PolarPlottingPositionHelper
+configmgr/source/valueparser.hxx:76
+    configmgr::ValueParser node_ rtl::Reference<Node>
+    configmgr::PropertyNode
+configmgr/source/xcsparser.hxx:80
+    configmgr::XcsParser::Element node rtl::Reference<Node>
+    configmgr::SetNode
+cppu/source/uno/lbenv.cxx:72
+    (anonymous namespace)::InterfaceEntry pTypeDescr typelib_InterfaceTypeDescription *
+    _typelib_TypeDescription
+cui/source/inc/cfg.hxx:407
+    SvxConfigPage m_xContentsListBox std::unique_ptr<SvxMenuEntriesListBox>
+    SvxNotebookbarEntriesListBox
+cui/source/inc/cuitabline.hxx:321
+    SvxLineEndDefTabPage pPolyObj const SdrObject *
+    SdrPathObj
+cui/source/options/optcolor.cxx:270
+    (anonymous namespace)::ColorConfigWindow_Impl::Entry m_xText std::unique_ptr<weld::Widget>
+    weld::Toggleable
+cui/source/options/treeopt.cxx:424
+    OptionsPageInfo m_xPage std::unique_ptr<SfxTabPage>
+    SvxDefaultColorOptPage
+dbaccess/source/ui/app/AppDetailView.hxx:105
+    dbaui::OApplicationDetailView m_xControlHelper std::shared_ptr<OChildWindow>
+    dbaui::OAppDetailPageHelper
+dbaccess/source/ui/inc/RelationDlg.hxx:34
+    dbaui::ORelationDialog m_pConnData TTableConnectionData::value_type
+    dbaui::ORelationTableConnectionData
+dbaccess/source/ui/inc/RelationDlg.hxx:35
+    dbaui::ORelationDialog m_pOrigConnData TTableConnectionData::value_type
+    dbaui::ORelationTableConnectionData
+dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx:32
+    dbaui::OQueryDesignUndoAction m_pOwner VclPtr<OJoinTableView>
+    dbaui::OQueryTableView
+dbaccess/source/ui/querydesign/querydlg.hxx:37
+    dbaui::DlgQryJoin m_pConnData TTableConnectionData::value_type
+    dbaui::OQueryTableConnectionData
+editeng/source/editeng/impedit.hxx:268
+    ImpEditView mpViewShell OutlinerViewShell *
+    SfxViewShell
+editeng/source/editeng/impedit.hxx:270
+    ImpEditView mpOtherShell OutlinerViewShell *
+    SfxViewShell
+editeng/source/editeng/impedit.hxx:506
+    ImpEditEngine pEditEngine EditEngine *
+    OutlinerEditEng
+extensions/source/update/check/updatecheck.hxx:164
+    UpdateCheck m_pThread WorkerThread *
+    (anonymous namespace)::UpdateCheckThread
+i18npool/inc/calendarImpl.hxx:103
+    i18npool::CalendarImpl xCalendar css::uno::Reference<css::i18n::XCalendar4>
+    i18npool::Calendar_gregorian
+include/basegfx/DrawCommands.hxx:121
+    gfx::DrawRectangle mpFillGradient std::shared_ptr<GradientInfo>
+    gfx::LinearGradientInfo
+include/basic/sbstar.hxx:47
+    StarBASIC pRtl SbxObjectRef
+    SbiStdObject
+include/basic/sbxvar.hxx:258
+    SbxVariable pParent SbxObject *
+    StarBASIC
+include/comphelper/propertycontainerhelper.hxx:48
+    comphelper::PropertyDescription::LocationAccess pDerivedClassMember void *
+    com::sun::star::uno::Any
+include/connectivity/sdbcx/VTable.hxx:77
+    connectivity::sdbcx::OTable m_xColumns std::unique_ptr<OCollection>
+    dbaccess::OColumns
+include/connectivity/sdbcx/VTable.hxx:79
+    connectivity::sdbcx::OTable m_pTables OCollection *
+    connectivity::mysql::OTables
+include/editeng/editdata.hxx:231
+    HtmlImportInfo pParser SvParser<HtmlTokenId> *
+    HTMLParser
+include/editeng/editdata.hxx:245
+    RtfImportInfo pParser SvParser<int> *
+    SvxRTFParser
+include/filter/msfilter/msdffimp.hxx:219
+    SvxMSDffImportRec pObj rtl::Reference<SdrObject>
+    SdrObjGroup
+include/filter/msfilter/svdfppt.hxx:458
+    SdPageCapsule page SdrPage *
+    SdPage
+include/formula/FormulaCompiler.hxx:394
+    formula::FormulaCompiler mpToken FormulaTokenRef
+    ScTableRefToken
+include/formula/FormulaCompiler.hxx:397
+    formula::FormulaCompiler pArr FormulaTokenArray *
+    ScTokenArray
+include/jvmaccess/unovirtualmachine.hxx:94
+    jvmaccess::UnoVirtualMachine m_classLoader void *
+    _jobject
+include/oox/drawingml/graphicshapecontext.hxx:55
+    oox::drawingml::GraphicalObjectFrameContext mpParent ::oox::core::ContextHandler2Helper *
+    oox::ppt::PPTShapeGroupContext
+include/oox/drawingml/shapecontext.hxx:46
+    oox::drawingml::ShapeContext mpShapePtr ShapePtr
+    oox::ppt::PPTShape
+include/oox/export/vmlexport.hxx:87
+    oox::vml::VMLExport m_pSdrObject const SdrObject *
+    SdrGrafObj
+include/oox/vml/vmlshapecontext.hxx:147
+    oox::vml::ShapeContext mrShape ShapeBase &
+    oox::vml::SimpleShape
+include/sfx2/basedlgs.hxx:129
+    SfxSingleTabDialogController m_xSfxPage std::unique_ptr<SfxTabPage>
+    SfxMacroTabPage
+include/sfx2/devtools/DevelopmentToolDockingWindow.hxx:42
+    DevelopmentToolDockingWindow mxSelectionListener css::uno::Reference<css::view::XSelectionChangeListener>
+    SelectionChangeHandler
+include/sfx2/sfxstatuslistener.hxx:69
+    SfxStatusListener m_xDispatch css::uno::Reference<css::frame::XDispatch>
+    SfxOfficeDispatch
+include/sfx2/sidebar/Panel.hxx:102
+    sfx2::sidebar::Panel mxElement css::uno::Reference<css::ui::XUIElement>
+    sfx2::sidebar::SidebarPanelBase
+include/sot/storage.hxx:52
+    SotStorageStream pOwnStm BaseStorageStream *
+    UCBStorageStream
+include/sot/storage.hxx:77
+    SotStorage m_pOwnStg BaseStorage *
+    UCBStorage
+include/svl/style.hxx:208
+    SfxStyleSheetIterator pBasePool const SfxStyleSheetBasePool *
+    SwDocStyleSheetPool
+include/svl/style.hxx:236
+    SfxStyleSheetBasePool rPool SfxItemPool &
+    ScDocumentPool
+include/svl/undo.hxx:92
+    MarkedUndoAction pAction std::unique_ptr<SfxUndoAction>
+    ScSimpleUndo
+include/svx/AccessibleShape.hxx:391
+    accessibility::AccessibleShape m_pShape SdrObject *
+    SdrOle2Obj
+include/svx/fmsrcimp.hxx:161
+    FmSearchEngine m_xSearchCursor CursorWrapper
+    com::sun::star::uno::Reference
+include/svx/svdhdl.hxx:136
+    SdrHdl m_pObj SdrObject *
+    SdrEdgeObj
+include/svx/svdmodel.hxx:198
+    SdrModel mxStyleSheetPool rtl::Reference<SfxStyleSheetBasePool>
+    SdStyleSheetPool
+include/svx/svdview.hxx:100
+    SdrViewEvent mpObj SdrObject *
+    sdr::table::SdrTableObj
+include/svx/unomodel.hxx:45
+    SvxUnoDrawingModel mpDoc SdrModel *
+    FmFormModel
+include/svx/unopage.hxx:65
+    SvxDrawPage mpPage SdrPage *
+    SdPage
+include/test/a11y/accessibletestbase.hxx:42
+    test::AccessibleTestBase mxDocument css::uno::Reference<css::lang::XComponent>
+    vcl::ITiledRenderable
+include/toolkit/awt/vclxmenu.hxx:59
+    VCLXMenu mpMenu VclPtr<Menu>
+    PopupMenu
+include/tools/zcodec.hxx:59
+    ZCodec mpsC_Stream void *
+    z_stream_s
+include/vbahelper/vbaeventshelperbase.hxx:214
+    VbaEventsHelperBase mpShell SfxObjectShell *
+    ScDocShell
+include/vcl/builder.hxx:144
+    VclBuilder::WinAndId m_pWindow VclPtr<vcl::Window>
+    PushButton
+include/vcl/builder.hxx:158
+    VclBuilder::MenuAndId m_pMenu VclPtr<Menu>
+    PopupMenu
+include/vcl/dockwin.hxx:117
+    DockingWindow mpOldBorderWin VclPtr<vcl::Window>
+    ImplBorderWindow
+include/vcl/menu.hxx:127
+    Menu pStartedFrom VclPtr<Menu>
+    PopupMenu
+include/vcl/sysdata.hxx:68
+    SystemEnvData pDisplay void *
+    _XDisplay
+include/vcl/sysdata.hxx:71
+    SystemEnvData pVisual void *
+    Visual
+include/vcl/sysdata.hxx:155
+    SystemGraphicsData pDisplay void *
+    _XDisplay
+include/vcl/sysdata.hxx:157
+    SystemGraphicsData pVisual void *
+    Visual
+include/vcl/sysdata.hxx:161
+    SystemGraphicsData pSurface void *
+    _cairo_surface
+include/vcl/sysdata.hxx:197
+    SystemWindowData pVisual void *
+    Visual
+include/vcl/toolkit/fmtfield.hxx:60
+    FormattedField m_pFormatter Formatter *
+    (anonymous namespace)::DoubleCurrencyFormatter
+include/vcl/toolkit/menubtn.hxx:41
+    MenuButton mpFloatingWindow VclPtr<Window>
+    FloatingWindow
+include/vcl/uitest/uiobject.hxx:156
+    ButtonUIObject mxButton VclPtr<Button>
+    PushButton
+include/vcl/virdev.hxx:48
+    VirtualDevice mpVirDev std::unique_ptr<SalVirtualDevice>
+    SvpSalVirtualDevice
+include/xmloff/maptype.hxx:34
+    XMLPropertyMapEntry msApiName OUString
+    rtl::OUString
+include/xmloff/prstylei.hxx:45
+    XMLPropStyleContext mxStyles rtl::Reference<SvXMLStylesContext>
+    SvXMLStylesContext
+include/xmloff/shapeimport.hxx:150
+    XMLShapeImportHelper mrImporter SvXMLImport &
+    ScXMLImport
+lingucomponent/source/languageguessing/simpleguesser.hxx:97
+    SimpleGuesser h void *
+    (anonymous namespace)::textcat_t
+lotuswordpro/source/filter/lwpframelayout.hxx:103
+    LwpFrame m_pLayout LwpPlacableLayout *
+    LwpFrameLayout
+package/source/xstor/owriteablestream.hxx:241
+    OWriteStream m_xOutStream css::uno::Reference<css::io::XOutputStream>
+    comphelper::ByteWriter
+pyuno/inc/pyuno.hxx:165
+    pyuno::Runtime impl RuntimeImpl *
+    _object
+reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx:83
+    rptxml::ImportDocumentHandler m_xDocumentHandler css::uno::Reference<css::xml::sax::XFastDocumentHandler>
+    SvXMLImport
+reportdesign/source/ui/inc/DesignView.hxx:57
+    rptui::ODesignView m_pTaskPane VclPtr<vcl::Window>
+    rptui::(anonymous namespace)::OTaskWindow
+sal/rtl/bootstrap.cxx:396
+    (anonymous namespace)::FundamentalIniData ini rtlBootstrapHandle
+    (anonymous namespace)::Bootstrap_Impl
+sc/inc/chgtrack.hxx:192
+    ScChangeAction pNext ScChangeAction *
+    ScChangeActionContent
+sc/inc/dpfilteredcache.hxx:97
+    ScDPFilteredCache::Criterion mpFilter std::shared_ptr<FilterBase>
+    ScDPFilteredCache::GroupFilter
+sc/inc/dpobject.hxx:95
+    ScDPObject mpTableData std::shared_ptr<ScDPTableData>
+    ScDPGroupTableData
+sc/qa/unit/screenshots/screenshots.cxx:36
+    ScScreenshotTest mpFoundShell SfxObjectShell *
+    ScDocShell
+sc/source/core/opencl/formulagroupcl.cxx:1873
+    sc::opencl::(anonymous namespace)::DynamicKernelSoPArguments mpCodeGen std::shared_ptr<SlidingFunctionBase>
+    sc::opencl::OpSumIfs
+sc/source/core/opencl/opbase.hxx:465
+    sc::opencl::DynamicKernelSlidingArgument mpCodeGen std::shared_ptr<SlidingFunctionBase>
+    sc::opencl::OpSumIfs
+sc/source/filter/excel/xeformula.cxx:60
+    (anonymous namespace)::XclExpScToken mpScToken const FormulaToken *
+    formula::FormulaExternalToken
+sc/source/filter/inc/eeimport.hxx:43
+    ScEEImport mpParser std::unique_ptr<ScEEParser>
+    ScHTMLParser
+sc/source/ui/inc/AccessibleContextBase.hxx:232
+    ScAccessibleContextBase mxParent css::uno::Reference<css::accessibility::XAccessible>
+    ScAccessibleSpreadsheet
+sc/source/ui/vba/vbaformat.hxx:42
+    ScVbaFormat mxPropertySet css::uno::Reference<css::beans::XPropertySet>
+    ScCellRangesBase
+sc/source/ui/vba/vbaname.hxx:34
+    ScVbaName mxNamedRange css::uno::Reference<css::sheet::XNamedRange>
+    ScNamedRangeObj
+sc/source/ui/vba/vbarange.hxx:79
+    ScVbaRange mxRanges css::uno::Reference<css::sheet::XSheetCellRangeContainer>
+    ScCellRangesBase
+sd/inc/Outliner.hxx:283
+    SdOutliner mpObj SdrObject *
+    SdrGrafObj
+sd/inc/sdfilter.hxx:53
+    SdFilter mrDocShell ::sd::DrawDocShell &
+    SfxObjectShell
+sd/qa/unit/dialogs-test.cxx:43
+    SdDialogsTest mxComponent uno::Reference<lang::XComponent>
+    SdXImpressDocument
+sd/source/ui/dlg/sddlgfact.hxx:165
+    AbstractBulletDialog_Impl m_xDlg std::shared_ptr<SfxTabDialogController>
+    sd::OutlineBulletDlg
+sd/source/ui/inc/DrawViewShell.hxx:497
+    sd::DrawViewShell mxScannerListener css::uno::Reference<css::lang::XEventListener>
+    sd::(anonymous namespace)::ScannerEventListener
+sd/source/ui/inc/framework/FrameworkHelper.hxx:301
+    sd::framework::FrameworkHelper mxConfigurationController css::uno::Reference<css::drawing::framework::XConfigurationController>
+    sd::framework::ConfigurationController
+sd/source/ui/inc/fupoor.hxx:147
+    sd::FuPoor mpDocSh DrawDocShell *
+    sd::GraphicDocShell
+sd/source/ui/inc/fusel.hxx:76
+    sd::FuSelection pHdl SdrHdl *
+    svx::diagram::DiagramFrameHdl
+sd/source/ui/inc/TextObjectBar.hxx:53
+    sd::TextObjectBar mpView ::sd::View *
+    sd::OutlineView
+sd/source/ui/inc/unchss.hxx:34
+    StyleSheetUndoAction mpStyleSheet SfxStyleSheet *
+    SdStyleSheet
+sd/source/ui/slideshow/slideshowimpl.hxx:296
+    sd::SlideshowImpl mpViewShell ViewShell *
+    sd::PresentationViewShell
+sd/source/ui/table/tableobjectbar.hxx:51
+    sd::ui::table::TableObjectBar mpViewSh ::sd::ViewShell *
+    sd::DrawViewShell
+sd/source/ui/view/DocumentRenderer.cxx:1319
+    sd::DocumentRenderer::Implementation mrBase ViewShellBase &
+    SfxBroadcaster
+sd/source/ui/view/sdview3.cxx:95
+    sd::(anonymous namespace)::ImpRememberOrigAndClone pOrig SdrObject *
+    SdrEdgeObj
+sd/source/ui/view/sdview3.cxx:96
+    sd::(anonymous namespace)::ImpRememberOrigAndClone pClone SdrObject *
+    SdrEdgeObj
+sd/source/ui/view/ViewShellManager.cxx:56
+    sd::(anonymous namespace)::ShellDescriptor mpShell SfxShell *
+    sd::ViewShell
+sdext/source/pdfimport/pdfparse/pdfentries.cxx:49
+    pdfparse::EmitImplData m_pObjectContainer const PDFContainer *
+    pdfparse::PDFFile
+sdext/source/pdfimport/sax/emitcontext.hxx:36
+    pdfi::SaxEmitter m_xDocHdl css::uno::Reference<css::xml::sax::XDocumentHandler>
+    SvXMLImport
+sfx2/source/inc/objshimp.hxx:66
+    SfxObjectShell_Impl nTime DateTime
+    tools::Time
+sfx2/source/inc/statcach.hxx:66
+    SfxStateCache pInternalController SfxControllerItem *
+    SfxDispatchController_Impl
+sfx2/source/inc/StyleList.hxx:234
+    StyleList m_pParentDialog SfxCommonTemplateDialog_Impl *
+    SfxTemplateDialog_Impl
+sfx2/source/inc/workwin.hxx:84
+    SfxChild_Impl pWin VclPtr<vcl::Window>
+    SplitWindow
+sfx2/source/view/impframe.hxx:45
+    SfxFrame_Impl pExternalContainerWindow VclPtr<vcl::Window>
+    SystemWindow
+slideshow/source/inc/slideshowcontext.hxx:106
+    slideshow::internal::SlideShowContext mrCursorManager CursorManager &
+    slideshow::internal::Slide
+sot/source/sdstor/stgavl.hxx:43
+    StgAvlNode m_pLeft StgAvlNode *
+    StgDirEntry
+sot/source/sdstor/stgavl.hxx:43
+    StgAvlNode m_pRight StgAvlNode *
+    StgDirEntry
+sot/source/sdstor/stgcache.hxx:57
+    StgCache m_pStrm SvStream *
+    SvFileStream
+starmath/inc/caret.hxx:26
+    SmCaretPos pSelectedNode SmNode *
+    SmTextNode
+starmath/source/unofilter.cxx:28
+    (anonymous namespace)::MathTypeFilter m_xDstDoc uno::Reference<lang::XComponent>
+    SmModel
+stoc/source/proxy_factory/proxyfac.cxx:153
+    (anonymous namespace)::binuno_Proxy m_typeDescr TypeDescription
+    _typelib_InterfaceTypeDescription
+store/source/storbase.hxx:546
+    store::OStorePageObject m_xPage std::shared_ptr<PageData>
+    store::OStoreDirectoryPageData
+svgio/inc/svgvisitor.hxx:23
+    svgio::svgreader::SvgDrawVisitor mpCurrent std::shared_ptr<gfx::DrawBase>
+    gfx::DrawRoot
+svx/source/accessibility/AccessibleTextHelper.cxx:188
+    accessibility::AccessibleTextHelper_Impl mxFrontEnd uno::Reference<XAccessible>
+    accessibility::AccessibleCell
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:459
+    (anonymous namespace)::BinaryFunctionExpression mpFirstArg std::shared_ptr<ExpressionNode>
+    (anonymous namespace)::BinaryFunctionExpression
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:460
+    (anonymous namespace)::BinaryFunctionExpression mpSecondArg std::shared_ptr<ExpressionNode>
+    (anonymous namespace)::BinaryFunctionExpression
+svx/source/unodraw/UnoGraphicExporter.cxx:172
+    (anonymous namespace)::GraphicExporter mpDoc SdrModel *
+    FmFormModel
+svx/source/unodraw/unoshtxt.cxx:82
+    SvxTextEditSourceImpl mpText SdrText *
+    sdr::table::Cell
+sw/inc/calbck.hxx:184
+    SwModify m_pWriterListeners sw::WriterListener *
+    SwClient
+sw/inc/calbck.hxx:287
+    sw::ClientIteratorBase m_pPosition WriterListener *
+    sw::ListenerEntry
+sw/inc/calc.hxx:146
+    SwCalcExp pFieldType const SwFieldType *
+    SwUserFieldType
+sw/inc/cellatr.hxx:57
+    SwTableBoxFormula m_pDefinedIn sw::BroadcastingModify *
+    SwTableBoxFormat
+sw/inc/contentindex.hxx:51
+    SwContentIndex m_pMark const sw::mark::IMark *
+    sw::mark::CrossRefBookmark
+sw/inc/crsrsh.hxx:115
+    SwContentAtPos pFndTextAttr const SwTextAttr *
+    SwTextFootnote
+sw/inc/docstyle.hxx:52
+    SwDocStyleSheet m_pColl SwTextFormatColl *
+    SwConditionTextFormatColl
+sw/inc/hints.hxx:61
+    SwPtrMsgPoolItem pObject void *
+    SwFormat
+sw/inc/OnlineAccessibilityCheck.hxx:30
+    sw::WeakNodeContainer m_pNode SwNode *
+    sw::BroadcastingModify
+sw/inc/section.hxx:152
+    SwSection m_RefLink tools::SvRef<sfx2::SvBaseLink>
+    (anonymous namespace)::SwIntrnlSectRefLink
+sw/inc/swbaslnk.hxx:31
+    SwBaseLink m_pContentNode SwContentNode *
+    SwGrfNode
+sw/inc/swevent.hxx:63
+    SwCallMouseEvent::(unnamed union at /home/noel/libo-plugin/sw/inc/swevent.hxx:60:5) pFormat const SwFrameFormat *
+    sw::SpzFrameFormat
+sw/inc/swevent.hxx:71
+    SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat *
+    sw::SpzFrameFormat
+sw/inc/swserv.hxx:37
+    SwServerObject::(unnamed union at /home/noel/libo-plugin/sw/inc/swserv.hxx:36:5) pBkmk ::sw::mark::IMark *
+    sw::mark::DdeBookmark
+sw/inc/undobj.hxx:300
+    SwUndoFlyBase m_pFrameFormat SwFrameFormat *
+    sw::SpzFrameFormat
+sw/qa/extras/mailmerge/mailmerge2.cxx:291
+    MMTest2 mxMMComponent uno::Reference<lang::XComponent>
+    SwXTextDocument
+sw/qa/extras/mailmerge/mailmerge.cxx:300
+    MMTest mxMMComponent uno::Reference<lang::XComponent>
+    SwXTextDocument
+sw/source/core/access/accfrmobj.hxx:82
+    sw::access::SwAccessibleChild mpDrawObj const SdrObject *
+    SwVirtFlyDrawObj
+sw/source/core/access/accnotexthyperlink.hxx:35
+    SwAccessibleNoTextHyperlink mpFrame const SwFrame *
+    SwLayoutFrame
+sw/source/core/doc/DocumentRedlineManager.cxx:1110
+    (anonymous namespace)::TemporaryRedlineUpdater m_rRedline SwRangeRedline &
+    SwPaM
+sw/source/core/doc/tblrwcl.cxx:81
+    (anonymous namespace)::CpyTabFrame pNewFrameFormat SwTableBoxFormat *
+    SwTableLineFormat
+sw/source/core/inc/flowfrm.hxx:118
+    SwFlowFrame m_pFollow SwFlowFrame *
+    SwTextFrame
+sw/source/core/inc/frame.hxx:338
+    SwFrame mpNext SwFrame *
+    SwContentFrame
+sw/source/core/inc/MarkManager.hxx:160
+    sw::mark::MarkManager m_pLastActiveFieldmark sw::mark::FieldmarkWithDropDownButton *
+    sw::mark::DropDownFieldmark
+sw/source/core/inc/swcache.hxx:204
+    SwCacheAccess m_pObj SwCacheObj *
+    SwTextLine
+sw/source/core/inc/txmsrt.hxx:51
+    SwTOXSource pNd const SwContentNode *
+    SwTextNode
+sw/source/core/inc/viewimp.hxx:61
+    SwViewShellImp m_pShell SwViewShell *
+    SwFEShell
+sw/source/core/layout/paintfrm.cxx:273
+    (anonymous namespace)::SwPaintProperties pSGlobalShell SwViewShell *
+    SwWrtShell
+sw/source/core/text/inftxt.hxx:692
+    SwTextSlot pInf SwTextSizeInfo *
+    SwTextPaintInfo
+sw/source/core/text/itrtxt.hxx:35
+    SwTextIter m_pInf SwTextInfo *
+    SwTextSizeInfo
+sw/source/core/text/porfld.hxx:242
+    SwFieldFormDropDownPortion m_pFieldMark sw::mark::IFieldmark *
+    sw::mark::DropDownFieldmark
+sw/source/core/text/porfld.hxx:260
+    SwFieldFormDatePortion m_pFieldMark sw::mark::IFieldmark *
+    sw::mark::DateFieldmark
+sw/source/core/unocore/unoobj2.cxx:682
+    SwXTextRange::Impl m_pTableOrSectionFormat const SwFrameFormat *
+    SwSectionFormat
+sw/source/core/unocore/unorefmk.cxx:592
+    SwXMeta::Impl m_pMeta sw::Meta *
+    sw::MetaField
+sw/source/filter/html/swhtml.hxx:400
+    SwHTMLParser m_pActionViewShell SwViewShell *
+    SwEditShell
+sw/source/filter/ww8/ww8par.hxx:1269
+    SwWW8ImplReader m_pCurrentColl SwFormat *
+    SwTextFormatColl
+sw/source/filter/ww8/ww8scan.hxx:95
+    SprmResult pSprm const sal_uInt8 *
+    WW8_ANLD
+sw/source/filter/xml/xmlexp.hxx:54
+    SwXMLExport m_pTableItemMapper std::unique_ptr<SvXMLExportItemMapper>
+    (anonymous namespace)::SwXMLTableItemMapper_Impl
+sw/source/ui/dialog/swdlgfact.hxx:231
+    AbstractSwBreakDlg_Impl m_xDlg std::shared_ptr<weld::DialogController>
+    SwBreakDlg
+sw/source/ui/dialog/swdlgfact.hxx:562
+    AbstractInsTableDlg_Impl m_xDlg std::shared_ptr<weld::DialogController>
+    SwInsTableDlg
+sw/source/uibase/inc/fldmgr.hxx:103
+    SwFieldMgr m_pCurField SwField *
+    SwPageNumberField
+sw/source/uibase/inc/swuiccoll.hxx:35
+    SwCondCollPage m_pFormat SwFormat *
+    SwConditionTextFormatColl
+unoidl/source/unoidl-read.cxx:151
+    (anonymous namespace)::Entity entity const rtl::Reference<unoidl::Entity>
+    unoidl::PublishableEntity
+vcl/inc/animate/AnimationRenderer.hxx:48
+    AnimationRenderer mpRenderContext VclPtr<OutputDevice>
+    vcl::WindowOutputDevice
+vcl/inc/listbox.hxx:503
+    ImplListBoxFloatingWindow mpImplLB VclPtr<ImplListBox>
+    vcl::Window
+vcl/inc/qt5/QtAccessibleWidget.hxx:185
+    QtAccessibleWidget m_pObject QObject *
+    QWidget
+vcl/inc/qt5/QtClipboard.hxx:48
+    QtClipboard m_aContents css::uno::Reference<css::datatransfer::XTransferable>
+    QtClipboardTransferable
+vcl/inc/qt5/QtMenu.hxx:45
+    QtMenu mpVCLMenu VclPtr<Menu>
+    MenuBar
+vcl/inc/salusereventlist.hxx:41
+    SalUserEventList::SalUserEvent m_pFrame SalFrame *
+    SvpSalFrame
+vcl/inc/salusereventlist.hxx:42
+    SalUserEventList::SalUserEvent m_pData void *
+    ImplSVEvent
+vcl/inc/salvtables.hxx:45
+    SalInstanceBuilder m_aOwnedToplevel VclPtr<vcl::Window>
+    VclBuilderContainer
+vcl/inc/salvtables.hxx:414
+    SalInstanceLabel m_xLabel VclPtr<Control>
+    FixedText
+vcl/inc/salwtype.hxx:134
+    SalMenuEvent mpMenu void *
+    Menu
+vcl/inc/svdata.hxx:397
+    ImplSVData mpDefInst SalInstance *
+    QtInstance
+vcl/inc/svimpbox.hxx:185
+    SvImpLBox m_pView VclPtr<SvTreeListBox>
+    IconView
+vcl/inc/unx/gendisp.hxx:31
+    SalGenericDisplay m_pCapture SalFrame *
+    GtkSalFrame
+vcl/inc/unx/gtk/gtksalmenu.hxx:55
+    GtkSalMenu mpVCLMenu VclPtr<Menu>
+    MenuBar
+vcl/inc/unx/i18n_cb.hxx:77
+    preedit_data_t pFrame SalFrame *
+    X11SalFrame
+vcl/inc/unx/salgdi.h:136
+    X11SalGraphics mxImpl std::unique_ptr<SalGraphicsImpl>
+    X11GraphicsImpl
+vcl/inc/window.h:230
+    WindowImpl mpSysObj SalObject *
+    QtObject
+vcl/inc/window.h:233
+    WindowImpl mpBorderWindow VclPtr<vcl::Window>
+    ImplBorderWindow
+vcl/inc/window.h:234
+    WindowImpl mpClientWindow VclPtr<vcl::Window>
+    WorkWindow
+vcl/qa/cppunit/lifecycle.cxx:212
+    (anonymous namespace)::LeakTestObject mxRef VclPtr<vcl::Window>
+    vcl::Window
+vcl/qa/cppunit/lifecycle.cxx:213
+    (anonymous namespace)::LeakTestObject mpRef void *
+    vcl::Window
+vcl/source/control/imivctl.hxx:130
+    SvxIconChoiceCtrl_Impl pView VclPtr<SvtIconChoiceCtrl>
+    vcl::Window
+vcl/source/window/impldockingwrapper.hxx:42
+    ImplDockingWindowWrapper mpDockingWindow VclPtr<vcl::Window>
+    DockingWindow
+vcl/source/window/impldockingwrapper.hxx:46
+    ImplDockingWindowWrapper mpOldBorderWin VclPtr<vcl::Window>
+    ImplBorderWindow
+vcl/source/window/menufloatingwindow.hxx:38
+    MenuFloatingWindow pMenu VclPtr<Menu>
+    PopupMenu
+writerfilter/source/dmapper/NumberingManager.hxx:221
+    writerfilter::dmapper::ListsManager m_pCurrentDefinition class AbstractListDef::Pointer
+    writerfilter::dmapper::ListDef
+writerfilter/source/dmapper/StyleSheetTable.cxx:279
+    writerfilter::dmapper::StyleSheetTable_Impl m_pCurrentEntry StyleSheetEntryPtr
+    writerfilter::dmapper::TableStyleSheetEntry
+writerfilter/source/dmapper/TablePropertiesHandler.hxx:38
+    writerfilter::dmapper::TablePropertiesHandler m_pTableManager TableManager *
+    writerfilter::dmapper::DomainMapperTableManager
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:365
+    writerfilter::ooxml::OOXMLFastContextHandlerTable mCurrentChild css::uno::Reference<css::xml::sax::XFastContextHandler>
+    writerfilter::ooxml::OOXMLFastContextHandler
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:536
+    writerfilter::ooxml::OOXMLFastContextHandlerWrapper mxWrappedContext css::uno::Reference<css::xml::sax::XFastContextHandler>
+    writerfilter::ooxml::OOXMLFastContextHandler
+writerperfect/inc/DocumentHandler.hxx:47
+    writerperfect::DocumentHandler mxHandler css::uno::Reference<css::xml::sax::XDocumentHandler>
+    SvXMLImport
+xmloff/source/draw/ximpshap.hxx:555
+    SdXMLFrameShapeContext mxImplContext SvXMLImportContextRef
+    SdXMLShapeContext
+xmloff/source/text/XMLTextFrameContext.hxx:38
+    XMLTextFrameContext m_xImplContext SvXMLImportContextRef
+    (anonymous namespace)::XMLTextFrameContext_Impl
+xmloff/source/transform/ControlOOoTContext.hxx:26
+    XMLControlOOoTransformerContext m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/FormPropOOoTContext.hxx:29
+    XMLFormPropOOoTransformerContext m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/FrameOASISTContext.hxx:26
+    XMLFrameOASISTransformerContext m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/MergeElemTContext.hxx:31
+    XMLMergeElemTransformerContext m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/PersAttrListTContext.hxx:29
+    XMLPersAttrListTContext m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/StyleOASISTContext.cxx:63
+    XMLPropertiesTContext_Impl m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmloff/source/transform/StyleOOoTContext.cxx:144
+    (anonymous namespace)::XMLTypedPropertiesOOoTContext_Impl m_xAttrList css::uno::Reference<css::xml::sax::XAttributeList>
+    XMLMutableAttributeList
+xmlscript/source/xmldlg_imexp/imp_share.hxx:199
+    xmlscript::ElementBase m_pParent ElementBase *
+    xmlscript::ControlElement
+xmlscript/source/xmllib_imexp/imp_share.hxx:149
+    xmlscript::LibElementBase mxParent rtl::Reference<LibElementBase>
+    xmlscript::LibrariesElement
+xmlsecurity/inc/xsecctl.hxx:73
+    InternalSignatureInformation xReferenceResolvedListener css::uno::Reference<css::xml::crypto::sax::XReferenceResolvedListener>
+    SignatureVerifierImpl
diff --git a/compilerplugins/clang/finalclasses.cxx b/compilerplugins/clang/finalclasses.cxx
index 4271a0a76f1b..2d19dd67d703 100644
--- a/compilerplugins/clang/finalclasses.cxx
+++ b/compilerplugins/clang/finalclasses.cxx
@@ -11,6 +11,8 @@
 #include <set>
 #include <string>
 #include <iostream>
+#include "config_clang.h"
+#include "compat.hxx"
 #include "plugin.hxx"
 #include <fstream>
 
@@ -22,11 +24,11 @@ or
 
 In the case of (a), those members/fields can be made private.
 In the case of (b), making the class final means the compiler can devirtualise
-some method class.
+some method calls
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='finalclasses' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='finalclasses' check
   $ ./compilerplugins/clang/finalclasses.py
 
 */
@@ -46,6 +48,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -73,8 +77,9 @@ private:
 bool ignoreClass(StringRef s)
 {
     // ignore stuff in the standard library, and UNO stuff we can't touch.
-    if (s.startswith("rtl::") || s.startswith("sal::") || s.startswith("com::sun::")
-        || s.startswith("std::") || s.startswith("boost::")
+    if (compat::starts_with(s, "rtl::") || compat::starts_with(s, "sal::")
+        || compat::starts_with(s, "com::sun::") || compat::starts_with(s, "std::")
+        || compat::starts_with(s, "boost::")
         || s == "OString" || s == "OUString" || s == "bad_alloc")
     {
         return true;
@@ -86,7 +91,6 @@ bool FinalClasses::VisitCXXRecordDecl(const CXXRecordDecl* decl)
 {
     if (ignoreLocation(decl))
         return true;
-    decl = decl->getCanonicalDecl();
     if (!decl->hasDefinition())
         return true;
 
@@ -114,6 +118,7 @@ bool FinalClasses::VisitCXXRecordDecl(const CXXRecordDecl* decl)
         if ( i->isVirtual() )
             bFoundVirtual = true;
     }
+
     if (!bFoundProtected)
     {
         for (auto it = decl->field_begin(); it != decl->field_end(); ++it) {
@@ -131,7 +136,7 @@ bool FinalClasses::VisitCXXRecordDecl(const CXXRecordDecl* decl)
     if (ignoreClass(s))
         return true;
 
-    SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(decl));
+    SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(decl->getBeginLoc());
     auto const filename = getFilenameOfLocation(spellingLocation);
     auto sourceLocation = filename.substr(strlen(SRCDIR)).str() + ":"
         + std::to_string(compiler.getSourceManager().getSpellingLineNumber(spellingLocation));
diff --git a/compilerplugins/clang/finalclasses.py b/compilerplugins/clang/finalclasses.py
index 8b6f505fdd90..5e9f25a24a51 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import re
-import sys
 
 definitionSet = set()
 inheritFromSet = set()
@@ -54,7 +53,6 @@ for clazz in sorted(definitionSet - inheritFromSet):
     if file.startswith("include/rtl/"): continue
     if file.startswith("include/sal/"): continue
     if file.startswith("include/salhelper/"): continue
-    if file.startswith("include/systools/"): continue
     if file.startswith("include/typelib/"): continue
     if file.startswith("include/uno/"): continue
     # some kind of template noise
diff --git a/compilerplugins/clang/finalmethods.cxx b/compilerplugins/clang/finalmethods.cxx
new file mode 100644
index 000000000000..9dfb93e5f6a7
--- /dev/null
+++ b/compilerplugins/clang/finalmethods.cxx
@@ -0,0 +1,153 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+#include <unordered_map>
+#include <unordered_set>
+#include <string>
+#include <iostream>
+#include "config_clang.h"
+#include "compat.hxx"
+#include "plugin.hxx"
+#include <fstream>
+
+/**
+Look for methods that are final i.e. nothing overrides them
+
+Making the method final means the compiler can devirtualise
+some method calls.
+
+The process goes something like this:
+  $ make check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='finalmethods' check
+  $ ./compilerplugins/clang/finalmethods.py
+
+*/
+
+namespace
+{
+// try to limit the voluminous output a little
+static std::unordered_set<std::string> overriddenSet;
+static std::unordered_map<std::string, std::string> definitionMap; // methodName -> location
+
+class FinalMethods : public RecursiveASTVisitor<FinalMethods>, public loplugin::Plugin
+{
+public:
+    explicit FinalMethods(loplugin::InstantiationData const& data)
+        : Plugin(data)
+    {
+    }
+
+    virtual void run() override
+    {
+        handler.enableTreeWideAnalysisMode();
+
+        TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+        // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
+        // writing to the same logfile
+        std::string output;
+        for (const std::string& s : overriddenSet)
+            output += "overridden:\t" + s + "\n";
+        for (const auto& s : definitionMap)
+            output += "definition:\t" + s.first + "\t" + s.second + "\n";
+        std::ofstream myfile;
+        myfile.open(WORKDIR "/loplugin.finalmethods.log", std::ios::app | std::ios::out);
+        myfile << output;
+        myfile.close();
+    }
+
+    bool shouldVisitTemplateInstantiations() const { return true; }
+
+    bool shouldVisitImplicitCode() const { return true; }
+
+    bool VisitCXXMethodDecl(const CXXMethodDecl*);
+
+private:
+    std::string toString(SourceLocation loc);
+    std::string niceName(const CXXMethodDecl*);
+};
+
+bool FinalMethods::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
+{
+    if (ignoreLocation(methodDecl))
+        return true;
+    if (!methodDecl->isThisDeclarationADefinition())
+        return true;
+    // don't care about compiler-generated functions
+    if (methodDecl->isImplicit())
+        return true;
+    if (!methodDecl->isVirtual())
+        return true;
+    if (!methodDecl->getLocation().isValid())
+        return true;
+    if (isa<CXXDestructorDecl>(methodDecl) || isa<CXXConstructorDecl>(methodDecl))
+        return true;
+
+    methodDecl = methodDecl->getCanonicalDecl();
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(methodDecl->getLocation())))
+        return true;
+
+    std::string methodNiceName = niceName(methodDecl);
+
+    // If the containing class/struct is final, then the method is effectively final too.
+    if (!methodDecl->hasAttr<FinalAttr>() && !methodDecl->getParent()->hasAttr<FinalAttr>())
+        definitionMap.insert({ methodNiceName, toString(methodDecl->getBeginLoc()) });
+
+    for (auto it = methodDecl->begin_overridden_methods();
+         it != methodDecl->end_overridden_methods(); ++it)
+        overriddenSet.insert(niceName(*it));
+
+    return true;
+}
+
+std::string FinalMethods::niceName(const CXXMethodDecl* methodDecl)
+{
+    if (methodDecl->getInstantiatedFromMemberFunction())
+        methodDecl = dyn_cast<CXXMethodDecl>(methodDecl->getInstantiatedFromMemberFunction());
+    else if (methodDecl->getTemplateInstantiationPattern())
+        methodDecl = dyn_cast<CXXMethodDecl>(methodDecl->getTemplateInstantiationPattern());
+
+    std::string returnType = methodDecl->getReturnType().getCanonicalType().getAsString();
+
+    const CXXRecordDecl* recordDecl = methodDecl->getParent();
+    std::string nameAndParams
+        = recordDecl->getQualifiedNameAsString() + "::" + methodDecl->getNameAsString() + "(";
+
+    bool bFirst = true;
+    for (const ParmVarDecl* pParmVarDecl : methodDecl->parameters())
+    {
+        if (bFirst)
+            bFirst = false;
+        else
+            nameAndParams += ",";
+        nameAndParams += pParmVarDecl->getType().getCanonicalType().getAsString();
+    }
+    nameAndParams += ")";
+    if (methodDecl->isConst())
+        nameAndParams += " const";
+
+    return returnType + " " + nameAndParams + " " + returnType;
+}
+
+std::string FinalMethods::toString(SourceLocation loc)
+{
+    SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc(loc);
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    std::string sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(sourceLocation);
+    return sourceLocation;
+}
+
+loplugin::Plugin::Registration<FinalMethods> X("finalmethods", false);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/finalmethods.py b/compilerplugins/clang/finalmethods.py
new file mode 100755
index 000000000000..21414c1acbef
--- /dev/null
+++ b/compilerplugins/clang/finalmethods.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python3
+
+import re
+
+definitionSet = set()
+overriddenSet = set()
+definitionToFileDict = {}
+
+with open("workdir/loplugin.finalmethods.log") as txt:
+    for line in txt:
+        tokens = line.strip().split("\t")
+
+        if len(tokens) == 1:
+            pass
+
+        elif tokens[0] == "definition:":
+            methodName = tokens[1]
+            fileName  = tokens[2]
+            definitionSet.add(methodName)
+            definitionToFileDict[methodName] = fileName
+
+        elif tokens[0] == "overridden:":
+            methodName = tokens[1]
+            overriddenSet.add(methodName)
+
+        else:
+            print( "unknown line: " + line)
+
+match_module_inc1 = re.compile(r'^\w+/inc/')
+match_module_inc2 = re.compile(r'^\w+/.*/inc/')
+tmpset = set()
+for method in sorted(definitionSet - overriddenSet):
+    file = definitionToFileDict[method]
+    # ignore classes defined inside compilation units, the compiler knows they are final already
+    if (".cxx" in file): continue
+    # ignore test and external code
+    if ("/qa/" in file): continue
+    if (file.startswith("workdir/")): continue
+    # We are only really interested in classes that are shared between linkage units, where the compiler
+    # is not able to figure out for itself that classes are final.
+    if not(file.startswith("include/") or match_module_inc1.match(file) or match_module_inc2.match(file)): continue
+    #if not(file.endswith(".hxx")): continue
+    # Exclude URE
+    if file.startswith("include/com/"): continue
+    if file.startswith("include/cppu/"): continue
+    if file.startswith("include/cppuhelper/"): continue
+    if file.startswith("include/osl/"): continue
+    if file.startswith("include/rtl/"): continue
+    if file.startswith("include/sal/"): continue
+    if file.startswith("include/salhelper/"): continue
+    if file.startswith("include/typelib/"): continue
+    if file.startswith("include/uno/"): continue
+    tmpset.add((method, file))
+
+# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
+def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+    return [int(text) if text.isdigit() else text.lower()
+            for text in re.split(_nsre, s)]
+# sort by both the source-line and the datatype, so the output file ordering is stable
+# when we have multiple items on the same source line
+def v_sort_key(v):
+    return natural_sort_key(v[1]) + [v[0]]
+def sort_set_by_natural_key(s):
+    return sorted(s, key=lambda v: v_sort_key(v))
+
+# print output, sorted by name and line number
+with open("compilerplugins/clang/finalmethods.results", "wt") as f:
+    for t in sort_set_by_natural_key(tmpset):
+        f.write(t[1] + "\n")
+        f.write("    " + t[0] + "\n")
+
diff --git a/compilerplugins/clang/flatten.cxx b/compilerplugins/clang/flatten.cxx
index a615b8366b63..a3d57812d924 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "compat.hxx"
 #include "plugin.hxx"
 #include <cassert>
 #include <string>
@@ -48,7 +49,8 @@ private:
     SourceRange ignoreMacroExpansions(SourceRange range);
     SourceRange extendOverComments(SourceRange range);
     std::string getSourceAsString(SourceRange range);
-    llvm::Optional<std::string> invertCondition(Expr const * condExpr, SourceRange conditionRange);
+    compat::optional<std::string> invertCondition(
+        Expr const * condExpr, SourceRange conditionRange);
     bool isLargeCompoundStmt(Stmt const *);
 
     Stmt const * lastStmtInCompoundStmt = nullptr;
@@ -204,7 +206,7 @@ bool Flatten::VisitIfStmt(IfStmt const * ifStmt)
             report(
                 DiagnosticsEngine::Warning,
                 "large if statement at end of function, rather invert the condition and exit early, and flatten the function",
-                compat::getBeginLoc(ifStmt))
+                ifStmt->getBeginLoc())
               << ifStmt->getSourceRange();
         }
         return true;
@@ -238,12 +240,12 @@ bool Flatten::VisitIfStmt(IfStmt const * ifStmt)
             report(
                 DiagnosticsEngine::Warning,
                 "unconditional throw in else branch, rather invert the condition, throw early, and flatten the normal case",
-                compat::getBeginLoc(elseThrowExpr))
+                elseThrowExpr->getBeginLoc())
                 << elseThrowExpr->getSourceRange();
             report(
                 DiagnosticsEngine::Note,
                 "if condition here",
-                compat::getBeginLoc(ifStmt))
+                ifStmt->getBeginLoc())
                 << ifStmt->getSourceRange();
         }
     }
@@ -260,7 +262,7 @@ bool Flatten::VisitIfStmt(IfStmt const * ifStmt)
             report(
                 DiagnosticsEngine::Warning,
                 "unconditional throw in then branch, just flatten the else",
-                compat::getBeginLoc(thenThrowExpr))
+                thenThrowExpr->getBeginLoc())
                 << thenThrowExpr->getSourceRange();
         }
     }
@@ -301,7 +303,7 @@ bool Flatten::rewrite1(IfStmt const * ifStmt)
 
     // in adjusting the formatting I assume that "{" starts on a new line
 
-    llvm::Optional<std::string> conditionString = invertCondition(ifStmt->getCond(), conditionRange);
+    compat::optional<std::string> conditionString = invertCondition(ifStmt->getCond(), conditionRange);
     if (!conditionString)
         return false;
 
@@ -391,7 +393,7 @@ bool Flatten::rewriteLargeIf(IfStmt const * ifStmt)
 
     // in adjusting the formatting I assume that "{" starts on a new line
 
-    llvm::Optional<std::string> conditionString = invertCondition(ifStmt->getCond(), conditionRange);
+    compat::optional<std::string> conditionString = invertCondition(ifStmt->getCond(), conditionRange);
     if (!conditionString)
         return false;
 
@@ -415,7 +417,7 @@ bool Flatten::rewriteLargeIf(IfStmt const * ifStmt)
     return true;
 }
 
-llvm::Optional<std::string> Flatten::invertCondition(Expr const * condExpr, SourceRange conditionRange)
+compat::optional<std::string> Flatten::invertCondition(Expr const * condExpr, SourceRange conditionRange)
 {
     std::string s = getSourceAsString(conditionRange);
 
@@ -454,7 +456,7 @@ llvm::Optional<std::string> Flatten::invertCondition(Expr const * condExpr, Sour
                 s = "!(" + s + ")";
         }
         if (!ok)
-           return llvm::Optional<std::string>();
+           return compat::optional<std::string>();
     }
     else if (auto opCallExpr = dyn_cast<CXXOperatorCallExpr>(condExpr))
     {
@@ -471,7 +473,7 @@ llvm::Optional<std::string> Flatten::invertCondition(Expr const * condExpr, Sour
                 s = "!(" + s + ")";
         }
         if (!ok)
-            return llvm::Optional<std::string>();
+            return compat::optional<std::string>();
     }
     else if (isa<DeclRefExpr>(condExpr) || isa<CallExpr>(condExpr) || isa<MemberExpr>(condExpr))
         s = "!" + s;
diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx
index a1a09a2e6081..777710056684 100644
--- a/compilerplugins/clang/fragiledestructor.cxx
+++ b/compilerplugins/clang/fragiledestructor.cxx
@@ -12,7 +12,7 @@
 #include <iostream>
 
 #include "plugin.hxx"
-#include "compat.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 
 
@@ -111,8 +111,8 @@ bool FragileDestructor::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr
         return true;
 
     // if we see an explicit call to its own method, that's OK
-    auto s1 = compiler.getSourceManager().getCharacterData(compat::getBeginLoc(callExpr));
-    auto s2 = compiler.getSourceManager().getCharacterData(compat::getEndLoc(callExpr));
+    auto s1 = compiler.getSourceManager().getCharacterData(callExpr->getBeginLoc());
+    auto s2 = compiler.getSourceManager().getCharacterData(callExpr->getEndLoc());
     std::string tok(s1, s2-s1);
     if (tok.find("::") != std::string::npos)
         return true;
@@ -125,12 +125,12 @@ bool FragileDestructor::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr
     report(
         DiagnosticsEngine::Warning,
         "calling virtual method from destructor, either make the virtual method final, or make this class final",
-        compat::getBeginLoc(callExpr))
+        callExpr->getBeginLoc())
       << callExpr->getSourceRange();
     report(
         DiagnosticsEngine::Note,
         "callee method here",
-        compat::getBeginLoc(methodDecl))
+        methodDecl->getBeginLoc())
       << methodDecl->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/getimplementationname.cxx b/compilerplugins/clang/getimplementationname.cxx
index acc45acb7442..65cbabfdd4e9 100644
--- a/compilerplugins/clang/getimplementationname.cxx
+++ b/compilerplugins/clang/getimplementationname.cxx
@@ -20,6 +20,7 @@
 #include <fstream>
 #include <regex>
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 #include "clang/Frontend/CompilerInstance.h"
 
@@ -170,7 +171,7 @@ bool GetImplementationName::isStringConstant(
     }
     clang::StringLiteral const * lit = dyn_cast<clang::StringLiteral>(expr);
     if (lit != nullptr) {
-        if (!lit->isAscii()) {
+        if (!compat::isOrdinary(lit)) {
             return false;
         }
         *string = lit->getString();
diff --git a/compilerplugins/clang/getstr.cxx b/compilerplugins/clang/getstr.cxx
index aba53bd6e2e5..97276591e19e 100644
--- a/compilerplugins/clang/getstr.cxx
+++ b/compilerplugins/clang/getstr.cxx
@@ -13,7 +13,6 @@
 #include <stack>
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 // Find matches of
@@ -82,14 +81,14 @@ public:
             return true;
         }
         bool castToVoid = false;
-        if (auto const ic = dyn_cast<ImplicitCastExpr>(arg1))
+        if (isa<ImplicitCastExpr>(arg1))
         {
             if (loplugin::TypeCheck(arg1->getType()).Pointer().Void())
             {
                 castToVoid = true;
             }
         }
-        auto const t = compat::getObjectType(e);
+        auto const t = e->getObjectType();
         auto const tc = loplugin::TypeCheck(t);
         if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
               || tc.Class("OUString").Namespace("rtl").GlobalNamespace()
diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx
index 14574e3cd420..64bc97ff4999 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -17,8 +17,6 @@
 
 #include "clang/Basic/Builtins.h"
 
-#include "config_clang.h"
-
 #include "check.hxx"
 #include "compat.hxx"
 #include "plugin.hxx"
@@ -32,7 +30,7 @@ Expr const * ignoreParenAndTemporaryMaterialization(Expr const * expr) {
         if (e == nullptr) {
             return expr;
         }
-        expr = compat::getSubExpr(e);
+        expr = e->getSubExpr();
     }
 }
 
@@ -65,14 +63,15 @@ QualType reconstructTemplateArgumentType(
     SubstTemplateTypeParmType const * parmType)
 {
     TemplateParameterList const * ps = decl->getTemplateParameters();
-    auto i = std::find(ps->begin(), ps->end(), parmType->getReplacedParameter()->getDecl());
+    auto i = std::find(ps->begin(), ps->end(), compat::getReplacedParameter(parmType));
     if (i == ps->end()) {
         return {};
     }
-    if (ps->size() != specializationType->getNumArgs()) { //TODO
+    auto const args = specializationType->template_arguments();
+    if (ps->size() != args.size()) { //TODO
         return {};
     }
-    TemplateArgument const & arg = specializationType->getArg(i - ps->begin());
+    TemplateArgument const & arg = args[i - ps->begin()];
     if (arg.getKind() != TemplateArgument::Type) {
         return {};
     }
@@ -181,15 +180,24 @@ bool isBoolExpr(Expr const * expr) {
                 (void)op;
                 TemplateDecl const * d
                     = t->getTemplateName().getAsTemplateDecl();
-                if (d == nullptr
-                    || (d->getQualifiedNameAsString()
-                        != "com::sun::star::uno::Sequence")
-                    || t->getNumArgs() != 1
-                    || t->getArg(0).getKind() != TemplateArgument::Type)
+                if (d == nullptr) {
+                    break;
+                }
+                auto const dc = loplugin::DeclCheck(d->getTemplatedDecl());
+                auto const args = t->template_arguments();
+                if (dc.ClassOrStruct("array").StdNamespace() && args.size() >= 2
+                           && args[0].getKind() == TemplateArgument::Type)
                 {
+                    ty = args[0].getAsType();
+                } else if (dc.Class("Sequence").Namespace("uno").Namespace("star").Namespace("sun")
+                               .Namespace("com").GlobalNamespace()
+                           && args.size() == 1
+                           && args[0].getKind() == TemplateArgument::Type)
+                {
+                    ty = args[0].getAsType();
+                } else {
                     break;
                 }
-                ty = t->getArg(0).getAsType();
             }
             stack.pop();
             if (stack.empty()) {
@@ -253,28 +261,9 @@ public:
 
     bool TraverseBinaryOperator(BinaryOperator * expr);
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinLT(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinLE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinGT(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinGE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinEQ(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinNE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinAssign(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-#endif
-
     bool TraverseCompoundAssignOperator(CompoundAssignOperator * expr);
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinAndAssign(CompoundAssignOperator * expr)
-    { return TraverseCompoundAssignOperator(expr); }
-    bool TraverseBinOrAssign(CompoundAssignOperator * expr)
-    { return TraverseCompoundAssignOperator(expr); }
-    bool TraverseBinXorAssign(CompoundAssignOperator * expr)
-    { return TraverseCompoundAssignOperator(expr); }
-#endif
-
-    bool TraverseCXXStdInitializerListExpr(CXXStdInitializerListExpr * expr);
+    bool TraverseInitListExpr(InitListExpr * expr);
 
     bool TraverseReturnStmt(ReturnStmt * stmt);
 
@@ -425,9 +414,10 @@ bool ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr)
                         = ct->getTemplateName().getAsTemplateDecl();
                     if (td != nullptr) {
                         //TODO: fix this superficial nonsense check:
-                        if (ct->getNumArgs() >= 1
-                            && ct->getArg(0).getKind() == TemplateArgument::Type
-                            && (loplugin::TypeCheck(ct->getArg(0).getAsType())
+                        auto const args = ct->template_arguments();
+                        if (args.size() >= 1
+                            && args[0].getKind() == TemplateArgument::Type
+                            && (loplugin::TypeCheck(args[0].getAsType())
                                 .AnyBoolean()))
                         {
                             continue;
@@ -613,7 +603,7 @@ bool ImplicitBoolConversion::TraverseCompoundAssignOperator(CompoundAssignOperat
             {
                 report(
                     DiagnosticsEngine::Warning, "mix of %0 and %1 in operator %2",
-                    compat::getBeginLoc(expr->getRHS()))
+                    expr->getRHS()->getBeginLoc())
                     << expr->getLHS()->getType()
                     << expr->getRHS()->IgnoreParenImpCasts()->getType()
                     << expr->getOpcodeStr()
@@ -626,36 +616,15 @@ bool ImplicitBoolConversion::TraverseCompoundAssignOperator(CompoundAssignOperat
     }
 }
 
-bool ImplicitBoolConversion::TraverseCXXStdInitializerListExpr(
-    CXXStdInitializerListExpr * expr)
-{
-    // Must be some std::initializer_list<T>; check whether T is sal_Bool (i.e.,
-    // unsigned char) [TODO: check for real sal_Bool instead]:
-    auto t = expr->getType();
-    if (auto et = dyn_cast<ElaboratedType>(t)) {
-        t = et->desugar();
-    }
-    auto ts = t->getAs<TemplateSpecializationType>();
-    if (ts == nullptr
-        || !ts->getArg(0).getAsType()->isSpecificBuiltinType(
-            clang::BuiltinType::UChar))
-    {
-        return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
-    }
-    // Avoid warnings for code like
-    //
-    //  Sequence<sal_Bool> arBool({true, false, true});
-    //
-    auto e = dyn_cast<InitListExpr>(
-        ignoreParenAndTemporaryMaterialization(expr->getSubExpr()));
-    if (e == nullptr) {
-        return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
-    }
+bool ImplicitBoolConversion::TraverseInitListExpr(InitListExpr * expr) {
     nested.push(std::vector<ImplicitCastExpr const *>());
-    bool ret = RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
+    auto const e = expr->isSemanticForm() ? expr : expr->getSemanticForm();
+    auto const ret = TraverseSynOrSemInitListExpr(e, nullptr);
     assert(!nested.empty());
     for (auto i: nested.top()) {
-        if (std::find(e->begin(), e->end(), i) == e->end()) {
+        if (std::find(e->begin(), e->end(), i) == e->end()
+            || !i->getType()->isSpecificBuiltinType(clang::BuiltinType::UChar))
+        {
             reportWarning(i);
         }
     }
@@ -722,13 +691,33 @@ bool ImplicitBoolConversion::VisitImplicitCastExpr(
     if (isBool(compat::getSubExprAsWritten(expr)) && !isBool(expr)) {
         // Ignore NoOp from 'sal_Bool' (aka 'unsigned char') to 'const unsigned
         // char' in makeAny(b) with b of type sal_Bool:
-        if (expr->getCastKind() != CK_NoOp) {
-            if (nested.empty()) {
-                reportWarning(expr);
-            } else {
-                nested.top().push_back(expr);
+        if (expr->getCastKind() == CK_NoOp) {
+            return true;
+        }
+        // Ignore implicit conversions from bool to int in
+        //
+        //   #define _G_STR_NONNULL(x) (x + !x)
+        //
+        // from
+        // <https://gitlab.gnome.org/GNOME/glib/-/commit/48730d2b30473c5eeda2badf9a65d380304477c3>
+        // "gstrfuncs: Add back x + !x warning workaround":
+        if (auto const sub = dyn_cast<UnaryOperator>(compat::getSubExprAsWritten(expr))) {
+            if (sub->getOpcode() == UO_LNot) {
+                auto const l = expr->getBeginLoc();
+                if (compiler.getSourceManager().isMacroBodyExpansion(l)
+                    && Lexer::getImmediateMacroName(
+                            l, compiler.getSourceManager(), compiler.getLangOpts())
+                        == "_G_STR_NONNULL")
+                {
+                    return true;
+                }
             }
         }
+        if (nested.empty()) {
+            reportWarning(expr);
+        } else {
+            nested.top().push_back(expr);
+        }
         return true;
     }
     if (auto const sub = dyn_cast<ExplicitCastExpr>(
@@ -750,7 +739,7 @@ bool ImplicitBoolConversion::VisitImplicitCastExpr(
                 DiagnosticsEngine::Warning,
                 ("explicit conversion (%0) from %1 to %2 implicitly cast back"
                  " to %3"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << sub->getCastKindName() << subsub->getType() << sub->getType()
                 << expr->getType() << expr->getSourceRange();
             return true;
@@ -767,7 +756,7 @@ bool ImplicitBoolConversion::VisitImplicitCastExpr(
             report(
                 DiagnosticsEngine::Warning,
                 "implicit conversion (%0) of call argument from %1 to %2",
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCastKindName() << expr->getSubExpr()->getType()
                 << expr->getType() << expr->getSourceRange();
             return true;
@@ -782,7 +771,7 @@ bool ImplicitBoolConversion::VisitMaterializeTemporaryExpr(
     if (ignoreLocation(expr)) {
         return true;
     }
-    if (auto const sub = dyn_cast<ExplicitCastExpr>(compat::getSubExpr(expr))) {
+    if (auto const sub = dyn_cast<ExplicitCastExpr>(expr->getSubExpr())) {
         auto const subsub = compat::getSubExprAsWritten(sub);
         if (subsub->getType().IgnoreParens() == expr->getType().IgnoreParens()
             && isBool(subsub))
@@ -791,7 +780,7 @@ bool ImplicitBoolConversion::VisitMaterializeTemporaryExpr(
                 DiagnosticsEngine::Warning,
                 ("explicit conversion (%0) from %1 to %2 implicitly converted"
                  " back to %3"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << sub->getCastKindName() << subsub->getType() << sub->getType()
                 << expr->getType() << expr->getSourceRange();
             return true;
@@ -857,31 +846,39 @@ void ImplicitBoolConversion::checkCXXConstructExpr(
         if (j != expr->arg_end()) {
             TemplateSpecializationType const * t1 = expr->getType()->
                 getAs<TemplateSpecializationType>();
-            SubstTemplateTypeParmType const * t2 = nullptr;
-            CXXConstructorDecl const * d = expr->getConstructor();
-            if (d->getNumParams() == expr->getNumArgs()) { //TODO: better check
-                t2 = getAsSubstTemplateTypeParmType(
-                    d->getParamDecl(j - expr->arg_begin())->getType()
-                    .getNonReferenceType());
-            }
-            if (t1 != nullptr && t2 != nullptr) {
-                TemplateDecl const * td
-                    = t1->getTemplateName().getAsTemplateDecl();
-                if (td != nullptr) {
-                    TemplateParameterList const * ps
-                        = td->getTemplateParameters();
-                    auto i = std::find(
-                        ps->begin(), ps->end(),
-                        t2->getReplacedParameter()->getDecl());
-                    if (i != ps->end()) {
-                        if (ps->size() == t1->getNumArgs()) { //TODO
-                            TemplateArgument const & arg = t1->getArg(
-                                i - ps->begin());
-                            if (arg.getKind() == TemplateArgument::Type
-                                && (loplugin::TypeCheck(arg.getAsType())
-                                    .AnyBoolean()))
-                            {
-                                continue;
+            if (t1 == nullptr) {
+                //TODO:
+                if (i->getType()->isSpecificBuiltinType(clang::BuiltinType::UChar)) {
+                    continue;
+                }
+            } else {
+                SubstTemplateTypeParmType const * t2 = nullptr;
+                CXXConstructorDecl const * d = expr->getConstructor();
+                if (d->getNumParams() == expr->getNumArgs()) { //TODO: better check
+                    t2 = getAsSubstTemplateTypeParmType(
+                        d->getParamDecl(j - expr->arg_begin())->getType()
+                        .getNonReferenceType());
+                }
+                if (t2 != nullptr) {
+                    TemplateDecl const * td
+                        = t1->getTemplateName().getAsTemplateDecl();
+                    if (td != nullptr) {
+                        TemplateParameterList const * ps
+                            = td->getTemplateParameters();
+                        auto k = std::find(
+                            ps->begin(), ps->end(),
+                            compat::getReplacedParameter(t2));
+                        if (k != ps->end()) {
+                            auto const args = t1->template_arguments();
+                            if (ps->size() == args.size()) { //TODO
+                                TemplateArgument const & arg = args[
+                                    k - ps->begin()];
+                                if (arg.getKind() == TemplateArgument::Type
+                                    && (loplugin::TypeCheck(arg.getAsType())
+                                        .AnyBoolean()))
+                                {
+                                    continue;
+                                }
                             }
                         }
                     }
@@ -897,8 +894,9 @@ void ImplicitBoolConversion::reportWarning(ImplicitCastExpr const * expr) {
         if (expr->getCastKind() == CK_ConstructorConversion) {
             auto const t1 = expr->getType();
             if (auto const t2 = t1->getAs<TemplateSpecializationType>()) {
-                assert(t2->getNumArgs() >= 1);
-                auto const a = t2->getArg(0);
+                auto const args = t2->template_arguments();
+                assert(args.size() >= 1);
+                auto const a = args[0];
                 if (a.getKind() == TemplateArgument::Type && a.getAsType()->isBooleanType()
                     && (loplugin::TypeCheck(t1).TemplateSpecializationClass()
                         .ClassOrStruct("atomic").StdNamespace()))
@@ -909,7 +907,7 @@ void ImplicitBoolConversion::reportWarning(ImplicitCastExpr const * expr) {
         }
         report(
             DiagnosticsEngine::Warning,
-            "implicit conversion (%0) from %1 to %2", compat::getBeginLoc(expr))
+            "implicit conversion (%0) from %1 to %2", expr->getBeginLoc())
             << expr->getCastKindName() << expr->getSubExprAsWritten()->getType()
             << expr->getType() << expr->getSourceRange();
     }
diff --git a/compilerplugins/clang/implinheritancehelper.cxx b/compilerplugins/clang/implinheritancehelper.cxx
new file mode 100644
index 000000000000..1eb1db60a90b
--- /dev/null
+++ b/compilerplugins/clang/implinheritancehelper.cxx
@@ -0,0 +1,124 @@
+/* -*- 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/.
+ */
+
+#include <string>
+#include <iostream>
+
+#include "check.hxx"
+#include "plugin.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+
+/**
+
+Look for places where we should be using ImplInheritanceHelper
+
+*/
+
+namespace
+{
+class ImplInheritanceHelper : public loplugin::FilteringPlugin<ImplInheritanceHelper>
+{
+public:
+    explicit ImplInheritanceHelper(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override { return true; }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXRecordDecl(const CXXRecordDecl*);
+};
+
+bool ImplInheritanceHelper::VisitCXXRecordDecl(const CXXRecordDecl* cxxRecordDecl)
+{
+    if (ignoreLocation(cxxRecordDecl))
+        return true;
+    if (!cxxRecordDecl->isThisDeclarationADefinition())
+        return true;
+    if (cxxRecordDecl->isDependentContext())
+        return true;
+
+    // ignore the utility template classes
+    SourceLocation spellingLocation
+        = compiler.getSourceManager().getSpellingLoc(cxxRecordDecl->getBeginLoc());
+    StringRef fileName = getFilenameOfLocation(spellingLocation);
+    if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/include/cppu"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/comphelper/compbase.hxx"))
+        return true;
+
+    // not sure why this extends XPropertyState but does not support it in queryInterface.
+    if (loplugin::DeclCheck(cxxRecordDecl)
+            .Class("ChainablePropertySet")
+            .Namespace("comphelper")
+            .GlobalNamespace())
+        return true;
+    // in these cases the UNO interface is optional
+    if (loplugin::DeclCheck(cxxRecordDecl).Class("OFSInputStreamContainer").GlobalNamespace())
+        return true;
+    if (loplugin::DeclCheck(cxxRecordDecl)
+            .Class("OPropertyBrowserController")
+            .Namespace("pcr")
+            .GlobalNamespace())
+        return true;
+    if (loplugin::DeclCheck(cxxRecordDecl).Class("SdDrawPage").GlobalNamespace())
+        return true;
+    if (loplugin::DeclCheck(cxxRecordDecl).Class("SdMasterPage").GlobalNamespace())
+        return true;
+
+    // check if this class extends cppu::WeakImplHelper
+    if (!loplugin::isDerivedFrom(cxxRecordDecl, [](Decl const* decl) -> bool {
+            return bool(loplugin::DeclCheck(decl)
+                            .Class("WeakImplHelper")
+                            .Namespace("cppu")
+                            .GlobalNamespace());
+        }))
+        return true;
+    // check if this class directly inherits from a UNO interface class
+    bool foundOne = false;
+    for (auto const& i : cxxRecordDecl->bases())
+    {
+        auto rt = i.getType()->getAs<RecordType>();
+        if (!rt)
+            continue;
+        auto const bd = cast<CXXRecordDecl>(rt->getDecl())->getDefinition();
+        auto ctx = bd->getDeclContext();
+        if (!ctx->isNamespace())
+            break;
+        auto ns = dyn_cast<NamespaceDecl>(ctx);
+        while (ns)
+        {
+            if (ns->getIdentifier() && ns->getName() == "star")
+            {
+                foundOne = true;
+                break;
+            }
+            ns = dyn_cast_or_null<NamespaceDecl>(ns->getParent());
+        }
+    }
+    if (!foundOne)
+        return true;
+    report(DiagnosticsEngine::Warning, "can probably use ImplInheritanceHelper here",
+           cxxRecordDecl->getLocation())
+        << cxxRecordDecl->getSourceRange();
+    return true;
+}
+
+loplugin::Plugin::Registration<ImplInheritanceHelper>
+    implinheritancehelper("implinheritancehelper");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/includeform.cxx b/compilerplugins/clang/includeform.cxx
index 9d6587506a85..173f9e28841b 100644
--- a/compilerplugins/clang/includeform.cxx
+++ b/compilerplugins/clang/includeform.cxx
@@ -28,17 +28,24 @@ private:
 
     void InclusionDirective(
         SourceLocation HashLoc, Token const & IncludeTok, StringRef,
-        bool IsAngled, CharSourceRange FilenameRange, FileEntry const * File,
-        StringRef SearchPath, StringRef, clang::Module const *
-#if CLANG_VERSION >= 70000
-        , SrcMgr::CharacteristicKind
+        bool IsAngled, CharSourceRange FilenameRange,
+#if CLANG_VERSION >= 160000
+        OptionalFileEntryRef File,
+#elif CLANG_VERSION >= 150000
+        Optional<FileEntryRef> File,
+#else
+        FileEntry const * File,
 #endif
-        ) override
+        StringRef SearchPath, StringRef, clang::Module const *,
+#if CLANG_VERSION >= 190000
+        bool,
+#endif
+        SrcMgr::CharacteristicKind) override
     {
         if (ignoreLocation(HashLoc)) {
             return;
         }
-        if (File == nullptr) { // in case of "fatal error: '...' file not found"
+        if (!File) { // in case of "fatal error: '...' file not found"
             return;
         }
         if (IncludeTok.getIdentifierInfo()->getPPKeywordID() != tok::pp_include)
diff --git a/compilerplugins/clang/indentation.cxx b/compilerplugins/clang/indentation.cxx
index 088de1e702d6..cf2512d1d25d 100644
--- a/compilerplugins/clang/indentation.cxx
+++ b/compilerplugins/clang/indentation.cxx
@@ -15,6 +15,8 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include <unordered_set>
+#include "config_clang.h"
 #include "plugin.hxx"
 
 /*
@@ -49,6 +51,7 @@ public:
             return false;
         // the QEMIT macros
         if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qt5/")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qt6/")
             || loplugin::isSamePathname(fn, SRCDIR "/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx"))
             return false;
         return true;
@@ -65,9 +68,17 @@ public:
     bool PostTraverseSwitchStmt(SwitchStmt*, bool);
     bool TraverseSwitchStmt(SwitchStmt*);
     bool VisitSwitchStmt(SwitchStmt const*);
+    bool VisitIfStmt(IfStmt const*);
+    bool VisitForStmt(ForStmt const*);
+    bool VisitWhileStmt(WhileStmt const*);
+    bool VisitDoStmt(DoStmt const*);
+    bool VisitCXXForRangeStmt(CXXForRangeStmt const*);
 
 private:
+    void checkCompoundStmtBraces(const Stmt* parentStmt, const CompoundStmt*);
+
     std::vector<const Stmt*> switchStmtBodies;
+    std::unordered_set<const Stmt*> chainedSet;
 };
 
 bool Indentation::PreTraverseSwitchStmt(SwitchStmt* switchStmt)
@@ -109,7 +120,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
     {
         auto stmt = *i;
         auto const actualPrevEnd = prevEnd;
-        prevEnd = compat::getEndLoc(stmt); // compute early, before below `continue`s
+        prevEnd = stmt->getEndLoc(); // compute early, before below `continue`s
 
         // these show up in macro expansions, not interesting
         if (isa<NullStmt>(stmt))
@@ -117,28 +128,8 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
         // these are always weirdly indented
         if (isa<LabelStmt>(stmt))
             continue;
-#if CLANG_VERSION < 100000
-        // Before
-        // <https://github.com/llvm/llvm-project/commit/dc3957ec215dd17b8d293461f18696566637a6cd>
-        // "Include leading attributes in DeclStmt's SourceRange", getBeginLoc of a VarDecl DeclStmt
-        // with an UnusedAttr pointed after the attr (and getLocation of the attr pointed at
-        // "maybe_unused", not at the leading "[["), so just ignore those in old compiler versions:
-        if (auto const declStmt = dyn_cast<DeclStmt>(stmt))
-        {
-            if (declStmt->decl_begin() != declStmt->decl_end())
-            {
-                if (auto const decl = dyn_cast<VarDecl>(*declStmt->decl_begin()))
-                {
-                    if (decl->hasAttr<UnusedAttr>())
-                    {
-                        continue;
-                    }
-                }
-            }
-        }
-#endif
 
-        auto stmtLoc = compat::getBeginLoc(stmt);
+        auto stmtLoc = stmt->getBeginLoc();
 
         StringRef macroName;
         bool partOfMacro = false;
@@ -156,11 +147,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
             // similar thing in forms/
             if (macroName == "DECL_IFACE_PROP_IMPL" || macroName == "DECL_BOOL_PROP_IMPL")
                 continue;
-#if CLANG_VERSION >= 70000
             stmtLoc = SM.getExpansionRange(stmtLoc).getBegin();
-#else
-            stmtLoc = SM.getExpansionRange(stmtLoc).first;
-#endif
         }
 
         // check for comment to the left of the statement
@@ -202,13 +189,12 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
         {
             if (containsPreprocessingConditionalInclusion(SourceRange(
                     locationAfterToken(compiler.getSourceManager().getExpansionLoc(actualPrevEnd)),
-                    compiler.getSourceManager().getExpansionLoc(compat::getBeginLoc(stmt)))))
+                    compiler.getSourceManager().getExpansionLoc(stmt->getBeginLoc()))))
                 continue;
             report(DiagnosticsEngine::Warning, "statement mis-aligned compared to neighbours %0",
                    stmtLoc)
                 << macroName;
-            report(DiagnosticsEngine::Note, "measured against this one",
-                   compat::getBeginLoc(firstStmt));
+            report(DiagnosticsEngine::Note, "measured against this one", firstStmt->getBeginLoc());
             //getParentStmt(compoundStmt)->dump();
             //stmt->dump();
         }
@@ -219,7 +205,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
                 auto bodyStmt = ifStmt->getThen();
                 if (bodyStmt && !isa<CompoundStmt>(bodyStmt))
                 {
-                    stmtLoc = compat::getBeginLoc(bodyStmt);
+                    stmtLoc = bodyStmt->getBeginLoc();
                     invalid1 = false;
                     invalid2 = false;
                     unsigned bodyColumn = SM.getPresumedColumnNumber(stmtLoc, &invalid1);
@@ -234,7 +220,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
                 auto elseStmt = ifStmt->getElse();
                 if (elseStmt && !isa<CompoundStmt>(elseStmt) && !isa<IfStmt>(elseStmt))
                 {
-                    stmtLoc = compat::getBeginLoc(elseStmt);
+                    stmtLoc = elseStmt->getBeginLoc();
                     invalid1 = false;
                     invalid2 = false;
                     unsigned elseColumn = SM.getPresumedColumnNumber(stmtLoc, &invalid1);
@@ -258,9 +244,157 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
                 }
             }
     }
+
     return true;
 }
 
+bool Indentation::VisitIfStmt(IfStmt const* ifStmt)
+{
+    if (ignoreLocation(ifStmt))
+        return true;
+
+    // TODO - ignore chained if statements for now
+    if (auto chained = ifStmt->getElse())
+        chainedSet.insert(chained);
+    if (chainedSet.find(ifStmt) != chainedSet.end())
+        return true;
+
+    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(ifStmt->getThen()))
+        checkCompoundStmtBraces(ifStmt, compoundStmt);
+    // TODO - needs to be checked against the line that contains the else keyword, but not against the parent
+    //    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(ifStmt->getElse()))
+    //        checkCompoundStmtBraces(ifStmt, compoundStmt);
+    return true;
+}
+
+bool Indentation::VisitForStmt(ForStmt const* forStmt)
+{
+    if (ignoreLocation(forStmt))
+        return true;
+    if (chainedSet.find(forStmt) != chainedSet.end())
+        return true;
+    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(forStmt->getBody()))
+        checkCompoundStmtBraces(forStmt, compoundStmt);
+    return true;
+}
+
+bool Indentation::VisitWhileStmt(WhileStmt const* whileStmt)
+{
+    if (ignoreLocation(whileStmt))
+        return true;
+    if (chainedSet.find(whileStmt) != chainedSet.end())
+        return true;
+    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(whileStmt->getBody()))
+        checkCompoundStmtBraces(whileStmt, compoundStmt);
+    return true;
+}
+
+bool Indentation::VisitDoStmt(DoStmt const* doStmt)
+{
+    if (ignoreLocation(doStmt))
+        return true;
+    if (chainedSet.find(doStmt) != chainedSet.end())
+        return true;
+    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(doStmt->getBody()))
+        checkCompoundStmtBraces(doStmt, compoundStmt);
+    return true;
+}
+
+bool Indentation::VisitCXXForRangeStmt(CXXForRangeStmt const* cxxForRangeStmt)
+{
+    if (ignoreLocation(cxxForRangeStmt))
+        return true;
+    if (chainedSet.find(cxxForRangeStmt) != chainedSet.end())
+        return true;
+    if (auto compoundStmt = dyn_cast_or_null<CompoundStmt>(cxxForRangeStmt->getBody()))
+        checkCompoundStmtBraces(cxxForRangeStmt, compoundStmt);
+    return true;
+}
+
+void Indentation::checkCompoundStmtBraces(const Stmt* parentStmt, const CompoundStmt* compoundStmt)
+{
+    auto& SM = compiler.getSourceManager();
+    bool invalid1 = false;
+    bool invalid2 = false;
+
+    auto parentBeginLoc = parentStmt->getBeginLoc();
+    unsigned parentColumn = SM.getPresumedColumnNumber(parentBeginLoc, &invalid1);
+    if (invalid1)
+        return;
+
+    auto startBraceLoc = compoundStmt->getLBracLoc();
+    auto endBraceLoc = compoundStmt->getRBracLoc();
+    unsigned beginColumn = SM.getPresumedColumnNumber(startBraceLoc, &invalid1);
+    unsigned beginLine = SM.getPresumedLineNumber(startBraceLoc, &invalid2);
+    if (invalid1 || invalid2)
+        return;
+    unsigned endColumn = SM.getPresumedColumnNumber(endBraceLoc, &invalid1);
+    unsigned endLine = SM.getPresumedLineNumber(endBraceLoc, &invalid2);
+    if (invalid1 || invalid2)
+        return;
+    if (beginLine == endLine)
+        return;
+
+    // check for code to the left of the starting brace
+    bool foundCodeToLeft = false;
+    {
+        const char* p1 = SM.getCharacterData(startBraceLoc);
+        --p1;
+        while (*p1 && *p1 != '\n')
+        {
+            if (*p1 != ' ')
+            {
+                foundCodeToLeft = true;
+                break;
+            }
+            --p1;
+        }
+    }
+
+    // if we found code to the left of the start brace, that means the end-brace needs
+    // to line up with the start of the parent statement
+    if (foundCodeToLeft)
+    {
+        if (parentColumn != endColumn)
+        {
+            report(DiagnosticsEngine::Warning, "end brace not aligned with beginning of statement",
+                   endBraceLoc);
+            report(DiagnosticsEngine::Note, "statement beginning here", parentBeginLoc);
+        }
+        return;
+    }
+
+    if (parentColumn != beginColumn)
+    {
+        report(DiagnosticsEngine::Warning,
+               "start brace not aligned with beginning of parent statement", startBraceLoc);
+        report(DiagnosticsEngine::Note, "statement beginning here", parentBeginLoc);
+    }
+    else if (beginColumn != endColumn)
+    {
+        report(DiagnosticsEngine::Warning, "start and end brace not aligned", endBraceLoc);
+        report(DiagnosticsEngine::Note, "start brace here", startBraceLoc);
+    }
+
+    /** now check that lines inside the compoundstmt are indented */
+    if (!compoundStmt->size())
+        return;
+    auto firstStmt = compoundStmt->body_front();
+    if (isa<LabelStmt>(firstStmt))
+        return;
+    auto firstStmtLoc = firstStmt->getBeginLoc();
+    unsigned firstStmtBeginColumn = SM.getPresumedColumnNumber(firstStmtLoc, &invalid1);
+    if (invalid1)
+        return;
+    if (firstStmtBeginColumn > beginColumn)
+        return;
+    StringRef fn = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(firstStmtLoc));
+    // this is doing code generation, so the weird layout is deliberate
+    if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/core/opencl/"))
+        return;
+    report(DiagnosticsEngine::Warning, "body inside brace not indented", firstStmtLoc);
+}
+
 bool Indentation::VisitSwitchStmt(SwitchStmt const* switchStmt)
 {
     if (ignoreLocation(switchStmt))
@@ -283,7 +417,7 @@ bool Indentation::VisitSwitchStmt(SwitchStmt const* switchStmt)
         if (!caseStmt)
             continue;
 
-        auto stmtLoc = compat::getBeginLoc(caseStmt);
+        auto stmtLoc = caseStmt->getBeginLoc();
 
         bool invalid1 = false;
         bool invalid2 = false;
@@ -309,7 +443,7 @@ bool Indentation::VisitSwitchStmt(SwitchStmt const* switchStmt)
             //            report(DiagnosticsEngine::Warning, "statement mis-aligned compared to neighbours",
             //                   stmtLoc);
             //            report(DiagnosticsEngine::Note, "measured against this one",
-            //                   compat::getBeginLoc(firstStmt));
+            //                   firstStmt->getBeginLoc());
             //getParentStmt(compoundStmt)->dump();
             //stmt->dump();
         }
diff --git a/compilerplugins/clang/intvsfloat.cxx b/compilerplugins/clang/intvsfloat.cxx
index d89b34155cce..f6bd996a1e6d 100644
--- a/compilerplugins/clang/intvsfloat.cxx
+++ b/compilerplugins/clang/intvsfloat.cxx
@@ -35,7 +35,7 @@ public:
     bool VisitBinaryOperator(BinaryOperator const*);
 
 private:
-    llvm::Optional<double> getExprValue(Expr const* expr);
+    compat::optional<double> getExprValue(Expr const* expr);
 };
 
 bool IntVsFloat::VisitVarDecl(VarDecl const* varDecl)
@@ -49,13 +49,13 @@ bool IntVsFloat::VisitVarDecl(VarDecl const* varDecl)
     if (varDecl->getType()->isFloatingType())
         return true;
     //    init->dump();
-    llvm::Optional<double> d = getExprValue(init);
+    compat::optional<double> d = getExprValue(init);
     if (!d)
         return true;
     if (static_cast<long>(*d) == *d)
         return true;
     report(DiagnosticsEngine::Warning, "assigning constant float value to int truncates data",
-           compat::getBeginLoc(init))
+           init->getBeginLoc())
         << init->getSourceRange();
 
     return true;
@@ -67,7 +67,7 @@ bool IntVsFloat::VisitBinaryOperator(BinaryOperator const* op)
     {
         return true;
     }
-    if (ignoreLocation(compat::getBeginLoc(op)))
+    if (ignoreLocation(op->getBeginLoc()))
         return true;
     auto lhs = op->getLHS()->IgnoreImpCasts();
     auto rhs = op->getRHS()->IgnoreImpCasts();
@@ -77,29 +77,29 @@ bool IntVsFloat::VisitBinaryOperator(BinaryOperator const* op)
         return true;
     if (rhs->getType()->isFloatingType())
         return true;
-    llvm::Optional<double> d = getExprValue(lhs);
+    compat::optional<double> d = getExprValue(lhs);
     if (!d)
         return true;
     if (static_cast<long>(*d) == *d)
         return true;
     report(DiagnosticsEngine::Warning, "comparing integer to float constant, can never be true",
-           compat::getBeginLoc(op))
+           op->getBeginLoc())
         << op->getSourceRange();
     return true;
 }
 
-llvm::Optional<double> IntVsFloat::getExprValue(Expr const* expr)
+compat::optional<double> IntVsFloat::getExprValue(Expr const* expr)
 {
     // Of the available clang Evaluate* APIs, this is the __only__ one that produces useful output
     // (as of 17 Aug 2018 checkout of clang, ie. towards clang 7)
 
     if (expr->isValueDependent())
-        return llvm::Optional<double>();
+        return compat::optional<double>();
     Expr::EvalResult evalResult;
     if (!expr->EvaluateAsRValue(evalResult, compiler.getASTContext()))
-        return llvm::Optional<double>();
+        return compat::optional<double>();
     if (!evalResult.Val.isFloat())
-        return llvm::Optional<double>();
+        return compat::optional<double>();
     llvm::APFloat floatResult = evalResult.Val.getFloat();
     bool losesInfo;
     floatResult.convert(APFloat::IEEEdouble(), APFloat::rmNearestTiesToEven, &losesInfo);
diff --git a/compilerplugins/clang/literaltoboolconversion.cxx b/compilerplugins/clang/literaltoboolconversion.cxx
index c3f4c7a62e60..3d3a3615ec68 100644
--- a/compilerplugins/clang/literaltoboolconversion.cxx
+++ b/compilerplugins/clang/literaltoboolconversion.cxx
@@ -81,10 +81,9 @@ bool LiteralToBoolConversion::isFromCIncludeFile(
     SourceLocation spellingLocation) const
 {
     return !compiler.getSourceManager().isInMainFile(spellingLocation)
-        && (StringRef(
-                compiler.getSourceManager().getPresumedLoc(spellingLocation)
-                .getFilename())
-            .endswith(".h"));
+        && compat::ends_with(
+            StringRef(compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename()),
+            ".h");
 }
 
 bool LiteralToBoolConversion::isSharedCAndCppCode(SourceLocation location) const
@@ -126,10 +125,10 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
         return;
     }
     if (!subExpr->isValueDependent()) {
-        if (auto const res = compat::getIntegerConstantExpr(subExpr, compiler.getASTContext())) {
+        if (auto const res = subExpr->getIntegerConstantExpr(compiler.getASTContext())) {
             if (res->getLimitedValue() <= 1)
             {
-                SourceLocation loc { compat::getBeginLoc(subExpr) };
+                SourceLocation loc { subExpr->getBeginLoc() };
                 while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
                     loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
                 }
@@ -148,7 +147,7 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
         }
     }
     if (isa<clang::StringLiteral>(subExpr)) {
-        SourceLocation loc { compat::getBeginLoc(subExpr) };
+        SourceLocation loc { subExpr->getBeginLoc() };
         if (compiler.getSourceManager().isMacroArgExpansion(loc)
             && (Lexer::getImmediateMacroName(
                     loc, compiler.getSourceManager(), compiler.getLangOpts())
@@ -164,25 +163,25 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
         bool bRewritten = false;
         if (rewriter != nullptr) {
             SourceLocation loc { compiler.getSourceManager().getExpansionLoc(
-                    compat::getBeginLoc(expr2)) };
-            if (compiler.getSourceManager().getExpansionLoc(compat::getEndLoc(expr2))
+                    expr2->getBeginLoc()) };
+            if (compiler.getSourceManager().getExpansionLoc(expr2->getEndLoc())
                 == loc)
             {
                 char const * s = compiler.getSourceManager().getCharacterData(
                     loc);
                 unsigned n = Lexer::MeasureTokenLength(
-                    compat::getEndLoc(expr2), compiler.getSourceManager(),
+                    expr2->getEndLoc(), compiler.getSourceManager(),
                     compiler.getLangOpts());
                 std::string tok { s, n };
                 if (tok == "sal_False" || tok == "0") {
                     bRewritten = replaceText(
                         compiler.getSourceManager().getExpansionLoc(
-                            compat::getBeginLoc(expr2)),
+                            expr2->getBeginLoc()),
                         n, "false");
                 } else if (tok == "sal_True" || tok == "1") {
                     bRewritten = replaceText(
                         compiler.getSourceManager().getExpansionLoc(
-                            compat::getBeginLoc(expr2)),
+                            expr2->getBeginLoc()),
                         n, "true");
                 }
             }
@@ -191,7 +190,7 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
             report(
                 DiagnosticsEngine::Warning,
                 "implicit conversion (%0) of literal of type %1 to %2",
-                compat::getBeginLoc(expr2))
+                expr2->getBeginLoc())
                 << castExpr->getCastKindName() << subExpr->getType()
                 << castExpr->getType() << expr2->getSourceRange();
         }
@@ -208,18 +207,18 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
             DiagnosticsEngine::Warning,
             ("implicit conversion (%0) of null pointer constant of type %1 to"
              " %2"),
-            compat::getBeginLoc(expr2))
+            expr2->getBeginLoc())
             << castExpr->getCastKindName() << subExpr->getType()
             << castExpr->getType() << expr2->getSourceRange();
     } else if (!subExpr->isValueDependent()) {
-        if (auto const res = compat::getIntegerConstantExpr(subExpr, compiler.getASTContext())) {
+        if (auto const res = subExpr->getIntegerConstantExpr(compiler.getASTContext())) {
             report(
                 DiagnosticsEngine::Warning,
                 ("implicit conversion (%0) of integer constant expression of type"
                  " %1 with value %2 to %3"),
-                compat::getBeginLoc(expr2))
+                expr2->getBeginLoc())
                 << castExpr->getCastKindName() << subExpr->getType()
-                << res->toString(10) << castExpr->getType()
+                << compat::toString(*res, 10) << castExpr->getType()
                 << expr2->getSourceRange();
         }
     }
diff --git a/compilerplugins/clang/locking2.cxx b/compilerplugins/clang/locking2.cxx
new file mode 100644
index 000000000000..d31b29b2023e
--- /dev/null
+++ b/compilerplugins/clang/locking2.cxx
@@ -0,0 +1,716 @@
+/* -*- 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/.
+ */
+
+#if !defined _WIN32 //TODO, #include <sys/file.h>
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <unordered_set>
+#include <vector>
+#include <algorithm>
+#include <optional>
+#include <sys/file.h>
+#include <unistd.h>
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "compat.hxx"
+
+#include "clang/AST/ParentMapContext.h"
+
+/**
+Look for fields that are
+(a) only assigned to in the constructor using field-init, and can therefore be const.
+(b) protected via a mutex guard when accessed
+
+Which normally means we can remove the mutex guard.
+
+The process goes something like this:
+  $ make check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='locking2' check
+  $ ./compilerplugins/clang/locking2.py
+*/
+
+namespace
+{
+struct MyFieldInfo
+{
+    std::string parentClass;
+    std::string fieldName;
+    std::string fieldType;
+    std::string sourceLocation;
+};
+bool operator<(const MyFieldInfo& lhs, const MyFieldInfo& rhs)
+{
+    return std::tie(lhs.parentClass, lhs.fieldName) < std::tie(rhs.parentClass, rhs.fieldName);
+}
+struct MyLockedInfo
+{
+    const MemberExpr* memberExpr;
+    std::string parentClass;
+    std::string fieldName;
+    std::string sourceLocation;
+};
+bool operator<(const MyLockedInfo& lhs, const MyLockedInfo& rhs)
+{
+    return std::tie(lhs.parentClass, lhs.fieldName, lhs.sourceLocation)
+           < std::tie(rhs.parentClass, rhs.fieldName, rhs.sourceLocation);
+}
+
+// try to limit the voluminous output a little
+static std::set<MyFieldInfo> cannotBeConstSet;
+static std::set<MyFieldInfo> definitionSet;
+static std::set<MyLockedInfo> lockedAtSet;
+
+/**
+ * Wrap the different kinds of callable and callee objects in the clang AST so I can define methods that handle everything.
+ */
+class CallerWrapper
+{
+    const CallExpr* m_callExpr;
+    const CXXConstructExpr* m_cxxConstructExpr;
+
+public:
+    CallerWrapper(const CallExpr* callExpr)
+        : m_callExpr(callExpr)
+        , m_cxxConstructExpr(nullptr)
+    {
+    }
+    CallerWrapper(const CXXConstructExpr* cxxConstructExpr)
+        : m_callExpr(nullptr)
+        , m_cxxConstructExpr(cxxConstructExpr)
+    {
+    }
+    unsigned getNumArgs() const
+    {
+        return m_callExpr ? m_callExpr->getNumArgs() : m_cxxConstructExpr->getNumArgs();
+    }
+    const Expr* getArg(unsigned i) const
+    {
+        return m_callExpr ? m_callExpr->getArg(i) : m_cxxConstructExpr->getArg(i);
+    }
+};
+class CalleeWrapper
+{
+    const FunctionDecl* m_calleeFunctionDecl = nullptr;
+    const CXXConstructorDecl* m_cxxConstructorDecl = nullptr;
+    const FunctionProtoType* m_functionPrototype = nullptr;
+
+public:
+    explicit CalleeWrapper(const FunctionDecl* calleeFunctionDecl)
+        : m_calleeFunctionDecl(calleeFunctionDecl)
+    {
+    }
+    explicit CalleeWrapper(const CXXConstructExpr* cxxConstructExpr)
+        : m_cxxConstructorDecl(cxxConstructExpr->getConstructor())
+    {
+    }
+    explicit CalleeWrapper(const FunctionProtoType* functionPrototype)
+        : m_functionPrototype(functionPrototype)
+    {
+    }
+    unsigned getNumParams() const
+    {
+        if (m_calleeFunctionDecl)
+            return m_calleeFunctionDecl->getNumParams();
+        else if (m_cxxConstructorDecl)
+            return m_cxxConstructorDecl->getNumParams();
+        else if (m_functionPrototype->param_type_begin() == m_functionPrototype->param_type_end())
+            // FunctionProtoType will assert if we call getParamTypes() and it has no params
+            return 0;
+        else
+            return m_functionPrototype->getParamTypes().size();
+    }
+    const QualType getParamType(unsigned i) const
+    {
+        if (m_calleeFunctionDecl)
+            return m_calleeFunctionDecl->getParamDecl(i)->getType();
+        else if (m_cxxConstructorDecl)
+            return m_cxxConstructorDecl->getParamDecl(i)->getType();
+        else
+            return m_functionPrototype->getParamTypes()[i];
+    }
+    std::string getNameAsString() const
+    {
+        if (m_calleeFunctionDecl)
+            return m_calleeFunctionDecl->getNameAsString();
+        else if (m_cxxConstructorDecl)
+            return m_cxxConstructorDecl->getNameAsString();
+        else
+            return "";
+    }
+    CXXMethodDecl const* getAsCXXMethodDecl() const
+    {
+        if (m_calleeFunctionDecl)
+            return dyn_cast<CXXMethodDecl>(m_calleeFunctionDecl);
+        return nullptr;
+    }
+};
+
+class Locking2 : public RecursiveASTVisitor<Locking2>, public loplugin::Plugin
+{
+public:
+    explicit Locking2(loplugin::InstantiationData const& data)
+        : Plugin(data)
+    {
+    }
+
+    virtual void run() override;
+
+    bool shouldVisitTemplateInstantiations() const { return true; }
+    bool shouldVisitImplicitCode() const { return true; }
+
+    bool VisitFieldDecl(const FieldDecl*);
+    bool VisitMemberExpr(const MemberExpr*);
+    bool TraverseCXXConstructorDecl(CXXConstructorDecl*);
+    bool TraverseCXXMethodDecl(CXXMethodDecl*);
+    bool TraverseFunctionDecl(FunctionDecl*);
+    bool TraverseIfStmt(IfStmt*);
+    bool VisitCompoundStmt(const CompoundStmt*);
+
+private:
+    MyFieldInfo niceName(const FieldDecl*);
+    MyLockedInfo niceNameLocked(const MemberExpr*);
+    void check(const FieldDecl* fieldDecl, const Expr* memberExpr);
+    bool isSomeKindOfZero(const Expr* arg);
+    bool IsPassedByNonConst(const FieldDecl* fieldDecl, const Stmt* child, CallerWrapper callExpr,
+                            CalleeWrapper calleeFunctionDecl);
+    compat::optional<CalleeWrapper> getCallee(CallExpr const*);
+
+    RecordDecl* insideMoveOrCopyDeclParent = nullptr;
+    // For reasons I do not understand, parentFunctionDecl() is not reliable, so
+    // we store the parent function on the way down the AST.
+    FunctionDecl* insideFunctionDecl = nullptr;
+    std::vector<FieldDecl const*> insideConditionalCheckOfMemberSet;
+
+    bool isSolarMutexLockGuardStmt(const Stmt*);
+    const CXXThisExpr* isOtherMutexLockGuardStmt(const Stmt*);
+};
+
+void Locking2::run()
+{
+    TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+    // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
+    // writing to the same logfile
+    if (!isUnitTestMode())
+    {
+        std::string output;
+        for (const MyFieldInfo& s : cannotBeConstSet)
+            output += "write-outside-constructor:\t" + s.parentClass + "\t" + s.fieldName + "\n";
+        for (const MyFieldInfo& s : definitionSet)
+            output += "definition:\t" + s.parentClass + "\t" + s.fieldName + "\t" + s.fieldType
+                      + "\t" + s.sourceLocation + "\n";
+        for (const MyLockedInfo& s : lockedAtSet)
+            output += "locked:\t" + s.parentClass + "\t" + s.fieldName + "\t" + s.sourceLocation
+                      + "\n";
+        std::ofstream myfile;
+        myfile.open(WORKDIR "/loplugin.locking2.log", std::ios::app | std::ios::out);
+        myfile << output;
+        myfile.close();
+    }
+    else
+    {
+        for (const MyLockedInfo& s : lockedAtSet)
+            report(DiagnosticsEngine::Warning, "locked %0", s.memberExpr->getBeginLoc())
+                << s.fieldName;
+    }
+}
+
+MyFieldInfo Locking2::niceName(const FieldDecl* fieldDecl)
+{
+    MyFieldInfo aInfo;
+
+    const RecordDecl* recordDecl = fieldDecl->getParent();
+
+    if (const CXXRecordDecl* cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl))
+    {
+        if (cxxRecordDecl->getTemplateInstantiationPattern())
+            cxxRecordDecl = cxxRecordDecl->getTemplateInstantiationPattern();
+        aInfo.parentClass = cxxRecordDecl->getQualifiedNameAsString();
+    }
+    else
+    {
+        aInfo.parentClass = recordDecl->getQualifiedNameAsString();
+    }
+
+    aInfo.fieldName = fieldDecl->getNameAsString();
+    // sometimes the name (if it's an anonymous thing) contains the full path of the build folder, which we don't need
+    size_t idx = aInfo.fieldName.find(SRCDIR);
+    if (idx != std::string::npos)
+    {
+        aInfo.fieldName = aInfo.fieldName.replace(idx, strlen(SRCDIR), "");
+    }
+    aInfo.fieldType = fieldDecl->getType().getAsString();
+
+    SourceLocation expansionLoc
+        = compiler.getSourceManager().getExpansionLoc(fieldDecl->getLocation());
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    aInfo.sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
+
+    return aInfo;
+}
+
+MyLockedInfo Locking2::niceNameLocked(const MemberExpr* memberExpr)
+{
+    MyLockedInfo aInfo;
+
+    const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl());
+    const RecordDecl* recordDecl = fieldDecl->getParent();
+
+    if (const CXXRecordDecl* cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl))
+    {
+        if (cxxRecordDecl->getTemplateInstantiationPattern())
+            cxxRecordDecl = cxxRecordDecl->getTemplateInstantiationPattern();
+        aInfo.parentClass = cxxRecordDecl->getQualifiedNameAsString();
+    }
+    else
+    {
+        aInfo.parentClass = recordDecl->getQualifiedNameAsString();
+    }
+    aInfo.memberExpr = memberExpr;
+
+    aInfo.fieldName = fieldDecl->getNameAsString();
+    // sometimes the name (if it's an anonymous thing) contains the full path of the build folder, which we don't need
+    size_t idx = aInfo.fieldName.find(SRCDIR);
+    if (idx != std::string::npos)
+    {
+        aInfo.fieldName = aInfo.fieldName.replace(idx, strlen(SRCDIR), "");
+    }
+
+    SourceLocation expansionLoc
+        = compiler.getSourceManager().getExpansionLoc(memberExpr->getBeginLoc());
+    StringRef name = getFilenameOfLocation(expansionLoc);
+    aInfo.sourceLocation
+        = std::string(name.substr(strlen(SRCDIR) + 1)) + ":"
+          + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
+
+    return aInfo;
+}
+
+bool Locking2::VisitFieldDecl(const FieldDecl* fieldDecl)
+{
+    fieldDecl = fieldDecl->getCanonicalDecl();
+    if (ignoreLocation(fieldDecl))
+    {
+        return true;
+    }
+    // ignore stuff that forms part of the stable URE interface
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation())))
+    {
+        return true;
+    }
+    definitionSet.insert(niceName(fieldDecl));
+    return true;
+}
+
+bool Locking2::TraverseCXXConstructorDecl(CXXConstructorDecl* cxxConstructorDecl)
+{
+    auto copy = insideMoveOrCopyDeclParent;
+    if (!ignoreLocation(cxxConstructorDecl) && cxxConstructorDecl->isThisDeclarationADefinition())
+    {
+        if (cxxConstructorDecl->isCopyOrMoveConstructor())
+            insideMoveOrCopyDeclParent = cxxConstructorDecl->getParent();
+    }
+    bool ret = RecursiveASTVisitor::TraverseCXXConstructorDecl(cxxConstructorDecl);
+    insideMoveOrCopyDeclParent = copy;
+    return ret;
+}
+
+bool Locking2::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl)
+{
+    auto copy1 = insideMoveOrCopyDeclParent;
+    auto copy2 = insideFunctionDecl;
+    if (!ignoreLocation(cxxMethodDecl) && cxxMethodDecl->isThisDeclarationADefinition())
+    {
+        if (cxxMethodDecl->isCopyAssignmentOperator() || cxxMethodDecl->isMoveAssignmentOperator())
+            insideMoveOrCopyDeclParent = cxxMethodDecl->getParent();
+    }
+    insideFunctionDecl = cxxMethodDecl;
+    bool ret = RecursiveASTVisitor::TraverseCXXMethodDecl(cxxMethodDecl);
+    insideMoveOrCopyDeclParent = copy1;
+    insideFunctionDecl = copy2;
+    return ret;
+}
+
+bool Locking2::TraverseFunctionDecl(FunctionDecl* functionDecl)
+{
+    auto copy2 = insideFunctionDecl;
+    insideFunctionDecl = functionDecl;
+    bool ret = RecursiveASTVisitor::TraverseFunctionDecl(functionDecl);
+    insideFunctionDecl = copy2;
+    return ret;
+}
+
+bool Locking2::TraverseIfStmt(IfStmt* ifStmt)
+{
+    FieldDecl const* memberFieldDecl = nullptr;
+    if (Expr const* cond = ifStmt->getCond())
+    {
+        if (auto memberExpr = dyn_cast<MemberExpr>(cond->IgnoreParenImpCasts()))
+        {
+            if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
+                insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
+        }
+    }
+    bool ret = RecursiveASTVisitor::TraverseIfStmt(ifStmt);
+    if (memberFieldDecl)
+        insideConditionalCheckOfMemberSet.pop_back();
+    return ret;
+}
+
+bool Locking2::VisitMemberExpr(const MemberExpr* memberExpr)
+{
+    const ValueDecl* decl = memberExpr->getMemberDecl();
+    const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(decl);
+    if (!fieldDecl)
+    {
+        return true;
+    }
+    fieldDecl = fieldDecl->getCanonicalDecl();
+    if (ignoreLocation(fieldDecl))
+    {
+        return true;
+    }
+    // ignore stuff that forms part of the stable URE interface
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocation())))
+    {
+        return true;
+    }
+
+    check(fieldDecl, memberExpr);
+
+    return true;
+}
+
+void Locking2::check(const FieldDecl* fieldDecl, const Expr* memberExpr)
+{
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
+    const Stmt* child = memberExpr;
+    const Stmt* parent
+        = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
+    // walk up the tree until we find something interesting
+    bool bCannotBeConst = false;
+    bool bDump = false;
+    auto walkUp = [&]() {
+        child = parent;
+        auto parentsRange = compiler.getASTContext().getParents(*parent);
+        parent = parentsRange.begin() == parentsRange.end() ? nullptr
+                                                            : parentsRange.begin()->get<Stmt>();
+    };
+    do
+    {
+        if (!parent)
+        {
+            // check if we have an expression like
+            //    int& r = m_field;
+            auto parentsRange = compiler.getASTContext().getParents(*child);
+            if (parentsRange.begin() != parentsRange.end())
+            {
+                auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());
+                // The isImplicit() call is to avoid triggering when we see the vardecl which is part of a for-range statement,
+                // which is of type 'T&&' and also an l-value-ref ?
+                if (varDecl && !varDecl->isImplicit()
+                    && loplugin::TypeCheck(varDecl->getType()).LvalueReference().NonConst())
+                {
+                    bCannotBeConst = true;
+                }
+            }
+            break;
+        }
+        if (isa<CXXReinterpretCastExpr>(parent))
+        {
+            // once we see one of these, there is not much useful we can know
+            bCannotBeConst = true;
+            break;
+        }
+        else if (isa<CastExpr>(parent) || isa<MemberExpr>(parent) || isa<ParenExpr>(parent)
+                 || isa<ParenListExpr>(parent) || isa<ArrayInitLoopExpr>(parent)
+                 || isa<ExprWithCleanups>(parent))
+        {
+            walkUp();
+        }
+        else if (auto unaryOperator = dyn_cast<UnaryOperator>(parent))
+        {
+            UnaryOperator::Opcode op = unaryOperator->getOpcode();
+            if (op == UO_AddrOf || op == UO_PostInc || op == UO_PostDec || op == UO_PreInc
+                || op == UO_PreDec)
+            {
+                bCannotBeConst = true;
+            }
+            walkUp();
+        }
+        else if (auto operatorCallExpr = dyn_cast<CXXOperatorCallExpr>(parent))
+        {
+            auto callee = getCallee(operatorCallExpr);
+            if (callee)
+            {
+                // if calling a non-const operator on the field
+                auto calleeMethodDecl = callee->getAsCXXMethodDecl();
+                if (calleeMethodDecl && operatorCallExpr->getArg(0) == child
+                    && !calleeMethodDecl->isConst())
+                {
+                    bCannotBeConst = true;
+                }
+                else if (IsPassedByNonConst(fieldDecl, child, operatorCallExpr, *callee))
+                {
+                    bCannotBeConst = true;
+                }
+            }
+            else
+                bCannotBeConst = true; // conservative, could improve
+            walkUp();
+        }
+        else if (auto cxxMemberCallExpr = dyn_cast<CXXMemberCallExpr>(parent))
+        {
+            const CXXMethodDecl* calleeMethodDecl = cxxMemberCallExpr->getMethodDecl();
+            if (calleeMethodDecl)
+            {
+                // if calling a non-const method on the field
+                const Expr* tmp = dyn_cast<Expr>(child);
+                if (tmp->isBoundMemberFunction(compiler.getASTContext()))
+                {
+                    tmp = dyn_cast<MemberExpr>(tmp)->getBase();
+                }
+                if (cxxMemberCallExpr->getImplicitObjectArgument() == tmp
+                    && !calleeMethodDecl->isConst())
+                {
+                    bCannotBeConst = true;
+                    break;
+                }
+                if (IsPassedByNonConst(fieldDecl, child, cxxMemberCallExpr,
+                                       CalleeWrapper(calleeMethodDecl)))
+                    bCannotBeConst = true;
+            }
+            else
+                bCannotBeConst = true; // can happen in templates
+            walkUp();
+        }
+        else if (auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(parent))
+        {
+            if (IsPassedByNonConst(fieldDecl, child, cxxConstructExpr,
+                                   CalleeWrapper(cxxConstructExpr)))
+                bCannotBeConst = true;
+            walkUp();
+        }
+        else if (auto callExpr = dyn_cast<CallExpr>(parent))
+        {
+            auto callee = getCallee(callExpr);
+            if (callee)
+            {
+                if (IsPassedByNonConst(fieldDecl, child, callExpr, *callee))
+                    bCannotBeConst = true;
+            }
+            else
+                bCannotBeConst = true; // conservative, could improve
+            walkUp();
+        }
+        else if (auto binaryOp = dyn_cast<BinaryOperator>(parent))
+        {
+            BinaryOperator::Opcode op = binaryOp->getOpcode();
+            const bool assignmentOp = op == BO_Assign || op == BO_MulAssign || op == BO_DivAssign
+                                      || op == BO_RemAssign || op == BO_AddAssign
+                                      || op == BO_SubAssign || op == BO_ShlAssign
+                                      || op == BO_ShrAssign || op == BO_AndAssign
+                                      || op == BO_XorAssign || op == BO_OrAssign;
+            if (assignmentOp)
+            {
+                if (binaryOp->getLHS() == child)
+                    bCannotBeConst = true;
+                else if (loplugin::TypeCheck(binaryOp->getLHS()->getType())
+                             .LvalueReference()
+                             .NonConst())
+                    // if the LHS is a non-const reference, we could write to the field later on
+                    bCannotBeConst = true;
+            }
+            walkUp();
+        }
+        else if (isa<ReturnStmt>(parent))
+        {
+            if (insideFunctionDecl)
+            {
+                auto tc = loplugin::TypeCheck(insideFunctionDecl->getReturnType());
+                if (tc.LvalueReference().NonConst())
+                    bCannotBeConst = true;
+            }
+            break;
+        }
+        else if (isa<SwitchStmt>(parent) || isa<WhileStmt>(parent) || isa<ForStmt>(parent)
+                 || isa<IfStmt>(parent) || isa<DoStmt>(parent) || isa<CXXForRangeStmt>(parent)
+                 || isa<DefaultStmt>(parent))
+        {
+            break;
+        }
+        else
+        {
+            walkUp();
+        }
+    } while (true);
+
+    if (bDump)
+    {
+        report(DiagnosticsEngine::Warning, "oh dear, what can the matter be? writtenTo=%0",
+               memberExpr->getBeginLoc())
+            << bCannotBeConst << memberExpr->getSourceRange();
+        if (parent)
+        {
+            report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
+                << parent->getSourceRange();
+            parent->dump();
+        }
+        memberExpr->dump();
+        fieldDecl->getType()->dump();
+    }
+
+    if (bCannotBeConst)
+    {
+        cannotBeConstSet.insert(niceName(fieldDecl));
+    }
+}
+
+bool Locking2::IsPassedByNonConst(const FieldDecl* fieldDecl, const Stmt* child,
+                                  CallerWrapper callExpr, CalleeWrapper calleeFunctionDecl)
+{
+    unsigned len = std::min(callExpr.getNumArgs(), calleeFunctionDecl.getNumParams());
+    // if it's an array, passing it by value to a method typically means the
+    // callee takes a pointer and can modify the array
+    if (fieldDecl->getType()->isConstantArrayType())
+    {
+        for (unsigned i = 0; i < len; ++i)
+            if (callExpr.getArg(i) == child)
+                if (loplugin::TypeCheck(calleeFunctionDecl.getParamType(i)).Pointer().NonConst())
+                    return true;
+    }
+    else
+    {
+        for (unsigned i = 0; i < len; ++i)
+            if (callExpr.getArg(i) == child)
+                if (loplugin::TypeCheck(calleeFunctionDecl.getParamType(i))
+                        .LvalueReference()
+                        .NonConst())
+                    return true;
+    }
+    return false;
+}
+
+compat::optional<CalleeWrapper> Locking2::getCallee(CallExpr const* callExpr)
+{
+    FunctionDecl const* functionDecl = callExpr->getDirectCallee();
+    if (functionDecl)
+        return CalleeWrapper(functionDecl);
+
+    // Extract the functionprototype from a type
+    clang::Type const* calleeType = callExpr->getCallee()->getType().getTypePtr();
+    if (auto pointerType = calleeType->getUnqualifiedDesugaredType()->getAs<clang::PointerType>())
+    {
+        if (auto prototype = pointerType->getPointeeType()
+                                 ->getUnqualifiedDesugaredType()
+                                 ->getAs<FunctionProtoType>())
+        {
+            return CalleeWrapper(prototype);
+        }
+    }
+
+    return compat::optional<CalleeWrapper>();
+}
+
+bool Locking2::VisitCompoundStmt(const CompoundStmt* compoundStmt)
+{
+    if (ignoreLocation(compoundStmt))
+        return true;
+    if (compoundStmt->size() < 2)
+        return true;
+
+    const Stmt* firstStmt = *compoundStmt->body_begin();
+    bool solarMutex = isSolarMutexLockGuardStmt(firstStmt);
+    const CXXThisExpr* ignoreThisStmt = nullptr;
+    if (!solarMutex)
+        ignoreThisStmt = isOtherMutexLockGuardStmt(firstStmt);
+    if (!solarMutex && ignoreThisStmt == nullptr)
+        return true;
+    const ReturnStmt* returnStmt = dyn_cast<ReturnStmt>(*(compoundStmt->body_begin() + 1));
+    if (!returnStmt || !returnStmt->getRetValue())
+        return true;
+    const Expr* retValue = returnStmt->getRetValue()->IgnoreImplicit();
+    if (auto constructExpr = dyn_cast<CXXConstructExpr>(retValue))
+        retValue = constructExpr->getArg(0)->IgnoreImplicit();
+    const MemberExpr* memberExpr = dyn_cast<MemberExpr>(retValue);
+    if (!memberExpr)
+        return true;
+
+    lockedAtSet.insert(niceNameLocked(memberExpr));
+
+    return true;
+}
+
+bool Locking2::isSolarMutexLockGuardStmt(const Stmt* stmt)
+{
+    auto declStmt = dyn_cast<DeclStmt>(stmt);
+    if (!declStmt)
+        return false;
+    if (!declStmt->isSingleDecl())
+        return false;
+    auto varDecl = dyn_cast<VarDecl>(declStmt->getSingleDecl());
+    if (!varDecl)
+        return false;
+    auto tc = loplugin::TypeCheck(varDecl->getType());
+    if (!tc.Class("SolarMutexGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexClearableGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexResettableGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexTryAndBuyGuard").GlobalNamespace())
+        return false;
+    return true;
+}
+
+const CXXThisExpr* Locking2::isOtherMutexLockGuardStmt(const Stmt* stmt)
+{
+    auto declStmt = dyn_cast<DeclStmt>(stmt);
+    if (!declStmt)
+        return nullptr;
+    if (!declStmt->isSingleDecl())
+        return nullptr;
+    auto varDecl = dyn_cast<VarDecl>(declStmt->getSingleDecl());
+    if (!varDecl)
+        return nullptr;
+    auto tc = loplugin::TypeCheck(varDecl->getType());
+    if (!tc.Class("unique_lock").StdNamespace() && !tc.Class("scoped_lock").StdNamespace()
+        && !tc.Class("Guard") && !tc.Class("ClearableGuard") && !tc.Class("ResettableGuard"))
+        return nullptr;
+    auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(varDecl->getInit());
+    if (!cxxConstructExpr || cxxConstructExpr->getNumArgs() < 1)
+        return nullptr;
+    auto arg0 = cxxConstructExpr->getArg(0);
+    if (auto memberExpr = dyn_cast<MemberExpr>(arg0))
+    {
+        const CXXThisExpr* thisStmt
+            = dyn_cast<CXXThisExpr>(memberExpr->getBase()->IgnoreImplicit());
+        return thisStmt;
+    }
+    else if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(arg0))
+    {
+        return dyn_cast_or_null<CXXThisExpr>(
+            memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit());
+    }
+    return nullptr;
+}
+
+loplugin::Plugin::Registration<Locking2> X("locking2", false);
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/locking2.py b/compilerplugins/clang/locking2.py
new file mode 100755
index 000000000000..e6c6176052d1
--- /dev/null
+++ b/compilerplugins/clang/locking2.py
@@ -0,0 +1,79 @@
+#!/usr/bin/python3
+
+import re
+import io
+
+definitionToTypeMap = dict()
+writeFromOutsideConstructorSet = set()
+lockedMap = dict()
+
+# clang does not always use exactly the same numbers in the type-parameter vars it generates
+# so I need to substitute them to ensure we can match correctly.
+normalizeTypeParamsRegex = re.compile(r"type-parameter-\d+-\d+")
+def normalizeTypeParams( line ):
+    return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
+
+def parseFieldInfo( tokens ):
+    if len(tokens) == 3:
+        return (normalizeTypeParams(tokens[1]), tokens[2])
+    else:
+        return (normalizeTypeParams(tokens[1]), "")
+
+with io.open("workdir/loplugin.locking2.log", "r", buffering=1024*1024) as txt:
+    for line in txt:
+        tokens = line.strip().split("\t")
+        if tokens[0] == "definition:":
+            fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+            srcLoc = tokens[4]
+            # ignore external source code
+            if (srcLoc.startswith("external/")):
+                continue
+            # ignore build folder
+            if (srcLoc.startswith("workdir/")):
+                continue
+            definitionToTypeMap[fieldInfo] = tokens[3]
+        elif tokens[0] == "write-outside-constructor:":
+            writeFromOutsideConstructorSet.add(parseFieldInfo(tokens))
+        elif tokens[0] == "locked:":
+            fieldInfo = (normalizeTypeParams(tokens[1]), tokens[2])
+            lockedMap[fieldInfo] = tokens[3]
+        else:
+            print( "unknown line: " + line)
+
+removeLockingSet = set()
+for field,srcLoc in lockedMap.items():
+    if field in writeFromOutsideConstructorSet:
+        continue
+    if field not in definitionToTypeMap:
+        continue
+    fieldType = definitionToTypeMap[field]
+    if "std::unique_ptr" in fieldType:
+        continue
+    if "std::shared_ptr" in fieldType:
+        continue
+    if "Reference<" in fieldType:
+        continue
+    if "VclPtr<" in fieldType:
+        continue
+    removeLockingSet.add((field[0] + " " + field[1] + " " + fieldType, srcLoc))
+
+
+# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
+def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+    return [int(text) if text.isdigit() else text.lower()
+            for text in re.split(_nsre, s)]
+# sort by both the source-line and the datatype, so the output file ordering is stable
+# when we have multiple items on the same source line
+def v_sort_key(v):
+    return natural_sort_key(v[1]) + [v[0]]
+
+# sort results by name and line number
+tmp6list = sorted(removeLockingSet, key=lambda v: v_sort_key(v))
+
+# print out the results
+with open("compilerplugins/clang/locking2.results", "wt") as f:
+    for t in tmp6list:
+        f.write( t[1] + "\n" )
+        f.write( "    " + t[0] + "\n" )
+
+
diff --git a/compilerplugins/clang/logexceptionnicely.cxx b/compilerplugins/clang/logexceptionnicely.cxx
index a262d276b88c..6cc66fdf0289 100644
--- a/compilerplugins/clang/logexceptionnicely.cxx
+++ b/compilerplugins/clang/logexceptionnicely.cxx
@@ -12,7 +12,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
-#include "compat.hxx"
+#include "config_clang.h"
 #include <fstream>
 #include <unordered_set>
 
@@ -46,6 +46,12 @@ public:
             return false;
         if (loplugin::hasPathnamePrefix(fn, SRCDIR "/comphelper/"))
             return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/io/"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/javaunohelper/"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/stoc/"))
+            return false;
         // can't do that here, don't have an Any
         if (loplugin::hasPathnamePrefix(fn, SRCDIR
                                         "/connectivity/source/drivers/hsqldb/HStorageMap.cxx"))
@@ -101,7 +107,7 @@ public:
             return true;
 
         StringRef fn = getFilenameOfLocation(
-            compiler.getSourceManager().getExpansionLoc(compat::getBeginLoc(operatorCallExpr)));
+            compiler.getSourceManager().getExpansionLoc(operatorCallExpr->getBeginLoc()));
         // these are below tools in the module hierarchy, so we can't use the pretty printing
         if (loplugin::hasPathnamePrefix(fn, SRCDIR "/include/comphelper/"))
             return true;
@@ -120,7 +126,7 @@ public:
                     return true;
                 if (!isDerivedFromException(cxxRecordDecl))
                     return true;
-                auto loc = compat::getBeginLoc(operatorCallExpr);
+                auto loc = operatorCallExpr->getBeginLoc();
                 // for some reason, I'm warning multiple times? so just check if I've warned already
                 if (!m_visited.insert(compiler.getSourceManager().getExpansionLoc(loc)).second)
                     return true;
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index 896266385dea..bc03e94ca09b 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -16,6 +16,7 @@
 #include <list>
 #include <map>
 
+#include "compat.hxx"
 #include "plugin.hxx"
 //#include "clang/AST/CXXInheritance.h"
 
diff --git a/compilerplugins/clang/makeshared.cxx b/compilerplugins/clang/makeshared.cxx
index 9b512371d635..902d200ff562 100644
--- a/compilerplugins/clang/makeshared.cxx
+++ b/compilerplugins/clang/makeshared.cxx
@@ -16,8 +16,9 @@
 
 #include <clang/AST/CXXInheritance.h>
 
+#include "config_clang.h"
+
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -37,11 +38,6 @@ public:
     virtual bool preRun() override
     {
         StringRef fn(handler.getMainFileName());
-        // uses boost::shared_ptr and we trigger because we're not looking specifically for std::shared_ptr
-        if (loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/cmis/cmis_repo_content.cxx"))
-            return false;
-        if (loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/cmis/cmis_content.cxx"))
-            return false;
         // TODO something weird with protected base classes going on here
         if (loplugin::isSamePathname(fn, SRCDIR "/sc/source/filter/excel/xeextlst.cxx"))
             return false;
@@ -147,14 +143,14 @@ bool MakeShared::VisitCXXConstructExpr(CXXConstructExpr const* constructExpr)
     }
 
     StringRef fn = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(constructExpr)));
+        compiler.getSourceManager().getSpellingLoc(constructExpr->getBeginLoc()));
     if (loplugin::isSamePathname(fn, SRCDIR "/include/o3tl/make_shared.hxx"))
         return true;
     if (loplugin::isSamePathname(fn, SRCDIR "/svl/source/items/stylepool.cxx"))
         return true;
 
     report(DiagnosticsEngine::Warning, "rather use make_shared than constructing from %0",
-           compat::getBeginLoc(constructExpr))
+           constructExpr->getBeginLoc())
         << arg0->getType() << constructExpr->getSourceRange();
     return true;
 }
@@ -189,11 +185,11 @@ bool MakeShared::VisitCXXMemberCallExpr(CXXMemberCallExpr const* cxxMemberCallEx
         return true;
 
     StringRef fn = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(cxxMemberCallExpr)));
+        compiler.getSourceManager().getSpellingLoc(cxxMemberCallExpr->getBeginLoc()));
     if (loplugin::isSamePathname(fn, SRCDIR "/include/o3tl/make_shared.hxx"))
         return true;
 
-    report(DiagnosticsEngine::Warning, "rather use make_shared", compat::getBeginLoc(cxxNewExpr))
+    report(DiagnosticsEngine::Warning, "rather use make_shared", cxxNewExpr->getBeginLoc())
         << cxxNewExpr->getSourceRange();
 
     return true;
@@ -215,7 +211,7 @@ bool MakeShared::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* operCallExp
         return true;
 
     report(DiagnosticsEngine::Warning, "rather use make_shared than constructing from %0",
-           compat::getBeginLoc(operCallExpr))
+           operCallExpr->getBeginLoc())
         << operCallExpr->getArg(1)->getType() << operCallExpr->getSourceRange();
 
     return true;
@@ -241,13 +237,13 @@ bool MakeShared::VisitVarDecl(VarDecl const* varDecl)
         return true;
 
     report(DiagnosticsEngine::Warning, "rather use make_shared than constructing from %0",
-           compat::getBeginLoc(varDecl))
+           varDecl->getBeginLoc())
         << varDecl->getInit()->getType() << varDecl->getSourceRange();
 
     return true;
 }
 
-loplugin::Plugin::Registration<MakeShared> makeshared("makeshared");
+loplugin::Plugin::Registration<MakeShared> makeshared("makeshared", false);
 
 } // namespace
 
diff --git a/compilerplugins/clang/mergeclasses.cxx b/compilerplugins/clang/mergeclasses.cxx
index 0f0d73d709c2..0c023a9bd15a 100644
--- a/compilerplugins/clang/mergeclasses.cxx
+++ b/compilerplugins/clang/mergeclasses.cxx
@@ -11,6 +11,8 @@
 #include <set>
 #include <string>
 #include <iostream>
+#include "config_clang.h"
+#include "compat.hxx"
 #include "plugin.hxx"
 #include <fstream>
 
@@ -32,7 +34,7 @@ Then
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='mergeclasses' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='mergeclasses' check
   $ ./compilerplugins/clang/mergeclasses.py
 
 FIXME exclude 'static-only' classes, which some people may use/have used instead of a namespace to tie together a bunch of functions
@@ -55,6 +57,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -83,14 +87,15 @@ public:
 bool ignoreClass(StringRef s)
 {
     // ignore stuff in the standard library, and UNO stuff we can't touch.
-    if (s.startswith("rtl::") || s.startswith("sal::") || s.startswith("com::sun::")
-        || s.startswith("std::") || s.startswith("boost::")
+    if (compat::starts_with(s, "rtl::") || compat::starts_with(s, "sal::")
+        || compat::starts_with(s, "com::sun::") || compat::starts_with(s, "std::")
+        || compat::starts_with(s, "boost::")
         || s == "OString" || s == "OUString" || s == "bad_alloc")
     {
         return true;
     }
     // ignore instantiations of pointers and arrays
-    if (s.endswith("*") || s.endswith("]")) {
+    if (compat::ends_with(s, "*") || compat::ends_with(s, "]")) {
         return true;
     }
     return false;
@@ -126,7 +131,7 @@ bool MergeClasses::VisitCXXConstructExpr( const CXXConstructExpr* pCXXConstructE
         return true;
     }
     // ignore calls when a sub-class is constructing its superclass
-    if (pCXXConstructExpr->getConstructionKind() != CXXConstructExpr::ConstructionKind::CK_Complete) {
+    if (pCXXConstructExpr->getConstructionKind() != compat::CXXConstructionKind::Complete) {
         return true;
     }
     const CXXConstructorDecl* pCXXConstructorDecl = pCXXConstructExpr->getConstructor();
@@ -144,7 +149,7 @@ bool MergeClasses::VisitCXXRecordDecl(const CXXRecordDecl* decl)
     }
     if (decl->isThisDeclarationADefinition())
     {
-        SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(decl));
+        SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(decl->getBeginLoc());
         auto filename = getFilenameOfLocation(spellingLocation);
         filename = filename.substr(strlen(SRCDIR));
         std::string s = decl->getQualifiedNameAsString();
diff --git a/compilerplugins/clang/mergeclasses.py b/compilerplugins/clang/mergeclasses.py
index c859ef8daf0d..bbd469724218 100755
--- a/compilerplugins/clang/mergeclasses.py
+++ b/compilerplugins/clang/mergeclasses.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python2
-
-import sys
+#!/usr/bin/python3
 
 instantiatedSet = set()
 definitionSet = set()
@@ -56,7 +54,7 @@ def extractModuleName(clazz):
 with open("compilerplugins/clang/mergeclasses.results", "wt") as f:
     # loop over defined, but not instantiated classes
     for clazz in sorted(definitionSet - instantiatedSet):
-        if clazz == "svl::IUndoManager": print parentChildDict[clazz]
+        if clazz == "svl::IUndoManager": print(parentChildDict[clazz])
         # ignore classes without any children, and classes with more than one child
         if (clazz not in parentChildDict) or (len(parentChildDict[clazz]) != 1):
             continue
@@ -69,8 +67,8 @@ with open("compilerplugins/clang/mergeclasses.results", "wt") as f:
         if ("mutex" in clazz) or ("Mutex" in clazz):
             continue
         otherclazz = next(iter(parentChildDict[clazz]))
-        if clazz == "svl::IUndoManager": print extractModuleName(clazz)
-        if otherclazz == "svl::IUndoManager": print extractModuleName(otherclazz)
+        if clazz == "svl::IUndoManager": print(extractModuleName(clazz))
+        if otherclazz == "svl::IUndoManager": print(extractModuleName(otherclazz))
         # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable.
         if extractModuleName(clazz) != extractModuleName(otherclazz):
             continue
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index c0fd80c1fb17..9d4e9d583926 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -1,6 +1,7 @@
 merge (anonymous namespace)::Base2 with (anonymous namespace)::Derived
 merge (anonymous namespace)::Base3 with (anonymous namespace)::Derived
 merge (anonymous namespace)::BasePixelPtr with (anonymous namespace)::TrueColorPixelPtr
+merge (anonymous namespace)::BuiltinPropertyGetSetHelper with (anonymous namespace)::CustomPropertyGetSetHelper
 merge (anonymous namespace)::C2 with (anonymous namespace)::C3
 merge (anonymous namespace)::C3 with (anonymous namespace)::C4
 merge (anonymous namespace)::C4 with (anonymous namespace)::C5
@@ -9,9 +10,11 @@ merge (anonymous namespace)::Char1 with (anonymous namespace)::Char2
 merge (anonymous namespace)::Char2 with (anonymous namespace)::Char3
 merge (anonymous namespace)::DIBInfoHeader with (anonymous namespace)::DIBV5Header
 merge (anonymous namespace)::DomVisitor with (anonymous namespace)::DomExport
+merge (anonymous namespace)::GtkInstanceCheckButton with (anonymous namespace)::GtkInstanceRadioButton
 merge (anonymous namespace)::N with (anonymous namespace)::P
 merge (anonymous namespace)::O with (anonymous namespace)::O2
 merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity
+merge (anonymous namespace)::PopupMenuToolbarController with (anonymous namespace)::GenericPopupToolbarController
 merge (anonymous namespace)::PublishableDescription with cppu::ImplInheritanceHelper
 merge (anonymous namespace)::RecursiveTest with (anonymous namespace)::SimpleRecursiveTest
 merge (anonymous namespace)::ReflectionTransition with (anonymous namespace)::RochadeTransition
@@ -22,24 +25,32 @@ merge (anonymous namespace)::StrEntries with (anonymous namespace)::RemoveEditAt
 merge (anonymous namespace)::VariableTextField with (anonymous namespace)::VariableDateTimeField
 merge (anonymous namespace)::empty with (anonymous namespace)::second
 merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl
+merge AbstractSmParser with SmParser5
 merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
+merge AbstractTabController_Impl with AbstractApplyTabController_Impl
 merge AddressWalker with AddressWalkerWriter
 merge AutoIdle with (anonymous namespace)::TestAutoIdleRR
 merge B3dTransformationSet with B3dViewport
 merge B3dViewport with B3dCamera
+merge BaseJSWidget with JSWidget
 merge BitmapConvolutionMatrixFilter with BitmapSharpenFilter
+merge BrowseBox with svt::EditBrowseBox
+merge BrowserHeader with svt::EditBrowserHeader
 merge CSS1Parser with SvxCSS1Parser
+merge DateField with CalendarField
 merge DbGridControl with FmGridControl
 merge DdeItem with DdeGetPutItem
 merge DdeLink with DdeHotLink
+merge E3DObjGeoData with E3DSceneGeoData
 merge E3dUndoAction with E3dRotateUndoAction
+merge EditTextObject with EditTextObjectImpl
 merge ErrorInfo with DynamicErrorInfo
 merge EscherPersistTable with EscherEx
 merge ExcBoolRecord with Exc1904
 merge ExcelConverterBase with ExcelToSc
 merge ExportTyp with ExportBiff5
-merge FailTest with testMathMalformedXml
 merge FmGridListener with FmXGridPeer::GridListenerDelegator
+merge FmRecordCountListener_Base with FmRecordCountListener
 merge FmXDisposeListener with DisposeListenerGridBridge
 merge FmXFormShell_Base_Disambiguation with FmXFormShell
 merge GLWindow with GLX11Window
@@ -69,38 +80,53 @@ merge IFinishedThreadListener with ThreadListener
 merge IGrammarContact with (anonymous namespace)::SwGrammarContact
 merge IStyleAccess with (anonymous namespace)::SwStyleManager
 merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator
-merge ISwFrameControl with SwFrameMenuButtonBase
 merge IXFAttrList with XFSaxAttrList
 merge IXFStream with XFSaxStream
 merge IXFStyle with XFStyle
 merge IconChoicePage with SvxHyperlinkTabPageBase
-merge ImplGlyphFallbackFontSubstitution with (anonymous namespace)::FcGlyphFallbackSubstitution
-merge ImplPreMatchFontSubstitution with (anonymous namespace)::FcPreMatchSubstitution
+merge ListView with TemplateDlgLocalView
+merge LongCurrencyFormatter with LongCurrencyBox
 merge LotusConverterBase with LotusToSc
 merge LwpDLVListHead with LwpPropList
 merge LwpMarker with LwpStoryMarker
 merge ObservableThread with SwAsyncRetrieveInputStreamThread
-merge OldBasicPassword with basic::SfxScriptLibraryContainer
-merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
-merge OpenGLSalGraphicsImpl with X11OpenGLSalGraphicsImpl
 merge PPTExBulletProvider with PPTWriter
-merge PreviewControl3D with LightControl3D
+merge PriorityHBox with PriorityMergedHBox
 merge PropertyAccessorBase with GenericPropertyAccessor
 merge PropertyWrapperBase with PropertyWrapper
 merge SOParagraph with ParagraphObj
 merge SalData with GenericUnixSalData
 merge SalDisplay with SalX11Display
+merge SalGraphics with SalGraphicsAutoDelegateToImpl
 merge SalInfoPrinter with PspSalInfoPrinter
 merge SalInstance with SalGenericInstance
+merge SalInstanceBox with JSWidget
+merge SalInstanceBuilder with JSInstanceBuilder
+merge SalInstanceCheckButton with JSWidget
+merge SalInstanceComboBoxWithEdit with JSWidget
+merge SalInstanceComboBoxWithoutEdit with JSWidget
+merge SalInstanceDrawingArea with JSWidget
+merge SalInstanceExpander with JSWidget
+merge SalInstanceIconView with JSWidget
+merge SalInstanceImage with JSWidget
+merge SalInstanceLabel with JSWidget
+merge SalInstanceNotebook with JSWidget
+merge SalInstanceRadioButton with JSWidget
+merge SalInstanceSpinButton with JSWidget
+merge SalInstanceTextView with JSWidget
+merge SalInstanceToolbar with JSWidget
+merge SalInstanceTreeView with JSWidget
 merge SalPrinter with PspSalPrinter
 merge SalSession with (anonymous namespace)::IceSalSession
 merge SalSystem with SalGenericSystem
 merge ScAccessibleTableBase with ScAccessibleSpreadsheet
+merge ScAsyncTabController with ScAsyncTabController_Impl
 merge ScDBDataContainerBase with ScDBCollection::NamedDBs
 merge ScDBFunc with ScTabViewShell
 merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector
 merge ScDocFunc with ScDocFuncDirect
 merge ScEEAbsImport with ScEEImport
+merge ScEEParseEntry with ScHTMLEntry
 merge ScEnginePoolHelper with ScEditEngineDefaulter
 merge ScFormatFilterPlugin with ScFormatFilterPluginImpl
 merge ScMultiBlockUndo with ScUndoPaste
@@ -115,6 +141,7 @@ merge ScVbaGraphicObjectsBase with ScVbaButtons
 merge ScVbaObjectContainer with (anonymous namespace)::ScVbaControlContainer
 merge ScViewFunc with ScDBFunc
 merge SceneObject with (anonymous namespace)::Iris
+merge SdNavigatorWin with sd::sidebar::NavigatorWrapper
 merge SdOptionsContents with SdOptions
 merge SdOptionsGrid with SdOptions
 merge SdOptionsZoom with SdOptions
@@ -140,23 +167,26 @@ merge SfxExtItemPropertySetInfo_Base with SfxExtItemPropertySetInfo
 merge SfxItemPropertySetInfo_Base with SfxItemPropertySetInfo
 merge SfxModelSubComponent with sfx2::DocumentUndoManager
 merge SkiaSalGraphicsImpl with X11SkiaSalGraphicsImpl
-merge SmElement with SmElementSeparator
 merge SmFontPickList with SmFontPickListBox
 merge StarSymbolToMSMultiFont with (anonymous namespace)::StarSymbolToMSMultiFontImpl
 merge StgAvlIterator with StgIterator
 merge StgAvlNode with StgDirEntry
 merge StgCache with StgIo
+merge StylesPreviewWindow_Base with StylesPreviewWindow_Impl
+merge SvHeaderTabListBox with LclHeaderTabListBox
 merge SvIdlDataBase with SvIdlWorkingBase
 merge SvListView with SvTreeListBox
 merge SvXMLExportItemMapper with (anonymous namespace)::SwXMLTableItemMapper_Impl
 merge SvXMLImportItemMapper with (anonymous namespace)::SwXMLImportTableItemMapper_Impl
-merge SvXMLItemSetContext with (anonymous namespace)::SwXMLItemSetContext_Impl
 merge SvxAreaTabPage with SvxBkgTabPage
 merge SvxCSS1Parser with SwCSS1Parser
 merge SvxLanguageItem_Base with SvxLanguageItem
+merge SvxRTFItemStackType with MakeUniqueEnabler
 merge SvxRTFParser with EditRTFParser
+merge SvxVertCTLTextTbxCtrl_Base with SvxVertCTLTextTbxCtrl
 merge SwAccessibleFrame with SwAccessibleContext
 merge SwCursorShell with SwEditShell
+merge SwDashedLine with SwBreakDashedLine
 merge SwDrawModeGrf_Base with SwDrawModeGrf
 merge SwEditShell with SwFEShell
 merge SwEndNoteOptionPage with SwFootNoteOptionPage
@@ -174,35 +204,35 @@ merge SwXParaFrameEnumeration with (anonymous namespace)::SwXParaFrameEnumeratio
 merge SwXParagraphEnumeration with (anonymous namespace)::SwXParagraphEnumerationImpl
 merge SwXTextRanges with (anonymous namespace)::SwXTextRangesImpl
 merge Task with Timer
-merge TemplateLocalView with TemplateDefaultView
 merge TestShape with (anonymous namespace)::ImplTestShape
 merge TestView with (anonymous namespace)::ImplTestView
 merge TextObj with TextObjBinary
-merge TextRenderImpl with CairoTextRender
-merge TxtExportTest with testBullets
-merge TxtImportTest with testTdf112191
-merge VCLXTopWindow_Base with VCLXTopWindow
+merge TextRenderImpl with FreeTypeTextRenderImpl
+merge TxtEncExportHiddenTest with testBulletsHidden
+merge TxtEncExportNotHiddenTest with testBulletsNotHidden
 merge ValueGetter with (anonymous namespace)::CellValueGetter
 merge ValueSetter with (anonymous namespace)::CellValueSetter
+merge VclVButtonBox with (anonymous namespace)::LeakTestClass
 merge Viewport3D with Camera3D
 merge WW8PLCFx_Fc_FKP with WW8PLCFx_Cp_FKP
 merge WW8Style with WW8RStyle
+merge X11SalGraphicsImpl with X11CairoSalGraphicsImpl
 merge XFDate with XFDateStart
 merge XFDateTimePart with XFTimePart
-merge XHtmlExportTest with testImageEmbedding
 merge XMLNode with XMLChildNode
 merge XMLTransformer with XMLTransformerBase
 merge XclDebugObjCounter with XclRootData
 merge XclExpChFutureRecordBase with XclExpChFrLabelProps
 merge XclExpFutureRecord with XclExpChFutureRecordBase
+merge XclExpObjectManager with XclExpEmbeddedObjectManager
 merge XclExpSubStream with XclExpChart
 merge XclImpCachedValue with (anonymous namespace)::XclImpCrn
+merge XclImpCheckBoxObj with XclImpOptionButtonObj
 merge XclNumFmtBuffer with XclImpNumFmtBuffer
 merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
 merge accessibility::IComboListBoxHelper with VCLListBoxHelper
-merge accessibility::ListBoxAccessibleBase with accessibility::AccessibleListBoxEntry
 merge animcore::(anonymous namespace)::AnimationNodeBase with animcore::(anonymous namespace)::AnimationNode
-merge avmedia::ThreadHelpBase with avmedia::SoundHandler
+merge basctl::Entry with basctl::DocumentEntry
 merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments
 merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D
 merge basegfx::trapezoidhelper::(anonymous namespace)::TrDeSimpleEdge with basegfx::trapezoidhelper::(anonymous namespace)::TrDeEdgeEntry
@@ -223,19 +253,24 @@ merge chart::MarkHandleProvider with chart::SelectionHelper
 merge chart::wrapper::ChartDocumentWrapper_Base with chart::wrapper::ChartDocumentWrapper
 merge comphelper::ChainablePropertySetInfo_Base with comphelper::ChainablePropertySetInfo
 merge comphelper::ConfigurationListenerPropertyBase with comphelper::ConfigurationListenerProperty
+merge comphelper::ConfigurationListener_Base with comphelper::ConfigurationListener
 merge comphelper::MasterPropertySetInfo_Base with comphelper::MasterPropertySetInfo
 merge comphelper::OAccessibleComponentHelper_Base with comphelper::OAccessibleComponentHelper
-merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent
 merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper
 merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration
 merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper
 merge comphelper::OContainerListenerAdapter_Base with comphelper::OContainerListenerAdapter
+merge comphelper::OPropertyChangeMultiplexer_Base with comphelper::OPropertyChangeMultiplexer
 merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper
 merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper
 merge comphelper::OSequenceOutputStream_Base with comphelper::OSequenceOutputStream
 merge comphelper::OWeakListenerAdapterBase with comphelper::OWeakListenerAdapter
 merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo
+merge comphelper::TraceEvent with comphelper::NamedEvent
+merge comphelper::WeakComponentImplHelperBase with comphelper::WeakComponentImplHelper
+merge connectivity::OKeySet_Base with connectivity::OKeySet
 merge connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper with connectivity::evoab::(anonymous namespace)::OEvoabVersion38Helper
+merge connectivity::evoab::OEvoabVersionHelper with connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper
 merge connectivity::file::OStatement_Base with connectivity::file::OStatement_BASE2
 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection
 merge connectivity::java_lang_Exception with connectivity::java_sql_SQLException_BASE
@@ -251,18 +286,20 @@ merge cppcanvas::PolyPolygon with cppcanvas::internal::ImplPolyPolygon
 merge cppcanvas::Renderer with cppcanvas::internal::ImplRenderer
 merge cppcanvas::SpriteCanvas with cppcanvas::internal::ImplSpriteCanvas
 merge cppcanvas::internal::ImplSprite with cppcanvas::internal::ImplCustomSprite
-merge cppu::(anonymous namespace)::OSingleFactoryHelper with cppu::(anonymous namespace)::OFactoryComponentHelper
 merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin
 merge dbaccess::IPropertyContainer with dbaccess::OColumn
 merge dbaccess::IRefreshListener with dbaccess::OConnection
 merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper
+merge dbaccess::OComponentDefinition_Impl with dbaccess::OCommandDefinition_Impl
 merge dbahsql::AlterStmtParser with dbahsql::FbAlterStmtParser
 merge dbahsql::CreateStmtParser with dbahsql::FbCreateStmtParser
 merge dbaui::IController with dbaui::OGenericUnoController
 merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId
 merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper
+merge dbaui::OGenericUnoController with dbaui::OApplicationController
 merge dbaui::OSQLNameEntry with dbaui::OPropColumnEditCtrl
 merge dbaui::OTableRowView with dbaui::OTableEditorCtrl
+merge dbaui::OTableWindowData with dbaui::OQueryTableWindowData
 merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController
 merge dbp::OGridPage with dbp::OGridFieldsSelection
 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
@@ -270,12 +307,11 @@ merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks
 merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D
 merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D
 merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D
+merge drawinglayer::texture::GeoTexSvxBitmapEx with drawinglayer::texture::GeoTexSvxBitmapExTiled
 merge fileaccess::Notifier with fileaccess::BaseContent
 merge framework::OReadStatusBarDocumentHandler_Base with framework::OReadStatusBarDocumentHandler
 merge framework::OReadToolBoxDocumentHandler_Base with framework::OReadToolBoxDocumentHandler
 merge framework::SaxNamespaceFilter_Base with framework::SaxNamespaceFilter
-merge framework::TransactionBase with framework::Desktop
-merge frm::ICommandImageProvider with frm::(anonymous namespace)::DocumentCommandImageProvider
 merge frm::IEngineStatusListener with frm::RichTextControlImpl
 merge frm::IEngineTextChangeListener with frm::ORichTextModel
 merge frm::IFeatureDispatcher with frm::OFormNavigationHelper
@@ -288,23 +324,30 @@ merge ftp::ResultSetBase with ftp::ResultSetI
 merge gfx::DrawCommand with gfx::DrawBase
 merge gfx::GradientInfo with gfx::LinearGradientInfo
 merge gio::Seekable with gio::OutputStream
+merge http_dav_ucp::DAVAuthListener with http_dav_ucp::DAVAuthListener_Impl
+merge http_dav_ucp::DAVSession with http_dav_ucp::CurlSession
 merge oglcanvas::IBufferContext with oglcanvas::(anonymous namespace)::BufferContextImpl
 merge old_SdrDownCompat with SdIOCompat
 merge oox::SequenceSeekableStream with oox::SequenceInputStream
 merge oox::core::FilterBase with oox::core::XmlFilterBase
 merge oox::drawingml::LayoutAtomVisitor with oox::drawingml::LayoutAtomVisitorBase
+merge oox::drawingml::TextRun with oox::drawingml::TextField
+merge oox::dump::ConstList with oox::dump::MultiList
+merge oox::dump::FlagsList with oox::dump::CombiList
 merge oox::dump::ItemFormat with oox::dump::CombiList::ExtItemFormat
 merge oox::dump::OleStreamObject with oox::dump::OleCompObjObject
 merge oox::dump::OutputObjectBase with oox::dump::InputObjectBase
 merge oox::dump::RecordObjectBase with oox::dump::SequenceRecordObjectBase
 merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder
+merge oox::ole::AxListBoxModel with oox::ole::HtmlSelectModel
+merge oox::ole::AxTextBoxModel with oox::ole::HtmlTextBoxModel
 merge oox::ole::VbaFilterConfig with oox::ole::VbaProject
 merge oox::vml::CustomShape with oox::vml::ComplexShape
+merge oox::vml::ShapeType with oox::vml::ShapeBase
 merge oox::xls::FormulaParserImpl with oox::xls::(anonymous namespace)::OoxFormulaParserImpl
 merge oox::xls::FormulaProcessorBase with oox::xls::FormulaParser
 merge oox::xls::FunctionProvider with oox::xls::OpCodeProvider
 merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals
-merge oox::xls::SheetDataContextBase with oox::xls::SheetDataContext
 merge pcr::(anonymous namespace)::BroadcastHelperBase with pcr::(anonymous namespace)::ShapeGeometryChangeNotifier
 merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI
 merge pcr::CommonBehaviourControlHelper with pcr::CommonBehaviourControl
@@ -314,12 +357,13 @@ merge pcr::IPropertyInfoService with pcr::OPropertyInfoService
 merge pcr::IPropertyLineListener with pcr::OPropertyBrowserController
 merge pcr::ISQLCommandAdapter with pcr::(anonymous namespace)::ISQLCommandPropertyUI
 merge pcr::PropertyHandler with pcr::PropertyHandlerComponent
-merge pcr::PropertyHandlerComponent with pcr::HandlerComponentBase
 merge psp::(anonymous namespace)::Ascii85Encoder with psp::(anonymous namespace)::LZWEncoder
 merge psp::PrinterBmp with (anonymous namespace)::SalPrinterBmp
 merge registry::tools::Options with (anonymous namespace)::Options_Impl
 merge reportdesign::ITraverseReport with rptui::(anonymous namespace)::NavigatorTree
+merge rptui::AnyConverter with rptui::(anonymous namespace)::ParaAdjust
 merge rptui::IConditionalFormatAction with rptui::ConditionalFormattingDialog
+merge sax_fastparser::FastSaxSerializer::ForMerge with sax_fastparser::FastSaxSerializer::ForSort
 merge sax_fastparser::ForMergeBase with sax_fastparser::FastSaxSerializer::ForMerge
 merge sc::CompiledFormula with sc::opencl::(anonymous namespace)::DynamicKernel
 merge sc::FormulaGroupInterpreter with sc::opencl::FormulaGroupInterpreterOpenCL
@@ -333,16 +377,16 @@ merge sc::opencl::PriceMat with sc::opencl::OpPriceMat
 merge sc::opencl::RATE with sc::opencl::OpIntrate
 merge sc::opencl::RRI with sc::opencl::OpRRI
 merge sc::opencl::XNPV with sc::opencl::OpXNPV
+merge sc_apitest::(anonymous namespace)::TempFileBase with sc_apitest::ScDDELinkObj
+merge sd::(anonymous namespace)::ModelTraverseHandler with sd::(anonymous namespace)::GraphicSizeCheckHandler
 merge sd::BroadcastHelperOwner with sd::DrawController
 merge sd::ClientInfo with sd::ClientInfoInternal
 merge sd::IBluetoothSocket with sd::BufferedStreamSocket
 merge sd::ICustomAnimationListController with sd::CustomAnimationPane
+merge sd::TitledDockingWindow with sd::PaneDockingWindow
 merge sd::ZeroconfService with sd::AvahiNetworkService
-merge sd::sidebar::IDisposable with sd::sidebar::PanelBase
-merge sd::sidebar::ISidebarReceiver with sd::sidebar::PanelBase
 merge sd::sidebar::MasterPageContainerFiller::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
 merge sd::sidebar::MasterPageContainerQueue::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
-merge sd::sidebar::PreviewValueSet with sd::sidebar::MasterPagesSelector
 merge sd::slidesorter::view::(anonymous namespace)::AnimatorAccess with sd::slidesorter::view::InsertAnimator::Implementation
 merge sd::slidesorter::view::ILayerInvalidator with sd::slidesorter::view::(anonymous namespace)::LayerInvalidator
 merge sdext::presenter::IPresentationTime with sdext::presenter::(anonymous namespace)::PresentationTimeLabel
@@ -351,14 +395,13 @@ merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerti
 merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview
 merge sdr::SelectionController with sdr::table::SvxTableController
 merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor
-merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl
 merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry
-merge sfx2::ThreadHelpBase2 with sfx2::PreventDuplicateInteraction
 merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler
 merge slideshow::internal::AnimationFunction with slideshow::internal::ExpressionNode
 merge slideshow::internal::AnimationNode with slideshow::internal::BaseNode
 merge slideshow::internal::AttributableShape with slideshow::internal::DrawShape
 merge slideshow::internal::BoolAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
+merge slideshow::internal::ClickEventHandler with slideshow::internal::SkipEffectEventHandler
 merge slideshow::internal::ColorAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
 merge slideshow::internal::ContinuousKeyTimeActivityBase with slideshow::internal::(anonymous namespace)::ValuesActivity
 merge slideshow::internal::DocTreeNodeSupplier with slideshow::internal::DrawShape
@@ -374,21 +417,24 @@ merge slideshow::internal::ScreenUpdater::UpdateLock with (anonymous namespace):
 merge slideshow::internal::ShapeListenerEventHandler with slideshow::internal::ShapeManagerImpl
 merge slideshow::internal::ShapeManager with slideshow::internal::SubsettableShapeManager
 merge slideshow::internal::Slide with slideshow::internal::(anonymous namespace)::SlideImpl
+merge slideshow::internal::SnakeWipe with slideshow::internal::ParallelSnakesWipe
+merge slideshow::internal::SpiralWipe with slideshow::internal::BoxSnakesWipe
 merge slideshow::internal::StringAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
 merge slideshow::internal::SubsettableShapeManager with slideshow::internal::ShapeManagerImpl
 merge slideshow::internal::UserPaintEventHandler with slideshow::internal::PaintOverlayHandler
 merge slideshow::internal::View with slideshow::internal::UnoView
 merge slideshow::internal::ViewRepaintHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl
 merge slideshow::internal::ViewUpdate with slideshow::internal::ShapeManagerImpl
+merge slideshow::internal::ZigZagWipe with slideshow::internal::BarnZigZagWipe
 merge store::OStorePageBIOS with store::OStorePageManager
-merge svgio::svgreader::InfoProvider with svgio::svgreader::SvgNode
 merge svgio::svgreader::Visitor with svgio::svgreader::SvgDrawVisitor
 merge svl::StyleSheetCallback with (anonymous namespace)::AddStyleSheetCallback
 merge svl::StyleSheetDisposer with (anonymous namespace)::StyleSheetDisposerFunctor
-merge svt::IEditImplementation with svt::GenericEditImplementation
+merge svt::FrameStatusListener with (anonymous namespace)::ToolbarPopupStatusListener
 merge svt::IEnumerationResultHandler with SvtFileView_Impl
 merge svt::IFilePickerController with SvtFileDialog_Base
 merge svt::IFilePickerListener with SvtFilePicker
+merge svt::PopupWindowController_Base with svt::PopupWindowController
 merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade
 merge svt::table::ITableControl with svt::table::TableControl_Impl
 merge svt::table::ITableDataSort with svt::table::UnoControlTableModel
@@ -398,14 +444,13 @@ merge svt::table::ITableRenderer with svt::table::GridTableRenderer
 merge svx::IContextRequestObserver with svx::FmTextControlShell
 merge svx::IControllerFeatureInvalidation with FmXFormShell
 merge svx::IFocusObserver with svx::FmTextControlShell
-merge svx::IPropertyValueProvider with svx::PropertyValueProvider
 merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
 merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
 merge svxform::DispatchInterceptor with svxform::FormController
-merge svxform::IFormScriptingEnvironment with svxform::(anonymous namespace)::FormScriptingEnvironment
 merge sw::ClientIteratorBase with SwIterator
 merge sw::ICoreFrameStyle with (anonymous namespace)::SwXFrameStyle
 merge sw::IShellCursorSupplier with SwCursorShell
+merge sw::Meta with sw::MetaField
 merge sw::WriterListener with SwClient
 merge sw::mark::Bookmark with sw::mark::CrossRefBookmark
 merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl
@@ -415,21 +460,31 @@ merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark
 merge sw::mark::IDateFieldmark with sw::mark::DateFieldmark
 merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor
 merge testHFBase with testHFLinkToPrev
-merge treeview::ExtensionIteratorBase with treeview::TreeFileIterator
 merge ucbhelper::ActiveDataSink_Base with ucbhelper::ActiveDataSink
 merge ucbhelper::CommandEnvironment_Base with ucbhelper::CommandEnvironment
-merge unographic::GraphicTransformer with unographic::Graphic
+merge ucbhelper::InterceptedInteraction_Base with ucbhelper::InterceptedInteraction
 merge utl::OInputStreamWrapper_Base with utl::OInputStreamWrapper
 merge vcl::DeletionNotifier with SalFrame
 merge vcl::ExtOutDevData with vcl::PDFExtOutDevData
-merge vcl::IMnemonicEntryList with SvTreeListBox
 merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor
+merge vcl::SwapFile with ImpSwapFile
+merge vcl::font::GlyphFallbackFontSubstitution with (anonymous namespace)::FcGlyphFallbackSubstitution
+merge vcl::font::PreMatchFontSubstitution with (anonymous namespace)::FcPreMatchSubstitution
+merge vcl::pdf::PDFium with vcl::pdf::(anonymous namespace)::PDFiumImpl
+merge vcl::pdf::PDFiumAnnotation with vcl::pdf::(anonymous namespace)::PDFiumAnnotationImpl
+merge vcl::pdf::PDFiumBitmap with vcl::pdf::(anonymous namespace)::PDFiumBitmapImpl
+merge vcl::pdf::PDFiumDocument with vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl
+merge vcl::pdf::PDFiumPage with vcl::pdf::(anonymous namespace)::PDFiumPageImpl
+merge vcl::pdf::PDFiumPageObject with vcl::pdf::(anonymous namespace)::PDFiumPageObjectImpl
+merge vcl::pdf::PDFiumPathSegment with vcl::pdf::(anonymous namespace)::PDFiumPathSegmentImpl
+merge vcl::pdf::PDFiumSearchHandle with vcl::pdf::(anonymous namespace)::PDFiumSearchHandleImpl
+merge vcl::pdf::PDFiumSignature with vcl::pdf::(anonymous namespace)::PDFiumSignatureImpl
+merge vcl::pdf::PDFiumTextPage with vcl::pdf::(anonymous namespace)::PDFiumTextPageImpl
 merge vclcanvas::CanvasCustomSpriteSpriteBase_Base with canvas::CanvasBase
 merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base
 merge vclcanvas::SpriteCanvasBaseSpriteSurface_Base with canvas::CanvasBase
-merge webdav_ucp::DAVAuthListener with webdav_ucp::DAVAuthListener_Impl
-merge webdav_ucp::DAVSession with webdav_ucp::NeonSession
 merge weld::AssistantController with vcl::WizardMachine
+merge weld::WidgetStatusListener_Base with weld::WidgetStatusListener
 merge writerfilter::Stream with writerfilter::LoggedStream
 merge writerfilter::Table with writerfilter::LoggedTable
 merge writerfilter::dmapper::TableManager with writerfilter::dmapper::DomainMapperTableManager
@@ -438,6 +493,7 @@ merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with writerfilter::ooxm
 merge writerfilter::ooxml::OOXMLStream with writerfilter::ooxml::OOXMLStreamImpl
 merge writerfilter::ooxml::OOXMLUniversalMeasureValue with writerfilter::ooxml::OOXMLNthPtMeasureValue
 merge writerfilter::rtftok::RTFDocument with writerfilter::rtftok::RTFDocumentImpl
+merge ww8::WW8Struct with ww8::WW8Sttb
 merge xforms::OValueLimitedType_Base with xforms::OValueLimitedType
 merge xmloff::IEventAttacher with xmloff::OElementImport
 merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager
diff --git a/compilerplugins/clang/methodcycles.cxx b/compilerplugins/clang/methodcycles.cxx
index 7fd74b10d9ea..24f4562e4b51 100644
--- a/compilerplugins/clang/methodcycles.cxx
+++ b/compilerplugins/clang/methodcycles.cxx
@@ -17,6 +17,8 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 
 /**
@@ -35,7 +37,7 @@ Then we will post-process the log file with a python script, which takes about
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='methodcycles' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='methodcycles' check
   $ ./compilerplugins/clang/methodcycles.py
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
@@ -71,6 +73,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -126,10 +130,6 @@ MyFuncInfo MethodCycles::niceName(const FunctionDecl* functionDecl)
 {
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 
diff --git a/compilerplugins/clang/methodcycles.partition.results b/compilerplugins/clang/methodcycles.partition.results
index e2d808845e1b..9c31146daa6f 100644
--- a/compilerplugins/clang/methodcycles.partition.results
+++ b/compilerplugins/clang/methodcycles.partition.results
@@ -1,14 +1,8 @@
-callDict size 4
+callDict size 2
 
 
-std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > writerfilter::ooxml::OOXMLFastContextHandler::getType() const
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:88
-
 void sax_fastparser::FastSaxSerializer::ForMerge::print()
-sax/source/tools/fastserializer.hxx:184
+sax/source/tools/fastserializer.hxx:185
 
-SvTreeListEntry * SvTabListBox::InsertEntryToColumn(const rtl::OUString &,unsigned long,unsigned short,void *)
-include/vcl/svtabbx.hxx:86
-
-void sfx2::sidebar::Deck::PrintWindowSubTree(vcl::Window *,int)
-include/sfx2/sidebar/Deck.hxx:69
+std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > writerfilter::ooxml::OOXMLFastContextHandler::getType() const
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:85
diff --git a/compilerplugins/clang/methodcycles.py b/compilerplugins/clang/methodcycles.py
index 4a153ae1c0e5..5a1b731cc9d5 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -1,10 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from collections import defaultdict
 import io
 import re
 import subprocess
-import sys
 
 # --------------------------------------------------------------------------------------------
 # globals
@@ -33,7 +32,7 @@ def normalizeTypeParams( line ):
 # --------------------------------------------------------------------------------------------
 
 cnt = 0
-with io.open("workdir/loplugin.methodcycles.log", "rb", buffering=1024*1024) as txt:
+with io.open("workdir/loplugin.methodcycles.log", "r", buffering=1024*1024) as txt:
     for line in txt:
         tokens = line.strip().split("\t")
         if tokens[0] == "definition:":
@@ -106,7 +105,6 @@ for caller in definitionSet:
       or "include/rtl/" in location \
       or "include/sal/" in location \
       or "include/salhelper/" in location \
-      or "include/systools/" in location \
       or "include/typelib/" in location \
       or "include/uno/" in location \
       or "workdir/UnpackedTarball/" in location \
@@ -132,10 +130,10 @@ uno_constructor_entrypoints = set()
 git_grep_process = subprocess.Popen("git grep -h 'constructor=' -- *.component", stdout=subprocess.PIPE, shell=True)
 with git_grep_process.stdout as txt:
     for line in txt:
-        idx1 = line.find("\"")
-        idx2 = line.find("\"", idx1 + 1)
+        idx1 = line.find(b"\"")
+        idx2 = line.find(b"\"", idx1 + 1)
         func = line[idx1+1 : idx2]
-        uno_constructor_entrypoints.add(func)
+        uno_constructor_entrypoints.add(func.decode('utf-8'))
 for caller in callDict:
     if "(com::sun::star::uno::XComponentContext *,const com::sun::star::uno::Sequence<com::sun::star::uno::Any> &)" in caller:
         for func in uno_constructor_entrypoints:
@@ -264,4 +262,4 @@ def print_partitions():
             count = count + 1
             if count>1000: break
 
-print_partitions()
\ No newline at end of file
+print_partitions()
diff --git a/compilerplugins/clang/methodcycles.results b/compilerplugins/clang/methodcycles.results
index 5b8414cea0fb..60786eee9335 100644
--- a/compilerplugins/clang/methodcycles.results
+++ b/compilerplugins/clang/methodcycles.results
@@ -1,93 +1,157 @@
 found cycle
-    unsigned long slideshow::internal::hash::operator()(const type-parameter-?-? &) const
-    slideshow/source/inc/tools.hxx:84
+    void LogProbe(bool,void *,void *,_typelib_TypeDescriptionReference *,_typelib_MethodParameter *,int,const _typelib_TypeDescription *,void *,void **,_uno_Any **)
+    cppu/source/LogBridge/LogBridge.cxx:188
 
-    unsigned long com::sun::star::uno::hash_value(const Reference<type-parameter-?-?> &)
-    slideshow/source/inc/tools.hxx:94
+    void uno_ext_getMapping(_uno_Mapping **,_uno_Environment *,_uno_Environment *)
+    bridges/source/jni_uno/jni_bridge.cxx:514
 
-found cycle
     void (anonymous namespace)::traceValue(_typelib_TypeDescriptionReference *,void *)
     cppu/source/LogBridge/LogBridge.cxx:128
 
-    void uno_ext_getMapping(_uno_Mapping **,_uno_Environment *,_uno_Environment *)
-    bridges/source/jni_uno/jni_bridge.cxx:514
+found cycle
+    void svl::Items_t::fill(typename array<pair<unsigned short, unsigned short>, sizeof...(WIDs) / 2>::iterator)
+    include/svl/whichranges.hxx:52
 
-    void LogProbe(bool,void *,void *,_typelib_TypeDescriptionReference *,_typelib_MethodParameter *,int,const _typelib_TypeDescription *,void *,void **,_uno_Any **)
-    cppu/source/LogBridge/LogBridge.cxx:188
+    array<std::pair<unsigned short, unsigned short>, sizeof...(WIDs) / 2> svl::Items_t::make()
+    include/svl/whichranges.hxx:59
 
 found cycle
-    void chart::ChartTypeDialogController::adjustParameterToMainType(chart::ChartTypeParameter &)
-    chart2/source/controller/dialogs/ChartTypeDialogController.hxx:116
+    void weld::IconView::select_all()
+    include/vcl/weld.hxx:1385
 
-    chart::ChartTypeTabPage::ChartTypeTabPage(weld::Container *,weld::DialogController *,const com::sun::star::uno::Reference<com::sun::star::chart2::XChartDocument> &,bool)
-    chart2/source/controller/dialogs/tp_ChartType.hxx:48
+    void weld::IconView::unselect(int)
+    include/vcl/weld.hxx:1370
 
-    void chart::ChartTypeTabPage::selectMainType()
-    chart2/source/controller/dialogs/tp_ChartType.hxx:67
+found cycle
+    SvTreeListEntry * SvTreeListBox::InsertEntry(const rtl::OUString &,const Image &,const Image &,SvTreeListEntry *,bool,unsigned int,void *)
+    include/vcl/toolkit/treelistbox.hxx:559
 
-    void chart::ChartTypeTabPage::LinkStubSelectMainTypeHdl(void *,weld::TreeView &)
-    chart2/source/controller/dialogs/tp_ChartType.hxx:69
+    SvTreeListEntry * SvTabListBox::InsertEntryToColumn(const rtl::OUString &,const Image &,const Image &,SvTreeListEntry *,unsigned int,unsigned short,void *)
+    include/vcl/toolkit/svtabbx.hxx:79
 
-    void chart::ChartTypeTabPage::SelectMainTypeHdl(weld::TreeView &)
-    chart2/source/controller/dialogs/tp_ChartType.hxx:69
+found cycle
+    void CGM::ImplDefaultReplacement()
+    filter/source/graphicfilter/icgm/cgm.hxx:115
+
+    void CGM::ImplDoClass()
+    filter/source/graphicfilter/icgm/cgm.hxx:116
+
+    void CGM::ImplDoClass0()
+    filter/source/graphicfilter/icgm/cgm.hxx:117
+
+    unsigned int ImportCGM(SvStream &,const com::sun::star::uno::Reference<com::sun::star::frame::XModel> &,const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> &)
+    filter/source/graphicfilter/icgm/cgm.cxx:686
+
+    bool CGM::Write(SvStream &)
+    filter/source/graphicfilter/icgm/cgm.hxx:137
 
 found cycle
-    void SbxVariable::Dump(SvStream &,bool)
-    include/basic/sbxvar.hxx:262
+    bool ::operator()(weld::TreeIter &) const
+    reportdesign/source/ui/dlg/Navigator.cxx:234
 
-    void SbxObject::Dump(SvStream &,bool)
-    include/basic/sbxobj.hxx:80
+    void basctl::(anonymous namespace)::implCollapseModifiedObjectEntry(weld::TreeIter &,weld::TreeView &)
+    basctl/source/basicide/baside2b.cxx:2286
 
-    void SbRtl_DumpAllObjects(StarBASIC *,SbxArray &,bool)
-    basic/source/inc/rtlproto.hxx:293
+found cycle
+    bool ::operator()(weld::TreeIter &) const
+    reportdesign/source/ui/dlg/Navigator.cxx:234
+
+    bool FmEntryData::IsEqualWithoutChildren(FmEntryData *)
+    svx/source/inc/fmexpl.hxx:159
 
 found cycle
-    SvxMenuConfigPage::SvxMenuConfigPage(weld::Container *,weld::DialogController *,const SfxItemSet &,bool)
-    cui/source/inc/SvxMenuConfigPage.hxx:59
+    void sdext::presenter::PresenterToolBar::ProcessEntry(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &,const sdext::presenter::PresenterToolBar::Context &)
+    sdext/source/presenter/PresenterToolBar.hxx:183
+
+    void ::operator()(const rtl::OUString &,const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &) const
+    sdext/source/presenter/PresenterToolBar.cxx:611
 
-    void SvxMenuConfigPage::LinkStubGearHdl(void *,const rtl::OString &)
-    cui/source/inc/SvxMenuConfigPage.hxx:35
+    void sdext::presenter::(anonymous namespace)::Element::SetModes(const std::shared_ptr<sdext::presenter::(anonymous namespace)::ElementMode> &,const std::shared_ptr<sdext::presenter::(anonymous namespace)::ElementMode> &,const std::shared_ptr<sdext::presenter::(anonymous namespace)::ElementMode> &,const std::shared_ptr<sdext::presenter::(anonymous namespace)::ElementMode> &,const std::shared_ptr<sdext::presenter::(anonymous namespace)::ElementMode> &)
+    sdext/source/presenter/PresenterToolBar.cxx:129
 
-    rtl::OUString SvxConfigPageHelper::generateCustomMenuURL(std::::vector<SvxConfigEntry *, std::allocator<SvxConfigEntry *> > *,int)
-    cui/source/inc/SvxConfigPageHelper.hxx:46
+found cycle
+    void cppcanvas::internal::ImplRenderer::createActions(GDIMetaFile &,const cppcanvas::internal::ActionFactoryParameters &,bool)
+    cppcanvas/source/inc/implrenderer.hxx:170
 
-    SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(weld::Window *,std::::vector<SvxConfigEntry *, std::allocator<SvxConfigEntry *> > *,const SvxConfigEntry *,bool)
-    cui/source/inc/cfg.hxx:507
+    cppcanvas::internal::ImplRenderer::ImplRenderer(const std::shared_ptr<cppcanvas::Canvas> &,const GDIMetaFile &,const cppcanvas::Renderer::Parameters &)
+    cppcanvas/source/inc/implrenderer.hxx:122
 
-    void SvxMenuConfigPage::GearHdl(const rtl::OString &)
-    cui/source/inc/SvxMenuConfigPage.hxx:35
+    void cppcanvas::internal::ImplRenderer::createGradientAction(const tools::PolyPolygon &,const Gradient &,const cppcanvas::internal::ActionFactoryParameters &,bool,bool)
+    cppcanvas/source/inc/implrenderer.hxx:185
 
 found cycle
-    sd::UndoAnimationPath::UndoAnimationPath(SdDrawDocument *,SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
-    sd/inc/undoanim.hxx:55
+    void SbxObject::Dump(SvStream &,bool)
+    include/basic/sbxobj.hxx:80
 
-    sd::UndoAnimationPathImpl::UndoAnimationPathImpl(SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
-    sd/source/core/undoanim.cxx:119
+    void SbRtl_DumpAllObjects(StarBASIC *,SbxArray &,bool)
+    basic/source/inc/rtlproto.hxx:290
 
-    int sd::EffectSequenceHelper::getOffsetFromEffect(const std::shared_ptr<sd::CustomAnimationEffect> &) const
-    sd/inc/CustomAnimationEffect.hxx:324
+    void SbxVariable::Dump(SvStream &,bool)
+    include/basic/sbxvar.hxx:268
 
 found cycle
-    sd::UndoAnimationPath::UndoAnimationPath(SdDrawDocument *,SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
-    sd/inc/undoanim.hxx:55
+    unsigned long com::sun::star::uno::hash_value(const Reference<type-parameter-?-?> &)
+    slideshow/source/inc/tools.hxx:86
 
-    std::shared_ptr<sd::CustomAnimationEffect> sd::EffectSequenceHelper::findEffect(const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &) const
-    sd/inc/CustomAnimationEffect.hxx:288
+    unsigned long slideshow::internal::hash::operator()(const type-parameter-?-? &) const
+    slideshow/source/inc/tools.hxx:76
 
-    sd::UndoAnimationPathImpl::UndoAnimationPathImpl(SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
-    sd/source/core/undoanim.cxx:119
+found cycle
+    std::unique_ptr<SdrUndoAction, std::default_delete<SdrUndoAction> > SdrUndoFactory::CreateUndoPageRemoveMasterPage(SdrPage &)
+    include/svx/svdundo.hxx:736
+
+    SdrUndoDelPage::SdrUndoDelPage(SdrPage &)
+    include/svx/svdundo.hxx:562
 
 found cycle
-    void GtkInstanceAssistant::find_sidebar(_GtkWidget *,void *)
-    vcl/unx/gtk3/gtk3gtkinst.cxx:4162
+    void oox::PropertyMap::dumpCode(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &)
+    include/oox/helper/propertymap.hxx:113
 
-    GtkInstanceAssistant::GtkInstanceAssistant(_GtkAssistant *,GtkInstanceBuilder *,bool)
-    vcl/unx/gtk3/gtk3gtkinst.cxx:4185
+    const char * oox::lclDumpAnyValueCode(const com::sun::star::uno::Any &,int)
+    oox/source/helper/propertymap.cxx:548
 
 found cycle
+    void ScDPResultMember::DumpState(const ScDPResultMember *,ScDocument *,ScAddress &) const
+    sc/inc/dptabres.hxx:404
+
     void ScDPResultDimension::DumpState(const ScDPResultMember *,ScDocument *,ScAddress &) const
-    sc/inc/dptabres.hxx:573
+    sc/inc/dptabres.hxx:572
 
-    void ScDPResultMember::DumpState(const ScDPResultMember *,ScDocument *,ScAddress &) const
-    sc/inc/dptabres.hxx:405
+found cycle
+    void ScXMLSourceDlg::LoadSourceFileStructure(const rtl::OUString &)
+    sc/source/ui/inc/xmlsourcedlg.hxx:77
+
+    void ScXMLSourceDlg::LinkStubBtnPressedHdl(void *,weld::Button &)
+    sc/source/ui/inc/xmlsourcedlg.hxx:101
+
+    void (anonymous namespace)::populateTree(weld::TreeView &,orcus::xml_structure_tree::walker &,const orcus::xml_structure_tree::entity_name &,bool,const weld::TreeIter *,ScOrcusXMLTreeParam &)
+    sc/source/filter/orcus/xmlcontext.cxx:70
+
+    void ScXMLSourceDlg::SelectSourceFile()
+    sc/source/ui/inc/xmlsourcedlg.hxx:76
+
+    void ScXMLSourceDlg::BtnPressedHdl(weld::Button &)
+    sc/source/ui/inc/xmlsourcedlg.hxx:101
+
+    ScXMLSourceDlg::ScXMLSourceDlg(SfxBindings *,SfxChildWindow *,weld::Window *,ScDocument *)
+    sc/source/ui/inc/xmlsourcedlg.hxx:66
+
+    void ScOrcusXMLContext::loadXMLStructure(weld::TreeView &,ScOrcusXMLTreeParam &)
+    sc/inc/orcusfilters.hxx:63
+
+found cycle
+    void (anonymous namespace)::getFieldLinks(ScOrcusImportXMLParam::RangeLink &,std::::vector<unsigned long, std::allocator<unsigned long> > &,const weld::TreeView &,const weld::TreeIter &)
+    sc/source/ui/xmlsource/xmlsourcedlg.cxx:448
+
+    void ScXMLSourceDlg::LinkStubBtnPressedHdl(void *,weld::Button &)
+    sc/source/ui/inc/xmlsourcedlg.hxx:101
+
+    void ScXMLSourceDlg::BtnPressedHdl(weld::Button &)
+    sc/source/ui/inc/xmlsourcedlg.hxx:101
+
+    ScXMLSourceDlg::ScXMLSourceDlg(SfxBindings *,SfxChildWindow *,weld::Window *,ScDocument *)
+    sc/source/ui/inc/xmlsourcedlg.hxx:66
+
+    void ScXMLSourceDlg::OkPressed()
+    sc/source/ui/inc/xmlsourcedlg.hxx:97
 
diff --git a/compilerplugins/clang/moveit.cxx b/compilerplugins/clang/moveit.cxx
new file mode 100644
index 000000000000..ac1718a35ac7
--- /dev/null
+++ b/compilerplugins/clang/moveit.cxx
@@ -0,0 +1,271 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include "config_clang.h"
+#include "plugin.hxx"
+#include "check.hxx"
+#include <unordered_set>
+#include <unordered_map>
+
+/*
+Look for local variables that can be std::move'd into parameters.
+
+TODO
+(*) Ideally we would use a proper data-flow analysis, to detect that the var is dead after this point,
+     like the one in clang at include/clang/Analysis/CFG.h
+(*) we could expand the set of approved/interesting types
+*/
+
+namespace
+{
+class MoveIt : public loplugin::FilteringPlugin<MoveIt>
+{
+public:
+    explicit MoveIt(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override
+    {
+        std::string fn(handler.getMainFileName());
+        loplugin::normalizeDotDotInFilePath(fn);
+        // false +, needs to check if the moved-from var is outside a loop
+        if (loplugin::hasPathnamePrefix(
+                fn, SRCDIR "/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(
+                fn, SRCDIR "/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/drawinglayer/source/tools/emfphelperdata.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/core/tool/reftokenhelper.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn,
+                                        SRCDIR "/svx/source/svdraw/svdotextpathdecomposition.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/svdraw/svdcrtv.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/table/tablehandles.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/xoutdev/xpool.cxx"))
+            return false;
+        return true;
+    }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        for (auto const& pair : m_possibles)
+        {
+            auto const& possible = pair.second;
+            report(DiagnosticsEngine::Warning, "can std::move this var into this param",
+                   possible.argExpr->getBeginLoc());
+            report(DiagnosticsEngine::Note, "passing to this param",
+                   possible.calleeParmVarDecl->getBeginLoc());
+            report(DiagnosticsEngine::Note, "local var declared here",
+                   possible.localVarDecl->getBeginLoc());
+            report(DiagnosticsEngine::Note, "type declared here",
+                   possible.recordDecl->getBeginLoc());
+        }
+    }
+
+    bool VisitCXXMemberCallExpr(const CXXMemberCallExpr*);
+    bool VisitCXXConstructExpr(const CXXConstructExpr*);
+    bool VisitDeclRefExpr(const DeclRefExpr*);
+
+private:
+    bool isInterestingType(QualType);
+    struct Possible
+    {
+        const Expr* argExpr;
+        const ParmVarDecl* calleeParmVarDecl;
+        const VarDecl* localVarDecl;
+        const CXXRecordDecl* recordDecl;
+        const DeclRefExpr* dre;
+    };
+    std::unordered_map<const VarDecl*, Possible> m_possibles;
+    std::unordered_set<const VarDecl*> m_rejected;
+};
+
+bool MoveIt::VisitCXXMemberCallExpr(const CXXMemberCallExpr* topExpr)
+{
+    if (ignoreLocation(topExpr))
+        return true;
+    const CXXMethodDecl* methodDecl = topExpr->getMethodDecl();
+    if (!methodDecl)
+        return true;
+
+    unsigned len = std::min(topExpr->getNumArgs(), methodDecl->getNumParams());
+    for (unsigned i = 0; i < len; ++i)
+    {
+        // check if the parameter is a moveable type
+        const ParmVarDecl* parmVarDecl = methodDecl->getParamDecl(i);
+        if (!parmVarDecl->getType()->isRecordType())
+            continue;
+        const CXXRecordDecl* recordDecl
+            = dyn_cast<CXXRecordDecl>(parmVarDecl->getType()->getAsRecordDecl());
+        if (!recordDecl || !recordDecl->hasMoveConstructor() || recordDecl->isTriviallyCopyable())
+            continue;
+        if (!isInterestingType(parmVarDecl->getType()))
+            continue;
+
+        // check if (a) we're making a copy to pass to the param and (b) we're making a copy of a local var
+        const Expr* argExpr = topExpr->getArg(i);
+        if (!argExpr)
+            continue;
+        const CXXConstructExpr* argSubExpr = dyn_cast<CXXConstructExpr>(argExpr->IgnoreImplicit());
+        if (!argSubExpr || argSubExpr->getNumArgs() == 0)
+            continue;
+        const DeclRefExpr* dre = dyn_cast<DeclRefExpr>(argSubExpr->getArg(0)->IgnoreImplicit());
+        if (!dre)
+            continue;
+        const VarDecl* localVarDecl = dyn_cast<VarDecl>(dre->getDecl());
+        if (!localVarDecl || localVarDecl->getType()->isReferenceType()
+            || localVarDecl->getType()->isPointerType() || !localVarDecl->hasLocalStorage())
+            continue;
+        // because sometimes the parameter type is some obscured STL thing
+        if (!isInterestingType(localVarDecl->getType()))
+            continue;
+
+        if (m_rejected.count(localVarDecl))
+            continue;
+
+        m_possibles[localVarDecl] = Possible{ argExpr, parmVarDecl, localVarDecl, recordDecl, dre };
+    }
+
+    return true;
+}
+
+bool MoveIt::VisitCXXConstructExpr(const CXXConstructExpr* topExpr)
+{
+    if (ignoreLocation(topExpr))
+        return true;
+    if (isa<CXXTemporaryObjectExpr>(topExpr))
+        return true;
+    const CXXConstructorDecl* methodDecl = topExpr->getConstructor();
+    if (!methodDecl)
+        return true;
+
+    unsigned len = std::min(topExpr->getNumArgs(), methodDecl->getNumParams());
+    for (unsigned i = 0; i < len; ++i)
+    {
+        // check if the parameter is a moveable type
+        const ParmVarDecl* parmVarDecl = methodDecl->getParamDecl(i);
+        if (!parmVarDecl->getType()->isRecordType())
+            continue;
+        const CXXRecordDecl* recordDecl
+            = dyn_cast<CXXRecordDecl>(parmVarDecl->getType()->getAsRecordDecl());
+        if (!recordDecl || !recordDecl->hasMoveConstructor() || recordDecl->isTriviallyCopyable())
+            continue;
+        if (!isInterestingType(parmVarDecl->getType()))
+            continue;
+
+        // check if (a) we're making a copy to pass to the param and (b) we're making a copy of a local var
+        const Expr* argExpr = topExpr->getArg(i);
+        if (!argExpr)
+            continue;
+        const CXXConstructExpr* argSubExpr = dyn_cast<CXXConstructExpr>(argExpr->IgnoreImplicit());
+        if (!argSubExpr || argSubExpr->getNumArgs() == 0)
+            continue;
+        const DeclRefExpr* dre = dyn_cast<DeclRefExpr>(argSubExpr->getArg(0)->IgnoreImplicit());
+        if (!dre)
+            continue;
+        const VarDecl* localVarDecl = dyn_cast<VarDecl>(dre->getDecl());
+        if (!localVarDecl || localVarDecl->getType()->isReferenceType()
+            || localVarDecl->getType()->isPointerType() || !localVarDecl->hasLocalStorage())
+            continue;
+        // because sometimes the parameter type is some obscured STL thing
+        if (!isInterestingType(localVarDecl->getType()))
+            continue;
+
+        if (m_rejected.count(localVarDecl))
+            continue;
+
+        m_possibles[localVarDecl] = Possible{ argExpr, parmVarDecl, localVarDecl, recordDecl, dre };
+    }
+
+    return true;
+}
+
+/// If we have pushed a possibility, and then we see that possibility again,
+/// then we cannot std::move it, because it is being referenced after being moved.
+///
+bool MoveIt::VisitDeclRefExpr(const DeclRefExpr* declRefExpr)
+{
+    if (ignoreLocation(declRefExpr))
+        return true;
+    const VarDecl* localVarDecl = dyn_cast<VarDecl>(declRefExpr->getDecl());
+    if (!localVarDecl)
+        return true;
+    auto it = m_possibles.find(localVarDecl);
+    if (it == m_possibles.end())
+        return true;
+    // ignoring the DeclRefExpr* for the expression where we found the Possible
+    if (it->second.dre == declRefExpr)
+        return true;
+    m_possibles.erase(it);
+    m_rejected.insert(localVarDecl);
+    return true;
+}
+
+/// Exclude boring types, so that we don't generate too many low-value conversions.
+/// e.g. for now I ignore ref-counted types like Sequence and OUString and css::uno::Reference,
+/// because that generates too many changes
+bool MoveIt::isInterestingType(QualType qt)
+{
+    if (qt->isEnumeralType())
+        return false;
+    if (!qt->isRecordType())
+        return false;
+
+    auto tc = loplugin::TypeCheck(qt);
+
+    // clang-format off
+    return !tc.ClassOrStruct("iterator")
+           && !tc.ClassOrStruct("const_iterator")
+           && !tc.Typedef("iterator")
+           && !tc.Typedef("const_iterator")
+           && !tc.Class("_Safe_iterator")
+           && !tc.Typedef("string")
+           && !tc.ClassOrStruct("shared_ptr").StdNamespace()
+           && !tc.ClassOrStruct("shared_ptr").Namespace("boost")
+           && !tc.Class("B2DHomMatrix").Namespace("basegfx").GlobalNamespace()
+           && !tc.Class("Pipe").Namespace("osl")
+           && !tc.Class("Any").Namespace("uno")
+           && !tc.Class("TypeDescription").Namespace("uno")
+           && !tc.Class("UnoInterfaceReference").Namespace("uno")
+           && !tc.Class("ByteSequence").Namespace("rtl").GlobalNamespace()
+           && !tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+           && !tc.Class("OString").Namespace("rtl").GlobalNamespace()
+           && !tc.Class("BinaryAny")
+           && !tc.Class("Reference")
+           && !tc.Class("SvRef").Namespace("tools").GlobalNamespace()
+           && !tc.ClassOrStruct("sk_sp") // skia shared pointer
+           && !tc.ClassOrStruct("VclPtr")
+           && !tc.Typedef("IterString") // SalInstanceTreeView::IterString
+           && !tc.Typedef("svtree_render_args")
+           && !tc.Typedef("render_args") // weld::ComboBox::render_args
+           ;
+    // clang-format on
+}
+
+/// off by default because each warning needs to be hand checked to ensure it is not a false+
+loplugin::Plugin::Registration<MoveIt> moveit("moveit", false);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/moveparam.cxx b/compilerplugins/clang/moveparam.cxx
new file mode 100644
index 000000000000..dc7a84b4d64d
--- /dev/null
+++ b/compilerplugins/clang/moveparam.cxx
@@ -0,0 +1,191 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include <unordered_set>
+#include "config_clang.h"
+#include "plugin.hxx"
+#include "check.hxx"
+
+/*
+Look for places where we can pass by move && param and so avoid
+unnecessary copies.
+Empirically, when we are passing a container type to a function, 80% of the time,
+we are passing a local temporary that can be moved instead of being copied.
+
+TODO this could be a lot smarter, with ignoring false+ e.g. when copying a param
+in a loop
+*/
+
+namespace
+{
+class MoveParam : public loplugin::FilteringPlugin<MoveParam>
+{
+public:
+    explicit MoveParam(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override
+    {
+        std::string fn(handler.getMainFileName());
+        loplugin::normalizeDotDotInFilePath(fn);
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/filter/source/msfilter/escherex.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/ui/docshell/docfunc.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/ui/view/viewfunc.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/basegfx/source/polygon/b2dpolygontools.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/basegfx/source/polygon/b3dpolygontools.cxx"))
+            return false;
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/connectivity/source/commontools/dbtools.cxx"))
+            return false;
+        return true;
+    }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXOperatorCallExpr(const CXXOperatorCallExpr*);
+    bool VisitCXXConstructExpr(const CXXConstructExpr*);
+
+    bool isContainerType(QualType qt);
+};
+
+bool MoveParam::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callExpr)
+{
+    if (ignoreLocation(callExpr))
+        return true;
+    if (!callExpr->isAssignmentOp())
+        return true;
+    auto qt = callExpr->getType();
+    if (!isContainerType(qt))
+        return true;
+    auto declRef = dyn_cast<DeclRefExpr>(callExpr->getArg(1)->IgnoreParenImpCasts());
+    if (!declRef)
+        return true;
+
+    auto parmVarDecl = dyn_cast_or_null<ParmVarDecl>(declRef->getDecl());
+    if (!parmVarDecl)
+        return true;
+
+    if (!loplugin::TypeCheck(parmVarDecl->getType()).LvalueReference().Const())
+        return true;
+
+    StringRef aFileName = getFilenameOfLocation(
+        compiler.getSourceManager().getSpellingLoc(parmVarDecl->getBeginLoc()));
+    if (loplugin::hasPathnamePrefix(aFileName,
+                                    SRCDIR "/svx/source/sidebar/line/LineWidthValueSet.cxx"))
+        return true;
+
+    report(DiagnosticsEngine::Warning, "rather use move && param1", callExpr->getBeginLoc());
+
+    return true;
+}
+
+bool MoveParam::VisitCXXConstructExpr(const CXXConstructExpr* constructExpr)
+{
+    if (ignoreLocation(constructExpr->getBeginLoc()))
+        return true;
+    if (isInUnoIncludeFile(constructExpr->getBeginLoc()))
+        return true;
+
+    auto qt = constructExpr->getType();
+    if (!isContainerType(qt))
+        return true;
+
+    if (constructExpr->getNumArgs() != 1)
+        return true;
+
+    auto declRef = dyn_cast<DeclRefExpr>(constructExpr->getArg(0)->IgnoreParenImpCasts());
+    if (!declRef)
+        return true;
+
+    auto parmVarDecl = dyn_cast_or_null<ParmVarDecl>(declRef->getDecl());
+    if (!parmVarDecl)
+        return true;
+
+    if (!loplugin::TypeCheck(parmVarDecl->getType()).LvalueReference().Const())
+        return true;
+
+    StringRef aFileName = getFilenameOfLocation(
+        compiler.getSourceManager().getSpellingLoc(parmVarDecl->getBeginLoc()));
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
+                                    "/include/drawinglayer/primitive2d/Primitive2DContainer.hxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName,
+                                    SRCDIR "/include/drawinglayer/primitive3d/baseprimitive3d.hxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/svx/source/svdraw/svdmrkv.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/editeng/swafopt.hxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(
+            aFileName, SRCDIR "/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName,
+                                    SRCDIR "/chart2/source/tools/InternalDataProvider.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/sc/source/core/data/attrib.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/sw/source/core/doc/docfmt.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/configmgr/source/modifications.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/svx/source/dialog/srchdlg.cxx"))
+        return true;
+    if (loplugin::hasPathnamePrefix(aFileName,
+                                    SRCDIR "/stoc/source/servicemanager/servicemanager.cxx"))
+        return true;
+
+    report(DiagnosticsEngine::Warning, "rather use move && param3", constructExpr->getBeginLoc());
+
+    return true;
+}
+
+bool MoveParam::isContainerType(QualType qt)
+{
+    auto tc = loplugin::TypeCheck(qt);
+    return tc.Class("Primitive2DContainer")
+               .Namespace("primitive2d")
+               .Namespace("drawinglayer")
+               .GlobalNamespace()
+           || tc.ClassOrStruct("sorted_vector").Namespace("o3tl").GlobalNamespace()
+           || tc.ClassOrStruct("array").StdNamespace() || tc.ClassOrStruct("vector").StdNamespace()
+           || tc.ClassOrStruct("deque").StdNamespace()
+           || tc.ClassOrStruct("forward_list").StdNamespace()
+           || tc.ClassOrStruct("list").StdNamespace() || tc.ClassOrStruct("set").StdNamespace()
+           || tc.ClassOrStruct("map").StdNamespace() || tc.ClassOrStruct("multiset").StdNamespace()
+           || tc.ClassOrStruct("multimap").StdNamespace()
+           || tc.ClassOrStruct("unordered_set").StdNamespace()
+           || tc.ClassOrStruct("unordered_map").StdNamespace()
+           || tc.ClassOrStruct("unordered_multiset").StdNamespace()
+           || tc.ClassOrStruct("unordered_multimap").StdNamespace()
+           || tc.ClassOrStruct("stack").StdNamespace() || tc.ClassOrStruct("queue").StdNamespace()
+           || tc.ClassOrStruct("priority_queue").StdNamespace();
+}
+
+/** off by default because it needs some hand-holding */
+loplugin::Plugin::Registration<MoveParam> moveparam("moveparam", false);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/noexcept.cxx b/compilerplugins/clang/noexcept.cxx
new file mode 100644
index 000000000000..de956839e827
--- /dev/null
+++ b/compilerplugins/clang/noexcept.cxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "plugin.hxx"
+
+namespace
+{
+class Noexcept : public loplugin::FilteringRewritePlugin<Noexcept>
+{
+public:
+    explicit Noexcept(loplugin::InstantiationData const& data)
+        : FilteringRewritePlugin(data)
+    {
+    }
+
+    void run() override
+    {
+        // Don't execute for < C++11, so we don't accidentally rewrite the legacy definitions of
+        // SAL_THROW_EXTERN_C and SAL_NOEXCEPT in include/sal/types.h e.g. when building
+        // CppunitTest_odk_checkapi which explicitly uses gb_CXX03FLAGS:
+        if (compiler.getLangOpts().CPlusPlus11)
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitFunctionProtoTypeLoc(FunctionProtoTypeLoc tloc)
+    {
+        if (ignoreLocation(tloc))
+        {
+            return true;
+        }
+        if (tloc.getTypePtr()->getExceptionSpecType() != EST_DynamicNone)
+        {
+            return true;
+        }
+        auto const r = tloc.getExceptionSpecRange();
+        auto r2 = r;
+        auto l1 = r.getBegin();
+        while (compiler.getSourceManager().isMacroArgExpansion(l1))
+        {
+            l1 = compiler.getSourceManager().getImmediateMacroCallerLoc(l1);
+        }
+        if (compiler.getSourceManager().isMacroBodyExpansion(l1))
+        {
+            auto l2 = r.getEnd();
+            while (compiler.getSourceManager().isMacroArgExpansion(l2))
+            {
+                l2 = compiler.getSourceManager().getImmediateMacroCallerLoc(l2);
+            }
+            if (compiler.getSourceManager().isMacroBodyExpansion(l2))
+            {
+                //TODO: check l1, l2 are in same macro body expansion
+                auto const spl = compiler.getSourceManager().getSpellingLoc(l1);
+                if (ignoreLocation(spl))
+                {
+                    return true;
+                }
+                r2 = { spl, compiler.getSourceManager().getSpellingLoc(l2) };
+            }
+        }
+        auto const repl = isInUnoIncludeFile(r.getBegin()) ? "SAL_NOEXCEPT" : "noexcept";
+        if (rewriter != nullptr && replaceText(r2, repl))
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning,
+               "Replace legacy dynamic 'throw ()' exception specification with '%0'", r.getBegin())
+            << repl << r;
+        return true;
+    }
+};
+
+loplugin::Plugin::Registration<Noexcept> X("noexcept", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/noexceptmove.cxx b/compilerplugins/clang/noexceptmove.cxx
index c2cbdcf0c2a3..04ec58044ce4 100644
--- a/compilerplugins/clang/noexceptmove.cxx
+++ b/compilerplugins/clang/noexceptmove.cxx
@@ -8,12 +8,11 @@
  */
 // versions before 9.0 didn't have getExceptionSpecType
 
+#include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
-// clang before V9 does not have API to report exception spec type
-#if CLANG_VERSION >= 90000
-
-#include "check.hxx"
+#include "config_clang.h"
 
 #include <string>
 #include <set>
@@ -55,7 +54,7 @@ public:
     bool VisitVarDecl(const VarDecl*);
 
 private:
-    llvm::Optional<bool> IsCallThrows(const CallExpr* callExpr);
+    compat::optional<bool> IsCallThrows(const CallExpr* callExpr);
     std::vector<bool> m_ConstructorThrows;
     std::vector<std::vector<const Decl*>> m_Exclusions;
     std::vector<bool> m_CannotFix;
@@ -120,7 +119,7 @@ bool NoExceptMove::TraverseCXXMethodDecl(CXXMethodDecl* methodDecl)
     if (isMove)
     {
         StringRef fn = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(methodDecl)));
+            compiler.getSourceManager().getSpellingLoc(methodDecl->getBeginLoc()));
         // SfxObjectShellLock::operator= calls SotObject::OwnerLock which in turn calls stuff which cannot be noexcept
         if (loplugin::isSamePathname(fn, SRCDIR "/include/sfx2/objsh.hxx"))
             isMove = false;
@@ -173,7 +172,7 @@ bool NoExceptMove::VisitCallExpr(const CallExpr* callExpr)
         return true;
     if (m_ConstructorThrows.empty())
         return true;
-    llvm::Optional<bool> bCallThrows = IsCallThrows(callExpr);
+    compat::optional<bool> bCallThrows = IsCallThrows(callExpr);
     if (!bCallThrows)
     {
         callExpr->dump();
@@ -252,7 +251,7 @@ bool NoExceptMove::VisitVarDecl(const VarDecl* varDecl)
     return true;
 }
 
-llvm::Optional<bool> NoExceptMove::IsCallThrows(const CallExpr* callExpr)
+compat::optional<bool> NoExceptMove::IsCallThrows(const CallExpr* callExpr)
 {
     const FunctionDecl* calleeFunctionDecl = callExpr->getDirectCallee();
     if (calleeFunctionDecl)
@@ -302,7 +301,7 @@ llvm::Optional<bool> NoExceptMove::IsCallThrows(const CallExpr* callExpr)
     else
     {
         m_CannotFix.back() = true;
-        return llvm::Optional<bool>();
+        return compat::optional<bool>();
     }
 
     // allowlist of functions that could be noexcept, but we can't change them because of backwards-compatibility reasons
@@ -316,7 +315,7 @@ llvm::Optional<bool> NoExceptMove::IsCallThrows(const CallExpr* callExpr)
     if (!funcProto)
     {
         m_CannotFix.back() = true;
-        return llvm::Optional<bool>();
+        return compat::optional<bool>();
     }
 
     auto est = funcProto->getExceptionSpecType();
@@ -330,5 +329,4 @@ llvm::Optional<bool> NoExceptMove::IsCallThrows(const CallExpr* callExpr)
 loplugin::Plugin::Registration<NoExceptMove> noexceptmove("noexceptmove");
 }
 
-#endif // CLANG_VERSION
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/nullptr.cxx b/compilerplugins/clang/nullptr.cxx
index b4a40b408a6c..04fb5bf0f9fd 100644
--- a/compilerplugins/clang/nullptr.cxx
+++ b/compilerplugins/clang/nullptr.cxx
@@ -75,7 +75,7 @@ public:
 
     bool TraverseInitListExpr(InitListExpr * expr, DataRecursionQueue * queue = nullptr);
 
-    // bool shouldVisitTemplateInstantiations() const { return true; }
+    bool shouldVisitTemplateInstantiations() const { return true; }
 
 private:
     bool isInLokIncludeFile(SourceLocation spellingLocation) const;
@@ -121,7 +121,7 @@ bool Nullptr::VisitImplicitCastExpr(CastExpr const * expr) {
         case Expr::NPCK_ZeroLiteral:
             report(
                 DiagnosticsEngine::Warning,
-                "suspicious ValueDependentIsNull %0", compat::getBeginLoc(expr))
+                "suspicious ValueDependentIsNull %0", expr->getBeginLoc())
                 << kindName(k) << expr->getSourceRange();
             break;
         default:
@@ -131,11 +131,18 @@ bool Nullptr::VisitImplicitCastExpr(CastExpr const * expr) {
     case Expr::NPCK_CXX11_nullptr:
         break;
     default:
-        if (loplugin::TypeCheck(expr->getType()).Typedef("locale_t")
+        auto const tc = loplugin::TypeCheck(expr->getType());
+        if (tc.Typedef("locale_t")
             .GlobalNamespace())
         {
             break; // POSIX locale_t is left unspecified
         }
+        // Hack to handle libc++ and stdlibc++ `std::strong_ordering x; x < 0` etc.:
+        if (tc.MemberPointerOf().ClassOrStruct("_CmpUnspecifiedParam").StdNamespace()
+            || tc.Pointer().ClassOrStruct("__unspec").Namespace("__cmp_cat").StdNamespace())
+        {
+            break;
+        }
         handleNull(expr->getSubExpr(), expr->getCastKindName(), k);
         break;
     }
@@ -209,6 +216,9 @@ bool Nullptr::VisitParmVarDecl(ParmVarDecl const * decl) {
     if (!isAnyKindOfPointerType(decl->getType())) {
         return true;
     }
+    if (decl->hasUninstantiatedDefaultArg()) {
+        return true; //TODO
+    }
     auto e = decl->getDefaultArg();
     if (e == nullptr) {
         return true;
@@ -245,10 +255,9 @@ bool Nullptr::isInLokIncludeFile(SourceLocation spellingLocation) const {
 
 bool Nullptr::isFromCIncludeFile(SourceLocation spellingLocation) const {
     return !compiler.getSourceManager().isInMainFile(spellingLocation)
-        && (StringRef(
-                compiler.getSourceManager().getPresumedLoc(spellingLocation)
-                .getFilename())
-            .endswith(".h"));
+        && compat::ends_with(
+            StringRef(compiler.getSourceManager().getPresumedLoc(spellingLocation).getFilename()),
+            ".h");
 }
 
 bool Nullptr::isSharedCAndCppCode(SourceLocation location) const {
@@ -310,7 +319,7 @@ void Nullptr::handleNull(
     SourceLocation loc;
     for (;;) {
         e = e->IgnoreImpCasts();
-        loc = compat::getBeginLoc(e);
+        loc = e->getBeginLoc();
         while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
             loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
         }
@@ -375,7 +384,7 @@ void Nullptr::rewriteOrWarn(
     Expr::NullPointerConstantKind nullPointerKind, char const * replacement)
 {
     if (rewriter != nullptr) {
-        SourceLocation locStart(compat::getBeginLoc(expr));
+        SourceLocation locStart(expr->getBeginLoc());
         while (compiler.getSourceManager().isMacroArgExpansion(locStart)) {
             locStart = compiler.getSourceManager()
                 .getImmediateMacroCallerLoc(locStart);
@@ -390,7 +399,7 @@ void Nullptr::rewriteOrWarn(
             locStart = compat::getImmediateExpansionRange(compiler.getSourceManager(), locStart)
                 .first;
         }
-        SourceLocation locEnd(compat::getEndLoc(expr));
+        SourceLocation locEnd(expr->getEndLoc());
         while (compiler.getSourceManager().isMacroArgExpansion(locEnd)) {
             locEnd = compiler.getSourceManager()
                 .getImmediateMacroCallerLoc(locEnd);
@@ -409,13 +418,13 @@ void Nullptr::rewriteOrWarn(
         }
     }
     if (castKind == nullptr) {
-        report(DiagnosticsEngine::Warning, "%0 -> %1", compat::getBeginLoc(expr))
+        report(DiagnosticsEngine::Warning, "%0 -> %1", expr->getBeginLoc())
             << kindName(nullPointerKind) << replacement
             << expr->getSourceRange();
     } else {
         report(
             DiagnosticsEngine::Warning, "%0 ValueDependentIsNotNull %1 -> %2",
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << castKind << kindName(nullPointerKind) << replacement
             << expr->getSourceRange();
     }
diff --git a/compilerplugins/clang/optionalbool.cxx b/compilerplugins/clang/optionalbool.cxx
new file mode 100644
index 000000000000..013bf1b4725c
--- /dev/null
+++ b/compilerplugins/clang/optionalbool.cxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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 LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <stack>
+
+#include "check.hxx"
+#include "plugin.hxx"
+#include "config_clang.h"
+
+// Check for uses of std::optional<bool> being assigned to bool, which generally does not do
+// what you would expect.
+
+namespace
+{
+class OptionalBool final : public loplugin::FilteringPlugin<OptionalBool>
+{
+public:
+    explicit OptionalBool(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override
+    {
+        if (!compiler.getLangOpts().CPlusPlus)
+            return false;
+        return true;
+    }
+
+    void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitIfStmt(const IfStmt* ifStmt)
+    {
+        if (ignoreLocation(ifStmt))
+            return true;
+        m_ignoreIfCondition = ifStmt->getCond()->IgnoreImplicit();
+        return true;
+    }
+
+    bool VisitCXXMemberCallExpr(const CXXMemberCallExpr* memberCall)
+    {
+        if (ignoreLocation(memberCall))
+            return true;
+        if (m_ignoreIfCondition == memberCall)
+            return true;
+        // check if we are calling a 'operator bool' conversion method
+        auto conversionDecl = dyn_cast_or_null<CXXConversionDecl>(memberCall->getMethodDecl());
+        if (!conversionDecl || !conversionDecl->getConversionType()->isBooleanType())
+            return true;
+        auto ctsd = dyn_cast_or_null<ClassTemplateSpecializationDecl>(
+            memberCall->getObjectType()->getAsRecordDecl());
+        if (!ctsd || ctsd->getTemplateArgs().size() < 1)
+            return true;
+        if (ctsd->getName() != "optional")
+            return true;
+        if (!ctsd->getTemplateArgs().get(0).getAsType()->isBooleanType())
+            return true;
+        report(DiagnosticsEngine::Warning,
+               "using conversion call to convert std::optional<bool> to bool probably does not do "
+               "what you expect, rather use has_value() or value_or()",
+               memberCall->getBeginLoc())
+            << memberCall->getSourceRange();
+        return true;
+    }
+
+private:
+    const Expr* m_ignoreIfCondition = nullptr;
+};
+
+loplugin::Plugin::Registration<OptionalBool> optionalbool("optionalbool");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/ostr.cxx b/compilerplugins/clang/ostr.cxx
new file mode 100644
index 000000000000..189b74da3152
--- /dev/null
+++ b/compilerplugins/clang/ostr.cxx
@@ -0,0 +1,531 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <cassert>
+#include <set>
+#include <stack>
+
+#include "check.hxx"
+#include "compat.hxx"
+#include "plugin.hxx"
+
+// Rewrite some uses of O[U]String to use ""_ostr/u""_ustr literals.
+
+namespace
+{
+class Ostr : public loplugin::FilteringRewritePlugin<Ostr>
+{
+public:
+    explicit Ostr(loplugin::InstantiationData const& data)
+        : FilteringRewritePlugin(data)
+    {
+    }
+
+    // Needed so that e.g.
+    //
+    //   struct S { OUString s; };
+    //   S s = {u"foo"};
+    //
+    // is caught:
+    bool shouldVisitImplicitCode() const { return true; }
+
+    void run() override
+    {
+        if (compiler.getLangOpts().CPlusPlus
+            && TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()))
+        {
+            for (auto const& i : vars_)
+            {
+                auto const utf16
+                    = bool(loplugin::TypeCheck(i.first->getType()).Class("OUStringLiteral"));
+                if (i.second.singleUse == nullptr)
+                {
+                    if (rewriter != nullptr)
+                    {
+                        auto e = i.first->getInit()->IgnoreParenImpCasts();
+                        if (auto const e2 = dyn_cast<ConstantExpr>(e))
+                        {
+                            e = e2->getSubExpr()->IgnoreParenImpCasts();
+                        }
+                        if (auto const e2 = dyn_cast<CXXConstructExpr>(e))
+                        {
+                            assert(e2->getNumArgs() == 1);
+                            e = e2->getArg(0)->IgnoreParenImpCasts();
+                        }
+                        e = dyn_cast<clang::StringLiteral>(e);
+                        // e is null when this OUStringLiteral is initialized with another
+                        // OUStringLiteral:
+                        if (e == nullptr
+                            || insertTextAfterToken(e->getEndLoc(), utf16 ? "_ustr" : "_ostr"))
+                        {
+                            auto ok = true;
+                            for (auto d = i.first->getMostRecentDecl(); d != nullptr;
+                                 d = d->getPreviousDecl())
+                            {
+                                auto const l1 = d->getTypeSpecStartLoc();
+                                auto l2 = d->getTypeSpecEndLoc();
+                                l2 = l2.getLocWithOffset(Lexer::MeasureTokenLength(
+                                    l2, compiler.getSourceManager(), compiler.getLangOpts()));
+                                if (!replaceText(l1, delta(l1, l2), utf16 ? "OUString" : "OString"))
+                                {
+                                    ok = false;
+                                }
+                            }
+                            for (auto const i : i.second.explicitConversions)
+                            {
+                                auto const e2 = i->getArg(0);
+                                auto l1 = i->getBeginLoc();
+                                auto l2 = e2->getBeginLoc();
+                                auto l3 = e2->getEndLoc();
+                                auto l4 = i->getEndLoc();
+                                while (compiler.getSourceManager().isMacroArgExpansion(l1)
+                                       && compiler.getSourceManager().isMacroArgExpansion(l2)
+                                       && compiler.getSourceManager().isMacroArgExpansion(l3)
+                                       && compiler.getSourceManager().isMacroArgExpansion(l4))
+                                //TODO: check all four locations are part of the same macro argument
+                                // expansion
+                                {
+                                    l1 = compiler.getSourceManager().getImmediateMacroCallerLoc(l1);
+                                    l2 = compiler.getSourceManager().getImmediateMacroCallerLoc(l2);
+                                    l3 = compiler.getSourceManager().getImmediateMacroCallerLoc(l3);
+                                    l4 = compiler.getSourceManager().getImmediateMacroCallerLoc(l4);
+                                }
+                                l3 = l3.getLocWithOffset(Lexer::MeasureTokenLength(
+                                    l3, compiler.getSourceManager(), compiler.getLangOpts()));
+                                l4 = l4.getLocWithOffset(Lexer::MeasureTokenLength(
+                                    l4, compiler.getSourceManager(), compiler.getLangOpts()));
+                                removeText(l1, delta(l1, l2));
+                                removeText(l3, delta(l3, l4));
+                            }
+                            if (ok)
+                            {
+                                continue;
+                            }
+                        }
+                    }
+                    report(DiagnosticsEngine::Warning,
+                           "use '%select{OString|OUString}0', created from a %select{_ostr|_ustr}0 "
+                           "user-defined string literal, instead of "
+                           "'%select{OStringLiteral|OUStringLiteral}0' for the variable %1",
+                           i.first->getLocation())
+                        << utf16 << i.first->getName() << i.first->getSourceRange();
+                    for (auto d = i.first->getMostRecentDecl(); d != nullptr;
+                         d = d->getPreviousDecl())
+                    {
+                        if (d != i.first)
+                        {
+                            report(DiagnosticsEngine::Note, "variable %0 declared here",
+                                   d->getLocation())
+                                << d->getName() << d->getSourceRange();
+                        }
+                    }
+                }
+                else
+                {
+                    if (!compiler.getDiagnosticOpts().VerifyDiagnostics)
+                    {
+                        //TODO, left for later:
+                        continue;
+                    }
+                    report(DiagnosticsEngine::Warning,
+                           "directly use a %select{_ostr|_ustr}0 user-defined string literal "
+                           "instead of introducing the intermediary "
+                           "'%select{OStringLiteral|OUStringLiteral}0' variable %1",
+                           i.second.singleUse->getExprLoc())
+                        << utf16 << i.first->getName() << i.second.singleUse->getSourceRange();
+                    for (auto d = i.first->getMostRecentDecl(); d != nullptr;
+                         d = d->getPreviousDecl())
+                    {
+                        report(DiagnosticsEngine::Note, "intermediary variable %0 declared here",
+                               d->getLocation())
+                            << d->getName() << d->getSourceRange();
+                    }
+                }
+            }
+        }
+    }
+
+    bool TraverseParmVarDecl(ParmVarDecl* decl)
+    {
+        // Otherwise,
+        //
+        //   struct S { void f(int = 0); };
+        //   void S::f(int) {}
+        //
+        // would visit the default argument twice:
+        if (decl->hasDefaultArg() && !decl->hasUninstantiatedDefaultArg()
+            && !decl->hasUnparsedDefaultArg() && !defaultArgs_.insert(decl->getDefaultArg()).second)
+        {
+            return true;
+        }
+        return RecursiveASTVisitor::TraverseParmVarDecl(decl);
+    }
+
+    bool TraverseCXXFunctionalCastExpr(CXXFunctionalCastExpr* expr)
+    {
+        functionalCasts_.push(expr);
+        auto const ret = RecursiveASTVisitor::TraverseCXXFunctionalCastExpr(expr);
+        functionalCasts_.pop();
+        return ret;
+    }
+
+    bool VisitVarDecl(VarDecl const* decl)
+    {
+        if (ignoreLocation(decl))
+        {
+            return true;
+        }
+        if (!decl->isThisDeclarationADefinition())
+        {
+            return true;
+        }
+        loplugin::TypeCheck const tc(decl->getType());
+        if (!(tc.Class("OStringLiteral").Namespace("rtl").GlobalNamespace()
+              || tc.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        if (suppressWarningAt(decl->getLocation()))
+        {
+            return true;
+        }
+        vars_[decl].multipleUses
+            = decl->getDeclContext()->isFileContext()
+                  ? !compiler.getSourceManager().isInMainFile(decl->getLocation())
+                  : decl->isExternallyVisible();
+        return true;
+    }
+
+    bool VisitDeclRefExpr(DeclRefExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const d1 = dyn_cast<VarDecl>(expr->getDecl());
+        if (d1 == nullptr)
+        {
+            return true;
+        }
+        auto const d2 = d1->getDefinition();
+        if (d2 == nullptr)
+        {
+            return true;
+        }
+        auto const i = vars_.find(d2);
+        if (i == vars_.end())
+        {
+            return true;
+        }
+        if (!i->second.multipleUses)
+        {
+            if (i->second.singleUse == nullptr)
+            {
+                i->second.singleUse = expr;
+            }
+            else
+            {
+                i->second.multipleUses = true;
+                i->second.singleUse = nullptr;
+            }
+        }
+        return true;
+    }
+
+    bool VisitCXXConstructExpr(CXXConstructExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const dc = expr->getConstructor()->getParent();
+        auto const utf16
+            = bool(loplugin::DeclCheck(dc).Class("OUString").Namespace("rtl").GlobalNamespace());
+        if (!(utf16 || loplugin::DeclCheck(dc).Class("OString").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        if (expr->getNumArgs() == 1
+            && loplugin::TypeCheck(expr->getArg(0)->getType())
+                   .Class(utf16 ? "OUStringLiteral" : "OStringLiteral")
+                   .Namespace("rtl")
+                   .GlobalNamespace())
+        {
+            if (functionalCasts_.empty()
+                || functionalCasts_.top()->getSubExpr()->IgnoreImplicit() != expr)
+            {
+                return true;
+            }
+            auto const e = dyn_cast<DeclRefExpr>(expr->getArg(0)->IgnoreParenImpCasts());
+            if (e == nullptr)
+            {
+                return true;
+            }
+            auto const d1 = dyn_cast<VarDecl>(e->getDecl());
+            if (d1 == nullptr)
+            {
+                return true;
+            }
+            auto const d2 = d1->getDefinition();
+            if (d2 == nullptr)
+            {
+                return true;
+            }
+            auto const i = vars_.find(d2);
+            if (i == vars_.end())
+            {
+                return true;
+            }
+            i->second.explicitConversions.insert(expr);
+            return true;
+        }
+        if (expr->getNumArgs() != 2)
+        {
+            return true;
+        }
+        if (!loplugin::TypeCheck(expr->getArg(1)->getType())
+                 .Struct("Dummy")
+                 .Namespace("libreoffice_internal")
+                 .Namespace("rtl")
+                 .GlobalNamespace())
+        {
+            return true;
+        }
+        auto const e2 = dyn_cast<clang::StringLiteral>(expr->getArg(0)->IgnoreParenImpCasts());
+        if (e2 == nullptr)
+        {
+            return true;
+        }
+        if (!(compat::isOrdinary(e2) || e2->isUTF8()))
+        {
+            return true;
+        }
+        auto const temp = isa<CXXTemporaryObjectExpr>(expr)
+                          || (!functionalCasts_.empty()
+                              && functionalCasts_.top()->getSubExpr()->IgnoreImplicit() == expr);
+        auto const e1 = temp ? static_cast<Expr const*>(expr) : static_cast<Expr const*>(e2);
+        auto l1 = e1->getBeginLoc();
+        auto l2 = e2->getBeginLoc();
+        auto l3 = e2->getEndLoc();
+        auto l4 = e1->getEndLoc();
+        while (compiler.getSourceManager().isMacroArgExpansion(l1)
+               && compiler.getSourceManager().isMacroArgExpansion(l2)
+               && compiler.getSourceManager().isMacroArgExpansion(l3)
+               && compiler.getSourceManager().isMacroArgExpansion(l4))
+        //TODO: check all four locations are part of the same macro argument expansion
+        {
+            l1 = compiler.getSourceManager().getImmediateMacroCallerLoc(l1);
+            l2 = compiler.getSourceManager().getImmediateMacroCallerLoc(l2);
+            l3 = compiler.getSourceManager().getImmediateMacroCallerLoc(l3);
+            l4 = compiler.getSourceManager().getImmediateMacroCallerLoc(l4);
+        }
+        if (!locs_.insert(l1).second)
+        {
+            return true;
+        }
+        auto const macroBegin = l2.isMacroID()
+                                && Lexer::isAtStartOfMacroExpansion(l2, compiler.getSourceManager(),
+                                                                    compiler.getLangOpts());
+        if (macroBegin)
+        {
+            l2 = compiler.getSourceManager().getImmediateMacroCallerLoc(l2);
+        }
+        auto const macroEnd = l3.isMacroID()
+                              && Lexer::isAtEndOfMacroExpansion(l3, compiler.getSourceManager(),
+                                                                compiler.getLangOpts());
+        if (macroEnd)
+        {
+            l3 = compiler.getSourceManager().getImmediateMacroCallerLoc(l3);
+        }
+        if (!temp)
+        {
+            l1 = l2;
+            l4 = l3;
+        }
+        if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(l1)))
+        {
+            return true;
+        }
+        if (!compiler.getDiagnosticOpts().VerifyDiagnostics && utf16)
+        {
+            //TODO: Leave rewriting these uses of ordinary string literals for later (but already
+            // cover them when verifying CompilerTest_compilerplugins_clang):
+            return true;
+        }
+        if (rewriter != nullptr && isSpellingRange(l1, l2) && isSpellingRange(l3, l4))
+        {
+            l3 = l3.getLocWithOffset(
+                Lexer::MeasureTokenLength(l3, compiler.getSourceManager(), compiler.getLangOpts()));
+            l4 = l4.getLocWithOffset(
+                Lexer::MeasureTokenLength(l4, compiler.getSourceManager(), compiler.getLangOpts()));
+            if (replaceText(l1, delta(l1, l2), utf16 ? (macroBegin ? "u\"\" " : "u") : "")
+                && replaceText(l3, delta(l3, l4),
+                               utf16 ? (macroEnd ? " \"\"_ustr" : "_ustr")
+                                     : (macroEnd ? " \"\"_ostr" : "_ostr")))
+            {
+                return true;
+            }
+        }
+        report(DiagnosticsEngine::Warning,
+               "use a %select{_ostr|_ustr}0 user-defined string literal instead of constructing an"
+               " instance of %1 from an ordinary string literal",
+               expr->getExprLoc())
+            << utf16 << expr->getType().getLocalUnqualifiedType() << expr->getSourceRange();
+        return true;
+    }
+
+    bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        if (expr->getOperator() != OO_Equal)
+        {
+            return true;
+        }
+        if (!loplugin::TypeCheck(expr->getArg(0)->getType())
+                 .Class("OString")
+                 .Namespace("rtl")
+                 .GlobalNamespace())
+        {
+            return true;
+        }
+        auto const e2 = dyn_cast<clang::StringLiteral>(expr->getArg(1)->IgnoreParenImpCasts());
+        if (e2 == nullptr)
+        {
+            return true;
+        }
+        if (rewriter != nullptr)
+        {
+            auto loc = e2->getEndLoc();
+            auto const macroEnd = loc.isMacroID()
+                                  && Lexer::isAtEndOfMacroExpansion(
+                                         loc, compiler.getSourceManager(), compiler.getLangOpts());
+            if (macroEnd)
+            {
+                loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
+            }
+            if (insertTextAfterToken(loc, macroEnd ? " \"\"_ostr" : "_ostr"))
+            {
+                return true;
+            }
+        }
+        report(DiagnosticsEngine::Warning,
+               "use a _ostr user-defined string literal instead of assigning from an ordinary"
+               " string literal",
+               expr->getExprLoc())
+            << expr->getSourceRange();
+        return true;
+    }
+
+    bool VisitCXXMemberCallExpr(CXXMemberCallExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        if (!loplugin::DeclCheck(expr->getMethodDecl()).Operator(OO_Equal))
+        {
+            return true;
+        }
+        if (!loplugin::TypeCheck(expr->getObjectType())
+                 .Class("OString")
+                 .Namespace("rtl")
+                 .GlobalNamespace())
+        {
+            return true;
+        }
+        auto const e2 = dyn_cast<clang::StringLiteral>(expr->getArg(0)->IgnoreParenImpCasts());
+        if (e2 == nullptr)
+        {
+            return true;
+        }
+        if (rewriter != nullptr)
+        {
+            //TODO
+        }
+        report(DiagnosticsEngine::Warning,
+               "use a _ostr user-defined string literal instead of assigning from an ordinary"
+               " string literal",
+               expr->getExprLoc())
+            << expr->getSourceRange();
+        return true;
+    }
+
+    bool VisitCastExpr(CastExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const t1 = expr->getType().getNonReferenceType();
+        auto const tc1 = loplugin::TypeCheck(t1);
+        if (!(tc1.ClassOrStruct("basic_string").StdNamespace()
+              || tc1.ClassOrStruct("basic_string_view").StdNamespace()))
+        {
+            return true;
+        }
+        auto const e2 = dyn_cast<UserDefinedLiteral>(expr->getSubExprAsWritten());
+        if (e2 == nullptr)
+        {
+            return true;
+        }
+        auto const tc2 = loplugin::TypeCheck(e2->getType());
+        if (!(tc2.Class("OString").Namespace("rtl").GlobalNamespace()
+              || tc2.Class("OUString").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning,
+               "directly use a %0 value instead of a %select{_ostr|_ustr}1 user-defined string"
+               " literal",
+               expr->getExprLoc())
+            << t1.getUnqualifiedType() << bool(tc2.Class("OUString")) << expr->getSourceRange();
+        return true;
+    }
+
+private:
+    bool isSpellingRange(SourceLocation loc1, SourceLocation loc2)
+    {
+        if (!SourceLocation::isPairOfFileLocations(loc1, loc2))
+        {
+            return false;
+        }
+        if (compiler.getSourceManager().getFileID(loc1)
+            != compiler.getSourceManager().getFileID(loc2))
+        {
+            return false;
+        }
+        return loc1 <= loc2;
+    }
+
+    unsigned delta(SourceLocation loc1, SourceLocation loc2)
+    {
+        return compiler.getSourceManager().getDecomposedLoc(loc2).second
+               - compiler.getSourceManager().getDecomposedLoc(loc1).second;
+    }
+
+    struct Var
+    {
+        bool multipleUses = false;
+        DeclRefExpr const* singleUse = nullptr;
+        std::set<CXXConstructExpr const*> explicitConversions;
+    };
+
+    std::set<Expr const*> defaultArgs_;
+    std::stack<CXXFunctionalCastExpr const*> functionalCasts_;
+    std::set<SourceLocation> locs_;
+    std::map<VarDecl const*, Var> vars_;
+};
+
+loplugin::Plugin::Registration<Ostr> X("ostr", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/overridevirtual.cxx b/compilerplugins/clang/overridevirtual.cxx
index 8dd29ab0e426..b7fd2ce4d9cc 100644
--- a/compilerplugins/clang/overridevirtual.cxx
+++ b/compilerplugins/clang/overridevirtual.cxx
@@ -16,6 +16,7 @@
 
 #include "clang/AST/Attr.h"
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -94,7 +95,7 @@ bool OverrideVirtual::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
             // where "\<NL>" is followed directly by a real token without
             // intervening whitespace, tokens "\<NL>virtual" and "\<NL>{" are
             // reported:
-            if (s.startswith("\\\n")) {
+            if (compat::starts_with(s, "\\\n")) {
                 s = s.drop_front(2);
             }
             if (parens == 0) {
@@ -120,7 +121,7 @@ bool OverrideVirtual::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
                     addSpace = false;
                 }
                 seenSpace = true;
-            } else if (s.startswith("/*") || s.startswith("//") || s == "\\") {
+            } else if (compat::starts_with(s, "/*") || compat::starts_with(s, "//") || s == "\\") {
                 if (!seenSpace) {
                     addSpace = true;
                 }
diff --git a/compilerplugins/clang/pahole-all-classes.py b/compilerplugins/clang/pahole-all-classes.py
index 6037287a82ca..4163adc6a8da 100755
--- a/compilerplugins/clang/pahole-all-classes.py
+++ b/compilerplugins/clang/pahole-all-classes.py
@@ -16,7 +16,6 @@ import _thread
 import io
 import os
 import subprocess
-import time
 import re
 
 # search for all the class names in the file produced by the unusedfields loplugin
diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx
index cff1e781455c..549987e43b53 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -280,14 +280,28 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C
     if (dc.Function("convertItems").Class("ValueParser").Namespace("configmgr").GlobalNamespace()
         || dc.Function("parseListValue").AnonymousNamespace().Namespace("configmgr").GlobalNamespace()
         || dc.Function("parseSingleValue").AnonymousNamespace().Namespace("configmgr").GlobalNamespace()
-        || dc.Function("Create").Class("HandlerComponentBase").Namespace("pcr").GlobalNamespace()) {
+        || dc.Function("Create").Class("HandlerComponentBase").Namespace("pcr").GlobalNamespace()
+        || dc.Function("toAny").Struct("Convert").Namespace("detail").Namespace("comphelper").GlobalNamespace()
+        || dc.Function("makeAny").Namespace("utl").GlobalNamespace()) {
         return;
     }
     if (startswith(type.getAsString(), "struct o3tl::strong_int")) {
         return;
     }
+    auto tc = loplugin::TypeCheck(functionDecl->getReturnType());
+    // these functions are passed by function-pointer
+    if (functionDecl->getIdentifier() && functionDecl->getName() == "GetRanges"
+        && tc.Struct("WhichRangesContainer").GlobalNamespace())
+        return;
+    // extremely simple class, might as well pass by value
+    if (tc.Class("Color")) {
+        return;
+    }
     // extremely simple class, might as well pass by value
-    if (loplugin::TypeCheck(functionDecl->getReturnType()).Class("Color")) {
+    if (tc.Struct("TranslateId")) {
+        return;
+    }
+    if (tc.Class("span").Namespace("o3tl")) {
         return;
     }
 
@@ -323,7 +337,7 @@ bool PassStuffByRef::VisitReturnStmt(const ReturnStmt * returnStmt)
 {
     if (!mbInsideFunctionDecl)
         return true;
-    const Expr* expr = dyn_cast<Expr>(*returnStmt->child_begin())->IgnoreParenCasts();
+    const Expr* expr = dyn_cast<Expr>(*returnStmt->child_begin())->IgnoreParenImpCasts();
 
     if (isReturnExprDisqualified(expr))
         mbFoundReturnValueDisqualifier = true;
@@ -339,6 +353,7 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr)
     while (true)
     {
         expr = expr->IgnoreParens();
+//        expr->dump();
         if (auto implicitCast = dyn_cast<ImplicitCastExpr>(expr)) {
             expr = implicitCast->getSubExpr();
             continue;
@@ -418,6 +433,9 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr)
                     return true;
                 // otherwise fall through to the checking below
             }
+            if (Opc == OO_Arrow)
+                if (isReturnExprDisqualified(operatorCallExpr->getArg(0)))
+                    return true;
         }
         if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(expr)) {
             if (isReturnExprDisqualified(memberCallExpr->getImplicitObjectArgument()))
@@ -446,21 +464,19 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr)
 
 bool PassStuffByRef::VisitVarDecl(const VarDecl * varDecl)
 {
-    if (!mbInsideFunctionDecl)
+    if (!mbInsideFunctionDecl || mbFoundReturnValueDisqualifier)
         return true;
     // things guarded by locking are probably best left alone
     loplugin::TypeCheck dc(varDecl->getType());
-    if (dc.Class("Guard").Namespace("osl").GlobalNamespace())
-        mbFoundReturnValueDisqualifier = true;
-    if (dc.Class("ClearableGuard").Namespace("osl").GlobalNamespace())
-        mbFoundReturnValueDisqualifier = true;
-    if (dc.Class("ResettableGuard").Namespace("osl").GlobalNamespace())
-        mbFoundReturnValueDisqualifier = true;
-    else if (dc.Class("SolarMutexGuard").GlobalNamespace())
-        mbFoundReturnValueDisqualifier = true;
-    else if (dc.Class("SfxModelGuard").GlobalNamespace())
-        mbFoundReturnValueDisqualifier = true;
-    else if (dc.Class("ReadWriteGuard").Namespace("utl").GlobalNamespace())
+    if (dc.Class("Guard").Namespace("osl").GlobalNamespace() ||
+        dc.Class("ClearableGuard").Namespace("osl").GlobalNamespace() ||
+        dc.Class("ResettableGuard").Namespace("osl").GlobalNamespace() ||
+        dc.Class("SolarMutexGuard").GlobalNamespace() ||
+        dc.Class("SfxModelGuard").GlobalNamespace() ||
+        dc.Class("ReadWriteGuard").Namespace("utl").GlobalNamespace() ||
+        dc.Class("unique_lock").StdNamespace() ||
+        dc.Class("lock_guard").StdNamespace() ||
+        dc.Class("scoped_lock").StdNamespace())
         mbFoundReturnValueDisqualifier = true;
     return true;
 }
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 4e640cfb2c3b..8d8207d30437 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -15,6 +15,7 @@
 #include <cstddef>
 #include <string>
 
+#include <clang/AST/ParentMapContext.h>
 #include <clang/Basic/FileManager.h>
 #include <clang/Lex/Lexer.h>
 
@@ -24,10 +25,6 @@
 #include "pluginhandler.hxx"
 #include "check.hxx"
 
-#if CLANG_VERSION >= 110000
-#include "clang/AST/ParentMapContext.h"
-#endif
-
 /*
 Base classes for plugin actions.
 */
@@ -38,7 +35,7 @@ namespace {
 
 Expr const * skipImplicit(Expr const * expr) {
     if (auto const e = dyn_cast<MaterializeTemporaryExpr>(expr)) {
-        expr = compat::getSubExpr(e)->IgnoreImpCasts();
+        expr = e->getSubExpr()->IgnoreImpCasts();
     }
     if (auto const e = dyn_cast<CXXBindTemporaryExpr>(expr)) {
         expr = e->getSubExpr();
@@ -97,10 +94,14 @@ bool structurallyIdentical(Stmt const * stmt1, Stmt const * stmt2) {
         break;
     case Stmt::MaterializeTemporaryExprClass:
     case Stmt::CXXBindTemporaryExprClass:
+    case Stmt::CXXDefaultArgExprClass:
     case Stmt::ParenExprClass:
         break;
     case Stmt::CXXNullPtrLiteralExprClass:
         return true;
+    case Stmt::StringLiteralClass:
+        return cast<clang::StringLiteral>(stmt1)->getBytes()
+            == cast<clang::StringLiteral>(stmt2)->getBytes();
     default:
         // Conservatively assume non-identical for expressions that don't happen for us in practice
         // when compiling the LO code base (and for which the above set of supported classes would
@@ -131,6 +132,183 @@ DiagnosticBuilder Plugin::report( DiagnosticsEngine::Level level, StringRef mess
     return handler.report( level, name, message, compiler, loc );
 }
 
+bool Plugin::suppressWarningAt(SourceLocation location) const {
+    auto const start = compiler.getSourceManager().getSpellingLoc(location);
+    auto const startInfo = compiler.getSourceManager().getDecomposedLoc(start);
+    auto invalid = false;
+    auto const buf = compiler.getSourceManager().getBufferData(startInfo.first, &invalid);
+    if (invalid) {
+        if (isDebugMode()) {
+            report(DiagnosticsEngine::Fatal, "failed to getBufferData", start);
+        }
+        return false;
+    }
+    auto const label = std::string("[-loplugin:").append(name).append("]");
+    // Look back to the beginning of the previous line:
+    auto loc = start;
+    auto locInfo = startInfo;
+    auto cur = loc;
+    enum class State { Normal, Slash, Comment };
+    auto state = State::Normal;
+    auto newlines = 0;
+    for (auto prev = cur;;) {
+        auto prevInfo = compiler.getSourceManager().getDecomposedLoc(prev);
+        if (prev == compiler.getSourceManager().getLocForStartOfFile(prevInfo.first)) {
+            if (state == State::Comment && isDebugMode()) {
+                report(
+                    DiagnosticsEngine::Fatal,
+                    "beginning of file while looking for beginning of comment", prev);
+            }
+            break;
+        }
+        Token tok;
+        if (Lexer::getRawToken(
+                Lexer::GetBeginningOfToken(
+                    prev.getLocWithOffset(-1), compiler.getSourceManager(), compiler.getLangOpts()),
+                tok, compiler.getSourceManager(), compiler.getLangOpts(), true))
+        {
+            if (isDebugMode()) {
+                report(
+                    DiagnosticsEngine::Fatal, "failed to getRawToken",
+                    prev.getLocWithOffset(-1));
+            }
+            break;
+        }
+        if (tok.getLocation() == cur) {
+            // Keep walking back, character by character, through whitespace preceding the current
+            // token, which Clang treats as nominally belonging to that token (so the above
+            // Lexer::getRawToken/Lexer::GetBeginningOfToken will have produced just the same tok
+            // again):
+            prev = prev.getLocWithOffset(-1);
+            continue;
+        }
+        cur = tok.getLocation();
+        prev = cur;
+        if (state == State::Comment) {
+            // Lexer::GetBeginningOfToken (at least towards Clang 15, still) only re-scans from the
+            // start of the current line, so if we saw the end of a multi-line /*...*/ comment, we
+            // saw that as individual '/' and '*' faux-tokens, at which point we must (hopefully?)
+            // actually be at the end of such a multi-line comment, so we keep walking back to the
+            // first '/*' we encounter (TODO: which still need not be the real start of the comment,
+            // if the comment contains embedded '/*', but we could determine that only if we
+            // re-scanned from the start of the file):
+            if (!tok.is(tok::comment)) {
+                continue;
+            }
+            SmallVector<char, 256> tmp;
+            bool invalid = false;
+            auto const spell = Lexer::getSpelling(
+                prev, tmp, compiler.getSourceManager(), compiler.getLangOpts(), &invalid);
+            if (invalid) {
+                if (isDebugMode()) {
+                    report(DiagnosticsEngine::Fatal, "failed to getSpelling", prev);
+                }
+            } else if (!compat::starts_with(spell, "/*")) {
+                continue;
+            }
+        }
+        prevInfo = compiler.getSourceManager().getDecomposedLoc(prev);
+        auto const end = prev.getLocWithOffset(tok.getLength());
+        auto const endInfo = compiler.getSourceManager().getDecomposedLoc(end);
+        assert(prevInfo.first == endInfo .first);
+        assert(prevInfo.second <= endInfo.second);
+        assert(endInfo.first == locInfo.first);
+        // Whitespace between tokens is found at the end of prev, from end to loc (unless this is a
+        // multi-line comment, in which case the whitespace has already been inspected as the
+        // whitespace following the comment's final '/' faux-token):
+        StringRef ws;
+        if (state != State::Comment) {
+            assert(endInfo.second <= locInfo.second);
+            ws = buf.substr(endInfo.second, locInfo.second - endInfo.second);
+        }
+        for (std::size_t i = 0;;) {
+            auto const j = ws.find('\n', i);
+            if (j == StringRef::npos) {
+                break;
+            }
+            ++newlines;
+            if (newlines == 2) {
+                break;
+            }
+            i = j + 1;
+        }
+        if (newlines == 2) {
+            break;
+        }
+        auto str = buf.substr(prevInfo.second, endInfo.second - prevInfo.second);
+        if (tok.is(tok::comment) && str.contains(label)) {
+            return true;
+        }
+        for (std::size_t i = 0;;) {
+            auto const j = str.find('\n', i);
+            if (j == StringRef::npos) {
+                break;
+            }
+            ++newlines;
+            if (newlines == 2) {
+                break;
+            }
+            i = j + 1;
+        }
+        if (newlines == 2) {
+            break;
+        }
+        loc = prev;
+        locInfo = prevInfo;
+        switch (state) {
+        case State::Normal:
+            if (tok.is(tok::slash)) {
+                state = State::Slash;
+            }
+            break;
+        case State::Slash:
+            state = tok.is(tok::star) && ws.empty() ? State::Comment : State::Normal;
+                //TODO: check for "ws is only folding whitespace" rather than for `ws.empty()` (but
+                // then, we must not count newlines in that whitespace twice, first as part of the
+                // whitespace following the comment's semi-final '*' faux-token and then as part of
+                // the comment token's content)
+            break;
+        case State::Comment:
+            state = State::Normal;
+        }
+    }
+    // Look forward to the end of the current line:
+    loc = start;
+    locInfo = startInfo;
+    for (;;) {
+        Token tok;
+        if (Lexer::getRawToken(loc, tok, compiler.getSourceManager(), compiler.getLangOpts(), true))
+        {
+            if (isDebugMode()) {
+                report(DiagnosticsEngine::Fatal, "failed to getRawToken", loc);
+            }
+            break;
+        }
+        // Whitespace between tokens is found at the beginning, from loc to beg:
+        auto const beg = tok.getLocation();
+        auto const begInfo = compiler.getSourceManager().getDecomposedLoc(beg);
+        assert(begInfo.first == locInfo.first);
+        assert(begInfo.second >= locInfo.second);
+        if (buf.substr(locInfo.second, begInfo.second - locInfo.second).contains('\n')) {
+            break;
+        }
+        auto const next = beg.getLocWithOffset(tok.getLength());
+        auto const nextInfo = compiler.getSourceManager().getDecomposedLoc(next);
+        assert(nextInfo.first == begInfo.first);
+        assert(nextInfo.second >= begInfo.second);
+        auto const str = buf.substr(begInfo.second, nextInfo.second - begInfo.second);
+        if (tok.is(tok::comment) && str.contains(label)) {
+            return true;
+        }
+        if (tok.is(tok::eof) || str.contains('\n')) {
+            break;
+        }
+        loc = next;
+        locInfo = nextInfo;
+    }
+    return false;
+}
+
 void normalizeDotDotInFilePath( std::string & s )
 {
     for (std::string::size_type i = 0;;)
@@ -251,13 +429,19 @@ StringRef Plugin::getFilenameOfLocation(SourceLocation spellingLocation) const
     }
     else
     {
+        char const*const pCXX = getenv("CXX");
+        if (pCXX && strstr(pCXX, "sccache"))
+        {   // heuristic; sccache passes file with -frewrite-directives by name
+            s_Mode = STDIN;
+            return getFilenameOfLocation(spellingLocation);
+        }
         auto const fn(compiler.getSourceManager().getFilename(spellingLocation));
         if (!fn.data()) // wtf? happens in sot/source/sdstor/stg.cxx
         {
             return fn;
         }
 #if !defined _WIN32
-        assert(fn.startswith("/") || fn == "<stdin>");
+        assert(compat::starts_with(fn, "/") || fn == "<stdin>");
 #endif
         s_Mode = fn == "<stdin>" ? STDIN : GOOD;
         return getFilenameOfLocation(spellingLocation);
@@ -278,9 +462,9 @@ bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const
            || hasPathnamePrefix(name, SRCDIR "/include/rtl/")
            || hasPathnamePrefix(name, SRCDIR "/include/sal/")
            || hasPathnamePrefix(name, SRCDIR "/include/salhelper/")
-           || hasPathnamePrefix(name, SRCDIR "/include/systools/")
            || hasPathnamePrefix(name, SRCDIR "/include/typelib/")
-           || hasPathnamePrefix(name, SRCDIR "/include/uno/"));
+           || hasPathnamePrefix(name, SRCDIR "/include/uno/")
+           || hasPathnamePrefix(name, SDKDIR "/include/"));
 }
 
 bool Plugin::isInUnoIncludeFile(const FunctionDecl* functionDecl) const
@@ -363,6 +547,32 @@ bool Plugin::containsPreprocessingConditionalInclusion(SourceRange range)
     return false;
 }
 
+bool Plugin::containsComment(SourceRange range)
+{
+    SourceManager& SM = compiler.getSourceManager();
+    SourceLocation startLoc = range.getBegin();
+    SourceLocation endLoc = range.getEnd();
+    char const* p1 = SM.getCharacterData(startLoc);
+    char const* p2 = SM.getCharacterData(endLoc);
+    p2 += Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
+
+    // when doing 'make solenv.check' we don't want the special comments in the
+    // unit test files to trigger this check
+    constexpr char const comment0[] = "// expected-error";
+    if (std::search(p1, p2, comment0, comment0 + strlen(comment0)) != p2)
+        return false;
+
+    // check for comments
+    constexpr char const comment1[] = "/*";
+    constexpr char const comment2[] = "//";
+    if (std::search(p1, p2, comment1, comment1 + strlen(comment1)) != p2)
+        return true;
+    if (std::search(p1, p2, comment2, comment2 + strlen(comment2)) != p2)
+        return true;
+
+    return false;
+}
+
 Plugin::IdenticalDefaultArgumentsResult Plugin::checkIdenticalDefaultArguments(
     Expr const * argument1, Expr const * argument2)
 {
@@ -652,9 +862,8 @@ bool RewritePlugin::wouldRewriteWorkdir(SourceLocation loc)
     if (loc.isInvalid() || loc.isMacroID()) {
         return false;
     }
-    return
-        getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(loc))
-        .startswith(WORKDIR "/");
+    return compat::starts_with(
+        getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(loc)), WORKDIR "/");
 }
 
 bool RewritePlugin::reportEditFailure( SourceLocation loc )
@@ -708,7 +917,7 @@ bool hasPathnamePrefix(StringRef pathname, StringRef prefix)
 {
     return checkPathname(
         pathname, prefix,
-        [](StringRef p, StringRef a) { return p.startswith(a); });
+        [](StringRef p, StringRef a) { return compat::starts_with(p, a); });
 }
 
 bool isSamePathname(StringRef pathname, StringRef other)
@@ -717,6 +926,16 @@ bool isSamePathname(StringRef pathname, StringRef other)
         pathname, other, [](StringRef p, StringRef a) { return p == a; });
 }
 
+bool isSameUnoIncludePathname(StringRef fullPathname, StringRef includePathname)
+{
+    llvm::SmallVector<char, 256> buf;
+    if (isSamePathname(fullPathname, (SRCDIR "/include/" + includePathname).toStringRef(buf))) {
+        return true;
+    }
+    buf.clear();
+    return isSamePathname(fullPathname, (SDKDIR "/include/" + includePathname).toStringRef(buf));
+}
+
 bool hasCLanguageLinkageType(FunctionDecl const * decl) {
     assert(decl != nullptr);
     if (decl->isExternC()) {
@@ -731,8 +950,19 @@ bool hasCLanguageLinkageType(FunctionDecl const * decl) {
 static const CXXRecordDecl* stripTypeSugar(QualType qt)
 {
     const clang::Type* t = qt.getTypePtr();
-    while (auto elaboratedType = dyn_cast<ElaboratedType>(t))
-        t = elaboratedType->desugar().getTypePtr();
+    do
+    {
+        if (auto elaboratedType = dyn_cast<ElaboratedType>(t))
+            t = elaboratedType->desugar().getTypePtr();
+        else if (auto tsType = dyn_cast<TemplateSpecializationType>(t))
+            t = tsType->desugar().getTypePtr();
+        else if (auto sttpType = dyn_cast<SubstTemplateTypeParmType>(t))
+            t = sttpType->desugar().getTypePtr();
+        else if (auto tdType = dyn_cast<TypedefType>(t))
+            t = tdType->desugar().getTypePtr();
+        else
+            break;
+    } while(true);
     auto recordType = dyn_cast<RecordType>(t);
     if (!recordType)
         return nullptr;
@@ -782,7 +1012,7 @@ int derivedFromCount(QualType subclassQt, QualType baseclassQt)
 // a variable declared in an 'extern "..." {...}'-style linkage-specification as
 // if it contained the 'extern' specifier:
 bool hasExternalLinkage(VarDecl const * decl) {
-    if (decl->getLinkageAndVisibility().getLinkage() != ExternalLinkage) {
+    if (decl->getLinkageAndVisibility().getLinkage() != compat::Linkage::External) {
         return false;
     }
     for (auto ctx = decl->getLexicalDeclContext();
@@ -802,6 +1032,42 @@ bool hasExternalLinkage(VarDecl const * decl) {
     return true;
 }
 
+bool isSmartPointerType(QualType qt)
+{
+    // First check whether the object type as written is, or is derived from, std::unique_ptr or
+    // std::shared_ptr, in case the get member function is declared at a base class of that std
+    // type:
+    if (loplugin::isDerivedFrom(
+            qt->getAsCXXRecordDecl(),
+            [](Decl const * decl) {
+                auto const dc = loplugin::DeclCheck(decl);
+                return dc.ClassOrStruct("unique_ptr").StdNamespace()
+                    || dc.ClassOrStruct("shared_ptr").StdNamespace();
+            }))
+        return true;
+
+    // Then check the object type coerced to the type of the get member function, in
+    // case the type-as-written is derived from one of these types (tools::SvRef is
+    // final, but the rest are not):
+    auto const tc2 = loplugin::TypeCheck(qt);
+    if (tc2.ClassOrStruct("unique_ptr").StdNamespace()
+           || tc2.ClassOrStruct("shared_ptr").StdNamespace()
+           || tc2.Class("Reference").Namespace("uno").Namespace("star")
+                .Namespace("sun").Namespace("com").GlobalNamespace()
+           || tc2.Class("Reference").Namespace("rtl").GlobalNamespace()
+           || tc2.Class("SvRef").Namespace("tools").GlobalNamespace()
+           || tc2.Class("WeakReference").Namespace("tools").GlobalNamespace()
+           || tc2.Class("ScopedReadAccess").Namespace("Bitmap").GlobalNamespace()
+           || tc2.Class("ScopedVclPtrInstance").GlobalNamespace()
+           || tc2.Class("VclPtr").GlobalNamespace()
+           || tc2.Class("ScopedVclPtr").GlobalNamespace()
+           || tc2.Class("intrusive_ptr").Namespace("boost").GlobalNamespace())
+    {
+        return true;
+    }
+    return false;
+}
+
 bool isSmartPointerType(const Expr* e)
 {
     // First check whether the object type as written is, or is derived from, std::unique_ptr or
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index 577e8998b187..7980e79f7b45 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#pragma once
 
 #include <clang/AST/ASTContext.h>
 #include <clang/AST/RecursiveASTVisitor.h>
@@ -23,7 +22,6 @@
 
 #include <clang/Rewrite/Core/Rewriter.h>
 
-#include "compat.hxx"
 #include "pluginhandler.hxx"
 
 using namespace clang;
@@ -67,6 +65,10 @@ public:
     enum { isSharedPlugin = false };
 protected:
     DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc = SourceLocation()) const;
+    // Look at the line containing location and the previous line for any comments that overlap
+    // either of those two lines and that contain "[-loplugin:<name>]" (with the name of this
+    // plugin), indicating that warnings from this plugin should be suppressed here:
+    bool suppressWarningAt(SourceLocation location) const;
     bool ignoreLocation( SourceLocation loc ) const
     { return handler.ignoreLocation(loc); }
     bool ignoreLocation( const Decl* decl ) const;
@@ -100,6 +102,8 @@ protected:
 
     bool containsPreprocessingConditionalInclusion(SourceRange range);
 
+    bool containsComment(SourceRange range);
+
     enum class IdenticalDefaultArgumentsResult { No, Yes, Maybe };
     IdenticalDefaultArgumentsResult checkIdenticalDefaultArguments(
         Expr const * argument1, Expr const * argument2);
@@ -121,7 +125,7 @@ public:
     explicit FilteringPlugin( const InstantiationData& data ) : Plugin(data) {}
 
     bool TraverseNamespaceDecl(NamespaceDecl * decl) {
-        if (ignoreLocation(compat::getBeginLoc(decl)))
+        if (ignoreLocation(decl->getBeginLoc()))
             return true;
         return RecursiveASTVisitor<Derived>::TraverseNamespaceDecl(decl);
     }
@@ -221,15 +225,12 @@ bool Plugin::ignoreLocation( const Stmt* stmt ) const
 {
     // Invalid location can happen at least for ImplicitCastExpr of
     // ImplicitParam 'self' in Objective C method declarations:
-    return compat::getBeginLoc(stmt).isValid() && ignoreLocation( compat::getBeginLoc(stmt));
+    return stmt->getBeginLoc().isValid() && ignoreLocation( stmt->getBeginLoc());
 }
 
 inline bool Plugin::ignoreLocation(TypeLoc tloc) const
 {
-    // Invalid locations appear to happen at least with Clang 5.0.2 (but no longer with at least
-    // recent Clang 10 trunk):
-    auto const loc = tloc.getBeginLoc();
-    return loc.isValid() && ignoreLocation(loc);
+    return ignoreLocation(tloc.getBeginLoc());
 }
 
 template< typename T >
@@ -267,7 +268,7 @@ public:
     explicit FilteringRewritePlugin( const InstantiationData& data ) : RewritePlugin(data) {}
 
     bool TraverseNamespaceDecl(NamespaceDecl * decl) {
-        if (ignoreLocation(compat::getBeginLoc(decl)))
+        if (ignoreLocation(decl->getBeginLoc()))
             return true;
         return RecursiveASTVisitor<Derived>::TraverseNamespaceDecl(decl);
     }
@@ -283,6 +284,10 @@ bool hasPathnamePrefix(StringRef pathname, StringRef prefix);
 // also contain backslashes:
 bool isSamePathname(StringRef pathname, StringRef other);
 
+// Check whether fullPathname is either SRCDIR/include/includePathname or
+// SDKDIR/include/includePathname:
+bool isSameUnoIncludePathname(StringRef fullPathname, StringRef includePathname);
+
 // It appears that, given a function declaration, there is no way to determine
 // the language linkage of the function's type, only of the function's name
 // (via FunctionDecl::isExternC); however, in a case like
@@ -307,11 +312,10 @@ int derivedFromCount(const CXXRecordDecl* subtypeRecord, const CXXRecordDecl* ba
 bool hasExternalLinkage(VarDecl const * decl);
 
 bool isSmartPointerType(const Expr*);
+bool isSmartPointerType(clang::QualType);
 
 const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt);
 
 } // namespace
 
-#endif // COMPILEPLUGIN_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/pluginhandler.cxx b/compilerplugins/clang/pluginhandler.cxx
index 54dba3e3bcc0..0fb62eb56c48 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -13,17 +13,17 @@
 #include <system_error>
 #include <utility>
 
+#include "config_clang.h"
+
+#include "compat.hxx"
 #include "plugin.hxx"
 #include "pluginhandler.hxx"
 
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Frontend/FrontendPluginRegistry.h>
 #include <clang/Lex/PPCallbacks.h>
-#include <stdio.h>
-
-#if CLANG_VERSION >= 90000
+#include <llvm/ADT/StringExtras.h>
 #include <llvm/Support/TimeProfiler.h>
-#endif
 
 #if defined _WIN32
 #include <process.h>
@@ -64,7 +64,7 @@ static bool unitTestMode = false;
 
 StringRef initMainFileName(CompilerInstance& compiler)
 {
-    StringRef const& fn(compiler.getASTContext().getSourceManager().getFileEntryForID(
+    StringRef const& fn(compiler.getASTContext().getSourceManager().getFileEntryRefForID(
         compiler.getASTContext().getSourceManager().getMainFileID())->getName());
     if (fn == "<stdin>")
         // stdin means icecream, so we can rely on -main-file-name containing the full path name
@@ -231,6 +231,22 @@ bool PluginHandler::ignoreLocation(SourceLocation loc) {
 
 bool PluginHandler::checkIgnoreLocation(SourceLocation loc)
 {
+    // The tree-wide analysis plugins (like unusedmethods) don't want
+    // this logic, they only want to ignore external code
+    if (!treeWideAnalysisMode)
+    {
+        // If a location comes from a PCH, it is not necessary to check it
+        // in every compilation using the PCH, since with Clang we use
+        // -building-pch-with-obj to build a separate precompiled_foo.cxx file
+        // for the PCH, and so it is known that everything in the PCH will
+        // be checked while compiling this file. Skip the checks for all
+        // other files using the PCH.
+        if( !compiler.getSourceManager().isLocalSourceLocation( loc ))
+        {
+            if( !compiler.getLangOpts().BuildingPCHWithObjectFile )
+                return true;
+        }
+    }
     SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( loc );
     if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
         return true;
@@ -300,12 +316,10 @@ void PluginHandler::addSourceModification(SourceRange range)
 
 void PluginHandler::HandleTranslationUnit( ASTContext& context )
 {
-#if CLANG_VERSION >= 90000
     llvm::TimeTraceScope mainTimeScope("LOPluginMain", StringRef(""));
-#endif
     if( context.getDiagnostics().hasErrorOccurred())
         return;
-    if (mainFileName.endswith(".ii"))
+    if (compat::ends_with(mainFileName, ".ii"))
     {
         report(DiagnosticsEngine::Fatal,
             "input file has suffix .ii: \"%0\"\nhighly suspicious, probably ccache generated, this will break warning suppressions; export CCACHE_CPP2=1 to prevent this") << mainFileName;
@@ -316,9 +330,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
     {
         if( plugins[ i ].object != NULL && !plugins[ i ].disabledRun )
         {
-#if CLANG_VERSION >= 90000
             llvm::TimeTraceScope timeScope("LOPlugin", [&]() { return plugins[i].optionName; });
-#endif
             plugins[ i ].object->run();
         }
     }
@@ -331,8 +343,8 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
          it != rewriter.buffer_end();
          ++it )
     {
-        const FileEntry* e = context.getSourceManager().getFileEntryForID( it->first );
-        if( e == NULL )
+        auto e = context.getSourceManager().getFileEntryRefForID( it->first );
+        if( !e )
             continue; // Failed modification because of a macro expansion?
         /* Check where the file actually is, and warn about cases where modification
            most probably doesn't matter (generated files in workdir).
@@ -342,11 +354,11 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
         const char* pathWarning = NULL;
         bool bSkip = false;
         StringRef const name = e->getName();
-        if( name.startswith(WORKDIR "/") )
+        if( compat::starts_with(name, WORKDIR "/") )
             pathWarning = "modified source in workdir/ : %0";
-        else if( strcmp( SRCDIR, BUILDDIR ) != 0 && name.startswith(BUILDDIR "/") )
+        else if( strcmp( SRCDIR, BUILDDIR ) != 0 && compat::starts_with(name, BUILDDIR "/") )
             pathWarning = "modified source in build dir : %0";
-        else if( name.startswith(SRCDIR "/") )
+        else if( compat::starts_with(name, SRCDIR "/") )
             ; // ok
         else
         {
@@ -373,27 +385,25 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
             report( DiagnosticsEngine::Warning, pathWarning ) << name;
         if( bSkip )
             continue;
-        char* filename = new char[ modifyFile.length() + 100 ];
-        sprintf( filename, "%s.new.%d", modifyFile.c_str(), getpid());
+        auto const filename = modifyFile + ".new." + itostr(getpid());
         std::string error;
         bool bOk = false;
         std::error_code ec;
         std::unique_ptr<raw_fd_ostream> ostream(
-            new raw_fd_ostream(filename, ec, sys::fs::F_None));
+            new raw_fd_ostream(filename, ec, sys::fs::OF_None));
         if( !ec)
         {
             it->second.write( *ostream );
             ostream->close();
-            if( !ostream->has_error() && rename( filename, modifyFile.c_str()) == 0 )
+            if( !ostream->has_error() && rename( filename.c_str(), modifyFile.c_str()) == 0 )
                 bOk = true;
         }
         else
             error = "error: " + ec.message();
         ostream->clear_error();
-        unlink( filename );
+        unlink( filename.c_str() );
         if( !bOk )
             report( DiagnosticsEngine::Error, "cannot write modified source to %0 (%1)" ) << modifyFile << error;
-        delete[] filename;
     }
 #endif
  }
@@ -420,7 +430,7 @@ static bool MethodsAndNestedClassesComplete(const CXXRecordDecl *RD,
        I != E && Complete; ++I) {
     if (const CXXMethodDecl *M = dyn_cast<CXXMethodDecl>(*I))
       Complete = M->isDefined() || M->isDefaulted() ||
-                 (M->isPure() && !isa<CXXDestructorDecl>(M));
+                 (compat::isPureVirtual(M) && !isa<CXXDestructorDecl>(M));
     else if (const FunctionTemplateDecl *F = dyn_cast<FunctionTemplateDecl>(*I))
       // If the template function is marked as late template parsed at this
       // point, it has not been instantiated and therefore we have not
diff --git a/compilerplugins/clang/pluginhandler.hxx b/compilerplugins/clang/pluginhandler.hxx
index 54ab613b3a7e..e2ca4075d33d 100644
--- a/compilerplugins/clang/pluginhandler.hxx
+++ b/compilerplugins/clang/pluginhandler.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef PLUGINHANDLER_H
-#define PLUGINHANDLER_H
+#pragma once
 
 #include <cstddef>
 #include <functional>
@@ -69,6 +68,8 @@ public:
     // Is all code that could see `decl` defined in this TU?
     bool isAllRelevantCodeDefined(NamedDecl const * decl);
 
+    void enableTreeWideAnalysisMode() { treeWideAnalysisMode = true; }
+
 private:
     void handleOption( const std::string& option );
     void createPlugins( std::set< std::string > rewriters );
@@ -82,6 +83,8 @@ private:
     std::string warningsOnly;
     bool warningsAsErrors;
     bool debugMode = false;
+    //// Used by the tree-wide analysis plugins like unusedmethods, etc.
+    bool treeWideAnalysisMode = false;
     std::vector<std::pair<char const*, char const*>> mvModifiedRanges;
 
     // Used internally by isAllRelevantCodeDefined:
@@ -105,6 +108,4 @@ private:
 
 }
 
-#endif // COMPILEPLUGIN_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/pointerbool.cxx b/compilerplugins/clang/pointerbool.cxx
index 66c6a04b3697..6530c76e7179 100644
--- a/compilerplugins/clang/pointerbool.cxx
+++ b/compilerplugins/clang/pointerbool.cxx
@@ -16,6 +16,7 @@
 #include <clang/AST/CXXInheritance.h>
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
 
 /**
   Look for calls where the param is bool but the call-site-arg is pointer.
@@ -38,12 +39,42 @@ public:
             TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
     }
 
+    bool shouldVisitTemplateInstantiations() const { return true; }
+
+    bool PreTraverseFunctionDecl(FunctionDecl* decl);
+    bool PostTraverseFunctionDecl(FunctionDecl* decl, bool);
+    bool TraverseFunctionDecl(FunctionDecl* decl);
     bool VisitCallExpr(CallExpr const*);
 
 private:
-    llvm::Optional<APSInt> getCallValue(const Expr* arg);
+    compat::optional<APSInt> getCallValue(const Expr* arg);
+    std::vector<FunctionDecl*> functions_;
 };
 
+bool PointerBool::PreTraverseFunctionDecl(FunctionDecl* decl)
+{
+    functions_.push_back(decl);
+    return true;
+}
+
+bool PointerBool::PostTraverseFunctionDecl(FunctionDecl*, bool)
+{
+    assert(!functions_.empty());
+    functions_.pop_back();
+    return true;
+}
+
+bool PointerBool::TraverseFunctionDecl(FunctionDecl* decl)
+{
+    bool ret = true;
+    if (PreTraverseFunctionDecl(decl))
+    {
+        ret = FilteringPlugin::TraverseFunctionDecl(decl);
+        PostTraverseFunctionDecl(decl, ret);
+    }
+    return ret;
+}
+
 bool PointerBool::VisitCallExpr(CallExpr const* callExpr)
 {
     if (ignoreLocation(callExpr))
@@ -84,7 +115,7 @@ bool PointerBool::VisitCallExpr(CallExpr const* callExpr)
         if (arg->getType()->isIntegerType())
         {
             auto ret = getCallValue(arg);
-            if (ret.hasValue() && (ret.getValue() == 1 || ret.getValue() == 0))
+            if (compat::has_value(ret) && (compat::value(ret) == 1 || compat::value(ret) == 0))
                 continue;
             // something like: priv->m_nLOKFeatures & LOK_FEATURE_DOCUMENT_PASSWORD
             if (isa<BinaryOperator>(arg->IgnoreParenImpCasts()))
@@ -98,11 +129,18 @@ bool PointerBool::VisitCallExpr(CallExpr const* callExpr)
             << arg->getSourceRange();
         report(DiagnosticsEngine::Note, "method here", param->getLocation())
             << param->getSourceRange();
+        if (!functions_.empty())
+        {
+            auto callerFD = functions_.back();
+            if (callerFD->isTemplateInstantiation())
+                report(DiagnosticsEngine::Note, "instantiated from here",
+                       callerFD->getPointOfInstantiation());
+        }
     }
     return true;
 }
 
-llvm::Optional<APSInt> PointerBool::getCallValue(const Expr* arg)
+compat::optional<APSInt> PointerBool::getCallValue(const Expr* arg)
 {
     arg = arg->IgnoreParenCasts();
     if (auto defArg = dyn_cast<CXXDefaultArgExpr>(arg))
@@ -112,14 +150,14 @@ llvm::Optional<APSInt> PointerBool::getCallValue(const Expr* arg)
     // ignore this, it seems to trigger an infinite recursion
     if (isa<UnaryExprOrTypeTraitExpr>(arg))
     {
-        return llvm::Optional<APSInt>();
+        return compat::optional<APSInt>();
     }
     APSInt x1;
     if (compat::EvaluateAsInt(arg, x1, compiler.getASTContext()))
     {
         return x1;
     }
-    return llvm::Optional<APSInt>();
+    return compat::optional<APSInt>();
 }
 
 loplugin::Plugin::Registration<PointerBool> pointerbool("pointerbool");
diff --git a/compilerplugins/clang/privatebase.cxx b/compilerplugins/clang/privatebase.cxx
index 6819647f88c5..677461302b15 100644
--- a/compilerplugins/clang/privatebase.cxx
+++ b/compilerplugins/clang/privatebase.cxx
@@ -9,6 +9,7 @@
 
 #ifndef LO_CLANG_SHARED_PLUGINS
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -33,7 +34,7 @@ void PrivateBase::run() {
 
 bool PrivateBase::VisitCXXRecordDecl(CXXRecordDecl const * decl) {
     if (ignoreLocation(decl) || !decl->isThisDeclarationADefinition()
-        || decl->getTagKind() != TTK_Class)
+        || decl->getTagKind() != compat::TagTypeKind::Class)
     {
         return true;
     }
@@ -43,7 +44,7 @@ bool PrivateBase::VisitCXXRecordDecl(CXXRecordDecl const * decl) {
                 DiagnosticsEngine::Warning,
                 "base class is private by default; explicitly give an access"
                     " specifier",
-                compat::getBeginLoc(i))
+                i->getBeginLoc())
                 << i->getSourceRange();
         }
     }
diff --git a/compilerplugins/clang/rangedforcopy.cxx b/compilerplugins/clang/rangedforcopy.cxx
index 68004a1708ae..2de4766dab04 100644
--- a/compilerplugins/clang/rangedforcopy.cxx
+++ b/compilerplugins/clang/rangedforcopy.cxx
@@ -12,6 +12,7 @@
 #include <string>
 #include <iostream>
 
+#include "check.hxx"
 #include "plugin.hxx"
 #include "clang/AST/CXXInheritance.h"
 
@@ -45,15 +46,29 @@ bool RangedForCopy::VisitCXXForRangeStmt( const CXXForRangeStmt* stmt )
     const VarDecl* varDecl = stmt->getLoopVariable();
     if (!varDecl)
       return true;
+    if (isa<DecompositionDecl>(varDecl))
+    {
+        // Assume that use of a non-reference structured binding is intentional:
+        return true;
+    }
 
     const QualType type = varDecl->getType();
     if (type->isRecordType() && !type->isReferenceType() && !type->isPointerType())
     {
+        if (loplugin::TypeCheck(type).Class("__bit_const_reference").StdNamespace())
+        {
+            // With libc++ without _LIBCPP_ABI_BITSET_VECTOR_BOOL_CONST_SUBSCRIPT_RETURN_BOOL,
+            // iterating over a const std::vector<bool> non-compliantly uses a variable of some
+            // internal __bit_const_reference class type, rather than of type bool (see
+            // <https://reviews.llvm.org/D123851> "[libc++] Change
+            // vector<bool>::const_iterator::reference to bool in ABIv2"):
+            return true;
+        }
         std::string name = type.getAsString();
         report(
                DiagnosticsEngine::Warning,
                "Loop variable passed by value, pass by reference instead, e.g. 'const %0&'",
-               compat::getBeginLoc(varDecl))
+               varDecl->getBeginLoc())
                << name << varDecl->getSourceRange();
     }
 
diff --git a/compilerplugins/clang/reducevarscope.cxx b/compilerplugins/clang/reducevarscope.cxx
index c293fd432e6a..76eece2131bb 100644
--- a/compilerplugins/clang/reducevarscope.cxx
+++ b/compilerplugins/clang/reducevarscope.cxx
@@ -18,6 +18,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -392,7 +393,7 @@ bool ReduceVarScope::VisitVarDecl(const VarDecl* varDecl)
     if (!compiler.getSourceManager().isInMainFile(varDecl->getLocation()))
         return true;
     // Ignore macros like FD_ZERO
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(varDecl)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(varDecl->getBeginLoc()))
         return true;
     if (varDecl->hasGlobalStorage())
         return true;
@@ -536,7 +537,7 @@ bool ReduceVarScope::VisitLambdaExpr(const LambdaExpr* lambdaExpr)
         const LambdaCapture& capture = *captureIt;
         if (capture.capturesVariable())
         {
-            auto varDecl = capture.getCapturedVar();
+            auto varDecl = cast<VarDecl>(capture.getCapturedVar());
             maVarDeclMap.erase(varDecl);
             maVarUseSourceRangeMap.erase(varDecl);
         }
diff --git a/compilerplugins/clang/redundantcast.cxx b/compilerplugins/clang/redundantcast.cxx
index bdac3f3bcc56..6bace5282275 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -51,12 +51,12 @@ bool canConstCastFromTo(Expr const * from, Expr const * to) {
     auto const k2 = to->getValueKind();
     return (k2 == VK_LValue && k1 == VK_LValue)
         || (k2 == VK_XValue
-            && (k1 != VK_RValue || from->getType()->isRecordType()));
+            && (k1 != compat::VK_PRValue || from->getType()->isRecordType()));
 }
 
 char const * printExprValueKind(ExprValueKind k) {
     switch (k) {
-    case VK_RValue:
+    case compat::VK_PRValue:
         return "prvalue";
     case VK_LValue:
         return "lvalue";
@@ -66,6 +66,13 @@ char const * printExprValueKind(ExprValueKind k) {
     llvm_unreachable("unknown ExprValueKind");
 }
 
+QualType desugarElaboratedType(QualType type) {
+    if (auto const t = dyn_cast<ElaboratedType>(type)) {
+        return t->desugar();
+    }
+    return type;
+}
+
 enum class AlgebraicType { None, Integer, FloatingPoint };
 
 AlgebraicType algebraicType(clang::Type const & type) {
@@ -109,6 +116,14 @@ public:
                 expr->isSemanticForm() ? expr : expr->getSemanticForm(), queue);
     }
 
+    bool TraverseReturnStmt(ReturnStmt * stmt) {
+        auto const saved = returnExpr_;
+        returnExpr_ = stmt->getRetValue();
+        auto const ret = FilteringRewritePlugin::TraverseReturnStmt(stmt);
+        returnExpr_ = saved;
+        return ret;
+    }
+
     bool VisitImplicitCastExpr(ImplicitCastExpr const * expr);
 
     bool VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr);
@@ -150,10 +165,12 @@ private:
     bool isOverloadedFunction(FunctionDecl const * decl);
 
     bool isInIgnoredMacroBody(Expr const * expr) {
-        auto const loc = compat::getBeginLoc(expr);
+        auto const loc = expr->getBeginLoc();
         return compiler.getSourceManager().isMacroBodyExpansion(loc)
             && ignoreLocation(compiler.getSourceManager().getSpellingLoc(loc));
     }
+
+    Expr const * returnExpr_ = nullptr;
 };
 
 bool RedundantCast::VisitImplicitCastExpr(const ImplicitCastExpr * expr) {
@@ -222,7 +239,7 @@ bool RedundantCast::VisitImplicitCastExpr(const ImplicitCastExpr * expr) {
                            dyn_cast<CXXStaticCastExpr>(e)->getSubExpr()
                            ->IgnoreParenImpCasts()->getType())
                        && !compiler.getSourceManager().isMacroBodyExpansion(
-                           compat::getBeginLoc(e)))
+                           e->getBeginLoc()))
             {
                 report(
                     DiagnosticsEngine::Warning,
@@ -302,7 +319,7 @@ bool RedundantCast::VisitCStyleCastExpr(CStyleCastExpr const * expr) {
     if (ignoreLocation(expr)) {
         return true;
     }
-    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)))) {
+    if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()))) {
         return true;
     }
     auto t1 = compat::getSubExprAsWritten(expr)->getType();
@@ -310,7 +327,7 @@ bool RedundantCast::VisitCStyleCastExpr(CStyleCastExpr const * expr) {
     if (auto templateType = dyn_cast<SubstTemplateTypeParmType>(t1)) {
         t1 = templateType->desugar();
     }
-    if (t1 != t2) {
+    if (desugarElaboratedType(t1) != desugarElaboratedType(t2)) {
         return true;
     }
     if (!t1->isBuiltinType() && !loplugin::TypeCheck(t1).Enum() && !loplugin::TypeCheck(t1).Typedef()) {
@@ -323,7 +340,7 @@ bool RedundantCast::VisitCStyleCastExpr(CStyleCastExpr const * expr) {
     // Ignore FD_ISSET expanding to "...(SOCKET)(fd)..." in some Microsoft
     // winsock2.h (TODO: improve heuristic of determining that the whole
     // expr is part of a single macro body expansion):
-    auto l1 = compat::getBeginLoc(expr);
+    auto l1 = expr->getBeginLoc();
     while (compiler.getSourceManager().isMacroArgExpansion(l1)) {
         l1 = compiler.getSourceManager().getImmediateMacroCallerLoc(l1);
     }
@@ -331,7 +348,7 @@ bool RedundantCast::VisitCStyleCastExpr(CStyleCastExpr const * expr) {
     while (compiler.getSourceManager().isMacroArgExpansion(l2)) {
         l2 = compiler.getSourceManager().getImmediateMacroCallerLoc(l2);
     }
-    auto l3 = compat::getEndLoc(expr);
+    auto l3 = expr->getEndLoc();
     while (compiler.getSourceManager().isMacroArgExpansion(l3)) {
          l3 = compiler.getSourceManager().getImmediateMacroCallerLoc(l3);
     }
@@ -356,6 +373,15 @@ bool RedundantCast::VisitVarDecl(VarDecl const * varDecl) {
     if (!varDecl->getInit())
         return true;
     visitAssign(varDecl->getType(), varDecl->getInit());
+    if (varDecl->getInitStyle() != VarDecl::CInit
+        && isa<CXXTemporaryObjectExpr>(varDecl->getInit())
+        && !compiler.getSourceManager().isMacroBodyExpansion(varDecl->getInit()->getBeginLoc()))
+    {
+        report(
+            DiagnosticsEngine::Warning, "redundant functional cast",
+            varDecl->getBeginLoc())
+            << varDecl->getSourceRange();
+    }
     return true;
 }
 
@@ -502,6 +528,23 @@ bool RedundantCast::VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr) {
     {
         return true;
     }
+    // For <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2266r1.html> "P2266R1: Simpler
+    // implicit move" (as implemented with <https://github.com/llvm/llvm-project/commit/
+    // bf20631782183cd19e0bb7219e908c2bbb01a75f> "[clang] Implement P2266 Simpler implicit move"
+    // towards Clang 13), don't warn about a static_cast in a return statement like
+    //
+    //   return static_cast<int &>(x);
+    //
+    // that needs an lvalue but where in a return statement like
+    //
+    //   return x;
+    //
+    // the expression would now be an xvalue:
+    if (k3 == VK_LValue && k1 == VK_LValue && returnExpr_ != nullptr
+        && expr == returnExpr_->IgnoreParens())
+    {
+        return true;
+    }
     // Don't warn if a static_cast on a pointer to function or member function is used to
     // disambiguate an overloaded function:
     if (fnptr) {
@@ -524,7 +567,7 @@ bool RedundantCast::VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr) {
     // h=b5889d25e9bf944a89fdd7bcabf3b6c6f6bb6f7c> "assert: Support types
     // without operator== (int) [BZ #21972]":
     if (t1->isBooleanType() && t2->isBooleanType()) {
-        auto loc = compat::getBeginLoc(expr);
+        auto loc = expr->getBeginLoc();
         if (compiler.getSourceManager().isMacroBodyExpansion(loc)
             && (Lexer::getImmediateMacroName(
                     loc, compiler.getSourceManager(), compiler.getLangOpts())
@@ -539,7 +582,7 @@ bool RedundantCast::VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr) {
          " written as an explicit construction of a temporary}4"),
         expr->getExprLoc())
         << t1 << printExprValueKind(k1) << t2 << printExprValueKind(k3)
-        << (k3 == VK_RValue && (k1 != VK_RValue || t1->isRecordType()))
+        << (k3 == compat::VK_PRValue && (k1 != compat::VK_PRValue || t1->isRecordType()))
         << expr->getSourceRange();
     return true;
 }
@@ -550,13 +593,23 @@ bool RedundantCast::VisitCXXReinterpretCastExpr(
     if (ignoreLocation(expr)) {
         return true;
     }
+    if (expr->getTypeAsWritten() == expr->getSubExprAsWritten()->getType())
+        //TODO: instead of exact QualType match, allow some variation?
+    {
+        report(
+            DiagnosticsEngine::Warning, "redundant reinterpret_cast from %0 to %1",
+                expr->getExprLoc())
+                << expr->getSubExprAsWritten()->getType() << expr->getTypeAsWritten()
+                << expr->getSourceRange();
+        return true;
+    }
     if (auto const sub = dyn_cast<ImplicitCastExpr>(expr->getSubExpr())) {
         if (sub->getCastKind() == CK_ArrayToPointerDecay && sub->getType() == expr->getType())
             //TODO: instead of exact QualType match, allow some variation?
         {
             if (loplugin::TypeCheck(sub->getType()).Pointer().Const().Char()) {
                 if (auto const lit = dyn_cast<clang::StringLiteral>(expr->getSubExprAsWritten())) {
-                    if (lit->getKind() == clang::StringLiteral::UTF8) {
+                    if (lit->getKind() == compat::StringLiteralKind::UTF8) {
                         // Don't warn about
                         //
                         //   redundant_cast<char const *>(u8"...")
@@ -580,13 +633,13 @@ bool RedundantCast::VisitCXXReinterpretCastExpr(
             return true;
         }
         if (rewriter != nullptr) {
-            auto loc = compat::getBeginLoc(expr);
+            auto loc = expr->getBeginLoc();
             while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
                 loc = compiler.getSourceManager().getImmediateMacroCallerLoc(
                     loc);
             }
             if (compiler.getSourceManager().isMacroBodyExpansion(loc)) {
-                auto loc2 = compat::getEndLoc(expr);
+                auto loc2 = expr->getEndLoc();
                 while (compiler.getSourceManager().isMacroArgExpansion(loc2)) {
                     loc2 = compiler.getSourceManager()
                         .getImmediateMacroCallerLoc(loc2);
@@ -638,6 +691,24 @@ bool RedundantCast::VisitCXXReinterpretCastExpr(
             return true;
         }
     }
+    if (auto const t1 = expr->getSubExpr()->getType()->getAs<clang::PointerType>()) {
+        if (auto const t2 = expr->getType()->getAs<clang::PointerType>()) {
+            if (auto const d1 = t1->getPointeeCXXRecordDecl()) {
+                if (auto const d2 = t2->getPointeeCXXRecordDecl()) {
+                    if (d1->hasDefinition() && d1->isDerivedFrom(d2)) {
+                        report(
+                            DiagnosticsEngine::Warning,
+                            "suspicious reinterpret_cast from derived %0 to base %1, maybe this was"
+                                " meant to be a static_cast",
+                            expr->getExprLoc())
+                            << expr->getSubExprAsWritten()->getType() << expr->getTypeAsWritten()
+                            << expr->getSourceRange();
+                        return true;
+                    }
+                }
+            }
+        }
+    }
     return true;
 }
 
@@ -726,7 +797,7 @@ bool RedundantCast::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * exp
     auto const t1 = expr->getTypeAsWritten();
     bool const fnptr = t1->isFunctionPointerType() || t1->isMemberFunctionPointerType();
     auto const sub = fnptr ? stopAtFunctionPointerDecay(expr) : compat::getSubExprAsWritten(expr);
-    if ((sub->getValueKind() != VK_RValue && !fnptr) || expr->getType()->isRecordType()
+    if ((sub->getValueKind() != compat::VK_PRValue && !fnptr) || expr->getType()->isRecordType()
         || isa<InitListExpr>(sub) || isa<CXXStdInitializerListExpr>(sub))
     {
         return true;
@@ -768,8 +839,8 @@ bool RedundantCast::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * exp
     //
     // in sal/osl/unx/socket.cxx:
     //TODO: Better check that sub is exactly an expansion of FD_ISSET:
-    if (compat::getEndLoc(sub).isMacroID()) {
-        for (auto loc = compat::getBeginLoc(sub);
+    if (sub->getEndLoc().isMacroID()) {
+        for (auto loc = sub->getBeginLoc();
              loc.isMacroID()
                  && (compiler.getSourceManager()
                      .isAtStartOfImmediateMacroExpansion(loc));
@@ -800,16 +871,63 @@ bool RedundantCast::VisitCXXDynamicCastExpr(CXXDynamicCastExpr const * expr) {
     if (ignoreLocation(expr)) {
         return true;
     }
-    // so far this only deals with dynamic casting from T to T
     auto const sub = compat::getSubExprAsWritten(expr);
     auto const t1 = expr->getTypeAsWritten();
     auto const t2 = sub->getType();
-    if (t1.getCanonicalType() != t2.getCanonicalType())
+    QualType qt1 = t1.getCanonicalType();
+    QualType qt2 = t2.getCanonicalType();
+    if (qt1 == qt2)
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "redundant dynamic cast from %0 to %1", expr->getExprLoc())
+            << t2 << t1 << expr->getSourceRange();
         return true;
-    report(
-        DiagnosticsEngine::Warning,
-        "redundant dynamic cast from %0 to %1", expr->getExprLoc())
-        << t2 << t1 << expr->getSourceRange();
+    }
+    if (qt1->isPointerType() && qt2->isPointerType())
+    {
+        // casting from 'T*' to 'const T*' is redundant, so compare without the qualifiers
+        qt1 = qt1->getPointeeType().getUnqualifiedType();
+        qt2 = qt2->getPointeeType().getUnqualifiedType();
+        if (qt1 == qt2)
+        {
+            report(
+                DiagnosticsEngine::Warning,
+                "redundant dynamic cast from %0 to %1", expr->getExprLoc())
+                << t2 << t1 << expr->getSourceRange();
+            return true;
+        }
+        if (qt1->getAsCXXRecordDecl() && qt2->getAsCXXRecordDecl()->isDerivedFrom(qt1->getAsCXXRecordDecl()))
+        {
+            report(
+                DiagnosticsEngine::Warning,
+                "redundant dynamic upcast from %0 to %1", expr->getExprLoc())
+                << t2 << t1 << expr->getSourceRange();
+            return true;
+        }
+    }
+    else if (qt1->isReferenceType() && qt2->isRecordType())
+    {
+        // casting from 'T&' to 'const T&' is redundant, so compare without the qualifiers
+        qt1 = qt1->getPointeeType().getUnqualifiedType();
+        qt2 = qt2.getUnqualifiedType();
+        if (qt1 == qt2)
+        {
+            report(
+                DiagnosticsEngine::Warning,
+                "redundant dynamic cast from %0 to %1", expr->getExprLoc())
+                << t2 << t1 << expr->getSourceRange();
+            return true;
+        }
+        if (qt1->getAsCXXRecordDecl() && qt2->getAsCXXRecordDecl()->isDerivedFrom(qt1->getAsCXXRecordDecl()))
+        {
+            report(
+                DiagnosticsEngine::Warning,
+                "redundant dynamic upcast from %0 to %1", expr->getExprLoc())
+                << t2 << t1 << expr->getSourceRange();
+            return true;
+        }
+    }
     return true;
 }
 
diff --git a/compilerplugins/clang/redundantfcast.cxx b/compilerplugins/clang/redundantfcast.cxx
index d600aa5b79df..3a4dea0fd591 100644
--- a/compilerplugins/clang/redundantfcast.cxx
+++ b/compilerplugins/clang/redundantfcast.cxx
@@ -16,6 +16,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "config_clang.h"
+
 namespace
 {
 class RedundantFCast final : public loplugin::FilteringPlugin<RedundantFCast>
@@ -42,7 +44,7 @@ public:
             expr = cxxConstructExpr->getArg(0);
         }
         if (auto materializeTemporaryExpr = dyn_cast<MaterializeTemporaryExpr>(expr))
-            expr = compat::getSubExpr(materializeTemporaryExpr);
+            expr = materializeTemporaryExpr->getSubExpr();
         auto cxxFunctionalCastExpr = dyn_cast<CXXFunctionalCastExpr>(expr);
         if (!cxxFunctionalCastExpr)
             return true;
@@ -56,9 +58,15 @@ public:
             return true;
         }
         if (m_Seen.insert(cxxFunctionalCastExpr->getExprLoc()).second)
+        {
+            if (suppressWarningAt(cxxFunctionalCastExpr->getBeginLoc()))
+            {
+                return true;
+            }
             report(DiagnosticsEngine::Warning, "redundant functional cast from %0 to %1",
                    cxxFunctionalCastExpr->getExprLoc())
                 << t2 << t1 << cxxFunctionalCastExpr->getSourceRange();
+        }
         return true;
     }
 
@@ -94,7 +102,7 @@ public:
             if (!materializeTemporaryExpr)
                 continue;
             auto functionalCast = dyn_cast<CXXFunctionalCastExpr>(
-                compat::getSubExpr(materializeTemporaryExpr)->IgnoreImpCasts());
+                materializeTemporaryExpr->getSubExpr()->IgnoreImpCasts());
             if (!functionalCast)
                 continue;
             auto const t1 = functionalCast->getTypeAsWritten();
@@ -137,16 +145,21 @@ public:
         {
             // check if param is const&
             auto param = functionDecl->getParamDecl(i);
-            auto lvalueType = param->getType()->getAs<LValueReferenceType>();
-            if (!lvalueType)
-                continue;
-            if (!lvalueType->getPointeeType().isConstQualified())
-                continue;
-            auto paramClassOrStructType = lvalueType->getPointeeType()->getAs<RecordType>();
+            auto rvalueType = param->getType()->getAs<RValueReferenceType>();
+            if (!rvalueType)
+            {
+                auto lvalueType = param->getType()->getAs<LValueReferenceType>();
+                if (!lvalueType)
+                    continue;
+                if (!lvalueType->getPointeeType().isConstQualified())
+                    continue;
+            }
+            auto valueType = param->getType()->getAs<ReferenceType>();
+            auto paramClassOrStructType = valueType->getPointeeType()->getAs<RecordType>();
             if (!paramClassOrStructType)
                 continue;
             // check for temporary and functional cast in argument expression
-            auto arg = callExpr->getArg(i)->IgnoreImplicit();
+            auto arg = compat::IgnoreParenImplicit(callExpr->getArg(i));
             auto functionalCast = dyn_cast<CXXFunctionalCastExpr>(arg);
             if (!functionalCast)
                 continue;
@@ -158,10 +171,23 @@ public:
             // something useful
             if (t1.getCanonicalType().getTypePtr() != paramClassOrStructType)
                 continue;
+            if (rvalueType)
+            {
+                // constructing a temporary to pass to a && argument is fine. But we will see that in the VisitFunctionalCast
+                // method below and generate a warning. And we don't have enough context there to determine that we're
+                // doing the wrong thing. So add the expression to the m_Seen list here to prevent that warning.
+                m_Seen.insert(functionalCast->getExprLoc());
+                continue;
+            }
 
             if (m_Seen.insert(arg->getExprLoc()).second)
             {
-                report(DiagnosticsEngine::Warning, "redundant functional cast from %0 to %1",
+                if (suppressWarningAt(arg->getBeginLoc()))
+                {
+                    continue;
+                }
+                report(DiagnosticsEngine::Warning,
+                       "redundant functional cast from %0 to %1 in construct expression",
                        arg->getExprLoc())
                     << t2 << t1 << arg->getSourceRange();
                 report(DiagnosticsEngine::Note, "in call to method here", param->getLocation())
@@ -206,18 +232,19 @@ public:
             {
                 return false;
             }
-            if (t2->getNumArgs() != 1)
+            auto const args = t2->template_arguments();
+            if (args.size() != 1)
             {
                 if (isDebugMode())
                 {
                     report(DiagnosticsEngine::Fatal,
                            "TODO: unexpected std::function with %0 template arguments",
                            expr->getExprLoc())
-                        << t2->getNumArgs() << expr->getSourceRange();
+                        << compat::diagnosticSize(args.size()) << expr->getSourceRange();
                 }
                 return false;
             }
-            if (t2->getArg(0).getKind() != TemplateArgument::Type)
+            if (args[0].getKind() != TemplateArgument::Type)
             {
                 if (isDebugMode())
                 {
@@ -228,16 +255,18 @@ public:
                 }
                 return false;
             }
-            target = t2->getArg(0).getAsType();
+            target = args[0].getAsType();
         }
         else
         {
             return false;
         }
-        auto cxxConstruct = dyn_cast<CXXConstructExpr>(compat::IgnoreImplicit(expr->getSubExpr()));
+        auto cxxConstruct
+            = dyn_cast<CXXConstructExpr>(compat::IgnoreParenImplicit(expr->getSubExpr()));
         if (!cxxConstruct)
             return false;
-        auto const lambda = dyn_cast<LambdaExpr>(cxxConstruct->getArg(0));
+        auto const lambda
+            = dyn_cast<LambdaExpr>(compat::IgnoreParenImplicit(cxxConstruct->getArg(0)));
         if (!lambda)
             return false;
         if (deduced)
@@ -261,10 +290,15 @@ public:
         if (ignoreLocation(expr))
             return true;
         // specifying the name for an init-list is necessary sometimes
-        if (isa<InitListExpr>(expr->getSubExpr()->IgnoreImplicit()))
+        auto const e = compat::IgnoreParenImplicit(expr->getSubExpr());
+        if (isa<InitListExpr>(e))
+            return true;
+        if (isa<CXXStdInitializerListExpr>(e))
             return true;
-        if (isa<CXXStdInitializerListExpr>(expr->getSubExpr()->IgnoreImplicit()))
+#if CLANG_VERSION >= 160000
+        if (isa<CXXParenListInitExpr>(e))
             return true;
+#endif
         auto const t1 = expr->getTypeAsWritten();
         auto const t2 = compat::getSubExprAsWritten(expr)->getType();
         if (!(t1.getCanonicalType().getTypePtr() == t2.getCanonicalType().getTypePtr()
@@ -294,10 +328,15 @@ public:
             return true;
 
         if (m_Seen.insert(expr->getExprLoc()).second)
+        {
+            if (suppressWarningAt(expr->getBeginLoc()))
+            {
+                return true;
+            }
             report(DiagnosticsEngine::Warning, "redundant functional cast from %0 to %1",
                    expr->getExprLoc())
                 << t2 << t1 << expr->getSourceRange();
-        //getParentStmt(expr)->dump();
+        }
         return true;
     }
 
@@ -305,14 +344,6 @@ public:
     {
         if (!compiler.getLangOpts().CPlusPlus)
             return false;
-        std::string fn = handler.getMainFileName().str();
-        loplugin::normalizeDotDotInFilePath(fn);
-        // necessary on some other platforms
-        if (fn == SRCDIR "/sal/osl/unx/socket.cxx")
-            return false;
-        // compile-time check of constant
-        if (fn == SRCDIR "/bridges/source/jni_uno/jni_bridge.cxx")
-            return false;
         return true;
     }
 
diff --git a/compilerplugins/clang/redundantinline.cxx b/compilerplugins/clang/redundantinline.cxx
index 3bda99e397cb..c9491445b64f 100644
--- a/compilerplugins/clang/redundantinline.cxx
+++ b/compilerplugins/clang/redundantinline.cxx
@@ -10,6 +10,7 @@
 
 #include <cassert>
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -43,18 +44,18 @@ private:
         assert(inlineLoc->isInvalid());
         unsigned n = {}; // avoid -Werror=maybe-uninitialized
         auto end = Lexer::getLocForEndOfToken(
-            compiler.getSourceManager().getExpansionLoc(compat::getEndLoc(decl)), 0,
+            compiler.getSourceManager().getExpansionLoc(decl->getEndLoc()), 0,
             compiler.getSourceManager(), compiler.getLangOpts());
         assert(end.isValid());
         for (auto loc = compiler.getSourceManager().getExpansionLoc(
-                 compat::getBeginLoc(decl));
+                 decl->getBeginLoc());
              loc != end; loc = loc.getLocWithOffset(std::max<unsigned>(n, 1)))
         {
             n = Lexer::MeasureTokenLength(
                 loc, compiler.getSourceManager(), compiler.getLangOpts());
             StringRef s(compiler.getSourceManager().getCharacterData(loc), n);
             //TODO: see compilerplugins/clang/override.cxx:
-            if (s.startswith("\\\n")) {
+            if (compat::starts_with(s, "\\\n")) {
                 s = s.drop_front(2);
             }
             if (s == "inline") {
@@ -86,7 +87,7 @@ private:
                 StringRef s(
                     compiler.getSourceManager().getCharacterData(loc), n2);
                 //TODO: see compilerplugins/clang/override.cxx:
-                if (s.startswith("\\\n")) {
+                if (compat::starts_with(s, "\\\n")) {
                     s = s.drop_front(2);
                 }
                 if (!s.empty()) {
@@ -116,8 +117,8 @@ private:
     }
 
     bool isInMacroExpansion(FunctionDecl const * decl, StringRef name) {
-        auto loc = unwindTo(compat::getBeginLoc(decl), name);
-        return loc.isValid() && loc == unwindTo(compat::getEndLoc(decl), name);
+        auto loc = unwindTo(decl->getBeginLoc(), name);
+        return loc.isValid() && loc == unwindTo(decl->getEndLoc(), name);
     }
 
     bool handleImplicitInline(FunctionDecl const * decl) {
@@ -134,14 +135,14 @@ private:
             report(
                 DiagnosticsEngine::Warning,
                 "function definition redundantly declared 'inline'",
-                inlineLoc.isValid() ? inlineLoc : compat::getBeginLoc(decl))
+                inlineLoc.isValid() ? inlineLoc : decl->getBeginLoc())
                 << decl->getSourceRange();
         }
         return true;
     }
 
     bool handleNonExternalLinkage(FunctionDecl const * decl) {
-        if (decl->getLinkageInternal() >= ModuleLinkage) {
+        if (decl->getLinkageInternal() >= compat::Linkage::Module) {
             return false;
         }
         if (!compiler.getSourceManager().isInMainFile(decl->getLocation())) {
@@ -161,7 +162,7 @@ private:
             report(
                 DiagnosticsEngine::Warning,
                 "function has no external linkage but is explicitly declared 'inline'",
-                inlineLoc.isValid() ? inlineLoc : compat::getBeginLoc(decl))
+                inlineLoc.isValid() ? inlineLoc : decl->getBeginLoc())
                 << decl->getSourceRange();
         }
         return true;
diff --git a/compilerplugins/clang/redundantpointerops.cxx b/compilerplugins/clang/redundantpointerops.cxx
index 45b0783af0ab..caf6d4741170 100644
--- a/compilerplugins/clang/redundantpointerops.cxx
+++ b/compilerplugins/clang/redundantpointerops.cxx
@@ -17,7 +17,6 @@
 #include <clang/AST/CXXInheritance.h>
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -68,7 +67,7 @@ bool RedundantPointerOps::VisitMemberExpr(MemberExpr const * memberExpr)
 {
     if (ignoreLocation(memberExpr))
         return true;
-    if (compat::getBeginLoc(memberExpr).isMacroID())
+    if (memberExpr->getBeginLoc().isMacroID())
         return true;
     auto base = memberExpr->getBase()->IgnoreParenImpCasts();
             //parentStmt(parentStmt(memberExpr))->dump();
@@ -80,7 +79,7 @@ bool RedundantPointerOps::VisitMemberExpr(MemberExpr const * memberExpr)
                 report(
                     DiagnosticsEngine::Warning,
                     "'&' followed by '->' operating on %0, rather use '.'",
-                    compat::getBeginLoc(memberExpr))
+                    memberExpr->getBeginLoc())
                     << memberExpr->getBase()->getType()->getPointeeType()
                     << memberExpr->getSourceRange();
 
@@ -91,7 +90,7 @@ bool RedundantPointerOps::VisitMemberExpr(MemberExpr const * memberExpr)
                 report(
                     DiagnosticsEngine::Warning,
                     "'&' followed by '->' operating on %0, rather use '.'",
-                    compat::getBeginLoc(memberExpr))
+                    memberExpr->getBeginLoc())
                     << memberExpr->getBase()->getType()->getPointeeType()
                     << memberExpr->getSourceRange();
 
@@ -106,7 +105,7 @@ bool RedundantPointerOps::VisitMemberExpr(MemberExpr const * memberExpr)
                     report(
                         DiagnosticsEngine::Warning,
                         "'get()' followed by '->' operating on %0, just use '->'",
-                        compat::getBeginLoc(memberExpr))
+                        memberExpr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType().getLocalUnqualifiedType()
                         << memberExpr->getSourceRange();
             }
@@ -131,7 +130,7 @@ bool RedundantPointerOps::VisitUnaryOperator(UnaryOperator const * unaryOperator
 {
     if (ignoreLocation(unaryOperator))
         return true;
-    if (compat::getBeginLoc(unaryOperator).isMacroID())
+    if (unaryOperator->getBeginLoc().isMacroID())
         return true;
     if (unaryOperator->getOpcode() != UO_Deref)
         return true;
@@ -140,7 +139,7 @@ bool RedundantPointerOps::VisitUnaryOperator(UnaryOperator const * unaryOperator
     if (innerOp && innerOp->getOpcode() == UO_AddrOf)
         report(
             DiagnosticsEngine::Warning, "'&' followed by '*' operating on %0, rather use '.'",
-            compat::getBeginLoc(unaryOperator))
+            unaryOperator->getBeginLoc())
             << innerOp->getSubExpr()->getType() << unaryOperator->getSourceRange();
     if (auto cxxMemberCallExpr = dyn_cast<CXXMemberCallExpr>(subExpr))
     {
@@ -152,7 +151,7 @@ bool RedundantPointerOps::VisitUnaryOperator(UnaryOperator const * unaryOperator
                 report(
                     DiagnosticsEngine::Warning,
                     "'*' followed by '.get()' operating on %0, just use '*'",
-                    compat::getBeginLoc(unaryOperator))
+                    unaryOperator->getBeginLoc())
                     << e->IgnoreImpCasts()->getType().getLocalUnqualifiedType()
                     << unaryOperator->getSourceRange();
         }
diff --git a/compilerplugins/clang/redundantstatic.cxx b/compilerplugins/clang/redundantstatic.cxx
index 95a3c85c9d17..40f6ab45f132 100644
--- a/compilerplugins/clang/redundantstatic.cxx
+++ b/compilerplugins/clang/redundantstatic.cxx
@@ -8,7 +8,6 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /*
@@ -42,7 +41,7 @@ class RedundantStatic
                 return true;
             }
             if (decl->isInAnonymousNamespace()) {
-                auto loc = compat::getBeginLoc(decl);
+                auto loc = decl->getBeginLoc();
                 while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
                     loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
                 }
@@ -105,7 +104,7 @@ bool RedundantStatic::VisitFunctionDecl( const FunctionDecl* func )
                {
                     report( DiagnosticsEngine::Warning,
                         "redundant 'static' keyword in unnamed namespace",
-                        compat::getBeginLoc(func));
+                        func->getBeginLoc());
                }
          }
     }
diff --git a/compilerplugins/clang/refcounting.cxx b/compilerplugins/clang/refcounting.cxx
index 31b1540d391e..801173ce6488 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -6,13 +6,13 @@
  * 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 LO_CLANG_SHARED_PLUGINS
 
 #include <string>
 #include <iostream>
 
 #include "check.hxx"
 #include "plugin.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 
 /**
@@ -56,6 +56,10 @@ public:
     bool VisitFieldDecl(const FieldDecl *);
     bool VisitVarDecl(const VarDecl *);
     bool VisitFunctionDecl(const FunctionDecl *);
+    bool VisitTypeLoc(clang::TypeLoc typeLoc);
+    bool VisitCXXDeleteExpr(const CXXDeleteExpr *);
+    bool VisitBinaryOperator(const BinaryOperator *);
+    bool VisitReturnStmt(const ReturnStmt *);
 
     // Creation of temporaries with one argument are represented by
     // CXXFunctionalCastExpr, while any other number of arguments are
@@ -70,6 +74,8 @@ private:
                            const RecordDecl* parent, const std::string& rDeclName);
 
     bool visitTemporaryObjectExpr(Expr const * expr);
+    bool isCastingReference(const Expr* expr);
+    bool isCallingGetOnWeakRef(const Expr* expr);
 };
 
 bool containsXInterfaceSubclass(const clang::Type* pType0);
@@ -201,6 +207,65 @@ bool containsXInterfaceSubclass(const clang::Type* pType0) {
     }
 }
 
+bool containsOWeakObjectSubclass(const clang::Type* pType0);
+
+bool containsOWeakObjectSubclass(const QualType& qType) {
+    return containsOWeakObjectSubclass(qType.getTypePtr());
+}
+
+bool containsOWeakObjectSubclass(const clang::Type* pType0) {
+    if (!pType0)
+        return false;
+    if (pType0->isDependentType()) {
+         return false;
+    }
+    const clang::Type* pType = pType0->getUnqualifiedDesugaredType();
+    if (!pType)
+        return false;
+    const CXXRecordDecl* pRecordDecl = pType->getAsCXXRecordDecl();
+    if (pRecordDecl) {
+        // because dbaccess just has to be special...
+        loplugin::DeclCheck dc(pRecordDecl);
+        if (dc.Class("DocumentEvents").Namespace("dbaccess")
+                .GlobalNamespace() ||
+            dc.Class("OBookmarkContainer").Namespace("dbaccess")
+                .GlobalNamespace())
+            return false;
+        // TODO not sure about these ones, just avoiding dbaccess in general for now
+        if (dc.Class("SbaXPropertiesChangeMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXSubmitMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXResetMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXPropertyChangeMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXSQLErrorMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXParameterMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXRowSetApproveMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXRowSetMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXLoadMultiplexer").Namespace("dbaui").GlobalNamespace() ||
+            dc.Class("SbaXVetoableChangeMultiplexer").Namespace("dbaui").GlobalNamespace())
+            return false;
+        // slideshow playing games here
+        if (dc.Class("SlideView").AnonymousNamespace().Namespace("internal").Namespace("slideshow").GlobalNamespace())
+            return false;
+        // svx playing acquire/release games here in OWeakSubObject
+        if (dc.Class("FmXUpdateMultiplexer").GlobalNamespace() ||
+            dc.Class("FmXContainerMultiplexer").GlobalNamespace() ||
+            dc.Class("FmXSelectionMultiplexer").GlobalNamespace() ||
+            dc.Class("FmXGridControlMultiplexer").GlobalNamespace() ||
+            dc.Class("FmXModifyMultiplexer").GlobalNamespace())
+            return false;
+    }
+    if (pType->isPointerType()) {
+        // ignore
+        return false;
+    } else if (pType->isArrayType()) {
+        const clang::ArrayType* pArrayType = dyn_cast<clang::ArrayType>(pType);
+        QualType elementType = pArrayType->getElementType();
+        return containsOWeakObjectSubclass(elementType);
+    } else {
+        return loplugin::isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("OWeakObject").Namespace("cppu").GlobalNamespace()); });
+    }
+}
+
 bool containsSvRefBaseSubclass(const clang::Type* pType0) {
     if (!pType0)
         return false;
@@ -313,24 +378,30 @@ static bool containsStaticTypeMethod(const CXXRecordDecl* x)
 
 void RefCounting::checkUnoReference(QualType qt, const Decl* decl, const RecordDecl* parent, const std::string& rDeclName)
 {
-    if (loplugin::TypeCheck(qt).Class("Reference").Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()) {
-        const CXXRecordDecl* pRecordDecl = qt->getAsCXXRecordDecl();
-        const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl);
-        const TemplateArgument& rArg = pTemplate->getTemplateArgs()[0];
-        const CXXRecordDecl* templateParam = rArg.getAsType()->getAsCXXRecordDecl()->getDefinition();
-        if (templateParam && !containsStaticTypeMethod(templateParam)) {
-            report(
-                DiagnosticsEngine::Warning,
-                ("uno::Reference %0 with template parameter that does not"
-                 " contain ::static_type() %1%select{|, parent is %3,}2 should"
-                 " probably be using rtl::Reference instead"),
-                decl->getLocation())
-              << rDeclName << qt << (parent != nullptr)
-              << (parent != nullptr
-                  ? parent->getQualifiedNameAsString() : std::string())
-              << decl->getSourceRange();
-        }
-    }
+    if (!loplugin::TypeCheck(qt).Class("Reference").Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace())
+        return;
+    const CXXRecordDecl* pRecordDecl = qt->getAsCXXRecordDecl();
+    const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl);
+    const TemplateArgument& rArg = pTemplate->getTemplateArgs()[0];
+    const CXXRecordDecl* templateParam = rArg.getAsType()->getAsCXXRecordDecl()->getDefinition();
+    if (!templateParam)
+        return;
+    // SwXText is a special case. It is a mixin class that does not inherit from OWeakObject, so
+    // we cannot use rtl::Reference.
+    if (loplugin::DeclCheck(templateParam).Class("SwXText"))
+        return;
+    if (containsStaticTypeMethod(templateParam))
+        return;
+    report(
+        DiagnosticsEngine::Warning,
+        ("uno::Reference %0 with template parameter that does not"
+         " contain ::static_type() %1%select{|, parent is %3,}2 should"
+         " probably be using rtl::Reference instead"),
+        decl->getLocation())
+      << rDeclName << qt << (parent != nullptr)
+      << (parent != nullptr
+          ? parent->getQualifiedNameAsString() : std::string())
+      << decl->getSourceRange();
 }
 
 bool RefCounting::visitTemporaryObjectExpr(Expr const * expr) {
@@ -343,7 +414,7 @@ bool RefCounting::visitTemporaryObjectExpr(Expr const * expr) {
             DiagnosticsEngine::Warning,
             ("Temporary object of SvRefBase subclass %0 being directly stack"
              " managed, should be managed via tools::SvRef"),
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << t.getUnqualifiedType() << expr->getSourceRange();
     } else if (containsSalhelperReferenceObjectSubclass(t.getTypePtr())) {
         report(
@@ -351,7 +422,7 @@ bool RefCounting::visitTemporaryObjectExpr(Expr const * expr) {
             ("Temporary object of salhelper::SimpleReferenceObject subclass %0"
              " being directly stack managed, should be managed via"
              " rtl::Reference"),
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << t.getUnqualifiedType() << expr->getSourceRange();
     } else if (containsXInterfaceSubclass(t)) {
         report(
@@ -359,12 +430,111 @@ bool RefCounting::visitTemporaryObjectExpr(Expr const * expr) {
             ("Temporary object of css::uno::XInterface subclass %0 being"
              " directly stack managed, should be managed via"
              " css::uno::Reference"),
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
+            << t.getUnqualifiedType() << expr->getSourceRange();
+    } else if (containsOWeakObjectSubclass(t)) {
+        report(
+            DiagnosticsEngine::Warning,
+            ("Temporary object of cppu::OWeakObject subclass %0 being"
+             " directly stack managed, should be managed via"
+             " css::uno::Reference"),
+            expr->getBeginLoc())
             << t.getUnqualifiedType() << expr->getSourceRange();
     }
     return true;
 }
 
+// check for dodgy code managing ref-counted stuff with shared_ptr or unique_ptr or similar stuff
+bool RefCounting::VisitTypeLoc(clang::TypeLoc typeLoc)
+{
+    QualType firstTemplateParamType;
+    if (auto recordType = typeLoc.getType()->getUnqualifiedDesugaredType()->getAs<RecordType>()) {
+        auto const tc = loplugin::TypeCheck(recordType);
+        if (tc.ClassOrStruct("unique_ptr").StdNamespace()
+            || tc.ClassOrStruct("weak_ptr").StdNamespace()
+            || tc.ClassOrStruct("shared_ptr").StdNamespace()
+            || tc.ClassOrStruct("intrusive_ptr").Namespace("boost").GlobalNamespace())
+        {
+            auto templateDecl = dyn_cast<ClassTemplateSpecializationDecl>(recordType->getDecl());
+            if (templateDecl && templateDecl->getTemplateArgs().size() > 0)
+                firstTemplateParamType = templateDecl->getTemplateArgs()[0].getAsType();
+        }
+    }
+    if (firstTemplateParamType.isNull())
+        return true;
+    if (containsSvRefBaseSubclass(firstTemplateParamType.getTypePtr()))
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "SvRefBase subclass %0 being managed via smart pointer, should be managed via tools::SvRef",
+            typeLoc.getBeginLoc())
+            << firstTemplateParamType
+            << typeLoc.getSourceRange();
+    }
+    if (containsSalhelperReferenceObjectSubclass(firstTemplateParamType.getTypePtr()))
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "salhelper::SimpleReferenceObject subclass %0 being managed via smart pointer, should be managed via rtl::Reference",
+            typeLoc.getBeginLoc())
+            << firstTemplateParamType
+            << typeLoc.getSourceRange();
+    }
+// Not in general (dbaccess::DocumentEvents, dbaccess/source/core/dataaccess/databasedocument.hxx):
+#if 0
+    if (containsXInterfaceSubclass(firstTemplateParamType))
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "XInterface subclass %0 being managed via smart pointer, should be managed via uno::Reference",
+            typeLoc.getBeginLoc())
+            << firstTemplateParamType
+            << typeLoc.getSourceRange();
+    }
+#endif
+    if (containsOWeakObjectSubclass(firstTemplateParamType.getTypePtr()))
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "cppu::OWeakObject subclass %0 being managed via smart pointer, should be managed via rtl::Reference",
+            typeLoc.getBeginLoc())
+            << firstTemplateParamType
+            << typeLoc.getSourceRange();
+    }
+    return true;
+}
+
+bool RefCounting::VisitCXXDeleteExpr(const CXXDeleteExpr * cxxDeleteExpr)
+{
+    if (ignoreLocation(cxxDeleteExpr))
+        return true;
+    StringRef aFileName = getFilenameOfLocation(
+        compiler.getSourceManager().getSpellingLoc(cxxDeleteExpr->getBeginLoc()));
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/cppuhelper/source/weak.cxx"))
+        return true;
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/include/svx/svdobj.hxx"))
+        return true;
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/svdraw/svdobj.cxx"))
+        return true;
+
+    if (!cxxDeleteExpr->getArgument())
+        return true;
+    auto argType = cxxDeleteExpr->getArgument()->getType();
+    if (argType.isNull() || !argType->isPointerType())
+        return true;
+    auto pointeeType = argType->getPointeeType();
+    if (containsOWeakObjectSubclass(pointeeType))
+    {
+        report(
+            DiagnosticsEngine::Warning,
+            "cppu::OWeakObject subclass %0 being deleted via delete, should be managed via rtl::Reference",
+            cxxDeleteExpr->getBeginLoc())
+            << pointeeType
+            << cxxDeleteExpr->getSourceRange();
+    }
+    return true;
+}
+
 bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
     if (ignoreLocation(fieldDecl)) {
         return true;
@@ -380,20 +550,6 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
         return true;
     }
 
-    // check for dodgy code managing ref-counted stuff with shared_ptr or unique_ptr or similar stuff
-    QualType firstTemplateParamType;
-    if (auto recordType = fieldDecl->getType()->getUnqualifiedDesugaredType()->getAs<RecordType>()) {
-        auto const tc = loplugin::TypeCheck(fieldDecl->getType());
-        if (tc.Class("unique_ptr").StdNamespace()
-            || tc.Class("shared_ptr").StdNamespace()
-            || tc.Class("intrusive_ptr").Namespace("boost").GlobalNamespace())
-        {
-            auto templateDecl = dyn_cast<ClassTemplateSpecializationDecl>(recordType->getDecl());
-            if (templateDecl && templateDecl->getTemplateArgs().size() > 0)
-                firstTemplateParamType = templateDecl->getTemplateArgs()[0].getAsType();
-        }
-    }
-
     if (containsSvRefBaseSubclass(fieldDecl->getType().getTypePtr())) {
         report(
             DiagnosticsEngine::Warning,
@@ -405,18 +561,6 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
             << fieldDecl->getSourceRange();
     }
 
-    if (!firstTemplateParamType.isNull() && containsSvRefBaseSubclass(firstTemplateParamType.getTypePtr()))
-    {
-        report(
-            DiagnosticsEngine::Warning,
-            "SvRefBase subclass %0 being managed via smart pointer, should be managed via tools::SvRef, "
-            "parent is %1",
-            fieldDecl->getLocation())
-            << firstTemplateParamType
-            << fieldDecl->getParent()
-            << fieldDecl->getSourceRange();
-    }
-
     if (containsSalhelperReferenceObjectSubclass(fieldDecl->getType().getTypePtr())) {
         report(
             DiagnosticsEngine::Warning,
@@ -428,21 +572,10 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
             << fieldDecl->getSourceRange();
     }
 
-    if (!firstTemplateParamType.isNull() && containsSalhelperReferenceObjectSubclass(firstTemplateParamType.getTypePtr()))
-    {
-        report(
-            DiagnosticsEngine::Warning,
-            "salhelper::SimpleReferenceObject subclass %0 being managed via smart pointer, should be managed via rtl::Reference, "
-            "parent is %1",
-            fieldDecl->getLocation())
-            << firstTemplateParamType
-            << fieldDecl->getParent()
-            << fieldDecl->getSourceRange();
-    }
-
     auto const dc = loplugin::DeclCheck(fieldDecl->getParent());
     if ( (dc.Class("BaseReference").Namespace("uno").Namespace("star")
           .Namespace("sun").Namespace("com").GlobalNamespace())
+         || (dc.Class("Reference").Namespace("rtl").GlobalNamespace())
          || (dc.Union("element_alias").Namespace("detail").Namespace("cppu")
              .GlobalNamespace())
          // this is playing some kind of game to avoid circular references
@@ -463,20 +596,16 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
             << fieldDecl->getSourceRange();
     }
 
-// Not in general (dbaccess::DocumentEvents, dbaccess/source/core/dataaccess/databasedocument.hxx):
-#if 0
-    if (!firstTemplateParamType.isNull() && containsXInterfaceSubclass(firstTemplateParamType))
-    {
+    if (containsOWeakObjectSubclass(fieldDecl->getType())) {
         report(
             DiagnosticsEngine::Warning,
-            "XInterface subclass %0 being managed via smart pointer, should be managed via uno::Reference, "
+            "cppu::OWeakObject subclass %0 being directly heap managed, should be managed via rtl::Reference, "
             "parent is %1",
             fieldDecl->getLocation())
-            << firstTemplateParamType
+            << fieldDecl->getType()
             << fieldDecl->getParent()
             << fieldDecl->getSourceRange();
     }
-#endif
 
     checkUnoReference(
         fieldDecl->getType(), fieldDecl,
@@ -485,43 +614,267 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
     return true;
 }
 
+bool RefCounting::VisitReturnStmt(const ReturnStmt * returnStmt) {
+    if (ignoreLocation(returnStmt)) {
+        return true;
+    }
+
+    if (!returnStmt->getRetValue())
+        return true;
+    auto cxxNewExpr = dyn_cast<CXXNewExpr>(returnStmt->getRetValue()->IgnoreImplicit());
+    if (!cxxNewExpr)
+        return true;
+
+    auto qt = returnStmt->getRetValue()->getType();
+    if (!qt->isPointerType())
+        return false;
+    qt = qt->getPointeeType();
+
+    if (containsOWeakObjectSubclass(qt)) {
+        report(
+            DiagnosticsEngine::Warning,
+            "new object of cppu::OWeakObject subclass %0 being returned via raw pointer, should be returned by via rtl::Reference",
+            returnStmt->getBeginLoc())
+            << qt
+            << returnStmt->getSourceRange();
+    }
+
+    return true;
+}
 
 bool RefCounting::VisitVarDecl(const VarDecl * varDecl) {
-    if (ignoreLocation(varDecl)) {
+    if (ignoreLocation(varDecl))
+        return true;
+
+    checkUnoReference(varDecl->getType(), varDecl, nullptr, "var");
+
+    if (isa<ParmVarDecl>(varDecl))
         return true;
+
+    if (containsSvRefBaseSubclass(varDecl->getType().getTypePtr())) {
+        report(
+            DiagnosticsEngine::Warning,
+            "SvRefBase subclass being directly stack managed, should be managed via tools::SvRef, "
+            + varDecl->getType().getAsString(),
+            varDecl->getLocation())
+            << varDecl->getSourceRange();
     }
-    if (!isa<ParmVarDecl>(varDecl)) {
-        if (containsSvRefBaseSubclass(varDecl->getType().getTypePtr())) {
-            report(
-                DiagnosticsEngine::Warning,
-                "SvRefBase subclass being directly stack managed, should be managed via tools::SvRef, "
-                + varDecl->getType().getAsString(),
-                varDecl->getLocation())
-              << varDecl->getSourceRange();
+    if (containsSalhelperReferenceObjectSubclass(varDecl->getType().getTypePtr())) {
+        StringRef name { getFilenameOfLocation(
+            compiler.getSourceManager().getSpellingLoc(varDecl->getLocation())) };
+        // this is playing games that it believes is safe
+        if (loplugin::isSamePathname(name, SRCDIR "/stoc/source/security/permissions.cxx"))
+            return true;
+        report(
+            DiagnosticsEngine::Warning,
+            "salhelper::SimpleReferenceObject subclass being directly stack managed, should be managed via rtl::Reference, "
+            + varDecl->getType().getAsString(),
+            varDecl->getLocation())
+            << varDecl->getSourceRange();
+    }
+    if (containsXInterfaceSubclass(varDecl->getType())) {
+        report(
+            DiagnosticsEngine::Warning,
+            "XInterface subclass being directly stack managed, should be managed via uno::Reference, "
+            + varDecl->getType().getAsString(),
+            varDecl->getLocation())
+            << varDecl->getSourceRange();
+    }
+    if (containsOWeakObjectSubclass(varDecl->getType())) {
+        report(
+            DiagnosticsEngine::Warning,
+            "cppu::OWeakObject subclass being directly stack managed, should be managed via uno::Reference, "
+            + varDecl->getType().getAsString(),
+            varDecl->getLocation())
+            << varDecl->getSourceRange();
+    }
+
+    if (varDecl->getType()->isPointerType() && varDecl->getInit())
+    {
+        auto newExpr = dyn_cast<CXXNewExpr>(varDecl->getInit()->IgnoreImplicit());
+        if (newExpr)
+        {
+            StringRef fileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(varDecl->getBeginLoc()));
+            if (loplugin::isSamePathname(fileName, SRCDIR "/cppuhelper/source/component_context.cxx"))
+                return true;
+            auto pointeeType = varDecl->getType()->getPointeeType();
+            if (containsOWeakObjectSubclass(pointeeType))
+                report(
+                    DiagnosticsEngine::Warning,
+                    "cppu::OWeakObject subclass %0 being managed via raw pointer, should be managed via rtl::Reference",
+                    varDecl->getLocation())
+                    << pointeeType
+                    << varDecl->getSourceRange();
+        }
+        if (isCastingReference(varDecl->getInit()))
+        {
+            // TODO false+ code
+            StringRef fileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(varDecl->getBeginLoc()));
+            if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/core/unocore/unotbl.cxx"))
+                return true;
+            auto pointeeType = varDecl->getType()->getPointeeType();
+            if (containsOWeakObjectSubclass(pointeeType))
+                report(
+                    DiagnosticsEngine::Warning,
+                    "cppu::OWeakObject subclass %0 being managed via raw pointer, should be managed via rtl::Reference",
+                    varDecl->getLocation())
+                    << pointeeType
+                    << varDecl->getSourceRange();
+        }
+        if (isCallingGetOnWeakRef(varDecl->getInit()))
+        {
+            auto pointeeType = varDecl->getType()->getPointeeType();
+            if (containsOWeakObjectSubclass(pointeeType))
+                report(
+                    DiagnosticsEngine::Warning,
+                    "weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference",
+                    varDecl->getLocation())
+                    << pointeeType
+                    << varDecl->getSourceRange();
         }
-        if (containsSalhelperReferenceObjectSubclass(varDecl->getType().getTypePtr())) {
-            StringRef name { getFilenameOfLocation(
-                compiler.getSourceManager().getSpellingLoc(varDecl->getLocation())) };
-            // this is playing games that it believes is safe
-            if (loplugin::isSamePathname(name, SRCDIR "/stoc/source/security/permissions.cxx"))
+    }
+    return true;
+}
+
+/**
+    Look for code like
+        static_cast<FooChild*>(makeFoo().get());
+    where makeFoo() returns a Reference<Foo>
+*/
+bool RefCounting::isCastingReference(const Expr* expr)
+{
+    expr = expr->IgnoreImplicit();
+    auto castExpr = dyn_cast<CastExpr>(expr);
+    if (!castExpr)
+        return false;
+    auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(castExpr->getSubExpr());
+    if (!memberCallExpr)
+        return false;
+    if (!memberCallExpr->getMethodDecl()->getIdentifier() || memberCallExpr->getMethodDecl()->getName() != "get")
+        return false;
+    QualType objectType = memberCallExpr->getImplicitObjectArgument()->getType();
+    if (!loplugin::TypeCheck(objectType).Class("Reference"))
+        return false;
+    // ignore "x.get()" where x is a var
+    auto obj = memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit();
+    if (isa<DeclRefExpr>(obj) || isa<MemberExpr>(obj))
+        return false;
+    // if the foo in foo().get() returns "rtl::Reference<T>&" then the variable
+    // we are assigning to does not __have__ to be Reference, since the method called
+    // must already be holding a reference.
+    if (auto callExpr = dyn_cast<CallExpr>(obj))
+    {
+        if (auto callMethod = callExpr->getDirectCallee())
+            if (callMethod->getReturnType()->isReferenceType())
+                return false;
+    }
+    // Ignore
+    //     WeakReference x;
+    //     if (x.get.get())
+    // and similar stuff
+    if (auto memberCall2 = dyn_cast<CXXMemberCallExpr>(obj))
+    {
+        if (loplugin::TypeCheck(memberCall2->getImplicitObjectArgument()->getType()).Class("WeakReference"))
+                return false;
+    }
+    return true;
+}
+
+/**
+    Look for code like
+        makeFoo().get();
+    or
+        cast<T*>(makeFoo().get().get());
+    or
+        foo.get();
+    where makeFoo() returns a unotools::WeakReference<Foo>
+    and foo is a unotools::WeakReference<Foo> var.
+*/
+bool RefCounting::isCallingGetOnWeakRef(const Expr* expr)
+{
+    expr = expr->IgnoreImplicit();
+    // unwrap the cast (if any)
+    if (auto castExpr = dyn_cast<CastExpr>(expr))
+        expr = castExpr->getSubExpr()->IgnoreImplicit();
+    // unwrap outer get (if any)
+    if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(expr))
+    {
+        auto methodDecl = memberCallExpr->getMethodDecl();
+        if (methodDecl && methodDecl->getIdentifier() && methodDecl->getName() == "get")
+        {
+            QualType objectType = memberCallExpr->getImplicitObjectArgument()->getType();
+            if (loplugin::TypeCheck(objectType).Class("Reference").Namespace("rtl"))
+                expr = memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit();
+        }
+    }
+    // check for converting a WeakReference to a strong reference via get()
+    if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(expr))
+    {
+        auto methodDecl = memberCallExpr->getMethodDecl();
+        if (methodDecl && methodDecl->getIdentifier() && methodDecl->getName() == "get")
+        {
+            QualType objectType = memberCallExpr->getImplicitObjectArgument()->getType();
+            if (loplugin::TypeCheck(objectType).Class("WeakReference").Namespace("unotools"))
                 return true;
+        }
+    }
+    return false;
+}
+
+bool RefCounting::VisitBinaryOperator(const BinaryOperator * binaryOperator)
+{
+    if (ignoreLocation(binaryOperator))
+        return true;
+    if (binaryOperator->getOpcode() != BO_Assign)
+        return true;
+    if (!binaryOperator->getLHS()->getType()->isPointerType())
+        return true;
+
+    auto newExpr = dyn_cast<CXXNewExpr>(binaryOperator->getRHS()->IgnoreImplicit());
+    if (newExpr)
+    {
+        // deliberately does not want to keep track at the allocation site
+        StringRef fileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(binaryOperator->getBeginLoc()));
+        if (loplugin::isSamePathname(fileName, SRCDIR "/vcl/unx/generic/dtrans/X11_selection.cxx"))
+            return true;
+
+        auto pointeeType = binaryOperator->getLHS()->getType()->getPointeeType();
+        if (containsOWeakObjectSubclass(pointeeType))
+        {
             report(
                 DiagnosticsEngine::Warning,
-                "salhelper::SimpleReferenceObject subclass being directly stack managed, should be managed via rtl::Reference, "
-                + varDecl->getType().getAsString(),
-                varDecl->getLocation())
-              << varDecl->getSourceRange();
+                "cppu::OWeakObject subclass %0 being managed via raw pointer, should be managed via rtl::Reference",
+                binaryOperator->getBeginLoc())
+                << pointeeType
+                << binaryOperator->getSourceRange();
         }
-        if (containsXInterfaceSubclass(varDecl->getType())) {
+    }
+    if (isCastingReference(binaryOperator->getRHS()))
+    {
+        auto pointeeType = binaryOperator->getLHS()->getType()->getPointeeType();
+        if (containsOWeakObjectSubclass(pointeeType))
             report(
                 DiagnosticsEngine::Warning,
-                "XInterface subclass being directly stack managed, should be managed via uno::Reference, "
-                + varDecl->getType().getAsString(),
-                varDecl->getLocation())
-              << varDecl->getSourceRange();
-        }
+                "cppu::OWeakObject subclass %0 being managed via raw pointer, should be managed via rtl::Reference",
+                binaryOperator->getBeginLoc())
+                << pointeeType
+                << binaryOperator->getSourceRange();
+    }
+    if (isCallingGetOnWeakRef(binaryOperator->getRHS()))
+    {
+        // TODO Very dodgy code, but I see no simple way of fixing it
+        StringRef fileName = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(binaryOperator->getBeginLoc()));
+        if (loplugin::isSamePathname(fileName, SRCDIR "/sd/source/ui/view/Outliner.cxx"))
+            return true;
+        auto pointeeType = binaryOperator->getLHS()->getType()->getPointeeType();
+        if (containsOWeakObjectSubclass(pointeeType))
+            report(
+                DiagnosticsEngine::Warning,
+                "weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference",
+                binaryOperator->getBeginLoc())
+                << pointeeType
+                << binaryOperator->getSourceRange();
     }
-    checkUnoReference(varDecl->getType(), varDecl, nullptr, "var");
     return true;
 }
 
@@ -543,6 +896,4 @@ loplugin::Plugin::Registration< RefCounting > refcounting("refcounting");
 
 }
 
-#endif // LO_CLANG_SHARED_PLUGINS
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/refcountingbase.cxx b/compilerplugins/clang/refcountingbase.cxx
new file mode 100644
index 000000000000..dddc7335e8d5
--- /dev/null
+++ b/compilerplugins/clang/refcountingbase.cxx
@@ -0,0 +1,141 @@
+/* -*- 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 LO_CLANG_SHARED_PLUGINS
+
+#include <string>
+#include <iostream>
+#include <map>
+#include <set>
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "clang/AST/CXXInheritance.h"
+
+/**
+ * Make sure a class does not have multiple reference-counting base classes
+ */
+namespace
+{
+class RefCountingBase : public loplugin::FilteringPlugin<RefCountingBase>
+{
+public:
+    explicit RefCountingBase(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitCXXRecordDecl(CXXRecordDecl const*);
+};
+
+bool RefCountingBase::VisitCXXRecordDecl(CXXRecordDecl const* recordDecl)
+{
+    if (ignoreLocation(recordDecl))
+        return true;
+    if (!recordDecl->isThisDeclarationADefinition())
+        return true;
+
+    int virtualWeakBase = 0;
+    int virtualOWeakObject = 0;
+    int virtualSimpleReferenceObject = 0;
+    int virtualSvRefBase = 0;
+    int virtualXmlImportContenxt = 0;
+    int virtualVclReferenceBase = 0;
+    int noRefCountingBases = 0;
+    std::string basePaths;
+    auto BaseMatchesCallback = [&](const CXXBaseSpecifier* cxxBaseSpecifier, CXXBasePath& Paths) {
+        if (!cxxBaseSpecifier->getType().getTypePtr())
+            return false;
+        const CXXRecordDecl* baseCXXRecordDecl = cxxBaseSpecifier->getType()->getAsCXXRecordDecl();
+        if (!baseCXXRecordDecl)
+            return false;
+        if (baseCXXRecordDecl->isInvalidDecl())
+            return false;
+
+        if (baseCXXRecordDecl->getName() != "WeakBase" // tools::WeakBase
+            && baseCXXRecordDecl->getName() != "OWeakObject" // cppu::WeakBase
+            && baseCXXRecordDecl->getName()
+                   != "SimpleReferenceObject" // salhelper::SimpleReferenceObject
+            && baseCXXRecordDecl->getName() != "SvRefBase" // tool::SvRefBase
+            && baseCXXRecordDecl->getName() != "SvXMLImportContext" // in xmloff
+            && baseCXXRecordDecl->getName() != "VclReferenceBase") // in vcl
+            return false;
+        if (cxxBaseSpecifier->isVirtual())
+        {
+            if (baseCXXRecordDecl->getName() == "WeakBase")
+                virtualWeakBase = 1;
+            else if (baseCXXRecordDecl->getName() != "OWeakObject")
+                virtualOWeakObject = 1;
+            else if (baseCXXRecordDecl->getName() != "SimpleReferenceObject")
+                virtualSimpleReferenceObject = 1;
+            else if (baseCXXRecordDecl->getName() != "SvRefBase")
+                virtualSvRefBase = 1;
+            else if (baseCXXRecordDecl->getName() != "SvXMLImportContext")
+                virtualXmlImportContenxt = 1;
+            else if (baseCXXRecordDecl->getName() != "VclReferenceBase")
+                virtualVclReferenceBase = 1;
+            else
+                assert(false);
+        }
+        else
+            ++noRefCountingBases;
+        std::string sPath;
+        for (CXXBasePathElement const& pathElement : Paths)
+        {
+            if (!sPath.empty())
+            {
+                sPath += "->";
+            }
+            if (pathElement.Class->hasDefinition())
+                sPath += pathElement.Class->getNameAsString();
+            else
+                sPath += "???";
+        }
+        sPath += "->";
+        sPath += baseCXXRecordDecl->getNameAsString();
+        if (!basePaths.empty())
+            basePaths += ", ";
+        basePaths += sPath;
+        return false;
+    };
+
+    CXXBasePaths aPaths;
+    recordDecl->lookupInBases(BaseMatchesCallback, aPaths);
+
+    int total = virtualWeakBase + virtualOWeakObject + virtualSimpleReferenceObject
+                + virtualSvRefBase + virtualXmlImportContenxt + virtualVclReferenceBase
+                + noRefCountingBases;
+    if (total > 1)
+    {
+        report(DiagnosticsEngine::Warning,
+               "this class has multiple copies of a reference-counting base class, through "
+               "inheritance paths %0",
+               recordDecl->getBeginLoc())
+            << basePaths << recordDecl->getSourceRange();
+    }
+    return true;
+}
+
+loplugin::Plugin::Registration<RefCountingBase> refcountingbase("refcountingbase", true);
+
+} // namespace
+
+#endif // LO_CLANG_SHARED_PLUGINS
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/referencecasting.cxx b/compilerplugins/clang/referencecasting.cxx
index f23e2f6811cd..cff5b050ea9f 100644
--- a/compilerplugins/clang/referencecasting.cxx
+++ b/compilerplugins/clang/referencecasting.cxx
@@ -10,9 +10,9 @@
  */
 #ifndef LO_CLANG_SHARED_PLUGINS
 
-#include "compat.hxx"
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include <iostream>
 
 /*
@@ -60,42 +60,83 @@ public:
 
     bool VisitCXXConstructExpr(const CXXConstructExpr* cce);
     bool VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce);
+    bool VisitCallExpr(const CallExpr*);
+    bool VisitInitListExpr(const InitListExpr*);
 
 private:
-    bool CheckForUnnecessaryGet(const Expr*);
+    bool CheckForUnnecessaryGet(const Expr*, bool includeRtlReference);
 };
 
-static const RecordType* extractTemplateType(const clang::Type*);
+static const RecordType* extractTemplateType(QualType);
 static bool isDerivedFrom(const CXXRecordDecl* subtypeRecord, const CXXRecordDecl* baseRecord);
 
+bool ReferenceCasting::VisitInitListExpr(const InitListExpr* ile)
+{
+    if (ignoreLocation(ile))
+        return true;
+    for (const Expr* expr : ile->inits())
+    {
+        if (CheckForUnnecessaryGet(expr, /*includeRtlReference*/ true))
+        {
+            report(DiagnosticsEngine::Warning, "unnecessary get() call", expr->getBeginLoc())
+                << expr->getSourceRange();
+            return true;
+        }
+    }
+    return true;
+}
 bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
 {
+    if (ignoreLocation(cce))
+        return true;
     // don't bother processing anything in the Reference.h file. Makes my life easier when debugging this.
-    StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(cce)));
+    StringRef aFileName
+        = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(cce->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.h"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.hxx"))
         return true;
 
+    if (cce->getNumArgs() == 0)
+        return true;
+
     // look for calls to the Reference<T>(x, UNO_something) constructor
     auto constructorClass = cce->getConstructor()->getParent();
-    if (!constructorClass->getIdentifier() || constructorClass->getName() != "Reference")
+    auto dc = loplugin::DeclCheck(constructorClass);
+    bool isUnoReference(dc.Class("Reference").Namespace("uno"));
+    bool isRtlReference(dc.Class("Reference").Namespace("rtl").GlobalNamespace());
+    if (!isUnoReference && !isRtlReference)
         return true;
 
-    if (cce->getNumArgs() != 2)
-        return true;
+    if (isUnoReference)
+        if (CheckForUnnecessaryGet(cce->getArg(0), /*includeRtlReference*/ cce->getNumArgs() == 1))
+        {
+            report(DiagnosticsEngine::Warning, "unnecessary get() call",
+                   cce->getArg(0)->getBeginLoc())
+                << cce->getArg(0)->getSourceRange();
+            return true;
+        }
+    if (isRtlReference && cce->getNumArgs() == 1)
+        if (CheckForUnnecessaryGet(cce->getArg(0), /*includeRtlReference*/ true))
+        {
+            report(DiagnosticsEngine::Warning, "unnecessary get() call",
+                   cce->getArg(0)->getBeginLoc())
+                << cce->getArg(0)->getSourceRange();
+            return true;
+        }
 
-    if (CheckForUnnecessaryGet(cce->getArg(0)))
-        report(DiagnosticsEngine::Warning, "unnecessary get() call", compat::getBeginLoc(cce))
-            << cce->getSourceRange();
+    if (isRtlReference)
+        return true;
+    if (isUnoReference && cce->getNumArgs() != 2)
+        return true;
 
-    // ignore the up-casting constructor
-    if (!isa<EnumType>(cce->getConstructor()->getParamDecl(1)->getType()))
+    // ignore the up-casting constructor, which has a std::enable_if second parameter
+    if (isUnoReference && cce->getNumArgs() == 2
+        && !cce->getConstructor()->getParamDecl(1)->getType()->isEnumeralType())
         return true;
 
     // extract the type parameter passed to the template
-    const RecordType* templateParamType = extractTemplateType(cce->getType().getTypePtr());
+    const RecordType* templateParamType = extractTemplateType(cce->getType());
     if (!templateParamType)
         return true;
 
@@ -105,17 +146,17 @@ bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
         return true;
 
     // drill down the expression tree till we hit the bottom, because at the top, the type is BaseReference
-    const clang::Type* argType;
+    QualType argType;
     for (;;)
     {
         if (auto castExpr = dyn_cast<CastExpr>(constructorArg0))
         {
-            constructorArg0 = castExpr->getSubExpr();
+            constructorArg0 = castExpr->getSubExprAsWritten();
             continue;
         }
         if (auto matTempExpr = dyn_cast<MaterializeTemporaryExpr>(constructorArg0))
         {
-            constructorArg0 = compat::getSubExpr(matTempExpr);
+            constructorArg0 = matTempExpr->getSubExpr();
             continue;
         }
         if (auto bindTempExpr = dyn_cast<CXXBindTemporaryExpr>(constructorArg0))
@@ -133,7 +174,16 @@ bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
             constructorArg0 = parenExpr->getSubExpr();
             continue;
         }
-        argType = constructorArg0->getType().getTypePtr();
+        // for the "uno::Reference<X>(*this, UNO_QUERY)" case
+        if (auto unaryOper = dyn_cast<UnaryOperator>(constructorArg0))
+        {
+            if (unaryOper->getOpcode() == UO_Deref)
+            {
+                constructorArg0 = unaryOper->getSubExpr();
+                continue;
+            }
+        }
+        argType = constructorArg0->getType();
         break;
     }
 
@@ -154,26 +204,27 @@ bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
     if (templateParamRD->getName() == "XShape")
         return true;
 
-    if (auto declRefExpr = dyn_cast<DeclRefExpr>(cce->getArg(1)))
-    {
-        // no warning expected, used to reject null references
-        if (auto enumConstantDecl = dyn_cast<EnumConstantDecl>(declRefExpr->getDecl()))
+    if (cce->getNumArgs() == 2)
+        if (auto declRefExpr = dyn_cast<DeclRefExpr>(cce->getArg(1)))
         {
-            if (enumConstantDecl->getName() == "UNO_SET_THROW")
-                return true;
-            if (enumConstantDecl->getName() == "UNO_QUERY_THROW")
-                return true;
-            if (enumConstantDecl->getName() == "SAL_NO_ACQUIRE")
-                return true;
+            // no warning expected, used to reject null references
+            if (auto enumConstantDecl = dyn_cast<EnumConstantDecl>(declRefExpr->getDecl()))
+            {
+                if (enumConstantDecl->getName() == "UNO_SET_THROW")
+                    return true;
+                if (enumConstantDecl->getName() == "UNO_QUERY_THROW")
+                    return true;
+                if (enumConstantDecl->getName() == "SAL_NO_ACQUIRE")
+                    return true;
+            }
         }
-    }
 
     if (constructorArgRD->Equals(templateParamRD)
         || isDerivedFrom(constructorArgRD, templateParamRD))
     {
         report(DiagnosticsEngine::Warning,
                "the source reference is already a subtype of the destination reference, just use =",
-               compat::getBeginLoc(cce))
+               cce->getBeginLoc())
             << cce->getSourceRange();
     }
     return true;
@@ -181,29 +232,38 @@ bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
 
 bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
 {
+    if (ignoreLocation(mce))
+        return true;
     // don't bother processing anything in the Reference.h file. Makes my life easier when debugging this.
-    StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(mce)));
+    StringRef aFileName
+        = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(mce->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.h"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.hxx"))
         return true;
 
+    if (mce->getNumArgs() == 0)
+        return true;
+
     // look for calls to the Reference<T>.set(x, UNO_QUERY) constructor
     auto method = mce->getMethodDecl();
     if (!method || !method->getIdentifier() || method->getName() != "set")
         return true;
-    if (mce->getNumArgs() != 2)
-        return true;
 
     auto methodRecordDecl = dyn_cast<ClassTemplateSpecializationDecl>(mce->getRecordDecl());
     if (!methodRecordDecl || !methodRecordDecl->getIdentifier()
         || methodRecordDecl->getName() != "Reference")
         return true;
 
-    if (CheckForUnnecessaryGet(mce->getArg(0)))
-        report(DiagnosticsEngine::Warning, "unnecessary get() call", compat::getBeginLoc(mce))
-            << mce->getSourceRange();
+    if (CheckForUnnecessaryGet(mce->getArg(0), /*includeRtlReference*/ mce->getNumArgs() == 1))
+    {
+        report(DiagnosticsEngine::Warning, "unnecessary get() call", mce->getArg(0)->getBeginLoc())
+            << mce->getArg(0)->getSourceRange();
+        return true;
+    }
+
+    if (mce->getNumArgs() != 2)
+        return true;
 
     // extract the type parameter passed to the template
     const RecordType* templateParamType
@@ -217,7 +277,7 @@ bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
         return true;
 
     // drill down the expression tree till we hit the bottom, because at the top, the type is BaseReference
-    const clang::Type* argType;
+    QualType argType;
     for (;;)
     {
         if (auto castExpr = dyn_cast<CastExpr>(arg0))
@@ -227,7 +287,7 @@ bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
         }
         if (auto matTempExpr = dyn_cast<MaterializeTemporaryExpr>(arg0))
         {
-            arg0 = compat::getSubExpr(matTempExpr);
+            arg0 = matTempExpr->getSubExpr();
             continue;
         }
         if (auto bindTempExpr = dyn_cast<CXXBindTemporaryExpr>(arg0))
@@ -245,7 +305,7 @@ bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
             arg0 = parenExpr->getSubExpr();
             continue;
         }
-        argType = arg0->getType().getTypePtr();
+        argType = arg0->getType();
         break;
     }
 
@@ -266,26 +326,126 @@ bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
     if (templateParamRD->getName() == "XShape")
         return true;
 
-    if (auto declRefExpr = dyn_cast<DeclRefExpr>(mce->getArg(1)))
+    if (mce->getNumArgs() == 2)
+        if (auto declRefExpr = dyn_cast<DeclRefExpr>(mce->getArg(1)))
+        {
+            // no warning expected, used to reject null references
+            if (auto enumConstantDecl = dyn_cast<EnumConstantDecl>(declRefExpr->getDecl()))
+            {
+                if (enumConstantDecl->getName() == "UNO_SET_THROW")
+                    return true;
+                if (enumConstantDecl->getName() == "UNO_QUERY_THROW")
+                    return true;
+                if (enumConstantDecl->getName() == "SAL_NO_ACQUIRE")
+                    return true;
+            }
+        }
+
+    if (methodArgRD->Equals(templateParamRD) || isDerivedFrom(methodArgRD, templateParamRD))
+    {
+        report(DiagnosticsEngine::Warning,
+               "the source reference is already a subtype of the destination reference, just use =",
+               mce->getBeginLoc())
+            << mce->getSourceRange();
+    }
+    return true;
+}
+
+bool ReferenceCasting::VisitCallExpr(const CallExpr* ce)
+{
+    if (ignoreLocation(ce))
+        return true;
+    // don't bother processing anything in the Reference.h file. Makes my life easier when debugging this.
+    StringRef aFileName
+        = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(ce->getBeginLoc()));
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.h"))
+        return true;
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Reference.hxx"))
+        return true;
+
+    // look for calls to Reference<T>::query(x)
+    auto method = dyn_cast_or_null<CXXMethodDecl>(ce->getDirectCallee());
+    if (!method || !method->getIdentifier() || method->getName() != "query")
+        return true;
+    if (ce->getNumArgs() != 1)
+        return true;
+
+    auto methodRecordDecl = dyn_cast<ClassTemplateSpecializationDecl>(method->getParent());
+    if (!methodRecordDecl || !methodRecordDecl->getIdentifier()
+        || methodRecordDecl->getName() != "Reference")
+        return true;
+
+    if (CheckForUnnecessaryGet(ce->getArg(0), /*includeRtlReference*/ true))
+        report(DiagnosticsEngine::Warning, "unnecessary get() call", ce->getArg(0)->getBeginLoc())
+            << ce->getArg(0)->getSourceRange();
+
+    // extract the type parameter passed to the template
+    const RecordType* templateParamType
+        = dyn_cast<RecordType>(methodRecordDecl->getTemplateArgs()[0].getAsType());
+    if (!templateParamType)
+        return true;
+
+    // extract the type of the first parameter passed to the method
+    const Expr* arg0 = ce->getArg(0);
+    if (!arg0)
+        return true;
+
+    // drill down the expression tree till we hit the bottom, because at the top, the type is BaseReference
+    QualType argType;
+    for (;;)
     {
-        // no warning expected, used to reject null references
-        if (auto enumConstantDecl = dyn_cast<EnumConstantDecl>(declRefExpr->getDecl()))
+        if (auto castExpr = dyn_cast<CastExpr>(arg0))
         {
-            if (enumConstantDecl->getName() == "UNO_SET_THROW")
-                return true;
-            if (enumConstantDecl->getName() == "UNO_QUERY_THROW")
-                return true;
-            if (enumConstantDecl->getName() == "SAL_NO_ACQUIRE")
-                return true;
+            arg0 = castExpr->getSubExpr();
+            continue;
         }
+        if (auto matTempExpr = dyn_cast<MaterializeTemporaryExpr>(arg0))
+        {
+            arg0 = matTempExpr->getSubExpr();
+            continue;
+        }
+        if (auto bindTempExpr = dyn_cast<CXXBindTemporaryExpr>(arg0))
+        {
+            arg0 = bindTempExpr->getSubExpr();
+            continue;
+        }
+        if (auto tempObjExpr = dyn_cast<CXXTemporaryObjectExpr>(arg0))
+        {
+            arg0 = tempObjExpr->getArg(0);
+            continue;
+        }
+        if (auto parenExpr = dyn_cast<ParenExpr>(arg0))
+        {
+            arg0 = parenExpr->getSubExpr();
+            continue;
+        }
+        argType = arg0->getType();
+        break;
     }
 
+    const RecordType* argTemplateType = extractTemplateType(argType);
+    if (!argTemplateType)
+        return true;
+
+    CXXRecordDecl* templateParamRD = dyn_cast<CXXRecordDecl>(templateParamType->getDecl());
+    CXXRecordDecl* methodArgRD = dyn_cast<CXXRecordDecl>(argTemplateType->getDecl());
+
+    // querying for XInterface (instead of doing an upcast) has special semantics,
+    // to check for UNO object equivalence.
+    if (templateParamRD->getName() == "XInterface")
+        return true;
+
+    // XShape is used in UNO aggregates in very "entertaining" ways, which means an UNO_QUERY
+    // can return a completely different object, e.g. see SwXShape::queryInterface
+    if (templateParamRD->getName() == "XShape")
+        return true;
+
     if (methodArgRD->Equals(templateParamRD) || isDerivedFrom(methodArgRD, templateParamRD))
     {
         report(DiagnosticsEngine::Warning,
                "the source reference is already a subtype of the destination reference, just use =",
-               compat::getBeginLoc(mce))
-            << mce->getSourceRange();
+               ce->getBeginLoc())
+            << ce->getSourceRange();
     }
     return true;
 }
@@ -295,7 +455,7 @@ bool ReferenceCasting::VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce)
         Reference<T>(x.get(), UNO_QUERY)
     because sometimes simplifying that means the main purpose of this plugin can kick in.
  */
-bool ReferenceCasting::CheckForUnnecessaryGet(const Expr* expr)
+bool ReferenceCasting::CheckForUnnecessaryGet(const Expr* expr, bool includeRtlReference)
 {
     expr = expr->IgnoreImplicit();
     auto cxxMemberCallExpr = dyn_cast<CXXMemberCallExpr>(expr);
@@ -309,18 +469,23 @@ bool ReferenceCasting::CheckForUnnecessaryGet(const Expr* expr)
 
     if (!loplugin::TypeCheck(expr->getType()).Pointer())
         return false;
-    if (!loplugin::DeclCheck(methodDecl->getParent()).Class("Reference").Namespace("uno"))
+    auto dc = loplugin::DeclCheck(methodDecl->getParent());
+    if (dc.Class("Reference").Namespace("uno"))
+        ; // ok
+    else if (includeRtlReference && dc.Class("Reference").Namespace("rtl"))
+        ; // ok
+    else
         return false;
 
-    StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+    StringRef aFileName
+        = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/cppu/qa/test_reference.cxx"))
         return false;
 
     return true;
 }
 
-static const RecordType* extractTemplateType(const clang::Type* cceType)
+static const RecordType* extractTemplateType(QualType cceType)
 {
     // check for passing raw pointer to interface case
     if (cceType->isPointerType())
@@ -328,6 +493,8 @@ static const RecordType* extractTemplateType(const clang::Type* cceType)
         auto pointeeType = cceType->getPointeeType();
         if (auto elaboratedType = dyn_cast<ElaboratedType>(pointeeType))
             pointeeType = elaboratedType->desugar();
+        if (auto substTemplateTypeParmType = dyn_cast<SubstTemplateTypeParmType>(pointeeType))
+            pointeeType = substTemplateTypeParmType->desugar();
         if (auto recordType = dyn_cast<RecordType>(pointeeType))
             return recordType;
     }
@@ -335,7 +502,7 @@ static const RecordType* extractTemplateType(const clang::Type* cceType)
     // extract Foo from Reference<Foo>
     if (auto subst = dyn_cast<SubstTemplateTypeParmType>(cceType))
     {
-        if (auto recType = dyn_cast<RecordType>(subst->desugar().getTypePtr()))
+        if (auto recType = dyn_cast<RecordType>(subst->desugar()))
         {
             if (auto ctsd = dyn_cast<ClassTemplateSpecializationDecl>(recType->getDecl()))
             {
@@ -347,16 +514,17 @@ static const RecordType* extractTemplateType(const clang::Type* cceType)
     }
 
     if (auto elaboratedType = dyn_cast<ElaboratedType>(cceType))
-        cceType = elaboratedType->desugar().getTypePtr();
+        cceType = elaboratedType->desugar();
     auto cceTST = dyn_cast<TemplateSpecializationType>(cceType);
     if (!cceTST)
         return NULL;
-    if (cceTST->getNumArgs() != 1)
+    auto const args = cceTST->template_arguments();
+    if (args.size() != 1)
         return NULL;
-    const TemplateArgument& cceTA = cceTST->getArg(0);
-    const clang::Type* templateParamType = cceTA.getAsType().getTypePtr();
+    const TemplateArgument& cceTA = args[0];
+    QualType templateParamType = cceTA.getAsType();
     if (auto elaboratedType = dyn_cast<ElaboratedType>(templateParamType))
-        templateParamType = elaboratedType->desugar().getTypePtr();
+        templateParamType = elaboratedType->desugar();
     return dyn_cast<RecordType>(templateParamType);
 }
 
diff --git a/compilerplugins/clang/rendercontext.cxx b/compilerplugins/clang/rendercontext.cxx
index 8a4e8bd69a9c..2508b449e8eb 100644
--- a/compilerplugins/clang/rendercontext.cxx
+++ b/compilerplugins/clang/rendercontext.cxx
@@ -121,7 +121,7 @@ bool RenderContext::VisitCXXMemberCallExpr(const CXXMemberCallExpr* pCXXMemberCa
     report(
         DiagnosticsEngine::Warning,
         "Should be calling OutputDevice method through RenderContext.",
-        compat::getBeginLoc(pCXXMemberCallExpr))
+        pCXXMemberCallExpr->getBeginLoc())
             << pCXXMemberCallExpr->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/reservedid.cxx b/compilerplugins/clang/reservedid.cxx
index 3f019a10d830..8fad7739065a 100644
--- a/compilerplugins/clang/reservedid.cxx
+++ b/compilerplugins/clang/reservedid.cxx
@@ -17,6 +17,9 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -31,7 +34,7 @@ bool isJniFunction(NamedDecl const * decl) {
         return false;
     }
     auto const id = decl->getIdentifier();
-    return id != nullptr && id->getName().startswith("Java_");
+    return id != nullptr && compat::starts_with(id->getName(), "Java_");
 }
 
 class ReservedId:
@@ -74,6 +77,7 @@ void ReservedId::postRun() {
                     // extensions/source/activex/StdAfx2.h
                 && id != "_ATL_STATIC_REGISTRY"
                     // extensions/source/activex/StdAfx2.h
+                && id != "_CRT_RAND_S" // sal/osl/w32/random.cxx
                 && id != "_GLIBCXX_CDTOR_CALLABI"
                 && id != "_HAS_AUTO_PTR_ETC" // unotools/source/i18n/resmgr.cxx
                 && id != "_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" // unotools/source/i18n/resmgr.cxx
@@ -110,16 +114,14 @@ void ReservedId::postRun() {
                 for (;;) {
                     if (d->getKind() == MacroDirective::MD_Define) {
                         auto loc = d->getLocation();
-                        if (loc.isValid() && !ignoreLocation(loc)) {
+                        if (loc.isValid() && !ignoreLocation(loc) && !suppressWarningAt(loc)) {
                             auto file = getFilenameOfLocation(loc);
-                            if (!loplugin::isSamePathname(
+                            if (!loplugin::isSameUnoIncludePathname(
                                     file,
-                                    SRCDIR
-                                        "/include/cppuhelper/implbase_ex_post.hxx")
-                                && !loplugin::isSamePathname(
+                                    "cppuhelper/implbase_ex_post.hxx")
+                                && !loplugin::isSameUnoIncludePathname(
                                     file,
-                                    SRCDIR
-                                        "/include/cppuhelper/implbase_ex_pre.hxx"))
+                                    "cppuhelper/implbase_ex_pre.hxx"))
                             {
                                 report(
                                     DiagnosticsEngine::Warning,
@@ -145,7 +147,7 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
     }
     auto filename = getFilenameOfLocation(spelLoc);
     if (loplugin::hasPathnamePrefix(filename, SRCDIR "/bridges/source/cpp_uno/")
-        && (filename.endswith("abi.hxx") || filename.endswith("share.hxx")))
+        && (compat::ends_with(filename, "abi.hxx") || compat::ends_with(filename, "share.hxx")))
     {
         return true;
     }
@@ -168,8 +170,8 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
                 // vcl/source/window/cairo_cairo.cxx -> include/vcl/sysdata.hxx
             && s != "__CxxDetectRethrow"
                 // bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
-            && s != "__GLXcontextRec" // vcl/unx/glxtest.cxx
-            && s != "__GLXFBConfigRec" // vcl/unx/glxtest.cxx
+            && s != "__ImageBase"
+                // bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx, MS linker magic
             && s != "__PK11_GetKeyData"
                 // xmlsecurity/source/xmlsec/nss/nssrenam.h
             && s != "__current_exception" // bridges/inc/except.hxx, Windows
@@ -197,6 +199,8 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
                 // connectivity/source/inc/ado/Awrapadox.hxx, MS SDK adoctint.h
             && s != "_ADOUser"
                 // connectivity/source/inc/ado/Awrapadox.hxx, MS SDK adoctint.h
+            && s != "_CustomCellRenderer" // vcl/unx/gtk3/customcellrenderer.hxx
+            && s != "_CustomCellRendererClass" // vcl/unx/gtk3/customcellrenderer.cxx
             && s != "_FcPattern" // vcl/inc/unx/fc_fontoptions.hxx
             && s != "_GdkDisplay"
                 // vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
@@ -206,9 +210,18 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
                 // vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
             && s != "_GstVideoOverlay"
                 // avmedia/source/gstreamer/gstplayer.hxx
+            && s != "_GtkMediaStream"
+                // avmedia/source/gtk/gtkplayer.hxx
+            && s != "_GtkWidget"
+                // avmedia/source/gtk/gtkplayer.hxx
             && s != "_Module" // extensions/source/activex/StdAfx2.h, CComModule
-            && s != "_XRegion" // vcl/unx/generic/gdi/x11cairotextrender.cxx
-            && s != "_XTrap") // vcl/unx/generic/gdi/xrender_peer.hxx
+            && s != "_NotifyingLayout" // vcl/unx/gtk4/notifyinglayout.cxx
+            && s != "_SurfacePaintable" // vcl/unx/gtk3/gtkinst.cxx
+            && s != "_SurfacePaintableClass" // vcl/unx/gtk3/gtkinst.cxx
+            && s != "_SurfaceCellRenderer" // vcl/unx/gtk4/surfacecellrenderer.cxx
+            && s != "_SurfaceCellRendererClass" // vcl/unx/gtk4/surfacecellrenderer.cxx
+            && s != "_TransferableContent" // vcl/unx/gtk4/transferableprovider.cxx
+            && s != "_TransferableContentClass") // vcl/unx/gtk4/transferableprovider.cxx
         {
             report(
                 DiagnosticsEngine::Warning,
diff --git a/compilerplugins/clang/returnconstant.cxx b/compilerplugins/clang/returnconstant.cxx
index c2c0442bf63d..530044c9609d 100644
--- a/compilerplugins/clang/returnconstant.cxx
+++ b/compilerplugins/clang/returnconstant.cxx
@@ -44,11 +44,11 @@ public:
                 continue;
             report(DiagnosticsEngine::Warning,
                    "Method only returns a single constant value %0, does it make sense?",
-                   compat::getBeginLoc(functionDecl))
+                   functionDecl->getBeginLoc())
                 << pair.second << functionDecl->getSourceRange();
             if (functionDecl != functionDecl->getCanonicalDecl())
                 report(DiagnosticsEngine::Note, "decl here",
-                       compat::getBeginLoc(functionDecl->getCanonicalDecl()))
+                       functionDecl->getCanonicalDecl()->getBeginLoc())
                     << functionDecl->getCanonicalDecl()->getSourceRange();
         }
     }
@@ -118,12 +118,11 @@ bool ReturnConstant::TraverseCXXMethodDecl(CXXMethodDecl* functionDecl)
         return true;
 
     // ignore LINK macro stuff
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(functionDecl))
-        || compiler.getSourceManager().isMacroArgExpansion(compat::getBeginLoc(functionDecl)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(functionDecl->getBeginLoc())
+        || compiler.getSourceManager().isMacroArgExpansion(functionDecl->getBeginLoc()))
     {
-        StringRef name{ Lexer::getImmediateMacroName(compat::getBeginLoc(functionDecl),
-                                                     compiler.getSourceManager(),
-                                                     compiler.getLangOpts()) };
+        StringRef name{ Lexer::getImmediateMacroName(
+            functionDecl->getBeginLoc(), compiler.getSourceManager(), compiler.getLangOpts()) };
         if (name.find("IMPL_LINK") != StringRef::npos
             || name.find("IMPL_STATIC_LINK") != StringRef::npos
             || name.find("DECL_LINK") != StringRef::npos
@@ -186,7 +185,7 @@ std::string ReturnConstant::getExprValue(Expr const* arg)
     APSInt x1;
     if (compat::EvaluateAsInt(arg, x1, compiler.getASTContext()))
     {
-        return x1.toString(10);
+        return compat::toString(x1, 10);
     }
     if (isa<CXXNullPtrLiteralExpr>(arg))
     {
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index a3f5678a3918..c6b8da579c57 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -152,7 +152,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
     if (!bCanonicalDeclIsSalCall)
         return true;
 
-    if (!decl->isThisDeclarationADefinition() && !(methodDecl && methodDecl->isPure()))
+    if (!decl->isThisDeclarationADefinition() && !(methodDecl && compat::isPureVirtual(methodDecl)))
         return true;
 
     m_decls.insert(decl);
@@ -323,7 +323,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         // qualified names this will point after the qualifiers, but needlessly including those in
         // the search should be harmless---modulo issues with using "SAL_CALL" as the name of a
         // function-like macro parameter as discussed below):
-        endLoc = compat::getBeginLoc(functionDecl->getNameInfo());
+        endLoc = functionDecl->getNameInfo().getBeginLoc();
         while (SM.isMacroArgExpansion(endLoc, &endLoc))
         {
         }
@@ -371,7 +371,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
             assert(SM.isMacroBodyExpansion(startLoc));
             auto const startLoc2 = compat::getImmediateExpansionRange(SM, startLoc).second;
             auto name = Lexer::getImmediateMacroName(startLoc, SM, compiler.getLangOpts());
-            while (name.startswith("\\\n"))
+            while (compat::starts_with(name, "\\\n"))
             {
                 name = name.drop_front(2);
                 while (!name.empty()
@@ -391,7 +391,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
             endLoc1 = Lexer::getLocForEndOfToken(endLoc1, 0, SM, compiler.getLangOpts());
             startLoc = Lexer::getLocForEndOfToken(SM.getSpellingLoc(startLoc), 0, SM,
                                                   compiler.getLangOpts());
-            if (!compat::isPointWithin(SM, endLoc, startLoc, endLoc1))
+            if (!SM.isPointWithin(endLoc, startLoc, endLoc1))
             {
                 ranges.emplace_back(startLoc, endLoc1);
                 startLoc = Lexer::getLocForEndOfToken(SM.getSpellingLoc(startLoc2), 0, SM,
@@ -404,7 +404,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         // Stop searching for "SAL_CALL" at the start of the function declaration's name (for
         // qualified names this will point after the qualifiers, but needlessly including those in
         // the search should be harmless):
-        endLoc = compat::getBeginLoc(functionDecl->getNameInfo());
+        endLoc = functionDecl->getNameInfo().getBeginLoc();
         while (endLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(endLoc, &endLoc))
         {
         }
@@ -413,7 +413,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         if (SM.isMacroBodyExpansion(endLoc))
         {
             auto name = Lexer::getImmediateMacroName(endLoc, SM, compiler.getLangOpts());
-            while (name.startswith("\\\n"))
+            while (compat::starts_with(name, "\\\n"))
             {
                 name = name.drop_front(2);
                 while (!name.empty()
@@ -447,8 +447,8 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         startLoc = functionDecl->getSourceRange().getBegin();
         while (startLoc.isMacroID()
                && !(macroRange.isValid()
-                    && compat::isPointWithin(SM, SM.getSpellingLoc(startLoc), macroRange.getBegin(),
-                                             macroRange.getEnd()))
+                    && SM.isPointWithin(SM.getSpellingLoc(startLoc), macroRange.getBegin(),
+                                        macroRange.getEnd()))
                && SM.isAtStartOfImmediateMacroExpansion(startLoc, &startLoc))
         {
         }
@@ -459,7 +459,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
 
 #if defined _WIN32
         if (macroRange.isValid()
-            && !compat::isPointWithin(SM, startLoc, macroRange.getBegin(), macroRange.getEnd()))
+            && !SM.isPointWithin(startLoc, macroRange.getBegin(), macroRange.getEnd()))
         {
             // endLoc is within a macro body but startLoc is not; two source ranges, first is from
             // startLoc to the macro invocation, second is the leading part of the corresponding
@@ -477,9 +477,11 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         if (noReturnType
             && !(functionDecl->isVirtualAsWritten()
                  || (isa<CXXConstructorDecl>(functionDecl)
-                     && compat::isExplicitSpecified(cast<CXXConstructorDecl>(functionDecl)))
+                     && cast<CXXConstructorDecl>(functionDecl)->getExplicitSpecifier().isExplicit())
                  || (isa<CXXConversionDecl>(functionDecl)
-                     && compat::isExplicitSpecified(cast<CXXConversionDecl>(functionDecl)))))
+                     && cast<CXXConversionDecl>(functionDecl)
+                            ->getExplicitSpecifier()
+                            .isExplicit())))
         {
             SourceLocation endLoc1;
             if (macroStartLoc.isMacroID()
@@ -504,8 +506,8 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
                     // in the first line and include the intervening spaces and (part of? looks like an
                     // error in Clang) "barbaz", so just skip any tokens starting with backslash-newline
                     // when looking backwards here, without even trying to look at their content:
-                    if (!(s.empty() || s.startswith("/*") || s.startswith("//")
-                          || s.startswith("\\\n")))
+                    if (!(s.empty() || compat::starts_with(s, "/*") || compat::starts_with(s, "//")
+                          || compat::starts_with(s, "\\\n")))
                     {
                         break;
                     }
@@ -530,8 +532,8 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
                     // in the first line and include the intervening spaces and (part of? looks like an
                     // error in Clang) "barbaz", so just skip any tokens starting with backslash-newline
                     // when looking backwards here, without even trying to look at their content:
-                    if (!(s.empty() || s.startswith("/*") || s.startswith("//")
-                          || s.startswith("\\\n")))
+                    if (!(s.empty() || compat::starts_with(s, "/*") || compat::starts_with(s, "//")
+                          || compat::starts_with(s, "\\\n")))
                     {
                         break;
                     }
@@ -566,7 +568,7 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
         {
             unsigned n = Lexer::MeasureTokenLength(loc, SM, compiler.getLangOpts());
             auto s = StringRef(compiler.getSourceManager().getCharacterData(loc), n);
-            while (s.startswith("\\\n"))
+            while (compat::starts_with(s, "\\\n"))
             {
                 s = s.drop_front(2);
                 while (!s.empty()
diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx
index bb256c6d7431..f20c7f347e2f 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -109,18 +109,18 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
     // from the same macro should be the same).
     if( kind == LogCallKind::Sal )
         {
-        SourceLocation expansionLocation = compiler.getSourceManager().getExpansionLoc( compat::getBeginLoc(call));
+        SourceLocation expansionLocation = compiler.getSourceManager().getExpansionLoc( call->getBeginLoc());
         if( expansionLocation == lastSalDetailLogStreamMacro )
             return true;
         lastSalDetailLogStreamMacro = expansionLocation;
         };
     if( const clang::StringLiteral* area = dyn_cast< clang::StringLiteral >( call->getArg( areaArgIndex )->IgnoreParenImpCasts()))
         {
-        if( area->getKind() == clang::StringLiteral::Ascii )
+        if( compat::isOrdinary(area) )
             checkArea( area->getBytes(), area->getExprLoc());
         else
             report( DiagnosticsEngine::Warning, "unsupported string literal kind (plugin needs fixing?)",
-                compat::getBeginLoc(area));
+                area->getBeginLoc());
         return true;
         }
     if( loplugin::DeclCheck(inFunction).Function("log").Namespace("detail").Namespace("sal").GlobalNamespace()
@@ -132,7 +132,7 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
         Expr::NPC_ValueDependentIsNotNull ) != Expr::NPCK_NotNull )
         { // If the area argument is a null pointer, that is allowed only for SAL_DEBUG.
         const SourceManager& source = compiler.getSourceManager();
-        for( SourceLocation loc = compat::getBeginLoc(call);
+        for( SourceLocation loc = call->getBeginLoc();
              loc.isMacroID();
              loc = compat::getImmediateExpansionRange(source, loc ).first )
             {
@@ -141,11 +141,11 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
                 return true; // ok
             }
         report( DiagnosticsEngine::Warning, "missing log area",
-            compat::getBeginLoc(call->getArg( 1 )->IgnoreParenImpCasts()));
+            call->getArg( 1 )->IgnoreParenImpCasts()->getBeginLoc());
         return true;
         }
     report( DiagnosticsEngine::Warning, "cannot analyse log area argument (plugin needs fixing?)",
-        compat::getBeginLoc(call));
+        call->getBeginLoc());
     return true;
     }
 
diff --git a/compilerplugins/clang/salunicodeliteral.cxx b/compilerplugins/clang/salunicodeliteral.cxx
index 4c2a00669ab0..0a8eeea4885b 100644
--- a/compilerplugins/clang/salunicodeliteral.cxx
+++ b/compilerplugins/clang/salunicodeliteral.cxx
@@ -9,13 +9,14 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
 
 bool isAsciiCharacterLiteral(Expr const * expr) {
     if (auto const e = dyn_cast<CharacterLiteral>(expr)) {
-        return e->getKind() == CharacterLiteral::Ascii;
+        return e->getKind() == compat::CharacterLiteralKind::Ascii;
     }
     return false;
 }
@@ -74,7 +75,7 @@ private:
             t = tt->desugar();
         }
         auto const e1 = expr->getSubExprAsWritten();
-        auto const loc = compat::getBeginLoc(e1);
+        auto const loc = e1->getBeginLoc();
         if (loc.isMacroID()
             && compiler.getSourceManager().isAtStartOfImmediateMacroExpansion(
                 loc))
diff --git a/compilerplugins/clang/selfinit.cxx b/compilerplugins/clang/selfinit.cxx
index 35ce37278f2a..3891a5fc724f 100644
--- a/compilerplugins/clang/selfinit.cxx
+++ b/compilerplugins/clang/selfinit.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifndef LO_CLANG_SHARED_PLUGINS
+
 #include <vector>
 
 #include "plugin.hxx"
@@ -24,28 +26,45 @@ public:
     {
     }
 
-    bool TraverseVarDecl(VarDecl* decl)
+    bool PreTraverseVarDecl(VarDecl* decl)
     {
         decls_.push_back({ decl, decl->getCanonicalDecl() });
-        auto const ret = FilteringPlugin::TraverseVarDecl(decl);
+        return true;
+    }
+    bool PostTraverseVarDecl(VarDecl*, bool)
+    {
         decls_.pop_back();
+        return true;
+    }
+    bool TraverseVarDecl(VarDecl* decl)
+    {
+        PreTraverseVarDecl(decl);
+        auto const ret = FilteringPlugin::TraverseVarDecl(decl);
+        PostTraverseVarDecl(decl, ret);
         return ret;
     }
 
-    bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr* expr)
+    bool PreTraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr* expr)
     {
         if (expr->getKind() == UETT_SizeOf)
-        {
-            return true;
-        }
-        return FilteringPlugin::TraverseUnaryExprOrTypeTraitExpr(expr);
+            return false;
+        return true;
+    }
+    bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr* expr)
+    {
+        if (PreTraverseUnaryExprOrTypeTraitExpr(expr))
+            return FilteringPlugin::TraverseUnaryExprOrTypeTraitExpr(expr);
+        return true;
     }
 
-    bool TraverseCXXTypeidExpr(CXXTypeidExpr const*) { return true; }
+    bool TraverseCXXTypeidExpr(CXXTypeidExpr*) { return true; }
+    bool PreTraverseCXXTypeidExpr(CXXTypeidExpr*) { return false; }
 
-    bool TraverseCXXNoexceptExpr(CXXNoexceptExpr const*) { return true; }
+    bool TraverseCXXNoexceptExpr(CXXNoexceptExpr*) { return true; }
+    bool PreTraverseCXXNoexceptExpr(CXXNoexceptExpr*) { return false; }
 
     bool TraverseDecltypeTypeLoc(DecltypeTypeLoc) { return true; }
+    bool PreTraverseDecltypeTypeLoc(DecltypeTypeLoc) { return false; }
 
     bool VisitDeclRefExpr(DeclRefExpr const* expr)
     {
@@ -82,7 +101,9 @@ private:
     std::vector<Decl> decls_;
 };
 
-loplugin::Plugin::Registration<SelfInit> X("selfinit");
+loplugin::Plugin::Registration<SelfInit> selfinit("selfinit");
 }
 
+#endif // LO_CLANG_SHARED_PLUGINS
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/sequenceloop.cxx b/compilerplugins/clang/sequenceloop.cxx
deleted file mode 100644
index 7f14d6c4d951..000000000000
--- a/compilerplugins/clang/sequenceloop.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- 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 LO_CLANG_SHARED_PLUGINS
-
-#include <cassert>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <set>
-
-#include <clang/AST/CXXInheritance.h>
-#include "plugin.hxx"
-#include "check.hxx"
-
-/**
-  When used in "for" loops, css::uno::Sequence objects tend to end up calling the non-const begin()/end(),
-  which is considerably more expensive than the const variants because it forces a local copy
-  of the internal ref-counted impl object.
-*/
-
-namespace
-{
-class SequenceLoop : public loplugin::FilteringPlugin<SequenceLoop>
-{
-public:
-    explicit SequenceLoop(loplugin::InstantiationData const& data)
-        : FilteringPlugin(data)
-    {
-    }
-
-    virtual void run() override
-    {
-        if (preRun())
-            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-    }
-
-    bool VisitCXXForRangeStmt(CXXForRangeStmt const*);
-};
-
-bool SequenceLoop::VisitCXXForRangeStmt(CXXForRangeStmt const* forStmt)
-{
-    if (ignoreLocation(forStmt))
-        return true;
-
-    auto tc = loplugin::TypeCheck(forStmt->getRangeInit()->getType());
-    if (tc.Const())
-        return true;
-    if (!tc.Class("Sequence")
-             .Namespace("uno")
-             .Namespace("star")
-             .Namespace("sun")
-             .Namespace("com")
-             .GlobalNamespace())
-        return true;
-    const VarDecl* varDecl = forStmt->getLoopVariable();
-    auto tc2 = loplugin::TypeCheck(varDecl->getType());
-    if (!tc2.LvalueReference().Const())
-        return true;
-
-    report(DiagnosticsEngine::Warning,
-           ("use std::as_const, or otherwise make the for-range-initializer expression const, to"
-            " avoid creating a copy of the Sequence"),
-           compat::getBeginLoc(forStmt->getRangeInit()))
-        << forStmt->getSourceRange();
-    return true;
-}
-
-loplugin::Plugin::Registration<SequenceLoop> sequenceloop("sequenceloop");
-
-} // namespace
-
-#endif // LO_CLANG_SHARED_PLUGINS
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/sfxpoolitem.cxx b/compilerplugins/clang/sfxpoolitem.cxx
index 31d7dbc13c24..79ef64dd243e 100644
--- a/compilerplugins/clang/sfxpoolitem.cxx
+++ b/compilerplugins/clang/sfxpoolitem.cxx
@@ -93,7 +93,7 @@ bool SfxPoolItem::VisitCXXRecordDecl(const CXXRecordDecl* decl)
     if (ignoreLocation(decl)) {
        return true;
     }
-    if (!decl->hasDefinition()) {
+    if (!decl->isThisDeclarationADefinition()) {
        return true;
     }
     // check if this class is derived from Window
@@ -119,7 +119,7 @@ bool SfxPoolItem::VisitCXXRecordDecl(const CXXRecordDecl* decl)
     report(
             DiagnosticsEngine::Warning,
             "SfxPoolItem subclass %0 declares new fields, but does not override operator==",
-            compat::getBeginLoc(decl))
+            decl->getBeginLoc())
         << decl->getQualifiedNameAsString() << decl->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/sharedvisitor/analyzer.cxx b/compilerplugins/clang/sharedvisitor/analyzer.cxx
index ea519abb0d95..a23f0a16d01e 100644
--- a/compilerplugins/clang/sharedvisitor/analyzer.cxx
+++ b/compilerplugins/clang/sharedvisitor/analyzer.cxx
@@ -25,8 +25,7 @@
 #include "config_clang.h"
 #include "../check.hxx"
 #include "../check.cxx"
-
-using namespace std;
+#include "../compat.hxx"
 
 using namespace clang;
 using namespace llvm;
@@ -36,8 +35,8 @@ using namespace loplugin;
 // Info about a Traverse* function in a plugin.
 struct TraverseFunctionInfo
 {
-    string name;
-    string argument;
+    std::string name;
+    std::string argument;
     bool hasPre = false;
     bool hasPost = false;
 };
@@ -50,7 +49,7 @@ struct TraverseFunctionInfoLess
     }
 };
 
-static set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
+static std::set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
 
 class CheckFileVisitor
     : public RecursiveASTVisitor< CheckFileVisitor >
@@ -100,7 +99,7 @@ static TraverseFunctionInfo findOrCreateTraverseFunctionInfo( StringRef name )
     auto foundInfo = traverseFunctions.find( info );
     if( foundInfo != traverseFunctions.end())
     {
-        info = move( *foundInfo );
+        info = std::move( *foundInfo );
         traverseFunctions.erase( foundInfo );
     }
     return info;
@@ -116,10 +115,10 @@ bool CheckFileVisitor::VisitCXXRecordDecl( CXXRecordDecl* decl )
     if( decl->getName() == "FilteringPlugin" || decl->getName() == "FilteringRewritePlugin" )
         return true;
 
-    cout << "# This file is autogenerated. Do not modify." << endl;
-    cout << "# Generated by compilerplugins/clang/sharedvisitor/analyzer.cxx ." << endl;
-    cout << "InfoVersion:1" << endl;
-    cout << "ClassName:" << decl->getName().str() << endl;
+    std::cout << "# This file is autogenerated. Do not modify." << std::endl;
+    std::cout << "# Generated by compilerplugins/clang/sharedvisitor/analyzer.cxx ." << std::endl;
+    std::cout << "InfoVersion:1" << std::endl;
+    std::cout << "ClassName:" << decl->getName().str() << std::endl;
     traverseFunctions.clear();
     for( const CXXMethodDecl* method : decl->methods())
     {
@@ -127,75 +126,75 @@ bool CheckFileVisitor::VisitCXXRecordDecl( CXXRecordDecl* decl )
             continue;
         if( method->isStatic() || method->getAccess() != AS_public )
             continue;
-        if( method->getName().startswith( "Visit" ))
+        if( compat::starts_with(method->getName(), "Visit" ))
         {
             if( method->getNumParams() == 1 )
             {
-                cout << "VisitFunctionStart" << endl;
-                cout << "VisitFunctionName:" << method->getName().str() << endl;
-                cout << "VisitFunctionArgument:"
+                std::cout << "VisitFunctionStart" << std::endl;
+                std::cout << "VisitFunctionName:" << method->getName().str() << std::endl;
+                std::cout << "VisitFunctionArgument:"
                     << unqualifyPointeeType(
                         method->getParamDecl( 0 )->getTypeSourceInfo()->getType()).getAsString()
-                    << endl;
-                cout << "VisitFunctionEnd" << endl;
+                    << std::endl;
+                std::cout << "VisitFunctionEnd" << std::endl;
             }
             else
             {
-                cerr << "Unhandled Visit* function: " << decl->getName().str()
-                     << "::" << method->getName().str() << endl;
+                std::cerr << "Unhandled Visit* function: " << decl->getName().str()
+                     << "::" << method->getName().str() << std::endl;
                 abort();
             }
         }
-        else if( method->getName().startswith( "Traverse" ))
+        else if( compat::starts_with(method->getName(), "Traverse" ))
         {
             if( method->getNumParams() == 1 )
             {
                 TraverseFunctionInfo traverseInfo = findOrCreateTraverseFunctionInfo( method->getName());
                 traverseInfo.argument = method->getParamDecl( 0 )->getTypeSourceInfo()->getType().getAsString();
-                traverseFunctions.insert( move( traverseInfo ));
+                traverseFunctions.insert( std::move( traverseInfo ));
             }
             else
             {
-                cerr << "Unhandled Traverse* function: " << decl->getName().str()
-                     << "::" << method->getName().str() << endl;
+                std::cerr << "Unhandled Traverse* function: " << decl->getName().str()
+                     << "::" << method->getName().str() << std::endl;
                 abort();
             }
         }
-        else if( method->getName().startswith( "PreTraverse" ))
+        else if( compat::starts_with(method->getName(), "PreTraverse" ))
         {
             TraverseFunctionInfo traverseInfo = findOrCreateTraverseFunctionInfo( method->getName().substr( 3 ));
             traverseInfo.hasPre = true;
-            traverseFunctions.insert( move( traverseInfo ));
+            traverseFunctions.insert( std::move( traverseInfo ));
         }
-        else if( method->getName().startswith( "PostTraverse" ))
+        else if( compat::starts_with(method->getName(), "PostTraverse" ))
         {
                 TraverseFunctionInfo traverseInfo = findOrCreateTraverseFunctionInfo( method->getName().substr( 4 ));
                 traverseInfo.hasPost = true;
-                traverseFunctions.insert( move( traverseInfo ));
+                traverseFunctions.insert( std::move( traverseInfo ));
         }
         else if( method->getName() == "shouldVisitTemplateInstantiations" )
-            cout << "ShouldVisitTemplateInstantiations:1" << endl;
+            std::cout << "ShouldVisitTemplateInstantiations:1" << std::endl;
         else if (method->getName() == "shouldVisitImplicitCode")
-            cout << "ShouldVisitImplicitCode:1" << endl;
-        else if( method->getName().startswith( "WalkUp" ))
+            std::cout << "ShouldVisitImplicitCode:1" << std::endl;
+        else if( compat::starts_with(method->getName(), "WalkUp" ))
         {
-            cerr << "WalkUp function not supported for shared visitor: " << decl->getName().str()
-                 << "::" << method->getName().str() << endl;
+            std::cerr << "WalkUp function not supported for shared visitor: " << decl->getName().str()
+                 << "::" << method->getName().str() << std::endl;
             abort();
         }
     }
 
     for( const auto& traverseFunction : traverseFunctions )
     {
-        cout << "TraverseFunctionStart" << endl;
-        cout << "TraverseFunctionName:" << traverseFunction.name << endl;
-        cout << "TraverseFunctionArgument:" << traverseFunction.argument << endl;
-        cout << "TraverseFunctionHasPre:" << traverseFunction.hasPre << endl;
-        cout << "TraverseFunctionHasPost:" << traverseFunction.hasPost << endl;
-        cout << "TraverseFunctionEnd" << endl;
+        std::cout << "TraverseFunctionStart" << std::endl;
+        std::cout << "TraverseFunctionName:" << traverseFunction.name << std::endl;
+        std::cout << "TraverseFunctionArgument:" << traverseFunction.argument << std::endl;
+        std::cout << "TraverseFunctionHasPre:" << traverseFunction.hasPre << std::endl;
+        std::cout << "TraverseFunctionHasPost:" << traverseFunction.hasPost << std::endl;
+        std::cout << "TraverseFunctionEnd" << std::endl;
     }
 
-    cout << "InfoEnd" << endl;
+    std::cout << "InfoEnd" << std::endl;
     foundSomething = true;
     return true;
 }
@@ -220,23 +219,23 @@ class FindNamedClassAction
     : public ASTFrontendAction
     {
 public:
-    virtual unique_ptr<ASTConsumer> CreateASTConsumer( CompilerInstance&, StringRef ) override
+    virtual std::unique_ptr<ASTConsumer> CreateASTConsumer( CompilerInstance&, StringRef ) override
     {
-        return unique_ptr<ASTConsumer>( new FindNamedClassConsumer );
+        return std::unique_ptr<ASTConsumer>( new FindNamedClassConsumer );
     }
 };
 
 
-string readSourceFile( const char* filename )
+std::string readSourceFile( const char* filename )
 {
-    string contents;
-    ifstream stream( filename );
+    std::string contents;
+    std::ifstream stream( filename );
     if( !stream )
     {
-        cerr << "Failed to open: " << filename << endl;
+        std::cerr << "Failed to open: " << filename << std::endl;
         exit( 1 );
     }
-    string line;
+    std::string line;
     bool hasIfdef = false;
     while( getline( stream, line ))
     {
@@ -253,7 +252,7 @@ string readSourceFile( const char* filename )
 
 int main(int argc, char** argv)
 {
-    vector< string > args;
+    std::vector< std::string > args;
     int i = 1;
     for( ; i < argc; ++ i )
     {
@@ -281,23 +280,19 @@ int main(int argc, char** argv)
         });
     for( ; i < argc; ++ i )
     {
-        string contents = readSourceFile(argv[i]);
+        std::string contents = readSourceFile(argv[i]);
         if( contents.empty())
             continue;
         foundSomething = false;
-#if CLANG_VERSION >= 100000
         if( !tooling::runToolOnCodeWithArgs( std::unique_ptr<FindNamedClassAction>(new FindNamedClassAction), contents, args, argv[ i ] ))
-#else
-        if( !tooling::runToolOnCodeWithArgs( new FindNamedClassAction, contents, args, argv[ i ] ))
-#endif
         {
-            cerr << "Failed to analyze: " << argv[ i ] << endl;
+            std::cerr << "Failed to analyze: " << argv[ i ] << std::endl;
             return 2;
         }
         if( !foundSomething )
         {
             // there's #ifndef LO_CLANG_SHARED_PLUGINS in the source, but no class matched
-            cerr << "Failed to find code: " << argv[ i ] << endl;
+            std::cerr << "Failed to find code: " << argv[ i ] << std::endl;
             return 2;
         }
     }
diff --git a/compilerplugins/clang/sharedvisitor/dummyplugin.hxx b/compilerplugins/clang/sharedvisitor/dummyplugin.hxx
index d20f82f9278e..1ef87416a907 100644
--- a/compilerplugins/clang/sharedvisitor/dummyplugin.hxx
+++ b/compilerplugins/clang/sharedvisitor/dummyplugin.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef DUMMYPLUGIN_H
-#define DUMMYPLUGIN_H
+#pragma once
 
 #include "config_clang.h"
 
@@ -43,6 +42,7 @@ public:
     bool TraverseWhileStmt( WhileStmt* ) { return complain(); }
     bool TraverseDoStmt( DoStmt* ) { return complain(); }
     bool TraverseForStmt( ForStmt* ) { return complain(); }
+    bool TraverseCompoundStmt( CompoundStmt* ) { return complain(); }
     bool TraverseCXXForRangeStmt( CXXForRangeStmt* ) { return complain(); }
     bool TraverseConditionalOperator( ConditionalOperator* ) { return complain(); }
     bool TraverseCXXCatchStmt( CXXCatchStmt* ) { return complain(); }
@@ -56,6 +56,8 @@ public:
     bool TraverseFriendDecl( FriendDecl* ) { return complain(); }
     bool TraverseTypeLoc( TypeLoc ) { return complain(); }
     bool TraverseAlignedAttr( AlignedAttr* ) { return complain(); }
+    bool TraverseVarDecl( VarDecl* ) { return complain(); }
+    bool TraverseUnaryExprOrTypeTraitExpr( UnaryExprOrTypeTraitExpr* ) { return complain(); }
 private:
     bool complain() { assert(false && "should not be calling this in sharedplugin mode"); abort(); return false; }
 };
@@ -76,6 +78,4 @@ public:
 
 } // namespace
 
-#endif // DUMMYPLUGIN_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/sharedvisitor/generator.cxx b/compilerplugins/clang/sharedvisitor/generator.cxx
index 62c0798a4801..ca5d2743cb69 100644
--- a/compilerplugins/clang/sharedvisitor/generator.cxx
+++ b/compilerplugins/clang/sharedvisitor/generator.cxx
@@ -17,21 +17,19 @@
 #include <set>
 #include <vector>
 
-using namespace std;
-
 // Info about a Visit* function in a plugin.
 struct VisitFunctionInfo
 {
-    string name;
-    string argument;
+    std::string name;
+    std::string argument;
 };
 
 
 // Info about a Traverse* function in a plugin.
 struct TraverseFunctionInfo
 {
-    string name;
-    string argument;
+    std::string name;
+    std::string argument;
     bool hasPre = false;
     bool hasPost = false;
 };
@@ -56,13 +54,13 @@ struct TraverseFunctionInfoLess
 // Information about each LO plugin.
 struct PluginInfo
 {
-    string className; // e.g. "BadStatics"
-    string variableName; // e.g. "badStatics"
-    string lowercaseName;
+    std::string className; // e.g. "BadStatics"
+    std::string variableName; // e.g. "badStatics"
+    std::string lowercaseName;
     bool shouldVisitTemplateInstantiations;
     bool shouldVisitImplicitCode;
-    set< VisitFunctionInfo, VisitFunctionInfoLess > visitFunctions;
-    set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
+    std::set< VisitFunctionInfo, VisitFunctionInfoLess > visitFunctions;
+    std::set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
 };
 
 // We need separate visitors for shouldVisitTemplateInstantiations and shouldVisitImplicitCode,
@@ -82,14 +80,14 @@ const int Plugin_End = PluginVisitTemplatesImplicit + 1;
 static const char* const pluginTypeNames[ Plugin_End ]
     = { "Basic", "VisitTemplates", "VisitImplicit", "VisitTemplatesImplicit" };
 
-static vector< PluginInfo > plugins[ Plugin_End ];
+static std::vector< PluginInfo > plugins[ Plugin_End ];
 
 
 void generateVisitor( PluginType type );
 
 void generate()
 {
-    ostream& output = cout;
+    std::ostream& output = std::cout;
     output <<
 "// This file is autogenerated. Do not modify.\n"
 "// Generated by compilerplugins/clang/sharedvisitor/generator.cxx .\n"
@@ -113,7 +111,7 @@ void generate()
     output << "\n";
     for( const auto& pluginGroup : plugins )
         for( const PluginInfo& plugin : pluginGroup )
-            output << "#include \"" << plugin.lowercaseName << ".cxx\"" << endl;
+            output << "#include \"" << plugin.lowercaseName << ".cxx\"" << std::endl;
     output << "\n";
     output << "#undef RecursiveASTVisitor\n";
     output << "#undef FilteringPlugin\n";
@@ -140,7 +138,7 @@ void generateVisitor( PluginType type )
 {
     if( plugins[ type ].empty())
         return;
-    ostream& output = cout;
+    std::ostream& output = std::cout;
     output <<
 "\n"
 "class SharedRecursiveASTVisitor" << pluginTypeNames[ type ] << "\n"
@@ -218,7 +216,7 @@ void generateVisitor( PluginType type )
     if( type == PluginVisitImplicit || type == PluginVisitTemplatesImplicit )
         output << "bool shouldVisitImplicitCode() const { return true; }\n";
 
-    set< VisitFunctionInfo, VisitFunctionInfoLess > visitFunctions;
+    std::set< VisitFunctionInfo, VisitFunctionInfoLess > visitFunctions;
     for( const PluginInfo& plugin : plugins[ type ] )
         for( const VisitFunctionInfo& visit : plugin.visitFunctions )
             visitFunctions.insert( visit );
@@ -247,7 +245,7 @@ void generateVisitor( PluginType type )
 "    }\n";
     }
 
-    set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
+    std::set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
     for( const PluginInfo& plugin : plugins[ type ] )
         for( const TraverseFunctionInfo& traverse : plugin.traverseFunctions )
             traverseFunctions.insert( traverse );
@@ -334,36 +332,36 @@ void generateVisitor( PluginType type )
 "\n";
 }
 
-static string getValue( const string& line, const char* tag )
+static std::string getValue( const std::string& line, const char* tag )
 {
     size_t taglen = strlen( tag );
     if( line.size() < taglen + 2 )
-        return string();
+        return std::string();
     if( line.compare( 0, taglen, tag ) != 0 )
-        return string();
+        return std::string();
     if( line[ taglen ] != ':' )
-        return string();
+        return std::string();
     return line.substr( taglen + 1 );
 }
 
-static bool readFile( const string& fileName )
+static bool readFile( const std::string& fileName )
 {
-    ifstream file( fileName );
+    std::ifstream file( fileName );
     if( !file )
     {
-        cerr << "Cannot open file " << fileName << endl;
+        std::cerr << "Cannot open file " << fileName << std::endl;
         return false;
     }
     PluginInfo pluginInfo;
-    string line;
+    std::string line;
     do
     {
         getline( file, line );
     } while( !line.empty() && line[ 0 ] == '#' );
-    string version = getValue( line, "InfoVersion" );
+    std::string version = getValue( line, "InfoVersion" );
     if( version != "1" )
     {
-        cerr << "Incorrect version '" << version << "' in " << fileName << endl;
+        std::cerr << "Incorrect version '" << version << "' in " << fileName << std::endl;
         return false;
     }
     getline( file, line );
@@ -379,11 +377,11 @@ static bool readFile( const string& fileName )
     bool endOk = false;
     for(;;)
     {
-        string line;
+        std::string line;
         getline( file, line );
         if( file.eof() || !file )
         {
-            cerr << "Unexpected end of file" << endl;
+            std::cerr << "Unexpected end of file" << std::endl;
             return false;
         }
         if( line.empty())
@@ -403,10 +401,10 @@ static bool readFile( const string& fileName )
             getline( file, line );
             if( line != "VisitFunctionEnd" )
             {
-                cerr << "Missing VisitFunctionEnd" << endl;
+                std::cerr << "Missing VisitFunctionEnd" << std::endl;
                 return false;
             }
-            pluginInfo.visitFunctions.insert( move( visitInfo ));
+            pluginInfo.visitFunctions.insert( std::move( visitInfo ));
         }
         else if( line == "TraverseFunctionStart" )
         {
@@ -422,14 +420,14 @@ static bool readFile( const string& fileName )
             getline( file, line );
             if( line != "TraverseFunctionEnd" )
             {
-                cerr << "Missing TraverseFunctionEnd" << endl;
+                std::cerr << "Missing TraverseFunctionEnd" << std::endl;
                 return false;
             }
-            pluginInfo.traverseFunctions.insert( move( traverseInfo ));
+            pluginInfo.traverseFunctions.insert( std::move( traverseInfo ));
         }
         else
         {
-            string value;
+            std::string value;
             value = getValue( line, "ShouldVisitTemplateInstantiations" );
             if( value == "1" )
                 pluginInfo.shouldVisitTemplateInstantiations = true;
@@ -440,7 +438,7 @@ static bool readFile( const string& fileName )
                     pluginInfo.shouldVisitImplicitCode = true;
                 else
                 {
-                    cerr << "Unknown line " << line << endl;
+                    std::cerr << "Unknown line " << line << std::endl;
                     return false;
                 }
             }
@@ -451,13 +449,13 @@ static bool readFile( const string& fileName )
     (void)endOk;
 
     if( pluginInfo.shouldVisitTemplateInstantiations && pluginInfo.shouldVisitImplicitCode )
-        plugins[ PluginVisitTemplatesImplicit ].push_back( move( pluginInfo ));
+        plugins[ PluginVisitTemplatesImplicit ].push_back( std::move( pluginInfo ));
     else if( pluginInfo.shouldVisitTemplateInstantiations )
-        plugins[ PluginVisitTemplates ].push_back( move( pluginInfo ));
+        plugins[ PluginVisitTemplates ].push_back( std::move( pluginInfo ));
     else if( pluginInfo.shouldVisitImplicitCode )
-        plugins[ PluginVisitImplicit ].push_back( move( pluginInfo ));
+        plugins[ PluginVisitImplicit ].push_back( std::move( pluginInfo ));
     else
-        plugins[ PluginBasic ].push_back( move( pluginInfo ));
+        plugins[ PluginBasic ].push_back( std::move( pluginInfo ));
 
     return true;
 }
@@ -468,7 +466,7 @@ int main(int argc, char** argv)
     {
         if( !readFile( argv[ i ] ))
         {
-            cerr << "Error reading " << argv[ i ] << endl;
+            std::cerr << "Error reading " << argv[ i ] << std::endl;
             return 1;
         }
     }
diff --git a/compilerplugins/clang/simplifyconstruct.cxx b/compilerplugins/clang/simplifyconstruct.cxx
index bd8aaaf03957..d9eff0b3af89 100644
--- a/compilerplugins/clang/simplifyconstruct.cxx
+++ b/compilerplugins/clang/simplifyconstruct.cxx
@@ -88,12 +88,12 @@ bool SimplifyConstruct::VisitVarDecl(VarDecl const* varDecl)
         return true;
 
     auto init = varDecl->getInit();
-    auto const e1 = compat::IgnoreImplicit(init);
+    auto const e1 = init->IgnoreImplicit();
     if (!isa<CXXFunctionalCastExpr>(e1) && !isa<CXXTemporaryObjectExpr>(e1))
         return true;
 
     // e.g. the LANGUAGE_DONTKNOW defines
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(init)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(init->getBeginLoc()))
         return true;
 
     report(DiagnosticsEngine::Warning, "simplify", varDecl->getLocation())
diff --git a/compilerplugins/clang/simplifydynamiccast.cxx b/compilerplugins/clang/simplifydynamiccast.cxx
index b1f06179ee71..3b94f284de1e 100644
--- a/compilerplugins/clang/simplifydynamiccast.cxx
+++ b/compilerplugins/clang/simplifydynamiccast.cxx
@@ -14,7 +14,6 @@
 #include <set>
 
 #include <clang/AST/CXXInheritance.h>
-#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace
@@ -47,15 +46,19 @@ private:
 
 bool SimplifyDynamicCast::TraverseIfStmt(IfStmt* ifStmt)
 {
-    auto condExpr = ifStmt->getCond()->IgnoreParenImpCasts();
-    auto dynamicCastExpr = dyn_cast<CXXDynamicCastExpr>(condExpr);
-    if (!dynamicCastExpr)
+    CXXDynamicCastExpr const* dynamicCastExpr = nullptr;
+    if (Expr const* condExpr = ifStmt->getCond())
     {
-        if (auto binaryOp = dyn_cast<BinaryOperator>(condExpr))
+        condExpr = condExpr->IgnoreParenImpCasts();
+        dynamicCastExpr = dyn_cast<CXXDynamicCastExpr>(condExpr);
+        if (!dynamicCastExpr)
         {
-            if (binaryOp->getOpcode() == BO_NE)
-                dynamicCastExpr
-                    = dyn_cast<CXXDynamicCastExpr>(binaryOp->getLHS()->IgnoreParenImpCasts());
+            if (auto binaryOp = dyn_cast<BinaryOperator>(condExpr))
+            {
+                if (binaryOp->getOpcode() == BO_NE)
+                    dynamicCastExpr
+                        = dyn_cast<CXXDynamicCastExpr>(binaryOp->getLHS()->IgnoreParenImpCasts());
+            }
         }
     }
     Decl const* subExprDecl = nullptr;
@@ -102,12 +105,10 @@ bool SimplifyDynamicCast::VisitCXXStaticCastExpr(CXXStaticCastExpr const* static
         return true;
     if (dynamicCastSubExprVec[idx] != subExprDecl->getDecl())
         return true;
-    report(DiagnosticsEngine::Warning, "simplify, use var in if",
-           compat::getBeginLoc(staticCastExpr))
+    report(DiagnosticsEngine::Warning, "simplify, use var in if", staticCastExpr->getBeginLoc())
         << staticCastExpr->getSourceRange();
     auto ifStmt = ifVec[idx];
-    report(DiagnosticsEngine::Note, "if here", compat::getBeginLoc(ifStmt))
-        << ifStmt->getSourceRange();
+    report(DiagnosticsEngine::Note, "if here", ifStmt->getBeginLoc()) << ifStmt->getSourceRange();
     return true;
 }
 
diff --git a/compilerplugins/clang/simplifypointertobool.cxx b/compilerplugins/clang/simplifypointertobool.cxx
index 7afa2d01ec3e..1a9471fcf877 100644
--- a/compilerplugins/clang/simplifypointertobool.cxx
+++ b/compilerplugins/clang/simplifypointertobool.cxx
@@ -17,8 +17,6 @@
 
 #include <clang/AST/CXXInheritance.h>
 
-#include "config_clang.h"
-
 #include "plugin.hxx"
 #include "check.hxx"
 #include "compat.hxx"
@@ -78,10 +76,6 @@ public:
         return res;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
-#endif
-
     bool PreTraverseBinaryOperator(BinaryOperator* expr)
     {
         auto const op = expr->getOpcode();
@@ -114,11 +108,6 @@ public:
         return res;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinLOr(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
-#endif
-
     bool PreTraverseConditionalOperator(ConditionalOperator* expr)
     {
         contextuallyConvertedExprs_.push_back(expr->getCond()->IgnoreParenImpCasts());
@@ -143,14 +132,20 @@ public:
 
     bool PreTraverseIfStmt(IfStmt* stmt)
     {
-        contextuallyConvertedExprs_.push_back(stmt->getCond()->IgnoreParenImpCasts());
+        if (auto const cond = stmt->getCond())
+        {
+            contextuallyConvertedExprs_.push_back(cond->IgnoreParenImpCasts());
+        }
         return true;
     }
 
-    bool PostTraverseIfStmt(IfStmt*, bool)
+    bool PostTraverseIfStmt(IfStmt* stmt, bool)
     {
-        assert(!contextuallyConvertedExprs_.empty());
-        contextuallyConvertedExprs_.pop_back();
+        if (stmt->getCond() != nullptr)
+        {
+            assert(!contextuallyConvertedExprs_.empty());
+            contextuallyConvertedExprs_.pop_back();
+        }
         return true;
     }
 
@@ -268,7 +263,7 @@ private:
             auto const s = StringRef(compiler.getSourceManager().getCharacterData(start),
                                      Lexer::MeasureTokenLength(start, compiler.getSourceManager(),
                                                                compiler.getLangOpts()));
-            if (s.empty() || s.startswith("\\\n"))
+            if (s.empty() || compat::starts_with(s, "\\\n"))
             {
                 continue;
             }
@@ -285,14 +280,13 @@ private:
             auto const s = StringRef(compiler.getSourceManager().getCharacterData(start1),
                                      Lexer::MeasureTokenLength(start1, compiler.getSourceManager(),
                                                                compiler.getLangOpts()));
-            if (!(s.empty() || s.startswith("\\\n")))
+            if (!(s.empty() || compat::starts_with(s, "\\\n")))
             {
                 break;
             }
             start = start1;
         }
-        return SourceRange(start,
-                           compiler.getSourceManager().getSpellingLoc(compat::getEndLoc(expr)));
+        return SourceRange(start, compiler.getSourceManager().getSpellingLoc(expr->getEndLoc()));
     }
 
     //TODO: There are some more places where an expression is contextually converted to bool, but
@@ -379,7 +373,7 @@ bool SimplifyPointerToBool::VisitImplicitCastExpr(ImplicitCastExpr const* castEx
         if (rewriter)
         {
             auto const loc
-                = compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(memberCallExpr));
+                = compiler.getSourceManager().getSpellingLoc(memberCallExpr->getBeginLoc());
             auto const range = getCallSourceRange(memberCallExpr);
             if (loc.isValid() && range.isValid() && insertText(loc, "bool") && removeText(range))
             {
@@ -401,7 +395,7 @@ bool SimplifyPointerToBool::VisitImplicitCastExpr(ImplicitCastExpr const* castEx
         if (rewriter)
         {
             auto const loc
-                = compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(memberCallExpr));
+                = compiler.getSourceManager().getSpellingLoc(memberCallExpr->getBeginLoc());
             auto const range = getCallSourceRange(memberCallExpr);
             if (loc.isValid() && range.isValid() && insertText(loc, "bool(")
                 && replaceText(range, ")"))
diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results
index 655250eeed6d..ba40a0d12d5f 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -1,24 +1,93 @@
-connectivity/source/inc/dbase/dindexnode.hxx:120
+canvas/inc/spriteredrawmanager.hxx:170
+    canvas::SpriteRedrawManager::SpriteChangeRecord meChangeType
+    ChangeType
+configmgr/source/components.hxx:159
+    configmgr::Components modificationTarget_
+    ModificationTarget
+connectivity/source/inc/dbase/dindexnode.hxx:119
     connectivity::dbase::ONDXPage bNoDelete
     unsigned int
-cui/source/inc/cfg.hxx:233
+cppu/source/AffineBridge/AffineBridge.cxx:46
+    (anonymous namespace)::AffineBridge m_message
+    Msg
+cui/source/inc/cfg.hxx:237
     SvxConfigEntry nId
     sal_uInt16
-desktop/source/app/main.c:29
-    /home/noel/libo2/desktop/source/app/main.c g_Exiting
+dbaccess/source/core/api/query.hxx:67
+    dbaccess::OQuery m_eDoingCurrently
+    AggregateAction
+dbaccess/source/core/inc/querycontainer.hxx:65
+    dbaccess::OQueryContainer m_eDoingCurrently
+    AggregateAction
+desktop/source/app/main.c:30
+    /home/noel/libo-plugin/desktop/source/app/main.c g_Exiting
     int
 editeng/source/misc/hangulhanja.cxx:78
     editeng::HangulHanjaConversion_Impl m_eConvType
     class HangulHanjaConversion::ConversionType
-editeng/source/misc/svxacorr.cxx:233
+editeng/source/misc/svxacorr.cxx:225
     GetIgnoreTranslWrapper bIsInit
     int
-filter/source/graphicfilter/eps/eps.cxx:140
-    (anonymous namespace)::PSWriter nNextChrSetId
-    sal_uInt8
+emfio/inc/mtftools.hxx:406
+    emfio::WinMtfFillStyle aType
+    WinMtfFillStyleType
+filter/source/graphicfilter/icgm/elements.hxx:43
+    CGMElements eScalingMode
+    ScalingMode
+filter/source/graphicfilter/icgm/elements.hxx:46
+    CGMElements eVDCType
+    VDCType
+filter/source/graphicfilter/icgm/elements.hxx:48
+    CGMElements eVDCRealPrecision
+    RealPrecision
+filter/source/graphicfilter/icgm/elements.hxx:55
+    CGMElements eDeviceViewPortMap
+    DeviceViewPortMap
+filter/source/graphicfilter/icgm/elements.hxx:62
+    CGMElements eClipIndicator
+    ClipIndicator
+filter/source/graphicfilter/icgm/elements.hxx:65
+    CGMElements eColorSelectionMode
+    ColorSelectionMode
+filter/source/graphicfilter/icgm/elements.hxx:80
+    CGMElements eLineWidthSpecMode
+    SpecMode
+filter/source/graphicfilter/icgm/elements.hxx:87
+    CGMElements eMarkerSizeSpecMode
+    SpecMode
+filter/source/graphicfilter/icgm/elements.hxx:92
+    CGMElements eEdgeVisibility
+    EdgeVisibility
+filter/source/graphicfilter/icgm/elements.hxx:93
+    CGMElements eEdgeWidthSpecMode
+    SpecMode
+filter/source/graphicfilter/icgm/elements.hxx:119
+    CGMElements eTransparency
+    Transparency
+filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx:57
+    XmlFilterAdaptor meType
+    FilterType
+forms/source/richtext/rtattributehandler.hxx:147
+    frm::ParagraphDirectionHandler m_eParagraphDirection
+    SvxFrameDirection
+forms/source/richtext/rtattributehandler.hxx:148
+    frm::ParagraphDirectionHandler m_eDefaultAdjustment
+    SvxAdjust
+forms/source/richtext/rtattributehandler.hxx:149
+    frm::ParagraphDirectionHandler m_eOppositeDefaultAdjustment
+    SvxAdjust
+fpicker/source/office/iodlgimp.hxx:138
+    SvtExpFileDlg_Impl m_eDlgType
+    SvtFileDlgType
 include/opencl/openclwrapper.hxx:46
     openclwrapper::GPUEnv mnIsUserCreated
     int
+include/svtools/brwbox.hxx:311
+    BrowseBox bHideCursor
+    TriState
+include/svtools/ruler.hxx:524
+    RulerIndent nStyle
+    RulerIndentStyle
 include/svtools/ruler.hxx:621
     Ruler mnBorderWidth
     tools::Long
@@ -37,81 +106,156 @@ include/vcl/headbar.hxx:209
 include/vcl/toolkit/dialog.hxx:54
     Dialog mnMousePositioned
     tools::Long
-jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191
+include/vcl/weldutils.hxx:327
+    weld::TimeFormatter m_eTimeFormat
+    TimeFormat
+jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:195
     (anonymous) g_bInGetJavaVM
     sig_atomic_t
-libreofficekit/source/gtk/tilebuffer.hxx:232
+jvmfwk/source/fwkbase.cxx:379
+    jfw::getMode g_mode
+    JFW_MODE
+libreofficekit/source/gtk/tilebuffer.hxx:230
     LOEvent m_nSetGraphicSelectionType
     int
-sal/rtl/cipher.cxx:113
+oox/inc/drawingml/textspacing.hxx:62
+    oox::drawingml::TextSpacing nUnit
+    Unit
+sal/rtl/cipher.cxx:114
     (anonymous namespace)::Cipher_Impl m_algorithm
     rtlCipherAlgorithm
-sc/source/filter/inc/stylesbuffer.hxx:289
+sc/source/filter/inc/drawingbase.hxx:122
+    oox::xls::ShapeAnchor meCellAnchorType
+    CellAnchorType
+sc/source/filter/inc/orcusinterface.hxx:444
+    ScOrcusXf meHorAlignMethod
+    SvxCellJustifyMethod
+sc/source/filter/inc/orcusinterface.hxx:445
+    ScOrcusXf meVerAlignMethod
+    SvxCellJustifyMethod
+sc/source/filter/inc/stylesbuffer.hxx:292
     oox::xls::ApiAlignmentData mnHorJustifyMethod
     sal_Int32
-sc/source/filter/inc/stylesbuffer.hxx:291
+sc/source/filter/inc/stylesbuffer.hxx:294
     oox::xls::ApiAlignmentData mnVerJustifyMethod
     sal_Int32
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1083
+sc/source/filter/inc/xlroot.hxx:77
+    XclRootData meOutput
+    XclOutput
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1084
     (anonymous namespace)::ScPagePreviewCountData nHeaders
     tools::Long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1084
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1085
     (anonymous namespace)::ScPagePreviewCountData nTables
     tools::Long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1086
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1087
     (anonymous namespace)::ScPagePreviewCountData nFooters
     tools::Long
-sc/source/ui/vba/vbahyperlink.hxx:84
+sc/source/ui/inc/AnalysisOfVarianceDialog.hxx:33
+    ScAnalysisOfVarianceDialog meFactor
+    AnovaFactor
+sc/source/ui/inc/gridwin.hxx:163
+    ScGridWindow eHWhich
+    ScHSplitPos
+sc/source/ui/inc/gridwin.hxx:164
+    ScGridWindow eVWhich
+    ScVSplitPos
+sc/source/ui/inc/StatisticsInputOutputDialog.hxx:63
+    ScStatisticsInputOutputDialog mGroupedBy
+    GroupedBy
+sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:65
+    ScStatisticsTwoVariableDialog mGroupedBy
+    GroupedBy
+sc/source/ui/inc/tabview.hxx:183
+    ScTabView meHighlightBlockMode
+    BlockMode
+sc/source/ui/vba/vbahyperlink.hxx:83
     ScVbaHyperlink mnType
     tools::Long
-sd/qa/unit/tiledrendering/tiledrendering.cxx:854
+sd/qa/unit/tiledrendering/tiledrendering.cxx:776
     (anonymous namespace)::ViewCallback m_nPart
     int
-soltools/cpp/_tokens.c:35
-    /home/noel/libo2/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
-    int
-soltools/cpp/_tokens.c:36
-    /home/noel/libo2/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
-    int
+sd/source/ui/slideshow/slideshowviewimpl.hxx:65
+    sd::WrappedMouseMotionEvent meType
+    EventType
+sdext/source/pdfimport/inc/genericelements.hxx:207
+    pdfi::ParagraphElement Type
+    ParagraphType
 soltools/cpp/cpp.h:121
     includelist always
     char
-svx/source/inc/cell.hxx:202
+svgio/inc/svgfeblendnode.hxx:39
+    svgio::svgreader::SvgFeBlendNode maMode
+    Mode
+svx/source/inc/cell.hxx:199
     sdr::table::Cell mnCellContentType
     css::table::CellContentType
-svx/source/table/tablertfimporter.cxx:56
+svx/source/table/tablertfimporter.cxx:58
     sdr::table::(anonymous namespace)::RTFCellDefault mnRowSpan
     sal_Int32
-sw/source/filter/ww8/docxexport.hxx:98
+sw/source/filter/html/parcss1.hxx:195
+    CSS1Parser m_eState
+    CSS1ParserState
+sw/source/filter/html/svxcss1.hxx:140
+    SvxCSS1PropertyInfo m_eLeftMarginType
+    SvxCSS1LengthType
+sw/source/filter/html/svxcss1.hxx:141
+    SvxCSS1PropertyInfo m_eRightMarginType
+    SvxCSS1LengthType
+sw/source/filter/ww8/docxexport.hxx:107
     DocxExport m_nHeadersFootersInSection
     sal_Int32
-sw/source/filter/ww8/ww8scan.hxx:57
+sw/source/filter/ww8/ww8scan.hxx:58
     SprmInfo nVari
     unsigned int
+sw/source/uibase/inc/convert.hxx:48
+    SwConvertTableDlg m_nDfltStylePos
+    sal_uInt8
+sw/source/uibase/inc/edtwin.hxx:103
+    SwEditWin m_aActHitType
+    SdrHitKind
 sw/source/uibase/inc/tautofmt.hxx:48
     SwAutoFormatDlg m_nDfltStylePos
     sal_uInt8
-vcl/inc/unx/i18n_ic.hxx:32
+sw/source/writerfilter/dmapper/PageBordersHandler.hxx:47
+    writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
+    class SectionPropertyMap::BorderOffsetFrom
+toolkit/inc/controls/table/tablecontrolinterface.hxx:86
+    svt::table::TableCell eArea
+    TableCellArea
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:321
+    (anonymous namespace)::WebDAVResponseParser maLockScope
+    ucb::LockScope
+unotools/source/config/configvaluecontainer.cxx:51
+    utl::NodeValueAccessor eLocationType
+    LocationType
+vcl/inc/unx/i18n_ic.hxx:31
     SalI18N_InputContext mbUseable
     int
-vcl/inc/unx/salframe.h:126
+vcl/inc/unx/salframe.h:127
     X11SalFrame mbInputFocus
     int
-vcl/unx/generic/app/saldata.cxx:449
+vcl/skia/SkiaHelper.cxx:419
+    SkiaHelper methodToUse
+    RenderMethod
+vcl/source/filter/graphicfilter.cxx:503
+    (anonymous namespace)::GraphicImportContext m_nImportFlags
+    GraphicFilterImportFlags
+vcl/unx/generic/app/saldata.cxx:442
     EmitFontpathWarning bOnce
     int
-vcl/unx/generic/app/saldata.cxx:502
+vcl/unx/generic/app/saldata.cxx:495
     X11SalData::XError bOnce
     int
-vcl/unx/generic/app/sm.cxx:184
-    /home/noel/libo2/vcl/unx/generic/app/sm.cxx nSmDel
+vcl/unx/generic/app/sm.cxx:185
+    /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx nSmDel
     int
-vcl/workben/icontest.cxx:145
+vcl/workben/icontest.cxx:143
     (anonymous namespace)::IconTestApp nRet
     int
-workdir/LexTarget/l10ntools/source/cfglex.cxx:2293
-    /home/noel/libo2/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
-    int
-writerfilter/source/dmapper/PageBordersHandler.hxx:48
-    writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
-    class SectionPropertyMap::BorderOffsetFrom
+vcl/workben/vcldemo.cxx:97
+    (anonymous namespace)::DemoRenderer::RenderContext meStyle
+    RenderStyle
+xmlsecurity/source/helper/ooxmlsecparser.cxx:965
+    OOXMLSecParser::DsSignaturePropertyContext m_Property
+    SignatureProperty
diff --git a/compilerplugins/clang/singlevalfields.cxx b/compilerplugins/clang/singlevalfields.cxx
index 2731f55c8587..ab41ef52c55e 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -15,11 +15,10 @@
 
 #include "config_clang.h"
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
 Look for fields that are only ever assigned a single constant value.
@@ -31,7 +30,7 @@ Be warned that it produces around 5G of log file.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='singlevalfields' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='singlevalfields' check
   $ ./compilerplugins/clang/singlevalfields.py
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
@@ -95,6 +94,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         if (!isUnitTestMode())
@@ -114,11 +115,11 @@ public:
         else
         {
             for (const MyFieldAssignmentInfo & s : assignedSet)
-                if (s.fieldDecl && compiler.getSourceManager().isInMainFile(compat::getBeginLoc(s.fieldDecl)))
+                if (s.fieldDecl && compiler.getSourceManager().isInMainFile(s.fieldDecl->getBeginLoc()))
                     report(
                         DiagnosticsEngine::Warning,
                         "assign %0",
-                        compat::getBeginLoc(s.fieldDecl))
+                        s.fieldDecl->getBeginLoc())
                         << s.value;
         }
     }
@@ -181,8 +182,7 @@ bool SingleValFields::VisitFieldDecl( const FieldDecl* fieldDecl )
 {
     auto canonicalDecl = fieldDecl->getCanonicalDecl();
 
-    if( ignoreLocation( canonicalDecl )
-        || isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation())) )
+    if( isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation())) )
         return true;
 
     MyFieldInfo aInfo;
@@ -213,8 +213,7 @@ bool SingleValFields::VisitVarDecl( const VarDecl* varDecl )
     if (!canonicalDecl->getLocation().isValid())
         return true;
 
-    if( ignoreLocation( canonicalDecl )
-        || isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation())) )
+    if( isInUnoIncludeFile( compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation())) )
         return true;
 
     MyFieldInfo aInfo;
@@ -234,9 +233,6 @@ bool SingleValFields::VisitVarDecl( const VarDecl* varDecl )
 
 bool SingleValFields::VisitCXXConstructorDecl( const CXXConstructorDecl* decl )
 {
-    if( ignoreLocation( decl ) )
-        return true;
-
     // doesn't count as a write to fields because it's self->self
     if (decl->isCopyOrMoveConstructor())
         return true;
@@ -267,8 +263,6 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* memberExpr )
     const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(decl);
     if (!fieldDecl)
         return true;
-    if (ignoreLocation(memberExpr))
-        return true;
     walkPotentialAssign(fieldDecl, memberExpr);
     return true;
 }
@@ -284,8 +278,6 @@ bool SingleValFields::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
         return true;
     if (!(varDecl->isStaticLocal() || varDecl->isStaticDataMember() || varDecl->hasGlobalStorage()))
         return true;
-    if (ignoreLocation(declRefExpr))
-        return true;
     walkPotentialAssign(varDecl, declRefExpr);
     return true;
 }
@@ -299,7 +291,7 @@ void SingleValFields::walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl,
         if (methodDecl && (methodDecl->isCopyAssignmentOperator() || methodDecl->isMoveAssignmentOperator()))
            return;
         if (methodDecl && methodDecl->getIdentifier()
-            && (methodDecl->getName().startswith("Clone") || methodDecl->getName().startswith("clone")))
+            && (compat::starts_with(methodDecl->getName(), "Clone") || compat::starts_with(methodDecl->getName(), "clone")))
            return;
         auto cxxConstructorDecl = dyn_cast<CXXConstructorDecl>(parentFunction);
         if (cxxConstructorDecl && cxxConstructorDecl->isCopyOrMoveConstructor())
@@ -420,6 +412,7 @@ void SingleValFields::walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl,
                 || isa<UnresolvedMemberExpr>(parent)
                 || isa<MaterializeTemporaryExpr>(parent)  //???
                 || isa<InitListExpr>(parent)
+                || isa<DesignatedInitExpr>(parent)
                 || isa<CXXUnresolvedConstructExpr>(parent)
                 || isa<LambdaExpr>(parent)
                 || isa<PackExpansionExpr>(parent)
@@ -428,11 +421,15 @@ void SingleValFields::walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl,
         {
             break;
         }
-        else if ( isa<ArrayInitLoopExpr>(parent) || isa<GCCAsmStmt>(parent) || isa<VAArgExpr>(parent))
+        else if ( isa<ArrayInitLoopExpr>(parent) || isa<AtomicExpr>(parent) || isa<GCCAsmStmt>(parent) || isa<VAArgExpr>(parent))
         {
             bPotentiallyAssignedTo = true;
             break;
         }
+        else if (isa<DeclRefExpr>(parent)) // things like o3tl::convertNarrowing pass members as template params
+        {
+            break;
+        }
         else {
             bPotentiallyAssignedTo = true;
             bDump = true;
@@ -444,7 +441,7 @@ void SingleValFields::walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl,
         report(
              DiagnosticsEngine::Warning,
              "oh dear, what can the matter be?",
-              compat::getBeginLoc(memberExpr))
+              memberExpr->getBeginLoc())
               << memberExpr->getSourceRange();
         parent->dump();
     }
@@ -574,7 +571,7 @@ std::string SingleValFields::getExprValue(const Expr* arg)
     }
     APSInt x1;
     if (compat::EvaluateAsInt(arg, x1, compiler.getASTContext()))
-        return x1.toString(10);
+        return compat::toString(x1, 10);
     if (isa<CXXNullPtrLiteralExpr>(arg))
         return "0";
     return "?";
diff --git a/compilerplugins/clang/singlevalfields.py b/compilerplugins/clang/singlevalfields.py
index 0830a8cdcc00..fe2f4697638f 100755
--- a/compilerplugins/clang/singlevalfields.py
+++ b/compilerplugins/clang/singlevalfields.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -22,10 +21,12 @@ with io.open("workdir/loplugin.singlevalfields.log", "r", buffering=1024*1024) a
             parentClass = normalizeTypeParams(tokens[1])
             fieldName = normalizeTypeParams(tokens[2])
             fieldType = normalizeTypeParams(tokens[3])
-            sourceLocation = tokens[4]
-            fieldInfo = (parentClass, fieldName)
-            definitionToSourceLocationMap[fieldInfo] = sourceLocation
-            definitionToTypeMap[fieldInfo] = fieldType
+            srcLoc = tokens[4]
+            # ignore some external stuff that is somehow sneaking through
+            if not(srcLoc.startswith("workdir/") or srcLoc.startswith("-3.0/") or srcLoc.startswith("_64-linux-gnu/")):
+                fieldInfo = (parentClass, fieldName)
+                definitionToSourceLocationMap[fieldInfo] = srcLoc
+                definitionToTypeMap[fieldInfo] = fieldType
         elif tokens[0] == "asgn:":
             parentClass = normalizeTypeParams(tokens[1])
             fieldName = normalizeTypeParams(tokens[2])
@@ -55,6 +56,13 @@ for fieldInfo, assignValues in fieldAssignDict.items():
         continue
     if "?" in assignValues:
         continue
+    # ignore some random noise, no idea why this does not get filtered out by the normal checks in the C++
+    if v2.startswith("ux-gnu/") or v2.startswith(":") or v2.startswith(".h:") or v2.startswith("bxml/"):
+        continue
+    if v2.startswith("ib.h:") or v2.startswith("freetype/") or v2.startswith("k/") or v2.startswith("n.h"):
+        continue
+    if v2.startswith("pango/") or v2.startswith("t.h") or v2.startswith("h:"):
+        continue
     #if len(assignValues - set(["0", "1", "-1", "nullptr"])) > 0:
     #    continue
     # ignore things which are locally declared but are actually redeclarations of things from 3rd party code
@@ -86,6 +94,10 @@ for fieldInfo, assignValues in fieldAssignDict.items():
             fieldType = definitionToTypeMap[fieldInfo]
             if not "_Bool" in fieldType and not "enum " in fieldType and not "boolean" in fieldType:
                 tmp2list.append((v0,v1,v2,fieldType))
+    elif len(assignValues) == 1:
+        # ignore timers/idles
+        if not("Idle" in v1 or "Timer" in v1):
+            tmp1list.append((v0,v1,v2))
     else:
         tmp1list.append((v0,v1,v2))
 
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index cd8595bef3b8..f82fe970ae82 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1,16 +1,10 @@
-avmedia/inc/mediacontrol.hxx:64
-    avmedia::MediaControl maIdle
-    avmedia MediaControl Idle
-avmedia/inc/mediacontrol.hxx:65
-    avmedia::MediaControl maChangeTimeIdle
-    avmedia MediaControl Change Time Idle
 avmedia/source/framework/soundhandler.hxx:114
     avmedia::SoundHandler m_aUpdateIdle
     avmedia SoundHandler Update
-basctl/source/basicide/baside2.hxx:84
+basctl/source/basicide/baside2.hxx:88
     basctl::EditorWindow aHighlighter
     0
-basctl/source/inc/dlged.hxx:132
+basctl/source/inc/dlged.hxx:131
     basctl::DlgEditor aMarkIdle
     basctl DlgEditor Mark
 binaryurp/source/proxy.hxx:80
@@ -34,49 +28,37 @@ bridges/inc/cppinterfaceproxy.hxx:82
 bridges/inc/unointerfaceproxy.hxx:83
     bridges::cpp_uno::shared::UnoInterfaceProxy nRef
     1
-bridges/source/jni_uno/jni_bridge.h:52
+bridges/source/jni_uno/jni_bridge.h:49
     jni_uno::Bridge m_ref
     1
-bridges/source/jni_uno/jni_uno2java.cxx:391
+bridges/source/jni_uno/jni_uno2java.cxx:389
     jni_uno::(anonymous namespace)::UNO_proxy m_ref
     1
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex b
     1\10
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex g
     1\10
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex r
     1\10
-canvas/inc/rendering/irendermodule.hxx:37
+canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex z
     0\10
-chart2/source/controller/dialogs/DataBrowser.cxx:201
-    chart::impl::SeriesHeader m_aUpdateDataTimer
-    UpdateDataTimer
-chart2/source/controller/inc/ChartController.hxx:378
-    chart::ChartController m_aLifeTimeManager
-    0
-chart2/source/controller/inc/TitleDialogData.hxx:33
-    chart::TitleDialogData aPossibilityList
-    7
-chart2/source/controller/inc/TitleDialogData.hxx:34
-    chart::TitleDialogData aExistenceList
-    7
-chart2/source/controller/inc/TitleDialogData.hxx:35
+chart2/source/controller/inc/TitleDialogData.hxx:36
     chart::TitleDialogData aTextList
     7
-chart2/source/model/main/DataPoint.hxx:107
+chart2/source/model/main/DataPoint.hxx:104
     chart::DataPoint m_bNoParentPropAllowed
     0
-comphelper/source/misc/threadpool.cxx:37
+comphelper/source/misc/threadpool.cxx:39
     comphelper gbIsWorkerThread
     1
-connectivity/source/inc/dbase/DIndexIter.hxx:34
+connectivity/source/inc/dbase/DIndexIter.hxx:33
     connectivity::dbase::OIndexIterator m_pOperator
     0
-connectivity/source/inc/dbase/DIndexIter.hxx:35
+connectivity/source/inc/dbase/DIndexIter.hxx:34
     connectivity::dbase::OIndexIterator m_pOperand
     0
 connectivity/source/inc/OColumn.hxx:41
@@ -103,118 +85,193 @@ connectivity/source/inc/OColumn.hxx:47
 connectivity/source/inc/OColumn.hxx:48
     connectivity::OColumn m_DefinitelyWritable
     0
-connectivity/source/inc/writer/WTable.hxx:44
+connectivity/source/inc/writer/WTable.hxx:43
     connectivity::writer::OWriterTable m_nStartCol
     0
 cppu/source/uno/copy.hxx:38
     cppu::(anonymous namespace)::SequencePrefix nRefCount
     1
-cui/source/inc/acccfg.hxx:100
-    SfxAcceleratorConfigPage m_aUpdateDataTimer
-    UpdateDataTimer
-cui/source/inc/AdditionsDialog.hxx:59
-    AdditionsDialog m_aSearchDataTimer
-    SearchDataTimer
-cui/source/inc/cfg.hxx:371
-    SvxConfigPage m_aUpdateDataTimer
-    UpdateDataTimer
-cui/source/inc/linkdlg.hxx:45
-    SvBaseLinksDlg aUpdateIdle
-    cui SvBaseLinksDlg UpdateIdle
-cui/source/inc/thesdlg.hxx:31
+cui/source/inc/paragrph.hxx:47
+    SvxStdParagraphTabPage nMinFixDist
+    0
+cui/source/inc/thesdlg.hxx:33
     SvxThesaurusDialog m_aModifyIdle
     cui SvxThesaurusDialog LookUp Modify
-cui/source/options/optgdlg.cxx:1014
-    LanguageConfig_Impl aLanguageOptions
+cui/source/options/optgdlg.cxx:1124
+    LanguageConfig_Impl aCTLLanguageOptions
     0
 cui/source/options/optjava.hxx:59
     SvxJavaOptionsPage m_aResetIdle
     cui options SvxJavaOptionsPage Reset
-dbaccess/source/ui/inc/sqledit.hxx:42
+dbaccess/source/ui/inc/QueryTextView.hxx:35
+    dbaui::OQueryTextView m_timerUndoActionCreation
+    dbaccess OQueryTextView m_timerUndoActionCreation
+dbaccess/source/ui/inc/QueryTextView.hxx:37
+    dbaui::OQueryTextView m_timerInvalidate
+    dbaccess OQueryTextView m_timerInvalidate
+dbaccess/source/ui/inc/sqledit.hxx:44
     dbaui::SQLEditView m_aHighlighter
     1
-desktop/source/app/app.cxx:478
+dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx:57
+    dbaui::OSelectionBrowseBox m_timerInvalidate
+    dbaccess OSelectionBrowseBox m_timerInvalidate
+dbaccess/source/ui/tabledesign/TEditControl.hxx:70
+    dbaui::OTableEditorCtrl::ClipboardInvalidator m_aInvalidateTimer
+    dbaccess ClipboardInvalidator
+desktop/inc/lib/init.hxx:224
+    desktop::CallbackFlushHandler::PerViewIdData set
+    0
+desktop/source/app/app.cxx:507
     desktop::Desktop::Init bTryHardOfficeconfigBroken
     0
-desktop/source/app/cmdlineargs.hxx:136
+desktop/source/app/cmdlineargs.hxx:134
     desktop::CommandLineArgs m_quickstart
     0
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:373
-    drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bMultithreadAllowed
+desktop/source/app/dispatchwatcher.hxx:81
+    desktop::DispatchWatcher m_nRequestCount
+    0
+desktop/source/deployment/gui/license_dialog.cxx:44
+    dp_gui::(anonymous namespace)::LicenseDialogImpl m_aResized
+    desktop LicenseDialogImpl m_aResized
+desktop/source/deployment/gui/license_dialog.cxx:45
+    dp_gui::(anonymous namespace)::LicenseDialogImpl m_aRepeat
+    LicenseDialogImpl m_aRepeat
+drawinglayer/source/primitive2d/glowprimitive2d.cxx:223
+    drawinglayer::primitive2d::GlowPrimitive2D::create2DDecomposition bDoSaveForVisualControl
     0
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:481
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:425
+    drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bMultithreadAllowed
+    1
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:533
     drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bAddOutlineToCreated3DSceneRepresentation
     0
-drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:339
+drawinglayer/source/primitive2d/shadowprimitive2d.cxx:259
+    drawinglayer::primitive2d::ShadowPrimitive2D::create2DDecomposition bDoSaveForVisualControl
+    0
+drawinglayer/source/primitive2d/softedgeprimitive2d.cxx:218
+    drawinglayer::primitive2d::SoftEdgePrimitive2D::create2DDecomposition bDoSaveForVisualControl
+    0
+drawinglayer/source/processor2d/cairopixelprocessor2d.cxx:657
+    drawinglayer::processor2d::CairoPixelProcessor2D::processPolygonStrokePrimitive2D bRenderDecomposeForCompareInRed
+    0
+drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:460
     drawinglayer::impBufferDevice::paint bDoSaveForVisualControl
     0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:950
+drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:540
+    drawinglayer::impBufferDevice::paint bUseNew
+    0
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:965
     drawinglayer::processor2d::VclMetafileProcessor2D::processGraphicPrimitive2D bSuppressPDFExtOutDevDataSupport
     0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1298
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1355
     drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D bSuppressPDFExtOutDevDataSupport
     0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2057
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2268
     drawinglayer::processor2d::VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D bForceToMetafile
     0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2158
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2378
     drawinglayer::processor2d::VclMetafileProcessor2D::processTransparencePrimitive2D bForceToBigTransparentVDev
     0
-drawinglayer/source/tools/converters.cxx:91
+drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:983
+    drawinglayer::processor2d::VclPixelProcessor2D::processFillGradientPrimitive2D bTryDirectRender
+    1
+drawinglayer/source/tools/converters.cxx:234
     drawinglayer::convertToBitmapEx bDoSaveForVisualControl
     0
-editeng/source/editeng/impedit.hxx:531
-    ImpEditEngine nBigTextObjectStart
+editeng/source/editeng/impedit.hxx:582
+    ImpEditEngine mnBigTextObjectStart
     20
-emfio/source/reader/emfreader.cxx:1584
+emfio/qa/cppunit/wmf/wmfimporttest.cxx:34
+    WmfTest maDataUrl
+    /emfio/qa/cppunit/wmf/data/
+emfio/source/reader/emfreader.cxx:1610
     emfio::EmfReader::ReadEnhWMF bDoSaveForVisualControl
     0
-extensions/source/bibliography/bibcont.hxx:68
-    BibBookContainer aIdle
-    extensions BibBookContainer Split Idle
-filter/source/msfilter/msdffimp.cxx:2631
+enjdk-amd64/include/jawt.h:247
+    jawt version
+    65539
+enjdk-amd64/include/jni.h:1894
+    JavaVMInitArgs version
+    65538
+enjdk-amd64/include/jni.h:1898
+    JavaVMInitArgs ignoreUnrecognized
+    1
+extensions/source/bibliography/toolbar.hxx:145
+    BibToolBar aIdle
+    BibToolBar
+external/bluez_bluetooth/inc/bluetooth/rfcomm.h:43
+    sockaddr_rc rc_family
+    31
+external/bluez_bluetooth/inc/bluetooth/rfcomm.h:45
+    sockaddr_rc rc_channel
+    5
+external/sane/inc/sane/sane.h:170
+    SANE_Parameters format
+    5
+filter/source/msfilter/msdffimp.cxx:2707
     DffPropertyReader::ApplyAttributes bCheckShadow
     0
-filter/source/msfilter/viscache.hxx:30
+filter/source/msfilter/viscache.hxx:29
     Impl_OlePres nFormat
     3
-framework/source/services/autorecovery.cxx:398
-    (anonymous namespace)::AutoRecovery m_aTimer
-    Auto save timer
-framework/source/uiconfiguration/imagemanagerimpl.hxx:173
+framework/source/uiconfiguration/imagemanagerimpl.hxx:168
     framework::ImageManagerImpl m_aResourceString
     private:resource/images/moduleimages
-helpcompiler/inc/BasCodeTagger.hxx:28
+helpcompiler/inc/BasCodeTagger.hxx:27
     BasicCodeTagger m_Highlighter
     0
-i18npool/source/localedata/localedata.cxx:50
-    /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
-    localedata_en
-i18npool/source/localedata/localedata.cxx:51
-    /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
-    localedata_es
-i18npool/source/localedata/localedata.cxx:52
-    /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO
-    localedata_euro
-i18npool/source/localedata/localedata.cxx:53
-    /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS
-    localedata_others
-idlc/source/idlccompile.cxx:51
-    /home/noel/libo2/idlc/source/idlccompile.cxx yydebug
-    0
+i18npool/inc/breakiterator_unicode.hxx:74
+    i18npool::BreakIterator_Unicode lineRule
+    line
 include/basegfx/pixel/bpixel.hxx:41
-    basegfx::BPixel::(anonymous union)::(anonymous) mnValue
+    basegfx::BPixel::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/include/basegfx/pixel/bpixel.hxx:39:13) mnValue
     0
 include/basegfx/pixel/bpixel.hxx:42
-    basegfx::BPixel::(anonymous) maCombinedRGBO
+    basegfx::BPixel::(unnamed union at /home/noel/libo-plugin/include/basegfx/pixel/bpixel.hxx:29:9) maCombinedRGBA
     0
-include/basic/sbxvar.hxx:73
-    SbxValues::(anonymous) pData
+include/basegfx/utils/gradienttools.hxx:42
+    (anonymous namespace)::ColorToBColorConverter 
+    0
+include/basegfx/utils/gradienttools.hxx:44
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:42:9) 
+    0
+include/basegfx/utils/gradienttools.hxx:54
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union)::(anonymous struct at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) T
+    0
+include/basic/sbxvar.hxx:75
+    SbxValues::(anonymous union at /home/noel/libo-plugin/include/basic/sbxvar.hxx:43:5) pData
     0
 include/comphelper/parallelsort.hxx:88
     comphelper::(anonymous namespace)::ProfileZone mbDummy
     1
-include/editeng/swafopt.hxx:58
+include/docmodel/theme/FormatScheme.hxx:239
+    model::BlipEffect mnRadius
+    0
+include/docmodel/theme/FormatScheme.hxx:240
+    model::BlipEffect mbGrow
+    0
+include/docmodel/theme/FormatScheme.hxx:241
+    model::BlipEffect mnAlpha
+    0
+include/docmodel/theme/FormatScheme.hxx:243
+    model::BlipEffect mnHue
+    0
+include/docmodel/theme/FormatScheme.hxx:244
+    model::BlipEffect mnSaturation
+    0
+include/docmodel/theme/FormatScheme.hxx:245
+    model::BlipEffect mnLuminance
+    0
+include/docmodel/theme/FormatScheme.hxx:373
+    model::DashStop mnDashLength
+    0
+include/docmodel/theme/FormatScheme.hxx:374
+    model::DashStop mnStopLength
+    0
+include/editeng/lrspitem.hxx:254
+    SvxGutterRightMarginItem m_nRightGutterMargin
+    0
+include/editeng/swafopt.hxx:59
     editeng::SortedAutoCompleteStrings owning_
     1
 include/filter/msfilter/dffpropset.hxx:33
@@ -226,58 +283,34 @@ include/filter/msfilter/dffpropset.hxx:34
 include/filter/msfilter/dffpropset.hxx:35
     DffPropFlags bBlip
     1
-include/i18nutil/casefolding.hxx:58
-    i18nutil::Mapping nmap
-    0
-include/o3tl/cow_wrapper.hxx:204
+include/o3tl/cow_wrapper.hxx:200
     o3tl::cow_wrapper::impl_t m_ref_count
     1
-include/o3tl/vector_pool.hxx:93
+include/o3tl/vector_pool.hxx:94
     o3tl::detail::struct_from_value::type nextFree
     -1
-include/oox/core/contexthandler2.hxx:216
+include/oox/core/contexthandler2.hxx:231
     oox::core::ContextHandler2Helper mnRootStackSize
     0
 include/oox/dump/dumperbase.hxx:1680
     oox::dump::RecordObjectBase mbBinaryOnly
     0
-include/oox/ole/axcontrol.hxx:426
+include/oox/ole/axcontrol.hxx:427
     oox::ole::ComCtlModelBase mbCommonPart
     1
-include/oox/ole/axcontrol.hxx:427
+include/oox/ole/axcontrol.hxx:428
     oox::ole::ComCtlModelBase mbComplexPart
     1
-include/sfx2/msg.hxx:187
-    SfxSlot nGroupId
-    0
-include/sfx2/msg.hxx:191
-    SfxSlot nValue
-    0
-include/sfx2/msg.hxx:196
-    SfxSlot pType
-    0
-include/sfx2/msg.hxx:200
-    SfxSlot pFirstArgDef
-    0
-include/sfx2/msg.hxx:201
-    SfxSlot nArgDefCount
-    0
-include/sfx2/templatedlg.hxx:131
-    SfxTemplateManagerDlg m_aUpdateDataTimer
-    UpdateDataTimer
-include/svtools/ctrlbox.hxx:337
+include/svtools/ctrlbox.hxx:331
     FontNameBox maUpdateIdle
     FontNameBox Preview Update
-include/svtools/filechangedchecker.hxx:31
-    FileChangedChecker mTimer
-    SVTools FileChangedChecker Timer
-include/svtools/svparser.hxx:55
+include/svtools/svparser.hxx:56
     SvParser pImplData
     0
-include/svtools/svparser.hxx:73
+include/svtools/svparser.hxx:74
     SvParser::TokenStackType nTokenValue
     0
-include/svtools/svparser.hxx:74
+include/svtools/svparser.hxx:75
     SvParser::TokenStackType bTokenHasValue
     0
 include/svtools/tabbar.hxx:323
@@ -290,25 +323,34 @@ include/svx/ctredlin.hxx:93
     SvxRedlinTable aDaTiLast
     0
 include/svx/deflt3d.hxx:40
-    E3dDefaultAttributes bDefaultCubePosIsCenter
+    E3dDefaultAttributes m_bDefaultCubePosIsCenter
     0
 include/svx/deflt3d.hxx:47
-    E3dDefaultAttributes bDefaultLatheSmoothed
+    E3dDefaultAttributes m_bDefaultLatheSmoothed
     1
 include/svx/deflt3d.hxx:48
-    E3dDefaultAttributes bDefaultLatheSmoothFrontBack
+    E3dDefaultAttributes m_bDefaultLatheSmoothFrontBack
     0
 include/svx/deflt3d.hxx:50
-    E3dDefaultAttributes bDefaultLatheCloseFront
+    E3dDefaultAttributes m_bDefaultLatheCloseFront
     1
 include/svx/deflt3d.hxx:51
-    E3dDefaultAttributes bDefaultLatheCloseBack
+    E3dDefaultAttributes m_bDefaultLatheCloseBack
     1
 include/svx/deflt3d.hxx:54
-    E3dDefaultAttributes bDefaultExtrudeSmoothed
+    E3dDefaultAttributes m_bDefaultExtrudeSmoothed
     1
 include/svx/deflt3d.hxx:55
-    E3dDefaultAttributes bDefaultExtrudeSmoothFrontBack
+    E3dDefaultAttributes m_bDefaultExtrudeSmoothFrontBack
+    0
+include/svx/diagram/IDiagramHelper.hxx:72
+    svx::diagram::IDiagramHelper mbUseDiagramThemeData
+    0
+include/svx/diagram/IDiagramHelper.hxx:77
+    svx::diagram::IDiagramHelper mbUseDiagramModelData
+    1
+include/svx/diagram/IDiagramHelper.hxx:81
+    svx::diagram::IDiagramHelper mbForceThemePtrRecreation
     0
 include/svx/fontwork.hxx:77
     SvxFontWorkDialog aInputIdle
@@ -316,17 +358,14 @@ include/svx/fontwork.hxx:77
 include/svx/graphctl.hxx:53
     GraphCtrl aUpdateIdle
     svx GraphCtrl Update
-include/svx/numvset.hxx:92
-    SvxBmpNumValueSet aFormatIdle
-    SvxBmpNumValueSet FormatIdle
-include/svx/srchdlg.hxx:141
+include/svx/srchdlg.hxx:151
     SvxSearchDialog m_aPresentIdle
     Bring SvxSearchDialog to Foreground
 include/svx/svdcrtv.hxx:50
-    SdrCreateView nAutoCloseDistPix
+    SdrCreateView mnAutoCloseDistPix
     5
 include/svx/svdcrtv.hxx:51
-    SdrCreateView nFreeHandMinDistPix
+    SdrCreateView mnFreeHandMinDistPix
     10
 include/svx/svdmark.hxx:144
     SdrMarkList mbPointNameOk
@@ -334,106 +373,142 @@ include/svx/svdmark.hxx:144
 include/svx/svdmark.hxx:145
     SdrMarkList mbGluePointNameOk
     0
-include/vcl/opengl/OpenGLContext.hxx:116
-    OpenGLContext maClipRegion
+include/tools/stream.hxx:108
+    SvLockBytes m_pStream
     0
-include/vcl/settings.hxx:145
+include/vcl/animate/Animation.hxx:106
+    Animation maTimer
+    vcl::Animation
+include/vcl/menubarupdateicon.hxx:49
+    MenuBarUpdateIconManager maTimeoutTimer
+    MenuBarUpdateIconManager
+include/vcl/settings.hxx:144
     DialogStyle content_area_border
     2
-include/vcl/settings.hxx:146
+include/vcl/settings.hxx:145
     DialogStyle button_spacing
     6
-include/vcl/settings.hxx:147
+include/vcl/settings.hxx:146
     DialogStyle action_area_border
     5
-include/vcl/toolkit/treelistbox.hxx:213
+include/vcl/toolkit/treelistbox.hxx:210
     SvTreeListBox nIndent
     20
+include/vcl/weldutils.hxx:410
+    weld::ButtonPressRepeater m_aRepeat
+    vcl ButtonPressRepeater m_aRepeat
 io/qa/textinputstream.cxx:97
     (anonymous namespace)::Input open_
     1
-libreofficekit/source/gtk/lokdocview.cxx:85
+libreofficekit/source/gtk/lokdocview.cxx:86
     (anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading
     0
-oox/source/core/contexthandler2.cxx:36
+lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx:39
+    LanguageToolGrammarChecker mCachedResults
+    10
+lotuswordpro/source/filter/lwppara.hxx:213
+    LwpPara m_AllText
+    
+ltInternals.h:1708
+    _xsltTransformContext state
+    2
+o.h:203
+    _cairo_matrix yy
+    1
+oox/source/core/contexthandler2.cxx:40
     oox::core::ElementInfo maChars
     0
-opencl/source/opencl_device.cxx:53
+oox/source/drawingml/scene3dhelper.cxx:469
+    oox::(anonymous namespace)::MSOLight fMSOColorR
+    1\10
+oox/source/drawingml/scene3dhelper.cxx:470
+    oox::(anonymous namespace)::MSOLight fMSOColorG
+    1\10
+oox/source/drawingml/scene3dhelper.cxx:471
+    oox::(anonymous namespace)::MSOLight fMSOColorB
+    1\10
+opencl/source/opencl_device.cxx:52
     (anonymous namespace)::LibreOfficeDeviceEvaluationIO inputSize
     15360
-opencl/source/opencl_device.cxx:54
+opencl/source/opencl_device.cxx:53
     (anonymous namespace)::LibreOfficeDeviceEvaluationIO outputSize
     15360
-package/inc/ZipFile.hxx:61
+package/inc/ZipFile.hxx:59
     ZipFile aInflater
     1
-package/source/zipapi/XUnbufferedStream.hxx:57
+package/source/zipapi/XUnbufferedStream.hxx:55
     XUnbufferedStream maInflater
     1
 pyuno/source/module/pyuno_gc.cxx:30
     pyuno g_destructorsOfStaticObjectsHaveBeenCalled
     1
-pyuno/source/module/pyuno_impl.hxx:226
+pyuno/source/module/pyuno_impl.hxx:225
     pyuno::RuntimeCargo valid
     1
-sal/osl/unx/sockimpl.hxx:39
+sal/osl/unx/signal.cxx:58
+    (anonymous namespace)::SignalAction Action
+    1
+sal/osl/unx/sockimpl.hxx:38
     oslSocketImpl m_bIsInShutdown
     1
-sal/qa/osl/condition/osl_Condition_Const.h:41
-    /home/noel/libo2/sal/qa/osl/condition/osl_Condition.cxx aTestCon
-    testcondition
-sal/qa/osl/file/osl_File_Const.h:115
+sal/qa/osl/file/osl_File_Const.h:118
     extern aPreURL
     file:///
-sal/qa/osl/file/osl_File_Const.h:128
+sal/qa/osl/file/osl_File_Const.h:119
+    extern aRootURL
+    file:////
+sal/qa/osl/file/osl_File_Const.h:131
     extern aCanURL3
     ca@#;+.,$//tmp/678nonical//name
-sal/qa/osl/file/osl_File_Const.h:141
+sal/qa/osl/file/osl_File_Const.h:132
+    extern aCanURL4
+    canonical.name
+sal/qa/osl/file/osl_File_Const.h:144
     extern aRelURL1
     relative/file1
-sal/qa/osl/file/osl_File_Const.h:142
+sal/qa/osl/file/osl_File_Const.h:145
     extern aRelURL2
     relative/./file2
-sal/qa/osl/file/osl_File_Const.h:143
+sal/qa/osl/file/osl_File_Const.h:146
     extern aRelURL3
     relative/../file3
-sal/qa/osl/file/osl_File_Const.h:165
+sal/qa/osl/file/osl_File_Const.h:168
     extern aTypeURL1
     file:///dev/ccv
-sal/qa/osl/file/osl_File_Const.h:166
+sal/qa/osl/file/osl_File_Const.h:169
     extern aTypeURL2
     file:///devices/pseudo/tcp@0:tcp
-sal/qa/osl/file/osl_File_Const.h:167
+sal/qa/osl/file/osl_File_Const.h:170
     extern aTypeURL3
     file:///lib
-sal/qa/osl/file/osl_File_Const.h:182
+sal/qa/osl/file/osl_File_Const.h:185
     extern aVolURL2
     file:///dev/floppy/0u1440
-sal/qa/osl/file/osl_File_Const.h:184
+sal/qa/osl/file/osl_File_Const.h:187
     extern aVolURL3
     file:///proc
-sal/qa/osl/file/osl_File_Const.h:185
+sal/qa/osl/file/osl_File_Const.h:188
     extern aVolURL4
     file:///staroffice
-sal/qa/osl/file/osl_File_Const.h:186
+sal/qa/osl/file/osl_File_Const.h:189
     extern aVolURL5
     file:///tmp
-sal/qa/osl/file/osl_File_Const.h:187
+sal/qa/osl/file/osl_File_Const.h:190
     extern aVolURL6
     file:///cdrom
-sal/qa/osl/process/osl_process.cxx:151
+sal/qa/osl/process/osl_process.cxx:139
     Test_osl_executeProcess env_param_
     -env
-sal/qa/osl/process/osl_Thread.cxx:224
+sal/qa/osl/process/osl_Thread.cxx:219
     (anonymous namespace)::myThread m_aFlag
     0
-sal/qa/osl/process/osl_Thread.cxx:264
+sal/qa/osl/process/osl_Thread.cxx:259
     (anonymous namespace)::OCountThread m_aFlag
     0
-sal/qa/osl/process/osl_Thread.cxx:327
+sal/qa/osl/process/osl_Thread.cxx:322
     (anonymous namespace)::ONoScheduleThread m_aFlag
     0
-sal/qa/osl/process/osl_Thread.cxx:368
+sal/qa/osl/process/osl_Thread.cxx:363
     (anonymous namespace)::OAddThread m_aFlag
     0
 sal/qa/rtl/process/rtl_Process_Const.h:29
@@ -449,189 +524,180 @@ sal/qa/rtl/process/rtl_Process_Const.h:32
     extern suParam3
     -process
 sal/qa/rtl/strings/test_ostring_stringliterals.cxx:22
-    /home/noel/libo2/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
+    /home/noel/libo-plugin/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
     0
-sal/qa/rtl/strings/test_strings_replace.cxx:24
+sal/qa/rtl/strings/test_strings_replace.cxx:22
     (anonymous) s_bar
     bar
-sal/qa/rtl/strings/test_strings_replace.cxx:25
+sal/qa/rtl/strings/test_strings_replace.cxx:23
     (anonymous) s_bars
     bars
-sal/qa/rtl/strings/test_strings_replace.cxx:26
+sal/qa/rtl/strings/test_strings_replace.cxx:24
     (anonymous) s_foo
     foo
-sal/qa/rtl/strings/test_strings_replace.cxx:27
+sal/qa/rtl/strings/test_strings_replace.cxx:25
     (anonymous) s_other
     other
-sal/qa/rtl/strings/test_strings_replace.cxx:28
+sal/qa/rtl/strings/test_strings_replace.cxx:26
     (anonymous) s_xa
     xa
-sal/qa/rtl/strings/test_strings_replace.cxx:29
+sal/qa/rtl/strings/test_strings_replace.cxx:27
     (anonymous) s_xx
     xx
-sax/source/tools/fastserializer.hxx:232
-    sax_fastparser::FastSaxSerializer mbXescape
-    1
-sc/inc/compiler.hxx:113
-    ScRawToken::(anonymous union)::(anonymous) eInForceArray
+sc/inc/cellvalue.hxx:111
+    ScRefCellValue 
+    0\10
+sc/inc/cellvalue.hxx:112
+    ScRefCellValue::(anonymous union at /home/noel/libo-plugin/sc/inc/cellvalue.hxx:111:5) mfValue
+    0\10
+sc/inc/compiler.hxx:117
+    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sc/inc/compiler.hxx:115:9) eInForceArray
     0
-sc/inc/drwlayer.hxx:221
-    /home/noel/libo2/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
+sc/inc/drwlayer.hxx:234
+    /home/noel/libo-plugin/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
     0
-sc/inc/global.hxx:911
-    /home/noel/libo2/sc/source/core/data/global.cxx pScActiveViewShell
+sc/inc/global.hxx:927
+    /home/noel/libo-plugin/sc/source/core/data/global.cxx pScActiveViewShell
     0
-sc/inc/global.hxx:912
-    /home/noel/libo2/sc/source/core/data/global.cxx nScClickMouseModifier
+sc/inc/global.hxx:928
+    /home/noel/libo-plugin/sc/source/core/data/global.cxx nScClickMouseModifier
     0
-sc/inc/global.hxx:913
-    /home/noel/libo2/sc/source/core/data/global.cxx nScFillModeMouseModifier
+sc/inc/global.hxx:929
+    /home/noel/libo-plugin/sc/source/core/data/global.cxx nScFillModeMouseModifier
     0
-sc/inc/hints.hxx:32
-    ScPaintHint bPrint
-    1
 sc/inc/markmulti.hxx:81
     ScMultiSelIter aMarkArrayIter
     0
-sc/inc/refdata.hxx:39
-    ScSingleRefData::(anonymous) mnFlagValue
+sc/inc/pivot/PivotTableFormats.hxx:30
+    sc::Selection bSelected
+    0
+sc/inc/pivot/PivotTableFormats.hxx:31
+    sc::Selection nField
+    0
+sc/inc/pivot/PivotTableFormats.hxx:44
+    sc::PivotTableFormat bSelected
+    0
+sc/inc/refdata.hxx:38
+    ScSingleRefData::(anonymous union at /home/noel/libo-plugin/sc/inc/refdata.hxx:36:5) mnFlagValue
     0
-sc/inc/scmod.hxx:82
-    ScModule m_aIdleTimer
-    sc ScModule IdleTimer
-sc/inc/table.hxx:180
+sc/inc/table.hxx:190
     ScTable mpRowHeights
     0
-sc/qa/extras/check_data_pilot_field.cxx:63
+sc/qa/extras/sccheck_data_pilot_field.cxx:58
     sc_apitest::CheckDataPilotField mMaxFieldIndex
     6
+sc/qa/unit/helper/qahelper.hxx:65
+    RangeNameDef mnIndex
+    1
 sc/qa/unit/screenshots/screenshots.cxx:40
     ScScreenshotTest mCsv
     some, strings, here, separated, by, commas
-sc/qa/unit/ucalc.hxx:43
-    Test::RangeNameDef mnIndex
-    1
-sc/source/core/inc/parclass.hxx:94
+sc/source/core/data/queryiter.cxx:1293
+    ScQueryCellIteratorAccessSpecific<ScQueryCellIteratorAccess::SortedCache>::SortedCacheIndexer mLowIndex
+    0
+sc/source/core/inc/interpre.hxx:83
+    VectorSearchArguments nTab2
+    0
+sc/source/core/inc/parclass.hxx:93
     ScParameterClassification::RunData bHasForceArray
     1
-sc/source/core/tool/scmatrix.cxx:344
-    /home/noel/libo2/sc/source/core/tool/scmatrix.cxx bElementsMaxFetched
-    1
-sc/source/filter/inc/extlstcontext.hxx:20
-    /home/noel/libo2/sc/source/filter/oox/condformatbuffer.cxx rStyleIdx
+sc/source/core/inc/sharedstringpoolpurge.hxx:42
+    sc::SharedStringPoolPurge mTimer
+    SharedStringPoolPurge
+sc/source/filter/inc/extlstcontext.hxx:19
+    /home/noel/libo-plugin/sc/source/filter/oox/condformatbuffer.cxx gnStyleIdx
     0
-sc/source/filter/inc/orcusinterface.hxx:187
+sc/source/filter/inc/orcusinterface.hxx:195
     ScOrcusConditionalFormat meEntryType
     0
-sc/source/filter/inc/xltracer.hxx:82
+sc/source/filter/inc/xltracer.hxx:81
     XclTracer mbEnabled
     0
-sc/source/ui/inc/acredlin.hxx:51
-    ScAcceptChgDlg aSelectionIdle
-    ScAcceptChgDlg SelectionIdle
-sc/source/ui/inc/acredlin.hxx:52
-    ScAcceptChgDlg aReOpenIdle
-    ScAcceptChgDlg ReOpenIdle
-sc/source/ui/inc/autostyl.hxx:59
-    ScAutoStyleList aTimer
-    ScAutoStyleList Timer
-sc/source/ui/inc/autostyl.hxx:60
-    ScAutoStyleList aInitIdle
-    ScAutoStyleList InitIdle
-sc/source/ui/inc/conflictsdlg.hxx:120
-    ScConflictsDlg maSelectionIdle
-    ScConflictsDlg SelectionIdle
-sc/source/ui/inc/viewdata.hxx:289
+sc/source/ui/docshell/datastream.cxx:100
+    sc::datastreams::ReaderThread mbTerminate
+    0
+sc/source/ui/inc/dataprovider.hxx:41
+    sc::CSVFetchThread mbTerminate
+    0
+sc/source/ui/inc/inscldlg.hxx:37
+    ScInsertCellDlg MAX_INS_ROWS
+    4000
+sc/source/ui/inc/inscldlg.hxx:38
+    ScInsertCellDlg MAX_INS_COLS
+    4000
+sc/source/ui/inc/viewdata.hxx:290
     ScViewData aLogicMode
     0
-sc/source/ui/inc/viewfunc.hxx:378
-    /home/noel/libo2/sc/source/ui/view/viewfun7.cxx bPasteIsMove
+sc/source/ui/inc/viewfunc.hxx:394
+    /home/noel/libo-plugin/sc/source/ui/view/viewfun7.cxx bPasteIsMove
     0
-sccomp/source/solver/SwarmSolver.cxx:124
+sc/source/ui/view/viewfunc.cxx:159
+    (anonymous namespace)::FormulaProcessingContext bNumFmtChanged
+    1
+sccomp/source/solver/SwarmSolver.cxx:123
     (anonymous namespace)::SwarmSolver mfResultValue
     0\10
-sd/inc/sdpptwrp.hxx:44
-    SdPPTFilter pBas
-    0
-sd/source/filter/html/htmlex.hxx:116
-    HtmlExport mbAutoSlide
-    1
-sd/source/ui/animations/CustomAnimationPane.hxx:146
+sd/source/ui/inc/CustomAnimationPane.hxx:144
     sd::CustomAnimationPane maIdle
     sd idle treeview select
-sd/source/ui/framework/module/ShellStackGuard.hxx:84
-    sd::framework::ShellStackGuard maPrinterPollingIdle
-    sd ShellStackGuard PrinterPollingIdle
-sd/source/ui/inc/DrawController.hxx:292
-    sd::DrawController mpCurrentPage
-    0
-sd/source/ui/inc/pubdlg.hxx:157
-    SdPublishingDlg aAssistentFunc
-    6
-sd/source/ui/inc/View.hxx:263
+sd/source/ui/inc/View.hxx:269
     sd::View maDropErrorIdle
     sd View DropError
-sd/source/ui/inc/View.hxx:264
+sd/source/ui/inc/View.hxx:270
     sd::View maDropInsertFileIdle
     sd View DropInsertFile
-sd/source/ui/inc/WindowUpdater.hxx:98
+sd/source/ui/inc/WindowUpdater.hxx:97
     sd::WindowUpdater maCTLOptions
     0
-sd/source/ui/presenter/SlideRenderer.hxx:82
+sd/source/ui/presenter/SlideRenderer.hxx:78
     sd::presenter::SlideRenderer maPreviewRenderer
     1
-sd/source/ui/remotecontrol/DiscoveryService.hxx:37
-    sd::DiscoveryService zService
-    0
-sd/source/ui/sidebar/PanelBase.hxx:54
-    sd::sidebar::PanelBase mpWrappedControl
-    0
-sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx:42
+sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx:41
     sd::slidesorter::cache::BitmapFactory maRenderer
     0
-sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:92
+sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:91
     sd::slidesorter::controller::Animator maIdle
     sd slidesorter controller Animator
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:60
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:44
     (anonymous namespace)::StringEmitContext m_aBuf
     256
-sfx2/inc/autoredactdialog.hxx:97
+sfx2/inc/autoredactdialog.hxx:102
     SfxAutoRedactDialog m_bIsValidState
     1
-sfx2/source/appl/lnkbase2.cxx:79
+sfx2/source/appl/lnkbase2.cxx:62
     sfx2::ImplBaseLinkData::tDDEType pItem
     0
-sfx2/source/appl/lnkbase2.cxx:84
-    sfx2::ImplBaseLinkData::(anonymous) DDEType
+sfx2/source/appl/lnkbase2.cxx:67
+    sfx2::ImplBaseLinkData::(anonymous union at /home/noel/libo-plugin/sfx2/source/appl/lnkbase2.cxx:65:5) DDEType
     0
-sfx2/source/appl/lnkbase2.cxx:103
+sfx2/source/appl/lnkbase2.cxx:86
     sfx2::(anonymous namespace)::ImplDdeItem bIsInDTOR
     1
-sfx2/source/appl/newhelp.hxx:93
+sfx2/source/appl/newhelp.hxx:94
     IndexTabPage_Impl aFactoryIdle
     sfx2 appl IndexTabPage_Impl Factory
-sfx2/source/appl/newhelp.hxx:94
+sfx2/source/appl/newhelp.hxx:95
     IndexTabPage_Impl aAutoCompleteIdle
     sfx2 appl IndexTabPage_Impl AutoComplete
-sfx2/source/appl/newhelp.hxx:226
+sfx2/source/appl/newhelp.hxx:228
     SfxHelpIndexWindow_Impl aIdle
     sfx2 appl SfxHelpIndexWindow_Impl
-sfx2/source/appl/newhelp.hxx:346
+sfx2/source/appl/newhelp.hxx:348
     SfxHelpTextWindow_Impl aSelectIdle
     sfx2 appl SfxHelpTextWindow_Impl Select
-sfx2/source/control/itemdel.cxx:31
-    SfxItemDisruptor_Impl m_Idle
-    sfx SfxItemDisruptor_Impl::Delete
-slideshow/source/engine/slideshowimpl.cxx:473
+slideshow/source/engine/slideshowimpl.cxx:486
     (anonymous namespace)::SlideShowImpl maFrameSynchronization
     0.02\10
+solenv/lockfile/dotlockfile.c:44
+    /home/noel/libo-plugin/solenv/lockfile/dotlockfile.c quiet
+    1
 soltools/cpp/_cpp.c:31
-    /home/noel/libo2/soltools/cpp/_cpp.c nerrs
+    /home/noel/libo-plugin/soltools/cpp/_cpp.c nerrs
     1
 soltools/cpp/_eval.c:742
     tokval cvlen
     20
-soltools/cpp/_macro.c:168
+soltools/cpp/_macro.c:172
     doadefine onestr
     1
 soltools/cpp/cpp.h:120
@@ -644,269 +710,260 @@ soltools/mkdepend/def.h:118
     inclist i_searched
     1
 soltools/mkdepend/def.h:185
-    /home/noel/libo2/soltools/mkdepend/main.c printed
+    /home/noel/libo-plugin/soltools/mkdepend/main.c printed
     0
 soltools/mkdepend/def.h:185
-    /home/noel/libo2/soltools/mkdepend/pr.c printed
+    /home/noel/libo-plugin/soltools/mkdepend/pr.c printed
     1
 soltools/mkdepend/def.h:189
-    /home/noel/libo2/soltools/mkdepend/main.c show_where_not
+    /home/noel/libo-plugin/soltools/mkdepend/main.c show_where_not
     0
-starmath/inc/edit.hxx:57
-    SmEditWindow aModifyIdle
-    SmEditWindow ModifyIdle
-starmath/inc/cfgitem.hxx:109
+starmath/inc/cfgitem.hxx:105
     SmMathConfig vFontPickList
     5
 stoc/source/corereflection/lrucache.hxx:52
     LRU_Cache _pBlock
     0
-stoc/source/inspect/introspection.cxx:1506
+stoc/source/inspect/introspection.cxx:1509
     (anonymous namespace)::Cache::Data hits
     1
-stoc/source/security/access_controller.cxx:65
+stoc/source/security/access_controller.cxx:66
     (anonymous) s_envType
     gcc3
-stoc/source/security/access_controller.cxx:304
+stoc/source/security/access_controller.cxx:301
     (anonymous namespace)::AccessController m_rec
     0
 stoc/source/security/lru_cache.h:54
     stoc_sec::lru_cache m_block
     0
-svgio/source/svgreader/svgdocumenthandler.cxx:82
-    (anonymous namespace)::whiteSpaceHandling bNoGapsForBaselineShift
-    1
-svl/source/crypto/cryptosign.cxx:151
+svl/source/crypto/cryptosign.cxx:144
     (anonymous namespace)::TimeStampReq extensions
     0
-svx/inc/sdr/overlay/overlaymanagerbuffered.hxx:42
-    sdr::overlay::OverlayManagerBuffered maBufferIdle
-    sdr overlay OverlayManagerBuffered Idle
-svx/source/dialog/contimp.hxx:70
-    SvxSuperContourDlg aUpdateIdle
-    SvxSuperContourDlg UpdateIdle
-svx/source/dialog/contimp.hxx:71
-    SvxSuperContourDlg aCreateIdle
-    SvxSuperContourDlg CreateIdle
-svx/source/inc/StylesPreviewWindow.hxx:47
+svx/source/dialog/imapimp.hxx:33
+    IMapOwnData aIdle
+    svx IMapOwnData
+svx/source/inc/fmtextcontrolshell.hxx:109
+    svx::FmTextControlShell m_aClipboardInvalidation
+    svx FmTextControlShell m_aClipboardInvalidation
+svx/source/inc/StylesPreviewWindow.hxx:61
     StyleItemController m_eStyleFamily
     2
-svx/source/sdr/contact/viewcontactofsdrpage.cxx:104
+svx/source/sdr/contact/viewcontactofsdrpage.cxx:106
     sdr::contact::ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence bUseOldPageShadow
     0
-svx/source/sidebar/media/MediaPlaybackPanel.hxx:61
+svx/source/sidebar/media/MediaPlaybackPanel.hxx:57
     svx::sidebar::MediaPlaybackPanel maIdle
     MediaPlaybackPanel
-svx/source/tbxctrls/lboxctrl.cxx:49
+svx/source/tbxctrls/lboxctrl.cxx:51
     SvxPopupWindowListBox m_nVisRows
     10
-svx/source/unodraw/recoveryui.cxx:63
+svx/source/unodraw/recoveryui.cxx:64
     (anonymous namespace)::RecoveryUI m_pParentWindow
     0
-sw/inc/authfld.hxx:151
+sw/inc/authfld.hxx:163
     SwAuthorityField m_nTempSequencePos
     -1
-sw/inc/authfld.hxx:152
+sw/inc/authfld.hxx:164
     SwAuthorityField m_nTempSequencePosRLHidden
     -1
 sw/inc/checkit.hxx:38
-    /home/noel/libo2/sw/source/core/bastyp/init.cxx pCheckIt
+    /home/noel/libo-plugin/sw/source/core/bastyp/init.cxx pCheckIt
     0
-sw/inc/dbgoutsw.hxx:51
-    /home/noel/libo2/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
+sw/inc/dbgoutsw.hxx:50
+    /home/noel/libo-plugin/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
     0
-sw/inc/dbgoutsw.hxx:52
-    /home/noel/libo2/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
+sw/inc/dbgoutsw.hxx:51
+    /home/noel/libo-plugin/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
     0
 sw/inc/ftninfo.hxx:46
     SwEndNoteInfo m_aFormat
     4
-sw/inc/hints.hxx:268
+sw/inc/hints.hxx:368
     SwAttrSetChg m_bDelSet
     0
-sw/inc/modcfg.hxx:210
+sw/inc/modcfg.hxx:209
     SwModuleOptions m_aWebInsertConfig
     1
-sw/inc/modcfg.hxx:213
+sw/inc/modcfg.hxx:212
     SwModuleOptions m_aWebTableConfig
     1
-sw/inc/swmodule.hxx:265
-    /home/noel/libo2/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
+sw/inc/swmodule.hxx:262
+    /home/noel/libo-plugin/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
     0
-sw/inc/swmodule.hxx:265
-    /home/noel/libo2/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
+sw/inc/swmodule.hxx:262
+    /home/noel/libo-plugin/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
     0
-sw/inc/swmodule.hxx:265
-    /home/noel/libo2/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
+sw/inc/swmodule.hxx:262
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
     0
-sw/inc/swmodule.hxx:265
-    /home/noel/libo2/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
+sw/inc/swmodule.hxx:262
+    /home/noel/libo-plugin/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
     1
-sw/inc/view.hxx:189
+sw/inc/textboxhelper.hxx:217
+    SwTextBoxNode m_bIsCloningInProgress
+    0
+sw/inc/view.hxx:204
     SwView m_pHScrollbar
     0
-sw/inc/view.hxx:190
+sw/inc/view.hxx:205
     SwView m_pVScrollbar
     0
-sw/inc/view.hxx:697
-    /home/noel/libo2/sw/source/uibase/uiview/view.cxx bDocSzUpdated
+sw/inc/view.hxx:758
+    /home/noel/libo-plugin/sw/source/uibase/uiview/view.cxx bDocSzUpdated
     1
-sw/inc/view.hxx:697
-    /home/noel/libo2/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
+sw/inc/view.hxx:758
+    /home/noel/libo-plugin/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
     0
-sw/inc/viewopt.hxx:194
+sw/inc/viewopt.hxx:50
+    ViewOptFlags1 bRef
+    1
+sw/inc/viewopt.hxx:300
     SwViewOption m_bTest10
     0
-sw/source/core/bastyp/calc.cxx:99
+sw/qa/extras/tiledrendering/tiledrendering.cxx:428
+    testGetTextSelectionLineLimit::TestBody sExpectedHtml
+    Estonian employs the <a href="https://en.wikipedia.org/wiki/Latin_script">Latin script</a> as the basis for <a href="https://en.wikipedia.org/wiki/Estonian_alphabet">its alphabet</a>, which adds the letters <a href="https://en.wikipedia.org/wiki/%C3%84"><i>\-61\-92</i></a>, <a href="https://en.wikipedia.org/wiki/%C3%96"><i>\-61\-74</i></a>, <a href="https://en.wikipedia.org/wiki/%C3%9C"><i>\-61\-68</i></a>, and <a href="https://en.wikipedia.org/wiki/%C3%95"><i>\-61\-75</i></a>, plus the later additions <a href="https://en.wikipedia.org/wiki/%C5%A0"><i>\-59\-95</i></a> and <a href="https://en.wikipedia.org/wiki/%C5%BD"><i>\-59\-66</i></a>. The letters <i>c</i>, <i>q</i>, <i>w</i>, <i>x</i> and <i>y</i> are limited to <a href="https://en.wikipedia.org/wiki/Proper_names">proper names</a> of foreign origin, and <i>f</i>, <i>z</i>, <i>\-59\-95</i>, and <i>\-59\-66</i> appear in loanwords and foreign names only. <i>\-61\-106</i> and <i>\-61\-100</i> are pronounced similarly to their equivalents in Swedish and German. Unlike in standard German but like Swedish (when followed by 'r') and Finnish, <i>\-61\-124</i> is pronounced [\-61\-90], as in English <i>mat</i>. The vowels \-61\-124, \-61\-106 and \-61\-100 are clearly separate <a href="https://en.wikipedia.org/wiki/Phonemes">phonemes</a> and inherent in Estonian, although the letter shapes come from German. The letter <a href="https://en.wikipedia.org/wiki/%C3%95"><i>\-61\-75</i></a> denotes /\-55\-92/, unrounded /o/, or a <a href="https://en.wikipedia.org/wiki/Close-mid_back_unrounded_vowel">close-mid back unrounded vowel</a>. It is almost identical to the <a href="https://en.wikipedia.org/wiki/Bulgarian_language">Bulgarian</a> <a href="https://en.wikipedia.org/wiki/%D0%AA">\-47\-118</a> /\-55\-92\-52\-98/ and the <a href="https://en.wikipedia.org/wiki/Vietnamese_language">Vietnamese</a> <a href="https://en.wikipedia.org/wiki/%C6%A0">\-58\-95</a>, and is also used to transcribe the Russian <a href="https://en.wikipedia.org/wiki/%D0%AB">\-47\-117</a>.
+sw/qa/extras/tiledrendering/tiledrendering.cxx:462
+    testGetTextSelectionMultiLine::TestBody sExpectedHtml
+    Heading</h2>\10<p>Let's have text; we need to be able to select the text inside the shape, but also the various individual ones too:</p>\10<p><br/><br/></p>\10<p><br/><br/></p>\10<p><br/><br/></p>\10<p><br/><br/></p>\10<p><br/><br/></p>\10<h1 class="western">And this is all for Writer shape objects</h1>\10<h2 class="western">Heading on second page</h2>
+sw/source/core/bastyp/calc.cxx:101
     CalcOp eOp
     0
-sw/source/core/doc/docredln.cxx:66
+sw/source/core/doc/docredln.cxx:74
     sw_DebugRedline nWatch
     0
-sw/source/core/docnode/threadmanager.hxx:125
-    ThreadManager maStartNewThreadIdle
-    SW ThreadManager StartNewThreadIdle
-sw/source/core/inc/DocumentTimerManager.hxx:75
-    sw::DocumentTimerManager m_aFireIdleJobsTimer
-    sw::DocumentTimerManager m_aFireIdleJobsTimer
-sw/source/core/inc/fntcache.hxx:60
-    /home/noel/libo2/sw/source/core/txtnode/fntcache.cxx pFntCache
+sw/source/core/inc/fntcache.hxx:57
+    /home/noel/libo-plugin/sw/source/core/txtnode/fntcache.cxx pFntCache
     0
-sw/source/core/inc/fntcache.hxx:61
-    /home/noel/libo2/sw/source/core/txtnode/fntcache.cxx pLastFont
+sw/source/core/inc/fntcache.hxx:58
+    /home/noel/libo-plugin/sw/source/core/txtnode/fntcache.cxx pLastFont
     0
 sw/source/core/inc/frmtool.hxx:153
-    /home/noel/libo2/sw/source/core/layout/frmtool.cxx bDontCreateObjects
-    0
-sw/source/core/inc/frmtool.hxx:156
-    /home/noel/libo2/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
+    /home/noel/libo-plugin/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
     0
 sw/source/core/inc/noteurl.hxx:28
-    /home/noel/libo2/sw/source/core/text/noteurl.cxx pNoteURL
+    /home/noel/libo-plugin/sw/source/core/text/noteurl.cxx pNoteURL
     0
 sw/source/core/inc/swfntcch.hxx:43
-    /home/noel/libo2/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
+    /home/noel/libo-plugin/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
     0
-sw/source/core/inc/txtfly.hxx:44
-    /home/noel/libo2/sw/source/core/text/txtinit.cxx pContourCache
+sw/source/core/inc/txtfly.hxx:46
+    /home/noel/libo-plugin/sw/source/core/text/txtinit.cxx pContourCache
     0
-sw/source/core/inc/UndoSort.hxx:38
-    SwSortUndoElement::(anonymous union)::(anonymous) nID
-    4294967295
 sw/source/core/inc/UndoSplitMove.hxx:57
     SwUndoMove m_bJoinNext
     0
-sw/source/core/layout/flylay.cxx:305
+sw/source/core/layout/flylay.cxx:304
     SwFlyFreeFrame::supportsAutoContour bOverrideHandleContourToAlwaysOff
     1
-sw/source/core/ole/ndole.cxx:1088
+sw/source/core/ole/ndole.cxx:1204
     SwOLEObj::tryToGetChartContentAsPrimitive2DSequence bAsynchronousLoadingAllowed
     0
-sw/source/core/text/pordrop.hxx:33
-    /home/noel/libo2/sw/source/core/text/txtinit.cxx pDropCapCache
+sw/source/core/text/pordrop.hxx:32
+    /home/noel/libo-plugin/sw/source/core/text/txtinit.cxx pDropCapCache
     0
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous union)::(anonymous) nJunk
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) nJunk
     0
-sw/source/filter/ww8/ww8par3.cxx:339
+sw/source/filter/ww8/ww8par3.cxx:337
     (anonymous namespace)::WW8LST bSimpleList
     1
-sw/source/filter/ww8/ww8par3.cxx:340
+sw/source/filter/ww8/ww8par3.cxx:338
     (anonymous namespace)::WW8LST bRestartHdn
     1
-sw/source/filter/ww8/ww8par3.cxx:376
+sw/source/filter/ww8/ww8par3.cxx:368
+    (anonymous namespace)::WW8LVL fLegal
+    1
+sw/source/filter/ww8/ww8par3.cxx:374
     (anonymous namespace)::WW8LVL bV6Prev
     1
-sw/source/filter/ww8/ww8par3.cxx:377
+sw/source/filter/ww8/ww8par3.cxx:375
     (anonymous namespace)::WW8LVL bV6PrSp
     1
-sw/source/filter/ww8/ww8par3.cxx:378
+sw/source/filter/ww8/ww8par3.cxx:376
     (anonymous namespace)::WW8LVL bV6
     1
-sw/source/filter/ww8/ww8par5.cxx:1565
+sw/source/filter/ww8/ww8par5.cxx:1623
     SwWW8ImplReader::Read_F_DocInfo aName10
     \15
-sw/source/filter/ww8/ww8par5.cxx:1566
+sw/source/filter/ww8/ww8par5.cxx:1624
     SwWW8ImplReader::Read_F_DocInfo aName11
     TITEL
-sw/source/filter/ww8/ww8par5.cxx:1568
+sw/source/filter/ww8/ww8par5.cxx:1626
     SwWW8ImplReader::Read_F_DocInfo aName12
     TITRE
-sw/source/filter/ww8/ww8par5.cxx:1570
+sw/source/filter/ww8/ww8par5.cxx:1628
     SwWW8ImplReader::Read_F_DocInfo aName13
     TITLE
-sw/source/filter/ww8/ww8par5.cxx:1572
+sw/source/filter/ww8/ww8par5.cxx:1630
     SwWW8ImplReader::Read_F_DocInfo aName14
     TITRO
-sw/source/filter/ww8/ww8par5.cxx:1574
+sw/source/filter/ww8/ww8par5.cxx:1632
     SwWW8ImplReader::Read_F_DocInfo aName20
     \21
-sw/source/filter/ww8/ww8par5.cxx:1575
+sw/source/filter/ww8/ww8par5.cxx:1633
     SwWW8ImplReader::Read_F_DocInfo aName21
     ERSTELLDATUM
-sw/source/filter/ww8/ww8par5.cxx:1577
+sw/source/filter/ww8/ww8par5.cxx:1635
     SwWW8ImplReader::Read_F_DocInfo aName22
     CR\-55\-55
-sw/source/filter/ww8/ww8par5.cxx:1579
+sw/source/filter/ww8/ww8par5.cxx:1637
     SwWW8ImplReader::Read_F_DocInfo aName23
     CREATED
-sw/source/filter/ww8/ww8par5.cxx:1581
+sw/source/filter/ww8/ww8par5.cxx:1639
     SwWW8ImplReader::Read_F_DocInfo aName24
     CREADO
-sw/source/filter/ww8/ww8par5.cxx:1583
+sw/source/filter/ww8/ww8par5.cxx:1641
     SwWW8ImplReader::Read_F_DocInfo aName30
     \22
-sw/source/filter/ww8/ww8par5.cxx:1584
+sw/source/filter/ww8/ww8par5.cxx:1642
     SwWW8ImplReader::Read_F_DocInfo aName31
     ZULETZTGESPEICHERTZEIT
-sw/source/filter/ww8/ww8par5.cxx:1586
+sw/source/filter/ww8/ww8par5.cxx:1644
     SwWW8ImplReader::Read_F_DocInfo aName32
     DERNIERENREGISTREMENT
-sw/source/filter/ww8/ww8par5.cxx:1588
+sw/source/filter/ww8/ww8par5.cxx:1646
     SwWW8ImplReader::Read_F_DocInfo aName33
     SAVED
-sw/source/filter/ww8/ww8par5.cxx:1590
+sw/source/filter/ww8/ww8par5.cxx:1648
     SwWW8ImplReader::Read_F_DocInfo aName34
     MODIFICADO
-sw/source/filter/ww8/ww8par5.cxx:1592
+sw/source/filter/ww8/ww8par5.cxx:1650
     SwWW8ImplReader::Read_F_DocInfo aName40
     \23
-sw/source/filter/ww8/ww8par5.cxx:1593
+sw/source/filter/ww8/ww8par5.cxx:1651
     SwWW8ImplReader::Read_F_DocInfo aName41
     ZULETZTGEDRUCKT
-sw/source/filter/ww8/ww8par5.cxx:1595
+sw/source/filter/ww8/ww8par5.cxx:1653
     SwWW8ImplReader::Read_F_DocInfo aName42
     DERNI\-56REIMPRESSION
-sw/source/filter/ww8/ww8par5.cxx:1597
+sw/source/filter/ww8/ww8par5.cxx:1655
     SwWW8ImplReader::Read_F_DocInfo aName43
     LASTPRINTED
-sw/source/filter/ww8/ww8par5.cxx:1599
+sw/source/filter/ww8/ww8par5.cxx:1657
     SwWW8ImplReader::Read_F_DocInfo aName44
     HUPS PUPS
-sw/source/filter/ww8/ww8par5.cxx:1601
+sw/source/filter/ww8/ww8par5.cxx:1659
     SwWW8ImplReader::Read_F_DocInfo aName50
     \24
-sw/source/filter/ww8/ww8par5.cxx:1602
+sw/source/filter/ww8/ww8par5.cxx:1660
     SwWW8ImplReader::Read_F_DocInfo aName51
     \-36BERARBEITUNGSNUMMER
-sw/source/filter/ww8/ww8par5.cxx:1604
+sw/source/filter/ww8/ww8par5.cxx:1662
     SwWW8ImplReader::Read_F_DocInfo aName52
     NUM\-55RODEREVISION
-sw/source/filter/ww8/ww8par5.cxx:1606
+sw/source/filter/ww8/ww8par5.cxx:1664
     SwWW8ImplReader::Read_F_DocInfo aName53
     REVISIONNUMBER
-sw/source/filter/ww8/ww8par5.cxx:1608
+sw/source/filter/ww8/ww8par5.cxx:1666
     SwWW8ImplReader::Read_F_DocInfo aName54
     SNUBBEL BUBBEL
-sw/source/filter/ww8/ww8par.hxx:669
+sw/source/filter/ww8/ww8par.hxx:663
     WW8FormulaControl mfUnknown
     0
-sw/source/filter/ww8/ww8par.hxx:676
+sw/source/filter/ww8/ww8par.hxx:670
     WW8FormulaControl mhpsCheckBox
     20
-sw/source/filter/ww8/ww8par.hxx:1033
-    WW8TabBandDesc bCantSplit90
-    0
 sw/source/filter/ww8/ww8scan.hxx:1166
     WW8Fib m_fObfuscated
     0
@@ -923,209 +980,215 @@ sw/source/filter/ww8/ww8struc.hxx:542
     WW8_TCell fUnused
     0
 sw/source/filter/ww8/ww8struc.hxx:899
-    WW8_TablePos nSp37
+    WW8_TablePos nPWr
     2
-sw/source/ui/envelp/labfmt.hxx:68
-    SwLabFormatPage aPreviewIdle
+sw/source/ui/envelp/labfmt.hxx:67
+    SwLabFormatPage m_aPreviewIdle
     SwLabFormatPage Preview
+sw/source/uibase/inc/convert.hxx:50
+    SwConvertTableDlg m_bSetAutoFormat
+    0
 sw/source/uibase/inc/edtdd.hxx:15
-    /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
     0
-sw/source/uibase/inc/edtwin.hxx:302
-    /home/noel/libo2/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
+sw/source/uibase/inc/edtwin.hxx:78
+    SwEditWin m_aTimer
+    SwEditWin
+sw/source/uibase/inc/edtwin.hxx:305
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtdd.cxx g_bModePushed
     0
-sw/source/uibase/inc/edtwin.hxx:303
-    /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
+sw/source/uibase/inc/edtwin.hxx:306
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
     0
-sw/source/uibase/inc/edtwin.hxx:305
-    /home/noel/libo2/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr
+sw/source/uibase/inc/edtwin.hxx:307
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
+    0
+sw/source/uibase/inc/edtwin.hxx:308
+    /home/noel/libo-plugin/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr
     1
-sw/source/uibase/inc/edtwin.hxx:305
-    /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr
+sw/source/uibase/inc/edtwin.hxx:308
+    /home/noel/libo-plugin/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr
     0
-sw/source/uibase/inc/instable.hxx:44
+sw/source/uibase/inc/instable.hxx:45
     SwInsTableDlg minTableIndexInLb
     1
-sw/source/uibase/inc/pview.hxx:178
+sw/source/uibase/inc/pview.hxx:177
     SwPagePreview m_pHScrollbar
     0
-sw/source/uibase/inc/pview.hxx:179
+sw/source/uibase/inc/pview.hxx:178
     SwPagePreview m_pVScrollbar
     0
-sw/source/uibase/inc/srcedtw.hxx:84
+sw/source/uibase/inc/srcedtw.hxx:85
     SwSrcEditWindow m_aSyntaxIdle
     sw uibase SwSrcEditWindow Syntax
-sw/source/uibase/inc/unotools.hxx:46
+sw/source/uibase/inc/unotools.hxx:52
     SwOneExampleFrame m_aLoadedIdle
     sw uibase SwOneExampleFrame Loaded
-unotools/source/config/saveopt.cxx:82
-    (anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave
+sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx:270
+    writerfilter::dmapper::FieldParagraph m_bRemove
     0
-vcl/headless/svpgdi.cxx:600
-    (anonymous) nMinimalSquareSizeToBuffer
-    4096
-vcl/headless/svpgdi.cxx:1634
-    SvpSalGraphics::drawPolyLine bDoDirectCairoStroke
-    1
-vcl/inc/canvasbitmap.hxx:53
-    vcl::unotools::VclCanvasBitmap m_nEndianness
+sw/source/writerfilter/dmapper/SettingsTable.cxx:105
+    writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
+    3
+sw/source/writerfilter/rtftok/rtfcharsets.hxx:21
+    writerfilter::rtftok nRTFEncodings
+    31
+sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx:893
+    writerfilter::rtftok::RTFDocumentImpl m_nNestedTRLeft
     0
-vcl/inc/graphic/Manager.hxx:39
-    vcl::graphic::Manager maSwapOutTimer
-    graphic::Manager maSwapOutTimer
+sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx:894
+    writerfilter::rtftok::RTFDocumentImpl m_nTopLevelTRLeft
+    0
+sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx:897
+    writerfilter::rtftok::RTFDocumentImpl m_nNestedCurrentCellX
+    0
+sw/source/writerfilter/rtftok/rtftokenizer.hxx:60
+    writerfilter::rtftok::RTFTokenizer s_bControlWordsInitialised
+    1
+sw/source/writerfilter/rtftok/rtftokenizer.hxx:63
+    writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted
+    1
+test/source/a11y/accessibletestbase.cxx:412
+    ListenerHelper maTimeoutTimer
+    workaround timer if we don't catch WindowActivate
+test/source/a11y/accessibletestbase.cxx:413
+    ListenerHelper maIdleHandler
+    runs user callback in idle time
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:322
+    (anonymous namespace)::WebDAVResponseParser maLockType
+    0
+unotest/source/cpp/macros_test.cxx:206
+    unotest::(anonymous namespace)::Valid now
+    0
+vcl/inc/graphic/Manager.hxx:37
+    vcl::graphic::MemoryManager mnTimeout
+    1000
+vcl/inc/graphic/Manager.hxx:38
+    vcl::graphic::MemoryManager mnSmallFrySize
+    100000
 vcl/inc/impfontcache.hxx:75
     ImplFontCache m_aBoundRectCache
     3000
-vcl/inc/printdlg.hxx:210
-    vcl::PrintDialog maUpdatePreviewIdle
-    Print Dialog Update Preview Idle
-vcl/inc/printdlg.hxx:212
-    vcl::PrintDialog maUpdatePreviewNoCacheIdle
-    Print Dialog Update Preview (no cache) Idle
-vcl/inc/qt5/Qt5Instance.hxx:67
-    Qt5Instance m_aUpdateStyleTimer
-    vcl::qt5 m_aUpdateStyleTimer
-vcl/inc/salprn.hxx:43
+vcl/inc/pdf/pdfwriter_impl.hxx:825
+    vcl::PDFWriterImpl m_DocDigest
+    0
+vcl/inc/salinst.hxx:83
+    SalInstance m_bSupportsBitmap32
+    0
+vcl/inc/salprn.hxx:46
     SalPrinterQueueInfo mnStatus
     0
-vcl/inc/salprn.hxx:44
+vcl/inc/salprn.hxx:47
     SalPrinterQueueInfo mnJobs
     4294967295
-vcl/inc/salwtype.hxx:164
+vcl/inc/salwtype.hxx:171
     SalWheelMouseEvent mbDeltaIsPixel
     0
-vcl/inc/svdata.hxx:316
-    ImplSVNWFData mbMenuBarDockingAreaCommonBG
+vcl/inc/sft.hxx:179
+    vcl::TTGlobalFontInfo_ fsSelection
     0
-vcl/source/bitmap/bitmap.cxx:140
-    Bitmap::~Bitmap save
-    0
-vcl/source/bitmap/BitmapTools.cxx:1049
-    vcl::bitmap::get_unpremultiply_table inited
-    1
-vcl/source/bitmap/BitmapTools.cxx:1065
-    vcl::bitmap::get_premultiply_table inited
-    1
-vcl/source/control/imivctl.hxx:123
-    SvxIconChoiceCtrl_Impl aAutoArrangeIdle
-    svtools contnr SvxIconChoiceCtrl_Impl AutoArrange
-vcl/source/control/imivctl.hxx:124
-    SvxIconChoiceCtrl_Impl aDocRectChangedIdle
-    svtools contnr SvxIconChoiceCtrl_Impl DocRectChanged
-vcl/source/control/imivctl.hxx:125
-    SvxIconChoiceCtrl_Impl aVisRectChangedIdle
-    svtools contnr SvxIconChoiceCtrl_Impl VisRectChanged
-vcl/source/control/imivctl.hxx:126
-    SvxIconChoiceCtrl_Impl aCallSelectHdlIdle
-    svtools contnr SvxIconChoiceCtrl_Impl CallSelectHdl
-vcl/source/control/roadmapwizard.cxx:60
-    vcl::RoadmapWizardImpl pRoadmap
-    0
-vcl/source/filter/jpeg/transupp.h:128
-    (anonymous) perfect
-    0
-vcl/source/filter/jpeg/transupp.h:129
-    (anonymous) trim
-    0
-vcl/source/filter/jpeg/transupp.h:130
-    (anonymous) force_grayscale
-    0
-vcl/source/filter/jpeg/transupp.h:131
-    (anonymous) crop
+vcl/inc/svdata.hxx:277
+    ImplSVWinData mbIsLiveResize
     0
-vcl/source/filter/jpeg/transupp.h:147
-    (anonymous) crop_xoffset
-    0
-vcl/source/filter/jpeg/transupp.h:149
-    (anonymous) crop_yoffset
-    0
-vcl/source/filter/png/pngread.cxx:113
-    vcl::PNGReaderImpl mnPreviewShift
+vcl/inc/svdata.hxx:329
+    ImplSVNWFData mbMenuBarDockingAreaCommonBG
     0
-vcl/source/font/font.cxx:542
-    (anonymous namespace)::WeightSearchEntry weight
-    5
-vcl/source/fontsubset/ttcr.cxx:350
-    vcl::(anonymous namespace)::tdata_post ptr
+vcl/inc/svdata.hxx:336
+    ImplSVNWFData mbNoFrameJunctionForPopups
+    0
+vcl/qa/cppunit/png/PngFilterTest.cxx:158
+    PngFilterTest maDataUrl
+    /vcl/qa/cppunit/png/data/
+vcl/qa/cppunit/svm/svmtest.cxx:43
+    SvmTest maDataUrl
+    /vcl/qa/cppunit/svm/data/
+vcl/source/app/salvtables.cxx:243
+    SalFlashAttention m_aFlashTimer
+    SalFlashAttention
+vcl/source/bitmap/bitmap.cxx:155
+    Bitmap::~Bitmap save
     0
-vcl/source/gdi/dibtools.cxx:53
+vcl/source/bitmap/dibtools.cxx:52
     (anonymous namespace)::CIEXYZ aXyzX
     0
-vcl/source/gdi/dibtools.cxx:54
+vcl/source/bitmap/dibtools.cxx:53
     (anonymous namespace)::CIEXYZ aXyzY
     0
-vcl/source/gdi/dibtools.cxx:55
+vcl/source/bitmap/dibtools.cxx:54
     (anonymous namespace)::CIEXYZ aXyzZ
     0
-vcl/source/gdi/dibtools.cxx:108
-    (anonymous namespace)::DIBV5Header nV5RedMask
-    0
-vcl/source/gdi/dibtools.cxx:109
-    (anonymous namespace)::DIBV5Header nV5GreenMask
-    0
-vcl/source/gdi/dibtools.cxx:110
-    (anonymous namespace)::DIBV5Header nV5BlueMask
-    0
-vcl/source/gdi/dibtools.cxx:111
+vcl/source/bitmap/dibtools.cxx:107
     (anonymous namespace)::DIBV5Header nV5AlphaMask
     0
-vcl/source/gdi/dibtools.cxx:114
+vcl/source/bitmap/dibtools.cxx:108
+    (anonymous namespace)::DIBV5Header nV5CSType
+    0
+vcl/source/bitmap/dibtools.cxx:110
     (anonymous namespace)::DIBV5Header nV5GammaRed
     0
-vcl/source/gdi/dibtools.cxx:115
+vcl/source/bitmap/dibtools.cxx:111
     (anonymous namespace)::DIBV5Header nV5GammaGreen
     0
-vcl/source/gdi/dibtools.cxx:116
+vcl/source/bitmap/dibtools.cxx:112
     (anonymous namespace)::DIBV5Header nV5GammaBlue
     0
-vcl/source/gdi/dibtools.cxx:118
+vcl/source/bitmap/dibtools.cxx:113
+    (anonymous namespace)::DIBV5Header nV5Intent
+    0
+vcl/source/bitmap/dibtools.cxx:114
     (anonymous namespace)::DIBV5Header nV5ProfileData
     0
-vcl/source/gdi/dibtools.cxx:119
+vcl/source/bitmap/dibtools.cxx:115
     (anonymous namespace)::DIBV5Header nV5ProfileSize
     0
-vcl/source/gdi/dibtools.cxx:120
+vcl/source/bitmap/dibtools.cxx:116
     (anonymous namespace)::DIBV5Header nV5Reserved
     0
-vcl/source/gdi/pdfwriter_impl.hxx:766
-    vcl::PDFWriterImpl m_DocDigest
+vcl/source/control/quickselectionengine.cxx:38
+    vcl::QuickSelectionEngine_Data aSearchTimeout
+    vcl::QuickSelectionEngine_Data aSearchTimeout
+vcl/source/control/wizimpldata.hxx:84
+    vcl::RoadmapWizardImpl pRoadmap
     0
-vcl/source/outdev/bitmap.cxx:1263
-    OutputDevice::DrawTransformedBitmapEx bAllowPreferDirectPaint
-    1
-vcl/unx/gtk3/a11y/gtk3atkutil.cxx:694
-    ooo_atk_util_ensure_event_listener bInited
-    1
-vcl/unx/gtk3/gtk3gtkinst.cxx:16446
-    (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
-    1
-vcl/unx/gtk3/gtk3gtkinst.cxx:16474
-    (anonymous namespace)::ensure_disable_ctrl_page_up_down_bindings bDone
-    1
-workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
-    /home/noel/libo2/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
+vcl/source/filter/jpeg/transupp.h:128
+    jpeg_transform_info perfect
     0
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:148
-    writerfilter::dmapper::FieldParagraph m_bRemove
+vcl/source/filter/jpeg/transupp.h:129
+    jpeg_transform_info trim
     0
-writerfilter/source/dmapper/SettingsTable.cxx:271
-    writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
-    3
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:877
-    writerfilter::rtftok::RTFDocumentImpl m_nNestedTRLeft
+vcl/source/filter/jpeg/transupp.h:130
+    jpeg_transform_info force_grayscale
     0
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:878
-    writerfilter::rtftok::RTFDocumentImpl m_nTopLevelTRLeft
+vcl/source/filter/jpeg/transupp.h:131
+    jpeg_transform_info crop
     0
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:881
-    writerfilter::rtftok::RTFDocumentImpl m_nNestedCurrentCellX
+vcl/source/filter/jpeg/transupp.h:147
+    jpeg_transform_info crop_xoffset
     0
-writerfilter/source/rtftok/rtftokenizer.hxx:61
-    writerfilter::rtftok::RTFTokenizer s_bControlWordsInitialised
+vcl/source/filter/jpeg/transupp.h:149
+    jpeg_transform_info crop_yoffset
+    0
+vcl/source/font/font.cxx:777
+    (anonymous namespace)::WeightSearchEntry weight
+    5
+vcl/source/outdev/textline.cxx:97
+    (anonymous namespace)::WavyLineCache m_aItems
+    10
+vcl/unx/generic/fontmanager/fontconfig.cxx:119
+    (anonymous namespace)::CachedFontConfigFontOptions lru_options_cache
+    10
+vcl/unx/gtk3/a11y/atkutil.cxx:618
+    ooo_atk_util_ensure_event_listener bInited
     1
-writerfilter/source/rtftok/rtftokenizer.hxx:64
-    writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted
+vcl/unx/gtk3/gtkinst.cxx:23665
+    (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
+    1
+vcl/unx/gtk3/gtkinst.cxx:23693
+    (anonymous namespace)::ensure_disable_ctrl_page_up_down_bindings bDone
     1
-xmloff/source/text/XMLIndexTemplateContext.hxx:57
-    /home/noel/libo2/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
+xmloff/source/style/prstylei.cxx:269
+    XMLPropStyleContext::CreateAndInsert s_FillStyle
+    FillStyle
+xmloff/source/text/XMLIndexTemplateContext.hxx:56
+    /home/noel/libo-plugin/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
     0
diff --git a/compilerplugins/clang/staticaccess.cxx b/compilerplugins/clang/staticaccess.cxx
index 9c1abbc5cba4..46aa033f0bf2 100644
--- a/compilerplugins/clang/staticaccess.cxx
+++ b/compilerplugins/clang/staticaccess.cxx
@@ -86,7 +86,7 @@ bool StaticAccess::VisitMemberExpr(MemberExpr const * expr) {
         DiagnosticsEngine::Warning,
         ("accessing %select{static class member|member enumerator}0 through"
          " class member access syntax, use a qualified name like '%1' instead"),
-        compat::getBeginLoc(expr))
+        expr->getBeginLoc())
         << me << decl->getQualifiedNameAsString() << expr->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/staticconstfield.cxx b/compilerplugins/clang/staticconstfield.cxx
index 0802c323f810..74aad462fa3c 100644
--- a/compilerplugins/clang/staticconstfield.cxx
+++ b/compilerplugins/clang/staticconstfield.cxx
@@ -98,7 +98,7 @@ bool StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
 
     bool found = false;
     std::string value;
-    auto const initexpr = compat::IgnoreImplicit(init->getInit());
+    auto const initexpr = init->getInit()->IgnoreImplicit();
     if (tc.Const().Class("OUString").Namespace("rtl").GlobalNamespace()
         || tc.Const().Class("OString").Namespace("rtl").GlobalNamespace())
     {
@@ -135,7 +135,7 @@ bool StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
         APSInt x1;
         if (compat::EvaluateAsInt(initexpr, x1, compiler.getASTContext()))
         {
-            value = x1.toString(10);
+            value = compat::toString(x1, 10);
             found = true;
         }
     }
diff --git a/compilerplugins/clang/staticdynamic.cxx b/compilerplugins/clang/staticdynamic.cxx
new file mode 100644
index 000000000000..6dc351546590
--- /dev/null
+++ b/compilerplugins/clang/staticdynamic.cxx
@@ -0,0 +1,168 @@
+/* -*- 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 LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <map>
+#include <vector>
+
+#include "config_clang.h"
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+namespace
+{
+class StaticDynamic : public loplugin::FilteringPlugin<StaticDynamic>
+{
+public:
+    explicit StaticDynamic(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+    void postRun() override {}
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXDynamicCastExpr(CXXDynamicCastExpr const*);
+    bool VisitCXXStaticCastExpr(CXXStaticCastExpr const*);
+    bool PreTraverseCompoundStmt(CompoundStmt*);
+    bool PostTraverseCompoundStmt(CompoundStmt*, bool);
+    bool TraverseCompoundStmt(CompoundStmt*);
+
+private:
+    // the key is the pair of VarDecl and the type being cast to.
+    struct BlockState
+    {
+        std::map<std::pair<VarDecl const*, clang::Type const*>, SourceLocation> staticCastVars;
+        std::map<std::pair<VarDecl const*, clang::Type const*>, SourceLocation> dynamicCastVars;
+    };
+    // only maintain state inside a single basic block, we're not trying to analyse
+    // cross-block interactions.
+    std::vector<BlockState> blockStack;
+    BlockState blockState;
+};
+
+bool StaticDynamic::PreTraverseCompoundStmt(CompoundStmt*)
+{
+    blockStack.push_back(std::move(blockState));
+    return true;
+}
+
+bool StaticDynamic::PostTraverseCompoundStmt(CompoundStmt*, bool)
+{
+    blockState = std::move(blockStack.back());
+    blockStack.pop_back();
+    return true;
+}
+
+bool StaticDynamic::TraverseCompoundStmt(CompoundStmt* compoundStmt)
+{
+    bool ret = true;
+    if (PreTraverseCompoundStmt(compoundStmt))
+    {
+        ret = FilteringPlugin::TraverseCompoundStmt(compoundStmt);
+        PostTraverseCompoundStmt(compoundStmt, ret);
+    }
+    return ret;
+}
+
+const clang::Type* strip(QualType qt)
+{
+    const clang::Type* varType = qt->getUnqualifiedDesugaredType();
+    if (varType->isPointerType())
+        varType = varType->getPointeeType()->getUnqualifiedDesugaredType();
+    if (varType->isReferenceType())
+        varType = varType->getAs<clang::ReferenceType>()
+                      ->getPointeeType()
+                      ->getUnqualifiedDesugaredType();
+    return varType;
+}
+
+bool StaticDynamic::VisitCXXStaticCastExpr(CXXStaticCastExpr const* staticCastExpr)
+{
+    if (ignoreLocation(staticCastExpr))
+        return true;
+    auto subExprDecl = dyn_cast<DeclRefExpr>(staticCastExpr->getSubExpr()->IgnoreParenImpCasts());
+    if (!subExprDecl)
+        return true;
+    auto varDecl = dyn_cast_or_null<VarDecl>(subExprDecl->getDecl());
+    if (!varDecl)
+        return true;
+    auto varType = strip(staticCastExpr->getType());
+    auto it = blockState.dynamicCastVars.find({ varDecl, varType });
+    if (it != blockState.dynamicCastVars.end())
+    {
+        StringRef fn = getFilenameOfLocation(
+            compiler.getSourceManager().getSpellingLoc(staticCastExpr->getBeginLoc()));
+        // loop
+        if (loplugin::isSamePathname(fn, SRCDIR "/basctl/source/basicide/basobj3.cxx"))
+            return true;
+        if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/doc/swserv.cxx"))
+            return true;
+        if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/text/txtfly.cxx"))
+            return true;
+
+        report(DiagnosticsEngine::Warning, "static_cast after dynamic_cast",
+               staticCastExpr->getBeginLoc())
+            << staticCastExpr->getSourceRange();
+        report(DiagnosticsEngine::Note, "dynamic_cast here", it->second);
+        return true;
+    }
+    blockState.staticCastVars.insert({ { varDecl, varType }, staticCastExpr->getBeginLoc() });
+    return true;
+}
+
+bool StaticDynamic::VisitCXXDynamicCastExpr(CXXDynamicCastExpr const* dynamicCastExpr)
+{
+    if (ignoreLocation(dynamicCastExpr))
+        return true;
+
+    auto subExprDecl = dyn_cast<DeclRefExpr>(dynamicCastExpr->getSubExpr()->IgnoreParenImpCasts());
+    if (!subExprDecl)
+        return true;
+    auto varDecl = dyn_cast_or_null<VarDecl>(subExprDecl->getDecl());
+    if (!varDecl)
+        return true;
+    auto varType = strip(dynamicCastExpr->getTypeAsWritten());
+    auto it = blockState.staticCastVars.find({ varDecl, varType });
+    if (it != blockState.staticCastVars.end())
+    {
+        report(DiagnosticsEngine::Warning, "dynamic_cast after static_cast",
+               dynamicCastExpr->getBeginLoc())
+            << dynamicCastExpr->getSourceRange();
+        report(DiagnosticsEngine::Note, "static_cast here", it->second);
+        return true;
+    }
+    auto loc = dynamicCastExpr->getBeginLoc();
+    if (compiler.getSourceManager().isMacroArgExpansion(loc)
+        && (Lexer::getImmediateMacroNameForDiagnostics(loc, compiler.getSourceManager(),
+                                                       compiler.getLangOpts())
+            == "assert"))
+    {
+        return true;
+    }
+    blockState.dynamicCastVars.insert({ { varDecl, varType }, dynamicCastExpr->getBeginLoc() });
+    return true;
+}
+
+loplugin::Plugin::Registration<StaticDynamic> staticdynamic("staticdynamic");
+}
+
+#endif // LO_CLANG_SHARED_PLUGINS
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 06afc3d92584..ebe91520a7d5 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -9,6 +9,8 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
 #include "check.hxx"
 #include "plugin.hxx"
 
@@ -91,11 +93,11 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
         return true;
     }
     // don't mess with the backwards compatibility stuff
-    if (loplugin::isSamePathname(getFilename(compat::getBeginLoc(pCXXMethodDecl)), SRCDIR "/cppuhelper/source/compat.cxx")) {
+    if (loplugin::isSamePathname(getFilename(pCXXMethodDecl->getBeginLoc()), SRCDIR "/cppuhelper/source/compat.cxx")) {
         return true;
     }
     // the DDE has a dummy implementation on Linux and a real one on Windows
-    auto aFilename = getFilename(compat::getBeginLoc(pCXXMethodDecl->getCanonicalDecl()));
+    auto aFilename = getFilename(pCXXMethodDecl->getCanonicalDecl()->getBeginLoc());
     if (loplugin::isSamePathname(aFilename, SRCDIR "/include/svl/svdde.hxx")) {
         return true;
     }
@@ -109,16 +111,6 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
     if (cdc.Class("BitmapInfoAccess").GlobalNamespace()) {
         return true;
     }
-    // the unotools and svl config code stuff is doing weird stuff with a reference-counted statically allocated pImpl class
-    if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/unotools/")) {
-        return true;
-    }
-    if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/svl/")) {
-        return true;
-    }
-    if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/framework/") || loplugin::hasPathnamePrefix(aFilename, SRCDIR "/framework/")) {
-        return true;
-    }
     // there is some odd stuff happening here I don't fully understand, leave it for now
     if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/canvas/") || loplugin::hasPathnamePrefix(aFilename, SRCDIR "/canvas/")) {
         return true;
@@ -135,7 +127,6 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
         || cdc.Class("SvtOptionsDrawinglayer").GlobalNamespace()
         || cdc.Class("SvtMenuOptions").GlobalNamespace()
         || cdc.Class("SvtToolPanelOptions").GlobalNamespace()
-        || cdc.Class("SvtSlideSorterBarOptions").GlobalNamespace()
         || (cdc.Class("SharedResources").Namespace("connectivity")
             .GlobalNamespace())
         || (cdc.Class("OParseContextClient").Namespace("svxform")
@@ -144,7 +135,23 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
     {
         return true;
     }
+
     auto fdc = loplugin::DeclCheck(pCXXMethodDecl);
+
+    // somebody has work-in-progress here
+    if ((fdc.Function("getCurrZeroChar")
+         .Class("LocaleDataWrapper").GlobalNamespace()))
+        return true;
+
+    // the unotools and svl config code stuff is doing weird stuff with a reference-counted statically allocated pImpl class
+    if ((fdc.Function("getByName2")
+         .Class("GlobalEventConfig").GlobalNamespace()))
+        return true;
+    if ((cdc.Class("SvtLinguConfig").GlobalNamespace()))
+        return true;
+    if ((cdc.Class("SvtModuleOptions").GlobalNamespace()))
+        return true;
+
     // only empty on Linux, not on windows
     if ((fdc.Function("GetVisualRepresentationInNativeFormat_Impl")
          .Class("OleEmbeddedObject").GlobalNamespace())
@@ -182,7 +189,9 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
             .GlobalNamespace())
         || (fdc.Function("Read_Majority").Class("SwWW8ImplReader")
             .GlobalNamespace())
-        || fdc.Function("Ignore").Class("SwWrtShell").GlobalNamespace())
+        || fdc.Function("Ignore").Class("SwWrtShell").GlobalNamespace()
+        || (cdc.Class("AttributesChecker").AnonymousNamespace().GlobalNamespace()
+            && startsWith(pCXXMethodDecl->getNameAsString(), "check")))
     {
         return true;
     }
diff --git a/compilerplugins/clang/store/bodynotinblock.hxx b/compilerplugins/clang/store/bodynotinblock.hxx
index e5f0dc49f428..d74a4fbc169d 100644
--- a/compilerplugins/clang/store/bodynotinblock.hxx
+++ b/compilerplugins/clang/store/bodynotinblock.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef BODYNOTINBLOCK_H
-#define BODYNOTINBLOCK_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class BodyNotInBlock
 
 } // namespace
 
-#endif // BODYNOTINBLOCK_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/cascadingassignop.hxx b/compilerplugins/clang/store/cascadingassignop.hxx
index 26080c004beb..147ecaad0dd2 100644
--- a/compilerplugins/clang/store/cascadingassignop.hxx
+++ b/compilerplugins/clang/store/cascadingassignop.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef CASCADINGCONDOP_H
-#define CASCADINGCONDOP_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class CascadingAssignOp
 
 } // namespace loplugin
 
-#endif // CASCADINGCONDOP_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/cascadingcondop.hxx b/compilerplugins/clang/store/cascadingcondop.hxx
index f2c995064eb4..599fafd8263a 100644
--- a/compilerplugins/clang/store/cascadingcondop.hxx
+++ b/compilerplugins/clang/store/cascadingcondop.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef CASCADINGCONDOP_H
-#define CASCADINGCONDOP_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class CascadingCondOp
 
 } // namespace loplugin
 
-#endif // CASCADINGCONDOP_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/store/checkunusedparams.cxx
index fa930ba959c8..2f45049632d3 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/store/checkunusedparams.cxx
@@ -12,6 +12,8 @@
 #include <set>
 #include <iostream>
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 
 /**
@@ -205,7 +207,7 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
         return true;
     if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(canon->getLocation())))
         return true;
-    StringRef fn = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(canon)));
+    StringRef fn = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(canon->getBeginLoc()));
     // Some backwards compat magic.
     // TODO Can probably be removed, but need to do some checking
     if (loplugin::isSamePathname(fn, SRCDIR "/include/sax/fshelper.hxx"))
@@ -477,7 +479,7 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
                 continue;
         }
         report( DiagnosticsEngine::Warning,
-                "unused param %0 in %1", compat::getBeginLoc(param))
+                "unused param %0 in %1", param->getBeginLoc())
                 << param->getSourceRange()
                 << param->getName()
                 << fqn;
@@ -486,7 +488,7 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
             unsigned idx = param->getFunctionScopeIndex();
             const ParmVarDecl* pOther = canon->getParamDecl(idx);
             report( DiagnosticsEngine::Note, "declaration is here",
-                    compat::getBeginLoc(pOther))
+                    pOther->getBeginLoc())
                     << pOther->getSourceRange();
         }
     }
diff --git a/compilerplugins/clang/comparisonwithconstant.cxx b/compilerplugins/clang/store/comparisonwithconstant.cxx
index b5dfe8cc6e7f..d796b7c3a3a1 100644
--- a/compilerplugins/clang/comparisonwithconstant.cxx
+++ b/compilerplugins/clang/store/comparisonwithconstant.cxx
@@ -13,8 +13,6 @@
 #include <fstream>
 #include <set>
 
-#include "config_clang.h"
-
 #include "compat.hxx"
 #include "plugin.hxx"
 
@@ -51,11 +49,6 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION < 110000
-    bool TraverseBinEQ(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-    bool TraverseBinNE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
-#endif
-
     bool VisitBinaryOperator(const BinaryOperator *);
 private:
     bool rewrite(const BinaryOperator *);
diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx
index a29556723748..a7b88704c09e 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -32,7 +32,7 @@ public:
         if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "bootstrapfixture.cxx") != 0) {
             return;
         }
-        if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtk3gtkinst.cxx") != 0) {
+        if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtkinst.cxx") != 0) {
             return;
         }*/
 
diff --git a/compilerplugins/clang/constfields.cxx b/compilerplugins/clang/store/constfields.cxx
index 635774810717..692c84daeb8c 100644
--- a/compilerplugins/clang/constfields.cxx
+++ b/compilerplugins/clang/store/constfields.cxx
@@ -22,23 +22,20 @@
 #include "config_clang.h"
 
 #include "plugin.hxx"
-#include "compat.hxx"
 #include "check.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
 Look for fields that are only assigned to in the constructor using field-init, and can therefore be const.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='constfields' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='constfields' check
   $ ./compilerplugins/clang/constfields.py
 
 and then
-  $ for dir in *; do make $dir FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='constfieldsrewrite' $dir; done
+  $ for dir in *; do make $dir FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='constfieldsrewrite' $dir; done
 to auto-remove the method declarations
 
 */
@@ -205,7 +202,7 @@ void ConstFields::run()
     else
     {
         for (const MyFieldInfo& s : cannotBeConstSet)
-            report(DiagnosticsEngine::Warning, "notconst %0", compat::getBeginLoc(s.parentRecord))
+            report(DiagnosticsEngine::Warning, "notconst %0", s.parentRecord->getBeginLoc())
                 << s.fieldName;
     }
 }
@@ -322,11 +319,13 @@ bool ConstFields::TraverseFunctionDecl(FunctionDecl* functionDecl)
 bool ConstFields::TraverseIfStmt(IfStmt* ifStmt)
 {
     FieldDecl const* memberFieldDecl = nullptr;
-    Expr const* cond = ifStmt->getCond()->IgnoreParenImpCasts();
-    if (auto memberExpr = dyn_cast<MemberExpr>(cond))
+    if (Expr const* cond = ifStmt->getCond())
     {
-        if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
-            insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
+        if (auto memberExpr = dyn_cast<MemberExpr>(cond->IgnoreParenImpCasts()))
+        {
+            if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
+                insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
+        }
     }
     bool ret = RecursiveASTVisitor::TraverseIfStmt(ifStmt);
     if (memberFieldDecl)
@@ -525,11 +524,11 @@ void ConstFields::check(const FieldDecl* fieldDecl, const Expr* memberExpr)
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear, what can the matter be? writtenTo=%0",
-               compat::getBeginLoc(memberExpr))
+               memberExpr->getBeginLoc())
             << bCannotBeConst << memberExpr->getSourceRange();
         if (parent)
         {
-            report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+            report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
                 << parent->getSourceRange();
             parent->dump();
         }
diff --git a/compilerplugins/clang/constfields.py b/compilerplugins/clang/store/constfields.py
index e81d3f3043f5..311b372bc958 100755
--- a/compilerplugins/clang/constfields.py
+++ b/compilerplugins/clang/store/constfields.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import sys
 import re
 import io
 
diff --git a/compilerplugins/clang/constfieldsrewrite.cxx b/compilerplugins/clang/store/constfieldsrewrite.cxx
index 03fb3d0c3609..d72bb43aad7a 100644
--- a/compilerplugins/clang/constfieldsrewrite.cxx
+++ b/compilerplugins/clang/store/constfieldsrewrite.cxx
@@ -14,6 +14,7 @@
 #include <iostream>
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -93,9 +94,6 @@ bool ConstFieldsRewrite::VisitFieldDecl(const FieldDecl* fieldDecl)
     // in case we've already processed this field
     if (fieldDecl->getType().isConstQualified())
         return true;
-    // in case we've already processed this field
-    if (fieldDecl->getType().isConstQualified())
-        return true;
     // TODO rewriting T& is a bit trickier
     if (loplugin::TypeCheck(fieldDecl->getType()).LvalueReference())
         return true;
@@ -157,7 +155,7 @@ bool ConstFieldsRewrite::VisitFieldDecl(const FieldDecl* fieldDecl)
     if (!success)
     {
         report(DiagnosticsEngine::Warning, "Could not mark field as const",
-               compat::getBeginLoc(fieldDecl))
+               fieldDecl->getBeginLoc())
             << fieldDecl->getSourceRange();
     }
     return true;
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/store/constparams.cxx
index 95c8184009d7..dac7322d0130 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/store/constparams.cxx
@@ -20,9 +20,7 @@
 #include "check.hxx"
 #include "functionaddress.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
    Find pointer and reference params that can be declared const.
@@ -60,6 +58,11 @@ public:
             || loplugin::hasPathnamePrefix(fn, SRCDIR "/pyuno/source/module/pyuno_struct.cxx")
             || loplugin::hasPathnamePrefix(fn, SRCDIR "/pyuno/source/module/pyuno.cxx")
             || loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/filter/ascii/ascatr.cxx")
+            // TODO this plugin doesn't handle it well when we take the address of a pointer
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/svl/source/misc/sharedstringpool.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/registry/source/regkey.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/cppu/source/uno/lbenv.cxx")
+            || loplugin::hasPathnamePrefix(fn, SRCDIR "/cppuhelper/source/implbase_ex.cxx")
             )
             return;
 
@@ -77,7 +80,7 @@ public:
             report(
                 DiagnosticsEngine::Warning,
                 "this parameter can be const %0",
-                compat::getBeginLoc(pParmVarDecl))
+                pParmVarDecl->getBeginLoc())
                 << fname << pParmVarDecl->getSourceRange();
             if (canonicalDecl->getLocation() != functionDecl->getLocation()) {
                 unsigned idx = pParmVarDecl->getFunctionScopeIndex();
@@ -85,7 +88,7 @@ public:
                 report(
                     DiagnosticsEngine::Note,
                     "canonical parameter declaration here",
-                    compat::getBeginLoc(pOther))
+                    pOther->getBeginLoc())
                     << pOther->getSourceRange();
             }
             //functionDecl->dump();
@@ -96,6 +99,7 @@ public:
     bool TraverseCXXMethodDecl(CXXMethodDecl * f);
     bool TraverseCXXConstructorDecl(CXXConstructorDecl * f);
     bool VisitDeclRefExpr(const DeclRefExpr *);
+    bool VisitLambdaExpr(const LambdaExpr*);
 
 private:
     bool CheckTraverseFunctionDecl(FunctionDecl *);
@@ -159,16 +163,18 @@ bool ConstParams::CheckTraverseFunctionDecl(FunctionDecl * functionDecl)
     if (functionDecl->isMain()) {
         return false;
     }
+    if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate)
+        return false;
 
     // ignore the macros from include/tools/link.hxx
     auto canonicalDecl = functionDecl->getCanonicalDecl();
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(canonicalDecl))
-        || compiler.getSourceManager().isMacroArgExpansion(compat::getBeginLoc(canonicalDecl))) {
+    if (compiler.getSourceManager().isMacroBodyExpansion(canonicalDecl->getBeginLoc())
+        || compiler.getSourceManager().isMacroArgExpansion(canonicalDecl->getBeginLoc())) {
         StringRef name { Lexer::getImmediateMacroName(
-                compat::getBeginLoc(canonicalDecl), compiler.getSourceManager(), compiler.getLangOpts()) };
+                canonicalDecl->getBeginLoc(), compiler.getSourceManager(), compiler.getLangOpts()) };
         if (name.startswith("DECL_LINK") || name.startswith("DECL_STATIC_LINK"))
             return false;
-        auto loc2 = compat::getImmediateExpansionRange(compiler.getSourceManager(), compat::getBeginLoc(canonicalDecl)).first;
+        auto loc2 = compat::getImmediateExpansionRange(compiler.getSourceManager(), canonicalDecl->getBeginLoc()).first;
         if (compiler.getSourceManager().isMacroBodyExpansion(loc2))
         {
             StringRef name2 { Lexer::getImmediateMacroName(
@@ -189,9 +195,7 @@ bool ConstParams::CheckTraverseFunctionDecl(FunctionDecl * functionDecl)
             || name.startswith("Read_F_")
                 // UNO component entry points
             || name.endswith("component_getFactory")
-            || name == "egiGraphicExport"
-            || name == "etiGraphicExport"
-            || name == "epsGraphicExport"
+            || name.endswith("_get_implementation")
             // callback for some external code?
             || name == "ScAddInAsyncCallBack"
             // used as function pointers
@@ -259,6 +263,23 @@ bool ConstParams::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
     return true;
 }
 
+bool ConstParams::VisitLambdaExpr(const LambdaExpr* lambdaExpr)
+{
+    if (ignoreLocation(lambdaExpr))
+        return true;
+    for (auto captureIt = lambdaExpr->capture_begin(); captureIt != lambdaExpr->capture_end();
+         ++captureIt)
+    {
+        const LambdaCapture& capture = *captureIt;
+        if (capture.capturesVariable())
+        {
+            if (auto varDecl = dyn_cast<ParmVarDecl>(capture.getCapturedVar()))
+                interestingParamSet.erase(varDecl);
+        }
+    }
+    return true;
+}
+
 // Walk up from a statement that contains a DeclRefExpr, checking if the usage means that the
 // related ParamVarDecl can be const.
 bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVarDecl)
@@ -268,9 +289,11 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
     {
         // check if we're inside a CXXCtorInitializer
         auto parentsRange = compiler.getASTContext().getParents(*stmt);
+        auto it = parentsRange.begin();
         if ( parentsRange.begin() != parentsRange.end())
         {
-            if (auto cxxConstructorDecl = dyn_cast_or_null<CXXConstructorDecl>(parentsRange.begin()->get<Decl>()))
+            const Decl *decl = it->get<Decl>();
+            if (auto cxxConstructorDecl = dyn_cast_or_null<CXXConstructorDecl>(decl))
             {
                 for ( auto cxxCtorInitializer : cxxConstructorDecl->inits())
                 {
@@ -294,28 +317,28 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
                     }
                 }
             }
-            if (auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>()))
+            if (auto varDecl = dyn_cast_or_null<VarDecl>(decl))
             {
                 return isOkForParameter(varDecl->getType());
             }
         }
-        parmVarDecl->dump();
-        stmt->dump();
-        report(
-             DiagnosticsEngine::Warning,
-             "no parent?",
-              compat::getBeginLoc(stmt))
-              << stmt->getSourceRange();
+//        parmVarDecl->dump();
+//        stmt->dump();
+//        report(
+//             DiagnosticsEngine::Warning,
+//             "no parent?",
+//              stmt->getBeginLoc())
+//              << stmt->getSourceRange();
         return false;
     }
 
     if (auto unaryOperator = dyn_cast<UnaryOperator>(parent)) {
         UnaryOperator::Opcode op = unaryOperator->getOpcode();
-        if (op == UO_AddrOf || op == UO_PreInc || op == UO_PostInc
+        if (op == UO_PreInc || op == UO_PostInc
             || op == UO_PreDec || op == UO_PostDec) {
             return false;
         }
-        if (op == UO_Deref) {
+        if (op == UO_Deref || op == UO_AddrOf) {
             return checkIfCanBeConst(parent, parmVarDecl);
         }
         return true;
@@ -555,7 +578,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
     report(
          DiagnosticsEngine::Warning,
          "oh dear, what can the matter be?",
-          compat::getBeginLoc(parent))
+          parent->getBeginLoc())
           << parent->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/constvars.cxx b/compilerplugins/clang/store/constvars.cxx
index f89301fed205..2b06f54ea343 100644
--- a/compilerplugins/clang/constvars.cxx
+++ b/compilerplugins/clang/store/constvars.cxx
@@ -19,15 +19,10 @@
 #include <sys/file.h>
 #include <unistd.h>
 
-#include "config_clang.h"
-
 #include "plugin.hxx"
-#include "compat.hxx"
 #include "check.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
 Look for static vars that are only assigned to once, and never written to, they can be const.
@@ -175,7 +170,7 @@ void ConstVars::run()
         // Implement a marker that disables this plugins warning at a specific site
         if (sourceString.contains("loplugin:constvars:ignore"))
             continue;
-        report(DiagnosticsEngine::Warning, "var can be const", compat::getBeginLoc(v));
+        report(DiagnosticsEngine::Warning, "var can be const", v->getBeginLoc());
     }
 }
 
@@ -213,7 +208,7 @@ bool ConstVars::VisitVarDecl(const VarDecl* varDecl)
 
 bool ConstVars::VisitCXXForRangeStmt(const CXXForRangeStmt* forStmt)
 {
-    if (compat::getBeginLoc(forStmt).isValid() && ignoreLocation(forStmt))
+    if (forStmt->getBeginLoc().isValid() && ignoreLocation(forStmt))
         return true;
     const VarDecl* varDecl = forStmt->getLoopVariable();
     if (!varDecl)
@@ -272,11 +267,13 @@ bool ConstVars::TraverseFunctionDecl(FunctionDecl* functionDecl)
 bool ConstVars::TraverseIfStmt(IfStmt* ifStmt)
 {
     VarDecl const* varDecl = nullptr;
-    Expr const* cond = ifStmt->getCond()->IgnoreParenImpCasts();
-    if (auto declRefExpr = dyn_cast<DeclRefExpr>(cond))
+    if (Expr const* cond = ifStmt->getCond())
     {
-        if ((varDecl = dyn_cast<VarDecl>(declRefExpr->getDecl())))
-            insideConditionalCheckOfVarSet.push_back(varDecl);
+        if (auto declRefExpr = dyn_cast<DeclRefExpr>(cond->IgnoreParenImpCasts()))
+        {
+            if ((varDecl = dyn_cast<VarDecl>(declRefExpr->getDecl())))
+                insideConditionalCheckOfVarSet.push_back(varDecl);
+        }
     }
     bool ret = RecursiveASTVisitor::TraverseIfStmt(ifStmt);
     if (varDecl)
@@ -489,11 +486,11 @@ void ConstVars::check(const VarDecl* varDecl, const Expr* memberExpr)
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear, what can the matter be? writtenTo=%0",
-               compat::getBeginLoc(memberExpr))
+               memberExpr->getBeginLoc())
             << bCannotBeConst << memberExpr->getSourceRange();
         if (parent)
         {
-            report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+            report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
                 << parent->getSourceRange();
             parent->dump();
         }
diff --git a/compilerplugins/clang/convertlong.cxx b/compilerplugins/clang/store/convertlong.cxx
index 5d2ac82f5849..87b65a43f38b 100644
--- a/compilerplugins/clang/convertlong.cxx
+++ b/compilerplugins/clang/store/convertlong.cxx
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
 #include "check.hxx"
 
diff --git a/compilerplugins/clang/countusersofdefaultparams.cxx b/compilerplugins/clang/store/countusersofdefaultparams.cxx
index 0f689058197a..c336509b3ef6 100644
--- a/compilerplugins/clang/countusersofdefaultparams.cxx
+++ b/compilerplugins/clang/store/countusersofdefaultparams.cxx
@@ -14,15 +14,16 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
-#include "compat.hxx"
 
 /*
   Count call sites that are actually using the defaulted values on params on methods that declare such.
 
   The process goes something like this:
     $ make check
-    $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='countusersofdefaultparams' check
+    $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='countusersofdefaultparams' check
     $ ./compilerplugins/clang/countusersofdefaultparams.py
 */
 
@@ -93,10 +94,6 @@ void CountUsersOfDefaultParams::niceName(const FunctionDecl* functionDecl, MyFun
 {
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 
@@ -157,10 +154,6 @@ bool CountUsersOfDefaultParams::VisitCallExpr(const CallExpr * callExpr) {
     // work our way back to the root definition for template methods
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-    else if (functionDecl->getClassScopeSpecializationPattern())
-        functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
     else if (functionDecl->getTemplateInstantiationPattern())
         functionDecl = functionDecl->getTemplateInstantiationPattern();
     int n = functionDecl->getNumParams() - 1;
@@ -174,7 +167,7 @@ bool CountUsersOfDefaultParams::VisitCallExpr(const CallExpr * callExpr) {
     if ( n < (int)callExpr->getNumArgs() && callExpr->getArg(n)->isDefaultArgument()) {
         MyCallInfo callInfo;
         niceName(functionDecl, callInfo);
-        callInfo.sourceLocationOfCall = locationToString(compat::getBeginLoc(callExpr));
+        callInfo.sourceLocationOfCall = locationToString(callExpr->getBeginLoc());
         callSet.insert(callInfo);
     }
     return true;
@@ -188,10 +181,6 @@ bool CountUsersOfDefaultParams::VisitCXXConstructExpr(const CXXConstructExpr * c
     // work our way back to the root definition for template methods
     if (constructorDecl->getInstantiatedFromMemberFunction())
         constructorDecl = dyn_cast<CXXConstructorDecl>(constructorDecl->getInstantiatedFromMemberFunction());
-#if CLANG_VERSION < 90000
-    else if (constructorDecl->getClassScopeSpecializationPattern())
-        constructorDecl = dyn_cast<CXXConstructorDecl>(constructorDecl->getClassScopeSpecializationPattern());
-#endif
     else if (constructorDecl->getTemplateInstantiationPattern())
         constructorDecl = dyn_cast<CXXConstructorDecl>(constructorDecl->getTemplateInstantiationPattern());
     int n = constructorDecl->getNumParams() - 1;
@@ -205,7 +194,7 @@ bool CountUsersOfDefaultParams::VisitCXXConstructExpr(const CXXConstructExpr * c
     if ( n < (int)constructExpr->getNumArgs() && constructExpr->getArg(n)->isDefaultArgument()) {
         MyCallInfo callInfo;
         niceName(constructorDecl, callInfo);
-        callInfo.sourceLocationOfCall = locationToString(compat::getBeginLoc(constructExpr));
+        callInfo.sourceLocationOfCall = locationToString(constructExpr->getBeginLoc());
         callSet.insert(callInfo);
     }
     return true;
diff --git a/compilerplugins/clang/countusersofdefaultparams.py b/compilerplugins/clang/store/countusersofdefaultparams.py
index 57af9ea29caa..64ef6604af65 100755
--- a/compilerplugins/clang/countusersofdefaultparams.py
+++ b/compilerplugins/clang/store/countusersofdefaultparams.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import sys
 import re
 import io
 
@@ -47,8 +46,6 @@ for k,v in callDict.iteritems():
         continue
     if k.endswith("::RegisterChildWindow(_Bool,class SfxModule *,enum SfxChildWindowFlags)"):
         continue
-    if k.endswith("::RegisterChildWindowContext(unsigned short,class SfxModule *)"):
-        continue
     if k.endswith("::RegisterControl(unsigned short,class SfxModule *)"):
         continue
     if k.endswith("::RegisterFactory(unsigned short)"):
diff --git a/compilerplugins/clang/dodgyswitch.cxx b/compilerplugins/clang/store/dodgyswitch.cxx
index d0674b3632b0..43958f1364ad 100644
--- a/compilerplugins/clang/dodgyswitch.cxx
+++ b/compilerplugins/clang/store/dodgyswitch.cxx
@@ -41,7 +41,7 @@ bool DodgySwitch::VisitDefaultStmt(DefaultStmt const * defaultStmt)
     if (!IsParentSwitch(defaultStmt))
         report(
             DiagnosticsEngine::Warning, "default statement not directly under switch",
-            compat::getBeginLoc(defaultStmt))
+            defaultStmt->getBeginLoc())
           << defaultStmt->getSourceRange();
     return true;
 }
@@ -55,7 +55,7 @@ bool DodgySwitch::VisitCaseStmt(CaseStmt const * caseStmt)
         //parentStmt(parentStmt(caseStmt))->dump();
         report(
             DiagnosticsEngine::Warning, "case statement not directly under switch",
-            compat::getBeginLoc(caseStmt))
+            caseStmt->getBeginLoc())
           << caseStmt->getSourceRange();
     }
     return true;
diff --git a/compilerplugins/clang/doubleconvert.cxx b/compilerplugins/clang/store/doubleconvert.cxx
index 6a08ae376a95..6f9cc88df742 100644
--- a/compilerplugins/clang/doubleconvert.cxx
+++ b/compilerplugins/clang/store/doubleconvert.cxx
@@ -10,7 +10,6 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -58,7 +57,7 @@ bool DoubleConvert::VisitCXXConstructExpr(CXXConstructExpr const* cxxConstruct)
         = dyn_cast<CXXMemberCallExpr>(cxxConstruct->getArg(0)->IgnoreParenCasts());
     if (!cxxMemberCallExpr)
         return true;
-    if (!compat::isa_and_nonnull<CXXConversionDecl>(cxxMemberCallExpr->getMethodDecl()))
+    if (!isa_and_nonnull<CXXConversionDecl>(cxxMemberCallExpr->getMethodDecl()))
         return true;
     if (cxxConstruct->getType().getCanonicalType().getTypePtr()
         != cxxMemberCallExpr->getImplicitObjectArgument()
diff --git a/compilerplugins/clang/finalprotected.cxx b/compilerplugins/clang/store/finalprotected.cxx
index 41b994c049d5..c7296232a25b 100644
--- a/compilerplugins/clang/finalprotected.cxx
+++ b/compilerplugins/clang/store/finalprotected.cxx
@@ -51,7 +51,7 @@ bool FinalProtected::VisitCXXMethodDecl(CXXMethodDecl const * cxxMethodDecl)
     cxxMethodDecl = cxxMethodDecl->getCanonicalDecl();
     report(DiagnosticsEngine::Warning,
             "final class should not have protected members - convert them to private",
-            compat::getBeginLoc(cxxMethodDecl))
+            cxxMethodDecl->getBeginLoc())
         << cxxMethodDecl->getSourceRange();
     return true;
 }
@@ -70,7 +70,7 @@ bool FinalProtected::VisitFieldDecl(FieldDecl const * fieldDecl)
     fieldDecl = fieldDecl->getCanonicalDecl();
     report(DiagnosticsEngine::Warning,
             "final class should not have protected members - convert them to private",
-            compat::getBeginLoc(fieldDecl))
+            fieldDecl->getBeginLoc())
         << fieldDecl->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/store/fpcomparison.cxx b/compilerplugins/clang/store/fpcomparison.cxx
index faaec0110fa5..84d0aaee545b 100644
--- a/compilerplugins/clang/store/fpcomparison.cxx
+++ b/compilerplugins/clang/store/fpcomparison.cxx
@@ -31,8 +31,6 @@ public:
 
     virtual void run() override
     {
-        vclFloatDevicePixel = compiler.getPreprocessor()
-            .getIdentifierInfo("VCL_FLOAT_DEVICE_PIXEL")->hasMacroDefinition();
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
     }
 
@@ -43,7 +41,6 @@ private:
     bool ignore(FunctionDecl* );
     enum class EState { None, TraverseProcess, TraverseIgnore };
     EState meState = EState::None;
-    bool vclFloatDevicePixel;
 };
 
 bool FpComparison::TraverseFunctionDecl(FunctionDecl* function)
@@ -323,9 +320,8 @@ bool FpComparison::ignore(FunctionDecl* function)
         || dc.Function("testPlotAreaManualLayoutXLSX").Class("Chart2ExportTest").GlobalNamespace()
         || dc.Function("testLegendManualLayoutXLSX").Class("Chart2ExportTest").GlobalNamespace()
         || dc.Function("SetScreenNumber").Class("AquaSalFrame").GlobalNamespace()
-        || (vclFloatDevicePixel
-            && (dc.Function("Justify").Class("GenericSalLayout").GlobalNamespace()
-                || dc.Function("AdjustLayout").Class("MultiSalLayout").GlobalNamespace()))
+        || dc.Function("Justify").Class("GenericSalLayout").GlobalNamespace()
+        || dc.Function("AdjustLayout").Class("MultiSalLayout").GlobalNamespace()
         // vcl/headless/svpgdi.cxx, ba4a124b0c0c66fd275f5147d55eeec27ce78da9:
         || dc.Function("drawAlphaBitmap").Class("SvpSalGraphics").GlobalNamespace()
         || dc.Function("drawMask").Class("SvpSalGraphics").GlobalNamespace()
diff --git a/compilerplugins/clang/inlinefields.cxx b/compilerplugins/clang/store/inlinefields.cxx
index abc665de6959..1573e8d5217b 100644
--- a/compilerplugins/clang/inlinefields.cxx
+++ b/compilerplugins/clang/store/inlinefields.cxx
@@ -28,11 +28,11 @@ Be warned that it produces around 5G of log file.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='inlinefields' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='inlinefields' check
   $ ./compilerplugins/clang/inlinefields.py
 
 and then
-  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='inlinefieldsremove' $dir; done
+  $ for dir in *; do make FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='inlinefieldsremove' $dir; done
 to auto-remove the method declarations
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
diff --git a/compilerplugins/clang/inlinefields.py b/compilerplugins/clang/store/inlinefields.py
index 1a0dbda34189..e569431d37f7 100755
--- a/compilerplugins/clang/inlinefields.py
+++ b/compilerplugins/clang/store/inlinefields.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import sys
 import re
 import io
 
diff --git a/compilerplugins/clang/inlinesimplememberfunctions.cxx b/compilerplugins/clang/store/inlinesimplememberfunctions.cxx
index 668e9f252ab6..760094b5a03a 100644
--- a/compilerplugins/clang/inlinesimplememberfunctions.cxx
+++ b/compilerplugins/clang/store/inlinesimplememberfunctions.cxx
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "plugin.hxx"
-#include "compat.hxx"
 
 // Methods that purely return a local field should be declared in the header and be declared inline.
 // So that the compiler can elide the function call and turn it into a simple fixed-offset-load instruction.
@@ -243,8 +242,8 @@ bool InlineSimpleMemberFunctions::rewrite(const CXXMethodDecl * functionDecl) {
     const char *p1, *p2;
 
     // get the function body contents
-    p1 = compiler.getSourceManager().getCharacterData( compat::getBeginLoc(functionDecl->getBody()) );
-    p2 = compiler.getSourceManager().getCharacterData( compat::getEndLoc(functionDecl->getBody()) );
+    p1 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getBeginLoc() );
+    p2 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getEndLoc() );
     std::string s1( p1, p2 - p1 + 1);
 
     /* we can't safely move around stuff containing comments, we mess up the resulting code */
@@ -274,18 +273,18 @@ bool InlineSimpleMemberFunctions::rewrite(const CXXMethodDecl * functionDecl) {
     // remove the function's out of line body and declaration
     RewriteOptions opts;
     opts.RemoveLineIfEmpty = true;
-    if (!removeText(SourceRange(compat::getBeginLoc(functionDecl), compat::getEndLoc(functionDecl->getBody())), opts)) {
+    if (!removeText(SourceRange(functionDecl->getBeginLoc(), functionDecl->getBody()->getEndLoc()), opts)) {
         return false;
     }
 
     // scan forward until we find the semicolon
     const FunctionDecl * canonicalDecl = functionDecl->getCanonicalDecl();
-    p1 = compiler.getSourceManager().getCharacterData( compat::getEndLoc(canonicalDecl) );
+    p1 = compiler.getSourceManager().getCharacterData( canonicalDecl->getEndLoc() );
     p2 = ++p1;
     while (*p2 != 0 && *p2 != ';') p2++;
 
     // insert the function body into the inline function definition (i.e. the one inside the class definition)
-    return replaceText(compat::getEndLoc(canonicalDecl).getLocWithOffset(p2 - p1 + 1), 1, s1);
+    return replaceText(canonicalDecl->getEndLoc().getLocWithOffset(p2 - p1 + 1), 1, s1);
 }
 
 loplugin::Plugin::Registration< InlineSimpleMemberFunctions > X("inlinesimplememberfunctions");
diff --git a/compilerplugins/clang/store/lclstaticfix.hxx b/compilerplugins/clang/store/lclstaticfix.hxx
index e15420e63927..16623edcbd8c 100644
--- a/compilerplugins/clang/store/lclstaticfix.hxx
+++ b/compilerplugins/clang/store/lclstaticfix.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef LCLSTATICFIX_H
-#define LCLSTATICFIX_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -28,6 +27,4 @@ class LclStaticFix
 
 } // namespace
 
-#endif // POSTFIXINCREMENTFIX_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/memoryvar.cxx b/compilerplugins/clang/store/memoryvar.cxx
index 2354739f458f..14c328ba40dd 100644
--- a/compilerplugins/clang/memoryvar.cxx
+++ b/compilerplugins/clang/store/memoryvar.cxx
@@ -13,6 +13,7 @@
 #include <map>
 #include <set>
 
+#include "config_clang.h"
 #include "plugin.hxx"
 #include "clang/AST/CXXInheritance.h"
 
diff --git a/compilerplugins/clang/namespaceindentation.cxx b/compilerplugins/clang/store/namespaceindentation.cxx
index 95182197cbd5..1398efc86adf 100644
--- a/compilerplugins/clang/namespaceindentation.cxx
+++ b/compilerplugins/clang/store/namespaceindentation.cxx
@@ -84,8 +84,8 @@ bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
         {
             bool invalid1 = false;
             bool invalid2 = false;
-            unsigned line1 = SM.getPresumedLineNumber(compat::getBeginLoc(nsDecl), &invalid1);
-            unsigned line2 = SM.getPresumedLineNumber(compat::getBeginLoc(child), &invalid2);
+            unsigned line1 = SM.getPresumedLineNumber(nsDecl->getBeginLoc(), &invalid1);
+            unsigned line2 = SM.getPresumedLineNumber(child->getBeginLoc(), &invalid2);
             if (line1 == line2)
                 return true;
         }
@@ -95,12 +95,12 @@ bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
     // if we are inside the yyy NameSpaceDecl of
     //      namespace xxx::yyy
     // the beginLoc is just between the "xxx" and the "::"
-    auto nsDeclBeginLoc = compat::getBeginLoc(nsDecl);
+    auto nsDeclBeginLoc = nsDecl->getBeginLoc();
     bool foundMultiple = false;
     {
         constexpr int BACKSCAN = 32;
-        auto beginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(-BACKSCAN);
-        auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(3);
+        auto beginLoc = nsDecl->getBeginLoc().getLocWithOffset(-BACKSCAN);
+        auto endLoc = nsDecl->getBeginLoc().getLocWithOffset(3);
         const char* p1 = SM.getCharacterData(beginLoc);
         const char* p2 = SM.getCharacterData(endLoc);
         unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
@@ -114,7 +114,7 @@ bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
             if (namespaceToken.find("::") != std::string::npos)
             {
                 auto idx = s.rfind("\n");
-                nsDeclBeginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(idx - BACKSCAN + 1);
+                nsDeclBeginLoc = nsDecl->getBeginLoc().getLocWithOffset(idx - BACKSCAN + 1);
                 foundMultiple = true;
             }
         }
@@ -140,8 +140,8 @@ bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
                nsDecl->getRBraceLoc());
 
     // no easy way to get the position of the left brace
-    auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(256);
-    const char* p1 = SM.getCharacterData(SM.getExpansionLoc(compat::getBeginLoc(nsDecl)));
+    auto endLoc = nsDecl->getBeginLoc().getLocWithOffset(256);
+    const char* p1 = SM.getCharacterData(SM.getExpansionLoc(nsDecl->getBeginLoc()));
     const char* p2 = SM.getCharacterData(SM.getExpansionLoc(endLoc));
     unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
     if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048)
@@ -155,7 +155,7 @@ bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
             auto col3 = idx2 - idx1;
             if (col1 != col3)
                 report(DiagnosticsEngine::Warning, "statement left brace mis-aligned",
-                       compat::getBeginLoc(nsDecl));
+                       nsDecl->getBeginLoc());
         }
 
     // extract the comment following the end brace
diff --git a/compilerplugins/clang/oncevar.cxx b/compilerplugins/clang/store/oncevar.cxx
index 0f809b9ebfac..44fcfa950843 100644
--- a/compilerplugins/clang/oncevar.cxx
+++ b/compilerplugins/clang/store/oncevar.cxx
@@ -15,6 +15,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -318,7 +319,7 @@ bool OnceVar::VisitVarDecl( const VarDecl* varDecl )
         return true;
     }
     // Ignore macros like FD_ZERO
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(varDecl))) {
+    if (compiler.getSourceManager().isMacroBodyExpansion(varDecl->getBeginLoc())) {
         return true;
     }
     if (varDecl->hasGlobalStorage()) {
diff --git a/compilerplugins/clang/store/optmove.cxx b/compilerplugins/clang/store/optmove.cxx
new file mode 100644
index 000000000000..51b5a4b84fa1
--- /dev/null
+++ b/compilerplugins/clang/store/optmove.cxx
@@ -0,0 +1,161 @@
+/* -*- 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/.
+ */
+
+#include "plugin.hxx"
+#include "check.hxx"
+
+#include <string>
+#include <set>
+
+/**
+ * This plugin is unfinished, abandoned because it did not find anything interesting.
+ *
+ * Look for variables that are
+ * (a) copied from
+ * (b) never used after the copy
+ * (c) have move operators
+ *
+ * The intention being to find places where we can move data (e.g. in containers) instead of copying.
+*/
+
+namespace
+{
+class OptMove : public loplugin::FilteringPlugin<OptMove>
+{
+public:
+    explicit OptMove(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual void run() override
+    {
+        TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+        for (auto const& pair : m_Candidates)
+        {
+            //auto varDecl = pair.first;
+            auto candidate = pair.second;
+            if (!candidate.canUseExpr)
+                continue;
+            report(DiagnosticsEngine::Warning, "can std::move value instead of copy",
+                   candidate.canUseExpr->getSourceRange().getBegin())
+                << candidate.canUseExpr->getSourceRange();
+            //varDecl->dump();
+        }
+    }
+
+    bool VisitVarDecl(const VarDecl*);
+    bool VisitCXXOperatorCallExpr(const CXXOperatorCallExpr*);
+    bool VisitDeclRefExpr(const DeclRefExpr*);
+    bool VisitFunctionDecl(const FunctionDecl* f)
+    {
+        if (f->getIdentifier() && f->getName() == "foo")
+            f->dump();
+        return true;
+    }
+
+private:
+    struct Candidate
+    {
+        const DeclRefExpr* operatorArg1 = nullptr;
+        const Expr* canUseExpr = nullptr;
+    };
+    std::map<const VarDecl*, Candidate> m_Candidates;
+};
+
+bool OptMove::VisitVarDecl(const VarDecl* varDecl)
+{
+    if (ignoreLocation(varDecl))
+        return true;
+    if (varDecl->hasGlobalStorage())
+        return true;
+    if (varDecl->getLinkageAndVisibility().getLinkage() == ExternalLinkage)
+        return true;
+    if (!varDecl->getType()->isRecordType())
+        return true;
+
+    auto cxxRecord = dyn_cast<CXXRecordDecl>(varDecl->getType()->getAsRecordDecl());
+    if (!cxxRecord || !cxxRecord->hasDefinition() || !cxxRecord->hasMoveAssignment())
+        return true;
+    // ignore our simpler types for now, I'm after bigger game
+    auto typeName = cxxRecord->getName();
+    if (typeName.contains("Reference") || typeName.contains("Color") || typeName.contains("VclPtr")
+        || typeName.contains("OString") || typeName.contains("OUString")
+        || typeName.contains("Rectangle") || typeName.contains("Size")
+        || typeName.contains("Selection") || typeName.contains("Point")
+        || typeName.contains("strong_int"))
+        return true;
+    m_Candidates.emplace(varDecl, Candidate());
+
+    if (!varDecl->hasInit())
+        return true;
+    auto cons = dyn_cast<CXXConstructExpr>(varDecl->getInit());
+    if (!cons || !cons->getConstructor()->isCopyConstructor())
+        return true;
+    auto arg1 = dyn_cast<DeclRefExpr>(cons->getArg(0)->IgnoreImplicit());
+    if (!arg1)
+        return true;
+    auto varDecl1 = dyn_cast<VarDecl>(arg1->getDecl());
+    if (!varDecl1)
+        return true;
+    auto it = m_Candidates.find(varDecl1);
+    if (it == m_Candidates.end())
+        return true;
+    it->second.operatorArg1 = arg1;
+    it->second.canUseExpr = cons;
+    return true;
+}
+
+bool OptMove::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOperatorCallExpr)
+{
+    if (ignoreLocation(cxxOperatorCallExpr))
+        return true;
+    auto op = cxxOperatorCallExpr->getOperator();
+    if (op != OO_Equal)
+        return true;
+    auto arg0 = dyn_cast<DeclRefExpr>(cxxOperatorCallExpr->getArg(0)->IgnoreImplicit());
+    auto arg1 = dyn_cast<DeclRefExpr>(cxxOperatorCallExpr->getArg(1)->IgnoreImplicit());
+    if (!arg0 || !arg1)
+        return true;
+    auto varDecl0 = dyn_cast<VarDecl>(arg0->getDecl());
+    auto varDecl1 = dyn_cast<VarDecl>(arg1->getDecl());
+    if (!varDecl0 || !varDecl1)
+        return true;
+    auto cxxMethodDecl = dyn_cast_or_null<CXXMethodDecl>(cxxOperatorCallExpr->getDirectCallee());
+    if (!cxxMethodDecl || !cxxMethodDecl->isCopyAssignmentOperator())
+        return true;
+    auto it = m_Candidates.find(varDecl1);
+    if (it == m_Candidates.end())
+        return true;
+    it->second.operatorArg1 = arg1;
+    it->second.canUseExpr = cxxOperatorCallExpr;
+    return true;
+}
+
+bool OptMove::VisitDeclRefExpr(const DeclRefExpr* declRefExpr)
+{
+    if (ignoreLocation(declRefExpr))
+        return true;
+    auto varDecl = dyn_cast<VarDecl>(declRefExpr->getDecl());
+    if (!varDecl)
+        return true;
+    auto it = m_Candidates.find(varDecl);
+    if (it == m_Candidates.end())
+        return true;
+    if (it->second.operatorArg1 == declRefExpr)
+        return true;
+    m_Candidates.erase(it);
+    return true;
+}
+
+loplugin::Plugin::Registration<OptMove> noexceptmove("optmove");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/optvalue.cxx b/compilerplugins/clang/store/optvalue.cxx
new file mode 100644
index 000000000000..2b703e194fd6
--- /dev/null
+++ b/compilerplugins/clang/store/optvalue.cxx
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include "config_clang.h"
+#include "plugin.hxx"
+#include "check.hxx"
+
+/*
+*/
+
+namespace
+{
+class OptValue : public loplugin::FilteringPlugin<OptValue>
+{
+public:
+    explicit OptValue(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override { return true; }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXMemberCallExpr(const CXXMemberCallExpr*);
+};
+
+bool OptValue::VisitCXXMemberCallExpr(const CXXMemberCallExpr* topExpr)
+{
+    if (ignoreLocation(topExpr))
+        return true;
+    const CXXMethodDecl* methodDecl = topExpr->getMethodDecl();
+    if (!methodDecl)
+        return true;
+    if (!methodDecl->getIdentifier() || methodDecl->getName() != "value")
+        return true;
+    auto expr1 = topExpr->getImplicitObjectArgument()->IgnoreImpCasts();
+    if (!isa<MaterializeTemporaryExpr>(expr1))
+        return true;
+
+    report(DiagnosticsEngine::Warning, "call to OptValue::value()", topExpr->getBeginLoc());
+
+    return true;
+}
+
+loplugin::Plugin::Registration<OptValue> optvalue("optvalue", false);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/paintmethodconversion.cxx b/compilerplugins/clang/store/paintmethodconversion.cxx
index f8c63d4b98ce..7a394ae25382 100644
--- a/compilerplugins/clang/store/paintmethodconversion.cxx
+++ b/compilerplugins/clang/store/paintmethodconversion.cxx
@@ -16,7 +16,7 @@
 /**
  * Rewrites all Paint method on subclasses of vcl::Window to include RenderContext& as parameter.
  *
- * run as: make COMPILER_PLUGIN_TOOL=paintmethodconversion UPDATE_FILES=all FORCE_COMPILE_ALL=1
+ * run as: make COMPILER_PLUGIN_TOOL=paintmethodconversion UPDATE_FILES=all FORCE_COMPILE=all
  */
 
 namespace
diff --git a/compilerplugins/clang/store/postfixincrementfix.hxx b/compilerplugins/clang/store/postfixincrementfix.hxx
index 6cc2470e6ee7..7f496662be17 100644
--- a/compilerplugins/clang/store/postfixincrementfix.hxx
+++ b/compilerplugins/clang/store/postfixincrementfix.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef POSTFIXINCREMENTFIX_H
-#define POSTFIXINCREMENTFIX_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class PostfixIncrementFix
 
 } // namespace
 
-#endif // POSTFIXINCREMENTFIX_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/putpoolitem.cxx b/compilerplugins/clang/store/putpoolitem.cxx
new file mode 100644
index 000000000000..8080599973bd
--- /dev/null
+++ b/compilerplugins/clang/store/putpoolitem.cxx
@@ -0,0 +1,103 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include <unordered_set>
+
+#include <clang/AST/CXXInheritance.h>
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "check.hxx"
+
+/**
+
+*/
+
+namespace
+{
+class PutPoolItem : public loplugin::FilteringPlugin<PutPoolItem>
+{
+public:
+    explicit PutPoolItem(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override
+    {
+        //        StringRef fn(handler.getMainFileName());
+        //        if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/unoidl/source/sourceprovider-parser.cxx"))
+        //            return false;
+        return true;
+    }
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXMemberCallExpr(const CXXMemberCallExpr*);
+    bool VisitFunctionDecl(const FunctionDecl*)
+    {
+        //        if (f->getIdentifier() && f->getName() == "foo")
+        //            f->dump();
+        return true;
+    }
+};
+
+bool PutPoolItem::VisitCXXMemberCallExpr(const CXXMemberCallExpr* cxxCallExpr)
+{
+    if (ignoreLocation(cxxCallExpr))
+        return true;
+    auto tc = loplugin::TypeCheck(cxxCallExpr->getObjectType());
+    if (!tc.Class("SfxItemSet"))
+        return true;
+    if (!cxxCallExpr->getMethodDecl()->getIdentifier()
+        || cxxCallExpr->getMethodDecl()->getName() != "Put")
+        return true;
+    auto argExpr = dyn_cast<CXXOperatorCallExpr>(cxxCallExpr->getArg(0)->IgnoreImplicit());
+    if (!argExpr)
+        return true;
+    if (argExpr->getOperator() != OO_Star)
+        return true;
+    auto ptrExpr = argExpr->getArg(0)->IgnoreImplicit();
+    auto tc2 = loplugin::TypeCheck(ptrExpr->getType());
+    if (!tc2.Class("unique_ptr"))
+        return true;
+    // ignore calls when we are passing a copy of a member field
+    if (isa<MemberExpr>(ptrExpr))
+        return true;
+
+    StringRef fn = getFilenameOfLocation(
+        compiler.getSourceManager().getSpellingLoc(cxxCallExpr->getBeginLoc()));
+    if (loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/app/inputwin.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/dbgui/csvgrid.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/shells/basesh.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/shells/textsh.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/sw/source/filter/xml/xmlimpit.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/shells/tabsh.cxx"))
+        return true;
+
+    //    argExpr->dump();
+
+    report(DiagnosticsEngine::Warning, "could use std::move?", cxxCallExpr->getBeginLoc())
+        << cxxCallExpr->getSourceRange();
+    return true;
+}
+
+loplugin::Plugin::Registration<PutPoolItem> putpoolitem("putpoolitem", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/refassign.cxx b/compilerplugins/clang/store/refassign.cxx
index 27471a6ae643..6d8e28605ea5 100644
--- a/compilerplugins/clang/store/refassign.cxx
+++ b/compilerplugins/clang/store/refassign.cxx
@@ -17,7 +17,6 @@
 #include <clang/AST/CXXInheritance.h>
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -120,7 +119,7 @@ bool RefAssign::VisitBinaryOperator(BinaryOperator const* binaryOp)
     binaryOp->dump();
     report(DiagnosticsEngine::Warning,
            "assigning a %0 to a var of type %1 probably does not do what you think",
-           compat::getBeginLoc(binaryOp))
+           binaryOp->getBeginLoc())
         << rhsType << lhsType << binaryOp->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/store/removeforwardstringdecl.hxx b/compilerplugins/clang/store/removeforwardstringdecl.hxx
index ef2c3f96743f..bedd2c534359 100644
--- a/compilerplugins/clang/store/removeforwardstringdecl.hxx
+++ b/compilerplugins/clang/store/removeforwardstringdecl.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef REMOVEFORWARDSTRINGDECL_H
-#define REMOVEFORWARDSTRINGDECL_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -30,6 +29,4 @@ class RemoveForwardStringDecl
 
 } // namespace
 
-#endif // REMOVEFORWARDSTRINGDECL_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/sequentialassign.cxx b/compilerplugins/clang/store/sequentialassign.cxx
index a89afea43438..01172df17eb1 100644
--- a/compilerplugins/clang/sequentialassign.cxx
+++ b/compilerplugins/clang/store/sequentialassign.cxx
@@ -15,6 +15,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -205,8 +206,7 @@ void SequentialAssign::checkForSecondAssign(Stmt const* stmt, VarDecl const* var
                 if (declRefExprLHS->getDecl() == varDecl)
                 {
                     report(DiagnosticsEngine::Warning,
-                           "simplify by merging with the preceding assignment",
-                           compat::getBeginLoc(stmt))
+                           "simplify by merging with the preceding assignment", stmt->getBeginLoc())
                         << stmt->getSourceRange();
                 }
         }
@@ -221,8 +221,7 @@ void SequentialAssign::checkForSecondAssign(Stmt const* stmt, VarDecl const* var
                 if (declRefExpr->getDecl() == varDecl)
                 {
                     report(DiagnosticsEngine::Warning,
-                           "simplify by merging with the preceding assignment",
-                           compat::getBeginLoc(stmt))
+                           "simplify by merging with the preceding assignment", stmt->getBeginLoc())
                         << stmt->getSourceRange();
                 }
         }
diff --git a/compilerplugins/clang/shouldreturnbool.cxx b/compilerplugins/clang/store/shouldreturnbool.cxx
index 1372d8103374..fa1bd4cbdfb3 100644
--- a/compilerplugins/clang/shouldreturnbool.cxx
+++ b/compilerplugins/clang/store/shouldreturnbool.cxx
@@ -11,7 +11,10 @@
 #include <set>
 #include <iostream>
 
+#include "config_clang.h"
+
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 #include "functionaddress.hxx"
 
@@ -44,9 +47,6 @@ public:
         // false +, slightly odd usage, but not wrong
         if (loplugin::isSamePathname(fn, SRCDIR "/libreofficekit/qa/tilebench/tilebench.cxx"))
             return;
-        // uses the Unix convention of "non-zero return indicates error"
-        if (loplugin::isSamePathname(fn, SRCDIR "/idlc/source/idlcproduce.cxx"))
-            return;
         // template magic
         if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/gdi/bmpfast.cxx"))
             return;
@@ -111,12 +111,12 @@ public:
                 continue;
             report(DiagnosticsEngine::Warning,
                    "only returning one or zero is an indication you want to return bool",
-                   compat::getBeginLoc(functionDecl))
+                   functionDecl->getBeginLoc())
                 << functionDecl->getSourceRange();
             if (canonicalDecl->getLocation() != functionDecl->getLocation())
             {
                 report(DiagnosticsEngine::Note, "canonical function declaration here",
-                       compat::getBeginLoc(canonicalDecl))
+                       canonicalDecl->getBeginLoc())
                     << canonicalDecl->getSourceRange();
             }
         }
diff --git a/compilerplugins/clang/simplifybool.cxx b/compilerplugins/clang/store/simplifybool.cxx
index d2e53d63aae9..973ab6a7a464 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/store/simplifybool.cxx
@@ -9,7 +9,6 @@
 
 #include <cassert>
 
-#include "compat.hxx"
 #include "plugin.hxx"
 #include "clang/AST/CXXInheritance.h"
 
@@ -22,7 +21,7 @@ Expr const * ignoreAllImplicit(Expr const * expr) {
         expr = e->getSubExpr();
     }
     if (auto const e = dyn_cast<MaterializeTemporaryExpr>(expr)) {
-        expr = compat::getSubExpr(e);
+        expr = e->getSubExpr();
     }
     if (auto const e = dyn_cast<CXXBindTemporaryExpr>(expr)) {
         expr = e->getSubExpr();
@@ -231,7 +230,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
         // Ignore macros, otherwise
         //    OSL_ENSURE(!b, ...);
         // triggers.
-        if (compat::getBeginLoc(e).isMacroID())
+        if (e->getBeginLoc().isMacroID())
             return true;
         // double logical not of an int is an idiom to convert to bool
         auto const sub = ignoreAllImplicit(e);
@@ -241,7 +240,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
             DiagnosticsEngine::Warning,
             ("double logical negation expression of the form '!!A' (with A of type"
              " %0) can %select{logically|literally}1 be simplified as 'A'"),
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << sub->getType()
             << sub->getType()->isBooleanType()
             << expr->getSourceRange();
@@ -249,7 +248,6 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
     }
     auto sub = expr->getSubExpr()->IgnoreParenImpCasts();
     auto reversed = false;
-#if CLANG_VERSION >= 100000
     if (auto const rewritten = dyn_cast<CXXRewrittenBinaryOperator>(sub)) {
         if (rewritten->isReversed()) {
             if (rewritten->getOperator() == BO_EQ) {
@@ -269,12 +267,11 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
             }
         }
     }
-#endif
     if (auto binaryOp = dyn_cast<BinaryOperator>(sub)) {
         // Ignore macros, otherwise
         //    OSL_ENSURE(!b, ...);
         // triggers.
-        if (compat::getBeginLoc(binaryOp).isMacroID())
+        if (binaryOp->getBeginLoc().isMacroID())
             return true;
         if (binaryOp->isComparisonOp())
         {
@@ -288,7 +285,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
             report(
                 DiagnosticsEngine::Warning,
                 ("logical negation of comparison operator, can be simplified by inverting operator"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
         }
         else if (binaryOp->isLogicalOp())
@@ -308,7 +305,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
                     if (binaryOp->isComparisonOp())
                         return expr;
                 if (auto cxxOpCall = dyn_cast<CXXOperatorCallExpr>(expr))
-                    if (compat::isComparisonOp(cxxOpCall))
+                    if (cxxOpCall->isComparisonOp())
                         return expr;
                 return (Expr const*)nullptr;
             };
@@ -318,7 +315,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
                 report(
                     DiagnosticsEngine::Warning,
                     ("logical negation of logical op containing negation, can be simplified"),
-                    compat::getBeginLoc(binaryOp))
+                    binaryOp->getBeginLoc())
                     << binaryOp->getSourceRange();
         }
     }
@@ -326,7 +323,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
         // Ignore macros, otherwise
         //    OSL_ENSURE(!b, ...);
         // triggers.
-        if (compat::getBeginLoc(binaryOp).isMacroID())
+        if (binaryOp->getBeginLoc().isMacroID())
             return true;
         auto op = binaryOp->getOperator();
         // Negating things like > and >= would probably not be wise, there is no guarantee the negation holds for operator overloaded types.
@@ -352,7 +349,7 @@ bool SimplifyBool::VisitUnaryOperator(UnaryOperator const * expr) {
         report(
             DiagnosticsEngine::Warning,
             ("logical negation of comparison operator, can be simplified by inverting operator"),
-            compat::getBeginLoc(expr))
+            expr->getBeginLoc())
             << expr->getSourceRange();
         if (negOp != ASSUME_OPERATOR_EXISTS)
             report(
@@ -405,7 +402,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'A < false' (with A of type"
                  " %0) can logically be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -418,7 +415,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                         ("less-than expression of the form 'A < true' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getLHS()->IgnoreImpCasts()->getType()
                         << (expr->getLHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -429,7 +426,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                         ("less-than expression of the form '!A < true' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -445,7 +442,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'false < A' (with A of type"
                  " %0) can %select{logically|literally}1 be simplified as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getRHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -455,7 +452,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'false < false' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -463,7 +460,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'false < true' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -475,7 +472,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'true < A' (with A of type"
                  " %0) can logically be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -484,7 +481,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'true < false' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -492,7 +489,7 @@ bool SimplifyBool::visitBinLT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than expression of the form 'true < true' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -523,7 +520,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 ("greater-than expression of the form 'A > false' (with A of"
                  " type %0) can %select{logically|literally}1 be simplified as"
                  " 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getLHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -533,7 +530,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'A > true' (with A of"
                  " type %0) can logically be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -546,7 +543,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'false > A' (with A of"
                  " type %0) can logically be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -555,7 +552,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'false > false' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -563,7 +560,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'false > true' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -579,7 +576,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                         ("greater-than expression of the form 'true > A' (with"
                          " A of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getRHS()->IgnoreImpCasts()->getType()
                         << (expr->getRHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -590,7 +587,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                         ("greater-than expression of the form 'true > !A' (with"
                          " A of type %0) can %select{logically|literally}1 be"
                          " simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -602,7 +599,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'true > false' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -610,7 +607,7 @@ bool SimplifyBool::visitBinGT(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than expression of the form 'true > true' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -645,7 +642,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                          " false' (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as"
                          " '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getLHS()->IgnoreImpCasts()->getType()
                         << (expr->getLHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -656,7 +653,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                         ("less-than-or-equal-to expression of the form '!A <="
                          " false' (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -668,7 +665,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'A <= true'"
                  " (with A of type %0) can logically be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -681,7 +678,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'false <= A'"
                  " (with A of type %0) can logically be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -690,7 +687,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'false <= false'"
                  " can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -698,7 +695,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'false <= true'"
                  " can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -711,7 +708,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 ("less-than-or-equal-to expression of the form 'true <= A'"
                  " (with A of type %0) can %select{logically|literally}1 be"
                  " simplified as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getRHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -721,7 +718,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'true <= false'"
                  " can literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -729,7 +726,7 @@ bool SimplifyBool::visitBinLE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("less-than-or-equal-to expression of the form 'true <= true'"
                  " can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -759,7 +756,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'A >= false'"
                  " (with A of type %0) can logically be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -769,7 +766,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 ("greater-than-or-equal-to expression of the form 'A >= true'"
                  " (with A of type %0) can %select{logically|literally}1 be"
                  " simplified as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getLHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -788,7 +785,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                          " 'false >= A' (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as"
                          " '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getRHS()->IgnoreImpCasts()->getType()
                         << (expr->getRHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -799,7 +796,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                         ("greater-than-or-equal-to expression of the form"
                          " 'false >= !A' (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -811,7 +808,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'false >="
                  " false' can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -819,7 +816,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'false >="
                  " true' can literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -831,7 +828,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'true >= A'"
                  " (with A of type %0) can logically be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -840,7 +837,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'true >="
                  " false' can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -848,7 +845,7 @@ bool SimplifyBool::visitBinGE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("greater-than-or-equal-to expression of the form 'true >="
                  " true' can literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -882,7 +879,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                         ("equal-to expression of the form 'A == false' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getLHS()->IgnoreImpCasts()->getType()
                         << (expr->getLHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -893,7 +890,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                         ("equal-to expression of the form '!A == false' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -905,7 +902,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'A == true' (with A of type"
                  " %0) can %select{logically|literally}1 be simplified as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getLHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -923,7 +920,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                         ("equal-to expression of the form 'false == A' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getRHS()->IgnoreImpCasts()->getType()
                         << (expr->getRHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -934,7 +931,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                         ("equal-to expression of the form 'false == !A' (with A"
                          " of type %0) can %select{logically|literally}1 be"
                          " simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -946,7 +943,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'false == false' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -954,7 +951,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'false == true' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -966,7 +963,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'true == A' (with A of type"
                  " %0) can %select{logically|literally}1 be simplified as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getRHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -976,7 +973,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'true == false' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -984,7 +981,7 @@ bool SimplifyBool::visitBinEQ(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("equal-to expression of the form 'true == true' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -1015,7 +1012,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 ("not-equal-to expression of the form 'A != false' (with A of"
                  " type %0) can %select{logically|literally}1 be simplified as"
                  " 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getLHS()->IgnoreImpCasts()->getType()
                 << expr->getLHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -1029,7 +1026,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                         ("not-equal-to expression of the form 'A != true' (with"
                          " A of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getLHS()->IgnoreImpCasts()->getType()
                         << (expr->getLHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -1040,7 +1037,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                         ("not-equal-to expression of the form '!A != true'"
                          " (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -1057,7 +1054,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 ("not-equal-to expression of the form 'false != A' (with A of"
                  " type %0) can %select{logically|literally}1 be simplified as"
                  " 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getRHS()->IgnoreImpCasts()->getType()
                 << expr->getRHS()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -1067,7 +1064,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("not-equal-to expression of the form 'false != false' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -1075,7 +1072,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("not-equal-to expression of the form 'false != true' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -1091,7 +1088,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                         ("not-equal-to expression of the form 'true != A' (with"
                          " A of type %0) can %select{logically|literally}1 be"
                          " simplified as '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getRHS()->IgnoreImpCasts()->getType()
                         << (expr->getRHS()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -1102,7 +1099,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                         ("not-equal-to expression of the form 'true != !A'"
                          " (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -1114,7 +1111,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("not-equal-to expression of the form 'true != false' can"
                  " literally be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         case Value::True:
@@ -1122,7 +1119,7 @@ bool SimplifyBool::visitBinNE(BinaryOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("not-equal-to expression of the form 'true != true' can"
                  " literally be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getSourceRange();
             break;
         }
@@ -1148,7 +1145,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                 ("conditional expression of the form 'A ? B : false' (with A of"
                  " type %0 and B of type %1) can %select{logically|literally}2"
                  " be simplified as 'A && B'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCond()->IgnoreImpCasts()->getType()
                 << expr->getTrueExpr()->IgnoreImpCasts()->getType()
                 << ((expr->getCond()->IgnoreImpCasts()->getType()
@@ -1167,7 +1164,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                          " (with A of type %0 and B of type %1) can"
                          " %select{logically|literally}2 be simplified as '!A"
                          " || B'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getCond()->IgnoreImpCasts()->getType()
                         << expr->getTrueExpr()->IgnoreImpCasts()->getType()
                         << ((expr->getCond()->IgnoreImpCasts()->getType()
@@ -1182,7 +1179,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                          " (with A of type %0 and B of type %1) can"
                          " %select{logically|literally}2 be simplified as 'A ||"
                          " B'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << expr->getTrueExpr()->IgnoreImpCasts()->getType()
                         << (e->IgnoreImpCasts()->getType()->isBooleanType()
@@ -1206,7 +1203,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                          " (with A of type %0 and B of type %1) can"
                          " %select{logically|literally}2 be simplified as '!A"
                          " && B'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getCond()->IgnoreImpCasts()->getType()
                         << expr->getFalseExpr()->IgnoreImpCasts()->getType()
                         << ((expr->getCond()->IgnoreImpCasts()->getType()
@@ -1221,7 +1218,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                          " (with A of type %0 and B of type %1) can"
                          " %select{logically|literally}2 be simplified as 'A &&"
                          " B'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << expr->getFalseExpr()->IgnoreImpCasts()->getType()
                         << (e->IgnoreImpCasts()->getType()->isBooleanType()
@@ -1236,7 +1233,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("conditional expression of the form 'A ? false : false' (with"
                  " A of type %0) can logically be simplified as 'false'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCond()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
@@ -1250,7 +1247,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                          " (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as"
                          " '!A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << expr->getCond()->IgnoreImpCasts()->getType()
                         << (expr->getCond()->IgnoreImpCasts()->getType()
                             ->isBooleanType())
@@ -1261,7 +1258,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                         ("conditional expression of the form '!A ? false :"
                          " true' (with A of type %0) can"
                          " %select{logically|literally}1 be simplified as 'A'"),
-                        compat::getBeginLoc(expr))
+                        expr->getBeginLoc())
                         << e->IgnoreImpCasts()->getType()
                         << e->IgnoreImpCasts()->getType()->isBooleanType()
                         << expr->getSourceRange();
@@ -1278,7 +1275,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                 ("conditional expression of the form 'A ? true : B' (with A of"
                  " type %0 and B of type %1) can %select{logically|literally}2"
                  " be simplified as 'A || B'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCond()->IgnoreImpCasts()->getType()
                 << expr->getFalseExpr()->IgnoreImpCasts()->getType()
                 << ((expr->getCond()->IgnoreImpCasts()->getType()
@@ -1293,7 +1290,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                 ("conditional expression of the form 'A ? true : false' (with A"
                  " of type %0) can %select{logically|literally}1 be simplified"
                  " as 'A'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCond()->IgnoreImpCasts()->getType()
                 << expr->getCond()->IgnoreImpCasts()->getType()->isBooleanType()
                 << expr->getSourceRange();
@@ -1303,7 +1300,7 @@ bool SimplifyBool::VisitConditionalOperator(ConditionalOperator const * expr) {
                 DiagnosticsEngine::Warning,
                 ("conditional expression of the form 'A ? true : true' (with A"
                  " of type %0) can logically be simplified as 'true'"),
-                compat::getBeginLoc(expr))
+                expr->getBeginLoc())
                 << expr->getCond()->IgnoreImpCasts()->getType()
                 << expr->getSourceRange();
             break;
diff --git a/compilerplugins/clang/staticvar.cxx b/compilerplugins/clang/store/staticvar.cxx
index 10f38f5f71ea..774ab92245bb 100644
--- a/compilerplugins/clang/staticvar.cxx
+++ b/compilerplugins/clang/store/staticvar.cxx
@@ -15,6 +15,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -52,7 +53,6 @@ public:
             || fn == SRCDIR "/sal/qa/rtl/digest/rtl_digest.cxx"
             || fn == SRCDIR "/sal/qa/rtl/strings/test_oustring_endswith.cxx"
             || fn == SRCDIR "/sal/qa/rtl/strings/test_oustring_convert.cxx"
-            || fn == SRCDIR "/svl/qa/unit/items/test_itempool.cxx"
             // contains mutable state
             || fn == SRCDIR "/vcl/unx/generic/dtrans/X11_selection.cxx"
             || fn == SRCDIR "/sax/qa/cppunit/xmlimport.cxx"
diff --git a/compilerplugins/clang/store/stringbuffer.cxx b/compilerplugins/clang/store/stringbuffer.cxx
index 61df3069a51c..899c9b6ac2d8 100644
--- a/compilerplugins/clang/store/stringbuffer.cxx
+++ b/compilerplugins/clang/store/stringbuffer.cxx
@@ -9,7 +9,6 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 #include <vector>
 
@@ -58,11 +57,11 @@ bool StringBuffer::VisitCXXMemberCallExpr(CXXMemberCallExpr const* memberCallExp
     auto matTemp = dyn_cast<MaterializeTemporaryExpr>(memberCallExpr->getArg(0));
     if (!matTemp)
         return true;
-    if (!isa<CXXOperatorCallExpr>(compat::getSubExpr(matTemp)))
+    if (!isa<CXXOperatorCallExpr>(matTemp->getSubExpr()))
         return true;
     report(DiagnosticsEngine::Warning,
            "appending added result of OUString to OUStringBuffer, rather do .append(x).append(y)",
-           compat::getBeginLoc(memberCallExpr))
+           memberCallExpr->getBeginLoc())
         << memberCallExpr->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/store/stringliteraldefine.cxx b/compilerplugins/clang/store/stringliteraldefine.cxx
new file mode 100644
index 000000000000..8d7e778051e1
--- /dev/null
+++ b/compilerplugins/clang/store/stringliteraldefine.cxx
@@ -0,0 +1,171 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// Find constant character array variables that are either
+//   (a) passed into O[U]String constructors
+//   (b) assigned to O[U]String
+// and are declared using macro names
+// and should thus be turned into O[U]StringLiteral variables.
+//
+
+#include <cassert>
+
+#include "config_clang.h"
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+namespace
+{
+class StringLiteralDefine final : public loplugin::FilteringPlugin<StringLiteralDefine>
+{
+public:
+    explicit StringLiteralDefine(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool TraverseInitListExpr(InitListExpr* expr, DataRecursionQueue* queue = nullptr)
+    {
+        return WalkUpFromInitListExpr(expr)
+               && TraverseSynOrSemInitListExpr(
+                      expr->isSemanticForm() ? expr : expr->getSemanticForm(), queue);
+    }
+
+    bool VisitCXXConstructExpr(CXXConstructExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+            return true;
+        loplugin::TypeCheck const tc(expr->getType());
+        if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
+              || tc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        auto const ctor = expr->getConstructor();
+        if (ctor->getNumParams() != 2)
+            return true;
+
+        const Expr* arg0 = expr->getArg(0)->IgnoreParenImpCasts();
+        auto const e1 = dyn_cast<clang::StringLiteral>(arg0);
+        if (!e1)
+            return true;
+        auto argLoc = arg0->getBeginLoc();
+        // check if the arg is a macro
+        auto macroLoc = compiler.getSourceManager().getSpellingLoc(argLoc);
+        if (argLoc == macroLoc)
+            return true;
+        // check if it is the right kind of macro (not particularly reliable checks)
+        if (!macroLoc.isValid() || !compiler.getSourceManager().isInMainFile(macroLoc)
+            || compiler.getSourceManager().isInSystemHeader(macroLoc)
+            || compiler.getSourceManager().isWrittenInBuiltinFile(macroLoc)
+            || compiler.getSourceManager().isWrittenInScratchSpace(macroLoc)
+            || compiler.getSourceManager().isWrittenInCommandLineFile(macroLoc)
+            || isInUnoIncludeFile(macroLoc))
+            return true;
+        StringRef fileName = getFilenameOfLocation(macroLoc);
+        StringRef name{ Lexer::getImmediateMacroName(
+            arg0->getBeginLoc(), compiler.getSourceManager(), compiler.getLangOpts()) };
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/config_host/"))
+            return true;
+        // used in both OUString and OString context
+        if (name == "FM_COL_LISTBOX" || name == "HID_RELATIONDIALOG_LEFTFIELDCELL"
+            || name == "OOO_HELP_INDEX" || name == "IMP_PNG" || name.startswith("MNI_ACTION_"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/svx/source/stbctrls/pszctrl.cxx"))
+            return true;
+        // used as a prefix and/or concatenated with other strings
+        if (name.startswith("UNO_JAVA_JFW") || name == "SETNODE_BINDINGS" || name == "PATHDELIMITER"
+            || name == "SETNODE_ALLFILEFORMATS" || name == "SETNODE_DISABLED"
+            || name == "XMLNS_DIALOGS_PREFIX" || name == "XMLNS_LIBRARY_PREFIX"
+            || name == "XMLNS_SCRIPT_PREFIX" || name == "XMLNS_TOOLBAR" || name == "XMLNS_XLINK"
+            || name == "XMLNS_XLINK_PREFIX")
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName,
+                                        SRCDIR "/stoc/source/security/access_controller.cxx")
+            && (name == "SERVICE_NAME" || name == "USER_CREDS"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/stoc/source/security/file_policy.cxx")
+            && name == "IMPL_NAME")
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName,
+                                        SRCDIR "/desktop/source/migration/services/jvmfwk.cxx")
+            && name == "IMPL_NAME")
+            return true;
+        if (loplugin::hasPathnamePrefix(
+                fileName, SRCDIR "/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx")
+            && name == "STRXMLNS")
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/sw/source/ui/fldui/fldvar.cxx")
+            && name == "USER_DATA_VERSION_1")
+            return true;
+        // not sure how to exclude the case where the whole block is in a macro
+        // (vs. what I am looking for - regular code with a macro name as the argument)
+        if (name == "assert" || name == "SAL_INFO" || name == "DECLIMPL_SERVICEINFO_DERIVED"
+            || name == "OSL_VERIFY" || name == "OSL_ENSURE" || name == "DECL_PROP_2"
+            || name == "DECL_PROP_3" || name == "DECL_PROP_1" || name == "DECL_DEP_PROP_2"
+            || name == "DECL_DEP_PROP_3" || name == "CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS"
+            || name == "IMPLEMENT_SERVICE_INFO" || name == "SQL_GET_REFERENCES"
+            || name == "SFX_IMPL_OBJECTFACTORY" || name == "IMPLEMENT_SERVICE_INFO1"
+            || name == "IMPLEMENT_SERVICE_INFO2" || name == "IMPLEMENT_SERVICE_INFO3"
+            || name == "IMPLEMENT_SERVICE_INFO_IMPLNAME" || name == "SC_SIMPLE_SERVICE_INFO"
+            || name == "SC_SIMPLE_SERVICE_INFO_COMPAT" || name == "OUT_COMMENT"
+            || name == "LOCALE_EN" || name == "LOCALE" || name == "VBAFONTBASE_PROPNAME"
+            || name == "VBAHELPER_IMPL_XHELPERINTERFACE" || name == "IMPRESS_MAP_ENTRIES"
+            || name == "DRAW_MAP_ENTRIES" || name == "DRAW_PAGE_NOTES_PROPERTIES"
+            || name == "COMMON_FLDTYP_PROPERTIES" || name == "GRAPHIC_PAGE_PROPERTIES"
+            || name == "makeDelay" || name == "makeEvent" || name == "OOO_IMPORTER"
+            || name == "DBG_ASSERT" || name.startswith("CPPUNIT_ASSERT"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR
+                                        "/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx")
+            && name == "DEFAULT_SIZE")
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/filter/source/t602/t602filter.cxx"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/hwpfilter/source/formula.cxx"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/hwpfilter/source/hwpreader.cxx"))
+            return true;
+        if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/filter/source/svg/svgexport.cxx")
+            && name == "NSPREFIX")
+            return true;
+
+        if (!reported_.insert(macroLoc).second)
+            return true;
+
+        report(DiagnosticsEngine::Warning,
+               "change macro '%0' to 'constexpr "
+               "%select{OStringLiteral|OUStringLiteral}1'",
+               macroLoc)
+            << name << (tc.Class("OString").Namespace("rtl").GlobalNamespace() ? 0 : 1);
+        report(DiagnosticsEngine::Note, "macro used here", arg0->getBeginLoc())
+            << arg0->getSourceRange();
+        return true;
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+private:
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    std::set<SourceLocation> reported_;
+};
+
+// Off by default because it needs some hand-holding
+static loplugin::Plugin::Registration<StringLiteralDefine> reg("stringliteraldefine", false);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/stringloop.cxx b/compilerplugins/clang/store/stringloop.cxx
index cb3ad327738f..3bae1a225b1e 100644
--- a/compilerplugins/clang/stringloop.cxx
+++ b/compilerplugins/clang/store/stringloop.cxx
@@ -9,6 +9,7 @@
 
 #include "check.hxx"
 #include "plugin.hxx"
+#include "config_clang.h"
 #include <vector>
 
 /** Look for OUString/OString being appended to inside a loop, where OUStringBuffer/OStringBuffer would be a better idea
@@ -256,9 +257,9 @@ bool StringLoop::VisitCallExpr(CallExpr const* callExpr)
             return true;
         report(DiagnosticsEngine::Warning,
                "appending to OUString in loop, rather use OUStringBuffer",
-               compat::getBeginLoc(operatorCallExpr))
+               operatorCallExpr->getBeginLoc())
             << operatorCallExpr->getSourceRange();
-        report(DiagnosticsEngine::Note, "field here", compat::getBeginLoc(fieldDecl))
+        report(DiagnosticsEngine::Note, "field here", fieldDecl->getBeginLoc())
             << fieldDecl->getSourceRange();
     }
     else if (auto declRefExpr = dyn_cast<DeclRefExpr>(callExpr->getArg(0)))
@@ -275,9 +276,9 @@ bool StringLoop::VisitCallExpr(CallExpr const* callExpr)
                 return true;
             report(DiagnosticsEngine::Warning,
                    "appending to OUString in loop, rather use OUStringBuffer",
-                   compat::getBeginLoc(operatorCallExpr))
+                   operatorCallExpr->getBeginLoc())
                 << operatorCallExpr->getSourceRange();
-            report(DiagnosticsEngine::Note, "var here", compat::getBeginLoc(varDecl))
+            report(DiagnosticsEngine::Note, "var here", varDecl->getBeginLoc())
                 << varDecl->getSourceRange();
         }
     }
diff --git a/compilerplugins/clang/store/svstreamoutputoperators.cxx b/compilerplugins/clang/store/svstreamoutputoperators.cxx
index 6e0ff616844d..f4ac13c6e743 100644
--- a/compilerplugins/clang/store/svstreamoutputoperators.cxx
+++ b/compilerplugins/clang/store/svstreamoutputoperators.cxx
@@ -110,9 +110,9 @@ bool SvStreamOutputOperators::VisitCallExpr( const CallExpr* callExpr )
         else if( arg0 == "const double &" )
             newIOMethod = "WriteDouble";
         else if( arg0 == "const char *" )
-            newIOMethod = "WriteCharPtr";
+            newIOMethod = "WriteOString";
         else if( arg0 == "char *" )
-            newIOMethod = "WriteCharPtr";
+            newIOMethod = "WriteOString";
         else if( arg0 == "const unsigned char *" )
             newIOMethod = "WriteUCharPtr";
         else if( arg0 == "unsigned char *" )
diff --git a/compilerplugins/clang/toolslong.cxx b/compilerplugins/clang/store/toolslong.cxx
index fbf9ceb38773..35a7223bd8f4 100644
--- a/compilerplugins/clang/toolslong.cxx
+++ b/compilerplugins/clang/store/toolslong.cxx
@@ -20,7 +20,6 @@
 #include "config_clang.h"
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace
@@ -34,21 +33,6 @@ bool isLong(QualType type)
     // some parts of the STL have ::difference_type => long
     if (type->getAs<AutoType>() || type->getAs<DecltypeType>())
         return false;
-#if CLANG_VERSION < 80000
-    // Prior to <https://github.com/llvm/llvm-project/commit/
-    // c50240dac133451b3eae5b89cecca4c1c4af9fd4> "[AST] Get aliased type info from an aliased
-    // TemplateSpecialization" in Clang 8, if type is a TemplateSpecializationType on top of a
-    // TypedefType, the above getAs<TypedefType> returned null (as it unconditionally desugared the
-    // TemplateSpecializationType to the underlying canonic type, not to any aliased type), so re-
-    // check with the TemplateSpecializationType's aliased type:
-    if (auto const t = type->getAs<TemplateSpecializationType>())
-    {
-        if (t->isTypeAlias())
-        {
-            return isLong(t->getAliasedType());
-        }
-    }
-#endif
     if (type->isSpecificBuiltinType(BuiltinType::Kind::Long))
         return true;
     auto arrayType = type->getAsArrayTypeUnsafe();
@@ -119,10 +103,9 @@ private:
         std::vector<std::pair<T, bool>> vec(map.begin(), map.end());
         std::sort(vec.begin(), vec.end(),
                   [&](std::pair<T, bool> const& lhs, std::pair<T, bool> const& rhs) {
-                      return compiler.getSourceManager().getCharacterData(
-                                 compat::getBeginLoc(lhs.first))
+                      return compiler.getSourceManager().getCharacterData(lhs.first->getBeginLoc())
                              > compiler.getSourceManager().getCharacterData(
-                                   compat::getBeginLoc(rhs.first));
+                                   rhs.first->getBeginLoc());
                   });
         return vec;
     }
@@ -156,7 +139,7 @@ void ToolsLong::run()
         || loplugin::isSamePathname(fn, SRCDIR
                                     "/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx")
         || loplugin::isSamePathname(fn, SRCDIR "/shell/source/win32/zipfile/zipfile.cxx")
-        || loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-neon/NeonSession.cxx"))
+        || loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-curl/CurlSession.cxx"))
         return;
     // these are places where the external API is actually "long"
     if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/filter/jpeg/JpegReader.cxx"))
@@ -178,7 +161,7 @@ void ToolsLong::run()
     for (auto const& dcl : reverseSourceOrder(varDecls_))
     {
         auto const decl = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(decl) };
+        SourceLocation loc{ decl->getBeginLoc() };
         TypeSourceInfo* tsi = decl->getTypeSourceInfo();
         if (tsi != nullptr)
         {
@@ -216,7 +199,7 @@ void ToolsLong::run()
     for (auto const& dcl : reverseSourceOrder(fieldDecls_))
     {
         auto const decl = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(decl) };
+        SourceLocation loc{ decl->getBeginLoc() };
         TypeSourceInfo* tsi = decl->getTypeSourceInfo();
         if (tsi != nullptr)
         {
@@ -254,7 +237,7 @@ void ToolsLong::run()
     for (auto const& dcl : reverseSourceOrder(parmVarDecls_))
     {
         auto const decl = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(decl) };
+        SourceLocation loc{ decl->getBeginLoc() };
         TypeSourceInfo* tsi = decl->getTypeSourceInfo();
         if (tsi != nullptr)
         {
@@ -304,7 +287,7 @@ void ToolsLong::run()
     for (auto const& dcl : functionDecls_)
     {
         auto const decl = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(decl) };
+        SourceLocation loc{ decl->getBeginLoc() };
         SourceLocation l{ compiler.getSourceManager().getExpansionLoc(loc) };
         SourceLocation end{ compiler.getSourceManager().getExpansionLoc(
             decl->getNameInfo().getLoc()) };
@@ -340,7 +323,7 @@ void ToolsLong::run()
     for (auto const& dcl : staticCasts_)
     {
         auto const expr = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(expr) };
+        SourceLocation loc{ expr->getBeginLoc() };
         TypeSourceInfo* tsi = expr->getTypeInfoAsWritten();
         if (tsi != nullptr)
         {
@@ -372,7 +355,7 @@ void ToolsLong::run()
         if (!rewrite(loc))
         {
             report(DiagnosticsEngine::Warning, "CXXStaticCastExpr, suspicious cast from %0 to %1",
-                   compat::getBeginLoc(expr))
+                   expr->getBeginLoc())
                 << expr->getSubExpr()->IgnoreParenImpCasts()->getType() << expr->getType()
                 << expr->getSourceRange();
         }
@@ -381,7 +364,7 @@ void ToolsLong::run()
     for (auto const& dcl : functionalCasts_)
     {
         auto const expr = dcl.first;
-        SourceLocation loc{ compat::getBeginLoc(expr) };
+        SourceLocation loc{ expr->getBeginLoc() };
         TypeSourceInfo* tsi = expr->getTypeInfoAsWritten();
         if (tsi != nullptr)
         {
@@ -413,8 +396,7 @@ void ToolsLong::run()
         if (!rewrite(loc))
         {
             report(DiagnosticsEngine::Warning,
-                   "CXXFunctionalCastExpr, suspicious cast from %0 to %1",
-                   compat::getBeginLoc(expr))
+                   "CXXFunctionalCastExpr, suspicious cast from %0 to %1", expr->getBeginLoc())
                 << expr->getSubExpr()->IgnoreParenImpCasts()->getType() << expr->getType()
                 << expr->getSourceRange();
         }
@@ -425,12 +407,12 @@ bool ToolsLong::VisitCStyleCastExpr(CStyleCastExpr* expr)
 {
     if (ignoreLocation(expr))
         return true;
-    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr))))
+    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc())))
         return true;
     auto const k = isLong(expr->getType());
     if (!k)
         return true;
-    SourceLocation loc{ compat::getBeginLoc(expr) };
+    SourceLocation loc{ expr->getBeginLoc() };
     while (compiler.getSourceManager().isMacroArgExpansion(loc))
         loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
     if (compiler.getSourceManager().isMacroBodyExpansion(loc)
@@ -440,7 +422,7 @@ bool ToolsLong::VisitCStyleCastExpr(CStyleCastExpr* expr)
         return true;
     }
     report(DiagnosticsEngine::Warning, "CStyleCastExpr, suspicious cast from %0 to %1",
-           compat::getBeginLoc(expr))
+           expr->getBeginLoc())
         << expr->getSubExpr()->IgnoreParenImpCasts()->getType() << expr->getType()
         << expr->getSourceRange();
     return true;
@@ -450,7 +432,7 @@ bool ToolsLong::VisitCXXStaticCastExpr(CXXStaticCastExpr* expr)
 {
     if (ignoreLocation(expr))
         return true;
-    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr))))
+    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc())))
         return true;
     auto const k = isLong(expr->getType());
     if (!k)
@@ -463,7 +445,7 @@ bool ToolsLong::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr* expr)
 {
     if (ignoreLocation(expr))
         return true;
-    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr))))
+    if (isExcludedFile(compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc())))
         return true;
     auto const k = isLong(expr->getType());
     if (!k)
diff --git a/compilerplugins/clang/store/tutorial/tutorial1.hxx b/compilerplugins/clang/store/tutorial/tutorial1.hxx
index a296ab2cf27b..10f73f04b2cd 100644
--- a/compilerplugins/clang/store/tutorial/tutorial1.hxx
+++ b/compilerplugins/clang/store/tutorial/tutorial1.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef TUTORIAL1_H
-#define TUTORIAL1_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class Tutorial1
 
 } // namespace
 
-#endif // POSTFIXINCREMENTFIX_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/tutorial/tutorial2.hxx b/compilerplugins/clang/store/tutorial/tutorial2.hxx
index 9c1f486f80e0..9ae2de354844 100644
--- a/compilerplugins/clang/store/tutorial/tutorial2.hxx
+++ b/compilerplugins/clang/store/tutorial/tutorial2.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef TUTORIAL2_H
-#define TUTORIAL2_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -33,6 +32,4 @@ class Tutorial2
 
 } // namespace
 
-#endif // POSTFIXINCREMENTFIX_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/tutorial/tutorial3.hxx b/compilerplugins/clang/store/tutorial/tutorial3.hxx
index badb12904cf2..11378ef76581 100644
--- a/compilerplugins/clang/store/tutorial/tutorial3.hxx
+++ b/compilerplugins/clang/store/tutorial/tutorial3.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef TUTORIAL3_H
-#define TUTORIAL3_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -35,6 +34,4 @@ class Tutorial3
 
 } // namespace
 
-#endif // POSTFIXINCREMENTFIX_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/unique2optional.cxx b/compilerplugins/clang/store/unique2optional.cxx
new file mode 100644
index 000000000000..e4b8efa1e110
--- /dev/null
+++ b/compilerplugins/clang/store/unique2optional.cxx
@@ -0,0 +1,264 @@
+/* -*- 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/.
+ */
+
+#include <string>
+#include <iostream>
+
+#include "check.hxx"
+#include "plugin.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+
+/**
+
+Look for places where we are using std::unique_ptr to hold a small object,
+where we should rather be using std::optional.
+
+*/
+
+namespace
+{
+class Unique2Optional : public loplugin::FilteringPlugin<Unique2Optional>
+{
+public:
+    explicit Unique2Optional(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override { return true; }
+
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitFieldDecl(const FieldDecl*);
+    bool VisitVarDecl(const VarDecl*);
+
+private:
+    bool doDecl(const DeclaratorDecl*);
+    bool isSmall(QualType type);
+};
+
+bool Unique2Optional::VisitFieldDecl(const FieldDecl* fieldDecl) { return doDecl(fieldDecl); }
+bool Unique2Optional::VisitVarDecl(const VarDecl*)
+{
+    return true; //doDecl(varDecl);
+}
+
+bool Unique2Optional::doDecl(const DeclaratorDecl* fieldDecl)
+{
+    if (ignoreLocation(fieldDecl))
+        return true;
+
+    SourceLocation spellingLocation
+        = compiler.getSourceManager().getSpellingLoc(fieldDecl->getBeginLoc());
+    StringRef fileName = getFilenameOfLocation(spellingLocation);
+
+    // pimpl pattern
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/unotools/closeveto.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svl/svdde.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/vcl/toolkit/morebtn.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/vcl/toolkit/morebtn.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/xmloff/xmlexp.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/xmloff/txtparae.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/xmloff/controlpropertyhdl.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/cui/source/inc/cuitabarea.hxx"))
+        return true;
+
+    // std::type_info is not movable or copyable
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx"))
+        return true;
+
+    // TODO not sure what is going on here, get a compile error
+    if (loplugin::isSamePathname(fileName, SRCDIR "/vcl/inc/unx/printerjob.hxx"))
+        return true;
+
+    // Seems in bad taste to modify these
+    if (loplugin::isSamePathname(fileName, SRCDIR "/cui/source/tabpages/macroass.cxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/cui/source/inc/cuitabline.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/cui/source/inc/page.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sd/source/ui/sidebar/SlideBackground.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/hwpfilter/source/nodes.h"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/hwpfilter/source/hwpfile.h"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/uibase/inc/bookmark.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/inc/viewsh.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/uibase/sidebar/PageFormatPanel.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/uibase/sidebar/PageStylesPanel.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/inc/dpsave.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/ui/inc/dpgroupdlg.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/ui/inc/pvfundlg.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/inc/document.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/inc/scmod.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svx/gallery1.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/svx/inc/textchainflow.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svx/graphctl.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svx/float3d.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/dbaccess/source/ui/dlg/generalpage.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/extensions/source/propctrlr/cellbindinghandler.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/inc/chartlis.hxx"))
+        return true;
+
+    // header ordering issues make this hard to change
+    if (loplugin::isSamePathname(fileName, SRCDIR "/lotuswordpro/source/filter/lwpdlvlist.hxx"))
+        return true;
+
+    // the classes being allocate are ref-counted
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/filter/inc/xeextlst.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/filter/inc/xestyle.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/ui/inc/tpcalc.hxx"))
+        return true;
+
+    // not sure
+    if (fileName.contains("QtInstance.hxx")) // "/vcl/inc/qt5/QtInstance.hxx"))
+        return true;
+
+    // class is defined inside the module, typically some kind of child/pimpl/listener thing
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/sfx2/viewfrm.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svx/linectrl.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/include/svx/sidebar/LinePropertyPanelBase.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/vcl/source/fontsubset/ttcr.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/extensions/source/propctrlr/defaultforminspection.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/extensions/source/propctrlr/propertyhandler.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/inc/spellcheckcontext.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/core/inc/layouter.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sw/source/uibase/inc/numberingtypelistbox.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/lotuswordpro/inc/xfilter/xfdrawstyle.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName, SRCDIR "/sc/source/ui/inc/scuiimoptdlg.hxx"))
+        return true;
+
+    // One of the constructors initialises the field by receiving an unique_ptr
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/lotuswordpro/source/filter/lwpbreaksoverride.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/lotuswordpro/source/filter/lwpcharborderoverride.hxx"))
+        return true;
+    if (loplugin::isSamePathname(fileName,
+                                 SRCDIR "/lotuswordpro/source/filter/lwpparaborderoverride.hxx"))
+        return true;
+
+    if (!loplugin::TypeCheck(fieldDecl->getType()).ClassOrStruct("unique_ptr").StdNamespace())
+        return true;
+
+    auto templateDecl = dyn_cast_or_null<ClassTemplateSpecializationDecl>(
+        fieldDecl->getType()->getAsRecordDecl());
+    if (!templateDecl)
+        return true;
+    if (templateDecl->getTemplateArgs().size() == 0)
+        return true;
+    auto firstTemplateParamType = templateDecl->getTemplateArgs()[0].getAsType();
+    if (!isSmall(firstTemplateParamType))
+        return true;
+    auto paramRecordDecl = firstTemplateParamType->getAsCXXRecordDecl();
+    if (paramRecordDecl)
+    {
+        // if the pointed-to type has a virtual destructor, then we don't know for sure
+        // what size type will be stored there
+        if (!paramRecordDecl->isEffectivelyFinal())
+            if (CXXDestructorDecl* dd = paramRecordDecl->getDestructor())
+                if (dd->isVirtual())
+                    return true;
+        // If it doesn't have a move constructor, then it would be hard to assign into it
+        // TODO this condition could be relaxed in some situations
+        if (!paramRecordDecl->hasMoveConstructor())
+            return true;
+        // the weld stuff needs to be heap allocated
+        if (loplugin::DeclCheck(paramRecordDecl).Class("CustomWeld").Namespace("weld"))
+            return true;
+        // ref-counted classes should be heap allocated
+        if (loplugin::DeclCheck(paramRecordDecl).Class("SvxContourItem"))
+            return true;
+        if (loplugin::DeclCheck(paramRecordDecl).Class("SvxAdjustItem"))
+            return true;
+        if (loplugin::DeclCheck(paramRecordDecl).Class("SwFormatNoBalancedColumns"))
+            return true;
+        if (loplugin::DeclCheck(paramRecordDecl).Class("SwFormatFollowTextFlow"))
+            return true;
+    }
+    // ignore pimpl pattern
+    if (fieldDecl->getName().contains("pImpl"))
+        return true;
+    if (fieldDecl->getName().contains("impl_"))
+        return true;
+    if (fieldDecl->getName().contains("mxImpl"))
+        return true;
+    if (fieldDecl->getName().contains("m_aImpl"))
+        return true;
+    report(DiagnosticsEngine::Warning, "can use std::optional here, heap-stored type is very small",
+           fieldDecl->getLocation())
+        << fieldDecl->getSourceRange();
+    if (paramRecordDecl)
+        report(DiagnosticsEngine::Note, "class being allocated is here",
+               paramRecordDecl->getLocation())
+            << paramRecordDecl->getSourceRange();
+    return true;
+}
+
+bool Unique2Optional::isSmall(QualType type)
+{
+    if (type->isIncompleteType())
+        return false;
+    clang::Type const* t2 = type.getTypePtrOrNull();
+    if (!t2)
+        return false;
+    // 8 bytes == 1 pointer on 64-bit CPU
+    return compiler.getASTContext().getTypeSizeInChars(t2).getQuantity() <= 16;
+}
+
+loplugin::Plugin::Registration<Unique2Optional> unique2optional("unique2optional");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/unusedfieldsremove.cxx b/compilerplugins/clang/store/unusedfieldsremove.cxx
index b8c339edcbcd..61df036f2c62 100644
--- a/compilerplugins/clang/unusedfieldsremove.cxx
+++ b/compilerplugins/clang/store/unusedfieldsremove.cxx
@@ -12,6 +12,7 @@
 #include <cassert>
 #include <string>
 #include <iostream>
+#include "config_clang.h"
 #include "plugin.hxx"
 #include <sys/mman.h>
 #include <sys/types.h>
@@ -120,7 +121,7 @@ bool UnusedFieldsRemove::VisitFieldDecl( const FieldDecl* fieldDecl )
         report(
             DiagnosticsEngine::Warning,
             "Could not remove unused field (" + niceName(fieldDecl) + ")",
-            compat::getBeginLoc(fieldDecl))
+            fieldDecl->getBeginLoc())
           << fieldDecl->getSourceRange();
     }
     return true;
diff --git a/compilerplugins/clang/unusedindex.cxx b/compilerplugins/clang/store/unusedindex.cxx
index a47d55b0fd0a..63b9d4dcaeaf 100644
--- a/compilerplugins/clang/unusedindex.cxx
+++ b/compilerplugins/clang/store/unusedindex.cxx
@@ -63,8 +63,7 @@ bool UnusedIndex::TraverseForStmt(ForStmt* stmt)
     auto ret = RecursiveASTVisitor::TraverseStmt(stmt->getBody());
 
     if (loopVarDecl && mFoundSet.erase(loopVarDecl) == 0)
-        report(DiagnosticsEngine::Warning, "loop variable not used",
-               compat::getBeginLoc(loopVarDecl))
+        report(DiagnosticsEngine::Warning, "loop variable not used", loopVarDecl->getBeginLoc())
             << loopVarDecl->getSourceRange();
 
     if (loopVarDecl)
diff --git a/compilerplugins/clang/unusedmethodsremove.cxx b/compilerplugins/clang/store/unusedmethodsremove.cxx
index 417c3778edf0..ff87c6b7771a 100644
--- a/compilerplugins/clang/unusedmethodsremove.cxx
+++ b/compilerplugins/clang/store/unusedmethodsremove.cxx
@@ -12,8 +12,8 @@
 #include <cassert>
 #include <string>
 #include <iostream>
+#include "config_clang.h"
 #include "plugin.hxx"
-#include "compat.hxx"
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -137,7 +137,7 @@ bool UnusedMethodsRemove::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl
         report(
             DiagnosticsEngine::Warning,
             "Could not remove unused method (" + niceName(functionDecl) + ")",
-            compat::getBeginLoc(functionDecl))
+            functionDecl->getBeginLoc())
           << functionDecl->getSourceRange();
     }
     return true;
diff --git a/compilerplugins/clang/stringadd.cxx b/compilerplugins/clang/stringadd.cxx
index b4994ab60ec6..0ac4ee6d3c65 100644
--- a/compilerplugins/clang/stringadd.cxx
+++ b/compilerplugins/clang/stringadd.cxx
@@ -16,11 +16,13 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
 /**
-    Look for repeated addition to OUString/OString.
+    Look for repeated addition to OUString/OString/OUStringBuffer/OStringBuffer.
 
     Eg.
       OUString x = "xxx";
@@ -60,6 +62,9 @@ public:
         // TODO the += depends on the result of the preceding assign, so can't merge
         if (fn == SRCDIR "/editeng/source/misc/svxacorr.cxx")
             return false;
+        // TODO this file has a boatload of buffer appends' and I don't feel like fixing them all now
+        if (fn == SRCDIR "/vcl/source/gdi/pdfwriter_impl.cxx")
+            return false;
         return true;
     }
 
@@ -72,6 +77,7 @@ public:
 
     bool VisitCompoundStmt(CompoundStmt const*);
     bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*);
+    bool VisitCXXMemberCallExpr(CXXMemberCallExpr const*);
 
 private:
     enum class Summands
@@ -141,12 +147,32 @@ StringAdd::VarDeclAndSummands StringAdd::findAssignOrAdd(Stmt const* stmt)
             {
                 auto tc = loplugin::TypeCheck(varDeclLHS->getType());
                 if (!tc.Class("OUString").Namespace("rtl").GlobalNamespace()
-                    && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
+                    && !tc.Class("OString").Namespace("rtl").GlobalNamespace()
+                    && !tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+                    && !tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
                     return {};
                 if (varDeclLHS->getStorageDuration() == SD_Static)
                     return {};
                 if (!varDeclLHS->hasInit())
                     return {};
+                if (tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+                    || tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
+                {
+                    // ignore the constructor that gives the buffer a default size
+                    if (auto cxxConstructor = dyn_cast<CXXConstructExpr>(varDeclLHS->getInit()))
+                        if (auto constructorDecl = cxxConstructor->getConstructor())
+                            if ((constructorDecl->getNumParams() == 1
+                                 && loplugin::TypeCheck(constructorDecl->getParamDecl(0)->getType())
+                                        .Typedef("sal_Int32")
+                                        .GlobalNamespace())
+                                || (constructorDecl->getNumParams() == 2
+                                    && constructorDecl->getParamDecl(0)->getType()->isIntegralType(
+                                           compiler.getASTContext())
+                                    && constructorDecl->getParamDecl(1)
+                                           ->getType()
+                                           ->isSpecificBuiltinType(BuiltinType::Int)))
+                                return {};
+                }
                 return { varDeclLHS, (isCompileTimeConstant(varDeclLHS->getInit())
                                           ? Summands::OnlyCompileTimeConstants
                                           : (isSideEffectFree(varDeclLHS->getInit())
@@ -169,6 +195,24 @@ StringAdd::VarDeclAndSummands StringAdd::findAssignOrAdd(Stmt const* stmt)
                                   : (isSideEffectFree(rhs) ? Summands::OnlySideEffectFree
                                                            : Summands::SideEffect)) };
                 }
+    if (auto memberCall = dyn_cast<CXXMemberCallExpr>(stmt))
+        if (auto cxxMethodDecl = dyn_cast_or_null<CXXMethodDecl>(memberCall->getDirectCallee()))
+            if (cxxMethodDecl->getIdentifier() && cxxMethodDecl->getName() == "append")
+                if (auto declRefExprLHS
+                    = dyn_cast<DeclRefExpr>(ignore(memberCall->getImplicitObjectArgument())))
+                    if (auto varDeclLHS = dyn_cast<VarDecl>(declRefExprLHS->getDecl()))
+                    {
+                        auto tc = loplugin::TypeCheck(varDeclLHS->getType());
+                        if (!tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+                            && !tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
+                            return {};
+                        auto rhs = memberCall->getArg(0);
+                        return { varDeclLHS,
+                                 (isCompileTimeConstant(rhs)
+                                      ? Summands::OnlyCompileTimeConstants
+                                      : (isSideEffectFree(rhs) ? Summands::OnlySideEffectFree
+                                                               : Summands::SideEffect)) };
+                    }
     return {};
 }
 
@@ -180,20 +224,41 @@ bool StringAdd::checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2,
         stmt2 = exprCleanup->getSubExpr();
     if (auto switchCase = dyn_cast<SwitchCase>(stmt2))
         stmt2 = switchCase->getSubStmt();
-    auto operatorCall = dyn_cast<CXXOperatorCallExpr>(stmt2);
-    if (!operatorCall)
-        return false;
-    if (operatorCall->getOperator() != OO_PlusEqual)
-        return false;
-    auto declRefExprLHS = dyn_cast<DeclRefExpr>(ignore(operatorCall->getArg(0)));
+
+    const DeclRefExpr* declRefExprLHS;
+    const Expr* rhs;
+    auto tc = loplugin::TypeCheck(varDecl.varDecl->getType());
+    if (tc.Class("OString") || tc.Class("OUString"))
+    {
+        auto operatorCall = dyn_cast<CXXOperatorCallExpr>(stmt2);
+        if (!operatorCall)
+            return false;
+        if (operatorCall->getOperator() != OO_PlusEqual)
+            return false;
+        declRefExprLHS = dyn_cast<DeclRefExpr>(ignore(operatorCall->getArg(0)));
+        rhs = operatorCall->getArg(1);
+    }
+    else
+    {
+        // OUStringBuffer, OStringBuffer
+        auto memberCall = dyn_cast<CXXMemberCallExpr>(stmt2);
+        if (!memberCall)
+            return false;
+        auto cxxMethodDecl = dyn_cast_or_null<CXXMethodDecl>(memberCall->getDirectCallee());
+        if (!cxxMethodDecl)
+            return false;
+        if (!cxxMethodDecl->getIdentifier() || cxxMethodDecl->getName() != "append")
+            return false;
+        declRefExprLHS = dyn_cast<DeclRefExpr>(ignore(memberCall->getImplicitObjectArgument()));
+        rhs = memberCall->getArg(0);
+    }
     if (!declRefExprLHS)
         return false;
     if (declRefExprLHS->getDecl() != varDecl.varDecl)
         return false;
     // if either side is a compile-time-constant, then we don't care about
     // side-effects
-    auto rhs = operatorCall->getArg(1);
-    auto const ctcRhs = isCompileTimeConstant(rhs);
+    bool const ctcRhs = isCompileTimeConstant(rhs);
     if (!ctcRhs)
     {
         auto const sefRhs = isSideEffectFree(rhs);
@@ -205,17 +270,24 @@ bool StringAdd::checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2,
             return true;
         }
     }
+    SourceRange mergeRange(stmt1->getSourceRange().getBegin(), stmt2->getSourceRange().getEnd());
     // if we cross a #ifdef boundary
-    if (containsPreprocessingConditionalInclusion(
-            SourceRange(stmt1->getSourceRange().getBegin(), stmt2->getSourceRange().getEnd())))
+    if (containsPreprocessingConditionalInclusion(mergeRange))
     {
         varDecl.summands
             = ctcRhs ? Summands::OnlyCompileTimeConstants
                      : isSideEffectFree(rhs) ? Summands::OnlySideEffectFree : Summands::SideEffect;
         return true;
     }
-    report(DiagnosticsEngine::Warning, "simplify by merging with the preceding assignment",
-           compat::getBeginLoc(stmt2))
+    // If there is a comment between two calls, rather don't suggest merge
+    // IMO, code clarity trumps efficiency (as far as plugin warnings go, anyway).
+    if (containsComment(mergeRange))
+        return true;
+    // I don't think the OUStringAppend functionality can handle this efficiently
+    if (isa<ConditionalOperator>(ignore(rhs)))
+        return false;
+    report(DiagnosticsEngine::Warning, "simplify by merging with the preceding assign/append",
+           stmt2->getBeginLoc())
         << stmt2->getSourceRange();
     return true;
 }
@@ -229,8 +301,7 @@ bool StringAdd::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* operatorCall
     if (operatorCall->getOperator() != OO_Plus)
         return true;
     auto tc = loplugin::TypeCheck(operatorCall->getType()->getUnqualifiedDesugaredType());
-    if (!tc.Struct("OUStringConcat").Namespace("rtl").GlobalNamespace()
-        && !tc.Struct("OStringConcat").Namespace("rtl").GlobalNamespace()
+    if (!tc.Struct("StringConcat").Namespace("rtl").GlobalNamespace()
         && !tc.Class("OUString").Namespace("rtl").GlobalNamespace()
         && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
         return true;
@@ -242,12 +313,17 @@ bool StringAdd::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* operatorCall
             return;
         auto tc3 = loplugin::TypeCheck(e->getType());
         if (!tc3.Class("OUString").Namespace("rtl").GlobalNamespace()
-            && !tc3.Class("OString").Namespace("rtl").GlobalNamespace())
+            && !tc3.Class("OString").Namespace("rtl").GlobalNamespace()
+            && !tc3.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace()
+            && !tc3.Class("OStringLiteral").Namespace("rtl").GlobalNamespace()
+            && !tc3.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+            && !tc3.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
             return;
         report(DiagnosticsEngine::Warning,
-               ("avoid constructing %0 from %1 on %select{L|R}2HS of + (where %select{R|L}2HS is of"
+               ("rather use O[U]String::Concat than constructing %0 from %1 on %select{L|R}2HS of "
+                "+ (where %select{R|L}2HS is of"
                 " type %3)"),
-               compat::getBeginLoc(e))
+               e->getBeginLoc())
             << e->getType().getLocalUnqualifiedType() << e->getSubExprAsWritten()->getType() << arg
             << operatorCall->getArg(1 - arg)->IgnoreImpCasts()->getType() << e->getSourceRange();
     };
@@ -257,9 +333,50 @@ bool StringAdd::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* operatorCall
     return true;
 }
 
+bool StringAdd::VisitCXXMemberCallExpr(CXXMemberCallExpr const* methodCall)
+{
+    if (ignoreLocation(methodCall))
+        return true;
+
+    auto methodDecl = methodCall->getMethodDecl();
+    if (!methodDecl || !methodDecl->getIdentifier() || methodDecl->getName() != "append"
+        || methodCall->getNumArgs() == 0)
+        return true;
+    auto tc1 = loplugin::TypeCheck(methodCall->getType());
+    if (!tc1.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+        && !tc1.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
+        return true;
+    auto arg = methodCall->getArg(0);
+    // I don't think the OUStringAppend functionality can handle this efficiently
+    if (isa<ConditionalOperator>(ignore(arg)))
+        return true;
+
+    auto methodCall2 = dyn_cast<CXXMemberCallExpr>(ignore(methodCall->getImplicitObjectArgument()));
+    if (!methodCall2)
+        return true;
+    auto tc = loplugin::TypeCheck(methodCall2->getType());
+    if (!tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+        && !tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace())
+        return true;
+    auto methodDecl2 = methodCall2->getMethodDecl();
+    if (!methodDecl2->getIdentifier() || methodDecl2->getName() != "append"
+        || methodCall2->getNumArgs() == 0)
+        return true;
+    arg = methodCall2->getArg(0);
+    // I don't think the OUStringAppend functionality can handle this efficiently
+    if (isa<ConditionalOperator>(ignore(arg)))
+        return true;
+    report(DiagnosticsEngine::Warning,
+           "chained append, rather use single append call and + operator",
+           methodCall2->getBeginLoc())
+        << methodCall2->getSourceRange();
+
+    return true;
+}
+
 Expr const* StringAdd::ignore(Expr const* expr)
 {
-    return compat::IgnoreImplicit(compat::IgnoreImplicit(expr)->IgnoreParens());
+    return expr->IgnoreImplicit()->IgnoreParens()->IgnoreImplicit();
 }
 
 bool StringAdd::isSideEffectFree(Expr const* expr)
@@ -291,39 +408,68 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
     {
         // check for calls through OUString::number/OUString::unacquired
         if (auto calleeMethodDecl = dyn_cast_or_null<CXXMethodDecl>(callExpr->getCalleeDecl()))
-            if (calleeMethodDecl)
+        {
+            if (calleeMethodDecl->getIdentifier())
             {
-                if (calleeMethodDecl->getIdentifier())
+                auto name = calleeMethodDecl->getName();
+                if (callExpr->getNumArgs() > 0
+                    && (name == "number" || name == "unacquired" || name == "boolean"
+                        || name == "copy"))
                 {
-                    auto name = calleeMethodDecl->getName();
-                    if (callExpr->getNumArgs() > 0
-                        && (name == "number" || name == "unacquired" || name == "boolean"
-                            || name == "copy"))
+                    auto tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
+                    if (tc.Class("OUString") || tc.Class("OString"))
                     {
-                        auto tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
-                        if (tc.Class("OUString") || tc.Class("OString"))
-                        {
-                            if (isSideEffectFree(callExpr->getArg(0)))
-                                return true;
-                        }
+                        if (isSideEffectFree(callExpr->getArg(0)))
+                            return true;
                     }
                 }
-                else if (auto const d = dyn_cast<CXXConversionDecl>(calleeMethodDecl))
+            }
+            else if (auto const d = dyn_cast<CXXConversionDecl>(calleeMethodDecl))
+            {
+                if (loplugin::TypeCheck(d->getConversionType())
+                        .ClassOrStruct("basic_string_view")
+                        .StdNamespace())
                 {
-                    if (loplugin::TypeCheck(d->getConversionType())
-                            .ClassOrStruct("basic_string_view")
-                            .StdNamespace())
+                    auto const tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
+                    if (tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+                        || tc.Class("OString").Namespace("rtl").GlobalNamespace())
                     {
-                        auto const tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
-                        if (tc.Class("OUString").Namespace("rtl").GlobalNamespace()
-                            || tc.Class("OString").Namespace("rtl").GlobalNamespace())
+                        if (isSideEffectFree(callExpr->getCallee()))
+                            return true;
+                    }
+                }
+            }
+            // Aggressively assume that calls to const member functions are side effect free (if
+            // all of the call's sub-expressions are):
+            if (calleeMethodDecl->isConst())
+            {
+                auto sef = true;
+                // Other options besides CXXMemberCallExpr are e.g. CXXOperatorCallExpr which
+                // does not have such a target expression:
+                if (auto const mce = dyn_cast<CXXMemberCallExpr>(callExpr))
+                {
+                    if (!isSideEffectFree(mce->getImplicitObjectArgument()))
+                    {
+                        sef = false;
+                    }
+                }
+                if (sef)
+                {
+                    for (unsigned i = 0; i != callExpr->getNumArgs(); ++i)
+                    {
+                        if (!isSideEffectFree(callExpr->getArg(i)))
                         {
-                            if (isSideEffectFree(callExpr->getCallee()))
-                                return true;
+                            sef = false;
+                            break;
                         }
                     }
                 }
+                if (sef)
+                {
+                    return true;
+                }
             }
+        }
         if (auto calleeFunctionDecl = dyn_cast_or_null<FunctionDecl>(callExpr->getCalleeDecl()))
             if (calleeFunctionDecl && calleeFunctionDecl->getIdentifier())
             {
@@ -333,7 +479,7 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
                     if (isSideEffectFree(callExpr->getArg(0)))
                         return true;
                 // allowlist some known-safe methods
-                if (name.endswith("ResId") || name == "GetXMLToken")
+                if (compat::ends_with(name, "ResId") || name == "GetXMLToken")
                     if (isSideEffectFree(callExpr->getArg(0)))
                         return true;
             }
@@ -343,12 +489,15 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
     if (auto constructExpr = dyn_cast<CXXConstructExpr>(expr))
     {
         auto dc = loplugin::DeclCheck(constructExpr->getConstructor());
-        if (dc.MemberFunction().Class("OUString") || dc.MemberFunction().Class("OString"))
+        if (dc.MemberFunction().Class("OUString") || dc.MemberFunction().Class("OString")
+            || dc.MemberFunction().Class("OUStringBuffer")
+            || dc.MemberFunction().Class("OStringBuffer"))
             if (constructExpr->getNumArgs() == 0 || isSideEffectFree(constructExpr->getArg(0)))
                 return true;
         // Expr::HasSideEffects does not like stuff that passes through OUStringLiteral
         auto dc2 = loplugin::DeclCheck(constructExpr->getConstructor()->getParent());
-        if (dc2.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+        if (dc2.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OStringLiteral").Namespace("rtl").GlobalNamespace())
             return true;
     }
 
@@ -356,7 +505,8 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
     if (auto functionalCastExpr = dyn_cast<CXXFunctionalCastExpr>(expr))
     {
         auto tc = loplugin::TypeCheck(functionalCastExpr->getType());
-        if (tc.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+        if (tc.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace()
+            || tc.Class("OStringLiteral").Namespace("rtl").GlobalNamespace())
             return isSideEffectFree(functionalCastExpr->getSubExpr());
     }
 
@@ -365,7 +515,7 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
 
 bool StringAdd::isCompileTimeConstant(Expr const* expr)
 {
-    expr = compat::IgnoreImplicit(expr);
+    expr = expr->IgnoreImplicit();
     if (auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(expr))
         if (cxxConstructExpr->getNumArgs() > 0)
             expr = cxxConstructExpr->getArg(0);
diff --git a/compilerplugins/clang/stringconcatauto.cxx b/compilerplugins/clang/stringconcatauto.cxx
index c7460cfcc8cd..934556271b4f 100644
--- a/compilerplugins/clang/stringconcatauto.cxx
+++ b/compilerplugins/clang/stringconcatauto.cxx
@@ -20,6 +20,8 @@ and so their lifecycle should not extend the lifecycle of those temporaries.
 
 #ifndef LO_CLANG_SHARED_PLUGINS
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 #include "check.hxx"
 
@@ -71,7 +73,7 @@ bool StringConcatAuto::checkDecl( const DeclaratorDecl* decl, QualType type, con
     if( isa< ParmVarDecl >( decl )) // parameters should be fine, temporaries should exist during the call
         return true;
     std::string fileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(decl))).str();
+        compiler.getSourceManager().getSpellingLoc(decl->getBeginLoc())).str();
     loplugin::normalizeDotDotInFilePath(fileName);
     if (loplugin::isSamePathname(fileName, SRCDIR "/include/rtl/string.hxx")
         || loplugin::isSamePathname(fileName, SRCDIR "/include/rtl/ustring.hxx")
@@ -81,14 +83,8 @@ bool StringConcatAuto::checkDecl( const DeclaratorDecl* decl, QualType type, con
         return true;
     auto const tc = loplugin::TypeCheck( type.getNonReferenceType().getCanonicalType());
     const char* typeString = nullptr;
-    if( tc.Struct("OUStringConcat").Namespace("rtl").GlobalNamespace())
-        typeString = "OUString";
-    else if( tc.Struct("OStringConcat").Namespace("rtl").GlobalNamespace())
-        typeString = "OString";
-    else if( tc.Struct("OUStringNumber").Namespace("rtl").GlobalNamespace())
-        typeString = "OUString";
-    else if( tc.Struct("OStringNumber").Namespace("rtl").GlobalNamespace())
-        typeString = "OString";
+    if( tc.Struct("StringConcat").Namespace("rtl").GlobalNamespace())
+        typeString = "O(U)String";
     else
         return true;
     report( DiagnosticsEngine::Warning,
diff --git a/compilerplugins/clang/stringconcatliterals.cxx b/compilerplugins/clang/stringconcatliterals.cxx
index f82114199de8..9f6482d218f8 100644
--- a/compilerplugins/clang/stringconcatliterals.cxx
+++ b/compilerplugins/clang/stringconcatliterals.cxx
@@ -9,6 +9,8 @@
 
 #ifndef LO_CLANG_SHARED_PLUGINS
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 #include "check.hxx"
 
@@ -76,16 +78,16 @@ bool StringConcatLiterals::VisitCallExpr(CallExpr const * expr) {
     if ((oo != OverloadedOperatorKind::OO_Plus
          && oo != OverloadedOperatorKind::OO_LessLess)
         || fdecl->getNumParams() != 2 || expr->getNumArgs() != 2
-        || !isStringLiteral(expr->getArg(1)->IgnoreParenImpCasts()))
+        || !isStringLiteral(expr->getArg(1)))
     {
         return true;
     }
     SourceLocation leftLoc;
-    auto const leftExpr = expr->getArg(0)->IgnoreParenImpCasts();
+    auto const leftExpr = expr->getArg(0);
     if (isStringLiteral(leftExpr)) {
-        leftLoc = compat::getBeginLoc(leftExpr);
+        leftLoc = leftExpr->IgnoreParenImpCasts()->getBeginLoc();
     } else {
-        CallExpr const * left = dyn_cast<CallExpr>(leftExpr);
+        CallExpr const * left = dyn_cast<CallExpr>(leftExpr->IgnoreParenImpCasts());
         if (left == nullptr) {
             return true;
         }
@@ -97,11 +99,11 @@ bool StringConcatLiterals::VisitCallExpr(CallExpr const * expr) {
         if ((loo != OverloadedOperatorKind::OO_Plus
              && loo != OverloadedOperatorKind::OO_LessLess)
             || ldecl->getNumParams() != 2 || left->getNumArgs() != 2
-            || !isStringLiteral(left->getArg(1)->IgnoreParenImpCasts()))
+            || !isStringLiteral(left->getArg(1)))
         {
             return true;
         }
-        leftLoc = compat::getBeginLoc(left->getArg(1));
+        leftLoc = left->getArg(1)->getBeginLoc();
     }
 
     // We add an extra " " in the TOOLS_WARN_EXCEPTION macro, which triggers this plugin
@@ -111,13 +113,13 @@ bool StringConcatLiterals::VisitCallExpr(CallExpr const * expr) {
                     compiler.getSourceManager().getImmediateMacroCallerLoc(
                         compiler.getSourceManager().getImmediateMacroCallerLoc(
                             compiler.getSourceManager().getImmediateMacroCallerLoc(
-                                compat::getBeginLoc(expr)))))),
-            SRCDIR "/include/tools/diagnose_ex.h"))
+                                expr->getBeginLoc()))))),
+            SRCDIR "/include/comphelper/diagnose_ex.hxx"))
         return true;
 
     StringRef name {
         getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr))) };
+            compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc())) };
     if (loplugin::isSamePathname(
             name, SRCDIR "/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx")
         || loplugin::isSamePathname(
@@ -133,12 +135,26 @@ bool StringConcatLiterals::VisitCallExpr(CallExpr const * expr) {
         "replace '%0' between string literals with juxtaposition",
         op == nullptr ? expr->getExprLoc() : op->getOperatorLoc())
         << (oo == OverloadedOperatorKind::OO_Plus ? "+" : "<<")
-        << SourceRange(leftLoc, compat::getEndLoc(expr->getArg(1)));
+        << SourceRange(leftLoc, expr->getArg(1)->getEndLoc());
     return true;
 }
 
 bool StringConcatLiterals::isStringLiteral(Expr const * expr) {
-    expr = stripCtor(expr);
+    // Since <https://github.com/llvm/llvm-project/commit/878e590503dff0d9097e91c2bec4409f14503b82>
+    // "Reland [clang] Make predefined expressions string literals under -fms-extensions", in MS
+    // compatibility mode only, IgnoreParens and IgnoreParenImpCasts look through a PredefinedExpr
+    // representing __func__, but which we do not want to do here:
+    while (auto const e = dyn_cast<ParenExpr>(expr)) {
+        expr = e->getSubExpr();
+    }
+    expr = expr->IgnoreImpCasts();
+    if (isa<PredefinedExpr>(expr)) {
+        return false;
+    }
+    // Once we have filtered out the problematic PredefinedExpr above, still call
+    // IgnoreParenImpCasts again, because it does more than just ignore ParenExpr and call
+    // IgnoreImpCasts as is done above:
+    expr = stripCtor(expr->IgnoreParenImpCasts());
     if (!isa<clang::StringLiteral>(expr)) {
         return false;
     }
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index 372dbceb92ba..344125dd4df0 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -86,7 +86,7 @@ bool hasOverloads(FunctionDecl const * decl, unsigned arguments) {
 
 CXXConstructExpr const * lookForCXXConstructExpr(Expr const * expr) {
     if (auto e = dyn_cast<MaterializeTemporaryExpr>(expr)) {
-        expr = compat::getSubExpr(e);
+        expr = e->getSubExpr();
     }
     if (auto e = dyn_cast<CXXFunctionalCastExpr>(expr)) {
         expr = e->getSubExpr();
@@ -94,6 +94,12 @@ CXXConstructExpr const * lookForCXXConstructExpr(Expr const * expr) {
     if (auto e = dyn_cast<CXXBindTemporaryExpr>(expr)) {
         expr = e->getSubExpr();
     }
+    if (auto const e = dyn_cast<CXXMemberCallExpr>(expr)) {
+        // Look through OString::operator std::string_view:
+        if (isa_and_nonnull<CXXConversionDecl>(e->getCalleeDecl())) {
+            return lookForCXXConstructExpr(e->getImplicitObjectArgument()->IgnoreParenImpCasts());
+        }
+    }
     return dyn_cast<CXXConstructExpr>(expr);
 }
 
@@ -112,56 +118,56 @@ public:
     void run() override;
 
     bool TraverseFunctionDecl(FunctionDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseFunctionDecl(decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
 
     bool TraverseCXXDeductionGuideDecl(CXXDeductionGuideDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseCXXDeductionGuideDecl(
             decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
 
     bool TraverseCXXMethodDecl(CXXMethodDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseCXXMethodDecl(decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
 
     bool TraverseCXXConstructorDecl(CXXConstructorDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseCXXConstructorDecl(decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
 
     bool TraverseCXXDestructorDecl(CXXDestructorDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseCXXDestructorDecl(decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
 
     bool TraverseCXXConversionDecl(CXXConversionDecl * decl) {
-        returnTypes_.push(compat::getDeclaredReturnType(decl));
+        returnTypes_.push(decl->getDeclaredReturnType());
         auto const ret = RecursiveASTVisitor::TraverseCXXConversionDecl(decl);
         assert(!returnTypes_.empty());
-        assert(returnTypes_.top() == compat::getDeclaredReturnType(decl));
+        assert(returnTypes_.top() == decl->getDeclaredReturnType());
         returnTypes_.pop();
         return ret;
     }
@@ -185,6 +191,8 @@ public:
 
     bool VisitCallExpr(CallExpr const * expr);
 
+    bool VisitCXXMemberCallExpr(CXXMemberCallExpr const * expr);
+
     bool VisitCXXConstructExpr(CXXConstructExpr const * expr);
 
     bool VisitReturnStmt(ReturnStmt const * stmt);
@@ -418,7 +426,7 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
         // u.equalsIngoreAsciiCase("foo"):
 
         auto file = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+            compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()));
         if (loplugin::isSamePathname(
                 file, SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx"))
         {
@@ -436,7 +444,7 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
         // u.equalsIgnoreAsciiCaseAsciiL("foo", 3) ->
         // u.equalsIngoreAsciiCase("foo"):
         auto file = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+            compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()));
         if (loplugin::isSamePathname(
                 file, SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx"))
         {
@@ -810,7 +818,7 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
                 // b.append("foo", 3) -> b.append("foo"):
                 auto file = getFilenameOfLocation(
                     compiler.getSourceManager().getSpellingLoc(
-                        compat::getBeginLoc(expr)));
+                        expr->getBeginLoc()));
                 if (loplugin::isSamePathname(
                         file,
                         SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx"))
@@ -850,6 +858,47 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
     return true;
 }
 
+bool StringConstant::VisitCXXMemberCallExpr(CXXMemberCallExpr const * expr) {
+    if (ignoreLocation(expr)) {
+        return true;
+    }
+    FunctionDecl const * fdecl = expr->getDirectCallee();
+    if (fdecl == nullptr) {
+        return true;
+    }
+    auto const c = loplugin::DeclCheck(fdecl).Function("getStr");
+    if ((c.Class("OString").Namespace("rtl").GlobalNamespace()
+         || c.Class("OUString").Namespace("rtl").GlobalNamespace())
+        && fdecl->getNumParams() == 0)
+    {
+        auto const e1 = expr->getImplicitObjectArgument()->IgnoreImplicit()->IgnoreParens();
+        if (auto const e2 = dyn_cast<CXXTemporaryObjectExpr>(e1)) {
+            if (e2->getNumArgs() != 0) {
+                return true;
+            }
+            report(
+                DiagnosticsEngine::Warning,
+                "in call of '%0', replace default-constructed %1 directly with an empty %select{ordinary|UTF-16}2 string literal",
+                expr->getExprLoc())
+                << fdecl->getQualifiedNameAsString() << e2->getType() << bool(loplugin::TypeCheck(e2->getType()).Class("OUString")) << expr->getSourceRange();
+            return true;
+        }
+        if (auto const e2 = dyn_cast<CXXFunctionalCastExpr>(e1)) {
+            auto const e3 = dyn_cast<clang::StringLiteral>(e2->getSubExprAsWritten()->IgnoreParens());
+            if (e3 == nullptr) {
+                return true;
+            }
+            report(
+                DiagnosticsEngine::Warning,
+                "in call of '%0', replace %1 constructed from a string literal directly with %select{the|a UTF-16}2 string literal",
+                expr->getExprLoc())
+                << fdecl->getQualifiedNameAsString() << e2->getType() << (loplugin::TypeCheck(e2->getType()).Class("OUString") && !e3->isUTF16()) << expr->getSourceRange();
+            return true;
+        }
+    }
+    return true;
+}
+
 bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
     if (ignoreLocation(expr)) {
         return true;
@@ -945,7 +994,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
                         ("suspicious 'rtl::OUString' constructor with literal"
                          " of length %0 and non-matching length argument %1"),
                         expr->getExprLoc())
-                        << n << res.toString(10) << expr->getSourceRange();
+                        << n << compat::toString(res, 10) << expr->getSourceRange();
                     return true;
                 }
                 APSInt enc;
@@ -969,7 +1018,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
                          " encoding %0 but plain ASCII content; use"
                          " 'RTL_TEXTENCODING_ASCII_US' instead"),
                         expr->getArg(2)->getExprLoc())
-                        << enc.toString(10) << expr->getSourceRange();
+                        << compat::toString(enc, 10) << expr->getSourceRange();
                     return true;
                 }
                 if (encIsUtf8) {
@@ -1061,7 +1110,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
             for (auto i(argsBeg); i != argsEnd; ++i) {
                 Expr const * e = (*i)->IgnoreParenImpCasts();
                 if (isa<MaterializeTemporaryExpr>(e)) {
-                    e = compat::getSubExpr(cast<MaterializeTemporaryExpr>(e))
+                    e = cast<MaterializeTemporaryExpr>(e)->getSubExpr()
                         ->IgnoreParenImpCasts();
                 }
                 if (isa<CXXFunctionalCastExpr>(e)) {
@@ -1167,7 +1216,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
                                     auto file = getFilenameOfLocation(
                                             compiler.getSourceManager()
                                             .getSpellingLoc(
-                                                compat::getBeginLoc(expr)));
+                                                expr->getBeginLoc()));
                                     if (loplugin::isSamePathname(
                                             file,
                                             (SRCDIR
@@ -1180,7 +1229,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
                                         return true;
                                     }
                                 }
-                                auto loc = compat::getBeginLoc(expr->getArg(0));
+                                auto loc = expr->getArg(0)->getBeginLoc();
                                 while (compiler.getSourceManager()
                                        .isMacroArgExpansion(loc))
                                 {
@@ -1308,7 +1357,7 @@ bool StringConstant::VisitReturnStmt(ReturnStmt const * stmt) {
     {
         return true;
     }
-    report(DiagnosticsEngine::Warning, "elide constructor call", compat::getBeginLoc(e1))
+    report(DiagnosticsEngine::Warning, "elide constructor call", e1->getBeginLoc())
         << e1->getSourceRange();
     return true;
 }
@@ -1379,7 +1428,7 @@ bool StringConstant::isStringConstant(
     }
     clang::StringLiteral const * lit = dyn_cast<clang::StringLiteral>(expr);
     if (lit != nullptr) {
-        if (!(lit->isAscii() || lit->isUTF8())) {
+        if (!(compat::isOrdinary(lit) || lit->isUTF8())) {
             return false;
         }
         unsigned n = lit->getLength();
@@ -1954,6 +2003,15 @@ void StringConstant::handleStringCtor(
     bool explicitFunctionalCastNotation, StringKind stringKind)
 {
     auto e0 = argExpr->IgnoreParenImpCasts();
+    if (auto const e1 = dyn_cast<CXXMemberCallExpr>(e0)) {
+        if (auto const e2 = dyn_cast<CXXConversionDecl>(e1->getMethodDecl())) {
+            if (loplugin::TypeCheck(e2->getConversionType()).ClassOrStruct("basic_string_view")
+                .StdNamespace())
+            {
+                e0 = e1->getImplicitObjectArgument()->IgnoreParenImpCasts();
+            }
+        }
+    }
     auto e1 = dyn_cast<CXXFunctionalCastExpr>(e0);
     if (e1 == nullptr) {
         if (explicitFunctionalCastNotation) {
@@ -2019,7 +2077,7 @@ void StringConstant::handleStringCtor(
     }
     //TODO: cont, emb, trm
     if (rewriter != nullptr) {
-        auto loc1 = compat::getBeginLoc(e3);
+        auto loc1 = e3->getBeginLoc();
         auto range = e3->getParenOrBraceRange();
         if (loc1.isFileID() && range.getBegin().isFileID()
             && range.getEnd().isFileID())
@@ -2031,7 +2089,7 @@ void StringConstant::handleStringCtor(
                 if (!first) {
                     StringRef s(
                         compiler.getSourceManager().getCharacterData(loc2), n);
-                    while (s.startswith("\\\n")) {
+                    while (compat::starts_with(s, "\\\n")) {
                         s = s.drop_front(2);
                         while (!s.empty()
                                && (s.front() == ' ' || s.front() == '\t'
@@ -2041,7 +2099,7 @@ void StringConstant::handleStringCtor(
                             s = s.drop_front(1);
                         }
                     }
-                    if (!(s.empty() || s.startswith("/*") || s.startswith("//")
+                    if (!(s.empty() || compat::starts_with(s, "/*") || compat::starts_with(s, "//")
                           || s == "\\"))
                     {
                         break;
@@ -2057,7 +2115,7 @@ void StringConstant::handleStringCtor(
                 unsigned n = Lexer::MeasureTokenLength(
                     l, compiler.getSourceManager(), compiler.getLangOpts());
                 StringRef s(compiler.getSourceManager().getCharacterData(l), n);
-                while (s.startswith("\\\n")) {
+                while (compat::starts_with(s, "\\\n")) {
                     s = s.drop_front(2);
                     while (!s.empty()
                            && (s.front() == ' ' || s.front() == '\t'
@@ -2067,7 +2125,7 @@ void StringConstant::handleStringCtor(
                         s = s.drop_front(1);
                     }
                 }
-                if (!(s.empty() || s.startswith("/*") || s.startswith("//")
+                if (!(s.empty() || compat::starts_with(s, "/*") || compat::starts_with(s, "//")
                       || s == "\\"))
                 {
                     break;
diff --git a/compilerplugins/clang/stringliteralvar.cxx b/compilerplugins/clang/stringliteralvar.cxx
index 348193421a61..fcd3690669e7 100644
--- a/compilerplugins/clang/stringliteralvar.cxx
+++ b/compilerplugins/clang/stringliteralvar.cxx
@@ -7,8 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-// Find constant character array variables that are passed into O[U]String constructors and should
-// thus be turned into O[U]StringLiteral variables.
+// Find constant character array variables that are either
+//   (a) passed into O[U]String constructors
+//   (b) assigned to O[U]String
+// and should thus be turned into O[U]StringLiteral variables.
 //
 // Such a variable may have been used in multiple places, not all of which would be compatible with
 // changing the variable's type to O[U]StringLiteral.  However, this plugin is aggressive and
@@ -26,6 +28,7 @@
 #include <cassert>
 
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace
@@ -74,7 +77,8 @@ public:
         {
             return true;
         }
-        switch (expr->getConstructor()->getNumParams())
+        auto const ctor = expr->getConstructor();
+        switch (ctor->getNumParams())
         {
             case 1:
             {
@@ -120,16 +124,24 @@ public:
                     return true;
                 }
                 auto const e2 = expr->getArg(1);
-                if (!(isa<CXXDefaultArgExpr>(e2)
-                      && loplugin::TypeCheck(e2->getType())
-                             .Struct("Dummy")
-                             .Namespace("libreoffice_internal")
-                             .Namespace("rtl")
-                             .GlobalNamespace()))
+                if (!((isa<CXXDefaultArgExpr>(e2)
+                       && loplugin::TypeCheck(e2->getType())
+                              .Struct("Dummy")
+                              .Namespace("libreoffice_internal")
+                              .Namespace("rtl")
+                              .GlobalNamespace())
+                      || (loplugin::TypeCheck(ctor->getParamDecl(1)->getType())
+                              .Typedef("sal_Int32")
+                              .GlobalNamespace()
+                          && e2->isIntegerConstantExpr(compiler.getASTContext()))))
                 {
                     return true;
                 }
                 auto const d = e1->getDecl();
+                if (isPotentiallyInitializedWithMalformedUtf16(d))
+                {
+                    return true;
+                }
                 if (!reportedArray_.insert(d).second)
                 {
                     return true;
@@ -150,6 +162,56 @@ public:
         return true;
     }
 
+    bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        if (expr->getOperator() != OO_Equal)
+        {
+            return true;
+        }
+        loplugin::TypeCheck const tc(expr->getType());
+        if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
+              || tc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        if (expr->getNumArgs() != 2)
+        {
+            return true;
+        }
+        auto const e = dyn_cast<DeclRefExpr>(expr->getArg(1)->IgnoreParenImpCasts());
+        if (e == nullptr)
+        {
+            return true;
+        }
+        auto const t = e->getType();
+        if (!(t.isConstQualified() && t->isConstantArrayType()))
+        {
+            return true;
+        }
+        auto const d = e->getDecl();
+        if (isPotentiallyInitializedWithMalformedUtf16(d))
+        {
+            return true;
+        }
+        if (!reportedArray_.insert(d).second)
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning,
+               "change type of variable %0 from constant character array (%1) to "
+               "%select{OStringLiteral|OUStringLiteral}2%select{|, and make it static}3",
+               d->getLocation())
+            << d << d->getType() << (tc.Class("OString").Namespace("rtl").GlobalNamespace() ? 0 : 1)
+            << isAutomaticVariable(cast<VarDecl>(d)) << d->getSourceRange();
+        report(DiagnosticsEngine::Note, "first assigned here", expr->getBeginLoc())
+            << expr->getSourceRange();
+        return true;
+    }
+
     bool VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr const* expr)
     {
         if (ignoreLocation(expr))
@@ -193,6 +255,61 @@ private:
         }
     }
 
+    // There is some confusion on the semantics of numeric-escape-sequences in string literals, see
+    // <https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2029r4.html> "Proposed resolution
+    // for core issues 411, 1656, and 2333; numeric and universal character escapes in character and
+    // string literals", so suppress warnings about arrays that are deliberately not written as
+    // UTF-16 string literals because they contain lone surrogates:
+    bool isPotentiallyInitializedWithMalformedUtf16(ValueDecl const* decl) const
+    {
+        if (!decl->getType()->getArrayElementTypeNoTypeQual()->isChar16Type())
+        {
+            return false;
+        }
+        auto const init = cast<VarDecl>(decl)->getAnyInitializer();
+        if (init == nullptr)
+        {
+            return true;
+        }
+        auto const list = dyn_cast<InitListExpr>(init);
+        if (list == nullptr)
+        {
+            // Assuming that the initializer already is a string literal, assume that that string
+            // literal has no issues with malformed UTF-16:
+            if (isDebugMode())
+            {
+                assert(isa<clang::StringLiteral>(init));
+            }
+            return false;
+        }
+        auto highSurrogate = false;
+        for (auto const e : list->inits())
+        {
+            llvm::APSInt v;
+            if (!compat::EvaluateAsInt(e, v, compiler.getASTContext()))
+            {
+                return true;
+            }
+            if (highSurrogate)
+            {
+                if (v < 0xDC00 || v > 0xDFFF)
+                {
+                    return true;
+                }
+                highSurrogate = false;
+            }
+            else if (v >= 0xD800 && v <= 0xDBFF)
+            {
+                highSurrogate = true;
+            }
+            else if (v >= 0xDC00 && v <= 0xDFFF)
+            {
+                return true;
+            }
+        }
+        return highSurrogate;
+    }
+
     std::set<Decl const*> reportedAutomatic_;
     std::set<Decl const*> reportedArray_;
 };
diff --git a/compilerplugins/clang/stringstatic.cxx b/compilerplugins/clang/stringstatic.cxx
index 364bc566aa97..a7439608d556 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/compilerplugins/clang/stringstatic.cxx
@@ -10,17 +10,9 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
-#include <unordered_set>
-
-/** Look for static O*String and O*String[], they can be more efficiently declared as:
-
-        static constexpr OUStringLiteral our_aLBEntryMap[] = {u" ", u", "};
-        static constexpr OUStringLiteral sName(u"name");
-
-    which is more efficient at startup time.
+/** Look for static O*String and O*String[] which can be constepxr.
  */
 namespace {
 
@@ -33,16 +25,7 @@ public:
         FilteringPlugin(rData) {}
 
     void run() override;
-    bool preRun() override;
-    void postRun() override;
     bool VisitVarDecl(VarDecl const*);
-    bool VisitReturnStmt(ReturnStmt const*);
-    bool VisitDeclRefExpr(DeclRefExpr const*);
-    bool VisitMemberExpr(MemberExpr const*);
-
-private:
-    std::unordered_set<VarDecl const *> potentialVars;
-    std::unordered_set<VarDecl const *> excludeVars;
 };
 
 void StringStatic::run()
@@ -52,146 +35,77 @@ void StringStatic::run()
             postRun();
 }
 
-bool StringStatic::preRun()
-{
-    StringRef fn(handler.getMainFileName());
-    // passing around pointers to global OUString
-    if (loplugin::hasPathnamePrefix(fn, SRCDIR "/filter/source/svg/"))
-         return false;
-    // has a mix of literals and refs to external OUStrings
-    if (loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-neon/ContentProperties.cxx"))
-         return false;
-    return true;
-}
-
-void StringStatic::postRun()
-{
-    for (auto const & pVarDecl : excludeVars) {
-        potentialVars.erase(pVarDecl);
-    }
-    for (auto const & varDecl : potentialVars) {
-        report(DiagnosticsEngine::Warning,
-                "rather declare this using OUStringLiteral/OStringLiteral/char[]",
-                varDecl->getLocation())
-            << varDecl->getSourceRange();
-    }
-}
-
 bool StringStatic::VisitVarDecl(VarDecl const* varDecl)
 {
     if (ignoreLocation(varDecl))
         return true;
     QualType qt = varDecl->getType();
-    if (!varDecl->hasGlobalStorage())
-        return true;
-    if (varDecl->hasGlobalStorage() && !varDecl->isStaticLocal()) {
-        //TODO: For a non-public static member variable from an included file, we could still
-        // examine it further if all its uses must be seen in that included file:
-        if (!compiler.getSourceManager().isInMainFile(varDecl->getLocation())) {
-            return true;
-        }
-    }
     if (!varDecl->isThisDeclarationADefinition()
-        || !qt.isConstQualified())
+        || !qt.isConstQualified() || varDecl->isConstexpr())
         return true;
-    if (qt->isArrayType())
-        qt = qt->getAsArrayTypeUnsafe()->getElementType();
 
-    auto tc = loplugin::TypeCheck(qt);
-    if (!tc.Class("OUString").Namespace("rtl").GlobalNamespace()
-        && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
-        return true;
-    if (varDecl->hasInit())
+    if (varDecl->hasGlobalStorage())
     {
-        Expr const * expr = varDecl->getInit();
-        while (true) {
-            if (ExprWithCleanups const * exprWithCleanups = dyn_cast<ExprWithCleanups>(expr)) {
-                expr = exprWithCleanups->getSubExpr();
-            }
-            else if (CastExpr const * castExpr = dyn_cast<CastExpr>(expr)) {
-                expr = castExpr->getSubExpr();
-            }
-            else if (MaterializeTemporaryExpr const * materializeExpr = dyn_cast<MaterializeTemporaryExpr>(expr)) {
-                expr = compat::getSubExpr(materializeExpr);
-            }
-            else if (CXXBindTemporaryExpr const * bindExpr = dyn_cast<CXXBindTemporaryExpr>(expr)) {
-                expr = bindExpr->getSubExpr();
-            }
-            else if (CXXConstructExpr const * constructExpr = dyn_cast<CXXConstructExpr>(expr)) {
-                if (constructExpr->getNumArgs() == 0) {
+        if (qt->isArrayType())
+            qt = qt->getAsArrayTypeUnsafe()->getElementType();
+
+        auto tc = loplugin::TypeCheck(qt);
+        if (!tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+            && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
+            return true;
+        if (varDecl->hasInit())
+        {
+            Expr const * expr = varDecl->getInit();
+            while (true) {
+                if (ExprWithCleanups const * exprWithCleanups = dyn_cast<ExprWithCleanups>(expr)) {
+                    expr = exprWithCleanups->getSubExpr();
+                }
+                else if (CastExpr const * castExpr = dyn_cast<CastExpr>(expr)) {
+                    expr = castExpr->getSubExpr();
+                }
+                else if (MaterializeTemporaryExpr const * materializeExpr = dyn_cast<MaterializeTemporaryExpr>(expr)) {
+                    expr = materializeExpr->getSubExpr();
+                }
+                else if (CXXBindTemporaryExpr const * bindExpr = dyn_cast<CXXBindTemporaryExpr>(expr)) {
+                    expr = bindExpr->getSubExpr();
+                }
+                else if (CXXConstructExpr const * constructExpr = dyn_cast<CXXConstructExpr>(expr)) {
+                    if (constructExpr->getNumArgs() == 0) {
+                        return true;
+                    }
+                    expr = constructExpr->getArg(0);
+                } else if (isa<CallExpr>(expr)) {
                     return true;
+                } else {
+                    break;
                 }
-                expr = constructExpr->getArg(0);
-            } else if (isa<CallExpr>(expr)) {
-                return true;
-            } else {
-                break;
             }
         }
     }
-    potentialVars.insert(varDecl);
-
-    return true;
-}
-
-bool StringStatic::VisitReturnStmt(ReturnStmt const * returnStmt)
-{
-    if (ignoreLocation(returnStmt)) {
-        return true;
-    }
-    if (!returnStmt->getRetValue()) {
-        return true;
-    }
-    DeclRefExpr const * declRef = dyn_cast<DeclRefExpr>(returnStmt->getRetValue());
-    if (!declRef) {
-        return true;
-    }
-    VarDecl const * varDecl = dyn_cast<VarDecl>(declRef->getDecl());
-    if (varDecl) {
-        excludeVars.insert(varDecl);
-    }
-    return true;
-}
-
-bool StringStatic::VisitDeclRefExpr(DeclRefExpr const * declRef)
-{
-    if (ignoreLocation(declRef))
-        return true;
-    VarDecl const * varDecl = dyn_cast<VarDecl>(declRef->getDecl());
-    if (!varDecl)
-        return true;
-    if (potentialVars.count(varDecl) == 0)
-        return true;
-    // ignore globals that are used in CPPUNIT_ASSERT expressions, otherwise we can end up
-    // trying to compare an OUStringLiteral and an OUString, and CPPUNIT can't handle that
-    auto loc = compat::getBeginLoc(declRef);
-    if (compiler.getSourceManager().isMacroArgExpansion(loc))
+    else
     {
-        StringRef name { Lexer::getImmediateMacroName(loc, compiler.getSourceManager(), compiler.getLangOpts()) };
-        if (name.startswith("CPPUNIT_ASSERT"))
-            excludeVars.insert(varDecl);
+        if (isa<ParmVarDecl>(varDecl))
+            return true;
+        loplugin::TypeCheck const tc(varDecl->getType());
+        if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
+              || tc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+        {
+            return true;
+        }
+        if (varDecl->hasInit())
+        {
+            auto cxxConstruct = dyn_cast<CXXConstructExpr>(varDecl->getInit()->IgnoreImplicit());
+            if (!cxxConstruct || cxxConstruct->getNumArgs() == 0)
+                return true;
+            if (!isa<clang::StringLiteral>(cxxConstruct->getArg(0)))
+                return true;
+        }
     }
-    return true;
-}
+    report(DiagnosticsEngine::Warning,
+           "rather declare this as constexpr",
+           varDecl->getLocation())
+        << varDecl->getSourceRange();
 
-bool StringStatic::VisitMemberExpr(MemberExpr const * expr)
-{
-    if (ignoreLocation(expr))
-        return true;
-    auto const declRef = dyn_cast<DeclRefExpr>(expr->getBase());
-    if (declRef == nullptr) {
-        return true;
-    }
-    VarDecl const * varDecl = dyn_cast<VarDecl>(declRef->getDecl());
-    if (!varDecl)
-        return true;
-    if (potentialVars.count(varDecl) == 0)
-        return true;
-    auto const id = expr->getMemberDecl()->getIdentifier();
-    if (id == nullptr || id->getName() != "pData") {
-        return true;
-    }
-    excludeVars.insert(varDecl);
     return true;
 }
 
diff --git a/compilerplugins/clang/stringview.cxx b/compilerplugins/clang/stringview.cxx
index abfc87f78fd6..9484f3ace957 100644
--- a/compilerplugins/clang/stringview.cxx
+++ b/compilerplugins/clang/stringview.cxx
@@ -16,6 +16,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/StmtVisitor.h"
 
@@ -39,7 +40,13 @@ public:
     {
     }
 
-    bool preRun() override { return true; }
+    bool preRun() override
+    {
+        auto const fn = handler.getMainFileName();
+        return !(loplugin::isSamePathname(fn, SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx")
+                 || loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/rtl/strings/")
+                 || loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/rtl/oustring/"));
+    }
 
     virtual void run() override
     {
@@ -51,8 +58,11 @@ public:
     bool VisitFunctionDecl(FunctionDecl const*);
     bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*);
     bool VisitImplicitCastExpr(ImplicitCastExpr const*);
+    bool VisitCXXMemberCallExpr(CXXMemberCallExpr const*);
+    bool VisitCXXConstructExpr(CXXConstructExpr const*);
 
 private:
+    void handleSubExprThatCouldBeView(Expr const* expr);
     void handleCXXConstructExpr(CXXConstructExpr const* expr);
     void handleCXXMemberCallExpr(CXXMemberCallExpr const* expr);
 };
@@ -62,32 +72,35 @@ bool StringView::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOperator
     if (ignoreLocation(cxxOperatorCallExpr))
         return true;
 
-    auto check = [&](const Expr* expr) -> void {
-        auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(compat::IgnoreImplicit(expr));
-        if (!memberCallExpr)
-            return;
-        auto methodDecl = memberCallExpr->getMethodDecl();
-        if (!methodDecl->getIdentifier() || methodDecl->getName() != "copy")
-            return;
-        report(DiagnosticsEngine::Warning, "rather than copy, pass with a view using subView()",
-               compat::getBeginLoc(expr))
-            << expr->getSourceRange();
-    };
     auto op = cxxOperatorCallExpr->getOperator();
     if (op == OO_Plus && cxxOperatorCallExpr->getNumArgs() == 2)
     {
-        check(cxxOperatorCallExpr->getArg(0));
-        check(cxxOperatorCallExpr->getArg(1));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(0));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(1));
     }
-    if (compat::isComparisonOp(cxxOperatorCallExpr))
+    if (cxxOperatorCallExpr->isComparisonOp())
     {
-        check(cxxOperatorCallExpr->getArg(0));
-        check(cxxOperatorCallExpr->getArg(1));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(0));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(1));
     }
     else if (op == OO_PlusEqual)
-        check(cxxOperatorCallExpr->getArg(1));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(1));
     else if (op == OO_Subscript)
-        check(cxxOperatorCallExpr->getArg(0));
+        handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(0));
+    else if (op == OO_Equal)
+    {
+        if (loplugin::TypeCheck(cxxOperatorCallExpr->getType())
+                .Class("OUStringBuffer")
+                .Namespace("rtl")
+                .GlobalNamespace()
+            || loplugin::TypeCheck(cxxOperatorCallExpr->getType())
+                   .Class("OStringBuffer")
+                   .Namespace("rtl")
+                   .GlobalNamespace())
+        {
+            handleSubExprThatCouldBeView(cxxOperatorCallExpr->getArg(1));
+        }
+    }
     return true;
 }
 
@@ -111,16 +124,27 @@ bool StringView::VisitImplicitCastExpr(ImplicitCastExpr const* expr)
     {
         return true;
     }
-    auto const e = expr->getSubExprAsWritten()->IgnoreParens();
+    handleSubExprThatCouldBeView(expr->getSubExprAsWritten());
+    return true;
+}
+
+void StringView::handleSubExprThatCouldBeView(Expr const* subExpr)
+{
+    auto const e0 = subExpr->IgnoreImplicit();
+    auto const e = e0->IgnoreParens();
     auto const tc = loplugin::TypeCheck(e->getType());
     if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
-          || tc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+          || tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+          || tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()))
     {
-        return true;
+        return;
     }
     if (auto const e1 = dyn_cast<CXXConstructExpr>(e))
     {
-        handleCXXConstructExpr(e1);
+        if (e0 == subExpr)
+        {
+            handleCXXConstructExpr(e1);
+        }
     }
     else if (auto const e2 = dyn_cast<CXXFunctionalCastExpr>(e))
     {
@@ -138,12 +162,18 @@ bool StringView::VisitImplicitCastExpr(ImplicitCastExpr const* expr)
     {
         handleCXXMemberCallExpr(e3);
     }
-    return true;
 }
 
 void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
 {
-    bool charArg = false;
+    QualType argType;
+    enum
+    {
+        None,
+        OrChar,
+        ViaConcatenation
+    } extra
+        = None;
     auto const d = expr->getConstructor();
     switch (d->getNumParams())
     {
@@ -154,24 +184,21 @@ void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
             auto const t = d->getParamDecl(0)->getType();
             if (t->isAnyCharacterType())
             {
-                charArg = true;
+                argType = expr->getArg(0)->IgnoreImplicit()->getType();
+                extra = OrChar;
                 break;
             }
             loplugin::TypeCheck tc(t);
-            if (tc.LvalueReference()
-                    .Const()
-                    .Class("OStringLiteral")
-                    .Namespace("rtl")
-                    .GlobalNamespace()
-                || tc.LvalueReference()
-                       .Const()
-                       .Class("OUStringLiteral")
-                       .Namespace("rtl")
-                       .GlobalNamespace()
-                || tc.RvalueReference().Struct("OStringNumber").Namespace("rtl").GlobalNamespace()
-                || tc.RvalueReference().Struct("OUStringNumber").Namespace("rtl").GlobalNamespace()
+            if (tc.RvalueReference().Struct("StringNumber").Namespace("rtl").GlobalNamespace()
                 || tc.ClassOrStruct("basic_string_view").StdNamespace())
             {
+                argType = expr->getArg(0)->IgnoreImplicit()->getType();
+                break;
+            }
+            if (tc.RvalueReference().Struct("StringConcat").Namespace("rtl").GlobalNamespace())
+            {
+                argType = expr->getArg(0)->IgnoreImplicit()->getType();
+                extra = ViaConcatenation;
                 break;
             }
             return;
@@ -185,6 +212,18 @@ void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
                 if (t->isIntegralType(compiler.getASTContext())
                     && !(t->isBooleanType() || t->isAnyCharacterType()))
                 {
+                    auto const arg = expr->getArg(1);
+                    if (!arg->isValueDependent())
+                    {
+                        if (auto const val = arg->getIntegerConstantExpr(compiler.getASTContext()))
+                        {
+                            if (val->getExtValue() == 1)
+                            {
+                                extra = OrChar;
+                            }
+                        }
+                    }
+                    argType = expr->getArg(0)->IgnoreImplicit()->getType();
                     break;
                 }
             }
@@ -194,6 +233,7 @@ void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
                     .Namespace("rtl")
                     .GlobalNamespace())
             {
+                argType = expr->getArg(0)->IgnoreImplicit()->getType();
                 break;
             }
             return;
@@ -202,31 +242,161 @@ void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
             return;
     }
     report(DiagnosticsEngine::Warning,
-           "instead of an %0, pass a '%select{std::string_view|std::u16string_view}1'"
-           "%select{| (or an '%select{rtl::OStringChar|rtl::OUStringChar}1')}2",
+           "instead of an %0%select{| constructed from a %2}1, pass a"
+           " '%select{std::string_view|std::u16string_view}3'"
+           "%select{| (or an '%select{rtl::OStringChar|rtl::OUStringChar}3')|"
+           " via 'rtl::Concat2View'}4",
            expr->getExprLoc())
-        << expr->getType()
+        << expr->getType() << (argType.isNull() ? 0 : 1) << argType
         << (loplugin::TypeCheck(expr->getType()).Class("OString").Namespace("rtl").GlobalNamespace()
                 ? 0
                 : 1)
-        << charArg << expr->getSourceRange();
+        << extra << expr->getSourceRange();
 }
 
 void StringView::handleCXXMemberCallExpr(CXXMemberCallExpr const* expr)
 {
-    auto const dc = loplugin::DeclCheck(expr->getMethodDecl()).Function("copy");
-    if (!dc)
+    auto const dc1 = loplugin::DeclCheck(expr->getMethodDecl());
+    if (auto const dc2 = dc1.Function("copy"))
     {
+        if (dc2.Class("OString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace())
+        {
+            report(DiagnosticsEngine::Warning, "rather than copy, pass with a view using subView()",
+                   expr->getExprLoc())
+                << expr->getSourceRange();
+        }
         return;
     }
-    if (!(dc.Class("OString").Namespace("rtl").GlobalNamespace()
-          || dc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+    if (auto const dc2 = dc1.Function("getToken"))
     {
+        if (dc2.Class("OString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace())
+        {
+            report(DiagnosticsEngine::Warning,
+                   "rather than getToken, pass with a view using o3tl::getToken()",
+                   expr->getExprLoc())
+                << expr->getSourceRange();
+        }
         return;
     }
-    report(DiagnosticsEngine::Warning, "rather than copy, pass with a view using subView()",
-           expr->getExprLoc())
-        << expr->getSourceRange();
+    if (auto const dc2 = dc1.Function("trim"))
+    {
+        if (dc2.Class("OString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUString").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace())
+        {
+            report(DiagnosticsEngine::Warning,
+                   "rather than trim, pass with a view using o3tl::trim()", expr->getExprLoc())
+                << expr->getSourceRange();
+        }
+        return;
+    }
+    if (auto const dc2 = dc1.Function("makeStringAndClear"))
+    {
+        if (dc2.Class("OStringBuffer").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace())
+        {
+            auto const obj = expr->getImplicitObjectArgument();
+            if (!(obj->isLValue() || obj->getType()->isPointerType()))
+            {
+                report(DiagnosticsEngine::Warning,
+                       "rather than call makeStringAndClear on an rvalue, pass with a view",
+                       expr->getExprLoc())
+                    << expr->getSourceRange();
+            }
+        }
+        return;
+    }
+    if (auto const dc2 = dc1.Function("toString"))
+    {
+        if (dc2.Class("OStringBuffer").Namespace("rtl").GlobalNamespace()
+            || dc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace())
+        {
+            report(DiagnosticsEngine::Warning, "rather than call toString, pass with a view",
+                   expr->getExprLoc())
+                << expr->getSourceRange();
+        }
+        return;
+    }
+}
+
+bool StringView::VisitCXXMemberCallExpr(CXXMemberCallExpr const* expr)
+{
+    if (ignoreLocation(expr))
+    {
+        return true;
+    }
+    /** check for calls to O[U]StringBuffer::append that could be passed as a
+        std::u16string_view */
+    if (loplugin::TypeCheck(expr->getType())
+            .Class("OUStringBuffer")
+            .Namespace("rtl")
+            .GlobalNamespace()
+        || loplugin::TypeCheck(expr->getType())
+               .Class("OStringBuffer")
+               .Namespace("rtl")
+               .GlobalNamespace())
+    {
+        auto const dc = loplugin::DeclCheck(expr->getMethodDecl());
+        if (dc.Function("append") || dc.Function("indexOf") || dc.Function("lastIndexOf"))
+        {
+            handleSubExprThatCouldBeView(expr->getArg(0));
+        }
+        else if (dc.Function("insert"))
+        {
+            handleSubExprThatCouldBeView(expr->getArg(1));
+        }
+    }
+
+    // rather than getToken...toInt32, use o3tl::toInt(o3tl::getToken(...)
+    auto tc = loplugin::TypeCheck(expr->getImplicitObjectArgument()->getType());
+    if (tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+        || tc.Class("OString").Namespace("rtl").GlobalNamespace())
+    {
+        auto const dc = loplugin::DeclCheck(expr->getMethodDecl());
+        if (dc.Function("toInt32") || dc.Function("toUInt32") || dc.Function("toInt64")
+            || dc.Function("toDouble") || dc.Function("equalsAscii") || dc.Function("equalsAsciiL")
+            || dc.Function("equalsIgnoreAsciiCase") || dc.Function("compareToIgnoreAsciiCase")
+            || dc.Function("matchIgnoreAsciiCase") || dc.Function("trim")
+            || dc.Function("startsWith") || dc.Function("endsWith") || dc.Function("match")
+            || dc.Function("isEmpty") || dc.Function("getLength")
+            || dc.Function("iterateCodePoints"))
+        {
+            handleSubExprThatCouldBeView(expr->getImplicitObjectArgument());
+        }
+    }
+    return true;
+}
+
+/** check for calls to O[U]StringBuffer constructor that could be passed as a
+    std::u16string_view */
+bool StringView::VisitCXXConstructExpr(CXXConstructExpr const* expr)
+{
+    if (ignoreLocation(expr))
+    {
+        return true;
+    }
+    if (!loplugin::TypeCheck(expr->getType())
+             .Class("OUStringBuffer")
+             .Namespace("rtl")
+             .GlobalNamespace()
+        && !loplugin::TypeCheck(expr->getType())
+                .Class("OStringBuffer")
+                .Namespace("rtl")
+                .GlobalNamespace())
+    {
+        return true;
+    }
+    if (!compiler.getLangOpts().CPlusPlus17 && expr->isElidable()) // external C++03 code
+    {
+        return true;
+    }
+    if (expr->getNumArgs() > 0)
+        handleSubExprThatCouldBeView(expr->getArg(0));
+    return true;
 }
 
 loplugin::Plugin::Registration<StringView> stringview("stringview");
diff --git a/compilerplugins/clang/stringviewdangle.cxx b/compilerplugins/clang/stringviewdangle.cxx
new file mode 100644
index 000000000000..99cb852d03b6
--- /dev/null
+++ b/compilerplugins/clang/stringviewdangle.cxx
@@ -0,0 +1,117 @@
+/* -*- 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 LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "compat.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+#include "clang/AST/StmtVisitor.h"
+
+/**
+Look for places where we are assigning a temporary O[U]String to a std::*string_view, which leads
+to a view pointing to freed memory.
+*/
+
+namespace
+{
+class StringViewDangle : public loplugin::FilteringPlugin<StringViewDangle>
+{
+public:
+    explicit StringViewDangle(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return true; }
+
+    virtual void run() override
+    {
+        if (!preRun())
+            return;
+        TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*);
+    bool VisitVarDecl(VarDecl const*);
+};
+
+static const Expr* IgnoreImplicitAndConversionOperator(const Expr* expr)
+{
+    expr = expr->IgnoreImplicit();
+    if (auto memberCall = dyn_cast<CXXMemberCallExpr>(expr))
+    {
+        if (auto conversionDecl = dyn_cast_or_null<CXXConversionDecl>(memberCall->getMethodDecl()))
+        {
+            if (!conversionDecl->isExplicit())
+                expr = memberCall->getImplicitObjectArgument()->IgnoreImpCasts();
+        }
+    }
+    return expr;
+}
+
+bool StringViewDangle::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOperatorCallExpr)
+{
+    if (ignoreLocation(cxxOperatorCallExpr))
+        return true;
+
+    auto op = cxxOperatorCallExpr->getOperator();
+    if (op != OO_Equal)
+        return true;
+    if (!loplugin::TypeCheck(cxxOperatorCallExpr->getType())
+             .ClassOrStruct("basic_string_view")
+             .StdNamespace())
+        return true;
+    auto expr = IgnoreImplicitAndConversionOperator(cxxOperatorCallExpr->getArg(1));
+    auto tc = loplugin::TypeCheck(expr->getType());
+    if (!tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+        && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
+        return true;
+    if (!isa<MaterializeTemporaryExpr>(expr))
+        return true;
+    report(DiagnosticsEngine::Warning, "view pointing into temporary i.e. dangling",
+           cxxOperatorCallExpr->getExprLoc())
+        << cxxOperatorCallExpr->getSourceRange();
+    return true;
+}
+
+bool StringViewDangle::VisitVarDecl(VarDecl const* varDecl)
+{
+    if (ignoreLocation(varDecl))
+        return true;
+    if (!loplugin::TypeCheck(varDecl->getType()).ClassOrStruct("basic_string_view").StdNamespace())
+        return true;
+    if (!varDecl->hasInit())
+        return true;
+    auto expr = IgnoreImplicitAndConversionOperator(varDecl->getInit());
+    auto tc = loplugin::TypeCheck(expr->getType());
+    if (!tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+        && !tc.Class("OString").Namespace("rtl").GlobalNamespace())
+        return true;
+    if (!isa<MaterializeTemporaryExpr>(expr))
+        return true;
+    report(DiagnosticsEngine::Warning, "view pointing into temporary i.e. dangling",
+           varDecl->getLocation())
+        << varDecl->getSourceRange();
+    return true;
+}
+
+loplugin::Plugin::Registration<StringViewDangle> stringviewdangle("stringviewdangle");
+}
+
+#endif // LO_CLANG_SHARED_PLUGINS
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/stringviewparam.cxx b/compilerplugins/clang/stringviewparam.cxx
index 86ee7c21b393..9687bd8bbe2c 100644
--- a/compilerplugins/clang/stringviewparam.cxx
+++ b/compilerplugins/clang/stringviewparam.cxx
@@ -11,8 +11,9 @@
 #include <set>
 #include <vector>
 
+#include "config_clang.h"
+
 #include "check.hxx"
-#include "compat.hxx"
 #include "functionaddress.hxx"
 #include "plugin.hxx"
 
@@ -122,7 +123,7 @@ DeclRefExpr const* relevantImplicitCastExpr(ImplicitCastExpr const* expr)
 
 DeclRefExpr const* relevantCXXMemberCallExpr(CXXMemberCallExpr const* expr)
 {
-    StringType t = relevantStringType(compat::getObjectType(expr));
+    StringType t = relevantStringType(expr->getObjectType());
     if (t == StringType::None)
     {
         return nullptr;
@@ -136,7 +137,11 @@ DeclRefExpr const* relevantCXXMemberCallExpr(CXXMemberCallExpr const* expr)
     else if (auto const i = d->getIdentifier())
     {
         auto const n = i->getName();
-        if (n == "isEmpty" || n == "subView")
+        if (!(n == "getLength" || n == "getStr" || n == "convertToString" || n == "replace"
+              || n == "replaceAll" || n == "replaceAt" || n == "replaceFirst"
+              || n == "toAsciiLowerCase" || n == "toAsciiUpperCase" || n == "toUtf8"
+              || n == "startsWithIgnoreAsciiCase" || n == "toUInt64" || n == "toFloat"
+              || n == "toBoolean"))
         {
             good = true;
         }
@@ -182,7 +187,7 @@ SmallVector<DeclRefExpr const*, 2> relevantCXXOperatorCallExpr(CXXOperatorCallEx
         }
         return wrap(relevantDeclRefExpr(e));
     }
-    if (compat::isComparisonOp(expr) || (op == OO_Plus && expr->getNumArgs() == 2))
+    if (expr->isComparisonOp() || (op == OO_Plus && expr->getNumArgs() == 2))
     {
         SmallVector<DeclRefExpr const*, 2> v;
         if (auto const e = relevantDeclRefExpr(expr->getArg(0)))
@@ -472,6 +477,10 @@ private:
         {
             return;
         }
+        if (compiler.getPreprocessor().getIdentifierInfo("NDEBUG")->hasMacroDefinition())
+        {
+            return;
+        }
         StringRef fn(handler.getMainFileName());
         // leave the string QA tests alone
         if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
diff --git a/compilerplugins/clang/stringviewvar.cxx b/compilerplugins/clang/stringviewvar.cxx
new file mode 100644
index 000000000000..5acc09d3fe78
--- /dev/null
+++ b/compilerplugins/clang/stringviewvar.cxx
@@ -0,0 +1,407 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <cassert>
+#include <set>
+#include <vector>
+
+#include "config_clang.h"
+
+#include "check.hxx"
+#include "functionaddress.hxx"
+#include "plugin.hxx"
+
+// Find various of type  rtl::O[U]String that can be converted to std::[u16]string_view instead.
+
+// This can generate false positives e.g.
+//   OUString sSave( aToken );
+//   aToken.append("foo");
+//   aToken = sSave;
+// where the data that is backing the view is modified and then the view is used to assign to
+// the same source data.
+
+namespace
+{
+enum class StringType
+{
+    None,
+    RtlOstring,
+    RtlOustring
+};
+
+StringType relevantStringType(QualType type)
+{
+    loplugin::TypeCheck const c(type);
+    if (c.Class("OString").Namespace("rtl"))
+    {
+        return StringType::RtlOstring;
+    }
+    else if (c.Class("OUString").Namespace("rtl"))
+    {
+        return StringType::RtlOustring;
+    }
+    else
+    {
+        return StringType::None;
+    }
+}
+
+bool relevantVarDecl(VarDecl const* decl)
+{
+    auto const t1 = decl->getType();
+    if (relevantStringType(t1.getNonReferenceType()) == StringType::None)
+    {
+        return false;
+    }
+    if (isa<ParmVarDecl>(decl))
+    {
+        return false;
+    }
+    return true;
+}
+
+DeclRefExpr const* relevantDeclRefExpr(Expr const* expr)
+{
+    //TODO: Look through BO_Comma and AbstractConditionalOperator
+    auto const e = dyn_cast<DeclRefExpr>(expr->IgnoreParenImpCasts());
+    if (e == nullptr)
+    {
+        return nullptr;
+    }
+    auto const d = dyn_cast<VarDecl>(e->getDecl());
+    if (d == nullptr)
+    {
+        return nullptr;
+    }
+    if (!relevantVarDecl(d))
+    {
+        return nullptr;
+    }
+    return e;
+}
+
+bool isStringView(QualType qt)
+{
+    return bool(loplugin::TypeCheck(qt).ClassOrStruct("basic_string_view").StdNamespace());
+}
+
+DeclRefExpr const* relevantImplicitCastExpr(ImplicitCastExpr const* expr)
+{
+    if (!isStringView(expr->getType()))
+    {
+        return nullptr;
+    }
+    return relevantDeclRefExpr(expr->getSubExprAsWritten());
+}
+
+DeclRefExpr const* relevantCStyleCastExpr(CStyleCastExpr const* expr)
+{
+    if (expr->getCastKind() != CK_ToVoid)
+    {
+        return nullptr;
+    }
+    return relevantDeclRefExpr(expr->getSubExprAsWritten());
+}
+
+DeclRefExpr const* relevantCXXMemberCallExpr(CXXMemberCallExpr const* expr)
+{
+    StringType t = relevantStringType(expr->getObjectType());
+    if (t == StringType::None)
+    {
+        return nullptr;
+    }
+    bool good = false;
+    auto const d = expr->getMethodDecl();
+    if (d->getOverloadedOperator() == OO_Subscript)
+    {
+        good = true;
+    }
+    else if (auto const i = d->getIdentifier())
+    {
+        auto const n = i->getName();
+        if (n == "endsWith" || n == "isEmpty" || n == "startsWith" || n == "subView"
+            || n == "indexOf" || n == "lastIndexOf" || n == "compareTo" || n == "match"
+            || n == "trim" || n == "toInt32" || n == "toInt64" || n == "toDouble"
+            || n == "equalsIgnoreAsciiCase" || n == "compareToIgnoreAsciiCase" || n == "getToken"
+            || n == "copy" || n == "iterateCodePoints")
+        {
+            good = true;
+        }
+#if 0
+        //TODO: rtl::O[U]String::getLength would be awkward to replace with
+        // std::[u16]string_view::length/size due to the sal_Int32 vs. std::size_t return type
+        // mismatch (C++20 ssize might make that easier, though); and while rtl::OString::getStr is
+        // documented to be NUL-terminated (so not eligible for replacement with
+        // std::string_view::data in general), rtl::OUString::getStr is not (so should be eligible
+        // for replacement with std::u16string_view::data, but some call sites might nevertheless
+        // incorrectly rely on NUL termination, so any replacement would need careful review):
+        if (n == "getLength" || (t == StringType::RtlOustring && n == "getStr"))
+        {
+            good = true;
+        }
+#endif
+    }
+    if (!good)
+    {
+        return nullptr;
+    }
+    return relevantDeclRefExpr(expr->getImplicitObjectArgument());
+}
+
+SmallVector<DeclRefExpr const*, 2> wrap(DeclRefExpr const* expr)
+{
+    if (expr == nullptr)
+    {
+        return {};
+    }
+    return { expr };
+}
+
+SmallVector<DeclRefExpr const*, 2> relevantCXXOperatorCallExpr(CXXOperatorCallExpr const* expr)
+{
+    auto const op = expr->getOperator();
+    if (op == OO_Subscript)
+    {
+        auto const e = expr->getArg(0);
+        if (relevantStringType(e->getType()) == StringType::None)
+        {
+            return {};
+        }
+        return wrap(relevantDeclRefExpr(e));
+    }
+    if (expr->isComparisonOp() || (op == OO_Plus && expr->getNumArgs() == 2))
+    {
+        SmallVector<DeclRefExpr const*, 2> v;
+        if (auto const e = relevantDeclRefExpr(expr->getArg(0)))
+        {
+            v.push_back(e);
+        }
+        if (auto const e = relevantDeclRefExpr(expr->getArg(1)))
+        {
+            v.push_back(e);
+        }
+        return v;
+    }
+    if (op == OO_PlusEqual)
+    {
+        if (relevantStringType(expr->getArg(0)->getType()) != StringType::RtlOustring)
+        {
+            return {};
+        }
+        return wrap(relevantDeclRefExpr(expr->getArg(1)));
+    }
+    if (op == OO_Equal)
+    {
+        if (!isStringView(expr->getArg(1)->getType()))
+        {
+            return {};
+        }
+        return wrap(relevantDeclRefExpr(expr->getArg(0)));
+    }
+    return {};
+}
+
+static const Expr* IgnoreImplicitAndConversionOperator(const Expr* expr)
+{
+    expr = expr->IgnoreImplicit();
+    if (auto memberCall = dyn_cast<CXXMemberCallExpr>(expr))
+    {
+        if (auto conversionDecl = dyn_cast_or_null<CXXConversionDecl>(memberCall->getMethodDecl()))
+        {
+            if (!conversionDecl->isExplicit())
+                expr = memberCall->getImplicitObjectArgument()->IgnoreImplicit();
+        }
+    }
+    return expr;
+}
+
+class StringViewVar final
+    : public loplugin::FunctionAddress<loplugin::FilteringPlugin<StringViewVar>>
+{
+public:
+    explicit StringViewVar(loplugin::InstantiationData const& data)
+        : FunctionAddress(data)
+    {
+    }
+
+    bool VisitVarDecl(VarDecl* decl)
+    {
+        if (ignoreLocation(decl))
+        {
+            return true;
+        }
+        if (decl->hasGlobalStorage())
+        {
+            return true;
+        }
+        if (!decl->isThisDeclarationADefinition())
+        {
+            return true;
+        }
+        if (!relevantVarDecl(decl))
+        {
+            return true;
+        }
+        if (decl->getInit())
+        {
+            auto expr = IgnoreImplicitAndConversionOperator(decl->getInit());
+            if (auto castExpr = dyn_cast<CXXFunctionalCastExpr>(expr))
+            {
+                expr = IgnoreImplicitAndConversionOperator(castExpr->getSubExpr());
+            }
+            if (auto cxxConstruct = dyn_cast<CXXConstructExpr>(expr))
+            {
+                if (cxxConstruct->getNumArgs() == 0)
+                    currentVars_.insert(decl); // default constructor
+                else if (cxxConstruct->getNumArgs() == 1
+                         && isStringView(cxxConstruct->getArg(0)->getType()))
+                    currentVars_.insert(decl);
+            }
+        }
+        return true;
+    }
+
+    bool TraverseImplicitCastExpr(ImplicitCastExpr* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const e = relevantImplicitCastExpr(expr);
+        if (e == nullptr)
+        {
+            return FunctionAddress::TraverseImplicitCastExpr(expr);
+        }
+        currentGoodUses_.insert(e);
+        auto const ret = FunctionAddress::TraverseImplicitCastExpr(expr);
+        currentGoodUses_.erase(e);
+        return ret;
+    }
+
+    bool TraverseCStyleCastExpr(CStyleCastExpr* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const e = relevantCStyleCastExpr(expr);
+        if (e == nullptr)
+        {
+            return FunctionAddress::TraverseCStyleCastExpr(expr);
+        }
+        currentGoodUses_.insert(e);
+        auto const ret = FunctionAddress::TraverseCStyleCastExpr(expr);
+        currentGoodUses_.erase(e);
+        return ret;
+    }
+
+    bool TraverseCXXMemberCallExpr(CXXMemberCallExpr* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const e = relevantCXXMemberCallExpr(expr);
+        if (e == nullptr)
+        {
+            return FunctionAddress::TraverseCXXMemberCallExpr(expr);
+        }
+        currentGoodUses_.insert(e);
+        auto const ret = FunctionAddress::TraverseCXXMemberCallExpr(expr);
+        currentGoodUses_.erase(e);
+        return ret;
+    }
+
+    bool TraverseCXXOperatorCallExpr(CXXOperatorCallExpr* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const es = relevantCXXOperatorCallExpr(expr);
+        if (es.empty())
+        {
+            return FunctionAddress::TraverseCXXOperatorCallExpr(expr);
+        }
+        currentGoodUses_.insert(es.begin(), es.end());
+        auto const ret = FunctionAddress::TraverseCXXOperatorCallExpr(expr);
+        for (auto const i : es)
+        {
+            currentGoodUses_.erase(i);
+        }
+        return ret;
+    }
+
+    bool VisitDeclRefExpr(DeclRefExpr* expr)
+    {
+        if (!FunctionAddress::VisitDeclRefExpr(expr))
+        {
+            return false;
+        }
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        if (currentGoodUses_.find(expr) != currentGoodUses_.end())
+        {
+            return true;
+        }
+        if (auto const d = dyn_cast<VarDecl>(expr->getDecl()))
+        {
+            currentVars_.erase(d);
+        }
+        return true;
+    }
+
+private:
+    void run() override
+    {
+        if (!compiler.getLangOpts().CPlusPlus)
+        {
+            return;
+        }
+        if (compiler.getPreprocessor().getIdentifierInfo("NDEBUG")->hasMacroDefinition())
+        {
+            return;
+        }
+        StringRef fn(handler.getMainFileName());
+        // leave the string QA tests alone
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
+        {
+            return;
+        }
+        // false +
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svtools/source/svrtf/parrtf.cxx"))
+        {
+            return;
+        }
+        if (!TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()))
+        {
+            return;
+        }
+        for (auto const i : currentVars_)
+        {
+            auto const t = relevantStringType(i->getType().getNonReferenceType());
+            report(DiagnosticsEngine::Warning,
+                   "replace var of type %0 with "
+                   "'%select{std::string_view|std::u16string_view}1'",
+                   i->getLocation())
+                << i->getType() << (int(t) - 1) << i->getSourceRange();
+        }
+    }
+
+    std::set<VarDecl const*> currentVars_;
+    std::set<DeclRefExpr const*> currentGoodUses_;
+};
+
+static loplugin::Plugin::Registration<StringViewVar> reg("stringviewvar",
+                                                         false); // might generate false+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/bufferadd.cxx b/compilerplugins/clang/test/bufferadd.cxx
index a9f28b13b55a..c8057a6f497b 100644
--- a/compilerplugins/clang/test/bufferadd.cxx
+++ b/compilerplugins/clang/test/bufferadd.cxx
@@ -52,6 +52,12 @@ void f5(OUStringBuffer& input)
     OUStringBuffer v(input);
     v.append("aaaa");
 }
+void f6(OString const& s)
+{
+    // expected-error@+1 {{convert this append sequence into a *String + sequence [loplugin:bufferadd]}}
+    OUStringBuffer b("foo");
+    b.append(OStringToOUString(s, RTL_TEXTENCODING_ASCII_US));
+}
 struct Footer
 {
     OStringBuffer m_descriptorStart;
diff --git a/compilerplugins/clang/test/buriedassign.cxx b/compilerplugins/clang/test/buriedassign.cxx
index 9cbdbfc49df9..0d9f011939a3 100644
--- a/compilerplugins/clang/test/buriedassign.cxx
+++ b/compilerplugins/clang/test/buriedassign.cxx
@@ -43,6 +43,7 @@ struct MyInt
         : x(i)
     {
     }
+    MyInt(MyInt const&) = default;
     MyInt& operator=(MyInt const&) = default;
     MyInt& operator=(int) { return *this; }
     bool operator<(MyInt const& other) const { return x < other.x; }
@@ -125,6 +126,7 @@ void main(OUString sUserAutoCorrFile, int* p2)
     // expected-error@+1 {{buried assignment, rather put on own line [loplugin:buriedassign]}}
     if ((p1 = p2) && sUserAutoCorrFile == "yyy")
         sRet = sUserAutoCorrFile;
+    (void)sRet;
 }
 }
 
diff --git a/compilerplugins/clang/test/casttovoid.cxx b/compilerplugins/clang/test/casttovoid.cxx
index 9904c8b5a3e4..3d8c22b49c7e 100644
--- a/compilerplugins/clang/test/casttovoid.cxx
+++ b/compilerplugins/clang/test/casttovoid.cxx
@@ -73,6 +73,18 @@ int const & fS2_2(S2 const & s) {
     return s.n; // expected-note {{first consumption is here [loplugin:casttovoid]}}
 }
 
+// Don't trigger assert in CastToVoid::VisitReturnStmt:
+int n = [] { return 0; }();
+
+int f() {
+    int n1 = n;
+    int n2 = [](int const & n) -> int const & {
+        (void) n; // expected-error {{unnecessary cast to void [loplugin:casttovoid]}}
+        return n; // expected-note {{first consumption is here [loplugin:casttovoid]}}
+    }(n1);
+    return n2;
+}
+
 int main() {
     int n1 = 0;
     (void) n1; // expected-error {{unnecessary cast to void [loplugin:casttovoid]}}
@@ -103,6 +115,8 @@ int main() {
     int n8 = 0;
     ASSERT(USE(USE(n8 == 0)));
     (void) n8;
+    int volatile n9 = 0;
+    (void) n9;
     return n1 // expected-note 8 {{first consumption is here [loplugin:casttovoid]}}
         + n2 // expected-note {{first consumption is here [loplugin:casttovoid]}}
         + n3;
diff --git a/compilerplugins/clang/test/constexprliteral.cxx b/compilerplugins/clang/test/constexprliteral.cxx
new file mode 100644
index 000000000000..f33ab2ff7a74
--- /dev/null
+++ b/compilerplugins/clang/test/constexprliteral.cxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+
+namespace test1
+{
+void f()
+{
+    // expected-error@+1 {{OUStringLiteral should be declared constexpr [loplugin:constexprliteral]}}
+    const OUStringLiteral foo = u"foo";
+    (void)foo;
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringstatic.hxx b/compilerplugins/clang/test/constmove.cxx
index ec82a8bf5deb..f6d2ed3ac9bf 100644
--- a/compilerplugins/clang/test/stringstatic.hxx
+++ b/compilerplugins/clang/test/constmove.cxx
@@ -7,17 +7,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "sal/config.h"
+#include <utility>
 
-#include "rtl/ustring.hxx"
-
-OUString const INCLUDED = "xxx";
+struct S
+{
+};
 
-inline void f()
+void f(S const& s1, S s2)
 {
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
-    static OUString const XXX = "xxx";
-    (void)XXX;
+    // expected-error-re@+1 {{suspicious 'std::move' from 'const S' to const-qualified '{{.+}}' (aka 'const S') [loplugin:constmove]}}
+    S v1(std::move(s1));
+    (void)v1;
+    S v2(std::move(s2));
+    (void)v2;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/constparams.cxx b/compilerplugins/clang/test/constparams.cxx
index 2cffd87fd5be..e6b22ca91529 100644
--- a/compilerplugins/clang/test/constparams.cxx
+++ b/compilerplugins/clang/test/constparams.cxx
@@ -9,6 +9,9 @@
 
 #include <string>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 struct Class1
 {
     int const * m_f1;
@@ -45,4 +48,26 @@ void f4(std::string * p) {
     *p = std::string("xxx");
 }
 
+
+namespace test5
+{
+struct Rectangle {};
+
+struct Foo
+{
+    void CallConst(const Rectangle*);
+    void CallNonConst(Rectangle*);
+    // expected-error@+1 {{this parameter can be const test5::Foo::ImplInvalidateParentFrameRegion [loplugin:constparams]}}
+    void ImplInvalidateParentFrameRegion( Rectangle& rRegion )
+    {
+        CallConst( &rRegion );
+    }
+    // no warning expected
+    void ImplInvalidateParentFrameRegion2( Rectangle& rRegion )
+    {
+        CallNonConst( &rRegion );
+    }
+};
+
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/consttobool.cxx b/compilerplugins/clang/test/consttobool.cxx
index 3d880cb4d5d1..4fe41a8140f2 100644
--- a/compilerplugins/clang/test/consttobool.cxx
+++ b/compilerplugins/clang/test/consttobool.cxx
@@ -28,7 +28,7 @@ constexpr int c2 = 2;
 struct S
 {
     S()
-    // expected-error-re@+1 {{implicit conversion of constant {{nullptr|0}} of type 'nullptr_t' to 'bool'; use 'false' instead [loplugin:consttobool]}}
+    // expected-error-re@+1 {{implicit conversion of constant {{nullptr|0}} of type '{{(std::)?}}nullptr_t' to 'bool'; use 'false' instead [loplugin:consttobool]}}
     : b(nullptr)
     {
     }
diff --git a/compilerplugins/clang/test/constvars.cxx b/compilerplugins/clang/test/constvars.cxx
index dc3c1ecb9c6b..88df50f8e199 100644
--- a/compilerplugins/clang/test/constvars.cxx
+++ b/compilerplugins/clang/test/constvars.cxx
@@ -12,7 +12,6 @@
 #else
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <map>
 #include <list>
@@ -79,20 +78,8 @@ void foo(std::list<Struct1*> aList)
 }
 };
 
-namespace test6
-{
-void foo(css::uno::Sequence<css::uno::Reference<css::uno::XInterface>>& aSeq)
-{
-    // expected-error@+1 {{var can be const [loplugin:constvars]}}
-    for (css::uno::Reference<css::uno::XInterface>& x : aSeq)
-    {
-        x.get();
-    }
-}
-};
-
 // no warning expected
-namespace test7
+namespace test6
 {
 void foo(std::vector<std::vector<int>> aVecVec)
 {
diff --git a/compilerplugins/clang/test/convertlong.cxx b/compilerplugins/clang/test/convertlong.cxx
index 850da3edebf1..020cdbb68090 100644
--- a/compilerplugins/clang/test/convertlong.cxx
+++ b/compilerplugins/clang/test/convertlong.cxx
@@ -32,6 +32,7 @@ void main2()
 
     int tmp2 = (sal_uLong)1;
     tmp2 = (long)1;
+    (void)tmp2;
 
     sal_uIntPtr tmp3 = x + y;
     // expected-error-re@-1 {{rather replace type of decl 'sal_uIntPtr' (aka 'unsigned {{.+}}') with 'int' [loplugin:convertlong]}}
diff --git a/compilerplugins/clang/test/cow_wrapper.cxx b/compilerplugins/clang/test/cow_wrapper.cxx
new file mode 100644
index 000000000000..5c95f87f04d9
--- /dev/null
+++ b/compilerplugins/clang/test/cow_wrapper.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "config_clang.h"
+#include "o3tl/cow_wrapper.hxx"
+#include <utility>
+
+struct ImplBitmapPalette
+{
+    void foo() const;
+};
+
+struct BitmapPalette
+{
+    void foo1()
+    {
+        // expected-error@+1 {{calling const method on o3tl::cow_wrapper impl class via non-const pointer, rather use std::as_const to prevent triggering an unnecessary copy [loplugin:cow_wrapper]}}
+        mpImpl->foo();
+    }
+    void foo2() const
+    {
+        // no error expected
+        mpImpl->foo();
+    }
+    void foo3()
+    {
+        // expected-error@+1 {{calling const method on o3tl::cow_wrapper impl class via non-const pointer, rather use std::as_const to prevent triggering an unnecessary copy [loplugin:cow_wrapper]}}
+        (*mpImpl).foo();
+    }
+    void foo4()
+    {
+        // expected-error@+1 {{calling const method on o3tl::cow_wrapper impl class via non-const pointer, rather use std::as_const to prevent triggering an unnecessary copy [loplugin:cow_wrapper]}}
+        std::as_const(*mpImpl).foo();
+    }
+    o3tl::cow_wrapper<ImplBitmapPalette> mpImpl;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx b/compilerplugins/clang/test/cppunitassertequals.cxx
index d42007c99d66..401105465635 100644
--- a/compilerplugins/clang/test/cppunitassertequals.cxx
+++ b/compilerplugins/clang/test/cppunitassertequals.cxx
@@ -9,44 +9,47 @@
 
 #include "sal/config.h"
 
+#include <cstddef>
+
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#include "cppunitassertequals.hxx"
+#include "rtl/ustring.hxx"
 
 #define TEST1 CPPUNIT_ASSERT(b1 == b2)
 #define TEST2(x) x
 
+struct T { bool operator ==(T); };
+
 void test(
-    bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n)
+    bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n,
+    double d, int i)
 {
     CppUnit::Asserter::failIf(b1,"");
-#if 0 // TODO: enable later
     CPPUNIT_ASSERT(b1 && b2); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT((b1 && b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(!(b1 || b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(!(b1 && b2));
     CPPUNIT_ASSERT(!!(b1 && b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT_MESSAGE("", b1 && b2); // expected-error {{rather split into two CPPUNIT_ASSERT_MESSAGE [loplugin:cppunitassertequals]}}
-#endif
-    CPPUNIT_ASSERT(b1 == b2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(b1 == b2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(b1 != b2);
-    CPPUNIT_ASSERT((b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    CPPUNIT_ASSERT(!(b1 != b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator != call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT((b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(!(b1 != b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator != call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(!(b1 == b2));
-    CPPUNIT_ASSERT(!!(b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    CPPUNIT_ASSERT_MESSAGE("", b1 == b2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL_MESSAGE (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    CPPUNIT_ASSERT(s1 == s2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(!!(b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_MESSAGE("", b1 == b2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL_MESSAGE when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(s1 == s2); // expected-error-re {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'const {{(rtl::)?}}OUString' and 'const {{(rtl::)?}}OUString' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(s1 != s2);
-    CPPUNIT_ASSERT((s1 == s2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    CPPUNIT_ASSERT(!(s1 != s2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator != call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT((s1 == s2)); // expected-error-re {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'const {{(rtl::)?}}OUString' and 'const {{(rtl::)?}}OUString' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(!(s1 != s2)); // expected-error-re {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'const {{(rtl::)?}}OUString' and 'const {{(rtl::)?}}OUString' (or rewrite as an explicit operator != call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT(!(s1 == s2));
-    CPPUNIT_ASSERT(!!(s1 == s2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    TEST1; // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    TEST2(CPPUNIT_ASSERT(b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
-    TEST2(TEST1); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(!!(s1 == s2)); // expected-error-re {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'const {{(rtl::)?}}OUString' and 'const {{(rtl::)?}}OUString' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    TEST1; // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    TEST2(CPPUNIT_ASSERT(b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    TEST2(TEST1); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
 
     // Useful when testing an equality iterator itself:
     CPPUNIT_ASSERT(operator ==(s1, s1));
@@ -57,7 +60,7 @@ void test(
     // very meaningful, so let it use CPPUNIT_ASSERT (but stick to CPPUNIT_ASSERT_EQUAL for
     // consistency in the unlikely case that P is of type std::nullptr_t):
     CPPUNIT_ASSERT(p == nullptr);
-    CPPUNIT_ASSERT(n == nullptr); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT(n == nullptr); // expected-error-re {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'std::nullptr_t'{{( \(aka 'nullptr_t'\))?}} and '{{(std::)?}}nullptr_t' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}}
 
     // There might even be good reasons(?) not to warn inside explicit casts:
     CPPUNIT_ASSERT(bool(b1 && b2));
@@ -72,6 +75,19 @@ void test(
     CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", s1, OUString("xxx")); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
     CPPUNIT_ASSERT_EQUAL(OUString("xxx"), s1);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", OUString("xxx"), s1);
+
+    CPPUNIT_ASSERT_EQUAL(d, 1.0); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_EQUAL(1.0, d);
+
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(d, 1.0, 0.1); // expected-error {{CPPUNIT_ASSERT_DOUBLES_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("foo", d, 1.0, 0.1); // expected-error {{CPPUNIT_ASSERT_DOUBLES_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, d, 0.1);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("foo", 1.0, d, 0.1);
+
+    CPPUNIT_ASSERT_LESS(i, 1); // expected-error {{CPPUNIT_ASSERT_LESS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_LESSEQUAL(i, 1); // expected-error {{CPPUNIT_ASSERT_LESSEQUAL parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_GREATER(i, 1); // expected-error {{CPPUNIT_ASSERT_GREATER parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
+    CPPUNIT_ASSERT_GREATEREQUAL(i, 1); // expected-error {{CPPUNIT_ASSERT_GREATEREQUAL parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/crosscast.cxx b/compilerplugins/clang/test/crosscast.cxx
new file mode 100644
index 000000000000..113557337113
--- /dev/null
+++ b/compilerplugins/clang/test/crosscast.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct Base
+{
+    virtual ~Base();
+};
+
+struct Derived : Base
+{
+};
+
+struct Virtual1 : virtual Base
+{
+};
+
+struct Virtual2 : virtual Base
+{
+};
+
+struct Virtual2a : Virtual2
+{
+};
+
+struct Other
+{
+    virtual ~Other();
+};
+
+struct[[clang::annotate("loplugin:crosscast")]] Ok { virtual ~Ok(); };
+
+Base* up(Derived* p) { return dynamic_cast<Base*>(p); }
+
+Base& up(Derived& p) { return dynamic_cast<Base&>(p); }
+
+Derived* down(Base* p) { return dynamic_cast<Derived*>(p); }
+
+Derived& down(Base& p) { return dynamic_cast<Derived&>(p); }
+
+Base* self(Base* p) { return dynamic_cast<Base*>(p); }
+
+Base& self(Base& p) { return dynamic_cast<Base&>(p); }
+
+Virtual1* crossVirtual(Virtual2a* p) { return dynamic_cast<Virtual1*>(p); }
+
+Virtual1& crossVirtual(Virtual2a& p) { return dynamic_cast<Virtual1&>(p); }
+
+Base* crossFromOther(Other* p)
+{
+    // expected-error@+1 {{suspicious dynamic cross cast from 'Other *' to 'Base *' [loplugin:crosscast]}}
+    return dynamic_cast<Base*>(p);
+}
+
+Base& crossFromOther(Other& p)
+{
+    // expected-error@+1 {{suspicious dynamic cross cast from 'Other' to 'Base &' [loplugin:crosscast]}}
+    return dynamic_cast<Base&>(p);
+}
+
+Other* crossToOther(Base* p)
+{
+    // expected-error@+1 {{suspicious dynamic cross cast from 'Base *' to 'Other *' [loplugin:crosscast]}}
+    return dynamic_cast<Other*>(p);
+}
+
+Other& crossToOther(Base& p)
+{
+    // expected-error@+1 {{suspicious dynamic cross cast from 'Base' to 'Other &' [loplugin:crosscast]}}
+    return dynamic_cast<Other&>(p);
+}
+
+Base* crossFromOk(Ok* p) { return dynamic_cast<Base*>(p); }
+
+Base& crossFromOk(Ok& p) { return dynamic_cast<Base&>(p); }
+
+Ok* crossToOk(Base* p) { return dynamic_cast<Ok*>(p); }
+
+Ok& crossToOk(Base& p) { return dynamic_cast<Ok&>(p); }
+
+void* mostDerived(Base* p) { return dynamic_cast<void*>(p); }
+
+template <typename T> T generic1(Base* p) { return dynamic_cast<T>(p); }
+
+template <typename T> T* generic2(Base* p) { return dynamic_cast<T*>(p); }
+
+template <typename T> Derived* generic3(T p) { return dynamic_cast<Derived*>(p); }
+
+template <typename T> Derived* generic4(T* p) { return dynamic_cast<Derived*>(p); }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/dbgunhandledexception.cxx b/compilerplugins/clang/test/dbgunhandledexception.cxx
index 4ae15a58e55d..39206d4beaaa 100644
--- a/compilerplugins/clang/test/dbgunhandledexception.cxx
+++ b/compilerplugins/clang/test/dbgunhandledexception.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 
 void func1();
diff --git a/compilerplugins/clang/test/elidestringvar.cxx b/compilerplugins/clang/test/elidestringvar.cxx
index 16fa7c570914..913bfbc2ae03 100644
--- a/compilerplugins/clang/test/elidestringvar.cxx
+++ b/compilerplugins/clang/test/elidestringvar.cxx
@@ -15,12 +15,12 @@ template <sal_Unicode C> OUString f(sal_Unicode c, int n)
 {
     OUString s0(C);
     OUString s1(c);
-    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}
+    // expected-note-re@+1 {{literal '{{(rtl::)?}}OUString' variable defined here [loplugin:elidestringvar]}}
     OUString s2('a');
-    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}
+    // expected-note-re@+1 {{literal '{{(rtl::)?}}OUString' variable defined here [loplugin:elidestringvar]}}
     OUString s3(u'a');
     static constexpr OUStringLiteral s4lit(u"a");
-    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}
+    // expected-note-re@+1 {{literal '{{(rtl::)?}}OUString' variable defined here [loplugin:elidestringvar]}}
     OUString s4 = s4lit;
     switch (n)
     {
@@ -29,15 +29,18 @@ template <sal_Unicode C> OUString f(sal_Unicode c, int n)
         case 1:
             return s1;
         case 2:
-            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
+            // expected-error-re@+1 {{replace single use of literal '{{(rtl::)?}}OUString' variable with a literal [loplugin:elidestringvar]}}
             return s2;
         case 3:
-            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
+            // expected-error-re@+1 {{replace single use of literal '{{(rtl::)?}}OUString' variable with a literal [loplugin:elidestringvar]}}
             return s3;
         default:
-            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
+            // expected-error-re@+1 {{replace single use of literal '{{(rtl::)?}}OUString' variable with a literal [loplugin:elidestringvar]}}
             return s4;
     }
 }
 
+// Trigger clang-cl to actually parse f under MSVC template instantiation model:
+template OUString f<'a'>(sal_Unicode, int);
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/expressionalwayszero.cxx b/compilerplugins/clang/test/expressionalwayszero.cxx
index 4986e5d690f7..23d3e2652ce7 100644
--- a/compilerplugins/clang/test/expressionalwayszero.cxx
+++ b/compilerplugins/clang/test/expressionalwayszero.cxx
@@ -42,5 +42,6 @@ int main()
 
     auto v5 = Enum2::ONE;
     v5 &= Enum2::ZERO; // expected-error {{expression always evaluates to zero, lhs=unknown rhs=0 [loplugin:expressionalwayszero]}}
+    (void)v5;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/fakebool.cxx b/compilerplugins/clang/test/fakebool.cxx
index 936e970e5e85..144bf4a28a15 100644
--- a/compilerplugins/clang/test/fakebool.cxx
+++ b/compilerplugins/clang/test/fakebool.cxx
@@ -33,4 +33,18 @@ struct S3 {
     void f() { S2 s(b_); }
 };
 
+namespace {
+
+struct S4 {
+    sal_Bool b;
+};
+
+}
+
+void f() {
+    sal_Bool b;
+    (void) &b;
+    (void) &S4::b;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/fieldcast.cxx b/compilerplugins/clang/test/fieldcast.cxx
new file mode 100644
index 000000000000..6d0437d04e6f
--- /dev/null
+++ b/compilerplugins/clang/test/fieldcast.cxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#if defined _WIN32 //TODO, #include <sys/file.h>
+// expected-no-diagnostics
+#else
+
+#include <rtl/ustring.hxx>
+#include <rtl/ref.hxx>
+#include <memory>
+
+struct Foo
+{
+    virtual ~Foo();
+};
+struct Bar : public Foo
+{
+};
+
+class Test1
+{
+    // expected-error@+1 {{cast Bar [loplugin:fieldcast]}}
+    Foo* m_p;
+    void test1() { (void)dynamic_cast<Bar*>(m_p); }
+};
+
+class Test2
+{
+    // expected-error@+1 {{cast Bar [loplugin:fieldcast]}}
+    rtl::Reference<Foo> m_p;
+    void test1() { (void)dynamic_cast<Bar*>(m_p.get()); }
+};
+
+class Test3
+{
+    // no warning expected, casting to a less specific type
+    rtl::Reference<Bar> m_p;
+    void test1() { (void)static_cast<Foo*>(m_p.get()); }
+};
+
+class Test4
+{
+    // expected-error@+1 {{cast Bar [loplugin:fieldcast]}}
+    std::unique_ptr<Foo> m_p;
+    void test1() { (void)dynamic_cast<Bar*>(m_p.get()); }
+};
+
+class Test5
+{
+    // expected-error@+1 {{cast Bar [loplugin:fieldcast]}}
+    std::shared_ptr<Foo> m_p;
+    void test1() { (void)dynamic_cast<Bar*>(m_p.get()); }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/finalprotected.cxx b/compilerplugins/clang/test/finalprotected.cxx
deleted file mode 100644
index c15564874447..000000000000
--- a/compilerplugins/clang/test/finalprotected.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-
-class S final {
-protected:
-    void f(int f) { f1 = f; }  // expected-error {{final class should not have protected members - convert them to private [loplugin:finalprotected]}}
-    int f1;      // expected-error {{final class should not have protected members - convert them to private [loplugin:finalprotected]}}
-public:
-    void g();
-    int g1;
-private:
-    void h();
-    int h1;
-};
-
-class S2 {
-protected:
-    void f(int f) { f1 = f; }
-    int f1;
-public:
-    void g();
-    int g1;
-private:
-    void h();
-    int h1;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/getstr.cxx b/compilerplugins/clang/test/getstr.cxx
index 976d39c25c71..c10939202a9c 100644
--- a/compilerplugins/clang/test/getstr.cxx
+++ b/compilerplugins/clang/test/getstr.cxx
@@ -24,7 +24,9 @@
 // "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a; TODO: the checks here and the
 // relevant code in loplugin:getstr should eventually be removed once support for the deleted
 // operators is widespread):
-#if __cplusplus > 201703L && (defined __GLIBCXX__ || defined _MSC_VER)
+#if __cplusplus > 201703L                                                                          \
+    && (defined __GLIBCXX__ || defined _MSC_VER                                                    \
+        || (defined _LIBCPP_VERSION && _LIBCPP_VERSION >= 16000))
 #define HAVE_DELETED_OPERATORS true
 #else
 #define HAVE_DELETED_OPERATORS false
@@ -37,11 +39,11 @@ void f(std::ostream& st, OString const& s1, OStringBuffer const& s2,
        OString* p1, OStringBuffer* p2, OUString* p3[[maybe_unused]],
        OUStringBuffer* p4[[maybe_unused]], S* p5, char const* (OString::*pf)() const)
 {
-    st << s1.getStr() // expected-error {{directly use object of type 'rtl::OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
+    st << s1.getStr() // expected-error-re {{directly use object of type '{{(rtl::)?}}OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
        << s2.getStr()
 #if !HAVE_DELETED_OPERATORS
-       << s3.getStr() // expected-error {{suspicious use of 'getStr' on an object of type 'rtl::OUString'; the result is implicitly cast to a void pointer in a call of 'operator <<' [loplugin:getstr]}}
-       << s4.getStr() // expected-error {{suspicious use of 'getStr' on an object of type 'rtl::OUStringBuffer'; the result is implicitly cast to a void pointer in a call of 'operator <<' [loplugin:getstr]}}
+       << s3.getStr() // expected-error-re {{suspicious use of 'getStr' on an object of type '{{(rtl::)?}}OUString'; the result is implicitly cast to a void pointer in a call of 'operator <<' [loplugin:getstr]}}
+       << s4.getStr() // expected-error-re {{suspicious use of 'getStr' on an object of type '{{(rtl::)?}}OUStringBuffer'; the result is implicitly cast to a void pointer in a call of 'operator <<' [loplugin:getstr]}}
 #endif
        << s5.getStr() // expected-error {{directly use object of type 'S' (aka 'rtl::OString') in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
        << p1->getStr() // expected-error {{directly use object of type 'rtl::OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
@@ -52,7 +54,7 @@ void f(std::ostream& st, OString const& s1, OStringBuffer const& s2,
 #endif
        << p5->getStr() // expected-error {{directly use object of type 'rtl::OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
        << (s1.*pf)();
-    SAL_INFO( // expected-error 1+ {{directly use object of type 'rtl::OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
+    SAL_INFO( // expected-error-re 1+ {{directly use object of type '{{(rtl::)?}}OString' in a call of 'operator <<', instead of calling 'getStr' first [loplugin:getstr]}}
         "test", s1.getStr());
 }
 
diff --git a/compilerplugins/clang/test/implicitboolconversion.cxx b/compilerplugins/clang/test/implicitboolconversion.cxx
index 31082d1d378b..122ee363ae68 100644
--- a/compilerplugins/clang/test/implicitboolconversion.cxx
+++ b/compilerplugins/clang/test/implicitboolconversion.cxx
@@ -9,12 +9,36 @@
 
 #include <sal/config.h>
 
+#include <array>
 #include <atomic>
+#include <initializer_list>
 
+#include <com/sun/star/uno/Sequence.hxx>
 #include <sal/types.h>
 
+template <typename T> struct Sequence
+{
+    Sequence(std::initializer_list<T>);
+};
+
+template <typename T> struct Wrap1
+{
+    T element;
+};
+
+template <typename T> struct Wrap2
+{
+    Wrap2(T const& e)
+        : element(e)
+    {
+    }
+    T element;
+};
+
 bool g();
 
+void h(bool);
+
 void f()
 {
     // expected-error@+1 {{implicit conversion (IntegralCast) from 'bool' to 'int' [loplugin:implicitboolconversion]}}
@@ -31,6 +55,29 @@ void f()
     (void)a;
     bool b2 = true;
     b2 &= g();
+    (void)b2;
+    Sequence<sal_Bool> s1{ false };
+    (void)s1;
+    Sequence<Sequence<sal_Bool>> s2{ { false } };
+    (void)s2;
+    // expected-error@+1 {{implicit conversion (IntegralCast) from 'bool' to 'const int' [loplugin:implicitboolconversion]}}
+    Sequence<int> s3{ false };
+    (void)s3;
+    // expected-error@+1 {{implicit conversion (IntegralCast) from 'bool' to 'const int' [loplugin:implicitboolconversion]}}
+    Sequence<Sequence<int>> s4{ { false } };
+    (void)s4;
+    Wrap1<sal_Bool> w1{ false };
+    Sequence<Wrap1<sal_Bool>> s5{ { false } };
+    (void)s5;
+    Wrap2<sal_Bool> w2{ false };
+    (void)w2;
+    Sequence<Wrap2<sal_Bool>> s6{ { false } };
+    (void)s6;
+    h(w1.element);
+    css::uno::Sequence<sal_Bool> s7(1);
+    h(s7[0]);
+    std::array<sal_Bool, 1> s8;
+    s8[0] = false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/implinheritancehelper.cxx b/compilerplugins/clang/test/implinheritancehelper.cxx
new file mode 100644
index 000000000000..4ef976641c7e
--- /dev/null
+++ b/compilerplugins/clang/test/implinheritancehelper.cxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <cppuhelper/implbase.hxx>
+#include "com/sun/star/beans/XProperty.hpp"
+
+class VCLXDevice : public cppu::WeakImplHelper<css::lang::XUnoTunnel>
+{
+};
+
+// expected-error@+1 {{can probably use ImplInheritanceHelper here [loplugin:implinheritancehelper]}}
+class VCLXCheckBox : public css::beans::XProperty, public VCLXDevice
+{
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/indentation.cxx b/compilerplugins/clang/test/indentation.cxx
index e0e25884eebb..1c57c6ceea98 100644
--- a/compilerplugins/clang/test/indentation.cxx
+++ b/compilerplugins/clang/test/indentation.cxx
@@ -7,8 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config_clang.h"
-
 int foo();
 int foo2(int);
 
@@ -48,6 +46,16 @@ void top1(int x) {
     }
 
     if (x)
+    { // expected-note {{start brace here [loplugin:indentation]}}
+        foo();
+     } // expected-error {{start and end brace not aligned [loplugin:indentation]}}
+
+    if (x) // expected-note {{statement beginning here [loplugin:indentation]}}
+     { // expected-error {{start brace not aligned with beginning of parent statement [loplugin:indentation]}}
+        foo();
+     }
+
+    if (x)
         ;
     else
     foo(); // expected-error {{else body should be indented [loplugin:indentation]}}
@@ -84,11 +92,19 @@ void attr() {
     foo();
 }
 
-#if CLANG_VERSION >= 100000
 void attr_bad() {
     [[maybe_unused]] int i = foo(); // expected-note {{measured against this one [loplugin:indentation]}}
      foo(); // expected-error {{statement mis-aligned compared to neighbours  [loplugin:indentation]}}
 }
-#endif
+
+void xxx();
+void test5(bool x)
+{
+    if (x)
+    {
+    xxx(); // expected-error {{body inside brace not indented [loplugin:indentation]}}
+    }
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/locking2.cxx b/compilerplugins/clang/test/locking2.cxx
new file mode 100644
index 000000000000..5e6c36d4db26
--- /dev/null
+++ b/compilerplugins/clang/test/locking2.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#if defined _WIN32 //TODO, #include <sys/file.h>
+// expected-no-diagnostics
+#else
+
+#include <mutex>
+#include <memory>
+#include <osl/mutex.hxx>
+
+static std::mutex gSolarMutex;
+
+class SolarMutexGuard
+{
+    std::unique_lock<std::mutex> lock;
+
+public:
+    SolarMutexGuard()
+        : lock(gSolarMutex)
+    {
+    }
+};
+
+namespace test2
+{
+struct Foo
+{
+    std::mutex m_aMutex;
+    int m_foo;
+    std::shared_ptr<Foo> m_foo2;
+
+    int bar3()
+    {
+        std::scoped_lock guard(m_aMutex);
+        // expected-error@+1 {{locked m_foo [loplugin:locking2]}}
+        return m_foo;
+    }
+    std::shared_ptr<Foo> bar4()
+    {
+        std::scoped_lock guard(m_aMutex);
+        // expected-error@+1 {{locked m_foo2 [loplugin:locking2]}}
+        return m_foo2;
+    }
+};
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/logexceptionnicely.cxx b/compilerplugins/clang/test/logexceptionnicely.cxx
index 458eef8c4d10..3a0d85f75280 100644
--- a/compilerplugins/clang/test/logexceptionnicely.cxx
+++ b/compilerplugins/clang/test/logexceptionnicely.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/Exception.hpp>
diff --git a/compilerplugins/clang/test/moveit.cxx b/compilerplugins/clang/test/moveit.cxx
new file mode 100644
index 000000000000..9e4fa4f3d814
--- /dev/null
+++ b/compilerplugins/clang/test/moveit.cxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "config_clang.h"
+#include <memory>
+
+// expected-note@+3 {{type declared here [loplugin:moveit]}}
+// expected-note@+2 {{type declared here [loplugin:moveit]}}
+// expected-note@+1 {{type declared here [loplugin:moveit]}}
+struct Movable
+{
+    std::shared_ptr<int> x;
+
+    void method1();
+
+    Movable();
+    Movable(int);
+};
+
+namespace test1a
+{
+struct F
+{
+    // expected-note@+1 {{passing to this param [loplugin:moveit]}}
+    void call_by_value(Movable);
+    void foo()
+    {
+        // expected-note@+1 {{local var declared here [loplugin:moveit]}}
+        Movable m;
+        // expected-error@+1 {{can std::move this var into this param [loplugin:moveit]}}
+        call_by_value(m);
+    }
+};
+}
+
+namespace test1b
+{
+struct F
+{
+    // expected-note@+1 {{passing to this param [loplugin:moveit]}}
+    F(Movable);
+    void foo()
+    {
+        // expected-note@+1 {{local var declared here [loplugin:moveit]}}
+        Movable m;
+        // expected-error@+1 {{can std::move this var into this param [loplugin:moveit]}}
+        F a(m);
+        (void)a;
+    }
+};
+}
+
+namespace test2
+{
+struct F
+{
+    // expected-note@+1 {{passing to this param [loplugin:moveit]}}
+    F(Movable);
+    void foo()
+    {
+        // expected-note@+1 {{local var declared here [loplugin:moveit]}}
+        Movable m;
+        // expected-error@+1 {{can std::move this var into this param [loplugin:moveit]}}
+        F a(m);
+        (void)a;
+    }
+};
+}
+
+// No error expected, because referencing after call
+namespace test3
+{
+struct F
+{
+    F(Movable);
+    void foo()
+    {
+        Movable m;
+        F a(m);
+        m.method1();
+    }
+};
+}
+
+// No error expected, because constructing temporary(i.e. rvalue) to pass to param
+namespace test4
+{
+struct F
+{
+    F(Movable);
+    void foo()
+    {
+        F a((Movable(5)));
+        (void)a;
+    }
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/moveparam.cxx b/compilerplugins/clang/test/moveparam.cxx
new file mode 100644
index 000000000000..4e3df5b9c26a
--- /dev/null
+++ b/compilerplugins/clang/test/moveparam.cxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "config_clang.h"
+#include "o3tl/cow_wrapper.hxx"
+#include <map>
+
+namespace drawinglayer::primitive2d
+{
+class Primitive2DContainer
+{
+};
+}
+
+struct Foo
+{
+    drawinglayer::primitive2d::Primitive2DContainer maMine;
+
+    // expected-error@+2 {{rather use move && param3 [loplugin:moveparam]}}
+    Foo(drawinglayer::primitive2d::Primitive2DContainer const& rContainer)
+        : maMine(rContainer)
+    {
+    }
+
+    // no warning expected
+    Foo(drawinglayer::primitive2d::Primitive2DContainer&& rContainer)
+        : maMine(rContainer)
+    {
+    }
+
+    void foo1(const drawinglayer::primitive2d::Primitive2DContainer& rContainer)
+    {
+        // expected-error@+1 {{rather use move && param1 [loplugin:moveparam]}}
+        maMine = rContainer;
+    }
+};
+
+namespace test2
+{
+typedef std::map<int, int> Map2Map;
+
+struct Foo
+{
+    Map2Map maMine;
+
+    // expected-error@+2 {{rather use move && param3 [loplugin:moveparam]}}
+    Foo(Map2Map const& rContainer)
+        : maMine(rContainer)
+    {
+    }
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/noexcept.cxx b/compilerplugins/clang/test/noexcept.cxx
new file mode 100644
index 000000000000..f46a3d87f2b7
--- /dev/null
+++ b/compilerplugins/clang/test/noexcept.cxx
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// expected-error@+1 {{Replace legacy dynamic 'throw ()' exception specification with 'noexcept' [loplugin:noexcept]}}
+void f() throw();
+
+// expected-error@+1 {{Replace legacy dynamic 'throw ()' exception specification with 'noexcept' [loplugin:noexcept]}}
+using F = void() throw();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/noexceptmove.cxx b/compilerplugins/clang/test/noexceptmove.cxx
index fda58deae403..c0742c8284b7 100644
--- a/compilerplugins/clang/test/noexceptmove.cxx
+++ b/compilerplugins/clang/test/noexceptmove.cxx
@@ -6,10 +6,6 @@
  * 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/.
  */
-#include "config_clang.h"
-
-// clang before V9 does not have API to report exception spec type
-#if CLANG_VERSION >= 90000
 
 namespace test1
 {
@@ -96,7 +92,4 @@ class Bar
 };
 };
 
-#else
-// expected-no-diagnostics
-#endif // CLANG_VERSION
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/nullptr.cxx b/compilerplugins/clang/test/nullptr.cxx
index bf7376cb6562..392a930bf9b8 100644
--- a/compilerplugins/clang/test/nullptr.cxx
+++ b/compilerplugins/clang/test/nullptr.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "sal/config.h"
+
+#include <compare>
+
 struct S
 {
     void* p;
@@ -18,6 +22,8 @@ int main()
         0 // expected-error {{NullToPointer ValueDependentIsNotNull ZeroLiteral -> nullptr [loplugin:nullptr]}}
     };
     (void)s;
+
+    (void)(std::strong_order(0, 1) < 0);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/optionalbool.cxx b/compilerplugins/clang/test/optionalbool.cxx
new file mode 100644
index 000000000000..02c3a84cf962
--- /dev/null
+++ b/compilerplugins/clang/test/optionalbool.cxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+#include "config_clang.h"
+#include <optional>
+
+namespace test1
+{
+std::optional<bool> get_optional_bool();
+void foo1()
+{
+    // expected-error@+1 {{using conversion call to convert std::optional<bool> to bool probably does not do what you expect, rather use has_value() or value_or() [loplugin:optionalbool]}}
+    bool foo(get_optional_bool());
+    (void)foo;
+
+    // no warning expected
+    if (std::optional<bool> b = get_optional_bool())
+        return;
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/optmove.cxx b/compilerplugins/clang/test/optmove.cxx
new file mode 100644
index 000000000000..976806772f7e
--- /dev/null
+++ b/compilerplugins/clang/test/optmove.cxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+#include "config_clang.h"
+#include <vector>
+
+namespace test1
+{
+void foo1(std::vector<int> x)
+{
+    std::vector<int> y;
+    // expected-error@+1 {{can std::move value instead of copy [loplugin:optmove]}}
+    y = x;
+}
+}
+
+namespace test2
+{
+void foo(std::vector<int> x)
+{
+    // expected-error@+1 {{can std::move value instead of copy [loplugin:optmove]}}
+    std::vector<int> y = x;
+}
+}
+
+namespace test3
+{
+void foo1(std::vector<int> x)
+{
+    std::vector<int> y, z;
+    y = x;
+    // expected-error@+1 {{can std::move value instead of copy [loplugin:optmove]}}
+    z = x;
+}
+}
+
+namespace test4
+{
+void foo1(std::vector<int> x)
+{
+    std::vector<int> y;
+    // no warning expected, don't even try to follow loop
+    for (int i = 0; i < 10; i++)
+        y = x;
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/optvalue.cxx b/compilerplugins/clang/test/optvalue.cxx
new file mode 100644
index 000000000000..6d1ad86e7535
--- /dev/null
+++ b/compilerplugins/clang/test/optvalue.cxx
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "config_clang.h"
+
+template <typename Type> class OptValue
+{
+public:
+    OptValue()
+        : maValue()
+        , mbHasValue(false)
+    {
+    }
+    explicit OptValue(const Type& rValue)
+        : maValue(rValue)
+        , mbHasValue(true)
+    {
+    }
+
+    bool has_value() const { return mbHasValue; }
+    bool operator!() const { return !mbHasValue; }
+
+    const Type& value() const { return maValue; }
+    const Type& value_or(const Type& rDefValue) const { return mbHasValue ? maValue : rDefValue; }
+
+    Type& operator*() { return maValue; }
+    Type& emplace()
+    {
+        mbHasValue = true;
+        maValue = Type();
+        return maValue;
+    }
+
+    OptValue& operator=(const Type& rValue)
+    {
+        maValue = rValue;
+        mbHasValue = true;
+        return *this;
+    }
+    bool operator==(const OptValue& rValue) const
+    {
+        return ((!mbHasValue && rValue.mbHasValue == false)
+                || (mbHasValue == rValue.mbHasValue && maValue == rValue.maValue));
+    }
+
+private:
+    Type maValue;
+    bool mbHasValue;
+};
+
+struct AttributeList
+{
+    OptValue<int> getInteger();
+};
+
+namespace test1
+{
+void foo(AttributeList& rAttrs)
+{
+    // expected-error@+1 {{call to OptValue::value() [loplugin:optvalue]}}
+    rAttrs.getInteger().value();
+
+    // no warning expected
+    OptValue<int> x;
+    x.value();
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/ostr.cxx b/compilerplugins/clang/test/ostr.cxx
new file mode 100644
index 000000000000..e6e3a9b556e2
--- /dev/null
+++ b/compilerplugins/clang/test/ostr.cxx
@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "sal/config.h"
+
+#include <string>
+#include <string_view>
+
+#include "rtl/ustring.hxx"
+
+#define M(arg) f(arg, arg)
+
+struct S
+{
+    OUString s;
+};
+
+void takeOstring(OString const&);
+
+void takeOustring(OUString const&);
+
+void f(OUString const&, OUString const&);
+
+void takeStdString(std::string const&);
+
+void takeStdString(std::u16string const&);
+
+void takeStdView(std::string_view);
+
+void takeStdView(std::u16string_view);
+
+void f()
+{
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s1o = "foo";
+    (void)s1o;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s2o = (("foo"));
+    (void)s2o;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s3o("foo");
+    (void)s3o;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s4o((("foo")));
+    (void)s4o;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(OString("foo"));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(((OString((("foo"))))));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(OString("foo", rtl::libreoffice_internal::Dummy()));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(((OString((("foo")), rtl::libreoffice_internal::Dummy()))));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring("foo");
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring((("foo")));
+
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s1o8 = u8"foo";
+    (void)s1o8;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s2o8 = ((u8"foo"));
+    (void)s2o8;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s3o8(u8"foo");
+    (void)s3o8;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    OString s4o8(((u8"foo")));
+    (void)s4o8;
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(OString(u8"foo"));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(((OString(((u8"foo"))))));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(OString(u8"foo", rtl::libreoffice_internal::Dummy()));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(((OString(((u8"foo")), rtl::libreoffice_internal::Dummy()))));
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(u8"foo");
+    // expected-error-re@+1 {{use a _ostr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OString' from an ordinary string literal [loplugin:ostr]}}
+    takeOstring(((u8"foo")));
+
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    OUString s1u = "foo";
+    (void)s1u;
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    OUString s2u = (("foo"));
+    (void)s2u;
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    OUString s3u("foo");
+    (void)s3u;
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    OUString s4u((("foo")));
+    (void)s4u;
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring(OUString("foo"));
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring(((OUString((("foo"))))));
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring(OUString("foo", rtl::libreoffice_internal::Dummy()));
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring(((OUString((("foo")), rtl::libreoffice_internal::Dummy()))));
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring("foo");
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    takeOustring((("foo")));
+
+    OString s9;
+    // expected-error@+1 {{use a _ostr user-defined string literal instead of assigning from an ordinary string literal [loplugin:ostr]}}
+    s9 = "foo";
+    // expected-error@+1 {{use a _ostr user-defined string literal instead of assigning from an ordinary string literal [loplugin:ostr]}}
+    s9 = (("foo"));
+    // expected-error@+1 {{use a _ostr user-defined string literal instead of assigning from an ordinary string literal [loplugin:ostr]}}
+    s9.operator=("foo");
+    // expected-error@+1 {{use a _ostr user-defined string literal instead of assigning from an ordinary string literal [loplugin:ostr]}}
+    s9.operator=((("foo")));
+
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    S s10 = { "foo" };
+
+    // Only generate one warning here, not two, for a macro argument used twice in the macro's
+    // expansion:
+    // expected-error-re@+1 {{use a _ustr user-defined string literal instead of constructing an instance of '{{(rtl::)?}}OUString' from an ordinary string literal [loplugin:ostr]}}
+    M("foo");
+
+    // expected-note@+1 {{intermediary variable l1 declared here [loplugin:ostr]}}
+    constexpr OStringLiteral l1("foo");
+    // expected-error@+1 {{directly use a _ostr user-defined string literal instead of introducing the intermediary 'OStringLiteral' variable l1 [loplugin:ostr]}}
+    (void)l1;
+    // expected-error@+1 {{use 'OString', created from a _ostr user-defined string literal, instead of 'OStringLiteral' for the variable l2 [loplugin:ostr]}}
+    constexpr OStringLiteral l2("foo");
+    (void)l2;
+    (void)l2;
+    // expected-note@+1 {{intermediary variable l3 declared here [loplugin:ostr]}}
+    OUStringLiteral l3(u"foo");
+    // expected-error@+1 {{directly use a _ustr user-defined string literal instead of introducing the intermediary 'OUStringLiteral' variable l3 [loplugin:ostr]}}
+    (void)l3;
+    // expected-error@+1 {{use 'OUString', created from a _ustr user-defined string literal, instead of 'OUStringLiteral' for the variable l4 [loplugin:ostr]}}
+    OUStringLiteral l4(u"foo");
+    (void)l4;
+    (void)l4;
+}
+
+void passLiteral()
+{
+    // expected-error-re@+1 {{directly use a 'std::string' (aka 'basic_string<char{{(, char_traits<char>, allocator<char>)?}}>') value instead of a _ostr user-defined string literal [loplugin:ostr]}}
+    takeStdString(std::string(""_ostr));
+    // expected-error-re@+1 {{directly use a 'std::u16string' (aka 'basic_string<char16_t{{(, char_traits<char16_t>, allocator<char16_t>)?}}>') value instead of a _ustr user-defined string literal [loplugin:ostr]}}
+    takeStdString(std::u16string(u""_ustr));
+    // expected-error@+1 {{directly use a 'std::string_view' (aka 'basic_string_view<char>') value instead of a _ostr user-defined string literal [loplugin:ostr]}}
+    takeStdView(""_ostr);
+    // expected-error@+1 {{directly use a 'std::u16string_view' (aka 'basic_string_view<char16_t>') value instead of a _ustr user-defined string literal [loplugin:ostr]}}
+    takeStdView(u""_ustr);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/overridevirtual.cxx b/compilerplugins/clang/test/overridevirtual.cxx
new file mode 100644
index 000000000000..0f11d86b105d
--- /dev/null
+++ b/compilerplugins/clang/test/overridevirtual.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct S1
+{
+    // expected-note@+1 {{overridden declaration is here [loplugin:overridevirtual]}}
+    virtual ~S1();
+};
+
+struct S2 : S1
+{
+    // expected-error@+1 {{overriding virtual function declaration not marked 'override' [loplugin:overridevirtual]}}
+    ~S2();
+};
+
+template <typename> struct T1
+{
+    virtual ~T1();
+};
+
+template <typename T> struct T2 : T1<T>
+{
+    ~T2();
+};
+
+template <typename> struct U1
+{
+    // expected-note@+1 {{overridden declaration is here [loplugin:overridevirtual]}}
+    virtual ~U1();
+};
+
+template <typename T> struct U2 : U1<int>
+{
+    // expected-error@+1 {{overriding virtual function declaration not marked 'override' [loplugin:overridevirtual]}}
+    ~U2();
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/passparamsbyref.cxx b/compilerplugins/clang/test/passparamsbyref.cxx
index e58aa79bcaa8..010556a67b6e 100644
--- a/compilerplugins/clang/test/passparamsbyref.cxx
+++ b/compilerplugins/clang/test/passparamsbyref.cxx
@@ -9,6 +9,9 @@
 
 #include <rtl/ustring.hxx>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 struct S {
     OUString mv1;
     OUString mv2;
diff --git a/compilerplugins/clang/test/passstuffbyref.cxx b/compilerplugins/clang/test/passstuffbyref.cxx
index 3f0efb1d106e..d90d6f05ba9f 100644
--- a/compilerplugins/clang/test/passstuffbyref.cxx
+++ b/compilerplugins/clang/test/passstuffbyref.cxx
@@ -11,6 +11,9 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 struct S1 {
     OUString mv1;
     OUString const & get() const { return mv1; }
diff --git a/compilerplugins/clang/test/pointerbool.cxx b/compilerplugins/clang/test/pointerbool.cxx
index 276a95ae1e00..fcb4a9a31b57 100644
--- a/compilerplugins/clang/test/pointerbool.cxx
+++ b/compilerplugins/clang/test/pointerbool.cxx
@@ -29,4 +29,18 @@ void test1(int* p1)
     func_bool(aSeq[0]);
 }
 
+void func_bool2(bool); // expected-note {{method here [loplugin:pointerbool]}}
+
+template <typename... Args> void func_bool_via_forward_template(Args&&... args)
+{
+    // expected-error@+1 {{possibly unwanted implicit conversion when calling bool param [loplugin:pointerbool]}}
+    func_bool2(std::forward<Args>(args)...);
+}
+
+void test2(int p1)
+{
+    // expected-note@+1 {{instantiated from here [loplugin:pointerbool]}}
+    func_bool_via_forward_template(p1);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/putpoolitem.cxx b/compilerplugins/clang/test/putpoolitem.cxx
new file mode 100644
index 000000000000..fb44612a00f4
--- /dev/null
+++ b/compilerplugins/clang/test/putpoolitem.cxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <memory>
+
+class SfxPoolItem
+{
+public:
+    virtual ~SfxPoolItem();
+};
+class SfxPoolItemSubclass : public SfxPoolItem
+{
+};
+class SfxItemSet
+{
+public:
+    void Put(SfxPoolItem&);
+};
+
+void foo(SfxItemSet* pSet)
+{
+    std::unique_ptr<SfxPoolItemSubclass> foo;
+    SfxItemSet aSet;
+    // expected-error@+1 {{could use std::move? [loplugin:putpoolitem]}}
+    aSet.Put(*foo);
+
+    // expected-error@+1 {{could use std::move? [loplugin:putpoolitem]}}
+    pSet->Put(*foo);
+}
+
+class Foo2
+{
+    std::unique_ptr<SfxPoolItemSubclass> m_foo;
+    void foo()
+    {
+        SfxItemSet aSet;
+        // no warning expected
+        aSet.Put(*m_foo);
+    }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/rangedforcopy.cxx b/compilerplugins/clang/test/rangedforcopy.cxx
new file mode 100644
index 000000000000..e9a836e2489c
--- /dev/null
+++ b/compilerplugins/clang/test/rangedforcopy.cxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <vector>
+
+struct S
+{
+    int i1;
+    int i2;
+};
+
+void f(S const (&a)[2])
+{
+    // expected-error-re@+1 {{Loop variable passed by value, pass by reference instead, e.g. 'const {{(struct )?}}S&' [loplugin:rangedforcopy]}}
+    for (auto i : a)
+    {
+        (void)i;
+    }
+    for (auto[i1, i2] : a)
+    {
+        (void)i1;
+        (void)i2;
+    }
+}
+
+void f(std::vector<bool> const& v)
+{
+    for (auto b : v)
+    {
+        (void)b;
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/reducevarscope.cxx b/compilerplugins/clang/test/reducevarscope.cxx
index ee600c988efe..ca4ed09be585 100644
--- a/compilerplugins/clang/test/reducevarscope.cxx
+++ b/compilerplugins/clang/test/reducevarscope.cxx
@@ -9,6 +9,9 @@
 
 #include <rtl/ustring.hxx>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 void test1()
 {
     int i = 2; // expected-error {{can reduce scope of var [loplugin:reducevarscope]}}
diff --git a/compilerplugins/clang/test/redundantcast.cxx b/compilerplugins/clang/test/redundantcast.cxx
index 03ce47796d65..47a155c64b37 100644
--- a/compilerplugins/clang/test/redundantcast.cxx
+++ b/compilerplugins/clang/test/redundantcast.cxx
@@ -42,7 +42,7 @@ void testConstCast() {
 
     void * vp = nullptr;
     (void) const_cast<char *>(static_cast<char const *>(vp)); // expected-error {{redundant static_cast/const_cast combination from 'void *' via 'const char *' to 'char *' [loplugin:redundantcast]}}
-    (void) const_cast<char *>(static_cast<char const *>(nullptr)); // expected-error {{redundant static_cast/const_cast combination from 'nullptr_t' via 'const char *' to 'char *' [loplugin:redundantcast]}}
+    (void) const_cast<char *>(static_cast<char const *>(nullptr)); // expected-error-re {{redundant static_cast/const_cast combination from '{{(std::)?}}nullptr_t' via 'const char *' to 'char *' [loplugin:redundantcast]}}
     (void) const_cast<S &>(static_cast<S const &>(D{})); // expected-error {{redundant static_cast/const_cast combination from 'D' via 'const S &' to 'S &' [loplugin:redundantcast]}}
 
     S const s{};
@@ -286,6 +286,8 @@ void testStaticCast() {
     (void) static_cast<S const &&>(csr());
 }
 
+int & testReturnStaticCast(int && x) { return static_cast<int &>(x); }
+
 void testFunctionalCast() {
     (void) int(nir()); // expected-error {{redundant functional cast from 'int' to 'int' [loplugin:redundantcast]}}
     (void) S(nsr());
@@ -327,24 +329,64 @@ void testArithmeticTypedefs() {
     (void) static_cast<T1>(c); // expected-error {{redundant}}
 }
 
+void testReinterpretCast() {
+    int * p;
+    (void) reinterpret_cast<int *>(p); // expected-error {{redundant reinterpret_cast from 'int *' to 'int *' [loplugin:redundantcast]}}
+}
+
 void testReinterpretConstCast() {
     int n = 0;
     (void) reinterpret_cast<std::size_t>((const_cast<int const *>(&n))); // expected-error-re {{redundant const_cast from 'int *' to 'const int *' within reinterpret_cast to fundamental type 'std::size_t' (aka 'unsigned {{.+}}') [loplugin:redundantcast]}}
 }
 
+void testSuspiciousReinterpretCast() {
+    D * p;
+    // expected-error@+1 {{suspicious reinterpret_cast from derived 'D *' to base 'S *', maybe this was meant to be a static_cast [loplugin:redundantcast]}}
+    (void) reinterpret_cast<S *>(p);
+    (void) reinterpret_cast<sal_uIntPtr>(p); // expected no error
+}
+
 void testDynamicCast() {
 
-    struct S1 { virtual ~S1(); };
+    struct S1 { virtual ~S1() {} };
     struct S2 final: S1 {};
     struct S3: S1 {};
 
     S1 * s1 = nullptr;
     S2 * s2 = nullptr;
+    S3 * s3 = nullptr;
 
+    (void) dynamic_cast<void *>(s1);
+    (void) dynamic_cast<void const *>(s1);
     (void) dynamic_cast<S2 *>(s1);
-    (void) dynamic_cast<S1 *>(s2);
+    (void) dynamic_cast<S2 &>(*s1);
+    (void) dynamic_cast<S1 *>(s2); // expected-error {{redundant dynamic upcast from 'S2 *' to 'S1 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S1 &>(*s2); // expected-error {{redundant dynamic upcast from 'S2' to 'S1 &' [loplugin:redundantcast]}}
     (void) dynamic_cast<S2 *>(s2); // expected-error {{redundant dynamic cast from 'S2 *' to 'S2 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S2 &>(*s2); // expected-error {{redundant dynamic cast from 'S2' to 'S2 &' [loplugin:redundantcast]}}
     (void) dynamic_cast<S3 *>(s2);
+    (void) dynamic_cast<S3 &>(*s2);
+    (void) dynamic_cast<const S2 *>(s2); // expected-error {{redundant dynamic cast from 'S2 *' to 'const S2 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<const S2 &>(*s2); // expected-error {{redundant dynamic cast from 'S2' to 'const S2 &' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S1 *>(s3); // expected-error {{redundant dynamic upcast from 'S3 *' to 'S1 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S1&>(*s3); // expected-error {{redundant dynamic upcast from 'S3' to 'S1 &' [loplugin:redundantcast]}}
+
+    S1 const * c1 = nullptr;
+    S2 const * c2 = nullptr;
+    S3 const * c3 = nullptr;
+
+    (void) dynamic_cast<void const *>(c1);
+    (void) dynamic_cast<S2 const *>(c1);
+    (void) dynamic_cast<S2 const &>(*c1);
+    (void) dynamic_cast<S1 const *>(c2); // expected-error {{redundant dynamic upcast from 'const S2 *' to 'const S1 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S1 const &>(*c2); // expected-error {{redundant dynamic upcast from 'const S2' to 'const S1 &' [loplugin:redundantcast]}}
+
+    (void) dynamic_cast<S2 const *>(c2); // expected-error {{redundant dynamic cast from 'const S2 *' to 'const S2 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S2 const &>(*c2); // expected-error {{redundant dynamic cast from 'const S2' to 'const S2 &' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S3 const *>(c2);
+    (void) dynamic_cast<S3 const &>(*c2);
+    (void) dynamic_cast<S1 const *>(c3); // expected-error {{redundant dynamic upcast from 'const S3 *' to 'const S1 *' [loplugin:redundantcast]}}
+    (void) dynamic_cast<S1 const&>(*c3); // expected-error {{redundant dynamic upcast from 'const S3' to 'const S1 &' [loplugin:redundantcast]}}
 }
 
 void overload(int);
@@ -391,8 +433,8 @@ void testIntermediaryStaticCast() {
 };
 
 void testArrayDecay() {
-    (void) static_cast<char const *>(""); // expected-error {{redundant static_cast from 'const char [1]' to 'const char *' [loplugin:redundantcast]}}
-    (void) reinterpret_cast<char const *>(""); // expected-error {{redundant reinterpret_cast from 'const char [1]' to 'const char *' [loplugin:redundantcast]}}
+    (void) static_cast<char const *>(""); // expected-error-re {{redundant static_cast from 'const char{{ ?}}[1]' to 'const char *' [loplugin:redundantcast]}}
+    (void) reinterpret_cast<char const *>(""); // expected-error-re {{redundant reinterpret_cast from 'const char{{ ?}}[1]' to 'const char *' [loplugin:redundantcast]}}
     (void) reinterpret_cast<char const *>(u8"");
 }
 
@@ -431,12 +473,25 @@ void testSalIntTypes() {
     (void) static_cast<Other>(n); // doesn't warn either
 }
 
+void testFunctionalCast2() {
+    struct S1 { S1(int, int, int, int) {} };
+
+    // expected-error@+1 {{redundant functional cast [loplugin:redundantcast]}}
+    S1 aTitleBarBox(S1(0, 0, 0, 0));
+    (void)aTitleBarBox;
+
+    // no warning expected
+#define S1_COL S1(0,0,0,0)
+    S1 aTest2(S1_COL);
+}
+
 int main() {
     testConstCast();
     testStaticCast();
     testFunctionalCast();
     testCStyleCast();
     testCStyleCastOfTemplateMethodResult(nullptr);
+    testReinterpretCast();
     testReinterpretConstCast();
     testDynamicCast();
     testIntermediaryStaticCast();
diff --git a/compilerplugins/clang/test/redundantfcast.cxx b/compilerplugins/clang/test/redundantfcast.cxx
index 255c1d44b2a7..1d13d8bea238 100644
--- a/compilerplugins/clang/test/redundantfcast.cxx
+++ b/compilerplugins/clang/test/redundantfcast.cxx
@@ -9,6 +9,7 @@
 
 #include "sal/config.h"
 
+#include "config_clang.h"
 #include "rtl/ustring.hxx"
 #include "tools/color.hxx"
 
@@ -44,23 +45,24 @@ int main()
 {
     OUString s;
     (void)OUString(
-        s); // expected-error@-1 {{redundant functional cast from 'rtl::OUString' to 'rtl::OUString' [loplugin:redundantfcast]}}
+        s); // expected-error-re@-1 {{redundant functional cast from '{{(rtl::)?}}OUString' to '{{(rtl::)?}}OUString' [loplugin:redundantfcast]}}
     using T1 = OUString;
     (void)T1(
-        s); // expected-error@-1 {{redundant functional cast from 'rtl::OUString' to 'T1' (aka 'rtl::OUString') [loplugin:redundantfcast]}}
+        s); // expected-error-re@-1 {{redundant functional cast from '{{(rtl::)?}}OUString' to 'T1' (aka '{{(rtl::)?}}OUString') [loplugin:redundantfcast]}}
     using T2 = OUString const;
     (void)T2(
-        s); // expected-error@-1 {{redundant functional cast from 'rtl::OUString' to 'T2' (aka 'const rtl::OUString') [loplugin:redundantfcast]}}
+        s); // expected-error-re@-1 {{redundant functional cast from '{{(rtl::)?}}OUString' to 'T2' (aka 'const {{(rtl::?)}}OUString') [loplugin:redundantfcast]}}
 
     (void)std::unique_ptr<int>(std::unique_ptr<int>(
         new int{})); // expected-error@-1 {{redundant functional cast from 'std::unique_ptr<int>' to 'std::unique_ptr<int>' [loplugin:redundantfcast]}}
 
     OUString s1;
     method1(OUString(
-        s1)); // expected-error@-1 {{redundant functional cast from 'rtl::OUString' to 'rtl::OUString' [loplugin:redundantfcast]}}
+        s1)); // expected-error-re@-1 {{redundant functional cast from '{{(rtl::)?}}OUString' to '{{(rtl::)?}}OUString' [loplugin:redundantfcast]}}
     OUString s2;
     s2 = OUString(
-        s1); // expected-error@-1 {{redundant functional cast from 'rtl::OUString' to 'rtl::OUString' [loplugin:redundantfcast]}}
+        s1); // expected-error-re@-1 {{redundant functional cast from '{{(rtl::)?}}OUString' to '{{(rtl::)?}}OUString' [loplugin:redundantfcast]}}
+    (void)s2;
 
     Color col1;
     Color col2 = Color(
@@ -73,7 +75,7 @@ int main()
 
     const tools::Polygon aPolygon;
     ImplWritePolyPolygonRecord(tools::PolyPolygon(tools::Polygon(
-        aPolygon))); // expected-error@-1 {{redundant functional cast from 'const tools::Polygon' to 'tools::Polygon' [loplugin:redundantfcast]}}
+        aPolygon))); // expected-error@-1 {{redundant functional cast from 'const tools::Polygon' to 'tools::Polygon' in construct expression [loplugin:redundantfcast]}}
 }
 
 class Class1
@@ -201,4 +203,40 @@ void g(std::initializer_list<int> il)
 }
 }
 
+namespace test8
+{
+class Primitive2DContainer
+{
+};
+struct GroupPrimitive
+{
+    GroupPrimitive(Primitive2DContainer&&);
+};
+
+const Primitive2DContainer& getChildren();
+
+void foo()
+{
+    // no warning expected, we have to create a temporary for this constructor
+    GroupPrimitive aGroup((Primitive2DContainer(getChildren())));
+    (void)aGroup;
+}
+}
+
+namespace test9
+{
+struct S
+{
+    int n;
+};
+
+void f()
+{
+    (void)S{ 0 };
+#if CLANG_VERSION >= 160000
+    (void)S(0);
+#endif
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/refcounting.cxx b/compilerplugins/clang/test/refcounting.cxx
index 4bcb03e2eef6..54d4dbe14b38 100644
--- a/compilerplugins/clang/test/refcounting.cxx
+++ b/compilerplugins/clang/test/refcounting.cxx
@@ -10,19 +10,123 @@
 #include <sal/config.h>
 
 #include <memory>
+#include <rtl/ref.hxx>
 #include <boost/intrusive_ptr.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
+#include <cppuhelper/weak.hxx>
+#include <unotools/weakref.hxx>
 
-// expected-no-diagnostics
+struct UnoObject : public cppu::OWeakObject
+{
+};
+struct UnoSubObject : public UnoObject
+{
+};
+
+//
+// Note, getting duplicate warnings for some reason I cannot fathom
+//
 
 struct Foo
 {
-// Not in general (dbaccess::DocumentEvents, dbaccess/source/core/dataaccess/databasedocument.hxx):
-#if 0
-    std::unique_ptr<css::uno::XInterface> m_foo1; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
-    std::shared_ptr<css::uno::XInterface> m_foo2; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
-    boost::intrusive_ptr<css::uno::XInterface> m_foo3; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
-#endif
+    // expected-error@+2 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    std::unique_ptr<UnoObject> m_foo1;
+    // expected-error@+2 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    std::shared_ptr<UnoObject> m_foo2;
+    // expected-error@+2 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    boost::intrusive_ptr<UnoObject> m_foo3;
+    rtl::Reference<UnoObject> m_foo4; // no warning expected
+};
+
+// expected-error@+2 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+// expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+std::unique_ptr<UnoObject> foo1();
+rtl::Reference<UnoObject> foo2(); // no warning expected
+// expected-error@+2 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+// expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via smart pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+void foo3(std::unique_ptr<UnoObject> p);
+
+void test2(UnoObject* pUnoObject)
+{
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being deleted via delete, should be managed via rtl::Reference [loplugin:refcounting]}}
+    delete pUnoObject;
+}
+
+template <typename T> struct Dependent : T
+{
+    void f() { delete this; }
+    //TODO: missing expected error@+1 {{cppu::OWeakObject subclass 'Dependent<UnoObject>' being deleted via delete, should be managed via rtl::Reference [loplugin:refcounting]}}
+    void g() { delete this; }
+};
+struct Dummy
+{
 };
+void dummy(Dependent<Dummy>* p1, Dependent<UnoObject>* p2)
+{
+    p1->f();
+    p2->g();
+}
+
+void foo4()
+{
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoObject* p = new UnoObject;
+    (void)p;
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoObject' being managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    p = new UnoObject;
+}
+
+UnoObject* foo5()
+{
+    // expected-error@+1 {{new object of cppu::OWeakObject subclass 'UnoObject' being returned via raw pointer, should be returned by via rtl::Reference [loplugin:refcounting]}}
+    return new UnoObject;
+}
+rtl::Reference<UnoObject> foo6()
+{
+    // no warning expected
+    return new UnoObject;
+}
+const rtl::Reference<UnoObject>& getConstRef();
+void foo7()
+{
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoSubObject' being managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoSubObject* p1 = static_cast<UnoSubObject*>(foo6().get());
+    (void)p1;
+    // expected-error@+1 {{cppu::OWeakObject subclass 'UnoSubObject' being managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    p1 = static_cast<UnoSubObject*>(foo6().get());
+
+    rtl::Reference<UnoObject> u2;
+    // no warning expected
+    UnoSubObject* p2 = static_cast<UnoSubObject*>(u2.get());
+    (void)p2;
+    p2 = static_cast<UnoSubObject*>(u2.get());
+    // no warning expected
+    UnoSubObject* p3 = static_cast<UnoSubObject*>(getConstRef().get());
+    (void)p3;
+    p3 = static_cast<UnoSubObject*>(getConstRef().get());
+}
+
+const unotools::WeakReference<UnoObject>& getWeakRef();
+void foo8()
+{
+    // expected-error@+1 {{weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoSubObject* p1 = static_cast<UnoSubObject*>(getWeakRef().get().get());
+    (void)p1;
+
+    // expected-error@+1 {{weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoObject* p2 = getWeakRef().get().get();
+    (void)p2;
+
+    unotools::WeakReference<UnoObject> weak1;
+    // expected-error@+1 {{weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoSubObject* p3 = dynamic_cast<UnoSubObject*>(weak1.get().get());
+    (void)p3;
 
+    // expected-error@+1 {{weak object being converted to strong, and then the reference dropped, and managed via raw pointer, should be managed via rtl::Reference [loplugin:refcounting]}}
+    UnoObject* p4 = weak1.get().get();
+    (void)p4;
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/referencecasting.cxx b/compilerplugins/clang/test/referencecasting.cxx
index 0272bc89cc98..beb69cc86616 100644
--- a/compilerplugins/clang/test/referencecasting.cxx
+++ b/compilerplugins/clang/test/referencecasting.cxx
@@ -9,16 +9,22 @@
 
 #include "sal/config.h"
 
+#include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/io/XStreamListener.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
 #include "com/sun/star/lang/XTypeProvider.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
+#include "cppuhelper/implbase.hxx"
 #include "cppuhelper/weak.hxx"
+#include "rtl/ref.hxx"
 
 void test1(const css::uno::Reference<css::io::XStreamListener>& a)
 {
     // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
     css::uno::Reference<css::lang::XEventListener> b(a, css::uno::UNO_QUERY);
+    // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+    auto c = css::uno::Reference<css::lang::XEventListener>::query(a);
 }
 
 namespace test2
@@ -77,6 +83,33 @@ void test(css::uno::Reference<css::io::XStreamListener> l)
     // expected-error@+1 {{unnecessary get() call [loplugin:referencecasting]}}
     a.set(l.get(), css::uno::UNO_QUERY);
 }
+
+class FooStream : public css::io::XStreamListener
+{
+    virtual ~FooStream();
+};
+void test(rtl::Reference<FooStream> l)
+{
+    // expected-error@+1 {{unnecessary get() call [loplugin:referencecasting]}}
+    css::uno::Reference<css::io::XStreamListener> a(l.get());
+    // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+    a.set(l.get(), css::uno::UNO_QUERY);
+    // expected-error@+1 {{unnecessary get() call [loplugin:referencecasting]}}
+    a.set(l.get());
+    // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+    css::uno::Reference<css::io::XStreamListener> b(l.get(), css::uno::UNO_QUERY);
+    // no warning expected
+    css::uno::Reference<css::lang::XTypeProvider> c(l.get(), css::uno::UNO_QUERY);
+    // no warning expected
+    css::uno::Reference<css::io::XStreamListener> a2 = l;
+    (void)a2;
+}
+css::uno::Sequence<css::uno::Reference<css::io::XStreamListener>> getContinuations()
+{
+    rtl::Reference<FooStream> noel1;
+    // expected-error@+1 {{unnecessary get() call [loplugin:referencecasting]}}
+    return { noel1.get() };
+}
 }
 
 namespace test8
@@ -156,4 +189,29 @@ void test14(css::uno::Sequence<css::uno::Reference<css::io::XStreamListener>> se
     }
 }
 
+namespace test15
+{
+class Foo : public cppu::WeakImplHelper<css::lang::XComponent, css::io::XInputStream>
+{
+    virtual ~Foo();
+    css::uno::Reference<css::lang::XTypeProvider> bar()
+    {
+        // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+        return css::uno::Reference<css::lang::XTypeProvider>(
+            static_cast<css::lang::XTypeProvider*>(this), css::uno::UNO_QUERY);
+    }
+    css::uno::Reference<css::io::XInputStream> bar2()
+    {
+        // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+        return css::uno::Reference<css::io::XInputStream>(static_cast<css::io::XInputStream*>(this),
+                                                          css::uno::UNO_QUERY);
+    }
+    css::uno::Reference<css::io::XInputStream> bar3()
+    {
+        // expected-error@+1 {{the source reference is already a subtype of the destination reference, just use = [loplugin:referencecasting]}}
+        return css::uno::Reference<css::io::XInputStream>(*this, css::uno::UNO_QUERY);
+    }
+};
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/sallogareas.cxx b/compilerplugins/clang/test/sallogareas.cxx
index 1b172ebd00b6..8dd552b9faa6 100644
--- a/compilerplugins/clang/test/sallogareas.cxx
+++ b/compilerplugins/clang/test/sallogareas.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 
 void func1();
diff --git a/compilerplugins/clang/test/sequenceloop.cxx b/compilerplugins/clang/test/sequenceloop.cxx
deleted file mode 100644
index e124fda27093..000000000000
--- a/compilerplugins/clang/test/sequenceloop.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <utility>
-
-namespace test1
-{
-void foo(css::uno::Sequence<css::uno::Reference<css::uno::XInterface>>& aSeq)
-{
-    // expected-error@+1 {{use std::as_const, or otherwise make the for-range-initializer expression const, to avoid creating a copy of the Sequence [loplugin:sequenceloop]}}
-    for (const auto& x : aSeq)
-        x.get();
-    // no warning expected
-    for (auto& x : aSeq)
-        x.get();
-    for (const auto& x : std::as_const(aSeq))
-        x.get();
-}
-// no warning expected
-void foo2(const css::uno::Sequence<css::uno::Reference<css::uno::XInterface>>& aSeq)
-{
-    for (const auto& x : aSeq)
-        x.get();
-}
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/sequentialassign.cxx b/compilerplugins/clang/test/sequentialassign.cxx
index e656e1a7a304..b7182db5c5b2 100644
--- a/compilerplugins/clang/test/sequentialassign.cxx
+++ b/compilerplugins/clang/test/sequentialassign.cxx
@@ -9,6 +9,9 @@
 
 #include <rtl/ustring.hxx>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 namespace test1
 {
 void f(OUString s1)
diff --git a/compilerplugins/clang/test/simplifybool.cxx b/compilerplugins/clang/test/simplifybool.cxx
deleted file mode 100644
index 906feabee96f..000000000000
--- a/compilerplugins/clang/test/simplifybool.cxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#include <rtl/ustring.hxx>
-// expected-note@rtl/ustring.hxx:* 2 {{the presumed corresponding negated operator for 'rtl::OUString' and 'rtl::OUString' is declared here [loplugin:simplifybool]}}
-#include <rtl/string.hxx>
-// expected-note@rtl/string.hxx:* {{the presumed corresponding negated operator for 'rtl::OString' and 'rtl::OString' is declared here [loplugin:simplifybool]}}
-#include <basegfx/vector/b3dvector.hxx>
-// expected-note@basegfx/tuple/b3dtuple.hxx:* {{the presumed corresponding negated operator for 'basegfx::B3DVector' and 'basegfx::B3DVector' is declared here [loplugin:simplifybool]}}
-
-#include <map>
-
-namespace group1
-{
-void f1(int a, int b)
-{
-    if (!(a < b))
-    { // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-        a = b;
-    }
-};
-
-void f2(float a, float b)
-{
-    // no warning expected
-    if (!(a < b))
-    {
-        a = b;
-    }
-};
-};
-
-// Consistently either warn about all or none of the below occurrences of "!!":
-namespace group2
-{
-enum E1
-{
-    E1_1 = 1
-};
-
-enum E2
-{
-    E2_1 = 1
-};
-E2 operator&(E2 e1, E2 e2);
-bool operator!(E2 e);
-
-enum class E3
-{
-    E1 = 1
-};
-struct W
-{
-    operator bool();
-};
-W operator&(E3 e1, E3 e2);
-
-bool f0(int n) { return !!(n & 1); }
-
-bool f1(E1 e) { return !!(e & E1_1); }
-
-bool f2(E2 e) { return !!(e & E2_1); }
-
-bool f3(E3 e) { return !!(e & E3::E1); }
-};
-
-// record types
-namespace group3
-{
-struct Record1
-{
-    bool operator==(const Record1&) const;
-};
-
-struct Record2
-{
-    bool operator==(const Record2&) const;
-    bool operator!=(const Record2&) const;
-    // expected-note@-1 {{the presumed corresponding negated operator for 'group3::Record2' and 'group3::Record2' is declared here [loplugin:simplifybool]}}
-};
-
-struct Record3
-{
-};
-
-bool operator==(const Record3&, const Record3&);
-bool operator!=(const Record3&, const Record3&);
-// expected-note@-1 {{the presumed corresponding negated operator for 'group3::Record3' and 'group3::Record3' is declared here [loplugin:simplifybool]}}
-
-void testRecord()
-{
-    Record1 a1;
-    Record1 a2;
-    // no warning expected, because a negated operator does not exist
-    bool v = !(a1 == a2);
-    Record2 b1;
-    Record2 b2;
-    v = !(b1 == b2);
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-    Record3 c1;
-    Record3 c2;
-    v = !(c1 == c2);
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-    OUString d1;
-    OUString d2;
-    v = !(d1 == d2);
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-    OString e1;
-    OString e2;
-    v = !(e1 == e2);
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-
-    // the operator != is in a base-class, and the param is a base-type
-    basegfx::B3DVector f1;
-    basegfx::B3DVector f2;
-    v = !(f1 == f2);
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-}
-
-struct Record4
-{
-    bool operator==(Record4 const&) const;
-    bool operator!=(Record4 const& other) const
-    {
-        // no warning expected
-        bool v = !operator==(other);
-        v = !(*this == other);
-        OUString c1;
-        OUString c2;
-        v = !(c1 == c2);
-        // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-        return v;
-    }
-};
-};
-
-namespace group4
-{
-bool foo1(bool a, bool b)
-{
-    return !(!a && !b);
-    // expected-error@-1 {{logical negation of logical op containing negation, can be simplified [loplugin:simplifybool]}}
-}
-bool foo2(int a, bool b)
-{
-    return !(a != 1 && !b);
-    // expected-error@-1 {{logical negation of logical op containing negation, can be simplified [loplugin:simplifybool]}}
-}
-bool foo3(int a, bool b)
-{
-    // no warning expected
-    return !(a != 1 && b);
-}
-};
-
-namespace group5
-{
-bool foo1(std::map<int, int>* pActions, int aKey)
-{
-    auto aIter = pActions->find(aKey);
-    //TODO this doesn't work yet because I'd need to implement conversion operators during method/func lookup
-    return !(aIter == pActions->end());
-    // expected-error@-1 {{logical negation of comparison operator, can be simplified by inverting operator [loplugin:simplifybool]}}
-}
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/staticdynamic.cxx b/compilerplugins/clang/test/staticdynamic.cxx
new file mode 100644
index 000000000000..aa6ca7559b6b
--- /dev/null
+++ b/compilerplugins/clang/test/staticdynamic.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct ClassA
+{
+    virtual ~ClassA() {}
+};
+
+struct ClassB : public ClassA
+{
+    void foo() const {}
+};
+
+void f1(ClassA* p1)
+{
+    // expected-note@+1 {{static_cast here [loplugin:staticdynamic]}}
+    static_cast<ClassB*>(p1)->foo();
+    // expected-error@+1 {{dynamic_cast after static_cast [loplugin:staticdynamic]}}
+    dynamic_cast<ClassB*>(p1)->foo();
+};
+
+void f2(ClassA* p1)
+{
+    // expected-note@+1 {{dynamic_cast here [loplugin:staticdynamic]}}
+    dynamic_cast<ClassB*>(p1)->foo();
+    // expected-error@+1 {{static_cast after dynamic_cast [loplugin:staticdynamic]}}
+    static_cast<ClassB*>(p1)->foo();
+};
+
+void f3(ClassA* p1)
+{
+    // expected-note@+1 {{dynamic_cast here [loplugin:staticdynamic]}}
+    dynamic_cast<const ClassB*>(p1)->foo();
+    // expected-error@+1 {{static_cast after dynamic_cast [loplugin:staticdynamic]}}
+    static_cast<ClassB*>(p1)->foo();
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/staticmethods.cxx b/compilerplugins/clang/test/staticmethods.cxx
new file mode 100644
index 000000000000..cd87c930dc23
--- /dev/null
+++ b/compilerplugins/clang/test/staticmethods.cxx
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+class foo
+{
+    // expected-error@+1 {{this member function can be declared static [loplugin:staticmethods]}}
+    int method1() { return 5; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringadd.cxx b/compilerplugins/clang/test/stringadd.cxx
index e17b207fcb64..7c1193643303 100644
--- a/compilerplugins/clang/test/stringadd.cxx
+++ b/compilerplugins/clang/test/stringadd.cxx
@@ -12,6 +12,10 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-parameter"
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 // ---------------------------------------------------------------
 // += tests
 
@@ -23,47 +27,48 @@ static const char XXX2[] = "xxx";
 void f1(OUString s1, int i, OString o)
 {
     OUString s2 = s1;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += s1;
     s2 = s1 + "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += s1;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += OUString::number(i);
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += XXX1;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error-re@+2 {{rather use O[U]String::Concat than constructing '{{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'rtl::OUStringLiteral<4>'\))?}} from 'const char16_t{{ ?}}[4]' on LHS of + (where RHS is of type 'const char{{ ?}}[4]') [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += OUStringLiteral(XXX1u) + XXX2;
 
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += OStringToOUString(o, RTL_TEXTENCODING_UTF8);
 }
 void f2(OString s1, int i, OUString u)
 {
     OString s2 = s1;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += s1;
     s2 = s1 + "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += s1;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += OString::number(i);
 
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += OUStringToOString(u, RTL_TEXTENCODING_ASCII_US);
 }
 void f3(OUString aStr, int nFirstContent)
 {
     OUString aFirstStr = aStr.copy(0, nFirstContent);
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     aFirstStr += "...";
 }
 OUString side_effect();
@@ -71,15 +76,15 @@ void f4(int i)
 {
     OUString s1;
     OUString s2("xxx");
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += "xxx";
     ++i;
     // any other kind of statement breaks the chain (at least for now)
     s2 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s2 += side_effect();
     s1 += "yyy";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s1 += "yyy";
 }
 }
@@ -89,13 +94,13 @@ namespace test2
 void f(OUString s3)
 {
     s3 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s3 += "xxx";
 }
 void g(OString s3)
 {
     s3 += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s3 += "xxx";
 }
 }
@@ -109,28 +114,28 @@ struct Bar
 void f(Bar b1, Bar& b2, Bar* b3)
 {
     OUString s3 = "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s3 += b1.m_field;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s3 += b2.m_field;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     s3 += b3->m_field;
 }
 OUString side_effect();
 void f2(OUString s)
 {
     OUString sRet = "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += side_effect();
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += "xxx";
     sRet += side_effect();
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += "xxx";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += "xxx";
     sRet += s;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += "xxx";
 }
 }
@@ -146,7 +151,7 @@ void f()
     sRet += ";";
 #endif
     sRet += " ";
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sRet += side_effect();
 }
 }
@@ -167,9 +172,9 @@ namespace test6
 void f(OUString sComma, OUString maExtension, int mnDocumentIconID)
 {
     OUString sValue;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sValue += sComma + sComma + maExtension + sComma;
-    // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
     sValue += OUString::number(mnDocumentIconID) + sComma;
 }
 struct Foo
@@ -183,7 +188,7 @@ void g(int x, const Foo& aValidation)
     {
         case 1:
             sCondition += "cell-content-is-in-list(";
-            // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
+            // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
             sCondition += aValidation.sFormula1 + ")";
     }
 }
@@ -200,9 +205,9 @@ void f1(OUString s, OUString t, int i, const char* pChar)
 {
     // no warning expected
     t = t + "xxx";
-    // expected-error@+1 {{avoid constructing 'rtl::OUString' from 'const char [4]' on RHS of + (where LHS is of type 'rtl::OUString') [loplugin:stringadd]}}
+    // expected-error-re@+1 {{rather use O[U]String::Concat than constructing '{{(rtl::)?}}OUString' from 'const char{{ ?}}[4]' on RHS of + (where LHS is of type '{{(rtl::)?}}OUString') [loplugin:stringadd]}}
     s = s + OUString("xxx");
-    // expected-error@+1 {{avoid constructing 'rtl::OUString' from 'const rtl::OUString' on RHS of + (where LHS is of type 'rtl::OUString') [loplugin:stringadd]}}
+    // expected-error-re@+1 {{rather use O[U]String::Concat than constructing '{{(rtl::)?}}OUString' from 'const {{(rtl::)?}}OUString' on RHS of + (where LHS is of type '{{(rtl::)?}}OUString') [loplugin:stringadd]}}
     s = s + OUString(getByRef());
 
     // no warning expected
@@ -216,14 +221,95 @@ void f1(OUString s, OUString t, int i, const char* pChar)
     // no warning expected
     OUString c;
     c = c + OUString(pChar, strlen(pChar), RTL_TEXTENCODING_UTF8);
+
+    OUStringBuffer buf;
+    // expected-error@+1 {{chained append, rather use single append call and + operator [loplugin:stringadd]}}
+    buf.append(" ").append(b);
 }
 void f2(char ch)
 {
     OString s;
-    // expected-error@+1 {{avoid constructing 'rtl::OString' from 'const char [4]' on RHS of + (where LHS is of type 'rtl::OString') [loplugin:stringadd]}}
+    // expected-error-re@+1 {{rather use O[U]String::Concat than constructing '{{(rtl::)?}}OString' from 'const char{{ ?}}[4]' on RHS of + (where LHS is of type '{{(rtl::)?}}OString') [loplugin:stringadd]}}
     s = s + OString("xxx");
-    // expected-error@+1 {{avoid constructing 'rtl::OString' from 'char' on RHS of + (where LHS is of type 'rtl::OString') [loplugin:stringadd]}}
+    // expected-error-re@+1 {{rather use O[U]String::Concat than constructing '{{(rtl::)?}}OString' from 'char' on RHS of + (where LHS is of type '{{(rtl::)?}}OString') [loplugin:stringadd]}}
     s = s + OString(ch);
 }
 }
+
+namespace test10
+{
+struct C
+{
+    OString constStringFunction(int) const;
+    OString nonConstStringFunction();
+    int constIntFunction() const;
+    int nonConstIntFunction();
+};
+
+C getC();
+
+void f1(C c)
+{
+    OString s;
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
+    s += c.constStringFunction(c.constIntFunction());
+    s += c.constStringFunction(c.nonConstIntFunction());
+    s += c.nonConstStringFunction();
+    s += getC().constStringFunction(c.constIntFunction());
+}
+}
+
+namespace test11
+{
+void f1()
+{
+    OUStringBuffer aFirstStr1("aaa");
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
+    aFirstStr1.append("...");
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
+    aFirstStr1.append("...");
+}
+}
+
+namespace test12
+{
+void f1(int j)
+{
+    OUStringBuffer aFirstStr1(12);
+    // no warning expected
+    aFirstStr1.append("...");
+    // expected-error@+1 {{simplify by merging with the preceding assign/append [loplugin:stringadd]}}
+    aFirstStr1.append("...");
+    // no warning expected
+    aFirstStr1.append(((j + 1) % 15) ? " " : "\n");
+}
+}
+
+namespace test13
+{
+void f1()
+{
+    OUStringBuffer aFirstStr1(12);
+    // no warning expected
+    aFirstStr1.append("...");
+    // because we have a comment between them
+    aFirstStr1.append("...");
+}
+}
+
+namespace test14
+{
+void f1()
+{
+    OUStringBuffer b(16);
+    b.append("...");
+}
+
+void f2(long long n)
+{
+    OUStringBuffer b(n);
+    b.append("...");
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringconcatauto.cxx b/compilerplugins/clang/test/stringconcatauto.cxx
index 8318e3c4a26f..dde4211eaee4 100644
--- a/compilerplugins/clang/test/stringconcatauto.cxx
+++ b/compilerplugins/clang/test/stringconcatauto.cxx
@@ -14,47 +14,43 @@
 void foo()
 {
     auto str1 = "str1" + OUString::number(10);
-    // expected-error-re@-1 {{creating a variable of type 'rtl::OUStringConcat<{{.*}}>' will make it reference temporaries}}
-    // expected-note@-2 {{use OUString instead}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it reference temporaries}}
+    // expected-note@-2 {{use O(U)String instead}}
     OUString str2 = "str2" + OUString::number(20) + "ing";
     const auto& str3 = "str3" + OUString::number(30);
-    // expected-error-re@-1 {{creating a variable of type 'const rtl::OUStringConcat<{{.*}}> &' will make it reference temporaries}}
-    // expected-note@-2 {{use OUString instead}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it reference temporaries}}
+    // expected-note@-2 {{use O(U)String instead}}
     const auto str4 = "str4" + OString::number(40);
-    // expected-error-re@-1 {{creating a variable of type 'const rtl::OStringConcat<{{.*}}>' will make it reference temporaries}}
-    // expected-note@-2 {{use OString instead}}
+    // expected-error-re@-1 {{creating a variable of type {{.+}} will make it reference temporaries}}
+    // expected-note@-2 {{use O(U)String instead}}
     auto str5 = OUString::number(50);
-    // expected-error-re@-1 {{creating a variable of type 'rtl::OUStringNumber<{{.*}}>' will make it reference temporaries}}
-    // expected-note@-2 {{use OUString instead}}
+    auto str6 = OUString::number(50).toAsciiUpperCase();
     (void)str1;
     (void)str2;
     (void)str3;
     (void)str4;
     (void)str5;
+    (void)str6;
 }
 
 struct A
 {
     auto bar()
-    // expected-error-re@-1 {{returning a variable of type 'rtl::OStringConcat<{{.*}}>' will make it reference temporaries}}
-    // expected-note@-2 {{use OString instead}}
+    // expected-error-re@-1 {{returning a variable of type {{.+}} will make it reference temporaries}}
+    // expected-note@-2 {{use O(U)String instead}}
     {
         return "bar" + OString::number(110);
     }
-    auto baz()
-    // expected-error-re@-1 {{returning a variable of type 'rtl::OStringNumber<{{.*}}>' will make it reference temporaries}}
-    // expected-note@-2 {{use OString instead}}
-    {
-        return OString::number(120);
-    }
+    auto baz() { return OString::number(120); }
+    auto baz2() { return OString::number(120).toAsciiUpperCase(); }
 };
 
 template <typename T> void fun(const T& par)
 // parameters are without warnings
 {
     const T& var = par;
-    // expected-error-re@-1 {{creating a variable of type 'const rtl::OUStringConcat<{{.*}}> &' will make it reference temporaries}}
-    // expected-note@-2 {{use OUString instead}}
+    // expected-error-re@-1 {{creating a variable of type 'const rtl::StringConcat<{{.*}}> &' will make it reference temporaries}}
+    // expected-note@-2 {{use O(U)String instead}}
     (void)var;
 }
 
diff --git a/compilerplugins/clang/test/stringconcatliterals.cxx b/compilerplugins/clang/test/stringconcatliterals.cxx
index d19ebb97c1c3..0575eb252bc0 100644
--- a/compilerplugins/clang/test/stringconcatliterals.cxx
+++ b/compilerplugins/clang/test/stringconcatliterals.cxx
@@ -14,6 +14,9 @@
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 #define FOO "foo"
 #define FOOu u"foo"
 
@@ -37,6 +40,7 @@ void f(std::ostream& s1)
     s1 << "foo" << OUString(FOO);
     // expected-error@-1 {{replace '<<' between string literals with juxtaposition}}
     s1 << "foo" << OUString(foo);
+    s1 << "foo" << __func__;
     OString s2;
     s2 = "foo" + OString("foo");
     // expected-error@-1 {{replace '+' between string literals with juxtaposition}}
diff --git a/compilerplugins/clang/test/stringconstant.cxx b/compilerplugins/clang/test/stringconstant.cxx
index 1e325633d856..f5982e2a4977 100644
--- a/compilerplugins/clang/test/stringconstant.cxx
+++ b/compilerplugins/clang/test/stringconstant.cxx
@@ -102,14 +102,12 @@ int main() {
 
     (void) OUString("xxx", 2, RTL_TEXTENCODING_ASCII_US); // expected-error {{suspicious 'rtl::OUString' constructor with literal of length 3 and non-matching length argument 2 [loplugin:stringconstant]}}
 
-#if !defined __cpp_char8_t
-    (void) OUString(u8"xxx", 3, RTL_TEXTENCODING_ASCII_US); // expected-error {{simplify construction of 'OUString' with string constant argument [loplugin:stringconstant]}}
-#endif
-
     (void) OUString("\x80", 1, RTL_TEXTENCODING_UTF8); // expected-error {{suspicious 'rtl::OUString' constructor with text encoding 'RTL_TEXTENCODING_UTF8' but non-UTF-8 content [loplugin:stringconstant]}}
 
     (void) OUString("\xC2\x80", 2, RTL_TEXTENCODING_UTF8); // expected-error {{simplify construction of 'OUString' with UTF-8 content as OUString(u"\u0080") [loplugin:stringconstant]}}
 
+    OUString().reverseCompareTo(OUString()); // expected-error {{in call of 'rtl::OUString::reverseCompareTo', replace default-constructed 'OUString' with an empty string literal [loplugin:stringconstant]}}
+
     OUStringBuffer ub;
     ub.append(""); // expected-error {{call of 'rtl::OUStringBuffer::append' with suspicious empty string constant argument [loplugin:stringconstant]}}
     ub.append("foo\0bar"); // expected-error {{call of 'rtl::OUStringBuffer::append' with string constant argument containing embedded NULLs [loplugin:stringconstant]}}
@@ -126,6 +124,17 @@ int main() {
     ub.append(static_cast<char const *>(sc2)); // at runtime: append "foo"
     ub.append(static_cast<char const *>(sc3)); // at runtime: assert
     ub.append(static_cast<char const *>(sc4)); // at runtime: UB
+
+    // expected-error-re@+1 {{in call of 'rtl::OString::getStr', replace default-constructed '{{(rtl::)?}}OString' directly with an empty ordinary string literal}}
+    OString().getStr();
+    // expected-error-re@+1 {{in call of 'rtl::OString::getStr', replace '{{(rtl::)?}}OString' constructed from a string literal directly with the string literal}}
+    OString("foo").getStr();
+    // expected-error-re@+1 {{in call of 'rtl::OString::getStr', replace '{{(rtl::)?}}OString' constructed from a string literal directly with the string literal}}
+    (OString(("foo"))).getStr();
+    // expected-error-re@+1 {{in call of 'rtl::OUString::getStr', replace default-constructed '{{(rtl::)?}}OUString' directly with an empty UTF-16 string literal}}
+    OUString().getStr();
+    // expected-error-re@+1 {{in call of 'rtl::OUString::getStr', replace '{{(rtl::)?}}OUString' constructed from a string literal directly with a UTF-16 string literal}}
+    OUString("foo").getStr();
 }
 
 
diff --git a/compilerplugins/clang/test/stringliteraldefine.cxx b/compilerplugins/clang/test/stringliteraldefine.cxx
new file mode 100644
index 000000000000..ba5f718ed86d
--- /dev/null
+++ b/compilerplugins/clang/test/stringliteraldefine.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+
+#include <vector>
+
+#include <rtl/ustring.hxx>
+#include <sal/macros.h>
+
+void f(OUString const&);
+
+void f1()
+{
+// expected-error@+1 {{change macro 'XXX' to 'constexpr OUStringLiteral' [loplugin:stringliteraldefine]}}
+#define XXX "xxx"
+
+    // expected-note@+1 {{macro used here [loplugin:stringliteraldefine]}}
+    f(OUString(XXX));
+
+    // FIXME no warning expected
+    //#define FOO f(OUString("xxx"))
+    //    FOO;
+}
+
+void f2()
+{
+    struct DataFlavorRepresentation
+    {
+        OUString pMimeType;
+    };
+
+// expected-error@+1 {{change macro 'MIMETYPE_VND_SUN_XML_WRITER_ASCII' to 'constexpr OUStringLiteral' [loplugin:stringliteraldefine]}}
+#define MIMETYPE_VND_SUN_XML_WRITER_ASCII "xxx"
+    static const DataFlavorRepresentation aInstance[] = {
+        // expected-note@+1 {{macro used here [loplugin:stringliteraldefine]}}
+        { MIMETYPE_VND_SUN_XML_WRITER_ASCII },
+    };
+}
+
+void f3()
+{
+// expected-error@+1 {{change macro 'YYY' to 'constexpr OUStringLiteral' [loplugin:stringliteraldefine]}}
+#define YYY "yyy"
+
+    // expected-note@+1 {{macro used here [loplugin:stringliteraldefine]}}
+    f(YYY);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringliteralvar.cxx b/compilerplugins/clang/test/stringliteralvar.cxx
index 25a85f90a5a3..6ea7c184c644 100644
--- a/compilerplugins/clang/test/stringliteralvar.cxx
+++ b/compilerplugins/clang/test/stringliteralvar.cxx
@@ -9,59 +9,60 @@
 
 #include <sal/config.h>
 
+#include <iterator>
 #include <vector>
 
 #include <rtl/ustring.hxx>
 
-// expected-error@+1 {{change type of variable 'literal1' from constant character array ('const char [4]') to OStringLiteral [loplugin:stringliteralvar]}}
+// expected-error-re@+1 {{change type of variable 'literal1' from constant character array ('const char{{ ?}}[4]') to OStringLiteral [loplugin:stringliteralvar]}}
 char const literal1[] = "foo";
 OString f1()
 {
-    // expected-note@+1 {{first passed into a 'rtl::OString' constructor here [loplugin:stringliteralvar]}}
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OString' constructor here [loplugin:stringliteralvar]}}
     return literal1;
 }
 
 void f(OUString const&);
 void f2()
 {
-    // expected-error@+1 {{change type of variable 'literal' from constant character array ('const char [4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
     char const literal[] = "foo";
-    // expected-note@+1 {{first passed into a 'rtl::OUString' constructor here [loplugin:stringliteralvar]}}
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
     f(literal);
 }
 
 struct S3
 {
-    // expected-error@+1 {{change type of variable 'literal' from constant character array ('const char16_t [4]') to OUStringLiteral [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
     static constexpr char16_t literal[] = u"foo";
 };
 void f3()
 {
-    // expected-note@+1 {{first passed into a 'rtl::OUString' constructor here [loplugin:stringliteralvar]}}
-    f(S3::literal);
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
+    f(OUString(S3::literal, 3));
 }
 
 std::vector<OUString> f4()
 {
-    // expected-error@+1 {{change type of variable 'literal' from constant character array ('const char16_t [4]') to OUStringLiteral [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
     static constexpr char16_t literal[] = u"foo";
-    // expected-note@+1 {{first passed into a 'rtl::OUString' constructor here [loplugin:stringliteralvar]}}
-    return { literal };
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
+    return { OUString(literal, 3) };
 }
 
 void f5()
 {
-    // expected-error@+1 {{variable 'literal' of type 'const rtl::OUStringLiteral<4>' with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
     OUStringLiteral const literal = u"foo";
-    // expected-note@+1 {{first converted to 'rtl::OUString' here [loplugin:stringliteralvar]}}
+    // expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
     f(literal);
 }
 
 void f6()
 {
-    // expected-error@+1 {{variable 'literal' of type 'const rtl::OUStringLiteral<4>' with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
     constexpr OUStringLiteral literal = u"foo";
-    // expected-note@+1 {{first converted to 'rtl::OUString' here [loplugin:stringliteralvar]}}
+    // expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
     f(literal);
 }
 
@@ -74,8 +75,60 @@ void f7()
 void f8()
 {
     static constexpr OUStringLiteral const literal = u"foo";
-    // expected-error@+1 {{variable 'literal' of type 'const rtl::OUStringLiteral<4>' suspiciously used in a sizeof expression [loplugin:stringliteralvar]}}
+    // expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} suspiciously used in a sizeof expression [loplugin:stringliteralvar]}}
     (void)sizeof literal;
 }
 
+void f9()
+{
+    // expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
+    static sal_Unicode const literal[] = { 'f', 'o', 'o' };
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
+    f(OUString(literal, std::size(literal)));
+}
+
+void f10()
+{
+    // expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
+    static sal_Unicode const literal[] = { 'f', 'o', 'o' };
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
+    f(OUString(literal, 3));
+}
+
+void f11(int nStreamType)
+{
+    // expected-error-re@+1 {{change type of variable 'sDocumentType' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
+    const char sDocumentType[] = "foo";
+    OUString sStreamType;
+    switch (nStreamType)
+    {
+        case 1:
+            // expected-note@+1 {{first assigned here [loplugin:stringliteralvar]}}
+            sStreamType = sDocumentType;
+            break;
+    }
+    (void)sStreamType;
+}
+
+extern sal_Unicode const extarr[1];
+
+sal_Unicode init();
+
+void f12()
+{
+    // Suppress warnings if the array contains a malformed sequence of UTF-16 code units...:
+    static sal_Unicode const arr1[] = { 0xD800 };
+    f(OUString(arr1, 1));
+    // ...Or potentially contains a malformed sequence of UTF-16 code units...:
+    f(OUString(extarr, 1));
+    sal_Unicode const arr2[] = { init() };
+    f(OUString(arr2, 1));
+    // ...But generate a warning if the array contains a well-formed sequence of UTF-16 code units
+    // containing surrogates:
+    // expected-error-re@+1 {{change type of variable 'arr3' from constant character array ('const sal_Unicode{{ ?}}[2]'{{( \(aka 'const char16_t\[2\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
+    static sal_Unicode const arr3[] = { 0xD800, 0xDC00 };
+    // expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
+    f(OUString(arr3, 2));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringloop.cxx b/compilerplugins/clang/test/stringloop.cxx
index 0e9183d42057..7a02cd9ceb07 100644
--- a/compilerplugins/clang/test/stringloop.cxx
+++ b/compilerplugins/clang/test/stringloop.cxx
@@ -11,6 +11,9 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 struct Foo
 {
     OUString m_field; // expected-note {{field here [loplugin:stringloop]}}
diff --git a/compilerplugins/clang/test/stringstatic.cxx b/compilerplugins/clang/test/stringstatic.cxx
index 3c26d961c6a8..7e2089a17da7 100644
--- a/compilerplugins/clang/test/stringstatic.cxx
+++ b/compilerplugins/clang/test/stringstatic.cxx
@@ -9,21 +9,21 @@
 
 #include <rtl/ustring.hxx>
 
-#include "stringstatic.hxx"
-
-// expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
+// expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
 static const OUString TEST1 = "xxx";
-
-void f(rtl_uString const*);
+static constexpr OUString TEST2 = u"xxx"_ustr;
 
 void test2()
 {
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
+    (void)TEST2;
+    // expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
     static const OUString XXX = "xxx";
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
-    static const OUString XXX2 = "xxx";
+    static constexpr OUString XXX2 = u"xxx"_ustr;
     (void)XXX;
     (void)XXX2;
-    static const OUString DATA = "xxx";
-    f(DATA.pData);
+    // expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
+    static const OUString A1[1] = { u"xxx"_ustr };
+    static constexpr OUString A2[1] = { u"xxx"_ustr };
+    (void)A1;
+    (void)A2;
 }
diff --git a/compilerplugins/clang/test/cppunitassertequals.hxx b/compilerplugins/clang/test/stringview-c++03.cxx
index 2448d64e93e7..1824ac9d02ce 100644
--- a/compilerplugins/clang/test/cppunitassertequals.hxx
+++ b/compilerplugins/clang/test/stringview-c++03.cxx
@@ -7,17 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#pragma once
+#include <sal/config.h>
 
-#include "sal/config.h"
+#include <rtl/ustrbuf.hxx>
 
-#include <cstddef>
+// expected-no-diagnostics
 
-#include "rtl/ustring.hxx"
-
-struct T { bool operator ==(T); };
-
-void test(
-    bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n);
+rtl::OUStringBuffer nowarn(rtl::OUStringBuffer const& s, sal_Int32 n)
+{
+    return s.copy(n, s.getLength() - n);
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringview.cxx b/compilerplugins/clang/test/stringview.cxx
index d40ee50175a1..a8df9dd6b179 100644
--- a/compilerplugins/clang/test/stringview.cxx
+++ b/compilerplugins/clang/test/stringview.cxx
@@ -10,6 +10,7 @@
 #include <sal/config.h>
 
 #include <string_view>
+#include <utility>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
@@ -59,6 +60,54 @@ void f1(OString s1)
     // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
     ConstructWithView(s1.copy(1));
 }
+void f1(OUStringBuffer s1)
+{
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    call_view(s1.copy(1, 2));
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    call_view(s1.copy(1));
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    ConstructWithView(s1.copy(1, 2));
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    ConstructWithView(s1.copy(1));
+    // expected-error@+1 {{rather than call toString, pass with a view [loplugin:stringview]}}
+    call_view(s1.toString());
+    // expected-error@+1 {{rather than call toString, pass with a view [loplugin:stringview]}}
+    ConstructWithView(s1.toString());
+}
+void f1(OStringBuffer s1)
+{
+    // expected-error@+1 {{rather than call toString, pass with a view [loplugin:stringview]}}
+    call_view(s1.toString());
+    // expected-error@+1 {{rather than call toString, pass with a view [loplugin:stringview]}}
+    ConstructWithView(s1.toString());
+}
+void makeStringAndClear(OUStringBuffer s)
+{
+    call_view(s.makeStringAndClear());
+    ConstructWithView(s.makeStringAndClear());
+    call_view((&s)->makeStringAndClear());
+    ConstructWithView((&s)->makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    call_view(std::move(s).makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    ConstructWithView(std::move(s).makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    call_view((s).copy(1).makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    ConstructWithView(s.copy(1).makeStringAndClear());
+}
+void makeStringAndClear(OStringBuffer s)
+{
+    call_view(s.makeStringAndClear());
+    ConstructWithView(s.makeStringAndClear());
+    call_view((&s)->makeStringAndClear());
+    ConstructWithView((&s)->makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    call_view(std::move(s).makeStringAndClear());
+    // expected-error@+1 {{rather than call makeStringAndClear on an rvalue, pass with a view [loplugin:stringview]}}
+    ConstructWithView(std::move(s).makeStringAndClear());
+}
 }
 
 namespace test2
@@ -73,6 +122,7 @@ void f3(OUString s1)
     s2 = "xxx" + s1.copy(1);
     // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
     s2 += s1.copy(1);
+    (void)s2;
 }
 void f3(OString s1)
 {
@@ -98,46 +148,72 @@ void f4(OUString s1, OUString s2)
 }
 }
 
-void f5(char const* s1, sal_Int32 n1, char16_t const* s2, sal_Int32 n2)
+void f5(char const* s1, sal_Int32 n1, char16_t const* s2, sal_Int32 n2, OString s3, OUString s4)
 {
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString', pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString());
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'const char{{ ?}}[4]', pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString("foo"));
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' (or an 'rtl::OStringChar') [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'const char', pass a 'std::string_view' (or an 'rtl::OStringChar') [loplugin:stringview]}}
     call_view(OString(*s1));
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'const char *', pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString(s1));
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'const char *', pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString(s1, n1));
     constexpr OStringLiteral l1("foo");
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString(l1));
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'std::string_view' (aka 'basic_string_view<char>'), pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString(std::string_view("foo")));
-    // expected-error@+1 {{instead of an 'rtl::OString', pass a 'std::string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an {{'(rtl::)?}}OString' constructed from a {{'(rtl::)?StringNumber<char, 33>'|'OStringNumber<33>' \(aka 'StringNumber<char, 33ULL?>'\)}}, pass a 'std::string_view' [loplugin:stringview]}}
     call_view(OString(OString::number(0)));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed from a 'OStringConcat<{{(rtl::)?}}OString, {{(rtl::)?}}OString>' (aka 'StringConcat<char, rtl::OString, rtl::OString>'), pass a 'std::string_view' via 'rtl::Concat2View' [loplugin:stringview]}}
+    call_view(OString(s3 + s3));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString());
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char{{ ?}}[4]', pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString("foo"));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
-    call_view(OUString(u"foo"));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char16_t{{ ?}}[4]', pass a 'std::u16string_view' [loplugin:stringview]}}
+    call_view(OUString(u"foo", 3));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview]}}
     call_view(OUString(*s1));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char16_t', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview]}}
     call_view(OUString(*s2));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char16_t *', pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString(s2));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char16_t *', pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString(s2, n2));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'const char16_t *', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview]}}
+    call_view(OUString(s2, 1));
     constexpr OUStringLiteral l2(u"foo");
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString(l2));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'std::u16string_view' (aka 'basic_string_view<char16_t>'), pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString(std::u16string_view(u"foo")));
-    // expected-error@+1 {{instead of an 'rtl::OUString', pass a 'std::u16string_view' [loplugin:stringview]}}
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a {{'(rtl::)?StringNumber<char16_t, 33>'|'OUStringNumber<33>' \(aka 'StringNumber<char16_t, 33ULL?>'\)}}, pass a 'std::u16string_view' [loplugin:stringview]}}
     call_view(OUString(OUString::number(0)));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'OUStringConcat<{{(rtl::)?}}OUString, {{(rtl::)?}}OUString>' (aka 'StringConcat<char16_t, rtl::OUString, rtl::OUString>'), pass a 'std::u16string_view' via 'rtl::Concat2View' [loplugin:stringview]}}
+    call_view(OUString(s4 + s4));
+
+    (void)(s3 == l1);
+    (void)(s4 == l2);
 }
 
+void f5(OUString s)
+{
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    OUStringBuffer buf(s.copy(5));
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    buf = s.copy(5);
+    // expected-error@+1 {{rather than copy, pass with a view using subView() [loplugin:stringview]}}
+    buf.append(s.copy(12));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'std::u16string_view' (aka 'basic_string_view<char16_t>'), pass a 'std::u16string_view' [loplugin:stringview]}}
+    buf.append(OUString(std::u16string_view(u"foo")));
+    // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed from a 'std::u16string_view' (aka 'basic_string_view<char16_t>'), pass a 'std::u16string_view' [loplugin:stringview]}}
+    s += OUString(std::u16string_view(u"foo"));
+}
+
+void f6(OUString s)
+{
+    // expected-error@+1 {{rather than getToken, pass with a view using o3tl::getToken() [loplugin:stringview]}}
+    s.getToken(1, ' ').toInt32();
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringviewdangle.cxx b/compilerplugins/clang/test/stringviewdangle.cxx
new file mode 100644
index 000000000000..0a8d2aa54b44
--- /dev/null
+++ b/compilerplugins/clang/test/stringviewdangle.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+
+#include <string_view>
+#include <utility>
+
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace test1
+{
+OUString foo1();
+OUString& foo2();
+void f1()
+{
+    // expected-error@+1 {{view pointing into temporary i.e. dangling [loplugin:stringviewdangle]}}
+    std::u16string_view v = foo1();
+    // expected-error@+1 {{view pointing into temporary i.e. dangling [loplugin:stringviewdangle]}}
+    v = foo1();
+
+    // no warning expected
+    std::u16string_view v2 = foo2();
+    v2 = foo2();
+}
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringviewparam.cxx b/compilerplugins/clang/test/stringviewparam.cxx
index 24dab18e0f9c..abb98797b1dc 100644
--- a/compilerplugins/clang/test/stringviewparam.cxx
+++ b/compilerplugins/clang/test/stringviewparam.cxx
@@ -7,20 +7,24 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#undef NDEBUG
+
 #include "sal/config.h"
 
 #include <string_view>
 
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
+#include "rtl/ustrbuf.hxx"
 #include "sal/types.h"
 
 void f1a(std::string_view);
-// expected-error@+1 {{replace function parameter of type 'const rtl::OString &' with 'std::string_view' [loplugin:stringviewparam]}}
+// expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OString &' with 'std::string_view' [loplugin:stringviewparam]}}
 char f1b(OString const& s)
 {
     f1a(s);
-    if (s.isEmpty())
+    OString rest;
+    if (s.isEmpty() || s.startsWith("foo", &rest) || s.endsWith("foo"))
     {
         f1a(std::string_view(s));
     }
@@ -28,11 +32,12 @@ char f1b(OString const& s)
 }
 
 void f2a(std::u16string_view);
-// expected-error@+1 {{replace function parameter of type 'const rtl::OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+// expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
 sal_Unicode f2b(OUString const& s)
 {
     f2a(s);
-    if (s.isEmpty())
+    OUString rest;
+    if (s.isEmpty() || s.startsWith("foo", &rest) || s.endsWith("foo"))
     {
         f2a(std::u16string_view(s));
     }
@@ -51,19 +56,19 @@ template <> void f5<OUString>(OUString const&) {}
 void f6([[maybe_unused]] OUString const&) {}
 
 bool f7(
-    // expected-error@+1 {{replace function parameter of type 'const rtl::OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+    // expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
     const OUString& p1,
-    // expected-error@+1 {{replace function parameter of type 'const rtl::OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+    // expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
     const OUString& p2)
 {
     return p1 == p2;
 }
-// expected-error@+1 {{replace function parameter of type 'const rtl::OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+// expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
 bool f8(const OUString& p1, std::u16string_view p2) { return p1 == p2; }
 
 struct Converter
 {
-    // expected-error@+1 {{replace function parameter of type 'const rtl::OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+    // expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
     static bool convertBool(bool& rBool, const OUString& rString)
     {
         rBool = rString == "true";
@@ -83,4 +88,26 @@ struct S10
     }
 };
 
+// expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+void f11(const OUString& f11rString)
+{
+    OUStringBuffer buf;
+    buf.append(f11rString);
+}
+
+// expected-error-re@+1 {{replace function parameter of type 'const {{(rtl::)?}}OUString &' with 'std::u16string_view' [loplugin:stringviewparam]}}
+sal_uInt32 decimalStringToNumber(OUString const& str, sal_Int32 nStart, sal_Int32 nLength)
+{
+    sal_uInt32 result = 0;
+    for (sal_Int32 i = nStart; i < nStart + nLength;)
+    {
+        sal_uInt32 c = str.iterateCodePoints(&i);
+        sal_uInt32 value = 0;
+        if (c <= 0x0039)
+            value = c - 0x0030;
+        result = result * 10 + value;
+    }
+    return result;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/stringviewvar.cxx b/compilerplugins/clang/test/stringviewvar.cxx
new file mode 100644
index 000000000000..4f5a8fd3def7
--- /dev/null
+++ b/compilerplugins/clang/test/stringviewvar.cxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#undef NDEBUG
+
+#include "sal/config.h"
+#include <string_view>
+#include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "sal/types.h"
+
+void f1(std::string_view sv)
+{
+    // expected-error-re@+1 {{replace var of type '{{(rtl::)?}}OString' with 'std::string_view' [loplugin:stringviewvar]}}
+    OString s1(sv);
+    (void)s1;
+}
+
+void f2(const OString s1)
+{
+    // no warning expected
+    OString s2(s1);
+    (void)s2;
+}
+
+std::string_view f3a();
+void f3()
+{
+    // expected-error-re@+1 {{replace var of type '{{(rtl::)?}}OString' with 'std::string_view' [loplugin:stringviewvar]}}
+    OString s1 = OString(f3a());
+    (void)s1;
+}
+
+void f4a(const OString&);
+void f4(std::string_view sv)
+{
+    // no warning expected
+    OString s1(sv);
+    f4a(s1);
+}
+
+void f5(std::string_view sv)
+{
+    // expected-error-re@+1 {{replace var of type '{{(rtl::)?}}OString' with 'std::string_view' [loplugin:stringviewvar]}}
+    OString s1(sv);
+    if (s1 == "xxxx")
+        f5(sv);
+}
+
+void f6(std::u16string_view sv)
+{
+    // expected-error-re@+1 {{replace var of type '{{(rtl::)?}}OUString' with 'std::u16string_view' [loplugin:stringviewvar]}}
+    OUString s6;
+    s6 = sv;
+    (void)s6;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/trivialconstructor.cxx b/compilerplugins/clang/test/trivialconstructor.cxx
new file mode 100644
index 000000000000..eed26f8bf305
--- /dev/null
+++ b/compilerplugins/clang/test/trivialconstructor.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct S1
+{
+    // expected-error@+1 {{no need for explicit constructor decl [loplugin:trivialconstructor]}}
+    S1() {}
+};
+
+struct S2
+{
+    S2() {}
+    S2(int) {}
+};
+
+struct S3
+{
+    S3() {}
+    template <typename T> S3(T);
+};
+
+template <typename> struct S4
+{
+#if !defined _MSC_VER
+// expected-error@+2 {{no need for explicit constructor decl [loplugin:trivialconstructor]}}
+#endif
+    S4() {}
+};
+
+template <typename> struct S5
+{
+    S5() {}
+    S5(int);
+};
+
+template <typename> struct S6
+{
+    S6() {}
+    template <typename T> S6(T);
+};
+
+struct S7
+{
+    S7(int = 0) {}
+};
+
+struct S8
+{
+    template <typename T> S8(T = 0) {}
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/trivialdestructor.cxx b/compilerplugins/clang/test/trivialdestructor.cxx
new file mode 100644
index 000000000000..b6ba4e968193
--- /dev/null
+++ b/compilerplugins/clang/test/trivialdestructor.cxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct S1
+{
+    // expected-note@+1 {{previous declaration is here [loplugin:trivialdestructor]}}
+    ~S1();
+};
+
+// expected-error@+1 {{no need for explicit destructor decl [loplugin:trivialdestructor]}}
+S1::~S1() {}
+
+struct S2
+{
+    // expected-note@+1 {{previous declaration is here [loplugin:trivialdestructor]}}
+    ~S2();
+};
+
+// expected-error@+1 {{no need for explicit destructor decl [loplugin:trivialdestructor]}}
+S2::~S2() = default;
+
+struct S3
+{
+    ~S3() = delete;
+};
+
+struct S4
+{
+    union {
+        int i;
+        float f;
+    };
+    // expected-error@+1 {{no need for explicit destructor decl [loplugin:trivialdestructor]}}
+    ~S4() {}
+};
+
+struct Nontrivial
+{
+    ~Nontrivial();
+};
+
+struct S5
+{
+    union {
+        int i;
+        Nontrivial n;
+    };
+    ~S5() {}
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/typeidcomparison.cxx b/compilerplugins/clang/test/typeidcomparison.cxx
new file mode 100644
index 000000000000..31ab749a2496
--- /dev/null
+++ b/compilerplugins/clang/test/typeidcomparison.cxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <typeinfo>
+
+struct Base
+{
+    virtual ~Base();
+};
+
+struct Derived : Base
+{
+};
+
+void good(Base* p)
+{
+    (void)(typeid(*p) == typeid(Derived));
+    (void)(typeid(Derived) == typeid(*p));
+    (void)(typeid(*p) != typeid(Derived));
+    (void)(typeid(Derived) != typeid(*p));
+}
+
+void bad(Base* p)
+{
+    // expected-error@+1 {{comparison of type info of mixed pointer and non-pointer types 'Base *' and 'Derived' can never succeed [loplugin:typeidcomparison]}}
+    (void)(typeid(p) == typeid(Derived));
+    // expected-error@+1 {{comparison of type info of mixed pointer and non-pointer types 'Derived' and 'Base *' can never succeed [loplugin:typeidcomparison]}}
+    (void)(typeid(Derived) == typeid(p));
+    // expected-error@+1 {{comparison of type info of mixed pointer and non-pointer types 'Base *' and 'Derived' can never succeed [loplugin:typeidcomparison]}}
+    (void)(typeid(p) != typeid(Derived));
+    // expected-error@+1 {{comparison of type info of mixed pointer and non-pointer types 'Derived' and 'Base *' can never succeed [loplugin:typeidcomparison]}}
+    (void)(typeid(Derived) != typeid(p));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unnecessarygetstr.cxx b/compilerplugins/clang/test/unnecessarygetstr.cxx
new file mode 100644
index 000000000000..bdb58cde2ef7
--- /dev/null
+++ b/compilerplugins/clang/test/unnecessarygetstr.cxx
@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+
+#include <ostream>
+#include <sstream>
+#include <string_view>
+#include <string>
+
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
+
+namespace test1
+{
+void f1(bool, const OString& s);
+struct Foo
+{
+    void f1(bool, const OString& s);
+};
+void test1(Foo& foo)
+{
+    OString s;
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to OString constructor [loplugin:unnecessarygetstr]}}
+    f1(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to OString constructor [loplugin:unnecessarygetstr]}}
+    foo.f1(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to OString constructor [loplugin:unnecessarygetstr]}}
+    foo.f1(true, OString::boolean(true).getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to OString constructor [loplugin:unnecessarygetstr]}}
+    foo.f1(true, OString::number(12).getStr());
+
+    // avoid false +
+    OString aVal = "xx";
+    OUString aCompText
+        = "xx" + OUString(aVal.getStr(), aVal.getLength(), RTL_TEXTENCODING_ASCII_US);
+    (void)aCompText;
+}
+}
+
+namespace test2
+{
+// call to param that takes string_view
+void f2(bool, std::string_view);
+void f2(bool, std::u16string_view);
+struct Foo2
+{
+    void f2(bool, std::string_view);
+    void f2(bool, std::u16string_view);
+};
+void testOString(Foo2& foo)
+{
+    OString s;
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    f2(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, OString::boolean(true).getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, OString::number(12).getStr());
+}
+void testOUString(Foo2& foo)
+{
+    OUString s;
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    f2(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, s.getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, OUString::boolean(true).getStr());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, OUString::number(12).getStr());
+}
+}
+
+namespace test3
+{
+// call to param that takes string_view
+void f2(bool, std::string_view);
+struct Foo2
+{
+    void f2(bool, std::string_view);
+};
+void test3(Foo2& foo)
+{
+    std::string s;
+    // expected-error@+1 {{unnecessary call to 'c_str' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    f2(true, s.c_str());
+    // expected-error@+1 {{unnecessary call to 'c_str' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    foo.f2(true, s.c_str());
+}
+}
+
+namespace test4
+{
+void test()
+{
+    std::string s;
+    // expected-error@+1 {{unnecessary call to 'c_str' when passing to OUString::createFromAscii [loplugin:unnecessarygetstr]}}
+    OUString::createFromAscii(s.c_str());
+}
+}
+
+namespace test5
+{
+void test(std::string v, OString o)
+{
+    // expected-error@+1 {{unnecessary call to 'c_str' when passing to string_view constructor [loplugin:unnecessarygetstr]}}
+    std::string_view s1(v.c_str());
+    // expected-error@+1 {{unnecessary call to 'getStr' when passing to string constructor [loplugin:unnecessarygetstr]}}
+    std::string s2(o.getStr());
+}
+}
+
+// no warning expected
+namespace test6
+{
+void foo(const OString&);
+void test(std::string v) { foo(v.c_str()); }
+}
+
+// no warning expected
+namespace test7
+{
+void test(const OString& v) { std::stringstream aStream(v.getStr()); }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unnecessarylocking.cxx b/compilerplugins/clang/test/unnecessarylocking.cxx
new file mode 100644
index 000000000000..a2319623140a
--- /dev/null
+++ b/compilerplugins/clang/test/unnecessarylocking.cxx
@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <mutex>
+#include <osl/mutex.hxx>
+
+static std::mutex gSolarMutex;
+
+class SolarMutexGuard
+{
+    std::unique_lock<std::mutex> lock;
+
+public:
+    SolarMutexGuard()
+        : lock(gSolarMutex)
+    {
+    }
+};
+
+namespace test1
+{
+struct Foo
+{
+    int m_foo;
+    int bar1()
+    // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+    {
+        SolarMutexGuard guard;
+        return 1;
+    }
+    // no warning expected
+    int bar2()
+    {
+        SolarMutexGuard guard;
+        return m_foo;
+    }
+};
+}
+
+namespace test2
+{
+int free_function() { return 1; }
+
+struct Foo
+{
+    std::mutex m_aMutex;
+    osl::Mutex m_aOslMutex;
+    int m_foo;
+
+    int bar1()
+    // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+    {
+        std::unique_lock guard(m_aMutex);
+        return 1;
+    }
+    int bar2()
+    // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+    {
+        std::scoped_lock guard(m_aMutex);
+        return 1;
+    }
+    // no warning expected
+    int bar3()
+    {
+        std::scoped_lock guard(m_aMutex);
+        return m_foo;
+    }
+    int bar4()
+    // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+    {
+        ::osl::Guard<::osl::Mutex> aGuard(m_aOslMutex);
+        return 1;
+    }
+    int bar5()
+    {
+        // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+        {
+            std::unique_lock guard(m_aMutex);
+            return free_function();
+        }
+    }
+    osl::Mutex& getOslMutex() { return m_aOslMutex; }
+    int bar6()
+    // expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+    {
+        ::osl::Guard<::osl::Mutex> aGuard(getOslMutex());
+        return 1;
+    }
+};
+}
+
+// Calling anything on VCLUnoHelper means we need the SolarMutex
+class VCLUnoHelper
+{
+public:
+    static int CreateToolkit();
+};
+namespace test4
+{
+// no warning expected
+void bar1()
+{
+    SolarMutexGuard guard;
+    VCLUnoHelper::CreateToolkit();
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx b/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx
index b54957be2d7a..960909b4ea4c 100644
--- a/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx
+++ b/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx
@@ -78,10 +78,10 @@ struct DefaultDerived1: VirtualBase {
 };
 
 struct DefaultDerived2: VirtualBase {
-    ~DefaultDerived2() override; // expected-note {{declared here [loplugin:unnecessaryoverride]}}
+    ~DefaultDerived2() override;
 };
 
-DefaultDerived2::~DefaultDerived2() = default; // expected-error {{unnecessary user-declared destructor [loplugin:unnecessaryoverride]}}
+DefaultDerived2::~DefaultDerived2() = default;
 
 struct EmptyDerived1: VirtualBase {
     ~EmptyDerived1() override {}; // expected-error {{unnecessary user-declared destructor [loplugin:unnecessaryoverride]}}
@@ -125,7 +125,7 @@ struct CompleteBase {
 // a class defined in a .hxx with the dtor declared (but not defined) as inline in the .hxx,
 // and then defined in the cxx (making it effectively only callable from within the cxx);
 // removing the dtor declaration from the class definition would change the dtor to be callable from everywhere
-MarkedInlineButNotDefined::~MarkedInlineButNotDefined() {}
+MarkedInlineButNotDefined::~MarkedInlineButNotDefined() = default;
 
 // avoid loplugin:unreffun:
 int main() {
diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx b/compilerplugins/clang/test/unnecessaryparen.cxx
index f932cd312558..89ca84da6ab2 100644
--- a/compilerplugins/clang/test/unnecessaryparen.cxx
+++ b/compilerplugins/clang/test/unnecessaryparen.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <rtl/ustring.hxx>
@@ -34,6 +35,13 @@ template <> struct typed_flags<BrowseMode> : is_typed_flags<BrowseMode, 0xf>
 };
 }
 
+void f(char const *);
+char const * operator ""_s1(char const *, std::size_t);
+#if __cplusplus >= 202002L
+struct Str { constexpr Str(char const *) {} };
+template<Str> char const * operator ""_s2();
+#endif
+
 int main()
 {
     int x = 1;
@@ -113,6 +121,23 @@ int main()
 
     BrowseMode nBits = ( BrowseMode::Modules | BrowseMode::Top ); // expected-error {{parentheses immediately inside vardecl statement [loplugin:unnecessaryparen]}}
     (void)nBits;
+
+    OUString::number((v2+1)); // expected-error {{parentheses immediately inside single-arg call [loplugin:unnecessaryparen]}}
+
+    (void) ("foo"); // expected-error {{unnecessary parentheses around single-token string literal [loplugin:unnecessaryparen]}}
+    (void) ("foo" "bar");
+    f(("foo")); // expected-error {{parentheses immediately inside single-arg call [loplugin:unnecessaryparen]}}
+    f(("foo" "bar"));
+    (void) ("foo"_s1); // expected-error {{unnecessary parentheses around single-token string literal [loplugin:unnecessaryparen]}}
+    (void) ("foo" "bar"_s1);
+    f(("foo"_s1)); // expected-error {{parentheses immediately inside single-arg call [loplugin:unnecessaryparen]}}
+    f(("foo" "bar"_s1));
+#if __cplusplus >= 202002L
+    (void) ("foo"_s2); //TODO: expected error {{unnecessary parentheses around single-token string literal [loplugin:unnecessaryparen]}}
+    (void) ("foo" "bar"_s2);
+    f(("foo"_s2)); // TODO: expected error {{parentheses immediately inside single-arg call [loplugin:unnecessaryparen]}}
+    f(("foo" "bar"_s2));
+#endif
 };
 
 struct B { operator bool() const; };
diff --git a/compilerplugins/clang/test/unoaggregation.cxx b/compilerplugins/clang/test/unoaggregation.cxx
new file mode 100644
index 000000000000..01e0dd832e9d
--- /dev/null
+++ b/compilerplugins/clang/test/unoaggregation.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMain.hpp>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <sal/types.h>
+
+class Base : public cppu::WeakAggImplHelper1<css::lang::XInitialization>
+{
+public:
+    void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& aArguments) override;
+};
+
+class Good : public Base, public css::lang::XMain
+{
+public:
+    css::uno::Any SAL_CALL queryInterface(css::uno::Type const& aType) override
+    {
+        return Base::queryInterface(aType);
+    }
+};
+
+class Bad : public cppu::ImplInheritanceHelper<Base, css::lang::XMain>
+{
+public:
+    sal_Int32 SAL_CALL run(css::uno::Sequence<OUString> const& aArguments) override;
+};
+
+// expected-error@cppuhelper/implbase.hxx:* {{'ImplInheritanceHelper<Base, com::sun::star::lang::XMain>' derives from XAggregation, but its implementation of queryInterface does not delegate to an appropriate base class queryInterface [loplugin:unoaggregation]}}
+Bad bad; //make sure Bad's base cppu::ImplInheritanceHelper<Base, css::lang::XMain> is instantiated
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unoany.cxx b/compilerplugins/clang/test/unoany.cxx
index 1b4bfaa2beec..b5d91007f80f 100644
--- a/compilerplugins/clang/test/unoany.cxx
+++ b/compilerplugins/clang/test/unoany.cxx
@@ -11,6 +11,9 @@
 
 #include "com/sun/star/uno/Any.hxx"
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 css::uno::Any getAny() { return css::uno::Any(true); }
 
 int main()
@@ -19,7 +22,6 @@ int main()
     css::uno::Any b;
     a = b;
     a = getAny();
-    a = css::uno::makeAny(true); // expected-error {{unnecessary copy, rather use <<= operator directly with the 'makeAny' argument [loplugin:unoany]}}
     a = css::uno::Any(true); // expected-error {{unnecessary copy, rather use <<= operator directly with the 'Any' constructor argument [loplugin:unoany]}}
 }
 
diff --git a/compilerplugins/clang/test/unreffun.cxx b/compilerplugins/clang/test/unreffun.cxx
index b61171a87c84..315c699b7748 100644
--- a/compilerplugins/clang/test/unreffun.cxx
+++ b/compilerplugins/clang/test/unreffun.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config_clang.h"
+
 #include "unreffun.hxx"
 
 template <typename> struct S
@@ -36,4 +38,20 @@ void l() // expected-error {{Unreferenced externally visible function definition
 {
 }
 
+void m()
+{
+// The below produced a false "Unreferenced externally invisible function definition" for Local::f
+// prior to <https://github.com/llvm/llvm-project/commit/d812488d3c54c07f24d4bef79e329f17e7f19c3b>
+// "Call MarkVirtualMembersReferenced on an actual class definition" in Clang 17:
+#if CLANG_VERSION >= 170000
+    struct Local;
+#endif
+    struct Local
+    {
+        virtual void f() {}
+    };
+    Local x;
+    (void)x;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unreffun.hxx b/compilerplugins/clang/test/unreffun.hxx
index a209dd7b6437..7eea5233fde7 100644
--- a/compilerplugins/clang/test/unreffun.hxx
+++ b/compilerplugins/clang/test/unreffun.hxx
@@ -13,4 +13,6 @@ void f();
 
 extern void i();
 
+void m();
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedcapturedefault.cxx b/compilerplugins/clang/test/unusedcapturedefault.cxx
new file mode 100644
index 000000000000..d98eec04da36
--- /dev/null
+++ b/compilerplugins/clang/test/unusedcapturedefault.cxx
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+auto f1()
+{
+    // expected-error@+1 {{unused capture-default [loplugin:unusedcapturedefault]}}
+    return [=] { return 0; };
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedenumconstants.cxx b/compilerplugins/clang/test/unusedenumconstants.cxx
index 189a037670b8..3f69e8993f04 100644
--- a/compilerplugins/clang/test/unusedenumconstants.cxx
+++ b/compilerplugins/clang/test/unusedenumconstants.cxx
@@ -114,6 +114,7 @@ void test6()
     Enum6 foo = Enum6::Modules;
     foo &= ~Enum6::Top;
     foo &= (~Enum6::Top);
+    (void)foo;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx
index 42b49a5df832..c936460bbea5 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -6,14 +6,13 @@
  * 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/.
  */
-#include "config_clang.h"
 
-// CLANG_VERSION = older versions of clang need something different in getParentFunctionDecl
-// WIN32 = TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
-#if CLANG_VERSION < 110000 || defined _WIN32
+#if defined _WIN32 // TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
 // expected-no-diagnostics
 #else
 
+#include <map>
+#include <memory>
 #include <vector>
 #include <ostream>
 #include <com/sun/star/uno/Any.hxx>
@@ -127,6 +126,7 @@ struct Bar
     {
         css::uno::Any any;
         any <<= m_bar10;
+        (void)any;
     }
 
     // check that we see reads of the LHS when calling operator>>=
@@ -378,6 +378,49 @@ namespace TouchFromOutsideAnalysis1
     };
 };
 
+namespace WriteOnlyAnalysis4
+{
+    struct ImplTabCtrlData
+    // expected-error@-1 {{read maLayoutLineToPageId [loplugin:unusedfields]}}
+    // expected-error@-2 {{outside maLayoutLineToPageId [loplugin:unusedfields]}}
+    {
+        std::map< int, int > maLayoutLineToPageId;
+    };
+    class TabControl
+    // expected-error@-1 {{read mpTabCtrlData [loplugin:unusedfields]}}
+    // expected-error@-2 {{outside-constructor mpTabCtrlData [loplugin:unusedfields]}}
+    {
+        std::unique_ptr<ImplTabCtrlData> mpTabCtrlData;
+
+        void foo(int nLine, int& rPageId)
+        {
+            rPageId = mpTabCtrlData->maLayoutLineToPageId[ nLine ];
+        }
+    };
+}
+
+namespace WriteOnlyAnalysis5
+{
+    struct ImplTabCtrlData
+    // expected-error@-1 {{read maLayoutLineToPageId [loplugin:unusedfields]}}
+    // expected-error@-2 {{write maLayoutLineToPageId [loplugin:unusedfields]}}
+    // expected-error@-3 {{outside maLayoutLineToPageId [loplugin:unusedfields]}}
+    {
+        std::map< int, int > maLayoutLineToPageId;
+    };
+    class TabControl
+    // expected-error@-1 {{read mpTabCtrlData [loplugin:unusedfields]}}
+    // expected-error@-2 {{outside-constructor mpTabCtrlData [loplugin:unusedfields]}}
+    {
+        std::unique_ptr<ImplTabCtrlData> mpTabCtrlData;
+
+        void foo(int nLine, int nPageId)
+        {
+            mpTabCtrlData->maLayoutLineToPageId[ nLine ] = nPageId;
+        }
+    };
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedindex.cxx b/compilerplugins/clang/test/unusedindex.cxx
index 7b98f8645b91..4d08b5be0d26 100644
--- a/compilerplugins/clang/test/unusedindex.cxx
+++ b/compilerplugins/clang/test/unusedindex.cxx
@@ -9,6 +9,9 @@
 
 #include <vector>
 
+#pragma clang diagnostic ignored "-Wunknown-warning-option" // for Clang < 13
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+
 void func1()
 {
     std::vector<int> v1;
diff --git a/compilerplugins/clang/test/unusedmember.cxx b/compilerplugins/clang/test/unusedmember.cxx
index 00b136249aca..90f3051b98ee 100644
--- a/compilerplugins/clang/test/unusedmember.cxx
+++ b/compilerplugins/clang/test/unusedmember.cxx
@@ -7,21 +7,43 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <cstddef>
+
 namespace Enum
 {
 namespace
 {
 struct S
 {
-    enum E
+    enum E1
     {
-        E1,
-        E2
+        E11,
+        E12
     };
-    E e;
+    E1 e1;
+    enum E2
+    {
+        E21,
+        E22
+    };
+    E2 e2; // expected-error {{unused class member [loplugin:unusedmember]}}
+    enum E3
+    {
+        E31,
+        E32
+    } e3;
+    enum E4
+    {
+        E41,
+        E42
+    } e4; // expected-error {{unused class member [loplugin:unusedmember]}}
 };
 }
-void f(S s) { (void)s.e; }
+void f(S s)
+{
+    (void)s.e1;
+    (void)s.e3;
+}
 }
 
 namespace ElaboratedEnum
@@ -203,6 +225,31 @@ void f()
 }
 }
 
+namespace Offsetof
+{
+namespace
+{
+struct S
+{
+    int i;
+};
+}
+void f() { (void)offsetof(S, i); }
+}
+
+namespace OffsetofTemplate
+{
+namespace
+{
+template <typename> struct S
+{
+    int i;
+};
+template <typename T> void f1() { (void)offsetof(T, i); }
+}
+void f() { f1<S<void>>(); }
+}
+
 int main()
 {
     (void)&Enum::f;
@@ -213,6 +260,8 @@ int main()
     (void)&Aligned::f;
     (void)&Bases::f;
     (void)&Unnamed::f;
+    (void)&Offsetof::f;
+    (void)&OffsetofTemplate::f;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedvariablecheck.cxx b/compilerplugins/clang/test/unusedvariablecheck.cxx
index c5b2a04d89fe..b020fba3eb4e 100644
--- a/compilerplugins/clang/test/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/test/unusedvariablecheck.cxx
@@ -12,17 +12,27 @@
 #include <list>
 #include <string>
 #include <vector>
+#include <memory>
 
 namespace
 {
 template <typename T> using Vec = std::vector<T>;
 }
 
+struct S : std::unique_ptr<int>
+{
+    S(int* = nullptr);
+};
+
 int main()
 {
     std::list<int> v1; // expected-error {{unused variable 'v1' [loplugin:unusedvariablecheck]}}
     std::string v2; // expected-error {{unused variable 'v2' [loplugin:unusedvariablecheck]}}
     Vec<int> v3; // expected-error {{unused variable 'v3' [loplugin:unusedvariablecheck]}}
+    std::unique_ptr<int>
+        v4; // expected-error {{unused variable 'v4' [loplugin:unusedvariablecheck]}}
+    S v5; // expected-error {{unused variable 'v5' [loplugin:unusedvariablecheck]}}
+    S v6(nullptr);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/unusedvarsglobal.cxx b/compilerplugins/clang/test/unusedvarsglobal.cxx
index 58c18d0de84c..e7a0316d497d 100644
--- a/compilerplugins/clang/test/unusedvarsglobal.cxx
+++ b/compilerplugins/clang/test/unusedvarsglobal.cxx
@@ -6,11 +6,8 @@
  * 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/.
  */
-#include "config_clang.h"
 
-// CLANG_VERSION = older versions of clang need something different in getParentFunctionDecl
-// WIN32 = TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
-#if CLANG_VERSION < 110000 || defined _WIN32
+#if defined _WIN32 // TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
 // expected-no-diagnostics
 #else
 
diff --git a/compilerplugins/clang/test/vclwidgets.cxx b/compilerplugins/clang/test/vclwidgets.cxx
index f08faaefecd9..1ff828e280ad 100644
--- a/compilerplugins/clang/test/vclwidgets.cxx
+++ b/compilerplugins/clang/test/vclwidgets.cxx
@@ -82,6 +82,7 @@ void bar3()
 {
     Widget* p;
     p = get<Widget>();
+    (void)p;
 }
 
 void bar4() {
diff --git a/compilerplugins/clang/test/weakbase.cxx b/compilerplugins/clang/test/weakbase.cxx
index a59a5372891e..3d5284ef543c 100644
--- a/compilerplugins/clang/test/weakbase.cxx
+++ b/compilerplugins/clang/test/weakbase.cxx
@@ -25,10 +25,59 @@ struct Foo2 : public tools::WeakBase
     virtual ~Foo2();
 };
 
-// expected-error@+1 {{multiple copies of WeakBase, through inheritance paths Bar->Foo1->WeakBase, Bar->Foo2->WeakBase [loplugin:weakbase]}}
+// expected-error@+1 {{found multiple copies of tools::WeakBase, through inheritance paths Bar->Foo1->WeakBase, Bar->Foo2->WeakBase [loplugin:weakbase]}}
 struct Bar : public Foo1, public Foo2
 {
     virtual ~Bar();
 };
 
+namespace cppu
+{
+class OWeakObject
+{
+};
+}
+
+namespace test2
+{
+class Foo1 : public cppu::OWeakObject
+{
+};
+class Foo2 : public cppu::OWeakObject
+{
+};
+// expected-error@+1 {{found multiple copies of cppu::OWeakObject, through inheritance paths Foo3->Foo1->OWeakObject, Foo3->Foo2->OWeakObject [loplugin:weakbase]}}
+class Foo3 : public Foo1, public Foo2
+{
+};
+}
+
+namespace test3
+{
+class Foo1 : public virtual cppu::OWeakObject
+{
+};
+class Foo2 : public virtual cppu::OWeakObject
+{
+};
+// no warning expected
+class Foo3 : public Foo1, public Foo2
+{
+};
+}
+
+namespace test4
+{
+class Foo1 : public cppu::OWeakObject
+{
+};
+class Foo2 : public virtual cppu::OWeakObject
+{
+};
+// expected-error@+1 {{found one virtual base and one or more normal bases of cppu::OWeakObject, through inheritance paths Foo3->Foo1->OWeakObject, Foo3->Foo2->OWeakObject [loplugin:weakbase]}}
+class Foo3 : public Foo1, public Foo2
+{
+};
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/writeonlyvars.cxx b/compilerplugins/clang/test/writeonlyvars.cxx
index 4c3732867a81..0fc141f62dd2 100644
--- a/compilerplugins/clang/test/writeonlyvars.cxx
+++ b/compilerplugins/clang/test/writeonlyvars.cxx
@@ -40,6 +40,7 @@ void test()
     int* m_bar3b;
     m_bar3 = nullptr;
     m_bar3b = m_bar3 = nullptr;
+    (void)m_bar3b;
 
     // check that we see reads of field when passed to a function pointer
     // check that we see read of a field that is a function pointer
@@ -91,6 +92,7 @@ void test()
     // expected-error@+1 {{read any2 [loplugin:writeonlyvars]}}
     css::uno::Any any2;
     any2 <<= m_bar10;
+    (void)any2;
 };
 };
 
diff --git a/compilerplugins/clang/trivialconstructor.cxx b/compilerplugins/clang/trivialconstructor.cxx
new file mode 100644
index 000000000000..c991d71ae703
--- /dev/null
+++ b/compilerplugins/clang/trivialconstructor.cxx
@@ -0,0 +1,156 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+#include "clang/AST/StmtVisitor.h"
+
+// Look for declared constructors that can be trivial (and therefore don't need to be declared)
+
+namespace
+{
+class TrivialConstructor : public loplugin::FilteringPlugin<TrivialConstructor>
+{
+public:
+    explicit TrivialConstructor(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+    bool VisitCXXConstructorDecl(CXXConstructorDecl const*);
+
+private:
+    bool HasTrivialConstructorBody(const CXXRecordDecl* BaseClassDecl,
+                                   const CXXRecordDecl* MostDerivedClassDecl);
+    bool FieldHasTrivialConstructorBody(const FieldDecl* Field);
+};
+
+bool TrivialConstructor::VisitCXXConstructorDecl(CXXConstructorDecl const* constructorDecl)
+{
+    if (ignoreLocation(constructorDecl))
+        return true;
+    if (!constructorDecl->hasTrivialBody())
+        return true;
+    if (constructorDecl->isExplicit())
+        return true;
+    if (!constructorDecl->isDefaultConstructor())
+        return true;
+    if (constructorDecl->getNumParams() != 0)
+        return true;
+    if (!constructorDecl->inits().empty())
+        return true;
+    if (constructorDecl->getExceptionSpecType() != EST_None)
+        return true;
+    if (constructorDecl->getAccess() != AS_public)
+        return true;
+    if (!constructorDecl->isThisDeclarationADefinition())
+        return true;
+    if (isInUnoIncludeFile(
+            compiler.getSourceManager().getSpellingLoc(constructorDecl->getLocation())))
+        return true;
+    const CXXRecordDecl* recordDecl = constructorDecl->getParent();
+    if (std::distance(recordDecl->ctor_begin(), recordDecl->ctor_end()) != 1)
+        return true;
+    // Constructor templates are not included in ctor_begin()..ctor_end() above, so also do a slow
+    // check across all decls():
+    for (auto d : recordDecl->decls())
+    {
+        if (auto const d2 = dyn_cast<FunctionTemplateDecl>(d))
+        {
+            if (isa<CXXConstructorDecl>(d2->getTemplatedDecl()))
+            {
+                return true;
+            }
+        }
+    }
+    if (!HasTrivialConstructorBody(recordDecl, recordDecl))
+        return true;
+
+    report(DiagnosticsEngine::Warning, "no need for explicit constructor decl",
+           constructorDecl->getLocation())
+        << constructorDecl->getSourceRange();
+    if (constructorDecl->getCanonicalDecl() != constructorDecl)
+    {
+        constructorDecl = constructorDecl->getCanonicalDecl();
+        report(DiagnosticsEngine::Warning, "no need for explicit constructor decl",
+               constructorDecl->getLocation())
+            << constructorDecl->getSourceRange();
+    }
+    return true;
+}
+
+bool TrivialConstructor::HasTrivialConstructorBody(const CXXRecordDecl* BaseClassDecl,
+                                                   const CXXRecordDecl* MostDerivedClassDecl)
+{
+    if (BaseClassDecl != MostDerivedClassDecl && !BaseClassDecl->hasTrivialDefaultConstructor())
+        return false;
+
+    // Check fields.
+    for (const auto* field : BaseClassDecl->fields())
+        if (!FieldHasTrivialConstructorBody(field))
+            return false;
+
+    // Check non-virtual bases.
+    for (const auto& I : BaseClassDecl->bases())
+    {
+        if (I.isVirtual())
+            continue;
+        if (!I.getType()->isRecordType())
+            continue;
+        const CXXRecordDecl* NonVirtualBase = I.getType()->getAsCXXRecordDecl();
+        if (NonVirtualBase && !HasTrivialConstructorBody(NonVirtualBase, MostDerivedClassDecl))
+            return false;
+    }
+
+    if (BaseClassDecl == MostDerivedClassDecl)
+    {
+        // Check virtual bases.
+        for (const auto& I : BaseClassDecl->vbases())
+        {
+            if (!I.getType()->isRecordType())
+                continue;
+            const CXXRecordDecl* VirtualBase = I.getType()->getAsCXXRecordDecl();
+            if (VirtualBase && !HasTrivialConstructorBody(VirtualBase, MostDerivedClassDecl))
+                return false;
+        }
+    }
+    return true;
+}
+
+bool TrivialConstructor::FieldHasTrivialConstructorBody(const FieldDecl* Field)
+{
+    QualType FieldBaseElementType = compiler.getASTContext().getBaseElementType(Field->getType());
+
+    const RecordType* RT = FieldBaseElementType->getAs<RecordType>();
+    if (!RT)
+        return true;
+
+    CXXRecordDecl* FieldClassDecl = cast<CXXRecordDecl>(RT->getDecl());
+
+    // The constructor for an implicit anonymous union member is never invoked.
+    if (FieldClassDecl->isUnion() && FieldClassDecl->isAnonymousStructOrUnion())
+        return false;
+
+    return FieldClassDecl->hasTrivialDefaultConstructor();
+}
+
+loplugin::Plugin::Registration<TrivialConstructor> X("trivialconstructor", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/trivialdestructor.cxx b/compilerplugins/clang/trivialdestructor.cxx
new file mode 100644
index 000000000000..5db1bbab705f
--- /dev/null
+++ b/compilerplugins/clang/trivialdestructor.cxx
@@ -0,0 +1,113 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+#include "clang/AST/StmtVisitor.h"
+
+// Look for explicit destructors that can be trivial (and therefore don't need to be declared)
+
+namespace
+{
+class TrivialDestructor : public loplugin::FilteringPlugin<TrivialDestructor>
+{
+public:
+    explicit TrivialDestructor(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+    bool VisitCXXDestructorDecl(CXXDestructorDecl const*);
+
+private:
+    bool HasTrivialDestructorBody(const CXXRecordDecl* ClassDecl);
+    bool FieldHasTrivialDestructor(const FieldDecl* Field);
+};
+
+bool TrivialDestructor::VisitCXXDestructorDecl(CXXDestructorDecl const* destructorDecl)
+{
+    if (ignoreLocation(destructorDecl))
+        return true;
+    if (!destructorDecl->isThisDeclarationADefinition())
+        return true;
+    if (!destructorDecl->hasTrivialBody())
+        return true;
+    if (destructorDecl->isVirtual())
+        return true;
+    if (destructorDecl->getExceptionSpecType() != EST_None)
+        return true;
+    if (destructorDecl->getAccess() != AS_public)
+        return true;
+    if (isInUnoIncludeFile(
+            compiler.getSourceManager().getSpellingLoc(destructorDecl->getLocation())))
+        return true;
+    if (!HasTrivialDestructorBody(destructorDecl->getParent()))
+        return true;
+
+    report(DiagnosticsEngine::Warning, "no need for explicit destructor decl",
+           destructorDecl->getLocation())
+        << destructorDecl->getSourceRange();
+    for (FunctionDecl const* d2 = destructorDecl;;)
+    {
+        d2 = d2->getPreviousDecl();
+        if (d2 == nullptr)
+        {
+            break;
+        }
+        report(DiagnosticsEngine::Note, "previous declaration is here", d2->getLocation())
+            << d2->getSourceRange();
+    }
+    return true;
+}
+
+bool TrivialDestructor::HasTrivialDestructorBody(const CXXRecordDecl* ClassDecl)
+{
+    // Check fields.
+    for (const auto* field : ClassDecl->fields())
+        if (!FieldHasTrivialDestructor(field))
+            return false;
+
+    // Check bases.
+    for (const auto& I : ClassDecl->bases())
+    {
+        const CXXRecordDecl* Base = I.getType()->getAsCXXRecordDecl();
+        if (!Base->hasTrivialDestructor())
+            return false;
+    }
+
+    return true;
+}
+
+bool TrivialDestructor::FieldHasTrivialDestructor(const FieldDecl* Field)
+{
+    QualType FieldBaseElementType = compiler.getASTContext().getBaseElementType(Field->getType());
+
+    const RecordType* RT = FieldBaseElementType->getAs<RecordType>();
+    if (!RT)
+        return true;
+
+    CXXRecordDecl* FieldClassDecl = cast<CXXRecordDecl>(RT->getDecl());
+
+    return FieldClassDecl->hasTrivialDestructor();
+}
+
+loplugin::Plugin::Registration<TrivialDestructor> X("trivialdestructor", true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/typedefparam.cxx b/compilerplugins/clang/typedefparam.cxx
index 7ea4df79d2af..6fffe66c8483 100644
--- a/compilerplugins/clang/typedefparam.cxx
+++ b/compilerplugins/clang/typedefparam.cxx
@@ -15,6 +15,8 @@
 #include <fstream>
 #include <set>
 
+#include "config_clang.h"
+
 #include "check.hxx"
 #include "plugin.hxx"
 
@@ -85,10 +87,10 @@ bool TypedefParam::VisitFunctionDecl(FunctionDecl const* functionDecl)
         report(DiagnosticsEngine::Warning,
                "function return type at definition site does not match function param at "
                "declaration site, %0 vs %1",
-               compat::getBeginLoc(functionDecl))
+               functionDecl->getBeginLoc())
             << functionDecl->getReturnType() << canonicalDecl->getReturnType()
             << functionDecl->getSourceRange();
-        report(DiagnosticsEngine::Note, "declaration site here", compat::getBeginLoc(canonicalDecl))
+        report(DiagnosticsEngine::Note, "declaration site here", canonicalDecl->getBeginLoc())
             << canonicalDecl->getSourceRange();
     }
     return true;
@@ -105,7 +107,7 @@ bool TypedefParam::VisitCXXMethodDecl(CXXMethodDecl const* methodDecl)
         return true;
 
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(methodDecl)));
+        compiler.getSourceManager().getSpellingLoc(methodDecl->getBeginLoc()));
     // seems to be using typedefs as a form of documentation for method params
     if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/sw/source/filter/ww8/ww8scan.hxx"))
         return true;
@@ -145,11 +147,11 @@ bool TypedefParam::VisitCXXMethodDecl(CXXMethodDecl const* methodDecl)
                 report(DiagnosticsEngine::Warning,
                        "method return type does not match overridden method "
                        "%0 vs %1",
-                       compat::getBeginLoc(methodDecl))
+                       methodDecl->getBeginLoc())
                     << methodDecl->getReturnType() << superMethodDecl->getReturnType()
                     << methodDecl->getSourceRange();
                 report(DiagnosticsEngine::Note, "super-class method here",
-                       compat::getBeginLoc(superMethodDecl))
+                       superMethodDecl->getBeginLoc())
                     << superMethodDecl->getSourceRange();
             }
     }
@@ -187,7 +189,7 @@ static bool areTypesEqual(QualType lhs, QualType rhs)
                 return dyn_cast<RecordType>(elaboratedType->desugar());
             };
             auto containsTypedefToRecord = [](clang::QualType type, RecordType const* recordType) {
-                TypedefType const* typedefType = dyn_cast<TypedefType>(type);
+                TypedefType const* typedefType = type->getAs<TypedefType>();
                 if (!typedefType)
                     return false;
                 auto tmp = typedefType->desugar();
diff --git a/compilerplugins/clang/typeidcomparison.cxx b/compilerplugins/clang/typeidcomparison.cxx
new file mode 100644
index 000000000000..359231f262e6
--- /dev/null
+++ b/compilerplugins/clang/typeidcomparison.cxx
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// Find (in-)equality comparisons between typeid expressions that can never succeed.  For now, just
+// detects cases where the two involved types are structurally different, one a pointer type and the
+// other a non-pointer type.
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include "plugin.hxx"
+
+namespace
+{
+class TypeidComparison final : public loplugin::FilteringPlugin<TypeidComparison>
+{
+public:
+    explicit TypeidComparison(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    // For CXXRewrittenBinaryOperator `typeid(...) != typeid(...)`:
+    bool shouldVisitImplicitCode() const { return true; }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        auto const op = expr->getOperator();
+        if (op != OO_EqualEqual && op != OO_ExclaimEqual)
+        {
+            return true;
+        }
+        assert(expr->getNumArgs() == 2);
+        auto const e1 = dyn_cast<CXXTypeidExpr>(expr->getArg(0)->IgnoreParenImpCasts());
+        if (e1 == nullptr)
+        {
+            return true;
+        }
+        auto const e2 = dyn_cast<CXXTypeidExpr>(expr->getArg(1)->IgnoreParenImpCasts());
+        if (e2 == nullptr)
+        {
+            return true;
+        }
+        auto const t1 = getOperandType(e1);
+        auto const t2 = getOperandType(e2);
+        if (t1->isPointerType() == t2->isPointerType())
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning,
+               "comparison of type info of mixed pointer and non-pointer types %0 and %1 can never "
+               "succeed",
+               expr->getExprLoc())
+            << t1 << t2 << expr->getSourceRange();
+        return true;
+    }
+
+private:
+    QualType getOperandType(CXXTypeidExpr const* expr)
+    {
+        return expr->isTypeOperand() ? expr->getTypeOperand(compiler.getASTContext())
+                                     : expr->getExprOperand()->getType();
+    }
+};
+
+static loplugin::Plugin::Registration<TypeidComparison> typeidcomparison("typeidcomparison");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unicodetochar.cxx b/compilerplugins/clang/unicodetochar.cxx
index 3599d3081a9f..e404211ffed1 100644
--- a/compilerplugins/clang/unicodetochar.cxx
+++ b/compilerplugins/clang/unicodetochar.cxx
@@ -12,6 +12,7 @@
 #include <stack>
 
 #include "check.hxx"
+#include "compat.hxx"
 #include "plugin.hxx"
 
 // In C++, find implicit conversions from char16_t (aka sal_Unicode) to char.
diff --git a/compilerplugins/clang/unnecessarycatchthrow.cxx b/compilerplugins/clang/unnecessarycatchthrow.cxx
index 903e903823ab..0a8265b170d6 100644
--- a/compilerplugins/clang/unnecessarycatchthrow.cxx
+++ b/compilerplugins/clang/unnecessarycatchthrow.cxx
@@ -16,7 +16,6 @@
 #include <set>
 
 #include <clang/AST/CXXInheritance.h>
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -77,7 +76,7 @@ bool UnnecessaryCatchThrow::VisitCXXTryStmt(CXXTryStmt const * tryStmt)
     }
 
     report( DiagnosticsEngine::Warning, "unnecessary catch and throw",
-            compat::getBeginLoc(catchStmt))
+            catchStmt->getBeginLoc())
             << catchStmt->getSourceRange();
     return true;
 }
diff --git a/compilerplugins/clang/unnecessarygetstr.cxx b/compilerplugins/clang/unnecessarygetstr.cxx
new file mode 100644
index 000000000000..589ab405f786
--- /dev/null
+++ b/compilerplugins/clang/unnecessarygetstr.cxx
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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 LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <stack>
+#include <unordered_set>
+
+#include "check.hxx"
+#include "plugin.hxx"
+#include "config_clang.h"
+
+// Find matches of
+//
+//   foo(s.getStr())
+//
+// (for the rtl string classes) that can be written as just
+//
+//   foo(s)
+//
+// and warn about them, which prevents constructing unnecessary temporaries.
+
+namespace
+{
+class UnnecessaryGetStr final : public loplugin::FilteringPlugin<UnnecessaryGetStr>
+{
+public:
+    explicit UnnecessaryGetStr(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool VisitCallExpr(const CallExpr* callExpr)
+    {
+        if (ignoreLocation(callExpr))
+            return true;
+        const FunctionDecl* func = callExpr->getDirectCallee();
+        if (!func)
+            return true;
+        if (loplugin::DeclCheck(func)
+                .Function("createFromAscii")
+                .Class("OUString")
+                .Namespace("rtl")
+                .GlobalNamespace())
+        {
+            checkForGetStr(callExpr->getArg(0), "OUString::createFromAscii",
+                           /*isOStringConstructor*/ false);
+        }
+        return true;
+    }
+
+    bool VisitCXXConstructExpr(const CXXConstructExpr* constructExpr)
+    {
+        if (ignoreLocation(constructExpr))
+            return true;
+        auto tc = loplugin::TypeCheck(constructExpr->getType());
+        if (tc.ClassOrStruct("basic_stringstream").StdNamespace())
+        {
+            // ignore the implicit-conversion nodes that are added here
+            if (constructExpr->getNumArgs() > 0)
+                nodesToIgnore.insert(constructExpr->getArg(0)->IgnoreImplicit());
+        }
+        else if (tc.ClassOrStruct("basic_string").StdNamespace())
+        {
+            if (constructExpr->getNumArgs() == 1 || constructExpr->getNumArgs() == 2)
+            {
+                if (nodesToIgnore.find(constructExpr) == nodesToIgnore.end())
+                    checkForGetStr(constructExpr->getArg(0), "string constructor",
+                                   /*isOStringConstructor*/ false);
+            }
+        }
+        else if (tc.ClassOrStruct("basic_string_view").StdNamespace())
+        {
+            if (constructExpr->getNumArgs() == 1)
+                checkForGetStr(constructExpr->getArg(0), "string_view constructor",
+                               /*isOStringConstructor*/ false);
+        }
+        else if (tc.Class("OString").Namespace("rtl").GlobalNamespace())
+        {
+            if (constructExpr->getNumArgs() == 1 || constructExpr->getNumArgs() == 2)
+                checkForGetStr(constructExpr->getArg(0), "OString constructor",
+                               /*isOStringConstructor*/ true);
+        }
+        else if (tc.Class("OUString").Namespace("rtl").GlobalNamespace())
+        {
+            if (constructExpr->getNumArgs() == 2)
+                checkForGetStr(constructExpr->getArg(0), "OUString constructor",
+                               /*isOStringConstructor*/ false);
+        }
+        return true;
+    }
+
+    bool preRun() override
+    {
+        if (!compiler.getLangOpts().CPlusPlus)
+            return false;
+        std::string fn(handler.getMainFileName());
+        loplugin::normalizeDotDotInFilePath(fn);
+        if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
+            return false;
+        return true;
+    }
+
+private:
+    void checkForGetStr(const Expr* arg, const char* msg, bool isOStringConstructor)
+    {
+        auto e = dyn_cast<CXXMemberCallExpr>(arg->IgnoreImplicit());
+        if (!e)
+            return;
+        auto const t = e->getObjectType();
+        auto const tc2 = loplugin::TypeCheck(t);
+        if (tc2.Class("OString").Namespace("rtl").GlobalNamespace()
+            || tc2.Class("OUString").Namespace("rtl").GlobalNamespace()
+            || tc2.Class("OStringBuffer").Namespace("rtl").GlobalNamespace()
+            || tc2.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
+            || tc2.ClassOrStruct("StringNumber").Namespace("rtl").GlobalNamespace())
+        {
+            if (loplugin::DeclCheck(e->getMethodDecl()).Function("getStr"))
+            {
+                StringRef fileName = getFilenameOfLocation(
+                    compiler.getSourceManager().getSpellingLoc(e->getBeginLoc()));
+                if (!loplugin::hasPathnamePrefix(fileName, SRCDIR "/include/rtl/"))
+                    report(DiagnosticsEngine::Warning,
+                           "unnecessary call to 'getStr' when passing to %0", e->getExprLoc())
+                        << msg << e->getSourceRange();
+            }
+        }
+        // we do need to use c_str() when passing to an OString
+        else if (!isOStringConstructor && tc2.Class("basic_string").StdNamespace())
+        {
+            if (loplugin::DeclCheck(e->getMethodDecl()).Function("c_str"))
+                report(DiagnosticsEngine::Warning, "unnecessary call to 'c_str' when passing to %0",
+                       e->getExprLoc())
+                    << msg << e->getSourceRange();
+        }
+    }
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    std::unordered_set<const Expr*> nodesToIgnore;
+};
+
+loplugin::Plugin::Registration<UnnecessaryGetStr> unnecessarygetstr("unnecessarygetstr");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unnecessarylocking.cxx b/compilerplugins/clang/unnecessarylocking.cxx
new file mode 100644
index 000000000000..40b15518571d
--- /dev/null
+++ b/compilerplugins/clang/unnecessarylocking.cxx
@@ -0,0 +1,322 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include <unordered_set>
+
+#include <clang/AST/CXXInheritance.h>
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "check.hxx"
+
+/**
+Look for methods that are taking a lock at the top of the method, but then not
+touching any object-local state. In which case the method might not need locking.
+
+TODO
+
+(*) check if the data being returned is never modified, in which case locking is not necessary
+
+*/
+
+namespace
+{
+class UnnecessaryLocking : public loplugin::FilteringPlugin<UnnecessaryLocking>
+{
+public:
+    explicit UnnecessaryLocking(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    virtual bool preRun() override
+    {
+        //        StringRef fn(handler.getMainFileName());
+        //        if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/unoidl/source/sourceprovider-parser.cxx"))
+        //            return false;
+        return true;
+    }
+    virtual void run() override
+    {
+        if (preRun())
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+    bool VisitCompoundStmt(const CompoundStmt*);
+    bool VisitCXXThisExpr(const CXXThisExpr*);
+    bool VisitCallExpr(const CallExpr*);
+
+private:
+    bool isSolarMutexLockGuardStmt(const Stmt*);
+    const CXXThisExpr* isOtherMutexLockGuardStmt(const Stmt*);
+    std::vector<bool> m_TouchesThis;
+    // so we ignore the CxxThisEpxr that references the maMutex in the guard expression
+    std::vector<const CXXThisExpr*> m_IgnoreThis;
+};
+
+bool UnnecessaryLocking::VisitCompoundStmt(const CompoundStmt* compoundStmt)
+{
+    if (ignoreLocation(compoundStmt))
+        return true;
+    if (compoundStmt->size() < 1)
+        return true;
+
+    const Stmt* firstStmt = *compoundStmt->body_begin();
+    bool solarMutex = isSolarMutexLockGuardStmt(firstStmt);
+    const CXXThisExpr* ignoreThisStmt = nullptr;
+    if (!solarMutex)
+        ignoreThisStmt = isOtherMutexLockGuardStmt(firstStmt);
+    if (!solarMutex && ignoreThisStmt == nullptr)
+        return true;
+
+    m_TouchesThis.push_back(false);
+    m_IgnoreThis.push_back(ignoreThisStmt);
+
+    for (const Stmt* stmt : compoundStmt->body())
+        FilteringPlugin::TraverseStmt(const_cast<Stmt*>(stmt));
+
+    if (!m_TouchesThis.back())
+    {
+        StringRef fn = getFilenameOfLocation(
+            compiler.getSourceManager().getSpellingLoc(compoundStmt->getBeginLoc()));
+        if (
+            // template magic
+            !loplugin::isSamePathname(fn, SRCDIR "/include/comphelper/unique_disposing_ptr.hxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/inc/unobaseclass.hxx")
+
+            // false+
+            && !loplugin::isSamePathname(fn, SRCDIR "/cppuhelper/source/component_context.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/toolkit/source/controls/tree/treecontrol.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/toolkit/source/helper/listenermultiplexer.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/include/toolkit/helper/macros.hxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/chart2/source/controller/main/CommandDispatch.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/chart2/source/controller/main/ChartView.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/chart2/source/controller/main/SelectionHelper.cxx")
+            && !loplugin::isSamePathname(
+                   fn, SRCDIR "/chart2/source/controller/accessibility/AccessibleChartView.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/desktop/source/offacc/acceptor.cxx")
+            && !loplugin::isSamePathname(
+                   fn, SRCDIR "/desktop/source/deployment/registry/component/dp_component.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/desktop/source/deployment/gui/dp_gui_dialog2.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/desktop/source/lib/init.cxx")
+            && !loplugin::isSamePathname(
+                   fn, SRCDIR "/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx")
+
+            // needs to lock around access to methods in vcl
+            && !loplugin::isSamePathname(fn, SRCDIR "/basctl/source/basicide/unomodel.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/cui/source/dialogs/AdditionsDialog.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/cui/source/dialogs/cuigaldlg.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/browser/unodatbr.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/uno/dbinteraction.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/dlg/DbAdminImpl.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/misc/UITools.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/desktop/source/lib/lokclipboard.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/editeng/source/misc/unolingu.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/framework/source/uielement/popuptoolbarcontroller.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/framework/source/uielement/newmenucontroller.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/framework/source/uielement/menubarwrapper.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/framework/source/services/desktop.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/framework/source/layoutmanager/layoutmanager.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/framework/source/layoutmanager/toolbarlayoutmanager.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/framework/source/fwe/helper/actiontriggerhelper.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/unodoc.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/filtuno.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/funcuno.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/vba/vbaapplication.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/unoidl/unodoc.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/unoidl/unomodule.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/remotecontrol/Receiver.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/sd/source/ui/slidesorter/controller/SlsClipboard.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/appl/fwkhelper.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/appl/appinit.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/appl/shutdownicon.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/dialog/dockwin.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/statbar/stbitem.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/toolbox/tbxitem.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/svtools/source/java/javainteractionhandler.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/svx/source/accessibility/ShapeTypeHandler.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/svx/source/tbxctrls/tbunosearchcontrollers.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/svx/source/form/fmscriptingenv.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/svx/source/fmcomp/fmgridif.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/toolkit/source/awt/vclxspinbutton.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/toolkit/source/awt/vclxtoolkit.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/toolkit/source/controls/tree/treecontrolpeer.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/image/ucpimage.cxx")
+            && !loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/")
+
+            // not sure
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/dbaccess/source/ui/browser/AsynchronousLink.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/framework/source/services/autorecovery.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/dialog/filedlghelper.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sfx2/source/appl/appdispatchprovider.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/tdoc/tdoc_storage.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/core/data/poolhelp.cxx")
+
+            // touching shared global data
+            && !loplugin::isSamePathname(fn, SRCDIR
+                                         "/framework/source/fwi/classes/protocolhandlercache.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/basic/source/basmgr/basicmanagerrepository.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/basic/source/classes/sb.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/docuno.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/afmtuno.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/unoobj/appluno.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sc/source/ui/vba/vbaapplication.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/access/accdoc.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/access/acccontext.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/sw/source/core/bastyp/proofreadingiterator.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unoftn.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unolinebreak.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unoobj.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unorefmk.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unotbl.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unocontentcontrol.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unobkm.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unocoll.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/unocore/unostyle.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/filter/xml/xmltexti.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/uno/dlelstnr.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/uno/unoatxt.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/uno/unodoc.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/uno/unomodule.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/uno/SwXFilterOptions.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/uibase/shells/translatehelper.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/sw/source/ui/vba/vbaapplication.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/unoxml/source/dom/documentbuilder.cxx")
+            && !loplugin::isSamePathname(
+                   fn, SRCDIR "/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx")
+            && !loplugin::isSamePathname(fn, SRCDIR "/starmath/source/accessibility.cxx")
+            && !loplugin::isSamePathname(fn,
+                                         SRCDIR "/starmath/source/AccessibleSmElementsControl.cxx"))
+        {
+            report(DiagnosticsEngine::Warning, "unnecessary locking", compoundStmt->getBeginLoc())
+                << compoundStmt->getSourceRange();
+        }
+    }
+
+    m_TouchesThis.pop_back();
+    m_IgnoreThis.pop_back();
+
+    return true;
+}
+
+bool UnnecessaryLocking::isSolarMutexLockGuardStmt(const Stmt* stmt)
+{
+    auto declStmt = dyn_cast<DeclStmt>(stmt);
+    if (!declStmt)
+        return false;
+    if (!declStmt->isSingleDecl())
+        return false;
+    auto varDecl = dyn_cast<VarDecl>(declStmt->getSingleDecl());
+    if (!varDecl)
+        return false;
+    auto tc = loplugin::TypeCheck(varDecl->getType());
+    if (!tc.Class("SolarMutexGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexClearableGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexResettableGuard").GlobalNamespace()
+        && !tc.Class("SolarMutexTryAndBuyGuard").GlobalNamespace())
+        return false;
+    return true;
+}
+
+const CXXThisExpr* UnnecessaryLocking::isOtherMutexLockGuardStmt(const Stmt* stmt)
+{
+    auto declStmt = dyn_cast<DeclStmt>(stmt);
+    if (!declStmt)
+        return nullptr;
+    if (!declStmt->isSingleDecl())
+        return nullptr;
+    auto varDecl = dyn_cast<VarDecl>(declStmt->getSingleDecl());
+    if (!varDecl)
+        return nullptr;
+    auto tc = loplugin::TypeCheck(varDecl->getType());
+    if (!tc.Class("unique_lock").StdNamespace() && !tc.Class("scoped_lock").StdNamespace()
+        && !tc.Class("Guard") && !tc.Class("ClearableGuard") && !tc.Class("ResettableGuard"))
+        return nullptr;
+    auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(varDecl->getInit());
+    if (!cxxConstructExpr || cxxConstructExpr->getNumArgs() < 1)
+        return nullptr;
+    auto arg0 = cxxConstructExpr->getArg(0);
+    if (auto memberExpr = dyn_cast<MemberExpr>(arg0))
+    {
+        const CXXThisExpr* thisStmt
+            = dyn_cast<CXXThisExpr>(memberExpr->getBase()->IgnoreImplicit());
+        return thisStmt;
+    }
+    else if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(arg0))
+    {
+        return dyn_cast_or_null<CXXThisExpr>(
+            memberCallExpr->getImplicitObjectArgument()->IgnoreImplicit());
+    }
+    return nullptr;
+}
+
+bool UnnecessaryLocking::VisitCXXThisExpr(const CXXThisExpr* cxxThisExpr)
+{
+    if (ignoreLocation(cxxThisExpr))
+        return true;
+    // just in case
+    if (m_TouchesThis.empty())
+        return true;
+    // already found something
+    if (m_TouchesThis.back())
+        return true;
+    if (m_IgnoreThis.back() && m_IgnoreThis.back() == cxxThisExpr)
+        return true;
+    m_TouchesThis.back() = true;
+    return true;
+}
+
+bool UnnecessaryLocking::VisitCallExpr(const CallExpr* callExpr)
+{
+    if (ignoreLocation(callExpr))
+        return true;
+    // just in case
+    if (m_TouchesThis.empty())
+        return true;
+    // already found something
+    if (m_TouchesThis.back())
+        return true;
+    const CXXMethodDecl* callee = dyn_cast_or_null<CXXMethodDecl>(callExpr->getDirectCallee());
+    if (!callee)
+        return true;
+    auto dc = loplugin::DeclCheck(callee->getParent());
+    if (dc.Class("VCLUnoHelper") || dc.Class("Application"))
+        m_TouchesThis.back() = true;
+    return true;
+}
+
+/** off by default because each warning needs to be carefully inspected */
+loplugin::Plugin::Registration<UnnecessaryLocking> unnecessarylocking("unnecessarylocking", false);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx
index 10ab158b7d8d..d3c67b492a19 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -16,6 +16,7 @@
 #include <set>
 
 #include <clang/AST/CXXInheritance.h>
+#include "config_clang.h"
 #include "plugin.hxx"
 #include "check.hxx"
 
@@ -95,6 +96,8 @@ public:
         // HAVE_ODBC_ADMINISTRATION
         if (loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/dlg/dsselect.cxx"))
             return false;
+        if (loplugin::isSamePathname(fn, SRCDIR "/unotools/source/streaming/streamhelper.cxx"))
+            return false;
         return true;
     }
 
@@ -122,7 +125,7 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
     }
 
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(methodDecl)));
+        compiler.getSourceManager().getSpellingLoc(methodDecl->getBeginLoc()));
 
     if (isa<CXXDestructorDecl>(methodDecl)
        && !isInUnoIncludeFile(methodDecl))
@@ -191,14 +194,11 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
                 return true;
             }
         }
-        // corner case
-        if (methodDecl->isInlined()
-            && compiler.getSourceManager().isInMainFile(methodDecl->getLocation())
-            && !compiler.getSourceManager().isInMainFile(methodDecl->getCanonicalDecl()->getLocation()))
-        {
-            return true;
-        }
-        if (!methodDecl->isExplicitlyDefaulted()) {
+        if (methodDecl->isExplicitlyDefaulted()) {
+            if (methodDecl->getPreviousDecl() != nullptr) {
+                return true;
+            }
+        } else {
             if (!methodDecl->doesThisDeclarationHaveABody()
                 || methodDecl->isLateTemplateParsed())
             {
@@ -246,11 +246,6 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
         return true;
     }
 
-    auto fdc = loplugin::DeclCheck(methodDecl);
-    // Has code only in #ifdef.
-    if (fdc.Function("GetBackendCapabilities").Class("X11SalInstance").GlobalNamespace())
-        return true;
-
     // If overriding more than one base member function, or one base member
     // function that is available in multiple (non-virtual) base class
     // instances, then this is a disambiguating override:
@@ -328,6 +323,9 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
             }
         */
         auto bodyIt = compoundStmt->body_begin();
+        if (bodyIt == compoundStmt->body_end()) {
+            return true;
+        }
         auto declStmt = dyn_cast<DeclStmt>(*bodyIt);
         if (!declStmt || !declStmt->isSingleDecl())
             return true;
@@ -374,7 +372,7 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
 
     if (pOther) {
         StringRef aFileName = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(pOther)));
+            compiler.getSourceManager().getSpellingLoc(pOther->getBeginLoc()));
         // SFX_DECL_CHILDWINDOW_WITHID macro
         if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/childwin.hxx"))
             return true;
diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx
index e93dfa64b5ec..d24986f0b669 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -20,7 +20,6 @@
 
 #include "config_clang.h"
 
-#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -44,7 +43,7 @@ Expr const * ignoreAllImplicit(Expr const * expr) {
             }
         }
         else if (auto const e = dyn_cast<MaterializeTemporaryExpr>(expr)) {
-            expr = compat::getSubExpr(e);
+            expr = e->getSubExpr();
         }
         else if (auto const e = dyn_cast<CXXBindTemporaryExpr>(expr)) {
             expr = e->getSubExpr();
@@ -57,17 +56,20 @@ Expr const * ignoreAllImplicit(Expr const * expr) {
                 expr = ce->getImplicitObjectArgument();
             }
         }
-#if CLANG_VERSION >= 80000
         else if (auto const e = dyn_cast<ConstantExpr>(expr)) {
             expr = e->getSubExpr();
         }
-#endif
         if (expr == oldExpr)
             return expr;
     }
     return expr;
 }
 
+bool isParenWorthyOpcode(BinaryOperatorKind op) {
+    return !(BinaryOperator::isMultiplicativeOp(op) || BinaryOperator::isAdditiveOp(op)
+             || BinaryOperator::isPtrMemOp(op));
+}
+
 class UnnecessaryParen:
     public loplugin::FilteringRewritePlugin<UnnecessaryParen>
 {
@@ -81,8 +83,6 @@ public:
         // fixing this, makes the source in the .y files look horrible
         if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/unoidl/source/sourceprovider-parser.cxx"))
             return false;
-        if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/idlc/source/parser.cxx"))
-            return false;
         return true;
     }
     virtual void run() override
@@ -143,6 +143,55 @@ private:
 
     bool removeParens(ParenExpr const * expr);
 
+    // Returns 0 if not a string literal at all:
+    unsigned getStringLiteralTokenCount(Expr const * expr, Expr const * parenExpr) {
+        if (auto const e = dyn_cast<clang::StringLiteral>(expr)) {
+            if (parenExpr == nullptr || !isPrecededBy_BAD_CAST(parenExpr)) {
+                return e->getNumConcatenated();
+            }
+        } else if (auto const e = dyn_cast<UserDefinedLiteral>(expr)) {
+            clang::StringLiteral const * lit = nullptr;
+            switch (e->getLiteralOperatorKind()) {
+            case UserDefinedLiteral::LOK_Template:
+                {
+                    auto const decl = e->getDirectCallee();
+                    assert(decl != nullptr);
+                    auto const args = decl->getTemplateSpecializationArgs();
+                    assert(args != nullptr);
+                    if (args->size() == 1 && (*args)[0].getKind() == TemplateArgument::Declaration)
+                    {
+                        if (auto const d
+                            = dyn_cast<TemplateParamObjectDecl>((*args)[0].getAsDecl()))
+                        {
+                            if (d->getValue().isStruct() || d->getValue().isUnion()) {
+                                //TODO: There appears to be no way currently to get at the original
+                                // clang::StringLiteral expression from which this struct/union
+                                // non-type template argument was constructed, so no way to tell
+                                // whether it was written as a single literal (=> in which case we
+                                // should warn about unnecessary parentheses) or as a concatenation
+                                // of multiple literals (=> in which case we should not warn).  So
+                                // be conservative and not warn at all (by pretending to have more
+                                // than one token):
+                                return 2;
+                            }
+                        }
+                    }
+                    break;
+                }
+            case UserDefinedLiteral::LOK_String:
+                assert(e->getNumArgs() == 2);
+                lit = dyn_cast<clang::StringLiteral>(e->getArg(0)->IgnoreImplicit());
+                break;
+            default:
+                break;
+            }
+            if (lit != nullptr) {
+                return lit->getNumConcatenated();
+            }
+        }
+        return 0;
+    }
+
     std::unordered_set<ParenExpr const *> handled_;
 };
 
@@ -170,7 +219,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
 {
     if (ignoreLocation(parenExpr))
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
     if (handled_.find(parenExpr) != handled_.end())
         return true;
@@ -179,11 +228,11 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
 
     if (auto subParenExpr = dyn_cast<ParenExpr>(subExpr))
     {
-        if (compat::getBeginLoc(subParenExpr).isMacroID())
+        if (subParenExpr->getBeginLoc().isMacroID())
             return true;
         report(
             DiagnosticsEngine::Warning, "parentheses around parentheses",
-            compat::getBeginLoc(parenExpr))
+            parenExpr->getBeginLoc())
             << parenExpr->getSourceRange();
         handled_.insert(subParenExpr);
     }
@@ -196,7 +245,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
         if (!isPrecededBy_BAD_CAST(parenExpr)) {
             report(
                 DiagnosticsEngine::Warning, "unnecessary parentheses around identifier",
-                compat::getBeginLoc(parenExpr))
+                parenExpr->getBeginLoc())
                 << parenExpr->getSourceRange();
             handled_.insert(parenExpr);
         }
@@ -205,7 +254,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
                || isa<CXXBoolLiteralExpr>(subExpr) || isa<CXXNullPtrLiteralExpr>(subExpr)
                || isa<ObjCBoolLiteralExpr>(subExpr))
     {
-        auto const loc = compat::getBeginLoc(subExpr);
+        auto const loc = subExpr->getBeginLoc();
         if (loc.isMacroID() && compiler.getSourceManager().isAtStartOfImmediateMacroExpansion(loc))
         {
             // just in case the macro could also expand to something that /would/ require
@@ -214,15 +263,15 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
         }
         report(
             DiagnosticsEngine::Warning, "unnecessary parentheses around literal",
-            compat::getBeginLoc(parenExpr))
+            parenExpr->getBeginLoc())
             << parenExpr->getSourceRange();
         handled_.insert(parenExpr);
-    } else if (auto const e = dyn_cast<clang::StringLiteral>(subExpr)) {
-        if (e->getNumConcatenated() == 1 && !isPrecededBy_BAD_CAST(parenExpr)) {
+    } else if (isa<clang::StringLiteral>(subExpr) || isa<UserDefinedLiteral>(subExpr)) {
+        if (getStringLiteralTokenCount(subExpr, parenExpr) == 1) {
             report(
                 DiagnosticsEngine::Warning,
                 "unnecessary parentheses around single-token string literal",
-                compat::getBeginLoc(parenExpr))
+                parenExpr->getBeginLoc())
                 << parenExpr->getSourceRange();
             handled_.insert(parenExpr);
         }
@@ -234,7 +283,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
                 report(
                     DiagnosticsEngine::Warning,
                     "unnecessary parentheses around signed numeric literal",
-                    compat::getBeginLoc(parenExpr))
+                    parenExpr->getBeginLoc())
                     << parenExpr->getSourceRange();
                 handled_.insert(parenExpr);
             }
@@ -243,7 +292,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
         if (!removeParens(parenExpr)) {
             report(
                 DiagnosticsEngine::Warning, "unnecessary parentheses around cast",
-                compat::getBeginLoc(parenExpr))
+                parenExpr->getBeginLoc())
                 << parenExpr->getSourceRange();
         }
         handled_.insert(parenExpr);
@@ -251,7 +300,7 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
         if (isa<CXXThisExpr>(ignoreAllImplicit(memberExpr->getBase()))) {
             report(
                 DiagnosticsEngine::Warning, "unnecessary parentheses around member expr",
-                compat::getBeginLoc(parenExpr))
+                parenExpr->getBeginLoc())
                 << parenExpr->getSourceRange();
             handled_.insert(parenExpr);
         }
@@ -262,8 +311,10 @@ bool UnnecessaryParen::VisitParenExpr(const ParenExpr* parenExpr)
 
 bool UnnecessaryParen::VisitIfStmt(const IfStmt* ifStmt)
 {
-    handleUnreachableCodeConditionParens(ifStmt->getCond());
-    VisitSomeStmt(ifStmt, ifStmt->getCond(), "if");
+    if (auto const cond = ifStmt->getCond()) {
+        handleUnreachableCodeConditionParens(cond);
+        VisitSomeStmt(ifStmt, cond, "if");
+    }
     return true;
 }
 
@@ -309,7 +360,7 @@ bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* returnStmt)
     auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(returnStmt->getRetValue()));
     if (!parenExpr)
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
     // assignments need extra parentheses or they generate a compiler warning
     auto binaryOp = dyn_cast<BinaryOperator>(parenExpr->getSubExpr());
@@ -318,11 +369,12 @@ bool UnnecessaryParen::VisitReturnStmt(const ReturnStmt* returnStmt)
 
     // only non-operator-calls for now
     auto subExpr = ignoreAllImplicit(parenExpr->getSubExpr());
-    if (isa<CallExpr>(subExpr) && !isa<CXXOperatorCallExpr>(subExpr))
+    if (isa<CallExpr>(subExpr) && !isa<CXXOperatorCallExpr>(subExpr)
+        && !isa<UserDefinedLiteral>(subExpr))
     {
         report(
             DiagnosticsEngine::Warning, "parentheses immediately inside return statement",
-            compat::getBeginLoc(parenExpr))
+            parenExpr->getBeginLoc())
             << parenExpr->getSourceRange();
         handled_.insert(parenExpr);
     }
@@ -339,7 +391,7 @@ void UnnecessaryParen::VisitSomeStmt(const Stmt * stmt, const Expr* cond, String
         if (handled_.find(parenExpr) != handled_.end()) {
             return;
         }
-        if (compat::getBeginLoc(parenExpr).isMacroID())
+        if (parenExpr->getBeginLoc().isMacroID())
             return;
         // assignments need extra parentheses or they generate a compiler warning
         auto binaryOp = dyn_cast<BinaryOperator>(parenExpr->getSubExpr());
@@ -352,7 +404,7 @@ void UnnecessaryParen::VisitSomeStmt(const Stmt * stmt, const Expr* cond, String
         }
         report(
             DiagnosticsEngine::Warning, "parentheses immediately inside %0 statement",
-            compat::getBeginLoc(parenExpr))
+            parenExpr->getBeginLoc())
             << stmtName
             << parenExpr->getSourceRange();
         handled_.insert(parenExpr);
@@ -363,21 +415,31 @@ bool UnnecessaryParen::VisitCallExpr(const CallExpr* callExpr)
 {
     if (ignoreLocation(callExpr))
         return true;
-    if (callExpr->getNumArgs() != 1 || isa<CXXOperatorCallExpr>(callExpr))
+    if (callExpr->getNumArgs() == 0 || isa<CXXOperatorCallExpr>(callExpr))
         return true;
 
+    // if we are calling a >1 arg method, are we using the defaults?
+    if (callExpr->getNumArgs() > 1)
+    {
+        if (!isa<CXXDefaultArgExpr>(callExpr->getArg(1)))
+            return true;
+    }
+
     auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(callExpr->getArg(0)));
     if (!parenExpr)
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
     // assignments need extra parentheses or they generate a compiler warning
     auto binaryOp = dyn_cast<BinaryOperator>(parenExpr->getSubExpr());
     if (binaryOp && binaryOp->getOpcode() == BO_Assign)
         return true;
+    if (getStringLiteralTokenCount(parenExpr->getSubExpr()->IgnoreImplicit(), nullptr) > 1) {
+        return true;
+    }
     report(
         DiagnosticsEngine::Warning, "parentheses immediately inside single-arg call",
-        compat::getBeginLoc(parenExpr))
+        parenExpr->getBeginLoc())
         << parenExpr->getSourceRange();
     handled_.insert(parenExpr);
     return true;
@@ -391,7 +453,7 @@ bool UnnecessaryParen::VisitCXXDeleteExpr(const CXXDeleteExpr* deleteExpr)
     auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(deleteExpr->getArgument()));
     if (!parenExpr)
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
     // assignments need extra parentheses or they generate a compiler warning
     auto binaryOp = dyn_cast<BinaryOperator>(parenExpr->getSubExpr());
@@ -399,7 +461,7 @@ bool UnnecessaryParen::VisitCXXDeleteExpr(const CXXDeleteExpr* deleteExpr)
         return true;
     report(
         DiagnosticsEngine::Warning, "parentheses immediately inside delete expr",
-        compat::getBeginLoc(parenExpr))
+        parenExpr->getBeginLoc())
         << parenExpr->getSourceRange();
     handled_.insert(parenExpr);
     return true;
@@ -425,14 +487,19 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE
     auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(callExpr->getArg(1)));
     if (!parenExpr)
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
     // Sometimes parentheses make the RHS of an assignment easier to read by
     // visually disambiguating the = from a call to ==
     auto sub = parenExpr->getSubExpr();
+    if (auto const e = dyn_cast<CXXRewrittenBinaryOperator>(sub)) {
+        if (isParenWorthyOpcode(e->getDecomposedForm().Opcode)) {
+            return true;
+        }
+    }
     if (auto subBinOp = dyn_cast<BinaryOperator>(sub))
     {
-        if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp()))
+        if (isParenWorthyOpcode(subBinOp->getOpcode()))
             return true;
     }
     if (auto subOperatorCall = dyn_cast<CXXOperatorCallExpr>(sub))
@@ -446,7 +513,7 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE
 
     report(
         DiagnosticsEngine::Warning, "parentheses immediately inside assignment",
-        compat::getBeginLoc(parenExpr))
+        parenExpr->getBeginLoc())
         << parenExpr->getSourceRange();
     handled_.insert(parenExpr);
     return true;
@@ -462,17 +529,15 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl)
     auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(varDecl->getInit()));
     if (!parenExpr)
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
 
     // Sometimes parentheses make the RHS of an assignment easier to read by
     // visually disambiguating the = from a call to ==
     auto sub = parenExpr->getSubExpr();
-#if CLANG_VERSION >= 100000
     if (auto const e = dyn_cast<CXXRewrittenBinaryOperator>(sub)) {
         sub = e->getDecomposedForm().InnerBinOp;
     }
-#endif
     if (auto subBinOp = dyn_cast<BinaryOperator>(sub))
     {
         if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp()))
@@ -495,7 +560,7 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl)
 
     report(
         DiagnosticsEngine::Warning, "parentheses immediately inside vardecl statement",
-        compat::getBeginLoc(parenExpr))
+        parenExpr->getBeginLoc())
         << parenExpr->getSourceRange();
     handled_.insert(parenExpr);
     return true;
@@ -511,7 +576,7 @@ bool UnnecessaryParen::VisitMemberExpr(const MemberExpr* memberExpr)
         return true;
     if (handled_.find(parenExpr) != handled_.end())
         return true;
-    if (compat::getBeginLoc(parenExpr).isMacroID())
+    if (parenExpr->getBeginLoc().isMacroID())
         return true;
 
     auto sub = parenExpr->getSubExpr();
@@ -529,7 +594,7 @@ bool UnnecessaryParen::VisitMemberExpr(const MemberExpr* memberExpr)
 
     report(
         DiagnosticsEngine::Warning, "unnecessary parentheses around member expr",
-        compat::getBeginLoc(parenExpr))
+        parenExpr->getBeginLoc())
         << parenExpr->getSourceRange();
     handled_.insert(parenExpr);
     return true;
@@ -542,7 +607,6 @@ bool UnnecessaryParen::VisitMemberExpr(const MemberExpr* memberExpr)
 // in Clang's lib/Analysis/ReachableCode.cpp looks for, descending into certain unary and binary
 // operators):
 void UnnecessaryParen::handleUnreachableCodeConditionParens(Expr const * expr) {
-    // Cf. :
     auto const e = ignoreAllImplicit(expr);
     if (auto const e1 = dyn_cast<ParenExpr>(e)) {
         auto const sub = e1->getSubExpr();
@@ -564,12 +628,12 @@ void UnnecessaryParen::handleUnreachableCodeConditionParens(Expr const * expr) {
 }
 
 bool UnnecessaryParen::isPrecededBy_BAD_CAST(Expr const * expr) {
-    if (compat::getBeginLoc(expr).isMacroID()) {
+    if (expr->getBeginLoc().isMacroID()) {
         return false;
     }
     SourceManager& SM = compiler.getSourceManager();
-    const char *p1 = SM.getCharacterData( compat::getBeginLoc(expr).getLocWithOffset(-10) );
-    const char *p2 = SM.getCharacterData( compat::getBeginLoc(expr) );
+    const char *p1 = SM.getCharacterData( expr->getBeginLoc().getLocWithOffset(-10) );
+    const char *p2 = SM.getCharacterData( expr->getBeginLoc() );
     return std::string(p1, p2 - p1).find("BAD_CAST") != std::string::npos;
 }
 
@@ -598,8 +662,8 @@ bool UnnecessaryParen::removeParens(ParenExpr const * expr) {
     if (rewriter == nullptr) {
         return false;
     }
-    auto const firstBegin = compat::getBeginLoc(expr);
-    auto secondBegin = compat::getEndLoc(expr);
+    auto const firstBegin = expr->getBeginLoc();
+    auto secondBegin = expr->getEndLoc();
     if (firstBegin.isMacroID() || secondBegin.isMacroID()) {
         return false;
     }
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results
index ff6177df67f3..65b8bb57a09b 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -1,28 +1,28 @@
-basic/source/comp/codegen.cxx:482
+basic/source/comp/codegen.cxx:478
     void (anonymous namespace)::OffSetAccumulator::start(const unsigned char *,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:107
+canvas/inc/base/bufferedgraphicdevicebase.hxx:105
     void canvas::BufferedGraphicDeviceBase::destroyBuffers()
 canvas/inc/base/graphicdevicebase.hxx:305
     void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,)
 canvas/inc/base/graphicdevicebase.hxx:318
     void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
-include/basegfx/utils/unopolypolygon.hxx:94
+include/basegfx/utils/unopolypolygon.hxx:93
     void basegfx::unotools::UnoPolyPolygon::modifying()const
-sc/source/core/opencl/formulagroupcl.cxx:1069
-    void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
-slideshow/source/engine/animationfactory.cxx:616
+sc/source/core/opencl/opbase.hxx:447
+    void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class sc::opencl::outputstream &,)
+slideshow/source/engine/animationfactory.cxx:617
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:2002
+    void std::messages::do_close(int,)const
+ux-gnu/../../../include/c++/13/streambuf:583
+    void std::basic_streambuf::imbue(const class std::locale &,)
+vcl/inc/font/LogicalFontInstance.hxx:123
+    void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
 vcl/inc/salframe.hxx:145
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salinst.hxx:200
+vcl/inc/salinst.hxx:203
     void SalInstance::releaseMainThread()
+vcl/inc/salinst.hxx:212
+    void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
 vcl/inc/salobj.hxx:49
     void SalObject::Enable(_Bool,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:66
-    void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:67
-    void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:68
-    void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:69
-    void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.cxx b/compilerplugins/clang/unnecessaryvirtual.cxx
index 7556217f29ce..b376f97c9b07 100644
--- a/compilerplugins/clang/unnecessaryvirtual.cxx
+++ b/compilerplugins/clang/unnecessaryvirtual.cxx
@@ -12,6 +12,8 @@
 #include <iostream>
 #include <set>
 #include <unordered_set>
+#include "config_clang.h"
+#include "compat.hxx"
 #include "plugin.hxx"
 #include <fstream>
 
@@ -24,9 +26,9 @@ that no longer has a purpose.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unnecessaryvirtual' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='unnecessaryvirtual' check
   $ ./compilerplugins/clang/unnecessaryvirtual.py
-  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done
+  $ for dir in *; do make FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
 to get it to work :-)
@@ -61,6 +63,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -107,9 +111,6 @@ std::string niceName(const CXXMethodDecl* cxxMethodDecl)
 
 bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
 {
-    if (ignoreLocation(methodDecl)) {
-        return true;
-    }
     if (!methodDecl->isVirtual() || methodDecl->isDeleted()) {
         return true;
     }
@@ -131,6 +132,8 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
         return true;
 
     methodDecl = methodDecl->getCanonicalDecl();
+    if (!methodDecl)
+        return true;
     std::string aNiceName = niceName(methodDecl);
 
     // for destructors, we need to check if any of the superclass' destructors are virtual
@@ -146,8 +149,11 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
             if (baseSpecifier->getType()->isRecordType())
             {
                 const CXXRecordDecl* superclassCXXRecordDecl = baseSpecifier->getType()->getAsCXXRecordDecl();
-                std::string aOverriddenNiceName = niceName(superclassCXXRecordDecl->getDestructor());
-                overridingSet.insert(aOverriddenNiceName);
+                if (superclassCXXRecordDecl->getDestructor())
+                {
+                    std::string aOverriddenNiceName = niceName(superclassCXXRecordDecl->getDestructor());
+                    overridingSet.insert(aOverriddenNiceName);
+                }
             }
         }
         return true;
@@ -161,7 +167,8 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
        {
            const CXXMethodDecl *overriddenMethod = *iter;
            // we only care about the first level override to establish that a virtual qualifier was useful.
-           if (overriddenMethod->isPure() || overriddenMethod->size_overridden_methods() == 0)
+           if (compat::isPureVirtual(overriddenMethod)
+               || overriddenMethod->size_overridden_methods() == 0)
            {
                std::string aOverriddenNiceName = niceName(overriddenMethod);
                overridingSet.insert(aOverriddenNiceName);
@@ -173,6 +180,8 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
 
 void UnnecessaryVirtual::MarkRootOverridesNonEmpty( const CXXMethodDecl* methodDecl )
 {
+    if (!methodDecl)
+        return;
     if (methodDecl->size_overridden_methods() == 0) {
         nonEmptySet.insert(niceName(methodDecl));
         return;
diff --git a/compilerplugins/clang/unnecessaryvirtual.py b/compilerplugins/clang/unnecessaryvirtual.py
index 01a32bfc3df1..12d8b00af470 100755
--- a/compilerplugins/clang/unnecessaryvirtual.py
+++ b/compilerplugins/clang/unnecessaryvirtual.py
@@ -2,7 +2,6 @@
 
 import io
 import re
-import sys
 
 definitionSet = set()
 definitionToSourceLocationMap = dict()
@@ -54,6 +53,8 @@ for clazz in (definitionSet - overridingSet):
 
     # ignore external code
     if loc.startswith("external/"): continue
+    if loc.startswith("workdir/"): continue
+    if loc.startswith("64-linux-gnu/"): continue
     # there is a bunch of Windows specific code that we don't see
     if loc.startswith("include/canvas/"): continue
     # not sure what the problem is here
@@ -73,6 +74,8 @@ for clazz in (definitionSet - nonEmptySet):
 
     # ignore external code
     if loc.startswith("external/"): continue
+    if loc.startswith("workdir/"): continue
+    if loc.startswith("64-linux-gnu/"): continue
 
     deadSet.add( (clazz,loc) )
 
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results
index 1d3821d7c2af..3ddcc5fe93be 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -1,22 +1,24 @@
-basic/source/comp/codegen.cxx:482
+accessibility/inc/standard/vclxaccessiblemenuitem.hxx:44
+    _Bool VCLXAccessibleMenuItem::IsCheckable()
+basic/source/comp/codegen.cxx:478
     void (anonymous namespace)::OffSetAccumulator::start(const unsigned char *,)
-basic/source/comp/codegen.cxx:483
+basic/source/comp/codegen.cxx:479
     void (anonymous namespace)::OffSetAccumulator::processOpCode0(enum SbiOpcode,)
-basic/source/comp/codegen.cxx:484
+basic/source/comp/codegen.cxx:480
     void (anonymous namespace)::OffSetAccumulator::processOpCode1(enum SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:485
+basic/source/comp/codegen.cxx:481
     void (anonymous namespace)::OffSetAccumulator::processOpCode2(enum SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:494
+basic/source/comp/codegen.cxx:490
     _Bool (anonymous namespace)::OffSetAccumulator::processParams()
-basic/source/comp/codegen.cxx:505
+basic/source/comp/codegen.cxx:501
     void (anonymous namespace)::BufferTransformer::start(const unsigned char *,)
-basic/source/comp/codegen.cxx:506
+basic/source/comp/codegen.cxx:502
     void (anonymous namespace)::BufferTransformer::processOpCode0(enum SbiOpcode,)
-basic/source/comp/codegen.cxx:510
+basic/source/comp/codegen.cxx:506
     void (anonymous namespace)::BufferTransformer::processOpCode1(enum SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:535
+basic/source/comp/codegen.cxx:531
     void (anonymous namespace)::BufferTransformer::processOpCode2(enum SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:544
+basic/source/comp/codegen.cxx:540
     _Bool (anonymous namespace)::BufferTransformer::processParams()
 canvas/inc/base/basemutexhelper.hxx:58
     void canvas::BaseMutexHelper::disposing()
@@ -28,27 +30,27 @@ canvas/inc/base/bitmapcanvasbase.hxx:84
     class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmap> canvas::BitmapCanvasBase::getScaledBitmap(const struct com::sun::star::geometry::RealSize2D &,unsigned char,)
 canvas/inc/base/bitmapcanvasbase.hxx:105
     void canvas::BitmapCanvasBase2::copyRect(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmapCanvas> &,const struct com::sun::star::geometry::RealRectangle2D &,const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,const struct com::sun::star::geometry::RealRectangle2D &,const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:94
+canvas/inc/base/bufferedgraphicdevicebase.hxx:92
     class com::sun::star::uno::Reference<class com::sun::star::rendering::XBufferController> canvas::BufferedGraphicDeviceBase::getBufferController()
-canvas/inc/base/bufferedgraphicdevicebase.hxx:100
+canvas/inc/base/bufferedgraphicdevicebase.hxx:98
     int canvas::BufferedGraphicDeviceBase::createBuffers(int,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:107
+canvas/inc/base/bufferedgraphicdevicebase.hxx:105
     void canvas::BufferedGraphicDeviceBase::destroyBuffers()
-canvas/inc/base/bufferedgraphicdevicebase.hxx:111
+canvas/inc/base/bufferedgraphicdevicebase.hxx:109
     unsigned char canvas::BufferedGraphicDeviceBase::showBuffer(unsigned char,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:118
+canvas/inc/base/bufferedgraphicdevicebase.hxx:116
     unsigned char canvas::BufferedGraphicDeviceBase::switchBuffer(unsigned char,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:162
+canvas/inc/base/bufferedgraphicdevicebase.hxx:160
     void canvas::BufferedGraphicDeviceBase::disposeThis()
-canvas/inc/base/bufferedgraphicdevicebase.hxx:209
+canvas/inc/base/bufferedgraphicdevicebase.hxx:207
     void canvas::BufferedGraphicDeviceBase::disposeEventSource(const struct com::sun::star::lang::EventObject &,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:219
+canvas/inc/base/bufferedgraphicdevicebase.hxx:217
     void canvas::BufferedGraphicDeviceBase::windowResized(const struct com::sun::star::awt::WindowEvent &,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:224
+canvas/inc/base/bufferedgraphicdevicebase.hxx:222
     void canvas::BufferedGraphicDeviceBase::windowMoved(const struct com::sun::star::awt::WindowEvent &,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:229
+canvas/inc/base/bufferedgraphicdevicebase.hxx:227
     void canvas::BufferedGraphicDeviceBase::windowShown(const struct com::sun::star::lang::EventObject &,)
-canvas/inc/base/bufferedgraphicdevicebase.hxx:236
+canvas/inc/base/bufferedgraphicdevicebase.hxx:234
     void canvas::BufferedGraphicDeviceBase::windowHidden(const struct com::sun::star::lang::EventObject &,)
 canvas/inc/base/canvasbase.hxx:123
     void canvas::CanvasBase::disposeThis()
@@ -208,55 +210,57 @@ canvas/inc/base/spritecanvasbase.hxx:174
     void canvas::SpriteCanvasBase::updateSprite(const class rtl::Reference<class canvas::Sprite> &,const class basegfx::B2DPoint &,const class basegfx::B2DRange &,)
 canvas/inc/rendering/icolorbuffer.hxx:43
     void canvas::IColorBuffer::~IColorBuffer()
-canvas/inc/rendering/irendermodule.hxx:59
+canvas/inc/rendering/irendermodule.hxx:60
     void canvas::IRenderModule::~IRenderModule()
 canvas/inc/rendering/isurface.hxx:34
     void canvas::ISurface::~ISurface()
-chart2/source/inc/ModifyListenerCallBack.hxx:41
-    void chart::ModifyListenerCallBack::~ModifyListenerCallBack()
-chart2/source/inc/WeakListenerAdapter.hxx:56
+chart2/source/inc/WeakListenerAdapter.hxx:52
     void chart::WeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,)
+codemaker/source/cppumaker/cpputype.cxx:192
+    void (anonymous namespace)::CppuType::dumpEmbindCppFile(class FileStream &,)
 extensions/source/dbpilots/unoautopilot.hxx:81
     class cppu::IPropertyArrayHelper * dbp::OUnoAutoPilot::createArrayHelper()const
-extensions/source/propctrlr/commoncontrol.hxx:130
+extensions/source/propctrlr/commoncontrol.hxx:129
     short pcr::CommonBehaviourControl::getControlType()
-extensions/source/propctrlr/commoncontrol.hxx:132
+extensions/source/propctrlr/commoncontrol.hxx:131
     class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlContext> pcr::CommonBehaviourControl::getControlContext()
-extensions/source/propctrlr/commoncontrol.hxx:134
+extensions/source/propctrlr/commoncontrol.hxx:133
     void pcr::CommonBehaviourControl::setControlContext(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlContext> &,)
-extensions/source/propctrlr/commoncontrol.hxx:136
+extensions/source/propctrlr/commoncontrol.hxx:135
     class com::sun::star::uno::Reference<class com::sun::star::awt::XWindow> pcr::CommonBehaviourControl::getControlWindow()
-extensions/source/propctrlr/commoncontrol.hxx:138
+extensions/source/propctrlr/commoncontrol.hxx:137
     unsigned char pcr::CommonBehaviourControl::isModified()
-extensions/source/propctrlr/commoncontrol.hxx:140
+extensions/source/propctrlr/commoncontrol.hxx:139
     void pcr::CommonBehaviourControl::notifyModifiedValue()
-extensions/source/propctrlr/commoncontrol.hxx:155
+extensions/source/propctrlr/commoncontrol.hxx:154
     void pcr::CommonBehaviourControl::disposing()
-forms/source/xforms/datatypes.hxx:233
+forms/source/xforms/datatypes.hxx:217
     class cppu::IPropertyArrayHelper * xforms::ODerivedDataType::createArrayHelper()const
-forms/source/xforms/datatypes.hxx:236
+forms/source/xforms/datatypes.hxx:220
     class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySetInfo> xforms::ODerivedDataType::getPropertySetInfo()
-forms/source/xforms/datatypes.hxx:237
+forms/source/xforms/datatypes.hxx:221
     class cppu::IPropertyArrayHelper & xforms::ODerivedDataType::getInfoHelper()
-forms/source/xforms/namedcollection.hxx:82
+forms/source/xforms/namedcollection.hxx:80
     class com::sun::star::uno::Type NamedCollection::getElementType()
-forms/source/xforms/namedcollection.hxx:87
+forms/source/xforms/namedcollection.hxx:85
     unsigned char NamedCollection::hasElements()
-forms/source/xforms/namedcollection.hxx:93
+forms/source/xforms/namedcollection.hxx:91
     class com::sun::star::uno::Any NamedCollection::getByName(const class rtl::OUString &,)
-forms/source/xforms/namedcollection.hxx:101
+forms/source/xforms/namedcollection.hxx:99
     class com::sun::star::uno::Sequence<class rtl::OUString> NamedCollection::getElementNames()
-forms/source/xforms/namedcollection.hxx:106
+forms/source/xforms/namedcollection.hxx:104
     unsigned char NamedCollection::hasByName(const class rtl::OUString &,)
-include/basegfx/utils/unopolypolygon.hxx:94
+include/basegfx/utils/unopolypolygon.hxx:93
     void basegfx::unotools::UnoPolyPolygon::modifying()const
 include/comphelper/interaction.hxx:53
     void comphelper::OInteraction::select()
 include/comphelper/proparrhlp.hxx:83
     class cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper()const
+include/comphelper/propshlp.hxx:172
+    class com::sun::star::uno::Any comphelper::OPropertySetHelper::getPropertyValueImpl(class std::unique_lock<class std::mutex> &,const class rtl::OUString &,)
 include/comphelper/solarmutex.hxx:59
     _Bool comphelper::SolarMutex::tryToAcquire()
-include/comphelper/unique_disposing_ptr.hxx:169
+include/comphelper/unique_disposing_ptr.hxx:170
     void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,)
 include/comphelper/weakeventlistener.hxx:120
     void comphelper::OWeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,)
@@ -272,23 +276,25 @@ include/svl/svdde.hxx:243
     _Bool DdeTopic::StartAdviseLoop()
 include/svl/svdde.hxx:300
     void DdeService::~DdeService()
+include/svx/svdundo.hxx:768
+    class std::unique_ptr<class SdrUndoAction> SdrUndoFactory::CreateUndoDiagramModelData(class SdrObject &,class std::shared_ptr<class svx::diagram::DiagramDataState> &,)
 include/vbahelper/vbacollectionimpl.hxx:289
     int ScVbaCollectionBase::getCount()
 include/vbahelper/vbacollectionimpl.hxx:294
     class com::sun::star::uno::Any ScVbaCollectionBase::Item(const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &,)
-include/vbahelper/vbacollectionimpl.hxx:323
+include/vbahelper/vbacollectionimpl.hxx:332
     unsigned char ScVbaCollectionBase::hasElements()
-include/vbahelper/vbahelperinterface.hxx:74
+include/vbahelper/vbahelperinterface.hxx:75
     int InheritedHelperInterfaceImpl::getCreator()
-include/vbahelper/vbahelperinterface.hxx:78
+include/vbahelper/vbahelperinterface.hxx:79
     class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> InheritedHelperInterfaceImpl::getParent()
-include/vbahelper/vbahelperinterface.hxx:80
+include/vbahelper/vbahelperinterface.hxx:81
     class com::sun::star::uno::Any InheritedHelperInterfaceImpl::Application()
-include/vbahelper/vbahelperinterface.hxx:88
-    class rtl::OUString InheritedHelperInterfaceImpl::getImplementationName()
 include/vbahelper/vbahelperinterface.hxx:89
+    class rtl::OUString InheritedHelperInterfaceImpl::getImplementationName()
+include/vbahelper/vbahelperinterface.hxx:90
     unsigned char InheritedHelperInterfaceImpl::supportsService(const class rtl::OUString &,)
-include/vbahelper/vbahelperinterface.hxx:99
+include/vbahelper/vbahelperinterface.hxx:100
     class com::sun::star::uno::Sequence<class rtl::OUString> InheritedHelperInterfaceImpl::getSupportedServiceNames()
 include/vbahelper/vbareturntypes.hxx:38
     void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,)
@@ -296,188 +302,300 @@ include/vbahelper/vbareturntypes.hxx:39
     type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue()
 include/vcl/customweld.hxx:45
     class rtl::OUString weld::CustomWidgetController::GetHelpText()const
-include/vcl/toolkit/dialog.hxx:98
-    void Dialog::set_content_area(class VclBox *,)
-include/vcl/weld.hxx:100
+include/vcl/weld.hxx:109
     void weld::Widget::set_visible(_Bool,)
-sc/source/core/opencl/formulagroupcl.cxx:1061
-    _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction()const
-sc/source/core/opencl/formulagroupcl.cxx:1069
-    void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
-sc/source/core/opencl/formulagroupcl.cxx:1352
-    void sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
-sc/source/core/opencl/formulagroupcl.cxx:1354
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const
-sc/source/core/opencl/formulagroupcl.cxx:1368
-    unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *,)
-sc/source/ui/vba/vbacondition.hxx:41
+sc/inc/patattr.hxx:126
+    _Bool ScPatternAttr::operator==(const class ScPatternAttr &,)const
+sc/source/core/opencl/opbase.hxx:446
+    _Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction()const
+sc/source/core/opencl/opbase.hxx:447
+    void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class sc::opencl::outputstream &,)
+sc/source/core/opencl/opbase.hxx:480
+    void sc::opencl::ParallelReductionVectorRef::GenSlidingWindowFunction(class sc::opencl::outputstream &,)
+sc/source/core/opencl/opbase.hxx:481
+    class std::basic_string<char> sc::opencl::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const
+sc/source/core/opencl/opbase.hxx:484
+    unsigned long sc::opencl::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *,)
+sc/source/ui/vba/vbacondition.hxx:40
     class rtl::OUString ScVbaCondition::Formula1()
-sc/source/ui/vba/vbacondition.hxx:42
+sc/source/ui/vba/vbacondition.hxx:41
     class rtl::OUString ScVbaCondition::Formula2()
-sc/source/ui/vba/vbacondition.hxx:44
+sc/source/ui/vba/vbacondition.hxx:43
     int ScVbaCondition::Operator(_Bool,)
-sc/source/ui/vba/vbaformat.hxx:74
+sc/source/ui/vba/vbaformat.hxx:73
     class com::sun::star::uno::Any ScVbaFormat::Borders(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:77
+sc/source/ui/vba/vbaformat.hxx:76
     class com::sun::star::uno::Reference<class ooo::vba::excel::XFont> ScVbaFormat::Font()
-sc/source/ui/vba/vbaformat.hxx:80
+sc/source/ui/vba/vbaformat.hxx:79
     class com::sun::star::uno::Reference<class ooo::vba::excel::XInterior> ScVbaFormat::Interior()
-sc/source/ui/vba/vbaformat.hxx:83
+sc/source/ui/vba/vbaformat.hxx:82
     void ScVbaFormat::setNumberFormat(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:86
+sc/source/ui/vba/vbaformat.hxx:85
     class com::sun::star::uno::Any ScVbaFormat::getNumberFormat()
-sc/source/ui/vba/vbaformat.hxx:89
+sc/source/ui/vba/vbaformat.hxx:88
     void ScVbaFormat::setNumberFormatLocal(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:92
+sc/source/ui/vba/vbaformat.hxx:91
     class com::sun::star::uno::Any ScVbaFormat::getNumberFormatLocal()
-sc/source/ui/vba/vbaformat.hxx:95
+sc/source/ui/vba/vbaformat.hxx:94
     void ScVbaFormat::setIndentLevel(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:98
+sc/source/ui/vba/vbaformat.hxx:97
     class com::sun::star::uno::Any ScVbaFormat::getIndentLevel()
-sc/source/ui/vba/vbaformat.hxx:101
+sc/source/ui/vba/vbaformat.hxx:100
     void ScVbaFormat::setHorizontalAlignment(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:104
+sc/source/ui/vba/vbaformat.hxx:103
     class com::sun::star::uno::Any ScVbaFormat::getHorizontalAlignment()
-sc/source/ui/vba/vbaformat.hxx:107
+sc/source/ui/vba/vbaformat.hxx:106
     void ScVbaFormat::setVerticalAlignment(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:110
+sc/source/ui/vba/vbaformat.hxx:109
     class com::sun::star::uno::Any ScVbaFormat::getVerticalAlignment()
-sc/source/ui/vba/vbaformat.hxx:113
+sc/source/ui/vba/vbaformat.hxx:112
     void ScVbaFormat::setOrientation(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:116
+sc/source/ui/vba/vbaformat.hxx:115
     class com::sun::star::uno::Any ScVbaFormat::getOrientation()
-sc/source/ui/vba/vbaformat.hxx:119
+sc/source/ui/vba/vbaformat.hxx:118
     void ScVbaFormat::setShrinkToFit(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:122
+sc/source/ui/vba/vbaformat.hxx:121
     class com::sun::star::uno::Any ScVbaFormat::getShrinkToFit()
-sc/source/ui/vba/vbaformat.hxx:125
+sc/source/ui/vba/vbaformat.hxx:124
     void ScVbaFormat::setWrapText(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:128
+sc/source/ui/vba/vbaformat.hxx:127
     class com::sun::star::uno::Any ScVbaFormat::getWrapText()
-sc/source/ui/vba/vbaformat.hxx:131
+sc/source/ui/vba/vbaformat.hxx:130
     void ScVbaFormat::setLocked(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:134
+sc/source/ui/vba/vbaformat.hxx:133
     class com::sun::star::uno::Any ScVbaFormat::getLocked()
-sc/source/ui/vba/vbaformat.hxx:137
+sc/source/ui/vba/vbaformat.hxx:136
     void ScVbaFormat::setFormulaHidden(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:140
+sc/source/ui/vba/vbaformat.hxx:139
     class com::sun::star::uno::Any ScVbaFormat::getFormulaHidden()
-sc/source/ui/vba/vbaformat.hxx:149
+sc/source/ui/vba/vbaformat.hxx:148
     void ScVbaFormat::setReadingOrder(const class com::sun::star::uno::Any &,)
-sc/source/ui/vba/vbaformat.hxx:152
+sc/source/ui/vba/vbaformat.hxx:151
     class com::sun::star::uno::Any ScVbaFormat::getReadingOrder()
-sc/source/ui/vba/vbapagebreak.hxx:45
+sc/source/ui/vba/vbapagebreak.hxx:44
     int ScVbaPageBreak::getType()
-sc/source/ui/vba/vbapagebreak.hxx:46
+sc/source/ui/vba/vbapagebreak.hxx:45
     void ScVbaPageBreak::setType(int,)
-sc/source/ui/vba/vbapagebreak.hxx:48
+sc/source/ui/vba/vbapagebreak.hxx:47
     void ScVbaPageBreak::Delete()
-sc/source/ui/vba/vbapagebreak.hxx:49
+sc/source/ui/vba/vbapagebreak.hxx:48
     class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaPageBreak::Location()
-sd/source/ui/remotecontrol/ZeroconfService.hxx:37
-    void sd::ZeroconfService::~ZeroconfService()
 shell/inc/i_xml_parser_event_handler.hxx:41
     void i_xml_parser_event_handler::~i_xml_parser_event_handler()
-slideshow/source/engine/activities/activitiesfactory.cxx:172
+slideshow/source/engine/activities/activitiesfactory.cxx:173
     void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:241
+slideshow/source/engine/activities/activitiesfactory.cxx:242
     void slideshow::internal::(anonymous namespace)::FromToByActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:331
+slideshow/source/engine/activities/activitiesfactory.cxx:332
     void slideshow::internal::(anonymous namespace)::FromToByActivity::performEnd()
-slideshow/source/engine/activities/activitiesfactory.cxx:344
+slideshow/source/engine/activities/activitiesfactory.cxx:345
     void slideshow::internal::(anonymous namespace)::FromToByActivity::dispose()
-slideshow/source/engine/activities/activitiesfactory.cxx:525
+slideshow/source/engine/activities/activitiesfactory.cxx:526
     void slideshow::internal::(anonymous namespace)::ValuesActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:536
+slideshow/source/engine/activities/activitiesfactory.cxx:537
     void slideshow::internal::(anonymous namespace)::ValuesActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:581
+slideshow/source/engine/activities/activitiesfactory.cxx:582
     void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd()
-slideshow/source/engine/animationfactory.cxx:616
+slideshow/source/engine/animationfactory.cxx:617
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
-slideshow/source/engine/animationfactory.cxx:619
+slideshow/source/engine/animationfactory.cxx:620
     void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
 slideshow/source/inc/shape.hxx:221
     void slideshow::internal::Shape::setIsForeground(const _Bool,)
-sw/inc/flypos.hxx:37
-    void SwPosFlyFrame::~SwPosFlyFrame()
-toolkit/inc/controls/geometrycontrolmodel.hxx:182
+toolkit/inc/controls/geometrycontrolmodel.hxx:185
     void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const
-vcl/inc/jsdialog/jsdialogbuilder.hxx:190
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:1092
+    char std::ctype<char>::do_widen(char,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:1115
+    const char * std::ctype<char>::do_widen(const char *,const char *,char *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:1142
+    char std::ctype<char>::do_narrow(char,char,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:1168
+    const char * std::ctype<char>::do_narrow(const char *,const char *,char,char *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:2220
+    type-parameter-0-1 std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,_Bool &,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:2277
+    type-parameter-0-1 std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,void *&,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:2535
+    type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class std::ios_base &,type-parameter-0-0,_Bool,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets.h:2571
+    type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class std::ios_base &,type-parameter-0-0,const void *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:636
+    enum std::time_base::dateorder std::time_get::do_date_order()const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:654
+    type-parameter-0-1 std::time_get::do_get_time(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:673
+    type-parameter-0-1 std::time_get::do_get_date(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:692
+    type-parameter-0-1 std::time_get::do_get_weekday(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:711
+    type-parameter-0-1 std::time_get::do_get_monthname(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:730
+    type-parameter-0-1 std::time_get::do_get_year(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:755
+    type-parameter-0-1 std::time_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base &,enum std::_Ios_Iostate &,struct tm *,char,char,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1613
+    type-parameter-0-1 std::money_get::do_get(type-parameter-0-1,type-parameter-0-1,_Bool,class std::ios_base &,enum std::_Ios_Iostate &,long double &,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1625
+    type-parameter-0-1 std::money_get::do_get(type-parameter-0-1,type-parameter-0-1,_Bool,class std::ios_base &,enum std::_Ios_Iostate &,basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>, allocator<type-parameter-0-0> > &,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1766
+    type-parameter-0-1 std::money_put::do_put(type-parameter-0-1,_Bool,class std::ios_base &,type-parameter-0-0,long double,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1790
+    type-parameter-0-1 std::money_put::do_put(type-parameter-0-1,_Bool,class std::ios_base &,type-parameter-0-0,const basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>, allocator<type-parameter-0-0> > &,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1975
+    int std::messages::do_open(const class std::basic_string<char> &,const class std::locale &,)const
+ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:2002
+    void std::messages::do_close(int,)const
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:427
+    void std::_Sp_counted_ptr::_M_dispose()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:431
+    void std::_Sp_counted_ptr::_M_destroy()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:435
+    void * std::_Sp_counted_ptr::_M_get_deleter(const class std::type_info &,)
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:526
+    void std::_Sp_counted_deleter::_M_dispose()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:530
+    void std::_Sp_counted_deleter::_M_destroy()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:538
+    void * std::_Sp_counted_deleter::_M_get_deleter(const class std::type_info &,)
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:611
+    void std::_Sp_counted_ptr_inplace::_M_dispose()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:618
+    void std::_Sp_counted_ptr_inplace::_M_destroy()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:631
+    void * std::_Sp_counted_ptr_inplace::_M_get_deleter(const class std::type_info &,)
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:695
+    void std::_Sp_counted_ptr_inplace<type-parameter-0-0, type-parameter-0-1, _Lp>::_M_dispose()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:702
+    void std::_Sp_counted_ptr_inplace<type-parameter-0-0, type-parameter-0-1, _Lp>::_M_destroy()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:845
+    void std::_Sp_counted_array::_M_dispose()
+ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:853
+    void std::_Sp_counted_array::_M_destroy()
+ux-gnu/../../../include/c++/13/cxxabi.h:307
+    _Bool __cxxabiv1::__pbase_type_info::__pointer_catch(const class __cxxabiv1::__pbase_type_info *,void **,unsigned int,)const
+ux-gnu/../../../include/c++/13/fstream:379
+    long std::basic_filebuf::showmanyc()
+ux-gnu/../../../include/c++/13/fstream:387
+    typename type-parameter-0-1::int_type std::basic_filebuf::underflow()
+ux-gnu/../../../include/c++/13/fstream:390
+    typename type-parameter-0-1::int_type std::basic_filebuf::pbackfail(typename type-parameter-0-1::int_type,)
+ux-gnu/../../../include/c++/13/fstream:400
+    typename type-parameter-0-1::int_type std::basic_filebuf::overflow(typename type-parameter-0-1::int_type,)
+ux-gnu/../../../include/c++/13/fstream:420
+    basic_streambuf<type-parameter-0-0, type-parameter-0-1> * std::basic_filebuf::setbuf(type-parameter-0-0 *,long,)
+ux-gnu/../../../include/c++/13/fstream:423
+    typename type-parameter-0-1::pos_type std::basic_filebuf::seekoff(typename type-parameter-0-1::off_type,enum std::_Ios_Seekdir,enum std::_Ios_Openmode,)
+ux-gnu/../../../include/c++/13/fstream:427
+    typename type-parameter-0-1::pos_type std::basic_filebuf::seekpos(typename type-parameter-0-1::pos_type,enum std::_Ios_Openmode,)
+ux-gnu/../../../include/c++/13/fstream:438
+    int std::basic_filebuf::sync()
+ux-gnu/../../../include/c++/13/fstream:441
+    void std::basic_filebuf::imbue(const class std::locale &,)
+ux-gnu/../../../include/c++/13/fstream:444
+    long std::basic_filebuf::xsgetn(type-parameter-0-0 *,long,)
+ux-gnu/../../../include/c++/13/fstream:447
+    long std::basic_filebuf::xsputn(const type-parameter-0-0 *,long,)
+ux-gnu/../../../include/c++/13/future:1488
+    void std::__future_base::_Task_state<type-parameter-0-0, type-parameter-0-1, type-parameter-0-2 (type-parameter-0-3...)>::_M_run(type-parameter-0-3 &&...,)
+ux-gnu/../../../include/c++/13/future:1498
+    void std::__future_base::_Task_state<type-parameter-0-0, type-parameter-0-1, type-parameter-0-2 (type-parameter-0-3...)>::_M_run_delayed(type-parameter-0-3 &&...,class std::weak_ptr<class std::__future_base::_State_baseV2>,)
+ux-gnu/../../../include/c++/13/future:1509
+    shared_ptr<_Task_state_base<type-parameter-0-2 (type-parameter-0-3...)> > std::__future_base::_Task_state<type-parameter-0-0, type-parameter-0-1, type-parameter-0-2 (type-parameter-0-3...)>::_M_reset()
+ux-gnu/../../../include/c++/13/sstream:346
+    long std::basic_stringbuf::showmanyc()
+ux-gnu/../../../include/c++/13/sstream:358
+    typename type-parameter-0-1::int_type std::basic_stringbuf::underflow()
+ux-gnu/../../../include/c++/13/sstream:361
+    typename type-parameter-0-1::int_type std::basic_stringbuf::pbackfail(typename type-parameter-0-1::int_type,)
+ux-gnu/../../../include/c++/13/sstream:364
+    typename type-parameter-0-1::int_type std::basic_stringbuf::overflow(typename type-parameter-0-1::int_type,)
+ux-gnu/../../../include/c++/13/sstream:378
+    basic_streambuf<type-parameter-0-0, type-parameter-0-1> * std::basic_stringbuf::setbuf(type-parameter-0-0 *,long,)
+ux-gnu/../../../include/c++/13/sstream:397
+    typename type-parameter-0-1::pos_type std::basic_stringbuf::seekoff(typename type-parameter-0-1::off_type,enum std::_Ios_Seekdir,enum std::_Ios_Openmode,)
+ux-gnu/../../../include/c++/13/sstream:401
+    typename type-parameter-0-1::pos_type std::basic_stringbuf::seekpos(typename type-parameter-0-1::pos_type,enum std::_Ios_Openmode,)
+ux-gnu/../../../include/c++/13/streambuf:583
+    void std::basic_streambuf::imbue(const class std::locale &,)
+ux-gnu/../../../include/c++/13/streambuf:634
+    int std::basic_streambuf::sync()
+ux-gnu/../../../include/c++/13/streambuf:672
+    long std::basic_streambuf::xsgetn(type-parameter-0-0 *,long,)
+ux-gnu/../../../include/c++/13/streambuf:707
+    typename type-parameter-0-1::int_type std::basic_streambuf::uflow()
+ux-gnu/../../../include/c++/13/streambuf:749
+    long std::basic_streambuf::xsputn(const type-parameter-0-0 *,long,)
+ux-gnu/qt5/QtGui/qpaintdevice.h:74
+    int QPaintDevice::devType()const
+vcl/inc/font/LogicalFontInstance.hxx:123
+    void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:161
+    void JSDialogSender::sendFullUpdate(_Bool,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:164
+    void JSDialogSender::sendAction(const class VclPtr<class vcl::Window> &,class std::unique_ptr<class std::unordered_map<class rtl::OString, class rtl::OUString> >,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:166
+    void JSDialogSender::sendPopup(const class VclPtr<class vcl::Window> &,const class rtl::OUString &,const class rtl::OUString &,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:168
+    void JSDialogSender::sendClosePopup(unsigned int,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:393
     void JSWidget::show()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:196
+vcl/inc/jsdialog/jsdialogbuilder.hxx:406
     void JSWidget::hide()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:203
+vcl/inc/jsdialog/jsdialogbuilder.hxx:420
     void JSWidget::set_sensitive(_Bool,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:209
+vcl/inc/jsdialog/jsdialogbuilder.hxx:428
     class com::sun::star::uno::Reference<class com::sun::star::datatransfer::dnd::XDropTarget> JSWidget::get_drop_target()
-vcl/inc/salbmp.hxx:118
-    void SalBitmap::updateChecksum()const
+vcl/inc/jsdialog/jsdialogbuilder.hxx:436
+    void JSWidget::freeze()
+vcl/inc/jsdialog/jsdialogbuilder.hxx:442
+    void JSWidget::thaw()
+vcl/inc/jsdialog/jsdialogbuilder.hxx:449
+    void JSWidget::grab_focus()
+vcl/inc/jsdialog/jsdialogbuilder.hxx:494
+    void JSWidget::set_buildable_name(const class rtl::OUString &,)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:622
+    void JSComboBox::set_entry_text_without_notify(const class rtl::OUString &,)
+vcl/inc/qt5/QtFrame.hxx:160
+    void QtFrame::registerDragSource(class QtDragSource *,)
+vcl/inc/qt5/QtFrame.hxx:161
+    void QtFrame::deregisterDragSource(const class QtDragSource *,)
+vcl/inc/qt5/QtFrame.hxx:162
+    void QtFrame::registerDropTarget(class QtDropTarget *,)
+vcl/inc/qt5/QtFrame.hxx:163
+    void QtFrame::deregisterDropTarget(const class QtDropTarget *,)
 vcl/inc/salframe.hxx:145
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
 vcl/inc/salframe.hxx:194
     void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/salinst.hxx:89
+vcl/inc/salinst.hxx:95
     _Bool SalInstance::SVMainHook(int *,)
-vcl/inc/salinst.hxx:200
+vcl/inc/salinst.hxx:203
     void SalInstance::releaseMainThread()
+vcl/inc/salinst.hxx:212
+    void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
 vcl/inc/salobj.hxx:49
     void SalObject::Enable(_Bool,)
-vcl/inc/salprn.hxx:116
+vcl/inc/salprn.hxx:119
     enum SalPrinterError SalPrinter::GetErrorCode()
-vcl/inc/skia/gdiimpl.hxx:236
+vcl/inc/skia/gdiimpl.hxx:231
     void SkiaSalGraphicsImpl::createSurface()
-vcl/inc/unx/gtk/gtkdata.hxx:121
+vcl/inc/skia/gdiimpl.hxx:241
+    void SkiaSalGraphicsImpl::flushSurfaceToWindowContext()
+vcl/inc/skia/gdiimpl.hxx:264
+    int SkiaSalGraphicsImpl::getWindowScaling()const
+vcl/inc/unx/gtk/gtkdata.hxx:336
     int GtkSalDisplay::CaptureMouse(class SalFrame *,)
-vcl/inc/unx/saldata.hxx:50
+vcl/inc/unx/saldata.hxx:48
     void X11SalData::Init()
-vcl/inc/unx/saldisp.hxx:181
-    void SalXLib::~SalXLib()
-vcl/inc/unx/saldisp.hxx:182
-    void SalXLib::Init()
-vcl/inc/unx/saldisp.hxx:184
-    _Bool SalXLib::Yield(_Bool,_Bool,)
-vcl/inc/unx/saldisp.hxx:185
-    void SalXLib::Wakeup()
-vcl/inc/unx/saldisp.hxx:188
-    void SalXLib::Insert(int,void *,int (*)(int, void *),int (*)(int, void *),int (*)(int, void *),)
-vcl/inc/unx/saldisp.hxx:192
-    void SalXLib::Remove(int,)
-vcl/inc/unx/saldisp.hxx:194
-    void SalXLib::StartTimer(unsigned long,)
-vcl/inc/unx/saldisp.hxx:195
-    void SalXLib::StopTimer()
-vcl/inc/unx/saldisp.hxx:197
-    _Bool SalXLib::CheckTimeout(_Bool,)
-vcl/inc/unx/saldisp.hxx:404
+vcl/inc/unx/saldisp.hxx:361
     void SalX11Display::Yield()
-vcl/inc/unx/salframe.h:207
+vcl/inc/unx/salframe.h:208
     void X11SalFrame::updateGraphics(_Bool,)
-vcl/inc/unx/salinst.h:41
+vcl/inc/unx/salinst.h:39
     class SalX11Display * X11SalInstance::CreateDisplay()const
-workdir/../vcl/inc/qt5/Qt5FilePicker.hxx:154
-    void Qt5FilePicker::addCustomControl(short,)
-workdir/../vcl/inc/qt5/Qt5FilePicker.hxx:172
-    void Qt5FilePicker::updateAutomaticFileExtension()
-workdir/../vcl/inc/qt5/Qt5Frame.hxx:160
-    void Qt5Frame::registerDragSource(class Qt5DragSource *,)
-workdir/../vcl/inc/qt5/Qt5Frame.hxx:161
-    void Qt5Frame::deregisterDragSource(const class Qt5DragSource *,)
-workdir/../vcl/inc/qt5/Qt5Frame.hxx:162
-    void Qt5Frame::registerDropTarget(class Qt5DropTarget *,)
-workdir/../vcl/inc/qt5/Qt5Frame.hxx:163
-    void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *,)
-workdir/../vcl/inc/qt5/Qt5Instance.hxx:84
-    class Qt5FilePicker * Qt5Instance::createPicker(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,enum QFileDialog::FileMode,)
-writerfilter/source/dmapper/TableManager.hxx:484
+writerfilter/source/dmapper/TableManager.hxx:490
     void writerfilter::dmapper::TableManager::tableExceptionProps(const class tools::SvRef<class writerfilter::dmapper::TablePropertyMap> &,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:66
-    void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:67
-    void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:68
-    void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:69
-    void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
-xmloff/source/forms/elementimport.hxx:551
+xmloff/source/forms/elementimport.hxx:548
     class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> xmloff::OColumnImport::createElement()
 
diff --git a/compilerplugins/clang/unoaggregation.cxx b/compilerplugins/clang/unoaggregation.cxx
new file mode 100644
index 000000000000..a3be33f395f7
--- /dev/null
+++ b/compilerplugins/clang/unoaggregation.cxx
@@ -0,0 +1,216 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+// Find classes that derive from css::uno::XAggregation, but which implement queryInterface in
+// violation of the protocol laid out in the documentation at
+// udkapi/com/sun/star/uno/XAggregation.idl (which implies that such a class either doesn't actually
+// make use of the deprecated XAggregation mechanism, which should thus be removed from that class
+// hierarchy, or that its implementation of queryInterface needs to be fixed).
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+
+#include "check.hxx"
+#include "compat.hxx"
+#include "plugin.hxx"
+
+namespace
+{
+bool isQueryInterface(CXXMethodDecl const* decl)
+{
+    auto const id = decl->getIdentifier();
+    if (id == nullptr || id->getName() != "queryInterface")
+    {
+        return false;
+    }
+    if (decl->getNumParams() != 1)
+    {
+        return false;
+    }
+    if (!loplugin::TypeCheck(decl->getParamDecl(0)->getType())
+             .LvalueReference()
+             .ConstNonVolatile()
+             .Class("Type")
+             .Namespace("uno")
+             .Namespace("star")
+             .Namespace("sun")
+             .Namespace("com")
+             .GlobalNamespace())
+    {
+        return false;
+    }
+    return true;
+}
+
+bool derivesFromXAggregation(CXXRecordDecl const* decl, bool checkSelf)
+{
+    return loplugin::isDerivedFrom(decl,
+                                   [](Decl const* decl) -> bool {
+                                       return bool(loplugin::DeclCheck(decl)
+                                                       .Class("XAggregation")
+                                                       .Namespace("uno")
+                                                       .Namespace("star")
+                                                       .Namespace("sun")
+                                                       .Namespace("com")
+                                                       .GlobalNamespace());
+                                   },
+                                   checkSelf);
+}
+
+// Return true if decl is an implementation of css::uno::XInterface::queryInterface in a class
+// derived from css::uno::XAggregation:
+bool isXAggregationQueryInterface(CXXMethodDecl const* decl)
+{
+    return isQueryInterface(decl) && derivesFromXAggregation(decl->getParent(), false);
+}
+
+bool basesHaveOnlyPureQueryInterface(CXXRecordDecl const* decl)
+{
+    for (auto const& b : decl->bases())
+    {
+        auto const d1 = b.getType()->getAsCXXRecordDecl();
+        if (!derivesFromXAggregation(d1, true))
+        {
+            continue;
+        }
+        for (auto const d2 : d1->methods())
+        {
+            if (!isQueryInterface(d2))
+            {
+                continue;
+            }
+            if (!compat::isPureVirtual(d2))
+            {
+                return false;
+            }
+        }
+        if (!basesHaveOnlyPureQueryInterface(d1))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+class UnoAggregation final : public loplugin::FilteringPlugin<UnoAggregation>
+{
+public:
+    explicit UnoAggregation(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool shouldVisitTemplateInstantiations() const { return true; }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+
+    bool VisitCXXMethodDecl(CXXMethodDecl const* decl)
+    {
+        if (ignoreLocation(decl))
+        {
+            return true;
+        }
+        if (!decl->isThisDeclarationADefinition())
+        {
+            return true;
+        }
+        auto const parent = decl->getParent();
+        if (parent->getDescribedClassTemplate() != nullptr)
+        {
+            // For class templates with dependent base classes, loplugin::isDerivedFrom as used in
+            // isXAggregationQueryInterface would always return true; work around that by not
+            // looking at any templates at all, which is OK due to
+            // shouldVisitTemplateInstantiations:
+            return true;
+        }
+        if (!isXAggregationQueryInterface(decl))
+        {
+            return true;
+        }
+        if (decl->isDeleted())
+        {
+            // Whether or not a deleted queryInterface makes sense, just leave those alone:
+            return true;
+        }
+        auto const body = decl->getBody();
+        assert(body != nullptr);
+        // Check whether the implementation forwards to one of the base classes that derive from
+        // XAggregation:
+        if (auto const s1 = dyn_cast<CompoundStmt>(body))
+        {
+            if (s1->size() == 1)
+            {
+                if (auto const s2 = dyn_cast<ReturnStmt>(s1->body_front()))
+                {
+                    if (auto const e1 = s2->getRetValue())
+                    {
+                        if (auto const e2
+                            = dyn_cast<CXXMemberCallExpr>(e1->IgnoreImplicit()->IgnoreParens()))
+                        {
+                            return true;
+                            if (e2->getImplicitObjectArgument() == nullptr)
+                            {
+                                if (isXAggregationQueryInterface(e2->getMethodDecl()))
+                                {
+                                    // e2 will thus necessarily be a call of a base class's
+                                    // queryInterface (or a recursive call of the given decl itself,
+                                    // but which would cause the code to have undefined behavior
+                                    // anyway, so don't bother to rule that out):
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                    else if (isDebugMode())
+                    {
+                        report(DiagnosticsEngine::Warning,
+                               "suspicious implementation of queryInterface containing a return "
+                               "statement with no operand",
+                               decl->getLocation())
+                            << decl->getSourceRange();
+                    }
+                }
+            }
+        }
+        // As a crude approximation (but which appears to work OK), if all of the base classes that
+        // derive from XAggregation only ever declare queryInterface as pure, assume that this is
+        // the base implementation of queryInterface (which will necessarily not match the above
+        // check for a forwarding implementation):
+        if (basesHaveOnlyPureQueryInterface(parent))
+        {
+            return true;
+        }
+        if (suppressWarningAt(decl->getBeginLoc()))
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning,
+               "%0 derives from XAggregation, but its implementation of queryInterface does not "
+               "delegate to an appropriate base class queryInterface",
+               decl->getLocation())
+            << parent << decl->getSourceRange();
+        return true;
+    }
+};
+
+loplugin::Plugin::Registration<UnoAggregation> unoaggregation("unoaggregation");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unoany.cxx b/compilerplugins/clang/unoany.cxx
index d44fce1d434c..0ab5657c1d03 100644
--- a/compilerplugins/clang/unoany.cxx
+++ b/compilerplugins/clang/unoany.cxx
@@ -9,8 +9,9 @@
 
 #ifndef LO_CLANG_SHARED_PLUGINS
 
+#include "config_clang.h"
+
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -40,7 +41,7 @@ bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr)
         return true;
     }
     StringRef aFileName = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+            compiler.getSourceManager().getSpellingLoc(expr->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/com/sun/star/uno/Any.hxx")) {
         return true;
     }
@@ -53,7 +54,7 @@ bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr)
         return true;
     }
     if (auto expr2 = dyn_cast<MaterializeTemporaryExpr>(expr->getArg(1))) {
-        if (auto expr3 = dyn_cast<CXXBindTemporaryExpr>(compat::getSubExpr(expr2))) {
+        if (auto expr3 = dyn_cast<CXXBindTemporaryExpr>(expr2->getSubExpr())) {
             if (auto expr4 = dyn_cast<CallExpr>(expr3->getSubExpr())) {
                 if (loplugin::DeclCheck(expr4->getDirectCallee()).Function("makeAny").
                     Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()) {
@@ -67,7 +68,7 @@ bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr)
                 }
             }
         }
-        if (isa<CXXFunctionalCastExpr>(compat::getSubExpr(expr2))) {
+        if (isa<CXXFunctionalCastExpr>(expr2->getSubExpr())) {
             //expr->getArg(1)->dump();
             report(
                     DiagnosticsEngine::Warning,
diff --git a/compilerplugins/clang/unoquery.cxx b/compilerplugins/clang/unoquery.cxx
index fd7715fe1df3..1fe2d4b5bab4 100644
--- a/compilerplugins/clang/unoquery.cxx
+++ b/compilerplugins/clang/unoquery.cxx
@@ -10,7 +10,6 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "check.hxx"
-#include "compat.hxx"
 #include "plugin.hxx"
 
 // TODO it would be better if we were running some kind of nullability analysis here, where we marked
@@ -64,7 +63,7 @@ bool UnoQuery::VisitCXXMemberCallExpr(CXXMemberCallExpr const* memberCallExpr)
     Expr const* expr = operatorCallExpr->getArg(0)->IgnoreImplicit();
     // depending on the version of clang, the IgnoreImplicit may or may not look through these nodes
     if (auto matTemp = dyn_cast<MaterializeTemporaryExpr>(expr))
-        expr = compat::getSubExpr(matTemp);
+        expr = matTemp->getSubExpr();
     if (auto bindTemp = dyn_cast<CXXBindTemporaryExpr>(expr))
         expr = bindTemp->getSubExpr();
 
diff --git a/compilerplugins/clang/unreffun.cxx b/compilerplugins/clang/unreffun.cxx
index 353eee5f0b31..fcb6f04016b7 100644
--- a/compilerplugins/clang/unreffun.cxx
+++ b/compilerplugins/clang/unreffun.cxx
@@ -16,6 +16,7 @@
 #include "clang/AST/Attr.h"
 #include "clang/Sema/SemaInternal.h" // warn_unused_function
 
+#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace {
@@ -152,7 +153,7 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * decl) {
         return true;
     }
     LinkageInfo info(canon->getLinkageAndVisibility());
-    if (info.getLinkage() == ExternalLinkage
+    if (info.getLinkage() == compat::Linkage::External
         && loplugin::hasCLanguageLinkageType(canon) && canon->isDefined()
         && ((decl == canon && info.getVisibility() == DefaultVisibility)
             || ((canon->hasAttr<ConstructorAttr>()
diff --git a/compilerplugins/clang/unsignedcompare.cxx b/compilerplugins/clang/unsignedcompare.cxx
index 7337f45223d4..5b55edea2843 100644
--- a/compilerplugins/clang/unsignedcompare.cxx
+++ b/compilerplugins/clang/unsignedcompare.cxx
@@ -7,15 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifndef LO_CLANG_SHARED_PLUGINS
+
 // Find explicit casts from signed to unsigned integer in comparison against unsigned integer, where
 // the cast is presumably used to avoid warnings about signed vs. unsigned comparisons, and could
 // thus be replaced with o3tl::make_unsigned for clarity.
 
 #include <cassert>
 
-#include "config_clang.h"
-
-#include "compat.hxx"
 #include "plugin.hxx"
 
 namespace
@@ -126,9 +125,7 @@ public:
         // be, so lets keep it here at least for now):
         switch (expr->getOpcode())
         {
-#if CLANG_VERSION >= 60000
             case BO_Cmp:
-#endif
             case BO_LT:
             case BO_GT:
             case BO_LE:
@@ -163,7 +160,6 @@ public:
         return true;
     }
 
-private:
     bool preRun() override
     {
         return compiler.getLangOpts().CPlusPlus
@@ -180,6 +176,7 @@ private:
         }
     }
 
+private:
     ExplicitCastExpr const* isCastToUnsigned(Expr const* expr)
     {
         auto const e = dyn_cast<ExplicitCastExpr>(expr->IgnoreParenImpCasts());
@@ -201,7 +198,7 @@ private:
         // Filter out e.g. `size_t(-1)`:
         if (!e2->isValueDependent())
         {
-            if (auto const val = compat::getIntegerConstantExpr(e2, compiler.getASTContext()))
+            if (auto const val = e2->getIntegerConstantExpr(compiler.getASTContext()))
             {
                 if (val->isNegative())
                 {
@@ -209,7 +206,7 @@ private:
                 }
             }
         }
-        auto loc = compat::getBeginLoc(e);
+        auto loc = e->getBeginLoc();
         while (compiler.getSourceManager().isMacroArgExpansion(loc))
         {
             loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
@@ -230,4 +227,6 @@ private:
 loplugin::Plugin::Registration<UnsignedCompare> unsignedcompare("unsignedcompare");
 }
 
+#endif // LO_CLANG_SHARED_PLUGINS
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedcapturedefault.cxx b/compilerplugins/clang/unusedcapturedefault.cxx
new file mode 100644
index 000000000000..57f6669dc309
--- /dev/null
+++ b/compilerplugins/clang/unusedcapturedefault.cxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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 LO_CLANG_SHARED_PLUGINS
+
+#include "plugin.hxx"
+
+namespace
+{
+class UnusedCaptureDefault : public loplugin::FilteringPlugin<UnusedCaptureDefault>
+{
+public:
+    explicit UnusedCaptureDefault(loplugin::InstantiationData const& data)
+        : FilteringPlugin(data)
+    {
+    }
+
+    bool preRun() override { return compiler.getLangOpts().CPlusPlus; }
+
+    bool VisitLambdaExpr(LambdaExpr const* expr)
+    {
+        if (ignoreLocation(expr))
+        {
+            return true;
+        }
+        if (expr->getCaptureDefault() == LCD_None)
+        {
+            return true;
+        }
+        if (expr->implicit_capture_begin() != expr->implicit_capture_end())
+        {
+            return true;
+        }
+        report(DiagnosticsEngine::Warning, "unused capture-default", expr->getCaptureDefaultLoc())
+            << expr->getSourceRange();
+        return true;
+    }
+
+private:
+    void run() override
+    {
+        if (preRun())
+        {
+            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+        }
+    }
+};
+
+loplugin::Plugin::Registration<UnusedCaptureDefault> unusedcapturedefault("unusedcapturedefault");
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedenumconstants.cxx b/compilerplugins/clang/unusedenumconstants.cxx
index 4ae1f52f2713..692faa0fb5e9 100644
--- a/compilerplugins/clang/unusedenumconstants.cxx
+++ b/compilerplugins/clang/unusedenumconstants.cxx
@@ -12,8 +12,8 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
-#include "compat.hxx"
 
 /**
 This looks for unused enum constants
@@ -29,7 +29,7 @@ Be warned that it produces around 5G of log file.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedenumconstants' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='unusedenumconstants' check
   $ ./compilerplugins/clang/unusedenumconstants.py
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
@@ -67,6 +67,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         if (!isUnitTestMode())
@@ -246,9 +248,7 @@ walk_up:
                 || isa<ParenExpr>(parent)
                 || isa<MaterializeTemporaryExpr>(parent)
                 || isa<ExprWithCleanups>(parent)
-#if CLANG_VERSION >= 80000
                 || isa<ConstantExpr>(parent)
-#endif
                 || isa<CXXBindTemporaryExpr>(parent))
     {
         goto walk_up;
@@ -267,6 +267,10 @@ walk_up:
     {
         goto walk_up;
     }
+    else if (isa<ParenListExpr>(parent))
+    {
+        goto walk_up;
+    }
     else if (isa<UnresolvedLookupExpr>(parent)
             || isa<CompoundStmt>(parent))
     {
@@ -284,7 +288,7 @@ walk_up:
         declRefExpr->dump();
         report( DiagnosticsEngine::Warning,
                 "unhandled clang AST node type",
-                compat::getBeginLoc(parent));
+                parent->getBeginLoc());
     }
 
     if (bWrite) {
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 72de385030c8..ebceffca0234 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -80,7 +79,7 @@ def is_ignore(srcLoc):
          "include/registry/version.h",
          "include/svtools/rtftoken.h",
          "sc/source/filter/inc/xltracer.hxx",
-         "writerfilter/source/dmapper/FieldTypes.hxx",
+         "sw/source/writerfilter/dmapper/FieldTypes.hxx",
          "vcl/source/fontsubset/cff.cxx",
          "vcl/source/filter/wmf/winmtf.hxx",
          "vcl/source/filter/sgvmain.hxx",
@@ -189,7 +188,7 @@ def is_ignore(srcLoc):
          "include/i18nlangtag/applelangid.hxx", # AppleLanguageId
          "connectivity/source/drivers/firebird/Util.hxx", # firebird::BlobSubtype
          "include/xmloff/xmltoken.hxx",
-         "writerfilter/source/rtftok/rtfcontrolwords.hxx",
+         "sw/source/writerfilter/rtftok/rtfcontrolwords.hxx",
          ]):
          return True
     if d[1] == "UNKNOWN" or d[1] == "LAST" or d[1].endswith("NONE") or d[1].endswith("None") or d[1].endswith("EQUAL_SIZE"):
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 085974a05544..af9a01077c38 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1,188 +1,184 @@
-bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:79
-    enum (anonymous namespace)::x86_64_reg_class X86_64_SSEUP_CLASS
-bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:80
-    enum (anonymous namespace)::x86_64_reg_class X86_64_X87_CLASS
-bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:81
-    enum (anonymous namespace)::x86_64_reg_class X86_64_X87UP_CLASS
+chart2/source/controller/main/FeatureCommandDispatchBase.hxx:37
+    enum ChartCommandID DrawTextVertical
+chart2/source/controller/main/FeatureCommandDispatchBase.hxx:39
+    enum ChartCommandID DrawCaptionVertical
 chart2/source/inc/CharacterProperties.hxx:120
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) FAST_PROPERTY_ID_END_CHAR_PROP
-chart2/source/inc/TitleHelper.hxx:47
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) FAST_PROPERTY_ID_END_CHAR_PROP
+chart2/source/inc/TitleHelper.hxx:49
     enum chart::TitleHelper::eTitleType NORMAL_TITLE_END
-chart2/source/view/inc/ShapeFactory.hxx:49
+chart2/source/view/inc/ShapeFactory.hxx:51
     enum chart::SymbolEnum Symbol_Square
-chart2/source/view/inc/ShapeFactory.hxx:50
+chart2/source/view/inc/ShapeFactory.hxx:52
     enum chart::SymbolEnum Symbol_Diamond
-chart2/source/view/inc/ShapeFactory.hxx:51
+chart2/source/view/inc/ShapeFactory.hxx:53
     enum chart::SymbolEnum Symbol_DownArrow
-chart2/source/view/inc/ShapeFactory.hxx:52
+chart2/source/view/inc/ShapeFactory.hxx:54
     enum chart::SymbolEnum Symbol_UpArrow
-chart2/source/view/inc/ShapeFactory.hxx:53
+chart2/source/view/inc/ShapeFactory.hxx:55
     enum chart::SymbolEnum Symbol_RightArrow
-chart2/source/view/inc/ShapeFactory.hxx:54
+chart2/source/view/inc/ShapeFactory.hxx:56
     enum chart::SymbolEnum Symbol_LeftArrow
-chart2/source/view/inc/ShapeFactory.hxx:55
+chart2/source/view/inc/ShapeFactory.hxx:57
     enum chart::SymbolEnum Symbol_Bowtie
-chart2/source/view/inc/ShapeFactory.hxx:56
+chart2/source/view/inc/ShapeFactory.hxx:58
     enum chart::SymbolEnum Symbol_Sandglass
-chart2/source/view/inc/ShapeFactory.hxx:57
+chart2/source/view/inc/ShapeFactory.hxx:59
     enum chart::SymbolEnum Symbol_Circle
-chart2/source/view/inc/ShapeFactory.hxx:58
+chart2/source/view/inc/ShapeFactory.hxx:60
     enum chart::SymbolEnum Symbol_Star
-chart2/source/view/inc/ShapeFactory.hxx:59
+chart2/source/view/inc/ShapeFactory.hxx:61
     enum chart::SymbolEnum Symbol_X
-chart2/source/view/inc/ShapeFactory.hxx:60
+chart2/source/view/inc/ShapeFactory.hxx:62
     enum chart::SymbolEnum Symbol_Plus
-chart2/source/view/inc/ShapeFactory.hxx:61
+chart2/source/view/inc/ShapeFactory.hxx:63
     enum chart::SymbolEnum Symbol_Asterisk
-chart2/source/view/inc/ShapeFactory.hxx:62
+chart2/source/view/inc/ShapeFactory.hxx:64
     enum chart::SymbolEnum Symbol_HorizontalBar
-chart2/source/view/inc/ShapeFactory.hxx:63
+chart2/source/view/inc/ShapeFactory.hxx:65
     enum chart::SymbolEnum Symbol_VerticalBar
-configmgr/source/access.hxx:443
-    enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_GROUP_MEMBER
-configmgr/source/access.hxx:443
-    enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_SET_MEMBER
+configmgr/source/access.hxx:456
+    enum configmgr::Access::(unnamed at /home/noel/libo-plugin/configmgr/source/access.hxx:454:5) IS_GROUP_MEMBER
+configmgr/source/access.hxx:456
+    enum configmgr::Access::(unnamed at /home/noel/libo-plugin/configmgr/source/access.hxx:454:5) IS_SET_MEMBER
+configmgr/source/components.hxx:149
+    enum configmgr::Components::ModificationTarget Dconf
 configmgr/source/parsemanager.hxx:43
-    enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_OOR
+    enum configmgr::ParseManager::(unnamed at /home/noel/libo-plugin/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_OOR
 configmgr/source/parsemanager.hxx:43
-    enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XS
+    enum configmgr::ParseManager::(unnamed at /home/noel/libo-plugin/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XS
 configmgr/source/parsemanager.hxx:43
-    enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XSI
+    enum configmgr::ParseManager::(unnamed at /home/noel/libo-plugin/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XSI
+connectivity/source/drivers/evoab2/NConnection.hxx:37
+    connectivity::evoab::SDBCAddress::sdbc_address_type Unknown
 cui/source/options/optgenrl.cxx:63
     enum (anonymous namespace)::RowType nRowCount
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:71
     enum dbaccess::OSingleSelectQueryComposer::EColumnType SelectColumns
 dbaccess/source/ui/inc/sqlmessage.hxx:56
     enum dbaui::MessBoxStyle DefaultCancel
-drawinglayer/source/tools/emfphelperdata.cxx:61
-    enum emfplushelper::(anonymous at /home/noel/libo2/drawinglayer/source/tools/emfphelperdata.cxx:59:5) WrapModeTile
-drawinglayer/source/tools/emfphelperdata.cxx:62
-    enum emfplushelper::(anonymous at /home/noel/libo2/drawinglayer/source/tools/emfphelperdata.cxx:59:5) WrapModeTileFlipX
+drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx:33
+    enum drawinglayer::primitive2d::TextEffectStyle2D ReliefEngraved
 drawinglayer/source/tools/emfphelperdata.cxx:63
-    enum emfplushelper::(anonymous at /home/noel/libo2/drawinglayer/source/tools/emfphelperdata.cxx:59:5) WrapModeTileFlipY
+    enum emfplushelper::(unnamed at /home/noel/libo-plugin/drawinglayer/source/tools/emfphelperdata.cxx:61:5) WrapModeTile
 drawinglayer/source/tools/emfphelperdata.cxx:64
-    enum emfplushelper::(anonymous at /home/noel/libo2/drawinglayer/source/tools/emfphelperdata.cxx:59:5) WrapModeTileFlipXY
-drawinglayer/source/tools/emfphelperdata.hxx:107
-    enum emfplushelper::PixelOffsetMode PixelOffsetModeDefault
+    enum emfplushelper::(unnamed at /home/noel/libo-plugin/drawinglayer/source/tools/emfphelperdata.cxx:61:5) WrapModeTileFlipX
+drawinglayer/source/tools/emfphelperdata.cxx:65
+    enum emfplushelper::(unnamed at /home/noel/libo-plugin/drawinglayer/source/tools/emfphelperdata.cxx:61:5) WrapModeTileFlipY
+drawinglayer/source/tools/emfphelperdata.cxx:66
+    enum emfplushelper::(unnamed at /home/noel/libo-plugin/drawinglayer/source/tools/emfphelperdata.cxx:61:5) WrapModeTileFlipXY
 drawinglayer/source/tools/emfphelperdata.hxx:108
-    enum emfplushelper::PixelOffsetMode PixelOffsetModeHighSpeed
+    enum emfplushelper::PixelOffsetMode PixelOffsetModeDefault
 drawinglayer/source/tools/emfphelperdata.hxx:109
+    enum emfplushelper::PixelOffsetMode PixelOffsetModeHighSpeed
+drawinglayer/source/tools/emfphelperdata.hxx:110
     enum emfplushelper::PixelOffsetMode PixelOffsetModeHighQuality
-drawinglayer/source/tools/emfphelperdata.hxx:111
+drawinglayer/source/tools/emfphelperdata.hxx:112
     enum emfplushelper::PixelOffsetMode PixelOffsetModeHalf
-drawinglayer/source/tools/emfphelperdata.hxx:116
-    enum emfplushelper::SmoothingMode SmoothingModeDefault
 drawinglayer/source/tools/emfphelperdata.hxx:117
-    enum emfplushelper::SmoothingMode SmoothingModeHighSpeed
+    enum emfplushelper::SmoothingMode SmoothingModeDefault
 drawinglayer/source/tools/emfphelperdata.hxx:118
+    enum emfplushelper::SmoothingMode SmoothingModeHighSpeed
+drawinglayer/source/tools/emfphelperdata.hxx:119
     enum emfplushelper::SmoothingMode SmoothingModeHighQuality
-drawinglayer/source/tools/emfphelperdata.hxx:120
-    enum emfplushelper::SmoothingMode SmoothingModeAntiAlias8x4
 drawinglayer/source/tools/emfphelperdata.hxx:121
+    enum emfplushelper::SmoothingMode SmoothingModeAntiAlias8x4
+drawinglayer/source/tools/emfphelperdata.hxx:122
     enum emfplushelper::SmoothingMode SmoothingModeAntiAlias8x8
-drawinglayer/source/tools/emfphelperdata.hxx:126
-    enum emfplushelper::InterpolationMode InterpolationModeDefault
 drawinglayer/source/tools/emfphelperdata.hxx:127
-    enum emfplushelper::InterpolationMode InterpolationModeLowQuality
+    enum emfplushelper::InterpolationMode InterpolationModeDefault
 drawinglayer/source/tools/emfphelperdata.hxx:128
-    enum emfplushelper::InterpolationMode InterpolationModeHighQuality
+    enum emfplushelper::InterpolationMode InterpolationModeLowQuality
 drawinglayer/source/tools/emfphelperdata.hxx:129
-    enum emfplushelper::InterpolationMode InterpolationModeBilinear
+    enum emfplushelper::InterpolationMode InterpolationModeHighQuality
 drawinglayer/source/tools/emfphelperdata.hxx:130
-    enum emfplushelper::InterpolationMode InterpolationModeBicubic
+    enum emfplushelper::InterpolationMode InterpolationModeBilinear
 drawinglayer/source/tools/emfphelperdata.hxx:131
-    enum emfplushelper::InterpolationMode InterpolationModeNearestNeighbor
+    enum emfplushelper::InterpolationMode InterpolationModeBicubic
 drawinglayer/source/tools/emfphelperdata.hxx:132
-    enum emfplushelper::InterpolationMode InterpolationModeHighQualityBilinear
+    enum emfplushelper::InterpolationMode InterpolationModeNearestNeighbor
 drawinglayer/source/tools/emfphelperdata.hxx:133
+    enum emfplushelper::InterpolationMode InterpolationModeHighQualityBilinear
+drawinglayer/source/tools/emfphelperdata.hxx:134
     enum emfplushelper::InterpolationMode InterpolationModeHighQualityBicubic
-drawinglayer/source/tools/emfphelperdata.hxx:138
-    enum emfplushelper::TextRenderingHint TextRenderingHintSystemDefault
 drawinglayer/source/tools/emfphelperdata.hxx:139
-    enum emfplushelper::TextRenderingHint TextRenderingHintSingleBitPerPixelGridFit
+    enum emfplushelper::TextRenderingHint TextRenderingHintSystemDefault
 drawinglayer/source/tools/emfphelperdata.hxx:140
-    enum emfplushelper::TextRenderingHint TextRenderingHintSingleBitPerPixel
+    enum emfplushelper::TextRenderingHint TextRenderingHintSingleBitPerPixelGridFit
 drawinglayer/source/tools/emfphelperdata.hxx:141
-    enum emfplushelper::TextRenderingHint TextRenderingHintAntialiasGridFit
+    enum emfplushelper::TextRenderingHint TextRenderingHintSingleBitPerPixel
 drawinglayer/source/tools/emfphelperdata.hxx:142
-    enum emfplushelper::TextRenderingHint TextRenderingHintAntialias
+    enum emfplushelper::TextRenderingHint TextRenderingHintAntialiasGridFit
 drawinglayer/source/tools/emfphelperdata.hxx:143
+    enum emfplushelper::TextRenderingHint TextRenderingHintAntialias
+drawinglayer/source/tools/emfphelperdata.hxx:144
     enum emfplushelper::TextRenderingHint TextRenderingHintClearTypeGridFit
-drawinglayer/source/tools/emfphelperdata.hxx:148
-    enum emfplushelper::UnitType UnitTypeWorld
 drawinglayer/source/tools/emfphelperdata.hxx:149
-    enum emfplushelper::UnitType UnitTypeDisplay
+    enum emfplushelper::UnitType UnitTypeWorld
 drawinglayer/source/tools/emfphelperdata.hxx:150
-    enum emfplushelper::UnitType UnitTypePixel
+    enum emfplushelper::UnitType UnitTypeDisplay
 drawinglayer/source/tools/emfphelperdata.hxx:151
-    enum emfplushelper::UnitType UnitTypePoint
+    enum emfplushelper::UnitType UnitTypePixel
 drawinglayer/source/tools/emfphelperdata.hxx:152
-    enum emfplushelper::UnitType UnitTypeInch
+    enum emfplushelper::UnitType UnitTypePoint
 drawinglayer/source/tools/emfphelperdata.hxx:153
-    enum emfplushelper::UnitType UnitTypeDocument
+    enum emfplushelper::UnitType UnitTypeInch
 drawinglayer/source/tools/emfphelperdata.hxx:154
+    enum emfplushelper::UnitType UnitTypeDocument
+drawinglayer/source/tools/emfphelperdata.hxx:155
     enum emfplushelper::UnitType UnitTypeMillimeter
-drawinglayer/source/tools/emfphelperdata.hxx:159
-    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeReplace
 drawinglayer/source/tools/emfphelperdata.hxx:160
-    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeIntersect
+    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeReplace
 drawinglayer/source/tools/emfphelperdata.hxx:161
-    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeUnion
+    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeIntersect
 drawinglayer/source/tools/emfphelperdata.hxx:162
-    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeXOR
+    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeUnion
 drawinglayer/source/tools/emfphelperdata.hxx:163
-    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeExclude
+    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeXOR
 drawinglayer/source/tools/emfphelperdata.hxx:164
+    enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeExclude
+drawinglayer/source/tools/emfphelperdata.hxx:165
     enum emfplushelper::EmfPlusCombineMode EmfPlusCombineModeComplement
 drawinglayer/source/tools/emfpimage.hxx:31
     emfplushelper::ImageDataType ImageDataTypeBitmap
 drawinglayer/source/tools/emfpimage.hxx:32
     emfplushelper::ImageDataType ImageDataTypeMetafile
-drawinglayer/source/tools/emfppen.hxx:58
+drawinglayer/source/tools/emfppen.hxx:60
     enum emfplushelper::LineCapType LineCapTypeFlat
-drawinglayer/source/tools/emfppen.hxx:59
+drawinglayer/source/tools/emfppen.hxx:61
     enum emfplushelper::LineCapType LineCapTypeSquare
-drawinglayer/source/tools/emfppen.hxx:60
+drawinglayer/source/tools/emfppen.hxx:62
     enum emfplushelper::LineCapType LineCapTypeRound
-drawinglayer/source/tools/emfppen.hxx:61
+drawinglayer/source/tools/emfppen.hxx:63
     enum emfplushelper::LineCapType LineCapTypeTriangle
-drawinglayer/source/tools/emfppen.hxx:62
+drawinglayer/source/tools/emfppen.hxx:64
     enum emfplushelper::LineCapType LineCapTypeNoAnchor
-drawinglayer/source/tools/emfppen.hxx:63
+drawinglayer/source/tools/emfppen.hxx:65
     enum emfplushelper::LineCapType LineCapTypeSquareAnchor
-drawinglayer/source/tools/emfppen.hxx:64
+drawinglayer/source/tools/emfppen.hxx:66
     enum emfplushelper::LineCapType LineCapTypeRoundAnchor
-drawinglayer/source/tools/emfppen.hxx:65
+drawinglayer/source/tools/emfppen.hxx:67
     enum emfplushelper::LineCapType LineCapTypeDiamondAnchor
-drawinglayer/source/tools/emfppen.hxx:66
+drawinglayer/source/tools/emfppen.hxx:68
     enum emfplushelper::LineCapType LineCapTypeArrowAnchor
-drawinglayer/source/tools/emfppen.hxx:67
+drawinglayer/source/tools/emfppen.hxx:69
     enum emfplushelper::LineCapType LineCapTypeAnchorMask
-drawinglayer/source/tools/emfppen.hxx:68
+drawinglayer/source/tools/emfppen.hxx:70
     enum emfplushelper::LineCapType LineCapTypeCustom
-drawinglayer/source/tools/emfppen.hxx:73
-    enum emfplushelper::LineJoinType LineJoinTypeMiter
-drawinglayer/source/tools/emfppen.hxx:74
-    enum emfplushelper::LineJoinType LineJoinTypeBevel
-drawinglayer/source/tools/emfppen.hxx:75
-    enum emfplushelper::LineJoinType LineJoinTypeRound
-drawinglayer/source/tools/emfppen.hxx:76
-    enum emfplushelper::LineJoinType LineJoinTypeMiterClipped
-drawinglayer/source/tools/emfppen.hxx:81
+drawinglayer/source/tools/emfppen.hxx:83
     enum emfplushelper::DashedLineCapType DashedLineCapTypeFlat
-drawinglayer/source/tools/emfppen.hxx:82
+drawinglayer/source/tools/emfppen.hxx:84
     enum emfplushelper::DashedLineCapType DashedLineCapTypeRound
-drawinglayer/source/tools/emfppen.hxx:83
+drawinglayer/source/tools/emfppen.hxx:85
     enum emfplushelper::DashedLineCapType DashedLineCapTypeTriangle
-drawinglayer/source/tools/emfppen.hxx:88
+drawinglayer/source/tools/emfppen.hxx:90
     enum emfplushelper::PenAlignment PenAlignmentCenter
-drawinglayer/source/tools/emfppen.hxx:89
+drawinglayer/source/tools/emfppen.hxx:91
     enum emfplushelper::PenAlignment PenAlignmentInset
-drawinglayer/source/tools/emfppen.hxx:90
+drawinglayer/source/tools/emfppen.hxx:92
     enum emfplushelper::PenAlignment PenAlignmentLeft
-drawinglayer/source/tools/emfppen.hxx:91
+drawinglayer/source/tools/emfppen.hxx:93
     enum emfplushelper::PenAlignment PenAlignmentOutset
-drawinglayer/source/tools/emfppen.hxx:92
+drawinglayer/source/tools/emfppen.hxx:94
     enum emfplushelper::PenAlignment PenAlignmentRight
 drawinglayer/source/tools/emfpregion.hxx:28
     emfplushelper::RegionNodeDataType RegionNodeDataTypeAnd
@@ -228,83 +224,415 @@ drawinglayer/source/tools/emfpstringformat.hxx:65
     enum emfplushelper::StringTrimming StringTrimmingEllipsisWord
 drawinglayer/source/tools/emfpstringformat.hxx:66
     enum emfplushelper::StringTrimming StringTrimmingEllipsisPath
-editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:26
+editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:25
     enum SvXMLAutoCorrectToken BLOCK
-editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:27
+editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:26
     enum SvXMLAutoCorrectToken BLOCKLIST
-emfio/inc/mtftools.hxx:48
-    enum emfio::BkMode Transparent
-emfio/inc/mtftools.hxx:82
+emfio/inc/mtftools.hxx:38
+    enum emfio::RegionMode RGN_AND
+emfio/inc/mtftools.hxx:39
+    enum emfio::RegionMode RGN_OR
+emfio/inc/mtftools.hxx:40
+    enum emfio::RegionMode RGN_XOR
+emfio/inc/mtftools.hxx:41
+    enum emfio::RegionMode RGN_DIFF
+emfio/inc/mtftools.hxx:57
+    enum emfio::ModifyWorldTransformMode MWT_IDENTITY
+emfio/inc/mtftools.hxx:58
+    enum emfio::ModifyWorldTransformMode MWT_LEFTMULTIPLY
+emfio/inc/mtftools.hxx:59
+    enum emfio::ModifyWorldTransformMode MWT_RIGHTMULTIPLY
+emfio/inc/mtftools.hxx:60
+    enum emfio::ModifyWorldTransformMode MWT_SET
+emfio/inc/mtftools.hxx:69
+    enum emfio::StockObject WHITE_BRUSH
+emfio/inc/mtftools.hxx:70
+    enum emfio::StockObject LTGRAY_BRUSH
+emfio/inc/mtftools.hxx:71
+    enum emfio::StockObject GRAY_BRUSH
+emfio/inc/mtftools.hxx:72
+    enum emfio::StockObject DKGRAY_BRUSH
+emfio/inc/mtftools.hxx:73
+    enum emfio::StockObject BLACK_BRUSH
+emfio/inc/mtftools.hxx:74
+    enum emfio::StockObject NULL_BRUSH
+emfio/inc/mtftools.hxx:75
+    enum emfio::StockObject WHITE_PEN
+emfio/inc/mtftools.hxx:76
+    enum emfio::StockObject BLACK_PEN
+emfio/inc/mtftools.hxx:77
+    enum emfio::StockObject NULL_PEN
+emfio/inc/mtftools.hxx:91
     enum emfio::WMFRasterOp Nop
-framework/inc/xml/imagesdocumenthandler.hxx:40
+emfio/inc/mtftools.hxx:101
+    enum emfio::MappingMode MM_LOMETRIC
+emfio/inc/mtftools.hxx:102
+    enum emfio::MappingMode MM_HIMETRIC
+emfio/inc/mtftools.hxx:103
+    enum emfio::MappingMode MM_LOENGLISH
+emfio/inc/mtftools.hxx:104
+    enum emfio::MappingMode MM_HIENGLISH
+emfio/inc/mtftools.hxx:105
+    enum emfio::MappingMode MM_TWIPS
+emfio/inc/mtftools.hxx:106
+    enum emfio::MappingMode MM_ISOTROPIC
+emfio/inc/mtftools.hxx:118
+    enum emfio::GraphicsMode GM_ADVANCED
+emfio/inc/mtftools.hxx:174
+    enum emfio::TextAlignmentMode TA_UPDATECP
+emfio/inc/mtftools.hxx:178
+    enum emfio::TextAlignmentMode TA_RIGHT_CENTER
+emfio/inc/mtftools.hxx:180
+    enum emfio::TextAlignmentMode TA_BOTTOM
+emfio/inc/mtftools.hxx:183
+    enum emfio::TextAlignmentMode TA_BASELINE
+emfio/inc/mtftools.hxx:193
+    enum emfio::TernaryRasterOperation SRCPAINT
+emfio/inc/mtftools.hxx:198
+    enum emfio::TernaryRasterOperation PATINVERT
+emfio/inc/mtftools.hxx:207
+    enum emfio::PenStyle PS_SOLID
+emfio/inc/mtftools.hxx:208
+    enum emfio::PenStyle PS_DASH
+emfio/inc/mtftools.hxx:209
+    enum emfio::PenStyle PS_DOT
+emfio/inc/mtftools.hxx:210
+    enum emfio::PenStyle PS_DASHDOT
+emfio/inc/mtftools.hxx:211
+    enum emfio::PenStyle PS_DASHDOTDOT
+emfio/inc/mtftools.hxx:212
+    enum emfio::PenStyle PS_NULL
+emfio/inc/mtftools.hxx:213
+    enum emfio::PenStyle PS_INSIDEFRAME
+emfio/inc/mtftools.hxx:216
+    enum emfio::PenStyle PS_STYLE_MASK
+emfio/inc/mtftools.hxx:218
+    enum emfio::PenStyle PS_ENDCAP_ROUND
+emfio/inc/mtftools.hxx:219
+    enum emfio::PenStyle PS_ENDCAP_SQUARE
+emfio/inc/mtftools.hxx:220
+    enum emfio::PenStyle PS_ENDCAP_FLAT
+emfio/inc/mtftools.hxx:221
+    enum emfio::PenStyle PS_ENDCAP_STYLE_MASK
+emfio/inc/mtftools.hxx:223
+    enum emfio::PenStyle PS_JOIN_ROUND
+emfio/inc/mtftools.hxx:224
+    enum emfio::PenStyle PS_JOIN_BEVEL
+emfio/inc/mtftools.hxx:225
+    enum emfio::PenStyle PS_JOIN_MITER
+emfio/inc/mtftools.hxx:226
+    enum emfio::PenStyle PS_JOIN_STYLE_MASK
+emfio/inc/mtftools.hxx:228
+    enum emfio::PenStyle PS_GEOMETRIC
+emfio/inc/mtftools.hxx:236
+    enum emfio::CharacterSet DEFAULT_CHARSET
+emfio/inc/mtftools.hxx:261
+    enum emfio::ExtTextOutOptions ETO_OPAQUE
+emfio/inc/mtftools.hxx:262
+    enum emfio::ExtTextOutOptions ETO_CLIPPED
+emfio/inc/mtftools.hxx:264
+    enum emfio::ExtTextOutOptions ETO_GLYPH_INDEX
+emfio/inc/mtftools.hxx:265
+    enum emfio::ExtTextOutOptions ETO_RTLREADING
+emfio/inc/mtftools.hxx:267
+    enum emfio::ExtTextOutOptions ETO_NO_RECT
+emfio/inc/mtftools.hxx:268
+    enum emfio::ExtTextOutOptions ETO_PDY
+emfio/inc/mtftools.hxx:276
+    enum emfio::PitchFont FIXED_PITCH
+emfio/inc/mtftools.hxx:277
+    enum emfio::PitchFont VARIABLE_PITCH
+emfio/inc/mtftools.hxx:285
+    enum emfio::FamilyFont FF_SWISS
+emfio/inc/mtftools.hxx:286
+    enum emfio::FamilyFont FF_MODERN
+emfio/inc/mtftools.hxx:287
+    enum emfio::FamilyFont FF_SCRIPT
+emfio/inc/mtftools.hxx:288
+    enum emfio::FamilyFont FF_DECORATIVE
+emfio/inc/mtftools.hxx:293
+    enum emfio::WeightFont FW_THIN
+emfio/inc/mtftools.hxx:295
+    enum emfio::WeightFont FW_LIGHT
+emfio/inc/mtftools.hxx:297
+    enum emfio::WeightFont FW_MEDIUM
+emfio/inc/mtftools.hxx:298
+    enum emfio::WeightFont FW_SEMIBOLD
+emfio/inc/mtftools.hxx:299
+    enum emfio::WeightFont FW_BOLD
+emfio/inc/mtftools.hxx:301
+    enum emfio::WeightFont FW_ULTRALIGHT
+emfio/inc/mtftools.hxx:302
+    enum emfio::WeightFont FW_ULTRABOLD
+emfio/inc/mtftools.hxx:309
+    enum emfio::BrushStyle BS_SOLID
+emfio/inc/mtftools.hxx:310
+    enum emfio::BrushStyle BS_NULL
+emfio/inc/mtftools.hxx:311
+    enum emfio::BrushStyle BS_HOLLOW
+emfio/inc/mtftools.hxx:313
+    enum emfio::BrushStyle BS_PATTERN
+emfio/source/reader/emfreader.cxx:182
+    enum (anonymous namespace)::EMFPointTypes PT_CLOSEFIGURE
+emfio/source/reader/emfreader.cxx:183
+    enum (anonymous namespace)::EMFPointTypes PT_LINETO
+emfio/source/reader/emfreader.cxx:184
+    enum (anonymous namespace)::EMFPointTypes PT_BEZIERTO
+emfio/source/reader/emfreader.cxx:185
+    enum (anonymous namespace)::EMFPointTypes PT_MOVETO
+emfio/source/reader/wmfreader.cxx:48
+    enum (anonymous namespace)::WMFRecords W_META_EOF
+emfio/source/reader/wmfreader.cxx:49
+    enum (anonymous namespace)::WMFRecords W_META_SETBKCOLOR
+emfio/source/reader/wmfreader.cxx:50
+    enum (anonymous namespace)::WMFRecords W_META_SETBKMODE
+emfio/source/reader/wmfreader.cxx:51
+    enum (anonymous namespace)::WMFRecords W_META_SETMAPMODE
+emfio/source/reader/wmfreader.cxx:52
+    enum (anonymous namespace)::WMFRecords W_META_SETROP2
+emfio/source/reader/wmfreader.cxx:53
+    enum (anonymous namespace)::WMFRecords W_META_SETRELABS
+emfio/source/reader/wmfreader.cxx:54
+    enum (anonymous namespace)::WMFRecords W_META_SETPOLYFILLMODE
+emfio/source/reader/wmfreader.cxx:55
+    enum (anonymous namespace)::WMFRecords W_META_SETSTRETCHBLTMODE
+emfio/source/reader/wmfreader.cxx:56
+    enum (anonymous namespace)::WMFRecords W_META_SETTEXTCHAREXTRA
+emfio/source/reader/wmfreader.cxx:57
+    enum (anonymous namespace)::WMFRecords W_META_SETTEXTCOLOR
+emfio/source/reader/wmfreader.cxx:58
+    enum (anonymous namespace)::WMFRecords W_META_SETTEXTJUSTIFICATION
+emfio/source/reader/wmfreader.cxx:59
+    enum (anonymous namespace)::WMFRecords W_META_SETWINDOWORG
+emfio/source/reader/wmfreader.cxx:60
+    enum (anonymous namespace)::WMFRecords W_META_SETWINDOWEXT
+emfio/source/reader/wmfreader.cxx:61
+    enum (anonymous namespace)::WMFRecords W_META_SETVIEWPORTORG
+emfio/source/reader/wmfreader.cxx:62
+    enum (anonymous namespace)::WMFRecords W_META_SETVIEWPORTEXT
+emfio/source/reader/wmfreader.cxx:63
+    enum (anonymous namespace)::WMFRecords W_META_OFFSETWINDOWORG
+emfio/source/reader/wmfreader.cxx:64
+    enum (anonymous namespace)::WMFRecords W_META_SCALEWINDOWEXT
+emfio/source/reader/wmfreader.cxx:65
+    enum (anonymous namespace)::WMFRecords W_META_OFFSETVIEWPORTORG
+emfio/source/reader/wmfreader.cxx:66
+    enum (anonymous namespace)::WMFRecords W_META_SCALEVIEWPORTEXT
+emfio/source/reader/wmfreader.cxx:67
+    enum (anonymous namespace)::WMFRecords W_META_LINETO
+emfio/source/reader/wmfreader.cxx:68
+    enum (anonymous namespace)::WMFRecords W_META_MOVETO
+emfio/source/reader/wmfreader.cxx:69
+    enum (anonymous namespace)::WMFRecords W_META_EXCLUDECLIPRECT
+emfio/source/reader/wmfreader.cxx:70
+    enum (anonymous namespace)::WMFRecords W_META_INTERSECTCLIPRECT
+emfio/source/reader/wmfreader.cxx:71
+    enum (anonymous namespace)::WMFRecords W_META_ARC
+emfio/source/reader/wmfreader.cxx:72
+    enum (anonymous namespace)::WMFRecords W_META_ELLIPSE
+emfio/source/reader/wmfreader.cxx:73
+    enum (anonymous namespace)::WMFRecords W_META_FLOODFILL
+emfio/source/reader/wmfreader.cxx:74
+    enum (anonymous namespace)::WMFRecords W_META_PIE
+emfio/source/reader/wmfreader.cxx:75
+    enum (anonymous namespace)::WMFRecords W_META_RECTANGLE
+emfio/source/reader/wmfreader.cxx:76
+    enum (anonymous namespace)::WMFRecords W_META_ROUNDRECT
+emfio/source/reader/wmfreader.cxx:77
+    enum (anonymous namespace)::WMFRecords W_META_PATBLT
+emfio/source/reader/wmfreader.cxx:78
+    enum (anonymous namespace)::WMFRecords W_META_SAVEDC
+emfio/source/reader/wmfreader.cxx:79
+    enum (anonymous namespace)::WMFRecords W_META_SETPIXEL
+emfio/source/reader/wmfreader.cxx:80
+    enum (anonymous namespace)::WMFRecords W_META_OFFSETCLIPRGN
+emfio/source/reader/wmfreader.cxx:81
+    enum (anonymous namespace)::WMFRecords W_META_TEXTOUT
+emfio/source/reader/wmfreader.cxx:82
+    enum (anonymous namespace)::WMFRecords W_META_BITBLT
+emfio/source/reader/wmfreader.cxx:83
+    enum (anonymous namespace)::WMFRecords W_META_STRETCHBLT
+emfio/source/reader/wmfreader.cxx:84
+    enum (anonymous namespace)::WMFRecords W_META_POLYGON
+emfio/source/reader/wmfreader.cxx:85
+    enum (anonymous namespace)::WMFRecords W_META_POLYLINE
+emfio/source/reader/wmfreader.cxx:86
+    enum (anonymous namespace)::WMFRecords W_META_ESCAPE
+emfio/source/reader/wmfreader.cxx:87
+    enum (anonymous namespace)::WMFRecords W_META_RESTOREDC
+emfio/source/reader/wmfreader.cxx:88
+    enum (anonymous namespace)::WMFRecords W_META_FILLREGION
+emfio/source/reader/wmfreader.cxx:89
+    enum (anonymous namespace)::WMFRecords W_META_FRAMEREGION
+emfio/source/reader/wmfreader.cxx:90
+    enum (anonymous namespace)::WMFRecords W_META_INVERTREGION
+emfio/source/reader/wmfreader.cxx:91
+    enum (anonymous namespace)::WMFRecords W_META_PAINTREGION
+emfio/source/reader/wmfreader.cxx:92
+    enum (anonymous namespace)::WMFRecords W_META_SELECTCLIPREGION
+emfio/source/reader/wmfreader.cxx:93
+    enum (anonymous namespace)::WMFRecords W_META_SELECTOBJECT
+emfio/source/reader/wmfreader.cxx:94
+    enum (anonymous namespace)::WMFRecords W_META_SETTEXTALIGN
+emfio/source/reader/wmfreader.cxx:95
+    enum (anonymous namespace)::WMFRecords W_META_DRAWTEXT
+emfio/source/reader/wmfreader.cxx:96
+    enum (anonymous namespace)::WMFRecords W_META_CHORD
+emfio/source/reader/wmfreader.cxx:97
+    enum (anonymous namespace)::WMFRecords W_META_SETMAPPERFLAGS
+emfio/source/reader/wmfreader.cxx:98
+    enum (anonymous namespace)::WMFRecords W_META_EXTTEXTOUT
+emfio/source/reader/wmfreader.cxx:99
+    enum (anonymous namespace)::WMFRecords W_META_SETDIBTODEV
+emfio/source/reader/wmfreader.cxx:100
+    enum (anonymous namespace)::WMFRecords W_META_SELECTPALETTE
+emfio/source/reader/wmfreader.cxx:101
+    enum (anonymous namespace)::WMFRecords W_META_REALIZEPALETTE
+emfio/source/reader/wmfreader.cxx:102
+    enum (anonymous namespace)::WMFRecords W_META_ANIMATEPALETTE
+emfio/source/reader/wmfreader.cxx:103
+    enum (anonymous namespace)::WMFRecords W_META_SETPALENTRIES
+emfio/source/reader/wmfreader.cxx:104
+    enum (anonymous namespace)::WMFRecords W_META_POLYPOLYGON
+emfio/source/reader/wmfreader.cxx:105
+    enum (anonymous namespace)::WMFRecords W_META_RESIZEPALETTE
+emfio/source/reader/wmfreader.cxx:106
+    enum (anonymous namespace)::WMFRecords W_META_DIBBITBLT
+emfio/source/reader/wmfreader.cxx:107
+    enum (anonymous namespace)::WMFRecords W_META_DIBSTRETCHBLT
+emfio/source/reader/wmfreader.cxx:108
+    enum (anonymous namespace)::WMFRecords W_META_DIBCREATEPATTERNBRUSH
+emfio/source/reader/wmfreader.cxx:109
+    enum (anonymous namespace)::WMFRecords W_META_STRETCHDIB
+emfio/source/reader/wmfreader.cxx:110
+    enum (anonymous namespace)::WMFRecords W_META_EXTFLOODFILL
+emfio/source/reader/wmfreader.cxx:111
+    enum (anonymous namespace)::WMFRecords W_META_RESETDC
+emfio/source/reader/wmfreader.cxx:112
+    enum (anonymous namespace)::WMFRecords W_META_STARTDOC
+emfio/source/reader/wmfreader.cxx:113
+    enum (anonymous namespace)::WMFRecords W_META_STARTPAGE
+emfio/source/reader/wmfreader.cxx:114
+    enum (anonymous namespace)::WMFRecords W_META_ENDPAGE
+emfio/source/reader/wmfreader.cxx:115
+    enum (anonymous namespace)::WMFRecords W_META_ABORTDOC
+emfio/source/reader/wmfreader.cxx:116
+    enum (anonymous namespace)::WMFRecords W_META_ENDDOC
+emfio/source/reader/wmfreader.cxx:117
+    enum (anonymous namespace)::WMFRecords W_META_DELETEOBJECT
+emfio/source/reader/wmfreader.cxx:118
+    enum (anonymous namespace)::WMFRecords W_META_CREATEPALETTE
+emfio/source/reader/wmfreader.cxx:119
+    enum (anonymous namespace)::WMFRecords W_META_CREATEBRUSH
+emfio/source/reader/wmfreader.cxx:120
+    enum (anonymous namespace)::WMFRecords W_META_CREATEPATTERNBRUSH
+emfio/source/reader/wmfreader.cxx:121
+    enum (anonymous namespace)::WMFRecords W_META_CREATEPENINDIRECT
+emfio/source/reader/wmfreader.cxx:122
+    enum (anonymous namespace)::WMFRecords W_META_CREATEFONTINDIRECT
+emfio/source/reader/wmfreader.cxx:123
+    enum (anonymous namespace)::WMFRecords W_META_CREATEBRUSHINDIRECT
+emfio/source/reader/wmfreader.cxx:124
+    enum (anonymous namespace)::WMFRecords W_META_CREATEBITMAPINDIRECT
+emfio/source/reader/wmfreader.cxx:125
+    enum (anonymous namespace)::WMFRecords W_META_CREATEBITMAP
+emfio/source/reader/wmfreader.cxx:126
+    enum (anonymous namespace)::WMFRecords W_META_CREATEREGION
+extensions/source/update/check/updatehdl.hxx:63
+    enum UpdateState UPDATESTATE_AUTO_START
+filter/source/msfilter/msdffimp.cxx:180
+    enum (anonymous namespace)::OfficeArtBlipRecInstance EMF
+filter/source/msfilter/msdffimp.cxx:181
+    enum (anonymous namespace)::OfficeArtBlipRecInstance WMF
+filter/source/msfilter/msdffimp.cxx:182
+    enum (anonymous namespace)::OfficeArtBlipRecInstance PICT
+filter/source/msfilter/msdffimp.cxx:183
+    enum (anonymous namespace)::OfficeArtBlipRecInstance JPEG_RGB
+filter/source/msfilter/msdffimp.cxx:184
+    enum (anonymous namespace)::OfficeArtBlipRecInstance JPEG_CMYK
+filter/source/msfilter/msdffimp.cxx:185
+    enum (anonymous namespace)::OfficeArtBlipRecInstance PNG
+filter/source/msfilter/msdffimp.cxx:186
+    enum (anonymous namespace)::OfficeArtBlipRecInstance DIB
+filter/source/msfilter/msdffimp.cxx:187
+    enum (anonymous namespace)::OfficeArtBlipRecInstance TIFF
+framework/inc/xml/imagesdocumenthandler.hxx:39
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_IMAGECONTAINER
-framework/inc/xml/imagesdocumenthandler.hxx:41
+framework/inc/xml/imagesdocumenthandler.hxx:40
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_IMAGES
-framework/inc/xml/imagesdocumenthandler.hxx:42
+framework/inc/xml/imagesdocumenthandler.hxx:41
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_ENTRY
-framework/inc/xml/imagesdocumenthandler.hxx:47
+framework/inc/xml/imagesdocumenthandler.hxx:46
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_COMMAND
-framework/inc/xml/statusbardocumenthandler.hxx:44
+framework/inc/xml/statusbardocumenthandler.hxx:43
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ELEMENT_STATUSBAR
-framework/inc/xml/statusbardocumenthandler.hxx:45
+framework/inc/xml/statusbardocumenthandler.hxx:44
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ELEMENT_STATUSBARITEM
-framework/inc/xml/statusbardocumenthandler.hxx:46
+framework/inc/xml/statusbardocumenthandler.hxx:45
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_URL
-framework/inc/xml/statusbardocumenthandler.hxx:47
+framework/inc/xml/statusbardocumenthandler.hxx:46
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_ALIGN
-framework/inc/xml/statusbardocumenthandler.hxx:48
+framework/inc/xml/statusbardocumenthandler.hxx:47
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_STYLE
-framework/inc/xml/statusbardocumenthandler.hxx:49
+framework/inc/xml/statusbardocumenthandler.hxx:48
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_AUTOSIZE
-framework/inc/xml/statusbardocumenthandler.hxx:50
+framework/inc/xml/statusbardocumenthandler.hxx:49
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_OWNERDRAW
-framework/inc/xml/statusbardocumenthandler.hxx:51
+framework/inc/xml/statusbardocumenthandler.hxx:50
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_WIDTH
-framework/inc/xml/statusbardocumenthandler.hxx:52
+framework/inc/xml/statusbardocumenthandler.hxx:51
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_OFFSET
-framework/inc/xml/statusbardocumenthandler.hxx:53
+framework/inc/xml/statusbardocumenthandler.hxx:52
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_HELPURL
-framework/inc/xml/statusbardocumenthandler.hxx:54
+framework/inc/xml/statusbardocumenthandler.hxx:53
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_MANDATORY
-framework/inc/xml/toolboxdocumenthandler.hxx:44
+framework/inc/xml/toolboxdocumenthandler.hxx:43
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ELEMENT_TOOLBAR
-framework/inc/xml/toolboxdocumenthandler.hxx:45
+framework/inc/xml/toolboxdocumenthandler.hxx:44
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ELEMENT_TOOLBARITEM
-framework/inc/xml/toolboxdocumenthandler.hxx:46
+framework/inc/xml/toolboxdocumenthandler.hxx:45
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ELEMENT_TOOLBARSPACE
-framework/inc/xml/toolboxdocumenthandler.hxx:47
+framework/inc/xml/toolboxdocumenthandler.hxx:46
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ELEMENT_TOOLBARBREAK
-framework/inc/xml/toolboxdocumenthandler.hxx:48
+framework/inc/xml/toolboxdocumenthandler.hxx:47
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ELEMENT_TOOLBARSEPARATOR
-framework/inc/xml/toolboxdocumenthandler.hxx:49
+framework/inc/xml/toolboxdocumenthandler.hxx:48
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ATTRIBUTE_TEXT
-framework/inc/xml/toolboxdocumenthandler.hxx:50
+framework/inc/xml/toolboxdocumenthandler.hxx:49
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ATTRIBUTE_URL
-framework/inc/xml/toolboxdocumenthandler.hxx:51
+framework/inc/xml/toolboxdocumenthandler.hxx:50
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ATTRIBUTE_VISIBLE
-framework/inc/xml/toolboxdocumenthandler.hxx:52
+framework/inc/xml/toolboxdocumenthandler.hxx:51
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ATTRIBUTE_STYLE
-framework/inc/xml/toolboxdocumenthandler.hxx:53
+framework/inc/xml/toolboxdocumenthandler.hxx:52
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry TB_ATTRIBUTE_UINAME
-include/connectivity/dbtools.hxx:817
+include/comphelper/errcode.hxx:162
+    enum DialogMask ButtonsYesNo
+include/comphelper/errcode.hxx:165
+    enum DialogMask ButtonDefaultsCancel
+include/comphelper/errcode.hxx:166
+    enum DialogMask ButtonDefaultsYes
+include/comphelper/errcode.hxx:167
+    enum DialogMask ButtonDefaultsNo
+include/connectivity/dbtools.hxx:821
     enum connectivity::dbase::DBFType dBaseIII
-include/connectivity/dbtools.hxx:818
+include/connectivity/dbtools.hxx:822
     enum connectivity::dbase::DBFType dBaseIV
-include/connectivity/dbtools.hxx:819
+include/connectivity/dbtools.hxx:823
     enum connectivity::dbase::DBFType dBaseV
-include/connectivity/dbtools.hxx:820
+include/connectivity/dbtools.hxx:824
     enum connectivity::dbase::DBFType VisualFoxPro
-include/connectivity/dbtools.hxx:821
+include/connectivity/dbtools.hxx:825
     enum connectivity::dbase::DBFType VisualFoxProAuto
-include/connectivity/dbtools.hxx:822
+include/connectivity/dbtools.hxx:826
     enum connectivity::dbase::DBFType dBaseFS
-include/connectivity/dbtools.hxx:823
+include/connectivity/dbtools.hxx:827
     enum connectivity::dbase::DBFType dBaseFSMemo
-include/connectivity/dbtools.hxx:824
+include/connectivity/dbtools.hxx:828
     enum connectivity::dbase::DBFType dBaseIIIMemo
-include/connectivity/dbtools.hxx:826
+include/connectivity/dbtools.hxx:830
     enum connectivity::dbase::DBFType dBaseIVMemoSQL
-include/connectivity/dbtools.hxx:827
+include/connectivity/dbtools.hxx:831
     enum connectivity::dbase::DBFType FoxProMemo
 include/connectivity/sqliterator.hxx:42
     enum connectivity::TraversalParts TableNames
@@ -312,16 +640,40 @@ include/desktop/exithelper.h:30
     int EXITHELPER_CRASH_WITH_RESTART
 include/desktop/exithelper.h:32
     int EXITHELPER_NORMAL_RESTART
-include/editeng/editeng.hxx:126
+include/docmodel/color/ComplexColor.hxx:30
+    enum model::ColorType Palette
+include/docmodel/theme/FormatScheme.hxx:211
+    enum model::BlipEffectType AlphaBiLevel
+include/docmodel/theme/FormatScheme.hxx:212
+    enum model::BlipEffectType AlphaCeiling
+include/docmodel/theme/FormatScheme.hxx:213
+    enum model::BlipEffectType AlphaFloor
+include/docmodel/theme/FormatScheme.hxx:214
+    enum model::BlipEffectType AlphaInverse
+include/docmodel/theme/FormatScheme.hxx:215
+    enum model::BlipEffectType AlphaModulate
+include/docmodel/theme/FormatScheme.hxx:217
+    enum model::BlipEffectType AlphaReplace
+include/docmodel/theme/FormatScheme.hxx:219
+    enum model::BlipEffectType Blur
+include/docmodel/theme/FormatScheme.hxx:221
+    enum model::BlipEffectType ColorReplace
+include/docmodel/theme/FormatScheme.hxx:222
+    enum model::BlipEffectType DuoTone
+include/docmodel/theme/FormatScheme.hxx:223
+    enum model::BlipEffectType FillOverlay
+include/docmodel/theme/FormatScheme.hxx:225
+    enum model::BlipEffectType HSL
+include/docmodel/theme/FormatScheme.hxx:227
+    enum model::BlipEffectType Tint
+include/editeng/editeng.hxx:132
     enum GetAttribsFlags STYLESHEET
-include/editeng/editeng.hxx:127
+include/editeng/editeng.hxx:133
     enum GetAttribsFlags PARAATTRIBS
-include/editeng/editstat.hxx:46
+include/editeng/editstat.hxx:47
     enum EEControlBits AUTOCOMPLETE
 include/editeng/flditem.hxx:91
     enum SvxDateFormat System
-include/editeng/flditem.hxx:93
-    enum SvxDateFormat StdBig
 include/editeng/flditem.hxx:260
     enum SvxTimeFormat System
 include/editeng/flditem.hxx:268
@@ -338,9 +690,9 @@ include/framework/framelistanalyzer.hxx:40
     enum FrameAnalyzerFlags Model
 include/framework/framelistanalyzer.hxx:45
     enum FrameAnalyzerFlags Zombie
-include/i18nutil/casefolding.hxx:40
-    enum MappingType CasedLetterMask
 include/i18nutil/casefolding.hxx:41
+    enum MappingType CasedLetterMask
+include/i18nutil/casefolding.hxx:42
     enum MappingType NotValue
 include/LibreOfficeKit/LibreOfficeKitEnums.h:33
     LibreOfficeKitPartMode LOK_PARTMODE_SLIDES
@@ -348,18 +700,14 @@ include/LibreOfficeKit/LibreOfficeKitEnums.h:34
     LibreOfficeKitPartMode LOK_PARTMODE_NOTES
 include/LibreOfficeKit/LibreOfficeKitEnums.h:40
     LibreOfficeKitTileMode LOK_TILEMODE_RGBA
-include/LibreOfficeKit/LibreOfficeKitEnums.h:48
-    LibreOfficeKitWindowAction LOK_WINDOW_PASTE
 include/LibreOfficeKit/LibreOfficeKitEnums.h:99
     LibreOfficeKitOptionalFeatures LOK_FEATURE_RANGE_HEADERS
-include/LibreOfficeKit/LibreOfficeKitEnums.h:790
-    LibreOfficeKitExtTextInputType LOK_EXT_TEXTINPUT
-include/LibreOfficeKit/LibreOfficeKitEnums.h:794
-    LibreOfficeKitExtTextInputType LOK_EXT_TEXTINPUT_END
-include/oox/core/filterbase.hxx:77
+include/LibreOfficeKit/LibreOfficeKitEnums.h:900
+    LibreOfficeKitCallbackType LOK_CALLBACK_MEDIA_SHAPE
+include/o3tl/unit_conversion.hxx:46
+    enum o3tl::Length count
+include/oox/core/filterbase.hxx:83
     enum oox::core::OoxmlVersion ISOIEC_29500_2008
-include/oox/mathml/export.hxx:33
-    enum oox::FormulaExportBase::eFormulaAlign GROUPEDCENTER
 include/sfx2/lnkbase.hxx:54
     enum sfx2::SvBaseLinkObjectType DdeExternal
 include/svl/ctloptions.hxx:64
@@ -368,52 +716,32 @@ include/svl/ctloptions.hxx:65
     enum SvtCTLOptions::TextNumerals NUMERALS_SYSTEM
 include/svl/ctloptions.hxx:66
     enum SvtCTLOptions::TextNumerals NUMERALS_CONTEXT
+include/svl/ctloptions.hxx:74
+    enum SvtCTLOptions::EOption E_CTLSEQUENCECHECKING
+include/svl/ctloptions.hxx:75
+    enum SvtCTLOptions::EOption E_CTLCURSORMOVEMENT
+include/svl/ctloptions.hxx:76
+    enum SvtCTLOptions::EOption E_CTLTEXTNUMERALS
 include/svl/ctloptions.hxx:77
     enum SvtCTLOptions::EOption E_CTLSEQUENCECHECKINGRESTRICTED
 include/svl/ctloptions.hxx:78
     enum SvtCTLOptions::EOption E_CTLSEQUENCECHECKINGTYPEANDREPLACE
-include/svl/languageoptions.hxx:60
-    enum SvtLanguageOptions::EOption E_CJKFONT
-include/svl/languageoptions.hxx:61
-    enum SvtLanguageOptions::EOption E_VERTICALTEXT
-include/svl/languageoptions.hxx:62
-    enum SvtLanguageOptions::EOption E_ASIANTYPOGRAPHY
-include/svl/languageoptions.hxx:63
-    enum SvtLanguageOptions::EOption E_JAPANESEFIND
-include/svl/languageoptions.hxx:64
-    enum SvtLanguageOptions::EOption E_RUBY
-include/svl/languageoptions.hxx:65
-    enum SvtLanguageOptions::EOption E_CHANGECASEMAP
-include/svl/languageoptions.hxx:66
-    enum SvtLanguageOptions::EOption E_DOUBLELINES
-include/svl/languageoptions.hxx:67
-    enum SvtLanguageOptions::EOption E_EMPHASISMARKS
-include/svl/languageoptions.hxx:68
-    enum SvtLanguageOptions::EOption E_VERTICALCALLOUT
-include/svl/languageoptions.hxx:72
-    enum SvtLanguageOptions::EOption E_CTLSEQUENCECHECKING
-include/svl/languageoptions.hxx:73
-    enum SvtLanguageOptions::EOption E_CTLCURSORMOVEMENT
-include/svl/languageoptions.hxx:74
-    enum SvtLanguageOptions::EOption E_CTLTEXTNUMERALS
-include/svl/lockfilecommon.hxx:34
+include/svl/hint.hxx:107
+    enum SfxHintId StyleSheetModifiedExtended
+include/svl/lockfilecommon.hxx:36
     enum LockFileComponent EDITTIME
-include/svl/lockfilecommon.hxx:34
+include/svl/lockfilecommon.hxx:36
     enum LockFileComponent LOCALHOST
-include/svl/lockfilecommon.hxx:34
+include/svl/lockfilecommon.hxx:36
     enum LockFileComponent OOOUSERNAME
-include/svl/lockfilecommon.hxx:34
+include/svl/lockfilecommon.hxx:36
     enum LockFileComponent SYSUSERNAME
-include/svl/poolitem.hxx:90
-    enum SfxItemState READONLY
 include/svl/srchdefs.hxx:40
     enum SearchOptionFlags WILDCARD
-include/svtools/apearcfg.hxx:29
-    enum SnapType ToMiddle
-include/svtools/apearcfg.hxx:34
-    enum DragMode FullWindow
-include/svtools/apearcfg.hxx:35
-    enum DragMode Frame
+include/svtools/restartdialog.hxx:64
+    enum svtools::RestartReason RESTART_REASON_MSCOMPATIBLE_FORMS_MENU
+include/svx/diagram/datamodel.hxx:43
+    enum svx::diagram::TypeConstant XML_doc
 include/svx/EnhancedCustomShapeGeometry.hxx:47
     enum SvxMSDffHandleFlags MIRRORED_X
 include/svx/EnhancedCustomShapeGeometry.hxx:48
@@ -424,19 +752,19 @@ include/svx/EnhancedCustomShapeGeometry.hxx:57
     enum SvxMSDffHandleFlags CENTER_X_IS_SPECIAL
 include/svx/EnhancedCustomShapeGeometry.hxx:58
     enum SvxMSDffHandleFlags CENTER_Y_IS_SPECIAL
-include/svx/flagsdef.hxx:106
+include/svx/flagsdef.hxx:109
     enum TabulatorDisableFlags TypeRight
-include/svx/flagsdef.hxx:107
+include/svx/flagsdef.hxx:110
     enum TabulatorDisableFlags TypeCenter
-include/svx/flagsdef.hxx:108
+include/svx/flagsdef.hxx:111
     enum TabulatorDisableFlags TypeDecimal
-include/svx/flagsdef.hxx:112
+include/svx/flagsdef.hxx:115
     enum TabulatorDisableFlags FillPoint
-include/svx/flagsdef.hxx:113
+include/svx/flagsdef.hxx:116
     enum TabulatorDisableFlags FillDashLine
-include/svx/flagsdef.hxx:114
+include/svx/flagsdef.hxx:117
     enum TabulatorDisableFlags FillSolidLine
-include/svx/flagsdef.hxx:115
+include/svx/flagsdef.hxx:118
     enum TabulatorDisableFlags FillSpecial
 include/svx/ruler.hxx:60
     enum SvxRulerDragFlags OBJECT_LEFT_INDENT_ONLY
@@ -444,7 +772,11 @@ include/svx/sdtakitm.hxx:31
     enum SdrTextAniKind Blink
 include/svx/svdhdl.hxx:108
     enum BitmapMarkerKind RectPlus_7x7
-include/svx/svdograf.hxx:52
+include/svx/svdobjkind.hxx:70
+    enum SdrObjKind E3D_INVENTOR_FIRST
+include/svx/svdobjkind.hxx:71
+    enum SdrObjKind E3D_INVENTOR_LAST
+include/svx/svdograf.hxx:42
     enum SdrGrafObjTransformsAttrs ROTATE
 include/svx/swframeposstrings.hxx:79
     enum SvxSwFramePosString::StringId STR_MAX
@@ -454,57 +786,45 @@ include/tools/inetmsg.hxx:72
     enum InetMessageMime NUMHDR
 include/unotools/extendedsecurityoptions.hxx:27
     enum SvtExtendedSecurityOptions::OpenHyperlinkMode OPEN_NEVER
-include/unotools/fontcfg.hxx:52
+include/unotools/fontcfg.hxx:50
     enum ImplFontAttrs Default
-include/unotools/fontcfg.hxx:53
+include/unotools/fontcfg.hxx:51
     enum ImplFontAttrs Standard
-include/unotools/fontcfg.hxx:54
-    enum ImplFontAttrs Normal
-include/unotools/fontcfg.hxx:60
+include/unotools/fontcfg.hxx:58
     enum ImplFontAttrs Special
-include/unotools/fontcfg.hxx:69
+include/unotools/fontcfg.hxx:67
     enum ImplFontAttrs CTL
-include/unotools/fontcfg.hxx:70
+include/unotools/fontcfg.hxx:68
     enum ImplFontAttrs NoneLatin
-include/unotools/fontcfg.hxx:71
+include/unotools/fontcfg.hxx:69
     enum ImplFontAttrs Full
-include/unotools/fontcfg.hxx:84
+include/unotools/fontcfg.hxx:82
     enum ImplFontAttrs CJK_AllLang
-include/unotools/fontcfg.hxx:86
+include/unotools/fontcfg.hxx:84
     enum ImplFontAttrs AllSubscript
-include/unotools/fontcfg.hxx:87
+include/unotools/fontcfg.hxx:85
     enum ImplFontAttrs AllSerifStyle
-include/unotools/fontdefs.hxx:69
+include/unotools/fontdefs.hxx:73
     enum DefaultFontType LATIN_DISPLAY
-include/unotools/fontdefs.hxx:70
+include/unotools/fontdefs.hxx:74
     enum DefaultFontType LATIN_FIXED
-include/unotools/fontdefs.hxx:80
+include/unotools/fontdefs.hxx:84
     enum DefaultFontType CTL_DISPLAY
-include/vcl/bitmap.hxx:56
-    enum BmpScaleFlag NearestNeighbor
-include/vcl/bitmap.hxx:61
-    enum BmpScaleFlag Super
-include/vcl/errinf.hxx:89
-    enum DialogMask ButtonsYesNo
-include/vcl/errinf.hxx:92
-    enum DialogMask ButtonDefaultsCancel
-include/vcl/errinf.hxx:93
-    enum DialogMask ButtonDefaultsYes
-include/vcl/errinf.hxx:94
-    enum DialogMask ButtonDefaultsNo
-include/vcl/gfxlink.hxx:53
-    enum GfxLinkType NativeFirst
+include/vcl/animate/AnimationFrame.hxx:33
+    enum Blend Source
 include/vcl/gfxlink.hxx:54
+    enum GfxLinkType NativeFirst
+include/vcl/gfxlink.hxx:55
     enum GfxLinkType NativeLast
-include/vcl/GraphicObject.hxx:35
-    enum GraphicAdjustmentFlags DRAWMODE
 include/vcl/GraphicObject.hxx:36
-    enum GraphicAdjustmentFlags COLORS
+    enum GraphicAdjustmentFlags DRAWMODE
 include/vcl/GraphicObject.hxx:37
-    enum GraphicAdjustmentFlags MIRROR
+    enum GraphicAdjustmentFlags COLORS
 include/vcl/GraphicObject.hxx:38
-    enum GraphicAdjustmentFlags ROTATE
+    enum GraphicAdjustmentFlags MIRROR
 include/vcl/GraphicObject.hxx:39
+    enum GraphicAdjustmentFlags ROTATE
+include/vcl/GraphicObject.hxx:40
     enum GraphicAdjustmentFlags TRANSPARENCY
 include/vcl/graphictools.hxx:227
     enum SvtGraphicFill::FillType fillSolid
@@ -512,24 +832,20 @@ include/vcl/headbar.hxx:187
     enum HeaderBarItemBits RIGHTIMAGE
 include/vcl/help.hxx:41
     enum QuickHelpFlags NoAutoPos
-include/vcl/keycod.hxx:31
+include/vcl/keycod.hxx:28
     enum KeyFuncType REDO
-include/vcl/keycodes.hxx:174
+include/vcl/keycodes.hxx:178
     enum ModKeyFlags Mod1Msk
-include/vcl/keycodes.hxx:175
+include/vcl/keycodes.hxx:179
     enum ModKeyFlags Mod2Msk
-include/vcl/menu.hxx:73
+include/vcl/menu.hxx:76
     enum PopupMenuFlags ExecuteUp
-include/vcl/menu.hxx:74
-    enum PopupMenuFlags ExecuteLeft
-include/vcl/menu.hxx:82
-    enum PopupMenuFlags NoHorzPlacement
-include/vcl/outdev.hxx:159
-    enum DrawTextFlags NewsEllipsis
-include/vcl/outdev.hxx:174
-    enum DrawImageFlags Highlight
-include/vcl/outdev.hxx:175
-    enum DrawImageFlags Deactive
+include/vcl/pdf/PDFAnnotAActionType.hxx:18
+    enum vcl::pdf::PDFAnnotAActionType Format
+include/vcl/pdf/PDFAnnotAActionType.hxx:19
+    enum vcl::pdf::PDFAnnotAActionType Validate
+include/vcl/pdf/PDFAnnotAActionType.hxx:20
+    enum vcl::pdf::PDFAnnotAActionType Calculate
 include/vcl/pdf/PDFAnnotationSubType.hxx:17
     enum vcl::pdf::PDFAnnotationSubType Unknown
 include/vcl/pdf/PDFAnnotationSubType.hxx:26
@@ -548,72 +864,76 @@ include/vcl/pdf/PDFBitmapType.hxx:20
     enum vcl::pdf::PDFBitmapType BGRx
 include/vcl/pdf/PDFBitmapType.hxx:21
     enum vcl::pdf::PDFBitmapType BGRA
+include/vcl/pdf/PDFErrorType.hxx:17
+    enum vcl::pdf::PDFErrorType Success
+include/vcl/pdf/PDFErrorType.hxx:18
+    enum vcl::pdf::PDFErrorType Unknown
+include/vcl/pdf/PDFErrorType.hxx:19
+    enum vcl::pdf::PDFErrorType File
+include/vcl/pdf/PDFErrorType.hxx:20
+    enum vcl::pdf::PDFErrorType Format
+include/vcl/pdf/PDFErrorType.hxx:21
+    enum vcl::pdf::PDFErrorType Password
+include/vcl/pdf/PDFErrorType.hxx:22
+    enum vcl::pdf::PDFErrorType Security
+include/vcl/pdf/PDFErrorType.hxx:23
+    enum vcl::pdf::PDFErrorType Page
+include/vcl/pdf/PDFFillMode.hxx:19
+    enum vcl::pdf::PDFFillMode Winding
+include/vcl/pdf/PDFFindFlags.hxx:22
+    enum vcl::pdf::PDFFindFlags Consecutive
+include/vcl/pdf/PDFFormFieldType.hxx:17
+    enum vcl::pdf::PDFFormFieldType Unknown
+include/vcl/pdf/PDFFormFieldType.hxx:18
+    enum vcl::pdf::PDFFormFieldType PushButton
+include/vcl/pdf/PDFFormFieldType.hxx:20
+    enum vcl::pdf::PDFFormFieldType RadioButton
+include/vcl/pdf/PDFFormFieldType.hxx:22
+    enum vcl::pdf::PDFFormFieldType ListBox
+include/vcl/pdf/PDFFormFieldType.hxx:24
+    enum vcl::pdf::PDFFormFieldType Signature
+include/vcl/pdf/PDFObjectType.hxx:17
+    enum vcl::pdf::PDFObjectType Unknown
+include/vcl/pdf/PDFObjectType.hxx:18
+    enum vcl::pdf::PDFObjectType Boolean
+include/vcl/pdf/PDFObjectType.hxx:19
+    enum vcl::pdf::PDFObjectType Number
+include/vcl/pdf/PDFObjectType.hxx:21
+    enum vcl::pdf::PDFObjectType Name
+include/vcl/pdf/PDFObjectType.hxx:22
+    enum vcl::pdf::PDFObjectType Array
+include/vcl/pdf/PDFObjectType.hxx:23
+    enum vcl::pdf::PDFObjectType Dictionary
+include/vcl/pdf/PDFObjectType.hxx:24
+    enum vcl::pdf::PDFObjectType Stream
+include/vcl/pdf/PDFObjectType.hxx:25
+    enum vcl::pdf::PDFObjectType Nullobj
+include/vcl/pdf/PDFObjectType.hxx:26
+    enum vcl::pdf::PDFObjectType Reference
 include/vcl/pdf/PDFPageObjectType.hxx:17
     enum vcl::pdf::PDFPageObjectType Unknown
-include/vcl/pdf/PDFPageObjectType.hxx:19
-    enum vcl::pdf::PDFPageObjectType Path
 include/vcl/pdf/PDFPageObjectType.hxx:21
     enum vcl::pdf::PDFPageObjectType Shading
 include/vcl/pdf/PDFSegmentType.hxx:17
     enum vcl::pdf::PDFSegmentType Unknown
 include/vcl/pdf/PDFSegmentType.hxx:19
     enum vcl::pdf::PDFSegmentType Bezierto
-include/vcl/pdfwriter.hxx:109
-    enum vcl::PDFWriter::PDFVersion PDF_1_2
-include/vcl/pdfwriter.hxx:109
-    enum vcl::PDFWriter::PDFVersion PDF_1_3
-include/vcl/pdfwriter.hxx:121
-    enum vcl::PDFWriter::StructElement Article
-include/vcl/pdfwriter.hxx:121
-    enum vcl::PDFWriter::StructElement Part
-include/vcl/pdfwriter.hxx:125
-    enum vcl::PDFWriter::StructElement H2
-include/vcl/pdfwriter.hxx:125
-    enum vcl::PDFWriter::StructElement H3
-include/vcl/pdfwriter.hxx:125
-    enum vcl::PDFWriter::StructElement H4
-include/vcl/pdfwriter.hxx:125
-    enum vcl::PDFWriter::StructElement H5
-include/vcl/pdfwriter.hxx:125
-    enum vcl::PDFWriter::StructElement H6
-include/vcl/pdfwriter.hxx:130
-    enum vcl::PDFWriter::StructElement Reference
-include/vcl/pdfwriter.hxx:139
-    enum vcl::PDFWriter::StructAttribute BlockAlign
-include/vcl/pdfwriter.hxx:139
-    enum vcl::PDFWriter::StructAttribute InlineAlign
-include/vcl/pdfwriter.hxx:140
-    enum vcl::PDFWriter::StructAttribute LineHeight
-include/vcl/pdfwriter.hxx:140
-    enum vcl::PDFWriter::StructAttribute ListNumbering
-include/vcl/pdfwriter.hxx:162
-    enum vcl::PDFWriter::StructAttributeValue After
-include/vcl/pdfwriter.hxx:162
-    enum vcl::PDFWriter::StructAttributeValue Before
-include/vcl/pdfwriter.hxx:162
-    enum vcl::PDFWriter::StructAttributeValue Start
-include/vcl/pdfwriter.hxx:168
-    enum vcl::PDFWriter::StructAttributeValue Auto
-include/vcl/pdfwriter.hxx:170
-    enum vcl::PDFWriter::StructAttributeValue Middle
-include/vcl/pdfwriter.hxx:172
-    enum vcl::PDFWriter::StructAttributeValue Normal
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue Circle
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue Decimal
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue Disc
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue LowerAlpha
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue LowerRoman
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue Square
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue UpperAlpha
-include/vcl/pdfwriter.hxx:176
-    enum vcl::PDFWriter::StructAttributeValue UpperRoman
+include/vcl/pdf/PDFTextRenderMode.hxx:17
+    enum vcl::pdf::PDFTextRenderMode Unknown
+include/vcl/pdf/PDFTextRenderMode.hxx:19
+    enum vcl::pdf::PDFTextRenderMode Stroke
+include/vcl/pdf/PDFTextRenderMode.hxx:20
+    enum vcl::pdf::PDFTextRenderMode FillStroke
+include/vcl/pdf/PDFTextRenderMode.hxx:21
+    enum vcl::pdf::PDFTextRenderMode Invisible
+include/vcl/pdf/PDFTextRenderMode.hxx:22
+    enum vcl::pdf::PDFTextRenderMode FillClip
+include/vcl/pdf/PDFTextRenderMode.hxx:23
+    enum vcl::pdf::PDFTextRenderMode StrokeClip
+include/vcl/pdf/PDFTextRenderMode.hxx:24
+    enum vcl::pdf::PDFTextRenderMode FillStrokeClip
+include/vcl/pdf/PDFTextRenderMode.hxx:25
+    enum vcl::pdf::PDFTextRenderMode Clip
 include/vcl/prntypes.hxx:37
     enum PrintQueueFlags Ready
 include/vcl/prntypes.hxx:38
@@ -666,41 +986,55 @@ include/vcl/prntypes.hxx:61
     enum PrintQueueFlags PowerSave
 include/vcl/ptrstyle.hxx:56
     enum PointerStyle Pen
-include/vcl/Scanline.hxx:46
+include/vcl/rendercontext/DrawImageFlags.hxx:29
+    enum DrawImageFlags Highlight
+include/vcl/rendercontext/DrawImageFlags.hxx:30
+    enum DrawImageFlags Deactive
+include/vcl/Scanline.hxx:43
     enum ScanlineFormat N32BitTcMask
+include/vcl/skia/SkiaHelper.hxx:31
+    enum SkiaHelper::RenderMethod RenderMetal
 include/vcl/vclenum.hxx:39
     enum MenuItemBits POPUPSELECT
-include/vcl/vclenum.hxx:114
+include/vcl/vclenum.hxx:112
     enum WindowBorderStyle NWF
-include/vcl/vclenum.hxx:151
+include/vcl/vclenum.hxx:129
     enum ExtTimeFieldFormat Long24H
-include/vcl/vclenum.hxx:151
+include/vcl/vclenum.hxx:129
     enum ExtTimeFieldFormat Short24H
-include/vcl/vclenum.hxx:152
+include/vcl/vclenum.hxx:130
     enum ExtTimeFieldFormat Long12H
-include/vcl/vclenum.hxx:152
+include/vcl/vclenum.hxx:130
     enum ExtTimeFieldFormat Short12H
-include/vcl/vclenum.hxx:153
+include/vcl/vclenum.hxx:131
     enum ExtTimeFieldFormat ShortDuration
-include/vcl/vclevent.hxx:120
+include/vcl/vclenum.hxx:276
+    enum NavbarButtonSize Auto
+include/vcl/vclenum.hxx:277
+    enum NavbarButtonSize Small
+include/vcl/vclenum.hxx:278
+    enum NavbarButtonSize Large
+include/vcl/vclenum.hxx:279
+    enum NavbarButtonSize XLarge
+include/vcl/vclevent.hxx:121
     enum VclEventId TabpageRemovedAll
-include/vcl/wall.hxx:36
-    enum WallpaperStyle Center
 include/vcl/wall.hxx:38
+    enum WallpaperStyle Center
+include/vcl/wall.hxx:40
     enum WallpaperStyle TopLeft
-include/vcl/wall.hxx:39
-    enum WallpaperStyle Top
 include/vcl/wall.hxx:41
+    enum WallpaperStyle Top
+include/vcl/wall.hxx:43
     enum WallpaperStyle Left
-include/vcl/wall.hxx:42
+include/vcl/wall.hxx:44
     enum WallpaperStyle Right
-include/vcl/wall.hxx:43
+include/vcl/wall.hxx:45
     enum WallpaperStyle BottomLeft
-include/vcl/wall.hxx:44
+include/vcl/wall.hxx:46
     enum WallpaperStyle Bottom
-include/xmloff/families.hxx:62
+include/xmloff/families.hxx:64
     enum XmlStyleFamily TEXT_ENDNOTECONFIG
-include/xmloff/xmlimp.hxx:119
+include/xmloff/xmlimp.hxx:121
     enum SvXMLImportFlags EMBEDDED
 linguistic/source/convdicxml.hxx:67
     enum ConvDicXMLToken TEXT_CONVERSION_DICTIONARY
@@ -708,50 +1042,76 @@ linguistic/source/convdicxml.hxx:68
     enum ConvDicXMLToken RIGHT_TEXT
 linguistic/source/convdicxml.hxx:69
     enum ConvDicXMLToken ENTRY
-o3tl/qa/test-enumarray.cxx:30
+o3tl/qa/test-enumarray.cxx:28
     enum MyEnum ONE
-o3tl/qa/test-enumarray.cxx:30
+o3tl/qa/test-enumarray.cxx:28
     enum MyEnum TWO
 o3tl/qa/test-typed_flags.cxx:20
     enum (anonymous namespace)::ConfigurationChangedHint TWO
-reportdesign/inc/conditionalexpression.hxx:78
-    enum rptui::ComparisonOperation eNotBetween
 reportdesign/inc/conditionalexpression.hxx:79
-    enum rptui::ComparisonOperation eEqualTo
+    enum rptui::ComparisonOperation eNotBetween
 reportdesign/inc/conditionalexpression.hxx:80
-    enum rptui::ComparisonOperation eNotEqualTo
+    enum rptui::ComparisonOperation eEqualTo
 reportdesign/inc/conditionalexpression.hxx:81
-    enum rptui::ComparisonOperation eGreaterThan
+    enum rptui::ComparisonOperation eNotEqualTo
 reportdesign/inc/conditionalexpression.hxx:82
-    enum rptui::ComparisonOperation eLessThan
+    enum rptui::ComparisonOperation eGreaterThan
 reportdesign/inc/conditionalexpression.hxx:83
-    enum rptui::ComparisonOperation eGreaterOrEqual
+    enum rptui::ComparisonOperation eLessThan
 reportdesign/inc/conditionalexpression.hxx:84
+    enum rptui::ComparisonOperation eGreaterOrEqual
+reportdesign/inc/conditionalexpression.hxx:85
     enum rptui::ComparisonOperation eLessOrEqual
-sal/qa/osl/file/osl_File.cxx:287
+sal/qa/osl/file/osl_File.cxx:281
     enum (anonymous namespace)::oslCheckMode Exist
-sc/inc/dociter.hxx:259
-    enum ScQueryCellIterator::StopOnMismatchBits nStopOnMismatchExecuted
-sc/inc/dociter.hxx:267
-    enum ScQueryCellIterator::TestEqualConditionBits nTestEqualConditionFulfilled
-sc/inc/token.hxx:216
+sc/inc/queryiter.hxx:160
+    enum ScQueryCellIteratorBase::StopOnMismatchBits nStopOnMismatchExecuted
+sc/inc/queryiter.hxx:160
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchExecuted
+sc/inc/queryiter.hxx:160
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchExecuted
+sc/inc/queryiter.hxx:160
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchExecuted
+sc/inc/queryiter.hxx:160
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchExecuted
+sc/inc/queryiter.hxx:168
+    enum ScQueryCellIteratorBase::TestEqualConditionBits nTestEqualConditionFulfilled
+sc/inc/queryiter.hxx:168
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionFulfilled
+sc/inc/queryiter.hxx:168
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionFulfilled
+sc/inc/queryiter.hxx:168
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionFulfilled
+sc/inc/queryiter.hxx:168
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionFulfilled
+sc/inc/token.hxx:215
     enum ScTableRefToken::Item HEADERS_DATA
-sc/inc/token.hxx:217
+sc/inc/token.hxx:216
     enum ScTableRefToken::Item DATA_TOTALS
-sc/inc/types.hxx:38
+sc/inc/types.hxx:37
     enum ScMatValType NonvalueMask
-sc/source/ui/inc/viewdata.hxx:43
+sc/inc/types.hxx:60
+    enum ScFormulaVectorState FormulaVectorUnknown
+sc/qa/unit/ucalc_copypaste.cxx:45
+    enum TestCopyPaste::CalcMode RecalcAtEnd
+sc/source/core/inc/interpre.hxx:59
+    enum MatchMode wildcard
+sc/source/core/inc/interpre.hxx:60
+    enum SearchMode searchrev
+sc/source/ui/inc/viewdata.hxx:42
     enum ScSplitMode SC_SPLIT_MODE_MAX_ENUM
-sc/source/ui/inc/viewdata.hxx:45
+sc/source/ui/inc/viewdata.hxx:44
     enum ScSplitPos SC_SPLIT_POS_MAX_ENUM
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx:102
     enum (anonymous namespace)::ScRegType LOGARITHMIC
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx:103
     enum (anonymous namespace)::ScRegType POWER
-sc/source/ui/unoobj/condformatuno.cxx:274
+sc/source/ui/unoobj/condformatuno.cxx:273
     enum (anonymous namespace)::DateProperties Date_StyleName
-sc/source/ui/unoobj/condformatuno.cxx:275
+sc/source/ui/unoobj/condformatuno.cxx:274
     enum (anonymous namespace)::DateProperties DateType
+sc/source/ui/view/viewfun2.cxx:267
+    enum (anonymous namespace)::ScAutoSum ScAutoSumEnd
 scaddins/source/datefunc/datefunc.hxx:41
     enum ScaCategory Finance
 scaddins/source/datefunc/datefunc.hxx:42
@@ -760,86 +1120,96 @@ scaddins/source/datefunc/datefunc.hxx:43
     enum ScaCategory Math
 scaddins/source/datefunc/datefunc.hxx:44
     enum ScaCategory Tech
-scaddins/source/pricing/pricing.hxx:49
+scaddins/source/pricing/pricing.hxx:47
     enum sca::pricing::ScaCategory DateTime
-scaddins/source/pricing/pricing.hxx:50
+scaddins/source/pricing/pricing.hxx:48
     enum sca::pricing::ScaCategory Text
-scaddins/source/pricing/pricing.hxx:52
+scaddins/source/pricing/pricing.hxx:50
     enum sca::pricing::ScaCategory Inf
-scaddins/source/pricing/pricing.hxx:53
+scaddins/source/pricing/pricing.hxx:51
     enum sca::pricing::ScaCategory Math
-scaddins/source/pricing/pricing.hxx:54
+scaddins/source/pricing/pricing.hxx:52
     enum sca::pricing::ScaCategory Tech
-sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:40
+sd/source/ui/inc/unomodel.hxx:385
+    enum SdLinkTargetType Page
+sd/source/ui/inc/unomodel.hxx:386
+    enum SdLinkTargetType Notes
+sd/source/ui/inc/unomodel.hxx:387
+    enum SdLinkTargetType Handout
+sd/source/ui/inc/unomodel.hxx:388
+    enum SdLinkTargetType MasterPage
+sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:39
     enum sd::slidesorter::cache::RequestPriorityClass MAX_CLASS
 slideshow/source/engine/shapes/viewshape.hxx:276
-    enum slideshow::internal::ViewShape::(anonymous at /home/noel/libo2/slideshow/source/engine/shapes/viewshape.hxx:276:13) MAX_RENDER_CACHE_ENTRIES
-slideshow/source/engine/slideview.cxx:242
-    enum slideshow::internal::(anonymous namespace)::LayerSpriteContainer::(anonymous at /home/noel/libo2/slideshow/source/engine/slideview.cxx:242:5) SPRITE_ULLAGE
-slideshow/source/engine/slideview.cxx:722
-    enum slideshow::internal::(anonymous namespace)::SlideView::(anonymous at /home/noel/libo2/slideshow/source/engine/slideview.cxx:722:5) LAYER_ULLAGE
+    enum slideshow::internal::ViewShape::(unnamed at /home/noel/libo-plugin/slideshow/source/engine/shapes/viewshape.hxx:276:13) MAX_RENDER_CACHE_ENTRIES
+slideshow/source/engine/slideview.cxx:243
+    enum slideshow::internal::(anonymous namespace)::LayerSpriteContainer::(unnamed at /home/noel/libo-plugin/slideshow/source/engine/slideview.cxx:243:5) SPRITE_ULLAGE
+slideshow/source/engine/slideview.cxx:723
+    enum slideshow::internal::(anonymous namespace)::SlideView::(unnamed at /home/noel/libo-plugin/slideshow/source/engine/slideview.cxx:723:5) LAYER_ULLAGE
 slideshow/source/inc/box2dtools.hxx:46
     enum box2d::utils::box2DNonsimulatedShapeUpdateType BOX2D_UPDATE_SIZE
 soltools/cpp/cpp.h:42
     int WS
-svgio/inc/svgstyleattributes.hxx:61
-    enum svgio::svgreader::FontSize FontSize_notset
-svl/source/numbers/zformat.cxx:305
+starmath/inc/mathml/def.hxx:56
+    enum SmMlElementType NMlStructural
+starmath/inc/mathml/def.hxx:57
+    enum SmMlElementType NMlSmNode
+svgio/inc/svgstyleattributes.hxx:62
+    enum svgio::svgreader::FontSize notset
+svl/source/numbers/zformat.cxx:310
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM2
-svl/source/numbers/zformat.cxx:306
+svl/source/numbers/zformat.cxx:311
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM3
-svl/source/numbers/zformat.cxx:307
+svl/source/numbers/zformat.cxx:312
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM4
-svl/source/numbers/zformat.cxx:308
+svl/source/numbers/zformat.cxx:313
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM5
-svl/source/numbers/zformat.cxx:309
+svl/source/numbers/zformat.cxx:314
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM6
-svl/source/numbers/zformat.cxx:310
+svl/source/numbers/zformat.cxx:315
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM7
-svl/source/numbers/zformat.cxx:311
+svl/source/numbers/zformat.cxx:316
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM8
-svl/source/numbers/zformat.cxx:312
+svl/source/numbers/zformat.cxx:317
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_DBNUM9
-svl/source/numbers/zformat.cxx:315
+svl/source/numbers/zformat.cxx:320
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM1
-svl/source/numbers/zformat.cxx:316
+svl/source/numbers/zformat.cxx:321
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM2
-svl/source/numbers/zformat.cxx:317
+svl/source/numbers/zformat.cxx:322
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM3
-svl/source/numbers/zformat.cxx:318
+svl/source/numbers/zformat.cxx:323
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM4
-svl/source/numbers/zformat.cxx:319
+svl/source/numbers/zformat.cxx:324
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM5
-svl/source/numbers/zformat.cxx:320
+svl/source/numbers/zformat.cxx:325
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM6
-svl/source/numbers/zformat.cxx:321
+svl/source/numbers/zformat.cxx:326
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM7
-svl/source/numbers/zformat.cxx:322
+svl/source/numbers/zformat.cxx:327
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM8
-svl/source/numbers/zformat.cxx:323
+svl/source/numbers/zformat.cxx:328
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM9
-svl/source/numbers/zformat.cxx:324
+svl/source/numbers/zformat.cxx:329
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM10
-svl/source/numbers/zformat.cxx:325
+svl/source/numbers/zformat.cxx:330
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM11
-svl/source/numbers/zformat.cxx:326
+svl/source/numbers/zformat.cxx:331
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM12
-svl/source/numbers/zformat.cxx:327
+svl/source/numbers/zformat.cxx:332
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM13
-svl/source/numbers/zformat.cxx:328
+svl/source/numbers/zformat.cxx:333
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM14
-svl/source/numbers/zformat.cxx:329
+svl/source/numbers/zformat.cxx:334
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM15
-svl/source/numbers/zformat.cxx:330
+svl/source/numbers/zformat.cxx:335
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM16
-svl/source/numbers/zformat.cxx:331
+svl/source/numbers/zformat.cxx:336
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM17
-svl/source/numbers/zformat.cxx:332
+svl/source/numbers/zformat.cxx:337
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM18
-svl/source/numbers/zformat.cxx:333
+svl/source/numbers/zformat.cxx:338
     enum (anonymous namespace)::BracketFormatSymbolType BRACKET_SYMBOLTYPE_NATNUM19
-svtools/inc/table/tablemodel.hxx:49
-    enum ColumnAttributeGroup ALL
 svx/source/inc/docrecovery.hxx:77
     enum EDocStates TryLoadBackup
 svx/source/inc/docrecovery.hxx:78
@@ -850,53 +1220,65 @@ svx/source/inc/docrecovery.hxx:85
     enum EDocStates Incomplete
 svx/source/inc/docrecovery.hxx:87
     enum EDocStates Succeeded
+svx/source/tbxctrls/fillctrl.cxx:55
+    enum (anonymous namespace)::eFillStyle SOLID
+svx/source/tbxctrls/fillctrl.cxx:56
+    enum (anonymous namespace)::eFillStyle GRADIENT
+svx/source/tbxctrls/fillctrl.cxx:57
+    enum (anonymous namespace)::eFillStyle HATCH
+svx/source/tbxctrls/fillctrl.cxx:58
+    enum (anonymous namespace)::eFillStyle BITMAP
 sw/inc/accmap.hxx:75
     enum AccessibleStates OPAQUE
+sw/inc/authfld.hxx:172
+    enum SwAuthorityField::TargetType UseDisplayURL
+sw/inc/authfld.hxx:173
+    enum SwAuthorityField::TargetType UseTargetURL
 sw/inc/crstate.hxx:32
     enum SwFillMode Space
 sw/inc/crstate.hxx:33
     enum SwFillMode Margin
 sw/inc/crstate.hxx:34
     enum SwFillMode Indent
-sw/inc/dbmgr.hxx:486
+sw/inc/dbmgr.hxx:488
     enum sw::DBConnURIType MSJET
-sw/inc/dbmgr.hxx:487
+sw/inc/dbmgr.hxx:489
     enum sw::DBConnURIType MSACE
-sw/inc/docary.hxx:69
+sw/inc/docary.hxx:73
     enum SwVectorModifyBase<class SwFrameFormat *>::DestructorPolicy FreeElements
-sw/inc/docary.hxx:69
+sw/inc/docary.hxx:73
     enum SwVectorModifyBase<class SwGrfFormatColl *>::DestructorPolicy FreeElements
-sw/inc/docary.hxx:69
+sw/inc/docary.hxx:73
     enum SwVectorModifyBase<class SwTextFormatColl *>::DestructorPolicy FreeElements
-sw/inc/docufld.hxx:113
+sw/inc/docufld.hxx:118
     enum SwExtUserSubType EU_FATHERSNAME
-sw/inc/docufld.hxx:114
+sw/inc/docufld.hxx:119
     enum SwExtUserSubType EU_APARTMENT
 sw/inc/ndtyp.hxx:42
     enum SwNodeType ContentMask
-sw/inc/reffld.hxx:40
-    enum REFERENCESUBTYPE REF_OUTLINE
-sw/inc/undobj.hxx:136
-    enum DelContentType Fly
+sw/inc/SwCapConfigProp.hxx:24
+    enum CapConfigProp PROP_CAP_OBJECT_ENABLE
 sw/inc/undobj.hxx:137
+    enum DelContentType Fly
+sw/inc/undobj.hxx:138
     enum DelContentType Bkm
 sw/source/core/inc/dbg_lay.hxx:28
     enum PROT Init
-sw/source/core/inc/SwXMLBlockImport.hxx:79
+sw/source/core/inc/SwXMLBlockImport.hxx:78
     enum SwXMLTextBlockToken OFFICE_BODY
-sw/source/core/inc/SwXMLBlockImport.hxx:80
+sw/source/core/inc/SwXMLBlockImport.hxx:79
     enum SwXMLTextBlockToken OFFICE_TEXT
-sw/source/core/inc/SwXMLBlockImport.hxx:81
+sw/source/core/inc/SwXMLBlockImport.hxx:80
     enum SwXMLTextBlockToken OFFICE_DOCUMENT
-sw/source/core/inc/SwXMLBlockImport.hxx:82
+sw/source/core/inc/SwXMLBlockImport.hxx:81
     enum SwXMLTextBlockToken OFFICE_DOCUMENT_CONTENT
-sw/source/core/inc/SwXMLBlockImport.hxx:83
+sw/source/core/inc/SwXMLBlockImport.hxx:82
     enum SwXMLTextBlockToken TEXT_P
-sw/source/core/inc/SwXMLBlockImport.hxx:104
+sw/source/core/inc/SwXMLBlockImport.hxx:103
     enum SwXMLBlockListToken BLOCK
-sw/source/core/inc/SwXMLBlockImport.hxx:105
+sw/source/core/inc/SwXMLBlockImport.hxx:104
     enum SwXMLBlockListToken BLOCK_LIST
-sw/source/core/text/pormulti.hxx:48
+sw/source/core/text/pormulti.hxx:47
     enum RubyPosition RIGHT
 sw/source/filter/ww8/ww8scan.hxx:603
     enum WW8PLCFx_Fc_FKP::Limits eMaxCache
@@ -908,40 +1290,36 @@ sw/source/uibase/inc/envimg.hxx:33
     enum SwEnvAlign ENV_VER_LEFT
 sw/source/uibase/inc/envimg.hxx:34
     enum SwEnvAlign ENV_VER_CNTR
-tools/source/generic/poly.cxx:1118
-    enum (anonymous at /home/noel/libo2/tools/source/generic/poly.cxx:1118:5) maxRecursionDepth
-ucbhelper/source/client/proxydecider.cxx:128
+toolkit/inc/controls/table/tablemodel.hxx:49
+    enum ColumnAttributeGroup ALL
+tools/source/generic/poly.cxx:1132
+    enum (unnamed at /home/noel/libo-plugin/tools/source/generic/poly.cxx:1132:5) maxRecursionDepth
+ucb/source/ucp/webdav-curl/DAVTypes.hxx:183
+    enum http_dav_ucp::Depth DAVINFINITY
+ucbhelper/source/client/proxydecider.cxx:126
     enum ucbhelper::proxydecider_impl::InternetProxyDecider_Impl::ProxyType Automatic
+vcl/inc/dndhelper.hxx:31
+    enum vcl::DragOrDrop Drag
 vcl/inc/driverblocklist.hxx:65
     enum DriverBlocklist::OperatingSystem DRIVER_OS_WINDOWS_LAST
 vcl/inc/driverblocklist.hxx:73
     enum DriverBlocklist::OperatingSystem DRIVER_OS_OSX_LAST
-vcl/inc/fontsubset.hxx:42
+vcl/inc/fontsubset.hxx:41
     enum FontType ANY_TYPE1
-vcl/inc/salbmp.hxx:123
-    enum SalBitmap::BitConvert RGB
-vcl/inc/salbmp.hxx:124
-    enum SalBitmap::BitConvert BGR
-vcl/inc/salptype.hxx:44
+vcl/inc/pdf/pdfwriter_impl.hxx:87
+    enum vcl::pdf::GraphicsStateUpdateFlags MapMode
+vcl/inc/pdf/pdfwriter_impl.hxx:92
+    enum vcl::pdf::GraphicsStateUpdateFlags TransparentPercent
+vcl/inc/salptype.hxx:45
     enum SalPrinterError Abort
-vcl/source/app/svapp.cxx:1120
-    enum (anonymous at /home/noel/libo2/vcl/source/app/svapp.cxx:1120:1) hwEnv
-vcl/source/app/svapp.cxx:1120
-    enum (anonymous at /home/noel/libo2/vcl/source/app/svapp.cxx:1120:1) hwUI
+vcl/source/app/svapp.cxx:1178
+    enum (unnamed at /home/noel/libo-plugin/vcl/source/app/svapp.cxx:1178:1) hwEnv
+vcl/source/app/svapp.cxx:1178
+    enum (unnamed at /home/noel/libo-plugin/vcl/source/app/svapp.cxx:1178:1) hwUI
 vcl/source/filter/jpeg/Exif.hxx:40
     enum Tag ORIENTATION
-vcl/source/gdi/CommonSalLayout.cxx:133
-    enum (anonymous namespace)::VerticalOrientation Upright
-vcl/source/gdi/CommonSalLayout.cxx:136
-    enum (anonymous namespace)::VerticalOrientation TransformedRotated
-vcl/source/gdi/pdfwriter_impl.hxx:84
-    enum vcl::pdf::GraphicsStateUpdateFlags MapMode
-vcl/source/gdi/pdfwriter_impl.hxx:89
-    enum vcl::pdf::GraphicsStateUpdateFlags TransparentPercent
-vcl/source/window/printdlg.cxx:55
-    enum (anonymous at /home/noel/libo2/vcl/source/window/printdlg.cxx:52:1) ORIENTATION_PORTRAIT
-writerfilter/source/dmapper/PropertyIds.hxx:230
-    enum writerfilter::dmapper::PropertyIds PROP_PARA_HYPHENATION_NO_CAPS
+vcl/source/window/printdlg.cxx:59
+    enum (unnamed at /home/noel/libo-plugin/vcl/source/window/printdlg.cxx:56:1) ORIENTATION_PORTRAIT
 writerfilter/source/ooxml/OOXMLFactory.hxx:33
     enum writerfilter::ooxml::ResourceType List
 writerfilter/source/ooxml/OOXMLFactory.hxx:34
@@ -962,3 +1340,5 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:51
     enum writerfilter::ooxml::ResourceType HpsMeasure
 writerfilter/source/ooxml/OOXMLFactory.hxx:52
     enum writerfilter::ooxml::ResourceType MeasurementOrPercent
+xmlsecurity/source/helper/ooxmlsecparser.cxx:964
+    enum OOXMLSecParser::DsSignaturePropertyContext::SignatureProperty Info
diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results b/compilerplugins/clang/unusedenumconstants.untouched.results
index 668d514419e9..a470b4cd6607 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -2,35 +2,153 @@ canvas/inc/rendering/icolorbuffer.hxx:37
     enum canvas::IColorBuffer::Format A8R8G8B8
 canvas/inc/rendering/icolorbuffer.hxx:40
     enum canvas::IColorBuffer::Format X8R8G8B8
-canvas/inc/rendering/irendermodule.hxx:54
+canvas/inc/rendering/irendermodule.hxx:55
     enum canvas::IRenderModule::PrimitiveType Unknown
-cui/source/options/optfltr.cxx:35
+chart2/source/model/main/Diagram.cxx:99
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_DATATABLEHBORDER
+chart2/source/model/main/Diagram.cxx:101
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_DATATABLEVBORDER
+chart2/source/model/main/Diagram.cxx:102
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_DATATABLEOUTLINE
+connectivity/source/inc/propertyids.hxx:87
+    enum PropertyId PROPERTY_ID_INVALID_INDEX
+connectivity/source/inc/propertyids.hxx:93
+    enum PropertyId PROPERTY_ID_IM001
+cui/source/options/optfltr.cxx:37
     enum MSFltrPg2_CheckBoxEntries InvalidCBEntry
-drawinglayer/source/tools/emfphelperdata.cxx:65
-    enum emfplushelper::(anonymous at /home/noel/libo2/drawinglayer/source/tools/emfphelperdata.cxx:59:5) WrapModeClamp
+drawinglayer/source/tools/emfphelperdata.cxx:67
+    enum emfplushelper::(unnamed at /home/noel/libo-plugin/drawinglayer/source/tools/emfphelperdata.cxx:61:5) WrapModeClamp
 drawinglayer/source/tools/emfpimage.hxx:30
     emfplushelper::ImageDataType ImageDataTypeUnknown
-framework/inc/xml/imagesdocumenthandler.hxx:43
+drawinglayer/source/tools/emfppen.hxx:75
+    enum emfplushelper::LineJoinType LineJoinTypeMiter
+drawinglayer/source/tools/emfppen.hxx:76
+    enum emfplushelper::LineJoinType LineJoinTypeBevel
+drawinglayer/source/tools/emfppen.hxx:77
+    enum emfplushelper::LineJoinType LineJoinTypeRound
+drawinglayer/source/tools/emfppen.hxx:78
+    enum emfplushelper::LineJoinType LineJoinTypeMiterClipped
+emfio/inc/mtftools.hxx:78
+    enum emfio::StockObject ANSI_FIXED_FONT
+emfio/inc/mtftools.hxx:79
+    enum emfio::StockObject ANSI_VAR_FONT
+emfio/inc/mtftools.hxx:80
+    enum emfio::StockObject SYSTEM_FIXED_FONT
+emfio/inc/mtftools.hxx:128
+    enum emfio::StretchMode HALFTONE
+emfio/inc/mtftools.hxx:129
+    enum emfio::StretchMode STRETCH_ANDSCANS
+emfio/inc/mtftools.hxx:130
+    enum emfio::StretchMode STRETCH_ORSCANS
+emfio/inc/mtftools.hxx:131
+    enum emfio::StretchMode STRETCH_DELETESCANS
+emfio/inc/mtftools.hxx:184
+    enum emfio::TextAlignmentMode TA_RTLREADING
+emfio/inc/mtftools.hxx:196
+    enum emfio::TernaryRasterOperation SRCERASE
+emfio/inc/mtftools.hxx:197
+    enum emfio::TernaryRasterOperation PATCOPY
+emfio/inc/mtftools.hxx:199
+    enum emfio::TernaryRasterOperation BLACKNESS
+emfio/inc/mtftools.hxx:200
+    enum emfio::TernaryRasterOperation WHITENESS
+emfio/inc/mtftools.hxx:214
+    enum emfio::PenStyle PS_USERSTYLE
+emfio/inc/mtftools.hxx:215
+    enum emfio::PenStyle PS_ALTERNATE
+emfio/inc/mtftools.hxx:235
+    enum emfio::CharacterSet ANSI_CHARSET
+emfio/inc/mtftools.hxx:237
+    enum emfio::CharacterSet SYMBOL_CHARSET
+emfio/inc/mtftools.hxx:238
+    enum emfio::CharacterSet SHIFTJIS_CHARSET
+emfio/inc/mtftools.hxx:239
+    enum emfio::CharacterSet HANGUL_CHARSET
+emfio/inc/mtftools.hxx:240
+    enum emfio::CharacterSet GB2312_CHARSET
+emfio/inc/mtftools.hxx:241
+    enum emfio::CharacterSet CHINESEBIG5_CHARSET
+emfio/inc/mtftools.hxx:244
+    enum emfio::CharacterSet MAC_CHARSET
+emfio/inc/mtftools.hxx:245
+    enum emfio::CharacterSet JOHAB_CHARSET
+emfio/inc/mtftools.hxx:246
+    enum emfio::CharacterSet GREEK_CHARSET
+emfio/inc/mtftools.hxx:247
+    enum emfio::CharacterSet TURKISH_CHARSET
+emfio/inc/mtftools.hxx:248
+    enum emfio::CharacterSet VIETNAMESE_CHARSET
+emfio/inc/mtftools.hxx:249
+    enum emfio::CharacterSet HEBREW_CHARSET
+emfio/inc/mtftools.hxx:250
+    enum emfio::CharacterSet ARABIC_CHARSET
+emfio/inc/mtftools.hxx:251
+    enum emfio::CharacterSet BALTIC_CHARSET
+emfio/inc/mtftools.hxx:252
+    enum emfio::CharacterSet RUSSIAN_CHARSET
+emfio/inc/mtftools.hxx:253
+    enum emfio::CharacterSet THAI_CHARSET
+emfio/inc/mtftools.hxx:254
+    enum emfio::CharacterSet EASTEUROPE_CHARSET
+emfio/inc/mtftools.hxx:283
+    enum emfio::FamilyFont FF_DONTCARE
+emfio/inc/mtftools.hxx:294
+    enum emfio::WeightFont FW_EXTRALIGHT
+emfio/inc/mtftools.hxx:296
+    enum emfio::WeightFont FW_NORMAL
+emfio/inc/mtftools.hxx:300
+    enum emfio::WeightFont FW_EXTRABOLD
+emfio/inc/mtftools.hxx:303
+    enum emfio::WeightFont FW_BLACK
+emfio/inc/mtftools.hxx:312
+    enum emfio::BrushStyle BS_HATCHED
+emfio/inc/mtftools.hxx:314
+    enum emfio::BrushStyle BS_INDEXED
+emfio/inc/mtftools.hxx:315
+    enum emfio::BrushStyle BS_DIBPATTERN
+emfio/inc/mtftools.hxx:316
+    enum emfio::BrushStyle BS_DIBPATTERNPT
+emfio/inc/mtftools.hxx:317
+    enum emfio::BrushStyle BS_PATTERN8X8
+emfio/inc/mtftools.hxx:318
+    enum emfio::BrushStyle BS_DIBPATTERN8X8
+emfio/inc/mtftools.hxx:319
+    enum emfio::BrushStyle BS_MONOPATTERN
+framework/inc/xml/imagesdocumenthandler.hxx:42
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_EXTERNALIMAGES
-framework/inc/xml/imagesdocumenthandler.hxx:44
+framework/inc/xml/imagesdocumenthandler.hxx:43
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_EXTERNALENTRY
-framework/inc/xml/imagesdocumenthandler.hxx:45
+framework/inc/xml/imagesdocumenthandler.hxx:44
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_HREF
-framework/inc/xml/imagesdocumenthandler.hxx:46
+framework/inc/xml/imagesdocumenthandler.hxx:45
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_MASKCOLOR
-framework/inc/xml/imagesdocumenthandler.hxx:48
+framework/inc/xml/imagesdocumenthandler.hxx:47
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_BITMAPINDEX
-framework/inc/xml/imagesdocumenthandler.hxx:49
+framework/inc/xml/imagesdocumenthandler.hxx:48
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_MASKURL
-framework/inc/xml/imagesdocumenthandler.hxx:50
+framework/inc/xml/imagesdocumenthandler.hxx:49
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_MASKMODE
-framework/inc/xml/imagesdocumenthandler.hxx:51
+framework/inc/xml/imagesdocumenthandler.hxx:50
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_HIGHCONTRASTURL
-framework/inc/xml/imagesdocumenthandler.hxx:52
+framework/inc/xml/imagesdocumenthandler.hxx:51
     enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_HIGHCONTRASTMASKURL
 framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx:44
     enum (anonymous namespace)::EPROPERTIES PROPERTYCOUNT
-include/connectivity/dbtools.hxx:825
+include/basic/basmgr.hxx:46
+    enum BasicErrorReason OPENLIBSTORAGE
+include/basic/basmgr.hxx:47
+    enum BasicErrorReason OPENMGRSTREAM
+include/basic/basmgr.hxx:48
+    enum BasicErrorReason OPENLIBSTREAM
+include/basic/basmgr.hxx:49
+    enum BasicErrorReason LIBNOTFOUND
+include/basic/basmgr.hxx:50
+    enum BasicErrorReason STORAGENOTFOUND
+include/basic/basmgr.hxx:51
+    enum BasicErrorReason BASICLOADERROR
+include/basic/basmgr.hxx:52
+    enum BasicErrorReason STDLIB
+include/connectivity/dbtools.hxx:829
     enum connectivity::dbase::DBFType dBaseIVMemo
 include/desktop/exithelper.h:26
     enum EExitCodes EXITHELPER_NO_ERROR
@@ -38,7 +156,9 @@ include/desktop/exithelper.h:26
     int EXITHELPER_NO_ERROR
 include/desktop/exithelper.h:28
     int EXITHELPER_FATAL_ERROR
-include/editeng/borderline.hxx:131
+include/docmodel/color/Transformation.hxx:39
+    enum model::TransformationType SatOff
+include/editeng/borderline.hxx:134
     enum SvxBorderLineStyle BORDER_LINE_STYLE_MAX
 include/filter/msfilter/ww8fields.hxx:28
     enum ww::eField ePOSSIBLEBOOKMARK
@@ -64,37 +184,55 @@ include/i18nutil/transliteration.hxx:119
     enum TransliterationFlags largeToSmall_ja_JP
 include/LibreOfficeKit/LibreOfficeKitEnums.h:56
     LibreOfficeKitSelectionType LOK_SELTYPE_LARGE_TEXT
-include/LibreOfficeKit/LibreOfficeKitEnums.h:792
+include/LibreOfficeKit/LibreOfficeKitEnums.h:1072
     LibreOfficeKitExtTextInputType LOK_EXT_TEXTINPUT_POS
 include/oox/ole/axfontdata.hxx:39
     enum AxFontFlags Disabled
 include/oox/ole/axfontdata.hxx:40
     enum AxFontFlags AutoColor
-include/unotools/eventcfg.hxx:29
-    enum GlobalEventId STARTAPP
+include/svl/inettype.hxx:173
+    enum INetContentType CONTENT_TYPE_IMAGE_WEBP
+include/svtools/colorcfg.hxx:47
+    enum svtools::ColorConfigEntry WRITERDIRECTCURSOR
+include/svx/diagram/datamodel.hxx:41
+    enum svx::diagram::TypeConstant XML_type
+include/svx/diagram/datamodel.hxx:42
+    enum svx::diagram::TypeConstant XML_asst
+include/svx/diagram/datamodel.hxx:47
+    enum svx::diagram::TypeConstant XML_parTrans
+include/svx/diagram/datamodel.hxx:52
+    enum svx::diagram::TypeConstant XML_sibTrans
+include/tools/stream.hxx:55
+    enum StreamMode DELETE_ON_CLOSE
 include/unotools/eventcfg.hxx:30
+    enum GlobalEventId STARTAPP
+include/unotools/eventcfg.hxx:31
     enum GlobalEventId CLOSEAPP
 include/unotools/extendedsecurityoptions.hxx:28
     enum SvtExtendedSecurityOptions::OpenHyperlinkMode OPEN_WITHSECURITYCHECK
-include/unotools/sharedunocomponent.hxx:149
+include/unotools/itemholderbase.hxx:28
+    enum EItem AccessibilityOptions
+include/unotools/localedatawrapper.hxx:60
+    enum LongDateOrder Invalid
+include/unotools/sharedunocomponent.hxx:150
     enum utl::SharedUNOComponent::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::beans::XPropertySet, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::embed::XStorage, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::sdb::XSingleSelectQueryComposer, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XPreparedStatement, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XStatement, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::uno::XInterface, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/vcl/pdf/PDFAnnotationMarker.hxx:57
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::beans::XPropertySet>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::embed::XStorage>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::sdb::XSingleSelectQueryComposer>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XPreparedStatement>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XStatement>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::uno::XInterface>::AssignmentMode NoTakeOwnership
+include/vcl/pdf/PDFAnnotationMarker.hxx:59
     enum vcl::pdf::PDFTextMarkerType Underline
-include/vcl/pdf/PDFAnnotationMarker.hxx:58
+include/vcl/pdf/PDFAnnotationMarker.hxx:60
     enum vcl::pdf::PDFTextMarkerType Squiggly
-include/vcl/pdf/PDFAnnotationMarker.hxx:59
+include/vcl/pdf/PDFAnnotationMarker.hxx:61
     enum vcl::pdf::PDFTextMarkerType StrikeOut
 include/vcl/pdf/PDFAnnotationSubType.hxx:19
     enum vcl::pdf::PDFAnnotationSubType Link
@@ -114,8 +252,6 @@ include/vcl/pdf/PDFAnnotationSubType.hxx:35
     enum vcl::pdf::PDFAnnotationSubType Sound
 include/vcl/pdf/PDFAnnotationSubType.hxx:36
     enum vcl::pdf::PDFAnnotationSubType Movie
-include/vcl/pdf/PDFAnnotationSubType.hxx:37
-    enum vcl::pdf::PDFAnnotationSubType Widget
 include/vcl/pdf/PDFAnnotationSubType.hxx:38
     enum vcl::pdf::PDFAnnotationSubType Screen
 include/vcl/pdf/PDFAnnotationSubType.hxx:39
@@ -130,174 +266,210 @@ include/vcl/pdf/PDFAnnotationSubType.hxx:43
     enum vcl::pdf::PDFAnnotationSubType Richmedia
 include/vcl/pdf/PDFAnnotationSubType.hxx:44
     enum vcl::pdf::PDFAnnotationSubType XFAWidget
-include/vcl/toolkit/svtabbx.hxx:36
+include/vcl/toolkit/svtabbx.hxx:38
     enum SvTabJustify AdjustRight
-include/vcl/toolkit/svtabbx.hxx:37
+include/vcl/toolkit/svtabbx.hxx:39
     enum SvTabJustify AdjustLeft
-include/vcl/toolkit/treelistbox.hxx:151
+include/vcl/toolkit/treelistbox.hxx:147
     enum DragDropMode APP_COPY
-include/vcl/toolkit/treelistbox.hxx:155
+include/vcl/toolkit/treelistbox.hxx:151
     enum DragDropMode ALL
-include/vcl/vclenum.hxx:313
-    enum WindowStateState FullScreen
-include/vcl/window.hxx:109
+include/vcl/vclenum.hxx:369
     enum TrackingEventFlags Focus
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:70
-    enum (anonymous at /home/noel/libo2/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:68:1) PROP_0
-libreofficekit/source/gtk/lokdocview.cxx:295
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:293:1) PROP_0
+include/vcl/windowstate.hxx:41
+    enum vcl::WindowState FullScreen
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:71
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:69:1) PROP_0
+libreofficekit/source/gtk/lokdocview.cxx:310
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:308:1) PROP_0
+lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx:118
+    enum (anonymous namespace)::HTTP_METHOD HTTP_GET
 reportdesign/source/filter/xml/xmlEnums.hxx:42
     enum rptxml::XMLReportToken XML_TOK_REPORT_ELEMENT
-reportdesign/source/filter/xml/xmlEnums.hxx:52
-    enum rptxml::XMLCell XML_TOK_P
-reportdesign/source/filter/xml/xmlEnums.hxx:53
-    enum rptxml::XMLCell XML_TOK_FIXED_CONTENT
-reportdesign/source/filter/xml/xmlEnums.hxx:54
-    enum rptxml::XMLCell XML_TOK_FORMATTED_TEXT
-reportdesign/source/filter/xml/xmlEnums.hxx:55
-    enum rptxml::XMLCell XML_TOK_IMAGE
-reportdesign/source/filter/xml/xmlEnums.hxx:56
-    enum rptxml::XMLCell XML_TOK_SUB_DOCUMENT
-reportdesign/source/filter/xml/xmlEnums.hxx:57
-    enum rptxml::XMLCell XML_TOK_CUSTOM_SHAPE
-reportdesign/source/filter/xml/xmlEnums.hxx:58
-    enum rptxml::XMLCell XML_TOK_PAGE_NUMBER
-reportdesign/source/filter/xml/xmlEnums.hxx:59
-    enum rptxml::XMLCell XML_TOK_PAGE_COUNT
-reportdesign/source/filter/xml/xmlEnums.hxx:60
-    enum rptxml::XMLCell XML_TOK_TEXT_TAB_STOP
-reportdesign/source/filter/xml/xmlEnums.hxx:61
-    enum rptxml::XMLCell XML_TOK_TEXT_LINE_BREAK
-reportdesign/source/filter/xml/xmlEnums.hxx:62
-    enum rptxml::XMLCell XML_TOK_TEXT_S
-reportdesign/source/filter/xml/xmlEnums.hxx:63
-    enum rptxml::XMLCell XML_TOK_FRAME
-sc/source/filter/excel/xiescher.cxx:473
-    enum (anonymous at /home/noel/libo2/sc/source/filter/excel/xiescher.cxx:473:17) eCreateFromOffice
-sc/source/filter/inc/decl.h:24
+sc/qa/unit/ucalc_copypaste.cxx:43
+    enum TestCopyPaste::CalcMode NoCalc
+sc/source/filter/excel/xiescher.cxx:481
+    enum (unnamed at /home/noel/libo-plugin/sc/source/filter/excel/xiescher.cxx:481:17) eCreateFromOffice
+sc/source/filter/inc/decl.h:23
     enum WKTYP eWK4
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) SLOTID
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl<class SfxModelessDialogController, true>::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) SLOTID
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl<class SfxTabDialogController, false>::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) SLOTID
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) SLOTID
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl<class SfxModelessDialogController>::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) SLOTID
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl<class SfxTabDialogController, false>::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) SLOTID
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx:101
     enum (anonymous namespace)::ScRegType LINEAR
-sfx2/source/sidebar/SidebarController.cxx:104
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_UNLOCK_TASK_PANEL
-sfx2/source/sidebar/SidebarController.cxx:105
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_LOCK_TASK_PANEL
-sfx2/source/sidebar/SidebarController.cxx:106
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_HIDE_SIDEBAR
-sfx2/source/sidebar/SidebarController.cxx:107
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_CUSTOMIZATION
-sfx2/source/sidebar/SidebarController.cxx:108
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_RESTORE_DEFAULT
-sfx2/source/sidebar/SidebarController.cxx:109
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_FIRST_PANEL
-sfx2/source/sidebar/SidebarController.cxx:110
-    enum sfx2::sidebar::(anonymous namespace)::MenuId MID_FIRST_HIDE
+sd/inc/resltn.hxx:24
+    enum PublishingFormat FORMAT_GIF
+sd/inc/resltn.hxx:25
+    enum PublishingFormat FORMAT_JPG
+sd/inc/resltn.hxx:26
+    enum PublishingFormat FORMAT_PNG
+sd/inc/resltn.hxx:31
+    enum PublishingScript SCRIPT_ASP
+sd/inc/resltn.hxx:32
+    enum PublishingScript SCRIPT_PERL
+starmath/inc/mathml/def.hxx:100
+    enum SmMlAttributeValueEmpty MlEmpty
+starmath/inc/mathml/def.hxx:142
+    enum SmMlAttributeValueLspace NMlEmpty
+starmath/inc/mathml/def.hxx:159
+    enum SmMlAttributeValueMathsize NMlEmpty
+starmath/inc/mathml/def.hxx:203
+    enum SmMlAttributeValueRspace NMlEmpty
+starmath/inc/mathml/mathmlMo.hxx:46
+    enum moOpDP movablelimits
+starmath/inc/mathml/mathmlMo.hxx:47
+    enum moOpDP starmathCustom
+starmath/inc/mathml/mathmlMo.hxx:48
+    enum moOpDP starmathCustomMo
+starmath/inc/mathml/mathmlMo.hxx:55
+    enum moOpDF nonedf
 svx/inc/sxmkitm.hxx:25
     enum SdrMeasureKind SDRMEASURE_RADIUS
-svx/source/inc/datanavi.hxx:59
+svx/source/inc/datanavi.hxx:61
     enum svxform::DataGroupType DGTUnknown
-sw/inc/docary.hxx:68
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase::DestructorPolicy KeepElements
-sw/inc/docary.hxx:68
-    enum SwVectorModifyBase<class SwCharFormat *>::DestructorPolicy KeepElements
-sw/inc/docary.hxx:68
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase<class SwNumRule *>::DestructorPolicy KeepElements
-sw/inc/docary.hxx:68
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase<class SwSectionFormat *>::DestructorPolicy KeepElements
-sw/inc/docary.hxx:69
+sw/inc/docary.hxx:73
     enum SwVectorModifyBase::DestructorPolicy FreeElements
-sw/inc/tblenum.hxx:34
+sw/inc/tblenum.hxx:35
     enum TableChgWidthHeightType InvalidPos
-sw/source/filter/ww8/ww8scan.hxx:384
+sw/source/filter/ww8/ww8scan.hxx:385
     enum ePLCFT SEP
 sw/source/filter/ww8/ww8struc.hxx:950
     enum WW8_FSPA::FSPAOrient RelPgMargin
 sw/source/filter/ww8/ww8struc.hxx:950
     enum WW8_FSPA::FSPAOrient RelText
-sw/source/ui/fldui/fldref.cxx:734
+sw/source/ui/fldui/fldref.cxx:53
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_PAGE_IDX
-sw/source/ui/fldui/fldref.cxx:735
+sw/source/ui/fldui/fldref.cxx:54
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_CHAPTER_IDX
-sw/source/ui/fldui/fldref.cxx:736
-    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_TEXT_IDX
-sw/source/ui/fldui/fldref.cxx:737
-    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_UPDOWN_IDX
-sw/source/ui/fldui/fldref.cxx:739
+sw/source/ui/fldui/fldref.cxx:58
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_ONLYNUMBER_IDX
-sw/source/ui/fldui/fldref.cxx:740
+sw/source/ui/fldui/fldref.cxx:59
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_ONLYCAPTION_IDX
-sw/source/uibase/utlui/content.cxx:846
+sw/source/uibase/utlui/content.cxx:1062
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_OUTLINE_LEVEL
-sw/source/uibase/utlui/content.cxx:847
-    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_DRAGMODE
-sw/source/uibase/utlui/content.cxx:849
-    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_LINK_REGION
-sw/source/uibase/utlui/content.cxx:850
-    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_COPY_REGION
-sw/source/uibase/utlui/content.cxx:851
+sw/source/uibase/utlui/content.cxx:1063
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_DISPLAY
-sw/source/uibase/utlui/content.cxx:855
-    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_INACTIVE
-sw/source/uibase/utlui/content.cxx:856
+sw/source/uibase/utlui/content.cxx:1068
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_EDIT_ENTRY
-sw/source/uibase/utlui/content.cxx:857
+sw/source/uibase/utlui/content.cxx:1069
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_DELETE_ENTRY
-sw/source/uibase/utlui/content.cxx:858
+sw/source/uibase/utlui/content.cxx:1070
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY
-sw/source/uibase/utlui/content.cxx:860
+sw/source/uibase/utlui/content.cxx:1072
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_OUTLINE_TRACKING_DEFAULT
-sw/source/uibase/utlui/content.cxx:861
+sw/source/uibase/utlui/content.cxx:1073
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_OUTLINE_TRACKING_FOCUS
-sw/source/uibase/utlui/content.cxx:862
+sw/source/uibase/utlui/content.cxx:1074
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_OUTLINE_TRACKING_OFF
-sw/source/uibase/utlui/glbltree.cxx:89
+sw/source/uibase/utlui/glbltree.cxx:93
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_UPDATE
-sw/source/uibase/utlui/glbltree.cxx:90
+sw/source/uibase/utlui/glbltree.cxx:94
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_EDIT_CONTENT
-sw/source/uibase/utlui/glbltree.cxx:91
+sw/source/uibase/utlui/glbltree.cxx:95
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_EDIT_INSERT
-sw/source/uibase/utlui/glbltree.cxx:92
+sw/source/uibase/utlui/glbltree.cxx:96
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_INDEX
-sw/source/uibase/utlui/glbltree.cxx:93
+sw/source/uibase/utlui/glbltree.cxx:97
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_FILE
-sw/source/uibase/utlui/glbltree.cxx:94
+sw/source/uibase/utlui/glbltree.cxx:98
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_NEW_FILE
-sw/source/uibase/utlui/glbltree.cxx:96
+sw/source/uibase/utlui/glbltree.cxx:100
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_DELETE
-sw/source/uibase/utlui/glbltree.cxx:97
+sw/source/uibase/utlui/glbltree.cxx:101
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_UPDATE_SEL
-sw/source/uibase/utlui/glbltree.cxx:98
+sw/source/uibase/utlui/glbltree.cxx:102
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_UPDATE_INDEX
-sw/source/uibase/utlui/glbltree.cxx:99
+sw/source/uibase/utlui/glbltree.cxx:103
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_UPDATE_LINK
-sw/source/uibase/utlui/glbltree.cxx:100
+sw/source/uibase/utlui/glbltree.cxx:104
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_UPDATE_ALL
-sw/source/uibase/utlui/glbltree.cxx:102
+sw/source/uibase/utlui/glbltree.cxx:106
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_EDIT_LINK
-ucb/source/ucp/webdav-neon/DAVTypes.hxx:192
-    enum webdav_ucp::Depth DAVINFINITY
-ucbhelper/source/client/proxydecider.cxx:128
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:56
+    enum (anonymous namespace)::WebDAVNamespace WebDAVNamespace_last
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:109
+    enum (anonymous namespace)::WebDAVName WebDAVName_last
+ucbhelper/source/client/proxydecider.cxx:126
     enum ucbhelper::proxydecider_impl::InternetProxyDecider_Impl::ProxyType Manual
-vcl/inc/salptype.hxx:43
+vcl/inc/dndhelper.hxx:32
+    enum vcl::DragOrDrop Drop
+vcl/inc/font/PhysicalFontFace.hxx:104
+    vcl::font::NameID NAME_ID_COPYRIGHT
+vcl/inc/font/PhysicalFontFace.hxx:106
+    vcl::font::NameID NAME_ID_FONT_SUBFAMILY
+vcl/inc/font/PhysicalFontFace.hxx:107
+    vcl::font::NameID NAME_ID_UNIQUE_ID
+vcl/inc/font/PhysicalFontFace.hxx:108
+    vcl::font::NameID NAME_ID_FULL_NAME
+vcl/inc/font/PhysicalFontFace.hxx:109
+    vcl::font::NameID NAME_ID_VERSION_STRING
+vcl/inc/font/PhysicalFontFace.hxx:110
+    vcl::font::NameID NAME_ID_POSTSCRIPT_NAME
+vcl/inc/font/PhysicalFontFace.hxx:111
+    vcl::font::NameID NAME_ID_TRADEMARK
+vcl/inc/font/PhysicalFontFace.hxx:112
+    vcl::font::NameID NAME_ID_MANUFACTURER
+vcl/inc/font/PhysicalFontFace.hxx:113
+    vcl::font::NameID NAME_ID_DESIGNER
+vcl/inc/font/PhysicalFontFace.hxx:114
+    vcl::font::NameID NAME_ID_DESCRIPTION
+vcl/inc/font/PhysicalFontFace.hxx:115
+    vcl::font::NameID NAME_ID_VENDOR_URL
+vcl/inc/font/PhysicalFontFace.hxx:116
+    vcl::font::NameID NAME_ID_DESIGNER_URL
+vcl/inc/font/PhysicalFontFace.hxx:117
+    vcl::font::NameID NAME_ID_LICENSE
+vcl/inc/font/PhysicalFontFace.hxx:118
+    vcl::font::NameID NAME_ID_LICENSE_URL
+vcl/inc/font/PhysicalFontFace.hxx:120
+    vcl::font::NameID NAME_ID_TYPOGRAPHIC_FAMILY
+vcl/inc/font/PhysicalFontFace.hxx:121
+    vcl::font::NameID NAME_ID_TYPOGRAPHIC_SUBFAMILY
+vcl/inc/font/PhysicalFontFace.hxx:122
+    vcl::font::NameID NAME_ID_MAC_FULL_NAME
+vcl/inc/font/PhysicalFontFace.hxx:123
+    vcl::font::NameID NAME_ID_SAMPLE_TEXT
+vcl/inc/font/PhysicalFontFace.hxx:124
+    vcl::font::NameID NAME_ID_CID_FINDFONT_NAME
+vcl/inc/font/PhysicalFontFace.hxx:125
+    vcl::font::NameID NAME_ID_WWS_FAMILY
+vcl/inc/font/PhysicalFontFace.hxx:126
+    vcl::font::NameID NAME_ID_WWS_SUBFAMILY
+vcl/inc/font/PhysicalFontFace.hxx:127
+    vcl::font::NameID NAME_ID_LIGHT_BACKGROUND
+vcl/inc/font/PhysicalFontFace.hxx:128
+    vcl::font::NameID NAME_ID_DARK_BACKGROUND
+vcl/inc/font/PhysicalFontFace.hxx:129
+    vcl::font::NameID NAME_ID_VARIATIONS_PS_PREFIX
+vcl/inc/fontsubset.hxx:40
+    enum FontType ANY_SFNT
+vcl/inc/salptype.hxx:44
     enum SalPrinterError General
-vcl/inc/skia/gdiimpl.hxx:221
-    enum SkiaSalGraphicsImpl::GlyphOrientation Ignore
-vcl/inc/unx/saldisp.hxx:62
+vcl/inc/unx/saldisp.hxx:60
     srv_vendor_t vendor_none
-vcl/source/app/svapp.cxx:1120
-    enum (anonymous at /home/noel/libo2/vcl/source/app/svapp.cxx:1120:1) hwAll
-vcl/source/gdi/CommonSalLayout.cxx:134
-    enum (anonymous namespace)::VerticalOrientation Rotated
-vcl/unx/gtk3/gtk3gtkinst.cxx:5301
-    enum (anonymous at /home/noel/libo2/vcl/unx/gtk3/gtk3gtkinst.cxx:5299:1) PROP_0
-vcl/unx/gtk3/gtk3gtkinst.cxx:5306
-    enum (anonymous at /home/noel/libo2/vcl/unx/gtk3/gtk3gtkinst.cxx:5299:1) PROP_SHADOW_TYPE
+vcl/source/app/svapp.cxx:1178
+    enum (unnamed at /home/noel/libo-plugin/vcl/source/app/svapp.cxx:1178:1) hwAll
+vcl/source/filter/ipcd/ipcd.cxx:41
+    enum (anonymous namespace)::PCDResolution PCDRES_4BASE
+vcl/source/filter/ipcd/ipcd.cxx:42
+    enum (anonymous namespace)::PCDResolution PCDRES_16BASE
+vcl/source/fontsubset/ttcr.hxx:48
+    enum vcl::TTCRErrCodes TTCR_UNKNOWN
+vcl/unx/gtk3/gtkinst.cxx:7890
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/gtkinst.cxx:7888:1) PROP_0
+vcl/unx/gtk3/gtkinst.cxx:7895
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/gtkinst.cxx:7888:1) PROP_SHADOW_TYPE
+writerfilter/source/dmapper/PropertyMap.hxx:227
+    enum writerfilter::dmapper::PageBreakType Both
 writerfilter/source/ooxml/OOXMLFactory.hxx:30
     enum writerfilter::ooxml::ResourceType NoResource
 writerfilter/source/ooxml/OOXMLFactory.hxx:31
@@ -324,5 +496,9 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:47
     enum writerfilter::ooxml::ResourceType Math
 writerfilter/source/ooxml/OOXMLFactory.hxx:48
     enum writerfilter::ooxml::ResourceType Any
+writerfilter/source/ooxml/OOXMLFactory.hxx:53
+    enum writerfilter::ooxml::ResourceType CommentEx
+writerfilter/source/ooxml/OOXMLFactory.hxx:54
+    enum writerfilter::ooxml::ResourceType Theme
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:202
     enum writerfilter::ooxml::OOXMLFastContextHandler::eMathParaJc INLINE
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 225d6c793cd6..977268921a21 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -1,6 +1,6 @@
-basctl/source/basicide/baside3.cxx:900
+basctl/source/basicide/baside3.cxx:843
     enum NameClashMode NO_CLASH
-basctl/source/basicide/doceventnotifier.cxx:58
+basctl/source/basicide/doceventnotifier.cxx:55
     enum basctl::(anonymous namespace)::ListenerAction RemoveListener
 basctl/source/basicide/macrodlg.hxx:32
     enum basctl::MacroExitCode Macro_Close
@@ -10,7 +10,7 @@ basctl/source/basicide/macrodlg.hxx:35
     enum basctl::MacroExitCode Macro_Edit
 basctl/source/inc/bastype2.hxx:40
     enum BrowseMode All
-basctl/source/inc/dlged.hxx:100
+basctl/source/inc/dlged.hxx:99
     enum basctl::DlgEditor::Mode SELECT
 basctl/source/inc/layout.hxx:82
     enum basctl::Layout::SplittedSide::Side Bottom
@@ -20,458 +20,480 @@ basctl/source/inc/sbxitem.hxx:31
     enum basctl::ItemType TYPE_LIBRARY
 basctl/source/inc/scriptdocument.hxx:46
     enum basctl::LibraryLocation LIBRARY_LOCATION_UNKNOWN
-basegfx/source/range/b2drangeclipper.cxx:150
+basegfx/source/range/b2drangeclipper.cxx:149
     enum basegfx::(anonymous namespace)::SweepLineEvent::EdgeType FINISHING_EDGE
-basegfx/source/range/b2drangeclipper.cxx:156
+basegfx/source/range/b2drangeclipper.cxx:155
     enum basegfx::(anonymous namespace)::SweepLineEvent::EdgeDirection PROCEED_UP
-basegfx/source/range/b2drangeclipper.cxx:791
-    enum basegfx::(anonymous namespace)::(anonymous at /home/noel/libo2/basegfx/source/range/b2drangeclipper.cxx:791:9) NoErase
-basegfx/source/range/b2drangeclipper.cxx:791
-    enum basegfx::(anonymous namespace)::(anonymous at /home/noel/libo2/basegfx/source/range/b2drangeclipper.cxx:791:9) PerformErase
+basegfx/source/range/b2drangeclipper.cxx:789
+    enum basegfx::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/basegfx/source/range/b2drangeclipper.cxx:789:9) NoErase
+basegfx/source/range/b2drangeclipper.cxx:789
+    enum basegfx::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/basegfx/source/range/b2drangeclipper.cxx:789:9) PerformErase
 basic/source/inc/expr.hxx:61
     enum SbiExprMode EXPRMODE_STANDARD
 basic/source/inc/expr.hxx:78
     enum SbiNodeType SbxDUMMY
 basic/source/inc/expr.hxx:85
     enum RecursiveMode PREVENT_CALL
-basic/source/inc/image.hxx:34
-    enum SbiImageFlags EXPLICIT
 basic/source/inc/image.hxx:35
-    enum SbiImageFlags COMPARETEXT
+    enum SbiImageFlags EXPLICIT
 basic/source/inc/image.hxx:36
-    enum SbiImageFlags INITCODE
+    enum SbiImageFlags COMPARETEXT
 basic/source/inc/image.hxx:37
+    enum SbiImageFlags INITCODE
+basic/source/inc/image.hxx:38
     enum SbiImageFlags CLASSMODULE
 basic/source/inc/iosys.hxx:39
     enum SbiStreamFlags Output
-basic/source/inc/namecont.hxx:224
+basic/source/inc/namecont.hxx:213
     enum basic::SfxLibraryContainer::InitMode LIBRARY_INIT_FILE
-basic/source/inc/namecont.hxx:226
+basic/source/inc/namecont.hxx:215
     enum basic::SfxLibraryContainer::InitMode OLD_BASIC_STORAGE
-basic/source/runtime/methods.cxx:4357
+basic/source/runtime/methods.cxx:4250
     enum BasicResponse Ok
-basic/source/runtime/methods.cxx:4358
+basic/source/runtime/methods.cxx:4251
     enum BasicResponse Cancel
-basic/source/runtime/methods.cxx:4359
+basic/source/runtime/methods.cxx:4252
     enum BasicResponse Abort
-basic/source/runtime/methods.cxx:4360
+basic/source/runtime/methods.cxx:4253
     enum BasicResponse Retry
-basic/source/runtime/methods.cxx:4361
+basic/source/runtime/methods.cxx:4254
     enum BasicResponse Ignore
-basic/source/runtime/methods.cxx:4362
+basic/source/runtime/methods.cxx:4255
     enum BasicResponse Yes
-basic/source/runtime/methods.cxx:4363
+basic/source/runtime/methods.cxx:4256
     enum BasicResponse No
 binaryurp/source/cache.hxx:35
-    enum binaryurp::cache::(anonymous at /home/noel/libo2/binaryurp/qa/../source/cache.hxx:35:1) size
-canvas/inc/rendering/irendermodule.hxx:55
-    enum canvas::IRenderModule::PrimitiveType Triangle
+    enum binaryurp::cache::(unnamed at /home/noel/libo-plugin/binaryurp/qa/../source/cache.hxx:35:1) size
+bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx:56
+    enum x86_64::ReturnKind RegistersGeneral
 canvas/inc/rendering/irendermodule.hxx:56
+    enum canvas::IRenderModule::PrimitiveType Triangle
+canvas/inc/rendering/irendermodule.hxx:57
     enum canvas::IRenderModule::PrimitiveType Quad
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:67
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MAX
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MAX
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:68
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:69
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPMAIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPMAIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:70
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPHELP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPHELP
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:71
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPHELP_COUNT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STEPHELP_COUNT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:72
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_MAX
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_MAX
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:73
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_MIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_MIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:74
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_STEPMAIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_STEPMAIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:75
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_STEPHELP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_STEPHELP
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:76
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TYPE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TYPE
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:77
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TIME_INCREMENT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TIME_INCREMENT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:78
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_EXPLICIT_TIME_INCREMENT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_EXPLICIT_TIME_INCREMENT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:79
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LOGARITHMIC
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LOGARITHMIC
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:80
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_REVERSEDIRECTION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_REVERSEDIRECTION
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:81
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_VISIBLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_VISIBLE
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:82
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CROSSOVER_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CROSSOVER_POSITION
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:83
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CROSSOVER_VALUE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CROSSOVER_VALUE
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:84
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_ORIGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_ORIGIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:85
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_ORIGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_AUTO_ORIGIN
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:86
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MARKS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MARKS
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:87
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_HELPMARKS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_HELPMARKS
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:88
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MARK_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MARK_POSITION
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:89
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_DISPLAY_LABELS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_DISPLAY_LABELS
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:90
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_NUMBERFORMAT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_NUMBERFORMAT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:91
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:92
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LABEL_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_LABEL_POSITION
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:93
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TEXT_ROTATION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TEXT_ROTATION
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:94
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_ARRANGE_ORDER
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_ARRANGE_ORDER
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:95
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TEXTBREAK
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TEXTBREAK
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:96
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CAN_OVERLAP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_CAN_OVERLAP
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:97
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STACKEDTEXT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_STACKEDTEXT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:98
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_OVERLAP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_OVERLAP
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:99
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_GAP_WIDTH
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_GAP_WIDTH
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:100
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_DISPLAY_UNITS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_DISPLAY_UNITS
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:101
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_BUILTINUNIT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_BUILTINUNIT
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:102
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TRY_STAGGERING_FIRST
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_TRY_STAGGERING_FIRST
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:103
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MAJOR_ORIGIN
-chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:133
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_HAS_MAIN_TITLE
-chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_HAS_SUB_TITLE
-chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:135
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_HAS_LEGEND
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:65:1) PROP_AXIS_MAJOR_ORIGIN
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:136
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_LABELS_IN_FIRST_ROW
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_HAS_MAIN_TITLE
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:137
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_HAS_SUB_TITLE
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:138
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_ADDIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_HAS_LEGEND
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:139
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_BASEDIAGRAM
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_LABELS_IN_FIRST_ROW
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:140
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_ADDITIONAL_SHAPES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:141
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_UPDATE_ADDIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_ADDIN
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:142
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_NULL_DATE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_BASEDIAGRAM
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:143
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_ENABLE_COMPLEX_CHARTTYPES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_ADDITIONAL_SHAPES
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:144
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:131:1) PROP_DOCUMENT_ENABLE_DATATABLE_DIALOG
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:70
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_SOLIDTYPE
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:71
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_SEGMENT_OFFSET
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:72
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_PERCENT_DIAGONAL
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_SEPARATOR
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:74
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_NUMBERFORMAT
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:75
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_LINK_NUMBERFORMAT_TO_SOURCE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_UPDATE_ADDIN
+chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:145
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_NULL_DATE
+chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:146
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_ENABLE_COMPLEX_CHARTTYPES
+chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:147
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:134:1) PROP_DOCUMENT_ENABLE_DATATABLE_DIALOG
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:76
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_PERCENTAGE_NUMBERFORMAT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_SOLIDTYPE
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:77
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_TEXT_WORD_WRAP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_SEGMENT_OFFSET
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:78
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_PLACEMENT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_PERCENT_DIAGONAL
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:79
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_SEPARATOR
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:80
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_ATTACHED_AXIS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_NUMBERFORMAT
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:81
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_SHOW_CUSTOM_LEADERLINES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_LINK_NUMBERFORMAT_TO_SOURCE
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:82
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_TEXT_ROTATION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_PERCENTAGE_NUMBERFORMAT
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:83
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_TEXT_WORD_WRAP
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:84
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH
-chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:85
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_COLOR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_PLACEMENT
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:86
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_TRANS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_ATTACHED_AXIS
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:87
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_FILL_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_SHOW_CUSTOM_LEADERLINES
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:88
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_FILL_COLOR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_TEXT_ROTATION
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:89
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_FILL_BACKGROUND
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:90
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:67:1) PROP_SERIES_DATAPOINT_LABEL_FILL_HATCH_NAME
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:82
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:83
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_PERCENT_STACKED
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:84
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_STACKED
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:85
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_THREE_D
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:86
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_SOLIDTYPE
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_DEEP
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:88
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_VERTICAL
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:91
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_COLOR
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:92
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_BORDER_TRANS
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:93
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_FILL_STYLE
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:94
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_FILL_COLOR
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:95
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_FILL_BACKGROUND
+chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:96
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:73:1) PROP_SERIES_DATAPOINT_LABEL_FILL_HATCH_NAME
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:89
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_NUMBER_OF_LINES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:90
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_STACKED_BARS_CONNECTED
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_PERCENT_STACKED
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:91
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_DATAROW_SOURCE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_STACKED
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:92
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_THREE_D
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:93
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_GROUP_BARS_PER_AXIS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_SOLIDTYPE
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:94
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_DEEP
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:95
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_VERTICAL
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:96
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_SORT_BY_X_VALUES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_NUMBER_OF_LINES
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:97
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_STACKED_BARS_CONNECTED
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:98
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_STARTING_ANGLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_DATAROW_SOURCE
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:100
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_RIGHT_ANGLED_AXES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_GROUP_BARS_PER_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:101
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_PERSPECTIVE
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:102
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_ROTATION_HORIZONTAL
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:103
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_ROTATION_VERTICAL
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_SORT_BY_X_VALUES
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:105
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_MISSING_VALUE_TREATMENT
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:107
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_X_AXIS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_STARTING_ANGLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:106
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_OF_PIE_TYPE
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:108
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_X_AXIS_DESCR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_RIGHT_ANGLED_AXES
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:109
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_X_AXIS_TITLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_PERSPECTIVE
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:110
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_X_AXIS_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_ROTATION_HORIZONTAL
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:111
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_X_AXIS_HELP_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_ROTATION_VERTICAL
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:113
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Y_AXIS
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:114
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Y_AXIS_DESCR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_MISSING_VALUE_TREATMENT
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:115
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Y_AXIS_TITLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_X_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:116
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Y_AXIS_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_X_AXIS_DESCR
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:117
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Y_AXIS_HELP_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_X_AXIS_TITLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:118
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_X_AXIS_GRID
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:119
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Z_AXIS
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:120
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Z_AXIS_DESCR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_X_AXIS_HELP_GRID
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:121
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Z_AXIS_TITLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Y_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:122
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Z_AXIS_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Y_AXIS_DESCR
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:123
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_Z_AXIS_HELP_GRID
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Y_AXIS_TITLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:124
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Y_AXIS_GRID
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:125
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:126
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS_DESCR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Y_AXIS_HELP_GRID
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:127
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Z_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:128
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Z_AXIS_DESCR
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:129
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Z_AXIS_TITLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:130
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Z_AXIS_GRID
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:131
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:132
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_Z_AXIS_HELP_GRID
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:133
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:134
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_AUTOMATIC_SIZE
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:135
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_DATATABLEHBORDER
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS_DESCR
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:136
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_DATATABLEVBORDER
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:137
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_DATATABLEOUTLINE
-chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:138
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:80:1) PROP_DIAGRAM_EXTERNALDATA
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:139
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:140
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:142
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_AUTOMATIC_SIZE
+chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:143
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:87:1) PROP_DIAGRAM_EXTERNALDATA
+chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:207
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:205:1) PROP_LEGEND_ALIGNMENT
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:208
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:206:1) PROP_LEGEND_ALIGNMENT
-chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:209
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:206:1) PROP_LEGEND_EXPANSION
-chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:131
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:129:1) PROP_TITLE_STRING
-chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:132
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:129:1) PROP_TITLE_TEXT_ROTATION
-chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:133
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:129:1) PROP_TITLE_TEXT_STACKED
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx:205:1) PROP_LEGEND_EXPANSION
+chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:186
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:184:1) PROP_TITLE_STRING
+chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:187
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:184:1) PROP_TITLE_FORMATTED_STRINGS
+chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:188
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:184:1) PROP_TITLE_VISIBLE
+chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:189
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:184:1) PROP_TITLE_TEXT_ROTATION
+chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:190
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx:184:1) PROP_TITLE_TEXT_STACKED
 chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx:102
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx:100:1) PROP_CHART_AUTOMATIC_POSITION
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx:100:1) PROP_CHART_AUTOMATIC_POSITION
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx:53
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx:50:1) PROP_CHART_DATAPOINT_DATA_CAPTION
-chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx:116
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx:114:1) PROP_CHART_SCALE_TEXT
-chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:174
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:171:1) PROP_CHART_SPLINE_TYPE
-chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:175
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:171:1) PROP_CHART_SPLINE_ORDER
-chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:176
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:171:1) PROP_CHART_SPLINE_RESOLUTION
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx:50:1) PROP_CHART_DATAPOINT_DATA_CAPTION
+chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx:117
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx:115:1) PROP_CHART_SCALE_TEXT
+chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:168
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:165:1) PROP_CHART_SPLINE_TYPE
+chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:169
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:165:1) PROP_CHART_SPLINE_ORDER
+chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:170
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx:165:1) PROP_CHART_SPLINE_RESOLUTION
+chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:934
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_CONST_ERROR_LOW
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:935
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_CONST_ERROR_LOW
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_CONST_ERROR_HIGH
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:936
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_CONST_ERROR_HIGH
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_MEAN_VALUE
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:937
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_MEAN_VALUE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_CATEGORY
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:938
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_CATEGORY
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_BAR_STYLE
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:939
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_BAR_STYLE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_PERCENT_ERROR
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:940
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_PERCENT_ERROR
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_MARGIN
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:941
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_MARGIN
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_INDICATOR
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:942
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_INDICATOR
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:943
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:944
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_REGRESSION_CURVES
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:945
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_REGRESSION_CURVES
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_REGRESSION_PROPERTIES
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:946
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_REGRESSION_PROPERTIES
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_ERROR_PROPERTIES
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:947
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_ERROR_PROPERTIES
-chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:948
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:932:1) PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES
-chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:250
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:247:1) PROP_CHART_STOCK_VOLUME
-chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:251
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:247:1) PROP_CHART_STOCK_UPDOWN
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:931:1) PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES
+chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:252
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:249:1) PROP_CHART_STOCK_VOLUME
+chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:253
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx:249:1) PROP_CHART_STOCK_UPDOWN
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:106
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_TYPE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_TYPE
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:107
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_BITMAP_URL
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_BITMAP_URL
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:108
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_BITMAP
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_BITMAP
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:109
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_SIZE
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_SIZE
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:110
-    enum chart::wrapper::(anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_AND_LINES
-chart2/source/controller/dialogs/DialogModel.hxx:103
+    enum chart::wrapper::(anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx:103:1) PROP_CHART_SYMBOL_AND_LINES
+chart2/source/controller/dialogs/DialogModel.hxx:104
     enum chart::DialogModel::MoveDirection Up
-chart2/source/controller/dialogs/tp_Scale.cxx:208
+chart2/source/controller/dialogs/tp_Scale.cxx:210
     enum chart::(anonymous namespace)::AxisTypeListBoxEntry TYPE_TEXT
-chart2/source/controller/inc/AccessibleBase.hxx:286
+chart2/source/controller/inc/AccessibleBase.hxx:281
     enum chart::AccessibleBase::eColorType ACC_BASE_BACKGROUND
-chart2/source/controller/inc/ChartController.hxx:93
+chart2/source/controller/inc/ChartController.hxx:95
     enum chart::ChartDrawMode CHARTDRAW_SELECT
-chart2/source/controller/main/ChartModelClone.hxx:33
+chart2/source/controller/main/ChartModelClone.hxx:35
     enum chart::ModelFacet E_MODEL
 chart2/source/controller/main/DragMethod_RotateDiagram.hxx:36
     enum chart::DragMethod_RotateDiagram::RotationDirection ROTATIONDIRECTION_FREE
-chart2/source/controller/sidebar/ChartElementsPanel.cxx:50
+chart2/source/controller/sidebar/ChartElementsPanel.cxx:49
     enum chart::sidebar::(anonymous namespace)::GridType VERT_MINOR
-chart2/source/controller/sidebar/ChartElementsPanel.cxx:57
+chart2/source/controller/sidebar/ChartElementsPanel.cxx:56
     enum chart::sidebar::(anonymous namespace)::AxisType X_MAIN
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx:39
     enum chart::sidebar::(anonymous namespace)::ErrorBarDirection POSITIVE
 chart2/source/inc/CharacterProperties.hxx:44
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_NAME
 chart2/source/inc/CharacterProperties.hxx:45
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_STYLE_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_STYLE_NAME
 chart2/source/inc/CharacterProperties.hxx:46
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_FAMILY
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_FAMILY
 chart2/source/inc/CharacterProperties.hxx:47
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_CHAR_SET
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_CHAR_SET
 chart2/source/inc/CharacterProperties.hxx:48
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_PITCH
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_FONT_PITCH
 chart2/source/inc/CharacterProperties.hxx:49
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COLOR
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COLOR
 chart2/source/inc/CharacterProperties.hxx:52
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ESCAPEMENT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ESCAPEMENT
 chart2/source/inc/CharacterProperties.hxx:53
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_CHAR_HEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_CHAR_HEIGHT
 chart2/source/inc/CharacterProperties.hxx:54
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE
 chart2/source/inc/CharacterProperties.hxx:55
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE_COLOR
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE_COLOR
 chart2/source/inc/CharacterProperties.hxx:56
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE_HAS_COLOR
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_UNDERLINE_HAS_COLOR
 chart2/source/inc/CharacterProperties.hxx:57
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE
 chart2/source/inc/CharacterProperties.hxx:58
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE_COLOR
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE_COLOR
 chart2/source/inc/CharacterProperties.hxx:59
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE_HAS_COLOR
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_OVERLINE_HAS_COLOR
 chart2/source/inc/CharacterProperties.hxx:60
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_WEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_WEIGHT
 chart2/source/inc/CharacterProperties.hxx:61
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_POSTURE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_POSTURE
 chart2/source/inc/CharacterProperties.hxx:62
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_AUTO_KERNING
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_AUTO_KERNING
 chart2/source/inc/CharacterProperties.hxx:63
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_KERNING
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_KERNING
 chart2/source/inc/CharacterProperties.hxx:68
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ESCAPEMENT_HEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ESCAPEMENT_HEIGHT
 chart2/source/inc/CharacterProperties.hxx:71
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_STRIKE_OUT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_STRIKE_OUT
 chart2/source/inc/CharacterProperties.hxx:72
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_WORD_MODE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_WORD_MODE
 chart2/source/inc/CharacterProperties.hxx:74
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_LOCALE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_LOCALE
 chart2/source/inc/CharacterProperties.hxx:77
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_SHADOWED
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_SHADOWED
 chart2/source/inc/CharacterProperties.hxx:78
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_CONTOURED
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_CONTOURED
 chart2/source/inc/CharacterProperties.hxx:79
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_RELIEF
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_RELIEF
 chart2/source/inc/CharacterProperties.hxx:84
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_EMPHASIS
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_EMPHASIS
 chart2/source/inc/CharacterProperties.hxx:92
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_NAME
 chart2/source/inc/CharacterProperties.hxx:93
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_STYLE_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_STYLE_NAME
 chart2/source/inc/CharacterProperties.hxx:94
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_FAMILY
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_FAMILY
 chart2/source/inc/CharacterProperties.hxx:95
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_CHAR_SET
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_CHAR_SET
 chart2/source/inc/CharacterProperties.hxx:96
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_PITCH
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_FONT_PITCH
 chart2/source/inc/CharacterProperties.hxx:97
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_CHAR_HEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_CHAR_HEIGHT
 chart2/source/inc/CharacterProperties.hxx:98
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_WEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_WEIGHT
 chart2/source/inc/CharacterProperties.hxx:99
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_POSTURE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_POSTURE
 chart2/source/inc/CharacterProperties.hxx:100
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_LOCALE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_ASIAN_LOCALE
 chart2/source/inc/CharacterProperties.hxx:106
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_NAME
 chart2/source/inc/CharacterProperties.hxx:107
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_STYLE_NAME
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_STYLE_NAME
 chart2/source/inc/CharacterProperties.hxx:108
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_FAMILY
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_FAMILY
 chart2/source/inc/CharacterProperties.hxx:109
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_CHAR_SET
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_CHAR_SET
 chart2/source/inc/CharacterProperties.hxx:110
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_PITCH
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_FONT_PITCH
 chart2/source/inc/CharacterProperties.hxx:111
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_CHAR_HEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_CHAR_HEIGHT
 chart2/source/inc/CharacterProperties.hxx:112
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_WEIGHT
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_WEIGHT
 chart2/source/inc/CharacterProperties.hxx:113
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_POSTURE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_POSTURE
 chart2/source/inc/CharacterProperties.hxx:114
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_LOCALE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_CHAR_COMPLEX_LOCALE
 chart2/source/inc/CharacterProperties.hxx:115
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_PARA_IS_CHARACTER_DISTANCE
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_PARA_IS_CHARACTER_DISTANCE
 chart2/source/inc/CharacterProperties.hxx:117
-    enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_WRITING_MODE
-chart2/source/inc/DiagramHelper.hxx:45
-    enum chart::DiagramPositioningMode DiagramPositioningMode_AUTO
+    enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) PROP_WRITING_MODE
+chart2/source/inc/ChartResourceGroups.hxx:38
+    enum chart::(unnamed at /home/noel/libo-plugin/chart2/source/inc/ChartResourceGroups.hxx:35:1) POS_3DSCHEME_REALISTIC
+chart2/source/inc/ChartType.hxx:43
+    enum chart::(unnamed at /home/noel/libo-plugin/chart2/source/inc/ChartType.hxx:41:1) PROP_PIECHARTTYPE_USE_RINGS
+chart2/source/inc/ChartType.hxx:44
+    enum chart::(unnamed at /home/noel/libo-plugin/chart2/source/inc/ChartType.hxx:41:1) PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
+chart2/source/inc/ChartType.hxx:45
+    enum chart::(unnamed at /home/noel/libo-plugin/chart2/source/inc/ChartType.hxx:41:1) PROP_PIECHARTTYPE_SUBTYPE
+chart2/source/inc/DataSeriesProperties.hxx:33
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_STACKING_DIRECTION
+chart2/source/inc/DataSeriesProperties.hxx:34
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_VARY_COLORS_BY_POINT
+chart2/source/inc/DataSeriesProperties.hxx:35
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_ATTACHED_AXIS_INDEX
+chart2/source/inc/DataSeriesProperties.hxx:36
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_SHOW_LEGEND_ENTRY
+chart2/source/inc/DataSeriesProperties.hxx:37
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_DELETED_LEGEND_ENTRIES
+chart2/source/inc/DataSeriesProperties.hxx:38
+    enum chart::DataSeriesProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES
+chart2/source/inc/Diagram.hxx:57
+    enum chart::DiagramPositioningMode Auto
 chart2/source/inc/FastPropertyIdRanges.hxx:25
     enum chart::FastPropertyIdRanges FAST_PROPERTY_ID_START
 chart2/source/inc/FastPropertyIdRanges.hxx:26
@@ -501,494 +523,600 @@ chart2/source/inc/FastPropertyIdRanges.hxx:40
 chart2/source/inc/FastPropertyIdRanges.hxx:41
     enum chart::FastPropertyIdRanges FAST_PROPERTY_ID_START_SCALE_TEXT_PROP
 chart2/source/inc/FillProperties.hxx:39
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_STYLE
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_STYLE
 chart2/source/inc/FillProperties.hxx:40
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_COLOR
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_COLOR
 chart2/source/inc/FillProperties.hxx:41
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_TRANSPARENCE
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_TRANSPARENCE
 chart2/source/inc/FillProperties.hxx:42
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_TRANSPARENCE_GRADIENT_NAME
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_TRANSPARENCE_GRADIENT_NAME
 chart2/source/inc/FillProperties.hxx:44
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_GRADIENT_NAME
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_GRADIENT_NAME
 chart2/source/inc/FillProperties.hxx:45
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_GRADIENT_STEPCOUNT
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_GRADIENT_STEPCOUNT
 chart2/source/inc/FillProperties.hxx:47
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_HATCH_NAME
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_HATCH_NAME
 chart2/source/inc/FillProperties.hxx:50
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_NAME
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_NAME
 chart2/source/inc/FillProperties.hxx:53
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_OFFSETX
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_OFFSETX
 chart2/source/inc/FillProperties.hxx:54
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_OFFSETY
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_OFFSETY
 chart2/source/inc/FillProperties.hxx:55
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_POSITION_OFFSETX
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_POSITION_OFFSETX
 chart2/source/inc/FillProperties.hxx:56
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_POSITION_OFFSETY
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_POSITION_OFFSETY
 chart2/source/inc/FillProperties.hxx:57
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_RECTANGLEPOINT
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_RECTANGLEPOINT
 chart2/source/inc/FillProperties.hxx:58
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_LOGICALSIZE
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_LOGICALSIZE
 chart2/source/inc/FillProperties.hxx:59
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_SIZEX
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_SIZEX
 chart2/source/inc/FillProperties.hxx:60
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_SIZEY
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_SIZEY
 chart2/source/inc/FillProperties.hxx:61
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_MODE
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BITMAP_MODE
 chart2/source/inc/FillProperties.hxx:63
-    enum chart::FillProperties::(anonymous at /home/noel/libo2/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BACKGROUND
+    enum chart::FillProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/FillProperties.hxx:36:5) PROP_FILL_BACKGROUND
 chart2/source/inc/LinePropertiesHelper.hxx:41
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_STYLE
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_STYLE
 chart2/source/inc/LinePropertiesHelper.hxx:42
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_DASH
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_DASH
 chart2/source/inc/LinePropertiesHelper.hxx:43
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_DASH_NAME
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_DASH_NAME
 chart2/source/inc/LinePropertiesHelper.hxx:44
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_COLOR
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_COLOR
 chart2/source/inc/LinePropertiesHelper.hxx:45
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_TRANSPARENCE
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_TRANSPARENCE
 chart2/source/inc/LinePropertiesHelper.hxx:46
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_WIDTH
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_WIDTH
 chart2/source/inc/LinePropertiesHelper.hxx:47
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_JOINT
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_JOINT
 chart2/source/inc/LinePropertiesHelper.hxx:48
-    enum chart::LinePropertiesHelper::(anonymous at /home/noel/libo2/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_CAP
-chart2/source/inc/ReferenceSizeProvider.hxx:46
+    enum chart::LinePropertiesHelper::(unnamed at /home/noel/libo-plugin/chart2/source/inc/LinePropertiesHelper.hxx:38:5) PROP_LINE_CAP
+chart2/source/inc/ReferenceSizeProvider.hxx:48
     enum chart::ReferenceSizeProvider::AutoResizeState AUTO_RESIZE_NO
-chart2/source/inc/SceneProperties.hxx:39
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_TRANSF_MATRIX
 chart2/source/inc/SceneProperties.hxx:40
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_DISTANCE
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_TRANSF_MATRIX
 chart2/source/inc/SceneProperties.hxx:41
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_FOCAL_LENGTH
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_DISTANCE
 chart2/source/inc/SceneProperties.hxx:42
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_SHADOW_SLANT
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_FOCAL_LENGTH
 chart2/source/inc/SceneProperties.hxx:43
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_SHADE_MODE
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_SHADOW_SLANT
 chart2/source/inc/SceneProperties.hxx:44
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_AMBIENT_COLOR
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_SHADE_MODE
 chart2/source/inc/SceneProperties.hxx:45
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_TWO_SIDED_LIGHTING
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_AMBIENT_COLOR
 chart2/source/inc/SceneProperties.hxx:46
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_CAMERA_GEOMETRY
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_TWO_SIDED_LIGHTING
 chart2/source/inc/SceneProperties.hxx:47
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_PERSPECTIVE
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_CAMERA_GEOMETRY
 chart2/source/inc/SceneProperties.hxx:48
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_1
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_PERSPECTIVE
 chart2/source/inc/SceneProperties.hxx:49
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_1
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_1
 chart2/source/inc/SceneProperties.hxx:50
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_1
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_1
 chart2/source/inc/SceneProperties.hxx:51
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_2
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_1
 chart2/source/inc/SceneProperties.hxx:52
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_2
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_2
 chart2/source/inc/SceneProperties.hxx:53
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_2
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_2
 chart2/source/inc/SceneProperties.hxx:54
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_3
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_2
 chart2/source/inc/SceneProperties.hxx:55
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_3
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_3
 chart2/source/inc/SceneProperties.hxx:56
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_3
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_3
 chart2/source/inc/SceneProperties.hxx:57
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_4
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_3
 chart2/source/inc/SceneProperties.hxx:58
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_4
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_4
 chart2/source/inc/SceneProperties.hxx:59
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_4
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_4
 chart2/source/inc/SceneProperties.hxx:60
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_5
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_4
 chart2/source/inc/SceneProperties.hxx:61
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_5
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_5
 chart2/source/inc/SceneProperties.hxx:62
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_5
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_5
 chart2/source/inc/SceneProperties.hxx:63
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_6
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_5
 chart2/source/inc/SceneProperties.hxx:64
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_6
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_6
 chart2/source/inc/SceneProperties.hxx:65
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_6
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_6
 chart2/source/inc/SceneProperties.hxx:66
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_7
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_6
 chart2/source/inc/SceneProperties.hxx:67
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_7
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_7
 chart2/source/inc/SceneProperties.hxx:68
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_7
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_7
 chart2/source/inc/SceneProperties.hxx:69
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_COLOR_8
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_7
 chart2/source/inc/SceneProperties.hxx:70
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_DIRECTION_8
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_COLOR_8
 chart2/source/inc/SceneProperties.hxx:71
-    enum chart::SceneProperties::(anonymous at /home/noel/libo2/chart2/source/inc/SceneProperties.hxx:36:5) PROP_SCENE_LIGHT_ON_8
-chart2/source/inc/ThreeDHelper.hxx:42
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_DIRECTION_8
+chart2/source/inc/SceneProperties.hxx:72
+    enum chart::SceneProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/SceneProperties.hxx:37:5) PROP_SCENE_LIGHT_ON_8
+chart2/source/inc/ThreeDHelper.hxx:45
     enum chart::CuboidPlanePosition CuboidPlanePosition_Top
-chart2/source/inc/TitleHelper.hxx:39
+chart2/source/inc/TitleHelper.hxx:41
     enum chart::TitleHelper::eTitleType TITLE_BEGIN
-chart2/source/inc/UserDefinedProperties.hxx:38
-    enum chart::UserDefinedProperties::(anonymous at /home/noel/libo2/chart2/source/inc/UserDefinedProperties.hxx:35:5) PROP_XML_USERDEF_CHART
 chart2/source/inc/UserDefinedProperties.hxx:39
-    enum chart::UserDefinedProperties::(anonymous at /home/noel/libo2/chart2/source/inc/UserDefinedProperties.hxx:35:5) PROP_XML_USERDEF_TEXT
+    enum chart::UserDefinedProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/UserDefinedProperties.hxx:36:5) PROP_XML_USERDEF_CHART
 chart2/source/inc/UserDefinedProperties.hxx:40
-    enum chart::UserDefinedProperties::(anonymous at /home/noel/libo2/chart2/source/inc/UserDefinedProperties.hxx:35:5) PROP_XML_USERDEF_PARA
-chart2/source/inc/UserDefinedProperties.hxx:45
-    enum chart::UserDefinedProperties::(anonymous at /home/noel/libo2/chart2/source/inc/UserDefinedProperties.hxx:35:5) PROP_XML_USERDEF
-chart2/source/model/main/Axis.cxx:57
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_SHOW
+    enum chart::UserDefinedProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/UserDefinedProperties.hxx:36:5) PROP_XML_USERDEF_TEXT
+chart2/source/inc/UserDefinedProperties.hxx:41
+    enum chart::UserDefinedProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/UserDefinedProperties.hxx:36:5) PROP_XML_USERDEF_PARA
+chart2/source/inc/UserDefinedProperties.hxx:46
+    enum chart::UserDefinedProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/UserDefinedProperties.hxx:36:5) PROP_XML_USERDEF
 chart2/source/model/main/Axis.cxx:58
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_CROSSOVER_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_SHOW
 chart2/source/model/main/Axis.cxx:59
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_CROSSOVER_VALUE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_CROSSOVER_POSITION
 chart2/source/model/main/Axis.cxx:60
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_DISPLAY_LABELS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_CROSSOVER_VALUE
 chart2/source/model/main/Axis.cxx:61
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_NUMBERFORMAT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_DISPLAY_LABELS
 chart2/source/model/main/Axis.cxx:62
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_NUMBERFORMAT
 chart2/source/model/main/Axis.cxx:63
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_LABEL_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE
 chart2/source/model/main/Axis.cxx:64
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TEXT_ROTATION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_LABEL_POSITION
 chart2/source/model/main/Axis.cxx:65
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TEXT_BREAK
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TEXT_ROTATION
 chart2/source/model/main/Axis.cxx:66
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TEXT_OVERLAP
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TEXT_BREAK
 chart2/source/model/main/Axis.cxx:67
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TEXT_STACKED
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TEXT_OVERLAP
 chart2/source/model/main/Axis.cxx:68
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TEXT_ARRANGE_ORDER
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TEXT_STACKED
 chart2/source/model/main/Axis.cxx:69
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_REFERENCE_DIAGRAM_SIZE
-chart2/source/model/main/Axis.cxx:71
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_MAJOR_TICKMARKS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TEXT_ARRANGE_ORDER
+chart2/source/model/main/Axis.cxx:70
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_REFERENCE_DIAGRAM_SIZE
 chart2/source/model/main/Axis.cxx:72
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_MINOR_TICKMARKS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_MAJOR_TICKMARKS
 chart2/source/model/main/Axis.cxx:73
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_MARK_POSITION
-chart2/source/model/main/Axis.cxx:75
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_DISPLAY_UNITS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_MINOR_TICKMARKS
+chart2/source/model/main/Axis.cxx:74
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_MARK_POSITION
 chart2/source/model/main/Axis.cxx:76
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_BUILTINUNIT
-chart2/source/model/main/Axis.cxx:78
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_TRY_STAGGERING_FIRST
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_DISPLAY_UNITS
+chart2/source/model/main/Axis.cxx:77
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_BUILTINUNIT
 chart2/source/model/main/Axis.cxx:79
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Axis.cxx:55:1) PROP_AXIS_MAJOR_ORIGIN
-chart2/source/model/main/BaseCoordinateSystem.cxx:45
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/BaseCoordinateSystem.cxx:43:1) PROP_COORDINATESYSTEM_SWAPXANDYAXIS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_TRY_STAGGERING_FIRST
+chart2/source/model/main/Axis.cxx:80
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Axis.cxx:56:1) PROP_AXIS_MAJOR_ORIGIN
+chart2/source/model/main/BaseCoordinateSystem.cxx:46
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/BaseCoordinateSystem.cxx:44:1) PROP_COORDINATESYSTEM_SWAPXANDYAXIS
 chart2/source/model/main/DataPointProperties.hxx:37
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_STYLE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_STYLE
 chart2/source/model/main/DataPointProperties.hxx:38
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_COLOR
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_COLOR
 chart2/source/model/main/DataPointProperties.hxx:39
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_BACKGROUND
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_BACKGROUND
 chart2/source/model/main/DataPointProperties.hxx:40
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_HATCH_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_FILL_HATCH_NAME
 chart2/source/model/main/DataPointProperties.hxx:43
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_COLOR
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_COLOR
 chart2/source/model/main/DataPointProperties.hxx:44
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TRANSPARENCY
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TRANSPARENCY
 chart2/source/model/main/DataPointProperties.hxx:47
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_STYLE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_STYLE
 chart2/source/model/main/DataPointProperties.hxx:48
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME
 chart2/source/model/main/DataPointProperties.hxx:49
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GRADIENT_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GRADIENT_NAME
 chart2/source/model/main/DataPointProperties.hxx:50
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GRADIENT_STEPCOUNT
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GRADIENT_STEPCOUNT
 chart2/source/model/main/DataPointProperties.hxx:51
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_HATCH_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_HATCH_NAME
 chart2/source/model/main/DataPointProperties.hxx:52
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_BITMAP_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_BITMAP_NAME
 chart2/source/model/main/DataPointProperties.hxx:53
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_BACKGROUND
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_FILL_BACKGROUND
 chart2/source/model/main/DataPointProperties.hxx:56
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_COLOR
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_COLOR
 chart2/source/model/main/DataPointProperties.hxx:57
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_STYLE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_STYLE
 chart2/source/model/main/DataPointProperties.hxx:58
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_WIDTH
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_WIDTH
 chart2/source/model/main/DataPointProperties.hxx:59
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_DASH_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_DASH_NAME
 chart2/source/model/main/DataPointProperties.hxx:60
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_TRANSPARENCY
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_BORDER_TRANSPARENCY
 chart2/source/model/main/DataPointProperties.hxx:63
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_SYMBOL_PROP
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_SYMBOL_PROP
 chart2/source/model/main/DataPointProperties.hxx:64
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_OFFSET
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_OFFSET
 chart2/source/model/main/DataPointProperties.hxx:65
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GEOMETRY3D
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_GEOMETRY3D
 chart2/source/model/main/DataPointProperties.hxx:66
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_NUMBER_FORMAT
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_NUMBER_FORMAT
 chart2/source/model/main/DataPointProperties.hxx:67
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LINK_NUMBERFORMAT_TO_SOURCE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LINK_NUMBERFORMAT_TO_SOURCE
 chart2/source/model/main/DataPointProperties.hxx:68
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT
 chart2/source/model/main/DataPointProperties.hxx:69
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_PLACEMENT
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_PLACEMENT
 chart2/source/model/main/DataPointProperties.hxx:70
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE
 chart2/source/model/main/DataPointProperties.hxx:71
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TEXT_ROTATION
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TEXT_ROTATION
 chart2/source/model/main/DataPointProperties.hxx:76
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_SHOW_ERROR_BOX
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_SHOW_ERROR_BOX
 chart2/source/model/main/DataPointProperties.hxx:77
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_PERCENT_DIAGONAL
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_PERCENT_DIAGONAL
 chart2/source/model/main/DataPointProperties.hxx:80
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL
 chart2/source/model/main/DataPointProperties.hxx:81
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_SEPARATOR
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_SEPARATOR
 chart2/source/model/main/DataPointProperties.hxx:82
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TEXT_WORD_WRAP
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_TEXT_WORD_WRAP
 chart2/source/model/main/DataPointProperties.hxx:83
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_STYLE
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_STYLE
 chart2/source/model/main/DataPointProperties.hxx:84
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_COLOR
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_COLOR
 chart2/source/model/main/DataPointProperties.hxx:85
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_WIDTH
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_WIDTH
 chart2/source/model/main/DataPointProperties.hxx:86
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_DASH
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_DASH
 chart2/source/model/main/DataPointProperties.hxx:87
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_DASH_NAME
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_DASH_NAME
 chart2/source/model/main/DataPointProperties.hxx:88
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_TRANS
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_BORDER_TRANS
 chart2/source/model/main/DataPointProperties.hxx:89
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_CUSTOM_LABEL_FIELDS
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_CUSTOM_LABEL_FIELDS
 chart2/source/model/main/DataPointProperties.hxx:90
-    enum chart::DataPointProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_CUSTOM_POS
-chart2/source/model/main/DataSeriesProperties.hxx:33
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_STACKING_DIRECTION
-chart2/source/model/main/DataSeriesProperties.hxx:34
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_VARY_COLORS_BY_POINT
-chart2/source/model/main/DataSeriesProperties.hxx:35
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_ATTACHED_AXIS_INDEX
-chart2/source/model/main/DataSeriesProperties.hxx:36
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_SHOW_LEGEND_ENTRY
-chart2/source/model/main/DataSeriesProperties.hxx:37
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_DELETED_LEGEND_ENTRIES
-chart2/source/model/main/DataSeriesProperties.hxx:38
-    enum chart::DataSeriesProperties::(anonymous at /home/noel/libo2/chart2/source/model/main/DataSeriesProperties.hxx:30:5) PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES
-chart2/source/model/main/Diagram.cxx:60
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_REL_POS
-chart2/source/model/main/Diagram.cxx:61
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_REL_SIZE
-chart2/source/model/main/Diagram.cxx:62
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS
-chart2/source/model/main/Diagram.cxx:63
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_SORT_BY_X_VALUES
-chart2/source/model/main/Diagram.cxx:64
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_CONNECT_BARS
-chart2/source/model/main/Diagram.cxx:65
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_GROUP_BARS_PER_AXIS
-chart2/source/model/main/Diagram.cxx:66
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
-chart2/source/model/main/Diagram.cxx:67
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_STARTING_ANGLE
-chart2/source/model/main/Diagram.cxx:68
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_RIGHT_ANGLED_AXES
-chart2/source/model/main/Diagram.cxx:72
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_MISSING_VALUE_TREATMENT
-chart2/source/model/main/Diagram.cxx:73
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_3DRELATIVEHEIGHT
-chart2/source/model/main/Diagram.cxx:74
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_DATATABLEHBORDER
-chart2/source/model/main/Diagram.cxx:75
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_DATATABLEVBORDER
-chart2/source/model/main/Diagram.cxx:76
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_DATATABLEOUTLINE
-chart2/source/model/main/Diagram.cxx:77
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Diagram.cxx:58:1) PROP_DIAGRAM_EXTERNALDATA
-chart2/source/model/main/GridProperties.cxx:44
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/GridProperties.cxx:42:1) PROP_GRID_SHOW
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_CUSTOM_POS
+chart2/source/model/main/DataPointProperties.hxx:91
+    enum chart::DataPointProperties::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataPointProperties.hxx:35:5) PROP_DATAPOINT_LABEL_CUSTOM_SIZE
+chart2/source/model/main/DataTable.cxx:32
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataTable.cxx:30:1) DataTableProperty_HorizontalBorder
+chart2/source/model/main/DataTable.cxx:33
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataTable.cxx:30:1) DataTableProperty_VerticalBorder
+chart2/source/model/main/DataTable.cxx:34
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataTable.cxx:30:1) DataTableProperty_Outilne
+chart2/source/model/main/DataTable.cxx:35
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/DataTable.cxx:30:1) DataTableProperty_Keys
+chart2/source/model/main/Diagram.cxx:85
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_REL_POS
+chart2/source/model/main/Diagram.cxx:86
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_REL_SIZE
+chart2/source/model/main/Diagram.cxx:87
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS
+chart2/source/model/main/Diagram.cxx:88
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_SORT_BY_X_VALUES
+chart2/source/model/main/Diagram.cxx:89
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_CONNECT_BARS
+chart2/source/model/main/Diagram.cxx:90
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_GROUP_BARS_PER_AXIS
+chart2/source/model/main/Diagram.cxx:91
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
+chart2/source/model/main/Diagram.cxx:92
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_STARTING_ANGLE
+chart2/source/model/main/Diagram.cxx:93
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_RIGHT_ANGLED_AXES
+chart2/source/model/main/Diagram.cxx:97
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_MISSING_VALUE_TREATMENT
+chart2/source/model/main/Diagram.cxx:98
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_3DRELATIVEHEIGHT
+chart2/source/model/main/Diagram.cxx:100
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_OF_PIE_TYPE
+chart2/source/model/main/Diagram.cxx:103
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Diagram.cxx:83:1) PROP_DIAGRAM_EXTERNALDATA
+chart2/source/model/main/GridProperties.cxx:43
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/GridProperties.cxx:41:1) PROP_GRID_SHOW
+chart2/source/model/main/Legend.cxx:52
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_ANCHOR_POSITION
 chart2/source/model/main/Legend.cxx:53
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_ANCHOR_POSITION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_EXPANSION
 chart2/source/model/main/Legend.cxx:54
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_EXPANSION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_SHOW
 chart2/source/model/main/Legend.cxx:55
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_SHOW
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_OVERLAY
 chart2/source/model/main/Legend.cxx:56
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_OVERLAY
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_REF_PAGE_SIZE
 chart2/source/model/main/Legend.cxx:57
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_REF_PAGE_SIZE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_REL_POS
 chart2/source/model/main/Legend.cxx:58
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_REL_POS
-chart2/source/model/main/Legend.cxx:59
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Legend.cxx:51:1) PROP_LEGEND_REL_SIZE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Legend.cxx:50:1) PROP_LEGEND_REL_SIZE
+chart2/source/model/main/Title.cxx:50
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_ADJUST
 chart2/source/model/main/Title.cxx:51
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_ADJUST
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_LAST_LINE_ADJUST
 chart2/source/model/main/Title.cxx:52
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_LAST_LINE_ADJUST
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_LEFT_MARGIN
 chart2/source/model/main/Title.cxx:53
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_LEFT_MARGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_RIGHT_MARGIN
 chart2/source/model/main/Title.cxx:54
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_RIGHT_MARGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_TOP_MARGIN
 chart2/source/model/main/Title.cxx:55
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_TOP_MARGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_BOTTOM_MARGIN
 chart2/source/model/main/Title.cxx:56
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_BOTTOM_MARGIN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_PARA_IS_HYPHENATION
 chart2/source/model/main/Title.cxx:57
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_PARA_IS_HYPHENATION
-chart2/source/model/main/Title.cxx:58
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_VISIBLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_VISIBLE
+chart2/source/model/main/Title.cxx:59
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_TEXT_ROTATION
 chart2/source/model/main/Title.cxx:60
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_TEXT_ROTATION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_TEXT_STACKED
 chart2/source/model/main/Title.cxx:61
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_TEXT_STACKED
-chart2/source/model/main/Title.cxx:62
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_REL_POS
-chart2/source/model/main/Title.cxx:64
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/main/Title.cxx:49:1) PROP_TITLE_REF_PAGE_SIZE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_REL_POS
+chart2/source/model/main/Title.cxx:63
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/main/Title.cxx:48:1) PROP_TITLE_REF_PAGE_SIZE
 chart2/source/model/template/AreaChartTypeTemplate.cxx:44
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/AreaChartTypeTemplate.cxx:42:1) PROP_AREA_TEMPLATE_DIMENSION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/AreaChartTypeTemplate.cxx:42:1) PROP_AREA_TEMPLATE_DIMENSION
+chart2/source/model/template/BarChartTypeTemplate.cxx:45
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/BarChartTypeTemplate.cxx:43:1) PROP_BAR_TEMPLATE_DIMENSION
 chart2/source/model/template/BarChartTypeTemplate.cxx:46
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/BarChartTypeTemplate.cxx:44:1) PROP_BAR_TEMPLATE_DIMENSION
-chart2/source/model/template/BarChartTypeTemplate.cxx:47
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/BarChartTypeTemplate.cxx:44:1) PROP_BAR_TEMPLATE_GEOMETRY3D
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/BarChartTypeTemplate.cxx:43:1) PROP_BAR_TEMPLATE_GEOMETRY3D
 chart2/source/model/template/CandleStickChartType.cxx:42
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_JAPANESE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_JAPANESE
 chart2/source/model/template/CandleStickChartType.cxx:46
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST
 chart2/source/model/template/CandleStickChartType.cxx:47
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/CandleStickChartType.cxx:40:1) PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW
 chart2/source/model/template/ColumnChartType.cxx:37
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ColumnChartType.cxx:35:1) PROP_BARCHARTTYPE_OVERLAP_SEQUENCE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ColumnChartType.cxx:35:1) PROP_BARCHARTTYPE_OVERLAP_SEQUENCE
 chart2/source/model/template/ColumnChartType.cxx:38
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ColumnChartType.cxx:35:1) PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
-chart2/source/model/template/ColumnLineChartTypeTemplate.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx:48:1) PROP_COL_LINE_NUMBER_OF_LINES
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ColumnChartType.cxx:35:1) PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
+chart2/source/model/template/ColumnLineChartTypeTemplate.cxx:51
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx:49:1) PROP_COL_LINE_NUMBER_OF_LINES
 chart2/source/model/template/LineChartType.cxx:41
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_CURVE_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_CURVE_STYLE
 chart2/source/model/template/LineChartType.cxx:42
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_CURVE_RESOLUTION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_CURVE_RESOLUTION
 chart2/source/model/template/LineChartType.cxx:43
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_SPLINE_ORDER
-chart2/source/model/template/LineChartTypeTemplate.cxx:49
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartTypeTemplate.cxx:47:1) PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartType.cxx:39:1) PROP_LINECHARTTYPE_SPLINE_ORDER
 chart2/source/model/template/LineChartTypeTemplate.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartTypeTemplate.cxx:47:1) PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartTypeTemplate.cxx:48:1) PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE
 chart2/source/model/template/LineChartTypeTemplate.cxx:51
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/LineChartTypeTemplate.cxx:47:1) PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER
-chart2/source/model/template/PieChartType.cxx:41
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartType.cxx:39:1) PROP_PIECHARTTYPE_USE_RINGS
-chart2/source/model/template/PieChartType.cxx:42
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartType.cxx:39:1) PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
-chart2/source/model/template/PieChartTypeTemplate.cxx:53
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartTypeTemplate.cxx:51:1) PROP_PIE_TEMPLATE_DEFAULT_OFFSET
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartTypeTemplate.cxx:48:1) PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION
+chart2/source/model/template/LineChartTypeTemplate.cxx:52
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/LineChartTypeTemplate.cxx:48:1) PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER
 chart2/source/model/template/PieChartTypeTemplate.cxx:54
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartTypeTemplate.cxx:51:1) PROP_PIE_TEMPLATE_OFFSET_MODE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/PieChartTypeTemplate.cxx:52:1) PROP_PIE_TEMPLATE_DEFAULT_OFFSET
 chart2/source/model/template/PieChartTypeTemplate.cxx:55
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartTypeTemplate.cxx:51:1) PROP_PIE_TEMPLATE_DIMENSION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/PieChartTypeTemplate.cxx:52:1) PROP_PIE_TEMPLATE_OFFSET_MODE
 chart2/source/model/template/PieChartTypeTemplate.cxx:56
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/PieChartTypeTemplate.cxx:51:1) PROP_PIE_TEMPLATE_USE_RINGS
-chart2/source/model/template/ScatterChartType.cxx:44
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartType.cxx:42:1) PROP_SCATTERCHARTTYPE_CURVE_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/PieChartTypeTemplate.cxx:52:1) PROP_PIE_TEMPLATE_DIMENSION
+chart2/source/model/template/PieChartTypeTemplate.cxx:57
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/PieChartTypeTemplate.cxx:52:1) PROP_PIE_TEMPLATE_USE_RINGS
+chart2/source/model/template/PieChartTypeTemplate.cxx:58
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/PieChartTypeTemplate.cxx:52:1) PROP_PIE_TEMPLATE_SUB_PIE_TYPE
 chart2/source/model/template/ScatterChartType.cxx:45
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartType.cxx:42:1) PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartType.cxx:43:1) PROP_SCATTERCHARTTYPE_CURVE_STYLE
 chart2/source/model/template/ScatterChartType.cxx:46
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartType.cxx:42:1) PROP_SCATTERCHARTTYPE_SPLINE_ORDER
-chart2/source/model/template/ScatterChartTypeTemplate.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartTypeTemplate.cxx:48:1) PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartType.cxx:43:1) PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION
+chart2/source/model/template/ScatterChartType.cxx:47
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartType.cxx:43:1) PROP_SCATTERCHARTTYPE_SPLINE_ORDER
 chart2/source/model/template/ScatterChartTypeTemplate.cxx:51
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartTypeTemplate.cxx:48:1) PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartTypeTemplate.cxx:49:1) PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE
 chart2/source/model/template/ScatterChartTypeTemplate.cxx:52
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/ScatterChartTypeTemplate.cxx:48:1) PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER
-chart2/source/model/template/StockChartTypeTemplate.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/StockChartTypeTemplate.cxx:48:1) PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartTypeTemplate.cxx:49:1) PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION
+chart2/source/model/template/ScatterChartTypeTemplate.cxx:53
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/ScatterChartTypeTemplate.cxx:49:1) PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER
 chart2/source/model/template/StockChartTypeTemplate.cxx:51
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/StockChartTypeTemplate.cxx:48:1) PROP_STOCKCHARTTYPE_TEMPLATE_OPEN
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/StockChartTypeTemplate.cxx:49:1) PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME
 chart2/source/model/template/StockChartTypeTemplate.cxx:52
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/StockChartTypeTemplate.cxx:48:1) PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/StockChartTypeTemplate.cxx:49:1) PROP_STOCKCHARTTYPE_TEMPLATE_OPEN
 chart2/source/model/template/StockChartTypeTemplate.cxx:53
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/model/template/StockChartTypeTemplate.cxx:48:1) PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE
-chart2/source/tools/CachedDataSequence.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/CachedDataSequence.cxx:47:1) PROP_NUMBERFORMAT_KEY
-chart2/source/tools/CachedDataSequence.cxx:51
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/CachedDataSequence.cxx:47:1) PROP_PROPOSED_ROLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/StockChartTypeTemplate.cxx:49:1) PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH
+chart2/source/model/template/StockChartTypeTemplate.cxx:54
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/model/template/StockChartTypeTemplate.cxx:49:1) PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE
+chart2/source/tools/CachedDataSequence.cxx:46
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/CachedDataSequence.cxx:43:1) PROP_NUMBERFORMAT_KEY
+chart2/source/tools/CachedDataSequence.cxx:47
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/CachedDataSequence.cxx:43:1) PROP_PROPOSED_ROLE
 chart2/source/tools/RegressionCurveModel.cxx:41
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_DEGREE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_DEGREE
 chart2/source/tools/RegressionCurveModel.cxx:42
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_PERIOD
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_PERIOD
 chart2/source/tools/RegressionCurveModel.cxx:43
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_EXTRAPOLATE_FORWARD
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_EXTRAPOLATE_FORWARD
 chart2/source/tools/RegressionCurveModel.cxx:44
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_EXTRAPOLATE_BACKWARD
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_EXTRAPOLATE_BACKWARD
 chart2/source/tools/RegressionCurveModel.cxx:45
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_FORCE_INTERCEPT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_FORCE_INTERCEPT
 chart2/source/tools/RegressionCurveModel.cxx:46
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_INTERCEPT_VALUE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_INTERCEPT_VALUE
 chart2/source/tools/RegressionCurveModel.cxx:47
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_CURVE_NAME
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_CURVE_NAME
+chart2/source/tools/RegressionCurveModel.cxx:48
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionCurveModel.cxx:39:1) PROPERTY_MOVING_AVERAGE_TYPE
+chart2/source/tools/RegressionEquation.cxx:52
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_SHOW
 chart2/source/tools/RegressionEquation.cxx:53
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_SHOW
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_XNAME
 chart2/source/tools/RegressionEquation.cxx:54
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_XNAME
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_YNAME
 chart2/source/tools/RegressionEquation.cxx:55
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_YNAME
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_SHOW_CORRELATION_COEFF
 chart2/source/tools/RegressionEquation.cxx:56
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_SHOW_CORRELATION_COEFF
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_MAY_HAVE_CORRELATION_COEFF
 chart2/source/tools/RegressionEquation.cxx:57
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_REF_PAGE_SIZE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_REF_PAGE_SIZE
 chart2/source/tools/RegressionEquation.cxx:58
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_REL_POS
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_REL_POS
 chart2/source/tools/RegressionEquation.cxx:59
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/RegressionEquation.cxx:51:1) PROP_EQUATION_NUMBER_FORMAT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/RegressionEquation.cxx:50:1) PROP_EQUATION_NUMBER_FORMAT
+chart2/source/tools/UncachedDataSequence.cxx:47
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/UncachedDataSequence.cxx:45:1) PROP_NUMBERFORMAT_KEY
 chart2/source/tools/UncachedDataSequence.cxx:48
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/UncachedDataSequence.cxx:46:1) PROP_NUMBERFORMAT_KEY
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/UncachedDataSequence.cxx:45:1) PROP_PROPOSED_ROLE
 chart2/source/tools/UncachedDataSequence.cxx:49
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/UncachedDataSequence.cxx:46:1) PROP_PROPOSED_ROLE
-chart2/source/tools/UncachedDataSequence.cxx:50
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/chart2/source/tools/UncachedDataSequence.cxx:46:1) PROP_XML_RANGE
-chart2/source/view/axes/VAxisProperties.hxx:48
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/chart2/source/tools/UncachedDataSequence.cxx:45:1) PROP_XML_RANGE
+chart2/source/view/axes/VAxisProperties.hxx:51
     enum chart::AxisLabelStaggering SideBySide
-chart2/source/view/inc/LegendEntryProvider.hxx:42
+chart2/source/view/inc/LegendEntryProvider.hxx:45
     enum chart::LegendSymbolStyle Box
-chart2/source/view/inc/ShapeFactory.hxx:64
+chart2/source/view/inc/ShapeFactory.hxx:66
     enum chart::SymbolEnum Symbol_COUNT
-chart2/source/view/inc/ShapeFactory.hxx:76
+chart2/source/view/inc/ShapeFactory.hxx:73
     enum chart::ShapeFactory::StackPosition Top
-codemaker/source/cppumaker/dependencies.hxx:47
+codemaker/source/cppumaker/dependencies.hxx:48
     enum codemaker::cppumaker::Dependencies::Kind KIND_NORMAL
-comphelper/source/misc/backupfilehelper.cxx:207
+comphelper/source/misc/backupfilehelper.cxx:209
     enum (anonymous namespace)::PackageRepository BUNDLED
-comphelper/source/misc/backupfilehelper.cxx:207
+comphelper/source/misc/backupfilehelper.cxx:209
     enum (anonymous namespace)::PackageRepository SHARED
-comphelper/source/misc/backupfilehelper.cxx:207
+comphelper/source/misc/backupfilehelper.cxx:209
     enum (anonymous namespace)::PackageRepository USER
-comphelper/source/misc/syntaxhighlight.cxx:35
-    enum (anonymous namespace)::CharFlags StartNumber
 comphelper/source/misc/syntaxhighlight.cxx:36
-    enum (anonymous namespace)::CharFlags InNumber
+    enum (anonymous namespace)::CharFlags StartNumber
 comphelper/source/misc/syntaxhighlight.cxx:37
-    enum (anonymous namespace)::CharFlags InHexNumber
+    enum (anonymous namespace)::CharFlags InNumber
 comphelper/source/misc/syntaxhighlight.cxx:38
-    enum (anonymous namespace)::CharFlags InOctNumber
+    enum (anonymous namespace)::CharFlags InHexNumber
 comphelper/source/misc/syntaxhighlight.cxx:39
-    enum (anonymous namespace)::CharFlags StartString
+    enum (anonymous namespace)::CharFlags InOctNumber
 comphelper/source/misc/syntaxhighlight.cxx:40
-    enum (anonymous namespace)::CharFlags Operator
+    enum (anonymous namespace)::CharFlags StartString
 comphelper/source/misc/syntaxhighlight.cxx:41
-    enum (anonymous namespace)::CharFlags Space
+    enum (anonymous namespace)::CharFlags Operator
 comphelper/source/misc/syntaxhighlight.cxx:42
+    enum (anonymous namespace)::CharFlags Space
+comphelper/source/misc/syntaxhighlight.cxx:43
     enum (anonymous namespace)::CharFlags EOL
-configmgr/source/access.hxx:442
-    enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_ANY
+configmgr/source/access.hxx:455
+    enum configmgr::Access::(unnamed at /home/noel/libo-plugin/configmgr/source/access.hxx:454:5) IS_ANY
 configmgr/source/partial.hxx:33
     enum configmgr::Partial::Containment CONTAINS_SUBNODES
-connectivity/source/inc/java/sql/ConnectionLog.hxx:67
+connectivity/source/drivers/evoab2/EApi.h:74
+    EBookQueryTest E_BOOK_QUERY_IS
+connectivity/source/drivers/evoab2/EApi.h:75
+    EBookQueryTest E_BOOK_QUERY_CONTAINS
+connectivity/source/drivers/evoab2/EApi.h:76
+    EBookQueryTest E_BOOK_QUERY_BEGINS_WITH
+connectivity/source/drivers/evoab2/EApi.h:77
+    EBookQueryTest E_BOOK_QUERY_ENDS_WITH
+connectivity/source/inc/java/sql/ConnectionLog.hxx:66
     enum connectivity::java::sql::ConnectionLog::ObjectType CONNECTION
-connectivity/source/inc/java/sql/ConnectionLog.hxx:68
+connectivity/source/inc/java/sql/ConnectionLog.hxx:67
     enum connectivity::java::sql::ConnectionLog::ObjectType STATEMENT
-connectivity/source/inc/java/sql/ConnectionLog.hxx:69
+connectivity/source/inc/java/sql/ConnectionLog.hxx:68
     enum connectivity::java::sql::ConnectionLog::ObjectType RESULTSET
-connectivity/source/inc/java/sql/ConnectionLog.hxx:71
+connectivity/source/inc/java/sql/ConnectionLog.hxx:70
     enum connectivity::java::sql::ConnectionLog::ObjectType ObjectTypeCount
-connectivity/source/inc/TSortIndex.hxx:37
+connectivity/source/inc/propertyids.hxx:53
+    enum PropertyId PROPERTY_ID_NAME
+connectivity/source/inc/propertyids.hxx:54
+    enum PropertyId PROPERTY_ID_TYPE
+connectivity/source/inc/propertyids.hxx:55
+    enum PropertyId PROPERTY_ID_TYPENAME
+connectivity/source/inc/propertyids.hxx:56
+    enum PropertyId PROPERTY_ID_PRECISION
+connectivity/source/inc/propertyids.hxx:57
+    enum PropertyId PROPERTY_ID_SCALE
+connectivity/source/inc/propertyids.hxx:58
+    enum PropertyId PROPERTY_ID_ISNULLABLE
+connectivity/source/inc/propertyids.hxx:59
+    enum PropertyId PROPERTY_ID_ISAUTOINCREMENT
+connectivity/source/inc/propertyids.hxx:60
+    enum PropertyId PROPERTY_ID_ISROWVERSION
+connectivity/source/inc/propertyids.hxx:61
+    enum PropertyId PROPERTY_ID_DESCRIPTION
+connectivity/source/inc/propertyids.hxx:62
+    enum PropertyId PROPERTY_ID_DEFAULTVALUE
+connectivity/source/inc/propertyids.hxx:64
+    enum PropertyId PROPERTY_ID_REFERENCEDTABLE
+connectivity/source/inc/propertyids.hxx:65
+    enum PropertyId PROPERTY_ID_UPDATERULE
+connectivity/source/inc/propertyids.hxx:66
+    enum PropertyId PROPERTY_ID_DELETERULE
+connectivity/source/inc/propertyids.hxx:67
+    enum PropertyId PROPERTY_ID_CATALOG
+connectivity/source/inc/propertyids.hxx:68
+    enum PropertyId PROPERTY_ID_ISUNIQUE
+connectivity/source/inc/propertyids.hxx:69
+    enum PropertyId PROPERTY_ID_ISPRIMARYKEYINDEX
+connectivity/source/inc/propertyids.hxx:70
+    enum PropertyId PROPERTY_ID_ISCLUSTERED
+connectivity/source/inc/propertyids.hxx:71
+    enum PropertyId PROPERTY_ID_ISASCENDING
+connectivity/source/inc/propertyids.hxx:72
+    enum PropertyId PROPERTY_ID_SCHEMANAME
+connectivity/source/inc/propertyids.hxx:73
+    enum PropertyId PROPERTY_ID_CATALOGNAME
+connectivity/source/inc/propertyids.hxx:76
+    enum PropertyId PROPERTY_ID_CHECKOPTION
+connectivity/source/inc/propertyids.hxx:77
+    enum PropertyId PROPERTY_ID_PASSWORD
+connectivity/source/inc/propertyids.hxx:78
+    enum PropertyId PROPERTY_ID_RELATEDCOLUMN
+connectivity/source/inc/propertyids.hxx:80
+    enum PropertyId PROPERTY_ID_FUNCTION
+connectivity/source/inc/propertyids.hxx:81
+    enum PropertyId PROPERTY_ID_TABLENAME
+connectivity/source/inc/propertyids.hxx:82
+    enum PropertyId PROPERTY_ID_REALNAME
+connectivity/source/inc/propertyids.hxx:83
+    enum PropertyId PROPERTY_ID_DBASEPRECISIONCHANGED
+connectivity/source/inc/propertyids.hxx:84
+    enum PropertyId PROPERTY_ID_ISCURRENCY
+connectivity/source/inc/propertyids.hxx:88
+    enum PropertyId PROPERTY_ID_HY010
+connectivity/source/inc/propertyids.hxx:89
+    enum PropertyId PROPERTY_ID_LABEL
+connectivity/source/inc/propertyids.hxx:90
+    enum PropertyId PROPERTY_ID_DELIMITER
+connectivity/source/inc/propertyids.hxx:91
+    enum PropertyId PROPERTY_ID_FORMATKEY
+connectivity/source/inc/propertyids.hxx:92
+    enum PropertyId PROPERTY_ID_LOCALE
+connectivity/source/inc/propertyids.hxx:95
+    enum PropertyId PROPERTY_ID_AUTOINCREMENTCREATION
+connectivity/source/inc/propertyids.hxx:97
+    enum PropertyId PROPERTY_ID_PRIVILEGES
+connectivity/source/inc/propertyids.hxx:98
+    enum PropertyId PROPERTY_ID_HAVINGCLAUSE
+connectivity/source/inc/propertyids.hxx:100
+    enum PropertyId PROPERTY_ID_ISSIGNED
+connectivity/source/inc/propertyids.hxx:101
+    enum PropertyId PROPERTY_ID_AGGREGATEFUNCTION
+connectivity/source/inc/propertyids.hxx:102
+    enum PropertyId PROPERTY_ID_ISSEARCHABLE
+connectivity/source/inc/propertyids.hxx:104
+    enum PropertyId PROPERTY_ID_APPLYFILTER
+connectivity/source/inc/propertyids.hxx:105
+    enum PropertyId PROPERTY_ID_FILTER
+connectivity/source/inc/propertyids.hxx:106
+    enum PropertyId PROPERTY_ID_MASTERFIELDS
+connectivity/source/inc/propertyids.hxx:107
+    enum PropertyId PROPERTY_ID_DETAILFIELDS
+connectivity/source/inc/propertyids.hxx:108
+    enum PropertyId PROPERTY_ID_FIELDTYPE
+connectivity/source/inc/propertyids.hxx:109
+    enum PropertyId PROPERTY_ID_VALUE
+connectivity/source/inc/propertyids.hxx:110
+    enum PropertyId PROPERTY_ID_ACTIVE_CONNECTION
+connectivity/source/inc/TSortIndex.hxx:36
     enum connectivity::TAscendingOrder DESC
-cppuhelper/source/servicemanager.hxx:118
+cppuhelper/source/servicemanager.hxx:117
     enum cppuhelper::ServiceManager::Data::Implementation::Status STATUS_WRAPPER
-cui/source/dialogs/colorpicker.cxx:56
+cui/inc/tipoftheday.hrc:50
+    enum tipModule scalc
+cui/inc/tipoftheday.hrc:50
+    enum tipModule sdraw
+cui/inc/tipoftheday.hrc:50
+    enum tipModule simpress
+cui/inc/tipoftheday.hrc:50
+    enum tipModule soffice
+cui/inc/tipoftheday.hrc:50
+    enum tipModule swriter
+cui/source/dialogs/colorpicker.cxx:59
     enum (anonymous namespace)::UpdateFlags All
 cui/source/dialogs/hangulhanjadlg.cxx:88
     enum svx::(anonymous namespace)::PseudoRubyText::RubyPosition eBelow
-cui/source/inc/acccfg.hxx:72
+cui/source/inc/acccfg.hxx:75
     enum StartFileDialogType Open
 cui/source/inc/cuitabarea.hxx:82
     enum PageType Area
@@ -1000,20 +1128,24 @@ cui/source/inc/hldoctp.hxx:51
     enum SvxHyperlinkDocTp::EPathType Invalid
 cui/source/inc/scriptdlg.hxx:42
     enum InputDialogMode NEWLIB
-cui/source/options/optcolor.cxx:47
-    enum (anonymous namespace)::Group Group_General
 cui/source/options/optcolor.cxx:52
+    enum (anonymous namespace)::Group Group_General
+cui/source/options/optcolor.cxx:57
     enum (anonymous namespace)::Group Group_Basic
-cui/source/options/optfltr.cxx:28
+cui/source/options/optfltr.cxx:30
     enum MSFltrPg2_CheckBoxEntries Math
-cui/source/options/optfltr.cxx:29
+cui/source/options/optfltr.cxx:31
     enum MSFltrPg2_CheckBoxEntries Writer
-cui/source/options/optfltr.cxx:30
+cui/source/options/optfltr.cxx:32
     enum MSFltrPg2_CheckBoxEntries Calc
-cui/source/options/optfltr.cxx:31
-    enum MSFltrPg2_CheckBoxEntries Impress
 cui/source/options/optfltr.cxx:33
+    enum MSFltrPg2_CheckBoxEntries Impress
+cui/source/options/optfltr.cxx:34
+    enum MSFltrPg2_CheckBoxEntries SmartArt
+cui/source/options/optfltr.cxx:35
     enum MSFltrPg2_CheckBoxEntries Visio
+cui/source/options/optfltr.cxx:36
+    enum MSFltrPg2_CheckBoxEntries PDF
 cui/source/options/optgenrl.cxx:50
     enum (anonymous namespace)::RowType Row_Company
 cui/source/options/optgenrl.cxx:51
@@ -1038,76 +1170,66 @@ cui/source/options/optgenrl.cxx:60
     enum (anonymous namespace)::RowType Row_Phone
 cui/source/options/optgenrl.cxx:61
     enum (anonymous namespace)::RowType Row_FaxMail
-cui/source/options/optlingu.cxx:185
-    enum (anonymous namespace)::EID_OPTIONS EID_SPELL_AUTO
-cui/source/options/optlingu.cxx:186
-    enum (anonymous namespace)::EID_OPTIONS EID_GRAMMAR_AUTO
-cui/source/options/optlingu.cxx:187
-    enum (anonymous namespace)::EID_OPTIONS EID_CAPITAL_WORDS
-cui/source/options/optlingu.cxx:188
-    enum (anonymous namespace)::EID_OPTIONS EID_WORDS_WITH_DIGITS
-cui/source/options/optlingu.cxx:189
-    enum (anonymous namespace)::EID_OPTIONS EID_SPELL_SPECIAL
-cui/source/options/optlingu.cxx:193
-    enum (anonymous namespace)::EID_OPTIONS EID_HYPH_AUTO
-cui/source/options/optlingu.cxx:194
-    enum (anonymous namespace)::EID_OPTIONS EID_HYPH_SPECIAL
-cui/source/tabpages/autocdlg.cxx:326
+cui/source/tabpages/autocdlg.cxx:335
     enum (anonymous namespace)::OfaAutoFmtOptions USE_REPLACE_TABLE
-cui/source/tabpages/autocdlg.cxx:327
+cui/source/tabpages/autocdlg.cxx:336
     enum (anonymous namespace)::OfaAutoFmtOptions CORR_UPPER
-cui/source/tabpages/autocdlg.cxx:328
+cui/source/tabpages/autocdlg.cxx:337
     enum (anonymous namespace)::OfaAutoFmtOptions BEGIN_UPPER
-cui/source/tabpages/autocdlg.cxx:329
+cui/source/tabpages/autocdlg.cxx:338
     enum (anonymous namespace)::OfaAutoFmtOptions BOLD_UNDERLINE
-cui/source/tabpages/autocdlg.cxx:330
+cui/source/tabpages/autocdlg.cxx:339
     enum (anonymous namespace)::OfaAutoFmtOptions DETECT_URL
-cui/source/tabpages/autocdlg.cxx:331
+cui/source/tabpages/autocdlg.cxx:340
+    enum (anonymous namespace)::OfaAutoFmtOptions DETECT_DOI
+cui/source/tabpages/autocdlg.cxx:341
     enum (anonymous namespace)::OfaAutoFmtOptions REPLACE_DASHES
-cui/source/tabpages/autocdlg.cxx:332
+cui/source/tabpages/autocdlg.cxx:342
     enum (anonymous namespace)::OfaAutoFmtOptions DEL_SPACES_AT_STT_END
-cui/source/tabpages/autocdlg.cxx:333
+cui/source/tabpages/autocdlg.cxx:343
     enum (anonymous namespace)::OfaAutoFmtOptions DEL_SPACES_BETWEEN_LINES
-cui/source/tabpages/autocdlg.cxx:334
+cui/source/tabpages/autocdlg.cxx:344
     enum (anonymous namespace)::OfaAutoFmtOptions IGNORE_DBLSPACE
-cui/source/tabpages/autocdlg.cxx:335
+cui/source/tabpages/autocdlg.cxx:345
     enum (anonymous namespace)::OfaAutoFmtOptions CORRECT_CAPS_LOCK
-cui/source/tabpages/autocdlg.cxx:337
+cui/source/tabpages/autocdlg.cxx:347
+    enum (anonymous namespace)::OfaAutoFmtOptions APPLY_NUMBERING_AFTER_SPACE
+cui/source/tabpages/autocdlg.cxx:348
     enum (anonymous namespace)::OfaAutoFmtOptions INSERT_BORDER
-cui/source/tabpages/autocdlg.cxx:338
+cui/source/tabpages/autocdlg.cxx:349
     enum (anonymous namespace)::OfaAutoFmtOptions CREATE_TABLE
-cui/source/tabpages/autocdlg.cxx:339
+cui/source/tabpages/autocdlg.cxx:350
     enum (anonymous namespace)::OfaAutoFmtOptions REPLACE_STYLES
-cui/source/tabpages/autocdlg.cxx:340
+cui/source/tabpages/autocdlg.cxx:351
     enum (anonymous namespace)::OfaAutoFmtOptions DEL_EMPTY_NODE
-cui/source/tabpages/autocdlg.cxx:341
+cui/source/tabpages/autocdlg.cxx:352
     enum (anonymous namespace)::OfaAutoFmtOptions REPLACE_USER_COLL
-cui/source/tabpages/autocdlg.cxx:1532
+cui/source/tabpages/autocdlg.cxx:1555
     enum (anonymous namespace)::OfaQuoteOptions ADD_NONBRK_SPACE
-cui/source/tabpages/autocdlg.cxx:1533
+cui/source/tabpages/autocdlg.cxx:1556
     enum (anonymous namespace)::OfaQuoteOptions REPLACE_1ST
-cui/source/tabpages/autocdlg.cxx:1534
+cui/source/tabpages/autocdlg.cxx:1557
     enum (anonymous namespace)::OfaQuoteOptions TRANSLITERATE_RTL
-cui/source/tabpages/autocdlg.cxx:1535
+cui/source/tabpages/autocdlg.cxx:1558
     enum (anonymous namespace)::OfaQuoteOptions REPLACE_ANGLE_QUOTES
-cui/source/tabpages/swpossizetabpage.cxx:100
+cui/source/tabpages/swpossizetabpage.cxx:104
     enum (anonymous namespace)::LB RelPagePrintAreaBottom
-cui/source/tabpages/swpossizetabpage.cxx:101
+cui/source/tabpages/swpossizetabpage.cxx:105
     enum (anonymous namespace)::LB RelPagePrintAreaTop
-dbaccess/source/core/dataaccess/databasedocument.hxx:163
+dbaccess/source/core/dataaccess/databasedocument.hxx:161
     enum dbaccess::ODatabaseDocument::InitState NotInitialized
-dbaccess/source/core/dataaccess/databasedocument.hxx:641
+dbaccess/source/core/dataaccess/databasedocument.hxx:640
     enum dbaccess::DocumentGuard::InitMethod_ InitMethod
-dbaccess/source/core/dataaccess/databasedocument.hxx:647
+dbaccess/source/core/dataaccess/databasedocument.hxx:646
     enum dbaccess::DocumentGuard::DefaultMethod_ DefaultMethod
-dbaccess/source/core/dataaccess/databasedocument.hxx:653
+dbaccess/source/core/dataaccess/databasedocument.hxx:652
     enum dbaccess::DocumentGuard::MethodUsedDuringInit_ MethodUsedDuringInit
-dbaccess/source/core/dataaccess/databasedocument.hxx:659
+dbaccess/source/core/dataaccess/databasedocument.hxx:658
     enum dbaccess::DocumentGuard::MethodWithoutInit_ MethodWithoutInit
-dbaccess/source/core/inc/definitioncontainer.hxx:103
+dbaccess/source/core/inc/definitioncontainer.hxx:104
     enum dbaccess::ODefinitionContainer::ListenerType ContainerListemers
-dbaccess/source/core/inc/ModelImpl.hxx:111
-    enum dbaccess::ODatabaseModelImpl::EmbeddedMacros eDocumentWideMacros
+dbaccess/source/core/inc/ModelImpl.hxx:176
+    enum dbaccess::ODatabaseModelImpl::EmbeddedMacros DocumentWide
 dbaccess/source/core/inc/objectnameapproval.hxx:49
     enum dbaccess::ObjectNameApproval::ObjectType TypeTable
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:72
@@ -1116,11 +1238,11 @@ dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:73
     enum dbaccess::OSingleSelectQueryComposer::EColumnType OrderColumns
 dbaccess/source/filter/xml/xmlDataSource.hxx:32
     enum dbaxml::OXMLDataSource::UsedFor eDataSource
-dbaccess/source/ui/app/AppView.hxx:72
+dbaccess/source/ui/app/AppView.hxx:71
     enum dbaui::OApplicationView::ChildFocusState PANELSWAP
 dbaccess/source/ui/dlg/ConnectionHelper.hxx:32
     enum dbaui::IS_PATH_EXIST PATH_EXIST
-dbaccess/source/ui/inc/dbadmin.hxx:104
+dbaccess/source/ui/inc/dbadmin.hxx:105
     enum dbaui::ODbAdminDialog::ApplyResult AR_KEEP
 dbaccess/source/ui/inc/dsmeta.hxx:40
     enum dbaui::AuthenticationMode AuthPwd
@@ -1140,149 +1262,155 @@ dbaccess/source/ui/inc/WCopyTable.hxx:224
     enum dbaui::OCopyTableWizard::Wizard_Button_Style WIZARD_PREV
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx:37
     enum dbaui::OTableFieldDescWin::ChildFocusState HELP
-desktop/inc/app.hxx:64
+desktop/inc/app.hxx:66
     enum desktop::Desktop::BootstrapStatus BS_OK
-desktop/source/app/officeipcthread.cxx:775
+desktop/source/app/officeipcthread.cxx:770
     enum PipeMode PIPEMODE_CONNECTED
-desktop/source/app/officeipcthread.hxx:83
+desktop/source/app/officeipcthread.hxx:84
     enum desktop::RequestHandler::State Starting
 desktop/source/app/userinstall.hxx:32
     enum desktop::userinstall::Status ERROR_OTHER
-desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx:237
+desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx:238
     enum dp_gui::ExtensionCmdQueue::Thread::Input START
 desktop/source/deployment/inc/dp_update.hxx:47
     enum dp_misc::UPDATE_SOURCE UPDATE_SOURCE_ONLINE
-desktop/source/deployment/registry/component/dp_component.cxx:111
+desktop/source/deployment/registry/component/dp_component.cxx:112
     enum dp_registry::backend::component::(anonymous namespace)::BackendImpl::ComponentPackageImpl::Reg NotRegistered
-desktop/source/deployment/registry/component/dp_component.cxx:243
+desktop/source/deployment/registry/component/dp_component.cxx:244
     enum dp_registry::backend::component::(anonymous namespace)::BackendImpl::RcItem RCITEM_COMPONENTS
-desktop/source/deployment/registry/inc/dp_backend.h:215
+desktop/source/deployment/registry/inc/dp_backend.h:216
     enum dp_registry::backend::PackageRegistryBackend::Context Document
-desktop/source/deployment/registry/inc/dp_backend.h:215
+desktop/source/deployment/registry/inc/dp_backend.h:216
     enum dp_registry::backend::PackageRegistryBackend::Context Tmp
-desktop/source/deployment/registry/inc/dp_backend.h:215
+desktop/source/deployment/registry/inc/dp_backend.h:216
     enum dp_registry::backend::PackageRegistryBackend::Context Unknown
-desktop/source/lib/init.cxx:4770
+desktop/source/lib/init.cxx:6194
     enum (anonymous namespace)::UndoOrRedo REDO
-desktop/source/lib/init.cxx:6049
-    enum (anonymous at /home/noel/libo2/desktop/source/lib/init.cxx:6046:5) FULL_INIT
+desktop/source/lib/init.cxx:7813
+    enum (unnamed at /home/noel/libo-plugin/desktop/source/lib/init.cxx:7810:5) FULL_INIT
 desktop/source/migration/services/oo3extensionmigration.hxx:62
     enum migration::OO3ExtensionMigration::ScanResult SCANRESULT_DONTMIGRATE_EXTENSION
 desktop/unx/source/start.c:178
     int ProgressExit
 desktop/unx/source/start.c:178
     int ProgressRestart
-editeng/inc/editdoc.hxx:338
+editeng/inc/TextPortion.hxx:47
     enum AsianCompressionFlags Normal
+editeng/source/editeng/impedit.hxx:1322
+    enum ImpEditEngine::CallbackResult Continue
+editeng/source/editeng/impedit.hxx:1340
+    enum ImpEditEngine::IterFlag none
+editeng/source/editeng/impedit.hxx:1341
+    enum ImpEditEngine::IterFlag inclILS
 editeng/source/items/paraitem.cxx:70
     enum (anonymous namespace)::SvxSpecialLineSpace User
 editeng/source/items/paraitem.cxx:74
     enum (anonymous namespace)::SvxSpecialLineSpace End
-editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:24
+editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:23
     enum SvXMLAutoCorrectToken NAMESPACE
-editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:25
+editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:24
     enum SvXMLAutoCorrectToken ABBREVIATED_NAME
-editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:28
+editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:27
     enum SvXMLAutoCorrectToken NAME
-emfio/inc/mtftools.hxx:49
-    enum emfio::BkMode OPAQUE
-emfio/inc/mtftools.hxx:79
+emfio/inc/mtftools.hxx:50
+    enum emfio::BackgroundMode OPAQUE
+emfio/inc/mtftools.hxx:88
     enum emfio::WMFRasterOp Black
-emfio/inc/mtftools.hxx:83
+emfio/inc/mtftools.hxx:92
     enum emfio::WMFRasterOp CopyPen
+emfio/inc/mtftools.hxx:125
+    enum emfio::StretchMode BLACKONWHITE
+emfio/inc/mtftools.hxx:126
+    enum emfio::StretchMode WHITEONBLACK
+emfio/inc/mtftools.hxx:127
+    enum emfio::StretchMode COLORONCOLOR
+emfio/inc/mtftools.hxx:173
+    enum emfio::TextAlignmentMode TA_NOUPDATECP
+emfio/inc/mtftools.hxx:175
+    enum emfio::TextAlignmentMode TA_LEFT
+emfio/inc/mtftools.hxx:176
+    enum emfio::TextAlignmentMode TA_RIGHT
+emfio/inc/mtftools.hxx:179
+    enum emfio::TextAlignmentMode TA_TOP
+emfio/inc/mtftools.hxx:192
+    enum emfio::TernaryRasterOperation SRCCOPY
+emfio/inc/mtftools.hxx:206
+    enum emfio::PenStyle PS_COSMETIC
 extensions/source/propctrlr/browserlistbox.cxx:126
     enum pcr::PropertyControlContext_Impl::NotificationMode eAsynchronously
-extensions/source/propctrlr/eformshelper.hxx:181
+extensions/source/propctrlr/eformshelper.hxx:180
     enum pcr::EFormsHelper::ModelElementType Binding
-extensions/source/propctrlr/formcomponenthandler.hxx:47
+extensions/source/propctrlr/formcomponenthandler.hxx:46
     enum pcr::ComponentClassification eUnknown
-extensions/source/propctrlr/formlinkdialog.cxx:76
+extensions/source/propctrlr/formlinkdialog.cxx:77
     enum pcr::FieldLinkRow::LinkParticipant eMasterField
+extensions/source/propctrlr/inspectormodelbase.cxx:35
+    enum pcr::(anonymous namespace)::ModelPropertyId HAS_HELP_SECTION
+extensions/source/propctrlr/inspectormodelbase.cxx:36
+    enum pcr::(anonymous namespace)::ModelPropertyId MIN_HELP_TEXT_LINES
+extensions/source/propctrlr/inspectormodelbase.cxx:37
+    enum pcr::(anonymous namespace)::ModelPropertyId MAX_HELP_TEXT_LINES
+extensions/source/propctrlr/inspectormodelbase.cxx:38
+    enum pcr::(anonymous namespace)::ModelPropertyId IS_READ_ONLY
+extensions/source/propctrlr/pcrcommon.hxx:38
+    enum pcr::OwnPropertyId CONTROLCONTEXT
+extensions/source/propctrlr/pcrcommon.hxx:39
+    enum pcr::OwnPropertyId TABBINGMODEL
+extensions/source/update/check/updatehdl.hxx:53
+    enum DialogControls THROBBER_CTRL
 filter/source/config/cache/filtercache.hxx:140
     enum filter::config::FilterCache::EItemFlushState E_ITEM_UNCHANGED
-filter/source/graphicfilter/ipict/ipict.cxx:74
-    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DASH
-filter/source/graphicfilter/ipict/ipict.cxx:74
-    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DASHDOT
-filter/source/graphicfilter/ipict/ipict.cxx:74
-    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DOT
-filter/source/graphicfilter/ipict/ipict.cxx:74
-    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_NULL
-filter/source/graphicfilter/ipict/ipict.cxx:74
-    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_SOLID
-filter/source/graphicfilter/ipict/ipict.cxx:75
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_HORZ
-filter/source/graphicfilter/ipict/ipict.cxx:75
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_SOLID
-filter/source/graphicfilter/ipict/ipict.cxx:75
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_VERT
-filter/source/graphicfilter/ipict/ipict.cxx:76
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_CROSS
-filter/source/graphicfilter/ipict/ipict.cxx:76
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_DIAGCROSS
-filter/source/graphicfilter/ipict/ipict.cxx:76
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_DOWNDIAG
-filter/source/graphicfilter/ipict/ipict.cxx:76
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_UPDIAG
-filter/source/graphicfilter/ipict/ipict.cxx:77
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_25
-filter/source/graphicfilter/ipict/ipict.cxx:77
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_50
-filter/source/graphicfilter/ipict/ipict.cxx:77
-    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_75
-filter/source/graphicfilter/ipict/ipict.cxx:149
-    enum (anonymous namespace)::PictDrawingMethod UNDEFINED
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx:35
     enum FilterType FILTER_IMPORT
-filter/source/xsltdialog/typedetectionimport.hxx:48
+filter/source/xsltdialog/typedetectionimport.hxx:47
     enum ImportState e_Unknown
-forms/source/inc/FormComponent.hxx:557
+forms/source/inc/FormComponent.hxx:524
     enum frm::OBoundControlModel::ValueChangeInstigator eOther
-forms/source/richtext/rtattributes.hxx:40
+forms/source/richtext/rtattributes.hxx:39
     enum frm::AttributeCheckState eIndetermined
-forms/source/solar/inc/navtoolbar.hxx:39
+forms/source/solar/inc/navtoolbar.hxx:38
     enum frm::NavigationToolBar::ImageSize eSmall
-forms/source/xforms/submission/submission.hxx:115
+forms/source/xforms/submission/submission.hxx:113
     enum CSubmission::SubmissionResult UNKNOWN_ERROR
-fpicker/source/office/fpinteraction.hxx:47
+fpicker/source/office/fpinteraction.hxx:46
     enum svt::OFilePickerInteractionHandler::EInterceptedInteractions E_NOINTERCEPTION
 fpicker/source/office/fpsmartcontent.hxx:59
     enum svt::SmartContent::Type Document
 fpicker/source/office/fpsmartcontent.hxx:97
     enum svt::SmartContent::InteractionHandlerType IHT_OWN
-framework/inc/dispatch/closedispatcher.hxx:67
+framework/inc/dispatch/closedispatcher.hxx:66
     enum framework::CloseDispatcher::EOperation E_CLOSE_WIN
-framework/inc/jobs/jobdata.hxx:50
+framework/inc/jobs/jobdata.hxx:51
     enum framework::JobData::EMode E_UNKNOWN_MODE
-framework/inc/jobs/jobdata.hxx:54
+framework/inc/jobs/jobdata.hxx:55
     enum framework::JobData::EMode E_SERVICE
-framework/inc/jobs/jobdata.hxx:66
+framework/inc/jobs/jobdata.hxx:67
     enum framework::JobData::EEnvironment E_UNKNOWN_ENVIRONMENT
-framework/inc/jobs/jobresult.hxx:53
+framework/inc/jobs/jobresult.hxx:52
     enum framework::JobResult::EParts E_NOPART
-framework/inc/jobs/jobresult.hxx:54
+framework/inc/jobs/jobresult.hxx:53
     enum framework::JobResult::EParts E_ARGUMENTS
-framework/inc/jobs/jobresult.hxx:55
+framework/inc/jobs/jobresult.hxx:54
     enum framework::JobResult::EParts E_DEACTIVATE
-framework/inc/jobs/jobresult.hxx:56
+framework/inc/jobs/jobresult.hxx:55
     enum framework::JobResult::EParts E_DISPATCHRESULT
-framework/inc/uielement/menubarmerger.hxx:48
+framework/inc/uielement/menubarmerger.hxx:47
     enum framework::RPResultInfo RP_POPUPMENU_NOT_FOUND
-framework/inc/uielement/menubarmerger.hxx:49
+framework/inc/uielement/menubarmerger.hxx:48
     enum framework::RPResultInfo RP_MENUITEM_NOT_FOUND
-framework/inc/uielement/togglebuttontoolbarcontroller.hxx:48
+framework/inc/uielement/togglebuttontoolbarcontroller.hxx:47
     enum framework::ToggleButtonToolbarController::Style ToggleDropDownButton
-framework/inc/xml/imagesdocumenthandler.hxx:59
+framework/inc/xml/imagesdocumenthandler.hxx:58
     enum framework::OReadImagesDocumentHandler::Image_XML_Namespace IMG_NS_XLINK
-framework/inc/xml/statusbardocumenthandler.hxx:61
+framework/inc/xml/statusbardocumenthandler.hxx:60
     enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Namespace SB_NS_XLINK
-framework/inc/xml/toolboxdocumenthandler.hxx:60
+framework/inc/xml/toolboxdocumenthandler.hxx:59
     enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Namespace TB_NS_XLINK
 framework/source/fwe/classes/addonsoptions.cxx:240
     enum framework::AddonsOptions_Impl::ImageSize IMGSIZE_SMALL
 framework/source/fwe/classes/addonsoptions.cxx:241
     enum framework::AddonsOptions_Impl::ImageSize IMGSIZE_BIG
-framework/source/inc/loadenv/loadenv.hxx:92
+framework/source/inc/loadenv/loadenv.hxx:91
     enum framework::LoadEnv::EContentType E_CAN_BE_HANDLED
 framework/source/inc/loadenv/loadenvexception.hxx:55
     enum framework::LoadEnvException::EIDs ID_INVALID_ENVIRONMENT
@@ -1294,131 +1422,99 @@ framework/source/inc/loadenv/loadenvexception.hxx:66
     enum framework::LoadEnvException::EIDs ID_STILL_RUNNING
 framework/source/inc/loadenv/loadenvexception.hxx:71
     enum framework::LoadEnvException::EIDs ID_GENERAL_ERROR
-framework/source/layoutmanager/toolbarlayoutmanager.hxx:56
+framework/source/layoutmanager/toolbarlayoutmanager.hxx:55
     enum framework::ToolbarLayoutManager::PreviewFrameDetection PREVIEWFRAME_NO
-framework/source/services/autorecovery.cxx:169
+framework/source/services/autorecovery.cxx:210
     enum (anonymous namespace)::DocState Unknown
-framework/source/services/autorecovery.cxx:177
+framework/source/services/autorecovery.cxx:218
     enum (anonymous namespace)::DocState TrySave
-framework/source/services/autorecovery.cxx:188
+framework/source/services/autorecovery.cxx:229
     enum (anonymous namespace)::DocState Succeeded
-framework/source/services/autorecovery.cxx:248
+framework/source/services/autorecovery.cxx:289
     enum (anonymous namespace)::AutoRecovery::EFailureSafeResult E_COPIED
-framework/source/services/autorecovery.cxx:249
+framework/source/services/autorecovery.cxx:290
     enum (anonymous namespace)::AutoRecovery::EFailureSafeResult E_ORIGINAL_FILE_MISSING
-framework/source/services/autorecovery.cxx:250
+framework/source/services/autorecovery.cxx:291
     enum (anonymous namespace)::AutoRecovery::EFailureSafeResult E_WRONG_TARGET_PATH
-framework/source/services/substitutepathvars.cxx:54
+framework/source/services/substitutepathvars.cxx:53
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_INST
-framework/source/services/substitutepathvars.cxx:55
+framework/source/services/substitutepathvars.cxx:54
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_PROG
-framework/source/services/substitutepathvars.cxx:56
+framework/source/services/substitutepathvars.cxx:55
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_USER
-framework/source/services/substitutepathvars.cxx:58
+framework/source/services/substitutepathvars.cxx:57
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_HOME
-framework/source/services/substitutepathvars.cxx:59
+framework/source/services/substitutepathvars.cxx:58
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_TEMP
-framework/source/services/substitutepathvars.cxx:61
+framework/source/services/substitutepathvars.cxx:60
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_USERNAME
-framework/source/services/substitutepathvars.cxx:62
+framework/source/services/substitutepathvars.cxx:61
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_LANGID
-framework/source/services/substitutepathvars.cxx:63
+framework/source/services/substitutepathvars.cxx:62
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_VLANG
-framework/source/services/substitutepathvars.cxx:64
+framework/source/services/substitutepathvars.cxx:63
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_INSTPATH
-framework/source/services/substitutepathvars.cxx:65
+framework/source/services/substitutepathvars.cxx:64
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_PROGPATH
-framework/source/services/substitutepathvars.cxx:66
+framework/source/services/substitutepathvars.cxx:65
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_USERPATH
-framework/source/services/substitutepathvars.cxx:67
+framework/source/services/substitutepathvars.cxx:66
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_INSTURL
-framework/source/services/substitutepathvars.cxx:68
+framework/source/services/substitutepathvars.cxx:67
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_PROGURL
-framework/source/services/substitutepathvars.cxx:69
+framework/source/services/substitutepathvars.cxx:68
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_USERURL
-framework/source/services/substitutepathvars.cxx:72
+framework/source/services/substitutepathvars.cxx:71
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_BASEINSTURL
-framework/source/services/substitutepathvars.cxx:73
+framework/source/services/substitutepathvars.cxx:72
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_USERDATAURL
-framework/source/services/substitutepathvars.cxx:74
+framework/source/services/substitutepathvars.cxx:73
     enum (anonymous namespace)::PreDefVariable PREDEFVAR_BRANDBASEURL
-framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:140
+framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:146
     enum (anonymous namespace)::ModuleUIConfigurationManager::Layer LAYER_DEFAULT
-framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:142
+framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:148
     enum (anonymous namespace)::ModuleUIConfigurationManager::Layer LAYER_COUNT
-framework/source/uiconfiguration/windowstateconfiguration.cxx:141
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_DOCKINGAREA
-framework/source/uiconfiguration/windowstateconfiguration.cxx:142
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_POS
 framework/source/uiconfiguration/windowstateconfiguration.cxx:143
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_SIZE
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_DOCKINGAREA
 framework/source/uiconfiguration/windowstateconfiguration.cxx:144
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_UINAME
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_POS
 framework/source/uiconfiguration/windowstateconfiguration.cxx:145
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_INTERNALSTATE
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_SIZE
 framework/source/uiconfiguration/windowstateconfiguration.cxx:146
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_STYLE
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_UINAME
 framework/source/uiconfiguration/windowstateconfiguration.cxx:147
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_DOCKPOS
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_INTERNALSTATE
 framework/source/uiconfiguration/windowstateconfiguration.cxx:148
-    enum (anonymous namespace)::ConfigurationAccess_WindowState::(anonymous at /home/noel/libo2/framework/source/uiconfiguration/windowstateconfiguration.cxx:139:9) WINDOWSTATE_MASK_DOCKSIZE
-helpcompiler/inc/BasCodeTagger.hxx:36
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_STYLE
+framework/source/uiconfiguration/windowstateconfiguration.cxx:149
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_DOCKPOS
+framework/source/uiconfiguration/windowstateconfiguration.cxx:150
+    enum (anonymous namespace)::ConfigurationAccess_WindowState::(unnamed at /home/noel/libo-plugin/framework/source/uiconfiguration/windowstateconfiguration.cxx:141:9) WINDOWSTATE_MASK_DOCKSIZE
+helpcompiler/inc/BasCodeTagger.hxx:35
     enum BasicCodeTagger::TaggerException NULL_DOCUMENT
-helpcompiler/inc/HelpCompiler.hxx:51
+helpcompiler/inc/HelpCompiler.hxx:50
     enum fs::convert native
-i18nlangtag/source/languagetag/languagetag.cxx:349
-    enum LanguageTagImpl::Extraction EXTRACTED_X
-i18nlangtag/source/languagetag/languagetag.cxx:350
-    enum LanguageTagImpl::Extraction EXTRACTED_X_JOKER
-i18nlangtag/source/languagetag/languagetag.cxx:351
+i18nlangtag/source/languagetag/languagetag.cxx:368
     enum LanguageTagImpl::Extraction EXTRACTED_KNOWN_BAD
 i18npool/inc/cclass_unicode.hxx:37
     enum ParserFlags ILLEGAL
 i18npool/inc/cclass_unicode.hxx:46
     enum ParserFlags WORD_SEP
-idl/inc/types.hxx:51
+idl/inc/types.hxx:49
     enum MetaTypeType Enum
-idl/inc/types.hxx:51
+idl/inc/types.hxx:49
     enum MetaTypeType Interface
-idlc/inc/idlctypes.hxx:63
-    enum ParseState PS_SingletonDeclSeen
-idlc/inc/idlctypes.hxx:74
-    enum ParseState PS_ServiceQsSeen
-idlc/inc/idlctypes.hxx:80
-    enum ParseState PS_SingletonSeen
-idlc/inc/idlctypes.hxx:81
-    enum ParseState PS_SingletonIDSeen
-idlc/inc/idlctypes.hxx:82
-    enum ParseState PS_SingletonSqSeen
-idlc/inc/idlctypes.hxx:83
-    enum ParseState PS_SingletonQsSeen
-idlc/inc/idlctypes.hxx:84
-    enum ParseState PS_SingletonBodySeen
-include/avmedia/mediaitem.hxx:46
+include/avmedia/mediaitem.hxx:52
     enum AVMediaSetMask ALL
-include/basegfx/DrawCommands.hxx:33
+include/basegfx/DrawCommands.hxx:34
     enum gfx::DrawCommandType Root
 include/basegfx/polygon/b2dpolygontools.hxx:48
     enum CutFlagValue DEFAULT
 include/basegfx/utils/common.hxx:28
     enum basegfx::Axis2D Y
-include/basic/basmgr.hxx:43
-    enum BasicErrorReason OPENLIBSTORAGE
-include/basic/basmgr.hxx:44
-    enum BasicErrorReason OPENMGRSTREAM
-include/basic/basmgr.hxx:45
-    enum BasicErrorReason OPENLIBSTREAM
-include/basic/basmgr.hxx:46
-    enum BasicErrorReason LIBNOTFOUND
-include/basic/basmgr.hxx:47
-    enum BasicErrorReason STORAGENOTFOUND
-include/basic/basmgr.hxx:48
-    enum BasicErrorReason BASICLOADERROR
-include/basic/basmgr.hxx:49
-    enum BasicErrorReason STDLIB
-include/basic/sbdef.hxx:50
+include/basic/sbdef.hxx:51
     enum BasicDebugFlags Continue
-include/codemaker/commoncpp.hxx:52
+include/codemaker/commoncpp.hxx:51
     enum codemaker::cpp::IdentifierTranslationMode NonGlobal
 include/comphelper/componentbase.hxx:110
     enum comphelper::ComponentMethodGuard::MethodType Default
@@ -1426,23 +1522,29 @@ include/comphelper/configurationhelper.hxx:43
     enum comphelper::EConfigurationModes Standard
 include/comphelper/docpasswordhelper.hxx:39
     enum comphelper::DocPasswordVerifierResult Abort
-include/comphelper/lok.hxx:78
+include/comphelper/documentconstants.hxx:104
+    enum SfxFilterFlags NOTINFILEDLG
+include/comphelper/documentconstants.hxx:112
+    enum SfxFilterFlags COMBINED
+include/comphelper/errcode.hxx:73
+    enum WarningFlag Yes
+include/comphelper/lok.hxx:93
     enum comphelper::LibreOfficeKit::Compat none
-include/comphelper/lok.hxx:79
+include/comphelper/lok.hxx:94
     enum comphelper::LibreOfficeKit::Compat scNoGridBackground
-include/comphelper/lok.hxx:80
+include/comphelper/lok.hxx:95
     enum comphelper::LibreOfficeKit::Compat scPrintTwipsMsgs
-include/connectivity/parameters.hxx:67
+include/connectivity/parameters.hxx:68
     enum dbtools::ParameterManager::ParameterClassification LinkedByParamName
 include/connectivity/sqliterator.hxx:51
     enum connectivity::TraversalParts All
 include/connectivity/sqlnode.hxx:223
     enum connectivity::OSQLParseNode::Rule null_predicate_part_2
-include/desktop/crashreport.hxx:46
+include/desktop/crashreport.hxx:47
     CrashReporter::tAddKeyHandling AddItem
-include/desktop/crashreport.hxx:46
+include/desktop/crashreport.hxx:47
     CrashReporter::tAddKeyHandling Create
-include/desktop/crashreport.hxx:46
+include/desktop/crashreport.hxx:47
     CrashReporter::tAddKeyHandling Write
 include/desktop/exithelper.h:28
     enum EExitCodes EXITHELPER_FATAL_ERROR
@@ -1450,39 +1552,207 @@ include/desktop/exithelper.h:30
     enum EExitCodes EXITHELPER_CRASH_WITH_RESTART
 include/desktop/exithelper.h:32
     enum EExitCodes EXITHELPER_NORMAL_RESTART
+include/docmodel/color/ComplexColor.hxx:37
+    enum model::SystemColorType Unused
+include/docmodel/color/ComplexColor.hxx:38
+    enum model::SystemColorType DarkShadow3D
+include/docmodel/color/ComplexColor.hxx:39
+    enum model::SystemColorType Light3D
+include/docmodel/color/ComplexColor.hxx:40
+    enum model::SystemColorType ActiveBorder
+include/docmodel/color/ComplexColor.hxx:41
+    enum model::SystemColorType ActiveCaption
+include/docmodel/color/ComplexColor.hxx:42
+    enum model::SystemColorType AppWorkspace
+include/docmodel/color/ComplexColor.hxx:43
+    enum model::SystemColorType Background
+include/docmodel/color/ComplexColor.hxx:44
+    enum model::SystemColorType ButtonFace
+include/docmodel/color/ComplexColor.hxx:45
+    enum model::SystemColorType ButtonHighlight
+include/docmodel/color/ComplexColor.hxx:46
+    enum model::SystemColorType ButtonShadow
+include/docmodel/color/ComplexColor.hxx:47
+    enum model::SystemColorType ButtonText
+include/docmodel/color/ComplexColor.hxx:48
+    enum model::SystemColorType CaptionText
+include/docmodel/color/ComplexColor.hxx:49
+    enum model::SystemColorType GradientActiveCaption
+include/docmodel/color/ComplexColor.hxx:50
+    enum model::SystemColorType GradientInactiveCaption
+include/docmodel/color/ComplexColor.hxx:51
+    enum model::SystemColorType GrayText
+include/docmodel/color/ComplexColor.hxx:52
+    enum model::SystemColorType Highlight
+include/docmodel/color/ComplexColor.hxx:53
+    enum model::SystemColorType HighlightText
+include/docmodel/color/ComplexColor.hxx:54
+    enum model::SystemColorType HotLight
+include/docmodel/color/ComplexColor.hxx:55
+    enum model::SystemColorType InactiveBorder
+include/docmodel/color/ComplexColor.hxx:56
+    enum model::SystemColorType InactiveCaption
+include/docmodel/color/ComplexColor.hxx:57
+    enum model::SystemColorType InactiveCaptionText
+include/docmodel/color/ComplexColor.hxx:58
+    enum model::SystemColorType InfoBack
+include/docmodel/color/ComplexColor.hxx:59
+    enum model::SystemColorType InfoText
+include/docmodel/color/ComplexColor.hxx:60
+    enum model::SystemColorType Menu
+include/docmodel/color/ComplexColor.hxx:61
+    enum model::SystemColorType MenuBar
+include/docmodel/color/ComplexColor.hxx:62
+    enum model::SystemColorType MenuHighlight
+include/docmodel/color/ComplexColor.hxx:63
+    enum model::SystemColorType MenuText
+include/docmodel/color/ComplexColor.hxx:64
+    enum model::SystemColorType ScrollBar
+include/docmodel/color/ComplexColor.hxx:65
+    enum model::SystemColorType Window
+include/docmodel/color/ComplexColor.hxx:66
+    enum model::SystemColorType WindowFrame
+include/docmodel/color/ComplexColor.hxx:67
+    enum model::SystemColorType WindowText
+include/docmodel/color/Transformation.hxx:22
+    enum model::TransformationType Red
+include/docmodel/color/Transformation.hxx:23
+    enum model::TransformationType RedMod
+include/docmodel/color/Transformation.hxx:24
+    enum model::TransformationType RedOff
+include/docmodel/color/Transformation.hxx:25
+    enum model::TransformationType Green
+include/docmodel/color/Transformation.hxx:26
+    enum model::TransformationType GreenMod
+include/docmodel/color/Transformation.hxx:27
+    enum model::TransformationType GreenOff
+include/docmodel/color/Transformation.hxx:28
+    enum model::TransformationType Blue
+include/docmodel/color/Transformation.hxx:29
+    enum model::TransformationType BlueMod
+include/docmodel/color/Transformation.hxx:30
+    enum model::TransformationType BlueOff
+include/docmodel/color/Transformation.hxx:32
+    enum model::TransformationType AlphaMod
+include/docmodel/color/Transformation.hxx:33
+    enum model::TransformationType AlphaOff
+include/docmodel/color/Transformation.hxx:34
+    enum model::TransformationType Hue
+include/docmodel/color/Transformation.hxx:35
+    enum model::TransformationType HueMod
+include/docmodel/color/Transformation.hxx:36
+    enum model::TransformationType HueOff
+include/docmodel/color/Transformation.hxx:37
+    enum model::TransformationType Sat
+include/docmodel/color/Transformation.hxx:38
+    enum model::TransformationType SatMod
+include/docmodel/color/Transformation.hxx:40
+    enum model::TransformationType Lum
+include/docmodel/color/Transformation.hxx:45
+    enum model::TransformationType Gray
+include/docmodel/color/Transformation.hxx:46
+    enum model::TransformationType Comp
+include/docmodel/color/Transformation.hxx:47
+    enum model::TransformationType Inv
+include/docmodel/color/Transformation.hxx:48
+    enum model::TransformationType Gamma
+include/docmodel/color/Transformation.hxx:49
+    enum model::TransformationType InvGamma
+include/docmodel/theme/FormatScheme.hxx:68
+    enum model::GradientType Undefined
+include/docmodel/theme/FormatScheme.hxx:107
+    enum model::PatternPreset Unused
+include/docmodel/theme/FormatScheme.hxx:179
+    enum model::BitmapMode Unused
+include/docmodel/theme/FormatScheme.hxx:341
+    enum model::LineEndType Triangle
+include/docmodel/theme/FormatScheme.hxx:342
+    enum model::LineEndType Stealth
+include/docmodel/theme/FormatScheme.hxx:343
+    enum model::LineEndType Diamond
+include/docmodel/theme/FormatScheme.hxx:344
+    enum model::LineEndType Oval
+include/docmodel/theme/FormatScheme.hxx:345
+    enum model::LineEndType Arrow
+include/docmodel/theme/FormatScheme.hxx:350
+    enum model::LineEndWidth Unset
+include/docmodel/theme/FormatScheme.hxx:351
+    enum model::LineEndWidth Small
+include/docmodel/theme/FormatScheme.hxx:352
+    enum model::LineEndWidth Medium
+include/docmodel/theme/FormatScheme.hxx:353
+    enum model::LineEndWidth Large
+include/docmodel/theme/FormatScheme.hxx:358
+    enum model::LineEndLength Unset
+include/docmodel/theme/FormatScheme.hxx:359
+    enum model::LineEndLength Small
+include/docmodel/theme/FormatScheme.hxx:360
+    enum model::LineEndLength Medium
+include/docmodel/theme/FormatScheme.hxx:361
+    enum model::LineEndLength Large
+include/docmodel/theme/FormatScheme.hxx:400
+    enum model::EffectType Unset
+include/docmodel/theme/FormatScheme.hxx:401
+    enum model::EffectType OuterShadow
+include/docmodel/theme/FormatScheme.hxx:402
+    enum model::EffectType InnerShadow
+include/docmodel/theme/FormatScheme.hxx:403
+    enum model::EffectType Glow
+include/docmodel/theme/FormatScheme.hxx:404
+    enum model::EffectType SoftEdge
+include/docmodel/theme/FormatScheme.hxx:405
+    enum model::EffectType Reflection
+include/docmodel/theme/FormatScheme.hxx:406
+    enum model::EffectType Blur
+include/docmodel/theme/ThemeColorType.hxx:25
+    enum model::ThemeColorType Accent1
+include/docmodel/theme/ThemeColorType.hxx:26
+    enum model::ThemeColorType Accent2
+include/docmodel/theme/ThemeColorType.hxx:27
+    enum model::ThemeColorType Accent3
+include/docmodel/theme/ThemeColorType.hxx:28
+    enum model::ThemeColorType Accent4
+include/docmodel/theme/ThemeColorType.hxx:29
+    enum model::ThemeColorType Accent5
+include/docmodel/theme/ThemeColorType.hxx:30
+    enum model::ThemeColorType Accent6
+include/docmodel/theme/ThemeColorType.hxx:31
+    enum model::ThemeColorType Hyperlink
+include/docmodel/theme/ThemeColorType.hxx:32
+    enum model::ThemeColorType FollowedHyperlink
+include/docmodel/theme/ThemeColorType.hxx:38
+    enum model::ThemeColorUsage Unknown
 include/drawinglayer/primitive2d/helplineprimitive2d.hxx:39
     enum drawinglayer::primitive2d::HelplineStyle2D Point
-include/drawinglayer/primitive2d/svggradientprimitive2d.hxx:76
-    enum drawinglayer::primitive2d::SpreadMethod Repeat
 include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx:113
     enum drawinglayer::primitive2d::FieldType FIELD_TYPE_COMMON
-include/editeng/AccessibleContextBase.hxx:62
+include/editeng/AccessibleContextBase.hxx:61
     enum accessibility::AccessibleContextBase::StringOrigin ManuallySet
-include/editeng/AccessibleContextBase.hxx:63
+include/editeng/AccessibleContextBase.hxx:62
     enum accessibility::AccessibleContextBase::StringOrigin FromShape
-include/editeng/AccessibleContextBase.hxx:64
+include/editeng/AccessibleContextBase.hxx:63
     enum accessibility::AccessibleContextBase::StringOrigin AutomaticallyCreated
-include/editeng/boxitem.hxx:150
+include/editeng/boxitem.hxx:186
     enum SvxBoxInfoItemValidFlags VERT
-include/editeng/boxitem.hxx:151
+include/editeng/boxitem.hxx:187
     enum SvxBoxInfoItemValidFlags DISTANCE
-include/editeng/boxitem.hxx:152
+include/editeng/boxitem.hxx:188
     enum SvxBoxInfoItemValidFlags DISABLE
-include/editeng/boxitem.hxx:153
+include/editeng/boxitem.hxx:189
     enum SvxBoxInfoItemValidFlags ALL
-include/editeng/editdata.hxx:36
+include/editeng/editdata.hxx:39
     enum EESelectionMode Std
-include/editeng/editeng.hxx:129
+include/editeng/editeng.hxx:135
     enum GetAttribsFlags ALL
 include/editeng/editobj.hxx:55
     enum TextRotation BOTTOMTOTOP
-include/editeng/editstat.hxx:43
+include/editeng/editstat.hxx:44
     enum EEControlBits MARKFIELDS
-include/editeng/editstat.hxx:119
+include/editeng/editstat.hxx:121
     enum SpellCallbackCommand WORDLANGUAGE
-include/editeng/editstat.hxx:120
+include/editeng/editstat.hxx:122
     enum SpellCallbackCommand PARALANGUAGE
-include/editeng/editview.hxx:83
+include/editeng/editview.hxx:86
     enum ScrollRangeCheck NoNegative
 include/editeng/flditem.hxx:311
     enum SvxFileType Var
@@ -1490,27 +1760,25 @@ include/editeng/flditem.hxx:353
     enum SvxAuthorType Var
 include/editeng/hangulhanja.hxx:84
     enum editeng::HangulHanjaConversion::ConversionDirection eHanjaToHangul
-include/editeng/numitem.hxx:231
+include/editeng/numitem.hxx:238
     enum SvxNumRuleFlags CHAR_STYLE
-include/editeng/numitem.hxx:232
+include/editeng/numitem.hxx:239
     enum SvxNumRuleFlags BULLET_REL_SIZE
-include/editeng/numitem.hxx:233
+include/editeng/numitem.hxx:240
     enum SvxNumRuleFlags BULLET_COLOR
-include/editeng/numitem.hxx:234
+include/editeng/numitem.hxx:241
     enum SvxNumRuleFlags NO_NUMBERS
-include/editeng/numitem.hxx:235
+include/editeng/numitem.hxx:242
     enum SvxNumRuleFlags ENABLE_LINKED_BMP
-include/editeng/numitem.hxx:236
+include/editeng/numitem.hxx:243
     enum SvxNumRuleFlags ENABLE_EMBEDDED_BMP
-include/editeng/numitem.hxx:246
+include/editeng/numitem.hxx:253
     enum SvxNumRuleType OUTLINE_NUMBERING
-include/editeng/numitem.hxx:247
+include/editeng/numitem.hxx:254
     enum SvxNumRuleType PRESENTATION_NUMBERING
-include/editeng/outliner.hxx:98
-    enum ParaFlag SETBULLETTEXT
-include/editeng/outliner.hxx:189
+include/editeng/outliner.hxx:192
     enum OutlinerView::MouseTarget Outside
-include/editeng/svxrtf.hxx:210
+include/editeng/svxrtf.hxx:146
     enum SvxRTFParser::RTF_CharTypeDef NOTDEF_CHARTYPE
 include/filter/msfilter/msdffimp.hxx:375
     enum DffSeekToContentMode SEEK_FROM_CURRENT
@@ -1520,8 +1788,6 @@ include/filter/msfilter/ww8fields.hxx:32
     enum ww::eField eSET
 include/filter/msfilter/ww8fields.hxx:35
     enum ww::eField eTC
-include/filter/msfilter/ww8fields.hxx:36
-    enum ww::eField eSTYLEREF
 include/filter/msfilter/ww8fields.hxx:37
     enum ww::eField eRD
 include/filter/msfilter/ww8fields.hxx:38
@@ -1558,8 +1824,6 @@ include/filter/msfilter/ww8fields.hxx:61
     enum ww::eField eQUOTE
 include/filter/msfilter/ww8fields.hxx:64
     enum ww::eField eASK
-include/filter/msfilter/ww8fields.hxx:65
-    enum ww::eField eFILLIN
 include/filter/msfilter/ww8fields.hxx:66
     enum ww::eField eMERGEDATA
 include/filter/msfilter/ww8fields.hxx:67
@@ -1648,7 +1912,7 @@ include/filter/msfilter/ww8fields.hxx:119
     enum ww::eField eADDRESSBLOCK
 include/filter/msfilter/ww8fields.hxx:120
     enum ww::eField eGREETINGLINE
-include/formula/formula.hxx:45
+include/formula/formula.hxx:46
     enum formula::FormulaDlgMode Edit
 include/formula/tokenarray.hxx:62
     enum ScRecalcMode ONLOAD_MUST
@@ -1656,38 +1920,20 @@ include/formula/tokenarray.hxx:64
     enum ScRecalcMode ONLOAD_LENIENT
 include/formula/tokenarray.hxx:166
     enum formula::FormulaTokenArrayReferencesIterator::Dummy Flag
-include/formula/tokenarray.hxx:258
+include/formula/tokenarray.hxx:259
     enum formula::FormulaTokenArray::ReplaceMode CODE_ONLY
 include/formula/vectortoken.hxx:42
     enum formula::VectorRefArray::InitInvalid Invalid
-include/framework/desktop.hxx:59
-    enum framework::ELoadState E_NOTSET
 include/framework/desktop.hxx:60
-    enum framework::ELoadState E_SUCCESSFUL
+    enum framework::ELoadState E_NOTSET
 include/framework/desktop.hxx:61
+    enum framework::ELoadState E_SUCCESSFUL
+include/framework/desktop.hxx:62
     enum framework::ELoadState E_FAILED
 include/framework/framelistanalyzer.hxx:44
     enum FrameAnalyzerFlags All
-include/framework/transactionmanager.hxx:81
+include/framework/transactionmanager.hxx:79
     enum framework::EExceptionMode E_SOFTEXCEPTIONS
-include/i18nutil/casefolding.hxx:35
-    enum MappingType ToUpper
-include/i18nutil/casefolding.hxx:36
-    enum MappingType ToLower
-include/i18nutil/casefolding.hxx:37
-    enum MappingType ToTitle
-include/i18nutil/casefolding.hxx:38
-    enum MappingType SimpleFolding
-include/i18nutil/casefolding.hxx:39
-    enum MappingType FullFolding
-include/i18nutil/transliteration.hxx:37
-    enum TransliterationFlags HALFWIDTH_FULLWIDTH
-include/i18nutil/transliteration.hxx:39
-    enum TransliterationFlags FULLWIDTH_HALFWIDTH
-include/i18nutil/transliteration.hxx:41
-    enum TransliterationFlags KATAKANA_HIRAGANA
-include/i18nutil/transliteration.hxx:43
-    enum TransliterationFlags HIRAGANA_KATAKANA
 include/i18nutil/transliteration.hxx:75
     enum TransliterationFlags NON_IGNORE_MASK
 include/i18nutil/transliteration.hxx:76
@@ -1696,25 +1942,63 @@ include/i18nutil/transliteration.hxx:122
     enum TransliterationFlags IGNORE_DIACRITICS_CTL
 include/i18nutil/transliteration.hxx:124
     enum TransliterationFlags IGNORE_KASHIDA_CTL
-include/jvmfwk/framework.hxx:174
+include/jvmfwk/framework.hxx:181
     enum javaFrameworkError JFW_E_ERROR
-include/jvmfwk/framework.hxx:184
+include/jvmfwk/framework.hxx:191
     enum javaFrameworkError JFW_E_CONFIGURATION
-include/LibreOfficeKit/LibreOfficeKitEnums.h:55
-    LibreOfficeKitSelectionType LOK_SELTYPE_TEXT
 include/LibreOfficeKit/LibreOfficeKitEnums.h:57
     LibreOfficeKitSelectionType LOK_SELTYPE_COMPLEX
 include/linguistic/misc.hxx:62
     enum linguistic::DictionaryError NOT_EXISTS
 include/linguistic/misc.hxx:69
     enum linguistic::CapType NOCAP
-include/oox/crypto/AgileEngine.hxx:73
+include/o3tl/unit_conversion.hxx:26
+    enum o3tl::Length mm100
+include/o3tl/unit_conversion.hxx:27
+    enum o3tl::Length mm10
+include/o3tl/unit_conversion.hxx:29
+    enum o3tl::Length cm
+include/o3tl/unit_conversion.hxx:30
+    enum o3tl::Length m
+include/o3tl/unit_conversion.hxx:31
+    enum o3tl::Length km
+include/o3tl/unit_conversion.hxx:32
+    enum o3tl::Length emu
+include/o3tl/unit_conversion.hxx:34
+    enum o3tl::Length pt
+include/o3tl/unit_conversion.hxx:35
+    enum o3tl::Length pc
+include/o3tl/unit_conversion.hxx:36
+    enum o3tl::Length in1000
+include/o3tl/unit_conversion.hxx:37
+    enum o3tl::Length in100
+include/o3tl/unit_conversion.hxx:38
+    enum o3tl::Length in10
+include/o3tl/unit_conversion.hxx:39
+    enum o3tl::Length in
+include/o3tl/unit_conversion.hxx:40
+    enum o3tl::Length ft
+include/o3tl/unit_conversion.hxx:41
+    enum o3tl::Length mi
+include/o3tl/unit_conversion.hxx:42
+    enum o3tl::Length master
+include/o3tl/unit_conversion.hxx:43
+    enum o3tl::Length px
+include/o3tl/unit_conversion.hxx:44
+    enum o3tl::Length ch
+include/o3tl/unit_conversion.hxx:45
+    enum o3tl::Length line
+include/oox/crypto/AgileEngine.hxx:74
     enum oox::crypto::AgileEncryptionPreset AES_256_SHA512
-include/oox/drawingml/shape.hxx:254
+include/oox/drawingml/clrscheme.hxx:37
+    enum oox::drawingml::PredefinedClrSchemeId dk1
+include/oox/drawingml/clrscheme.hxx:38
+    enum oox::drawingml::PredefinedClrSchemeId lt1
+include/oox/drawingml/shape.hxx:283
     enum oox::drawingml::Shape::FrameType FRAMETYPE_TABLE
-include/oox/ole/axcontrol.hxx:164
-    enum oox::ole::ApiControlType API_CONTROL_TABSTRIP
-include/oox/ole/axcontrol.hxx:185
+include/oox/export/drawingml.hxx:267
+    enum oox::drawingml::GraphicExport::TypeHint Detect
+include/oox/ole/axcontrol.hxx:186
     enum oox::ole::ApiDefaultStateMode API_DEFAULTSTATE_SHORT
 include/oox/ppt/pptfilterhelpers.hxx:40
     enum oox::ppt::AnimationAttributeEnum STYLEFONTFAMILY
@@ -1723,198 +2007,184 @@ include/oox/token/relationship.hxx:21
 include/oox/token/relationship.hxx:22
     enum oox::Relationship CHART
 include/oox/token/relationship.hxx:23
-    enum oox::Relationship COMMENTS
+    enum oox::Relationship CHARTUSERSHAPES
 include/oox/token/relationship.hxx:24
-    enum oox::Relationship COMMENTAUTHORS
+    enum oox::Relationship COMMENTS
 include/oox/token/relationship.hxx:25
-    enum oox::Relationship CONTROL
+    enum oox::Relationship COMMENTAUTHORS
 include/oox/token/relationship.hxx:26
-    enum oox::Relationship CTRLPROP
+    enum oox::Relationship COMMENTSEXTENDED
 include/oox/token/relationship.hxx:27
-    enum oox::Relationship CUSTOMXML
+    enum oox::Relationship CONTROL
 include/oox/token/relationship.hxx:28
-    enum oox::Relationship CUSTOMXMLPROPS
+    enum oox::Relationship CTRLPROP
 include/oox/token/relationship.hxx:29
-    enum oox::Relationship DIAGRAMCOLORS
+    enum oox::Relationship CUSTOMXML
 include/oox/token/relationship.hxx:30
-    enum oox::Relationship DIAGRAMDATA
+    enum oox::Relationship CUSTOMXMLPROPS
 include/oox/token/relationship.hxx:31
-    enum oox::Relationship DIAGRAMDRAWING
+    enum oox::Relationship DIAGRAMCOLORS
 include/oox/token/relationship.hxx:32
-    enum oox::Relationship DIAGRAMLAYOUT
+    enum oox::Relationship DIAGRAMDATA
 include/oox/token/relationship.hxx:33
-    enum oox::Relationship DIAGRAMQUICKSTYLE
+    enum oox::Relationship DIAGRAMDRAWING
 include/oox/token/relationship.hxx:34
-    enum oox::Relationship DRAWING
+    enum oox::Relationship DIAGRAMLAYOUT
 include/oox/token/relationship.hxx:35
-    enum oox::Relationship ENDNOTES
+    enum oox::Relationship DIAGRAMQUICKSTYLE
 include/oox/token/relationship.hxx:36
-    enum oox::Relationship EXTERNALLINKPATH
+    enum oox::Relationship DRAWING
 include/oox/token/relationship.hxx:37
-    enum oox::Relationship FONT
+    enum oox::Relationship ENDNOTES
 include/oox/token/relationship.hxx:38
-    enum oox::Relationship FONTTABLE
+    enum oox::Relationship EXTERNALLINKPATH
 include/oox/token/relationship.hxx:39
-    enum oox::Relationship FOOTER
+    enum oox::Relationship FONT
 include/oox/token/relationship.hxx:40
-    enum oox::Relationship FOOTNOTES
+    enum oox::Relationship FONTTABLE
 include/oox/token/relationship.hxx:41
-    enum oox::Relationship GLOSSARYDOCUMENT
+    enum oox::Relationship FOOTER
 include/oox/token/relationship.hxx:42
-    enum oox::Relationship HDPHOTO
+    enum oox::Relationship FOOTNOTES
 include/oox/token/relationship.hxx:43
-    enum oox::Relationship HEADER
+    enum oox::Relationship GLOSSARYDOCUMENT
 include/oox/token/relationship.hxx:44
-    enum oox::Relationship HYPERLINK
+    enum oox::Relationship HDPHOTO
 include/oox/token/relationship.hxx:45
-    enum oox::Relationship IMAGE
+    enum oox::Relationship HEADER
 include/oox/token/relationship.hxx:46
-    enum oox::Relationship MEDIA
+    enum oox::Relationship HYPERLINK
 include/oox/token/relationship.hxx:47
-    enum oox::Relationship NOTESMASTER
+    enum oox::Relationship IMAGE
 include/oox/token/relationship.hxx:48
-    enum oox::Relationship NOTESSLIDE
+    enum oox::Relationship MEDIA
 include/oox/token/relationship.hxx:49
-    enum oox::Relationship NUMBERING
+    enum oox::Relationship NOTESMASTER
 include/oox/token/relationship.hxx:50
-    enum oox::Relationship OFFICEDOCUMENT
+    enum oox::Relationship NOTESSLIDE
 include/oox/token/relationship.hxx:51
-    enum oox::Relationship OLEOBJECT
+    enum oox::Relationship NUMBERING
 include/oox/token/relationship.hxx:52
-    enum oox::Relationship PACKAGE
+    enum oox::Relationship OFFICEDOCUMENT
 include/oox/token/relationship.hxx:53
-    enum oox::Relationship SETTINGS
+    enum oox::Relationship OLEOBJECT
 include/oox/token/relationship.hxx:54
-    enum oox::Relationship SHAREDSTRINGS
+    enum oox::Relationship PACKAGE
 include/oox/token/relationship.hxx:55
-    enum oox::Relationship SLIDE
+    enum oox::Relationship PRESPROPS
 include/oox/token/relationship.hxx:56
-    enum oox::Relationship SLIDELAYOUT
+    enum oox::Relationship SETTINGS
 include/oox/token/relationship.hxx:57
-    enum oox::Relationship SLIDEMASTER
+    enum oox::Relationship SHAREDSTRINGS
 include/oox/token/relationship.hxx:58
-    enum oox::Relationship STYLES
+    enum oox::Relationship SLIDE
 include/oox/token/relationship.hxx:59
-    enum oox::Relationship THEME
+    enum oox::Relationship SLIDELAYOUT
 include/oox/token/relationship.hxx:60
-    enum oox::Relationship VBAPROJECT
+    enum oox::Relationship SLIDEMASTER
+include/oox/token/relationship.hxx:61
+    enum oox::Relationship STYLES
 include/oox/token/relationship.hxx:62
-    enum oox::Relationship AUDIO
+    enum oox::Relationship THEME
 include/oox/token/relationship.hxx:63
+    enum oox::Relationship VBAPROJECT
+include/oox/token/relationship.hxx:65
+    enum oox::Relationship AUDIO
+include/oox/token/relationship.hxx:66
     enum oox::Relationship VMLDRAWING
-include/oox/token/relationship.hxx:64
+include/oox/token/relationship.hxx:67
     enum oox::Relationship WORDVBADATA
-include/oox/token/relationship.hxx:65
+include/oox/token/relationship.hxx:68
     enum oox::Relationship WORKSHEET
-include/registry/regtype.h:44
+include/registry/regtype.h:43
     enum RegAccessMode READWRITE
-include/registry/regtype.h:88
+include/registry/regtype.h:87
     enum RegError REGISTRY_NOT_OPEN
-include/registry/regtype.h:92
+include/registry/regtype.h:91
     enum RegError REGISTRY_READONLY
-include/registry/regtype.h:94
+include/registry/regtype.h:93
     enum RegError DESTROY_REGISTRY_FAILED
-include/registry/regtype.h:98
+include/registry/regtype.h:97
     enum RegError CANNOT_OPEN_FOR_READWRITE
-include/registry/regtype.h:105
+include/registry/regtype.h:104
     enum RegError KEY_NOT_OPEN
-include/registry/regtype.h:109
+include/registry/regtype.h:108
     enum RegError CREATE_KEY_FAILED
-include/registry/regtype.h:111
+include/registry/regtype.h:110
     enum RegError DELETE_KEY_FAILED
-include/registry/regtype.h:117
+include/registry/regtype.h:116
     enum RegError INVALID_KEY
-include/registry/regtype.h:122
+include/registry/regtype.h:121
     enum RegError SET_VALUE_FAILED
-include/registry/regtype.h:124
+include/registry/regtype.h:123
     enum RegError DELETE_VALUE_FAILED
-include/sfx2/AccessibilityIssue.hxx:23
-    enum sfx::AccessibilityIssueID UNSPECIFIED
-include/sfx2/AccessibilityIssue.hxx:24
-    enum sfx::AccessibilityIssueID DOCUMENT_TITLE
-include/sfx2/AccessibilityIssue.hxx:25
-    enum sfx::AccessibilityIssueID DOCUMENT_LANGUAGE
-include/sfx2/AccessibilityIssue.hxx:26
-    enum sfx::AccessibilityIssueID STYLE_LANGUAGE
-include/sfx2/AccessibilityIssue.hxx:27
-    enum sfx::AccessibilityIssueID NO_ALT_OLE
-include/sfx2/AccessibilityIssue.hxx:28
-    enum sfx::AccessibilityIssueID NO_ALT_GRAPHIC
-include/sfx2/AccessibilityIssue.hxx:29
-    enum sfx::AccessibilityIssueID NO_ALT_SHAPE
-include/sfx2/AccessibilityIssue.hxx:30
-    enum sfx::AccessibilityIssueID TABLE_MERGE_SPLIT
-include/sfx2/AccessibilityIssue.hxx:31
-    enum sfx::AccessibilityIssueID TEXT_FORMATTING
-include/sfx2/app.hxx:75
+include/sfx2/app.hxx:70
     enum SfxToolsModule Math
-include/sfx2/app.hxx:76
+include/sfx2/app.hxx:71
     enum SfxToolsModule Calc
-include/sfx2/app.hxx:77
+include/sfx2/app.hxx:72
     enum SfxToolsModule Draw
-include/sfx2/app.hxx:78
+include/sfx2/app.hxx:73
     enum SfxToolsModule Writer
-include/sfx2/app.hxx:79
+include/sfx2/app.hxx:74
     enum SfxToolsModule Basic
-include/sfx2/docfile.hxx:158
+include/sfx2/docfile.hxx:171
     enum SfxMedium::LockFileResult Failed
-include/sfx2/docfile.hxx:160
+include/sfx2/docfile.hxx:173
     enum SfxMedium::LockFileResult Succeeded
-include/sfx2/docfile.hxx:289
+include/sfx2/docfile.hxx:308
     enum SfxMedium::ShowLockResult NoLock
-include/sfx2/filedlghelper.hxx:78
-    enum sfx2::FileDialogHelper::Context SW_INSERT_GRAPHIC
 include/sfx2/frmdescr.hxx:42
     enum ScrollingMode No
-include/sfx2/lnkbase.hxx:136
+include/sfx2/lnkbase.hxx:137
     enum sfx2::SvBaseLink::UpdateResult ERROR_GENERAL
-include/sfx2/mailmodelapi.hxx:47
+include/sfx2/mailmodelapi.hxx:48
     enum SfxMailModel::SaveResult SAVE_ERROR
-include/sfx2/mailmodelapi.hxx:71
+include/sfx2/mailmodelapi.hxx:72
     enum SfxMailModel::SendMailResult SEND_MAIL_CANCELLED
-include/sfx2/msg.hxx:38
+include/sfx2/msg.hxx:36
     enum SfxSlotMode TOGGLE
-include/sfx2/msg.hxx:39
+include/sfx2/msg.hxx:37
     enum SfxSlotMode AUTOUPDATE
-include/sfx2/msg.hxx:40
+include/sfx2/msg.hxx:38
     enum SfxSlotMode ASYNCHRON
-include/sfx2/msg.hxx:42
+include/sfx2/msg.hxx:40
     enum SfxSlotMode NORECORD
-include/sfx2/msg.hxx:43
+include/sfx2/msg.hxx:41
     enum SfxSlotMode RECORDPERITEM
-include/sfx2/msg.hxx:44
+include/sfx2/msg.hxx:42
     enum SfxSlotMode RECORDPERSET
-include/sfx2/msg.hxx:45
+include/sfx2/msg.hxx:43
     enum SfxSlotMode RECORDABSOLUTE
-include/sfx2/msg.hxx:47
+include/sfx2/msg.hxx:45
     enum SfxSlotMode METHOD
-include/sfx2/msg.hxx:49
+include/sfx2/msg.hxx:47
     enum SfxSlotMode FASTCALL
-include/sfx2/msg.hxx:51
+include/sfx2/msg.hxx:49
     enum SfxSlotMode MENUCONFIG
-include/sfx2/msg.hxx:52
+include/sfx2/msg.hxx:50
     enum SfxSlotMode TOOLBOXCONFIG
-include/sfx2/msg.hxx:53
+include/sfx2/msg.hxx:51
     enum SfxSlotMode ACCELCONFIG
-include/sfx2/msg.hxx:55
+include/sfx2/msg.hxx:53
     enum SfxSlotMode CONTAINER
-include/sfx2/msg.hxx:88
+include/sfx2/msg.hxx:86
     enum SfxSlotKind Standard
-include/sfx2/objface.hxx:47
+include/sfx2/objface.hxx:46
     enum StatusBarId GenericStatusBar
-include/sfx2/objface.hxx:48
+include/sfx2/objface.hxx:47
     enum StatusBarId WriterStatusBar
-include/sfx2/objface.hxx:49
+include/sfx2/objface.hxx:48
     enum StatusBarId MathStatusBar
-include/sfx2/objface.hxx:50
+include/sfx2/objface.hxx:49
     enum StatusBarId DrawStatusBar
-include/sfx2/objface.hxx:51
+include/sfx2/objface.hxx:50
     enum StatusBarId CalcStatusBar
-include/sfx2/objface.hxx:52
+include/sfx2/objface.hxx:51
     enum StatusBarId BasicIdeStatusBar
-include/sfx2/objsh.hxx:199
+include/sfx2/objsh.hxx:197
     enum SfxObjectShell::TriState no
-include/sfx2/passwd.hxx:36
+include/sfx2/passwd.hxx:35
     enum SfxShowExtras ALL
 include/sfx2/StylePreviewRenderer.hxx:33
     enum sfx2::StylePreviewRenderer::RenderAlign TOP
@@ -2022,204 +2292,206 @@ include/sot/exchange.hxx:103
     enum SotExchangeDest SCDOC_FREE_AREA
 include/sot/exchange.hxx:104
     enum SotExchangeDest SDDOC_FREE_AREA
-include/store/types.h:76
+include/store/types.h:75
     storeError store_E_AccessViolation
-include/store/types.h:78
+include/store/types.h:77
     storeError store_E_CantSeek
-include/store/types.h:79
+include/store/types.h:78
     storeError store_E_CantRead
-include/store/types.h:80
+include/store/types.h:79
     storeError store_E_CantWrite
-include/store/types.h:81
+include/store/types.h:80
     storeError store_E_InvalidAccess
-include/store/types.h:82
+include/store/types.h:81
     storeError store_E_InvalidHandle
-include/store/types.h:83
+include/store/types.h:82
     storeError store_E_InvalidParameter
-include/store/types.h:87
+include/store/types.h:86
     storeError store_E_NotDirectory
-include/store/types.h:88
+include/store/types.h:87
     storeError store_E_NotFile
-include/store/types.h:89
+include/store/types.h:88
     storeError store_E_NoMoreFiles
-include/store/types.h:90
+include/store/types.h:89
     storeError store_E_NameTooLong
-include/store/types.h:91
+include/store/types.h:90
     storeError store_E_OutOfMemory
-include/store/types.h:92
+include/store/types.h:91
     storeError store_E_OutOfSpace
-include/store/types.h:95
+include/store/types.h:94
     storeError store_E_WrongVersion
-include/store/types.h:96
+include/store/types.h:95
     storeError store_E_Unknown
-include/svl/IndexedStyleSheets.hxx:120
+include/svl/IndexedStyleSheets.hxx:121
     enum svl::IndexedStyleSheets::SearchBehavior ReturnAll
-include/svl/inettype.hxx:126
+include/svl/inettype.hxx:147
     enum INetContentType CONTENT_TYPE_APP_OCTSTREAM
-include/svl/inettype.hxx:127
+include/svl/inettype.hxx:148
     enum INetContentType CONTENT_TYPE_APP_PDF
-include/svl/inettype.hxx:128
+include/svl/inettype.hxx:149
     enum INetContentType CONTENT_TYPE_APP_RTF
-include/svl/inettype.hxx:129
+include/svl/inettype.hxx:150
     enum INetContentType CONTENT_TYPE_APP_MSWORD
-include/svl/inettype.hxx:130
+include/svl/inettype.hxx:151
     enum INetContentType CONTENT_TYPE_APP_MSWORD_TEMPL
-include/svl/inettype.hxx:131
+include/svl/inettype.hxx:152
     enum INetContentType CONTENT_TYPE_APP_STARCALC
-include/svl/inettype.hxx:132
+include/svl/inettype.hxx:153
     enum INetContentType CONTENT_TYPE_APP_STARCHART
-include/svl/inettype.hxx:133
+include/svl/inettype.hxx:154
     enum INetContentType CONTENT_TYPE_APP_STARDRAW
-include/svl/inettype.hxx:134
+include/svl/inettype.hxx:155
     enum INetContentType CONTENT_TYPE_APP_STARHELP
-include/svl/inettype.hxx:135
+include/svl/inettype.hxx:156
     enum INetContentType CONTENT_TYPE_APP_STARIMAGE
-include/svl/inettype.hxx:136
+include/svl/inettype.hxx:157
     enum INetContentType CONTENT_TYPE_APP_STARIMPRESS
-include/svl/inettype.hxx:137
+include/svl/inettype.hxx:158
     enum INetContentType CONTENT_TYPE_APP_STARMATH
-include/svl/inettype.hxx:138
+include/svl/inettype.hxx:159
     enum INetContentType CONTENT_TYPE_APP_STARWRITER
-include/svl/inettype.hxx:139
+include/svl/inettype.hxx:160
     enum INetContentType CONTENT_TYPE_APP_ZIP
-include/svl/inettype.hxx:140
+include/svl/inettype.hxx:161
     enum INetContentType CONTENT_TYPE_AUDIO_AIFF
-include/svl/inettype.hxx:141
+include/svl/inettype.hxx:162
     enum INetContentType CONTENT_TYPE_AUDIO_BASIC
-include/svl/inettype.hxx:142
+include/svl/inettype.hxx:163
     enum INetContentType CONTENT_TYPE_AUDIO_MIDI
-include/svl/inettype.hxx:143
+include/svl/inettype.hxx:164
     enum INetContentType CONTENT_TYPE_AUDIO_VORBIS
-include/svl/inettype.hxx:144
+include/svl/inettype.hxx:165
     enum INetContentType CONTENT_TYPE_AUDIO_WAV
-include/svl/inettype.hxx:145
+include/svl/inettype.hxx:166
     enum INetContentType CONTENT_TYPE_AUDIO_WEBM
-include/svl/inettype.hxx:146
+include/svl/inettype.hxx:167
     enum INetContentType CONTENT_TYPE_IMAGE_GIF
-include/svl/inettype.hxx:147
+include/svl/inettype.hxx:168
     enum INetContentType CONTENT_TYPE_IMAGE_JPEG
-include/svl/inettype.hxx:148
+include/svl/inettype.hxx:169
     enum INetContentType CONTENT_TYPE_IMAGE_PCX
-include/svl/inettype.hxx:149
+include/svl/inettype.hxx:170
     enum INetContentType CONTENT_TYPE_IMAGE_PNG
-include/svl/inettype.hxx:150
+include/svl/inettype.hxx:171
     enum INetContentType CONTENT_TYPE_IMAGE_TIFF
-include/svl/inettype.hxx:151
+include/svl/inettype.hxx:172
     enum INetContentType CONTENT_TYPE_IMAGE_BMP
-include/svl/inettype.hxx:152
+include/svl/inettype.hxx:174
     enum INetContentType CONTENT_TYPE_TEXT_HTML
-include/svl/inettype.hxx:154
+include/svl/inettype.hxx:176
     enum INetContentType CONTENT_TYPE_TEXT_URL
-include/svl/inettype.hxx:155
+include/svl/inettype.hxx:177
     enum INetContentType CONTENT_TYPE_TEXT_VCARD
-include/svl/inettype.hxx:156
+include/svl/inettype.hxx:178
     enum INetContentType CONTENT_TYPE_VIDEO_MSVIDEO
-include/svl/inettype.hxx:157
+include/svl/inettype.hxx:179
     enum INetContentType CONTENT_TYPE_VIDEO_THEORA
-include/svl/inettype.hxx:158
+include/svl/inettype.hxx:180
     enum INetContentType CONTENT_TYPE_VIDEO_VDO
-include/svl/inettype.hxx:159
+include/svl/inettype.hxx:181
     enum INetContentType CONTENT_TYPE_VIDEO_WEBM
-include/svl/inettype.hxx:160
+include/svl/inettype.hxx:182
     enum INetContentType CONTENT_TYPE_X_CNT_FSYSBOX
-include/svl/inettype.hxx:161
+include/svl/inettype.hxx:183
     enum INetContentType CONTENT_TYPE_X_CNT_FSYSFOLDER
-include/svl/inettype.hxx:162
+include/svl/inettype.hxx:184
     enum INetContentType CONTENT_TYPE_X_STARMAIL
-include/svl/inettype.hxx:163
+include/svl/inettype.hxx:185
     enum INetContentType CONTENT_TYPE_X_VRML
-include/svl/inettype.hxx:164
+include/svl/inettype.hxx:186
     enum INetContentType CONTENT_TYPE_APP_GALLERY
-include/svl/inettype.hxx:165
+include/svl/inettype.hxx:187
     enum INetContentType CONTENT_TYPE_APP_GALLERY_THEME
-include/svl/inettype.hxx:166
+include/svl/inettype.hxx:188
     enum INetContentType CONTENT_TYPE_APP_STARWRITER_GLOB
-include/svl/inettype.hxx:167
+include/svl/inettype.hxx:189
     enum INetContentType CONTENT_TYPE_APP_STARMAIL_SDM
-include/svl/inettype.hxx:168
+include/svl/inettype.hxx:190
     enum INetContentType CONTENT_TYPE_APP_STARMAIL_SMD
-include/svl/inettype.hxx:169
+include/svl/inettype.hxx:191
     enum INetContentType CONTENT_TYPE_APP_VND_CALC
-include/svl/inettype.hxx:170
+include/svl/inettype.hxx:192
     enum INetContentType CONTENT_TYPE_APP_VND_CHART
-include/svl/inettype.hxx:171
+include/svl/inettype.hxx:193
     enum INetContentType CONTENT_TYPE_APP_VND_DRAW
-include/svl/inettype.hxx:172
+include/svl/inettype.hxx:194
     enum INetContentType CONTENT_TYPE_APP_VND_IMAGE
-include/svl/inettype.hxx:173
+include/svl/inettype.hxx:195
     enum INetContentType CONTENT_TYPE_APP_VND_IMPRESS
-include/svl/inettype.hxx:174
+include/svl/inettype.hxx:196
     enum INetContentType CONTENT_TYPE_APP_VND_MAIL
-include/svl/inettype.hxx:175
+include/svl/inettype.hxx:197
     enum INetContentType CONTENT_TYPE_APP_VND_MATH
-include/svl/inettype.hxx:176
+include/svl/inettype.hxx:198
     enum INetContentType CONTENT_TYPE_APP_VND_WRITER
-include/svl/inettype.hxx:177
+include/svl/inettype.hxx:199
     enum INetContentType CONTENT_TYPE_APP_VND_WRITER_GLOBAL
-include/svl/inettype.hxx:178
+include/svl/inettype.hxx:200
     enum INetContentType CONTENT_TYPE_APP_VND_WRITER_WEB
-include/svl/inettype.hxx:179
+include/svl/inettype.hxx:201
     enum INetContentType CONTENT_TYPE_APP_FRAMESET
-include/svl/inettype.hxx:180
+include/svl/inettype.hxx:202
     enum INetContentType CONTENT_TYPE_APP_MACRO
-include/svl/inettype.hxx:181
+include/svl/inettype.hxx:203
     enum INetContentType CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER
-include/svl/inettype.hxx:182
+include/svl/inettype.hxx:204
     enum INetContentType CONTENT_TYPE_APP_VND_TEMPLATE
-include/svl/inettype.hxx:183
+include/svl/inettype.hxx:205
     enum INetContentType CONTENT_TYPE_IMAGE_GENERIC
-include/svl/inettype.hxx:184
+include/svl/inettype.hxx:206
     enum INetContentType CONTENT_TYPE_APP_VND_NEWS
-include/svl/inettype.hxx:185
+include/svl/inettype.hxx:207
     enum INetContentType CONTENT_TYPE_APP_VND_OUTTRAY
-include/svl/inettype.hxx:186
+include/svl/inettype.hxx:208
     enum INetContentType CONTENT_TYPE_APP_MSEXCEL
-include/svl/inettype.hxx:187
+include/svl/inettype.hxx:209
     enum INetContentType CONTENT_TYPE_APP_MSEXCEL_TEMPL
-include/svl/inettype.hxx:188
+include/svl/inettype.hxx:210
     enum INetContentType CONTENT_TYPE_APP_MSPPOINT
-include/svl/inettype.hxx:189
+include/svl/inettype.hxx:211
     enum INetContentType CONTENT_TYPE_APP_MSPPOINT_TEMPL
-include/svl/inettype.hxx:190
+include/svl/inettype.hxx:212
     enum INetContentType CONTENT_TYPE_TEXT_VCALENDAR
-include/svl/inettype.hxx:191
+include/svl/inettype.hxx:213
     enum INetContentType CONTENT_TYPE_TEXT_ICALENDAR
-include/svl/inettype.hxx:192
+include/svl/inettype.hxx:214
     enum INetContentType CONTENT_TYPE_TEXT_XMLICALENDAR
-include/svl/inettype.hxx:193
+include/svl/inettype.hxx:215
     enum INetContentType CONTENT_TYPE_APP_CDE_CALENDAR_APP
-include/svl/inettype.hxx:194
+include/svl/inettype.hxx:216
     enum INetContentType CONTENT_TYPE_INET_MESSAGE_RFC822
-include/svl/inettype.hxx:195
+include/svl/inettype.hxx:217
     enum INetContentType CONTENT_TYPE_INET_MULTIPART_ALTERNATIVE
-include/svl/inettype.hxx:196
+include/svl/inettype.hxx:218
     enum INetContentType CONTENT_TYPE_INET_MULTIPART_DIGEST
-include/svl/inettype.hxx:197
+include/svl/inettype.hxx:219
     enum INetContentType CONTENT_TYPE_INET_MULTIPART_PARALLEL
-include/svl/inettype.hxx:198
+include/svl/inettype.hxx:220
     enum INetContentType CONTENT_TYPE_INET_MULTIPART_RELATED
-include/svl/inettype.hxx:199
+include/svl/inettype.hxx:221
     enum INetContentType CONTENT_TYPE_INET_MULTIPART_MIXED
-include/svl/inettype.hxx:200
+include/svl/inettype.hxx:222
     enum INetContentType CONTENT_TYPE_APP_VND_IMPRESSPACKED
-include/svl/inettype.hxx:201
+include/svl/inettype.hxx:223
     enum INetContentType CONTENT_TYPE_APP_JAR
-include/svl/inettype.hxx:202
+include/svl/inettype.hxx:224
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_WRITER
-include/svl/inettype.hxx:203
+include/svl/inettype.hxx:225
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_CALC
-include/svl/inettype.hxx:204
+include/svl/inettype.hxx:226
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS
-include/svl/inettype.hxx:205
+include/svl/inettype.hxx:227
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_DRAW
-include/svl/inettype.hxx:206
+include/svl/inettype.hxx:228
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_CHART
-include/svl/inettype.hxx:207
+include/svl/inettype.hxx:229
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_MATH
-include/svl/inettype.hxx:208
+include/svl/inettype.hxx:230
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL
-include/svl/inettype.hxx:209
+include/svl/inettype.hxx:231
     enum INetContentType CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED
+include/svl/itemset.hxx:140
+    enum SfxItemSet::SfxAllItemSetFlag Flag
 include/svl/lstner.hxx:41
     enum DuplicateHandling Allow
 include/svl/nfsymbol.hxx:48
@@ -2228,7 +2500,7 @@ include/svl/sigstruct.hxx:79
     enum svl::crypto::SignatureMethodAlgorithm RSA
 include/svl/srchdefs.hxx:41
     enum SearchOptionFlags ALL
-include/svl/style.hxx:57
+include/svl/style.hxx:56
     enum SfxStyleSearchBits ScStandard
 include/svtools/borderline.hxx:45
     enum BorderWidthImplFlags FIXED
@@ -2241,96 +2513,104 @@ include/svtools/colorcfg.hxx:36
 include/svtools/colorcfg.hxx:40
     enum svtools::ColorConfigEntry SPELL
 include/svtools/colorcfg.hxx:41
-    enum svtools::ColorConfigEntry SMARTTAGS
+    enum svtools::ColorConfigEntry GRAMMAR
 include/svtools/colorcfg.hxx:42
-    enum svtools::ColorConfigEntry SHADOWCOLOR
+    enum svtools::ColorConfigEntry SMARTTAGS
 include/svtools/colorcfg.hxx:43
-    enum svtools::ColorConfigEntry WRITERTEXTGRID
+    enum svtools::ColorConfigEntry SHADOWCOLOR
 include/svtools/colorcfg.hxx:44
-    enum svtools::ColorConfigEntry WRITERFIELDSHADINGS
+    enum svtools::ColorConfigEntry WRITERTEXTGRID
 include/svtools/colorcfg.hxx:45
-    enum svtools::ColorConfigEntry WRITERIDXSHADINGS
+    enum svtools::ColorConfigEntry WRITERFIELDSHADINGS
 include/svtools/colorcfg.hxx:46
-    enum svtools::ColorConfigEntry WRITERDIRECTCURSOR
-include/svtools/colorcfg.hxx:47
-    enum svtools::ColorConfigEntry WRITERSCRIPTINDICATOR
+    enum svtools::ColorConfigEntry WRITERIDXSHADINGS
 include/svtools/colorcfg.hxx:48
-    enum svtools::ColorConfigEntry WRITERSECTIONBOUNDARIES
+    enum svtools::ColorConfigEntry WRITERSCRIPTINDICATOR
 include/svtools/colorcfg.hxx:49
-    enum svtools::ColorConfigEntry WRITERHEADERFOOTERMARK
+    enum svtools::ColorConfigEntry WRITERSECTIONBOUNDARIES
 include/svtools/colorcfg.hxx:50
+    enum svtools::ColorConfigEntry WRITERHEADERFOOTERMARK
+include/svtools/colorcfg.hxx:51
     enum svtools::ColorConfigEntry WRITERPAGEBREAKS
-include/svtools/colorcfg.hxx:55
-    enum svtools::ColorConfigEntry CALCGRID
 include/svtools/colorcfg.hxx:56
+    enum svtools::ColorConfigEntry CALCGRID
+include/svtools/colorcfg.hxx:58
     enum svtools::ColorConfigEntry CALCPAGEBREAK
-include/svtools/colorcfg.hxx:57
+include/svtools/colorcfg.hxx:59
     enum svtools::ColorConfigEntry CALCPAGEBREAKMANUAL
-include/svtools/colorcfg.hxx:58
+include/svtools/colorcfg.hxx:60
     enum svtools::ColorConfigEntry CALCPAGEBREAKAUTOMATIC
-include/svtools/colorcfg.hxx:59
+include/svtools/colorcfg.hxx:61
+    enum svtools::ColorConfigEntry CALCHIDDENROWCOL
+include/svtools/colorcfg.hxx:62
+    enum svtools::ColorConfigEntry CALCTEXTOVERFLOW
+include/svtools/colorcfg.hxx:63
+    enum svtools::ColorConfigEntry CALCCOMMENTS
+include/svtools/colorcfg.hxx:64
     enum svtools::ColorConfigEntry CALCDETECTIVE
-include/svtools/colorcfg.hxx:60
+include/svtools/colorcfg.hxx:65
     enum svtools::ColorConfigEntry CALCDETECTIVEERROR
-include/svtools/colorcfg.hxx:61
+include/svtools/colorcfg.hxx:66
     enum svtools::ColorConfigEntry CALCREFERENCE
-include/svtools/colorcfg.hxx:62
+include/svtools/colorcfg.hxx:67
     enum svtools::ColorConfigEntry CALCNOTESBACKGROUND
-include/svtools/colorcfg.hxx:63
+include/svtools/colorcfg.hxx:68
     enum svtools::ColorConfigEntry CALCVALUE
-include/svtools/colorcfg.hxx:64
+include/svtools/colorcfg.hxx:69
     enum svtools::ColorConfigEntry CALCFORMULA
-include/svtools/colorcfg.hxx:65
+include/svtools/colorcfg.hxx:70
     enum svtools::ColorConfigEntry CALCTEXT
-include/svtools/colorcfg.hxx:66
+include/svtools/colorcfg.hxx:71
     enum svtools::ColorConfigEntry CALCPROTECTEDBACKGROUND
-include/svtools/colorcfg.hxx:67
+include/svtools/colorcfg.hxx:72
     enum svtools::ColorConfigEntry DRAWGRID
-include/svtools/colorcfg.hxx:68
+include/svtools/colorcfg.hxx:73
+    enum svtools::ColorConfigEntry BASICEDITOR
+include/svtools/colorcfg.hxx:74
     enum svtools::ColorConfigEntry BASICIDENTIFIER
-include/svtools/colorcfg.hxx:69
+include/svtools/colorcfg.hxx:75
     enum svtools::ColorConfigEntry BASICCOMMENT
-include/svtools/colorcfg.hxx:70
+include/svtools/colorcfg.hxx:76
     enum svtools::ColorConfigEntry BASICNUMBER
-include/svtools/colorcfg.hxx:71
+include/svtools/colorcfg.hxx:77
     enum svtools::ColorConfigEntry BASICSTRING
-include/svtools/colorcfg.hxx:72
+include/svtools/colorcfg.hxx:78
     enum svtools::ColorConfigEntry BASICOPERATOR
-include/svtools/colorcfg.hxx:73
+include/svtools/colorcfg.hxx:79
     enum svtools::ColorConfigEntry BASICKEYWORD
-include/svtools/colorcfg.hxx:74
+include/svtools/colorcfg.hxx:80
     enum svtools::ColorConfigEntry BASICERROR
-include/svtools/colorcfg.hxx:75
+include/svtools/colorcfg.hxx:81
     enum svtools::ColorConfigEntry SQLIDENTIFIER
-include/svtools/colorcfg.hxx:76
+include/svtools/colorcfg.hxx:82
     enum svtools::ColorConfigEntry SQLNUMBER
-include/svtools/colorcfg.hxx:77
+include/svtools/colorcfg.hxx:83
     enum svtools::ColorConfigEntry SQLSTRING
-include/svtools/colorcfg.hxx:78
+include/svtools/colorcfg.hxx:84
     enum svtools::ColorConfigEntry SQLOPERATOR
-include/svtools/colorcfg.hxx:79
+include/svtools/colorcfg.hxx:85
     enum svtools::ColorConfigEntry SQLKEYWORD
-include/svtools/colorcfg.hxx:80
+include/svtools/colorcfg.hxx:86
     enum svtools::ColorConfigEntry SQLPARAMETER
-include/svtools/colorcfg.hxx:81
+include/svtools/colorcfg.hxx:87
     enum svtools::ColorConfigEntry SQLCOMMENT
-include/svtools/colrdlg.hxx:31
+include/svtools/colrdlg.hxx:35
     enum svtools::ColorPickerMode Modify
-include/svtools/colrdlg.hxx:31
+include/svtools/colrdlg.hxx:35
     enum svtools::ColorPickerMode Select
-include/svtools/editbrowsebox.hxx:790
+include/svtools/editbrowsebox.hxx:897
     enum svt::EditBrowseBox::BrowseInfo COLCHANGE
 include/svtools/imagemgr.hxx:29
     enum SvImageId START
-include/svtools/parhtml.hxx:47
+include/svtools/parhtml.hxx:48
     enum HTMLTableFrame Void
-include/svtools/parhtml.hxx:57
-    enum HTMLInputType Range
 include/svtools/parhtml.hxx:58
+    enum HTMLInputType Range
+include/svtools/parhtml.hxx:59
     enum HTMLInputType Scribble
-include/svtools/parhtml.hxx:70
-    enum HTMLScriptLanguage JavaScript
 include/svtools/parhtml.hxx:71
+    enum HTMLScriptLanguage JavaScript
+include/svtools/parhtml.hxx:72
     enum HTMLScriptLanguage Unknown
 include/svtools/ruler.hxx:471
     enum RulerExtra DontKnow
@@ -2340,17 +2620,31 @@ include/svtools/tabbar.hxx:301
     enum TabBarAllowRenamingReturnCode TABBAR_RENAMING_CANCEL
 include/svx/dataaccessdescriptor.hxx:48
     enum svx::DataAccessDescriptorProperty Filter
-include/svx/def3d.hxx:36
+include/svx/def3d.hxx:32
     enum E3dDragConstraint XYZ
-include/svx/EnhancedCustomShape2d.hxx:53
+include/svx/diagram/datamodel.hxx:40
+    enum svx::diagram::TypeConstant XML_none
+include/svx/diagram/datamodel.hxx:44
+    enum svx::diagram::TypeConstant XML_node
+include/svx/diagram/datamodel.hxx:45
+    enum svx::diagram::TypeConstant XML_norm
+include/svx/diagram/datamodel.hxx:48
+    enum svx::diagram::TypeConstant XML_pres
+include/svx/diagram/datamodel.hxx:50
+    enum svx::diagram::TypeConstant XML_presParOf
+include/svx/diagram/datamodel.hxx:51
+    enum svx::diagram::TypeConstant XML_rel
+include/svx/dlgutil.hxx:42
+    enum ConnectorType Bottom
+include/svx/EnhancedCustomShape2d.hxx:55
     enum HandleFlags MIRRORED_X
-include/svx/EnhancedCustomShape2d.hxx:54
+include/svx/EnhancedCustomShape2d.hxx:56
     enum HandleFlags MIRRORED_Y
-include/svx/flagsdef.hxx:31
+include/svx/flagsdef.hxx:33
     enum SwBorderModes FRAME
-include/svx/flagsdef.hxx:95
+include/svx/flagsdef.hxx:98
     enum SvxModeType SVX_PAGE_MODE_STANDARD
-include/svx/fmsrcimp.hxx:157
+include/svx/fmsrcimp.hxx:159
     enum FmSearchEngine::SearchFor NotNull
 include/svx/frmsel.hxx:36
     enum FrameSelFlags Left
@@ -2372,13 +2666,9 @@ include/svx/frmsel.hxx:53
     enum FrameSelFlags Outer
 include/svx/galmisc.hxx:71
     enum GalleryGraphicImportRet IMPORT_FILE
-include/svx/grfflt.hxx:26
-    enum SvxGraphicFilterResult UnsupportedGraphicType
-include/svx/grfflt.hxx:26
-    enum SvxGraphicFilterResult UnsupportedSlot
-include/svx/gridctrl.hxx:56
+include/svx/gridctrl.hxx:58
     enum GridRowStatus Invalid
-include/svx/gridctrl.hxx:121
+include/svx/gridctrl.hxx:123
     enum InitWindowFacet All
 include/svx/numvset.hxx:46
     enum NumberingPageType BITMAP
@@ -2416,71 +2706,67 @@ include/svx/papersizelistbox.hxx:30
     enum PaperSizeApp Draw
 include/svx/ruler.hxx:53
     enum SvxRulerDragFlags OBJECT
+include/svx/sdasitm.hxx:53
+    enum SdrCustomShapeGeometryItem::HashState Unusable
 include/svx/sdr/overlay/overlayselection.hxx:32
     enum sdr::overlay::OverlayType Solid
-include/svx/shapeproperty.hxx:32
-    enum svx::ShapeProperty Position
-include/svx/shapeproperty.hxx:33
-    enum svx::ShapeProperty Size
-include/svx/shapeproperty.hxx:35
-    enum svx::ShapeProperty TextDocAnchor
 include/svx/ShapeTypeHandler.hxx:82
-    enum accessibility::ShapeTypeHandler::(anonymous at /home/noel/libo2/include/svx/ShapeTypeHandler.hxx:82:5) UNKNOWN_SHAPE_TYPE
+    enum accessibility::ShapeTypeHandler::(unnamed at /home/noel/libo-plugin/include/svx/ShapeTypeHandler.hxx:82:5) UNKNOWN_SHAPE_TYPE
 include/svx/sidebar/InspectorTextPanel.hxx:34
-    enum svx::sidebar::TreeNode::(anonymous at /home/noel/libo2/include/svx/sidebar/InspectorTextPanel.hxx:31:5) ComplexProperty
-include/svx/srchdlg.hxx:74
+    enum svx::sidebar::TreeNode::(unnamed at /home/noel/libo-plugin/include/svx/sidebar/InspectorTextPanel.hxx:31:5) ComplexProperty
+include/svx/srchdlg.hxx:84
     enum SearchLabel Empty
 include/svx/svddrgv.hxx:36
-    enum SdrDragView::(anonymous at /home/noel/libo2/include/svx/svddrgv.hxx:35:5) eDragXorPolyLimit
+    enum SdrDragView::(unnamed at /home/noel/libo-plugin/include/svx/svddrgv.hxx:35:5) eDragXorPolyLimit
 include/svx/svddrgv.hxx:37
-    enum SdrDragView::(anonymous at /home/noel/libo2/include/svx/svddrgv.hxx:35:5) eDragXorPointLimit
-include/svx/svdedxv.hxx:51
+    enum SdrDragView::(unnamed at /home/noel/libo-plugin/include/svx/svddrgv.hxx:35:5) eDragXorPointLimit
+include/svx/svdedxv.hxx:52
     enum SdrEndTextEditKind Changed
-include/svx/svdglue.hxx:44
+include/svx/svdglue.hxx:43
     enum SdrEscapeDirection ALL
-include/svx/svdglue.hxx:57
+include/svx/svdglue.hxx:56
     enum SdrAlign HORZ_DONTCARE
-include/svx/svdglue.hxx:61
+include/svx/svdglue.hxx:60
     enum SdrAlign VERT_DONTCARE
 include/svx/svditer.hxx:36
     enum SdrIterMode DeepWithGroups
-include/svx/svdmrkv.hxx:49
+include/svx/svdmrkv.hxx:48
     enum SdrSearchOptions PICKMARKABLE
-include/svx/svdmrkv.hxx:50
+include/svx/svdmrkv.hxx:49
     enum SdrSearchOptions PICKTEXTEDIT
-include/svx/svdmrkv.hxx:51
+include/svx/svdmrkv.hxx:50
     enum SdrSearchOptions PICKMACRO
-include/svx/svdmrkv.hxx:61
+include/svx/svdmrkv.hxx:60
     enum SdrHitKind Object
-include/svx/svdoashp.hxx:59
+include/svx/svdoashp.hxx:58
     enum CustomShapeHandleModes ORTHO4
-include/svx/svdobj.hxx:106
+include/svx/svdobj.hxx:101
     enum SdrInventor IMap
-include/svx/svdobjkind.hxx:65
-    enum SdrObjKind E3D_OBJECT_ID
+include/svx/svdobjkind.hxx:63
+    enum SdrObjKind E3D_Object
 include/svx/svdobjkind.hxx:99
-    enum SdrObjKind OBJ_DLG_CONTROL
+    enum SdrObjKind BasicDialogControl
 include/svx/svdobjkind.hxx:100
-    enum SdrObjKind OBJ_DLG_DIALOG
-include/svx/svdograf.hxx:53
+    enum SdrObjKind BasicDialogDialog
+include/svx/svdograf.hxx:43
     enum SdrGrafObjTransformsAttrs ALL
-include/svx/svdotable.hxx:56
+include/svx/svdotable.hxx:55
     enum sdr::table::TableHitKind HorizontalBorder
-include/svx/svdotable.hxx:57
+include/svx/svdotable.hxx:56
     enum sdr::table::TableHitKind VerticallBorder
-include/svx/svdpntv.hxx:65
+include/svx/svdpntv.hxx:62
     enum SdrAnimationMode Disable
 include/svx/svdsnpv.hxx:73
     enum SdrSnap NOTSNAPPED
-include/svx/svdtypes.hxx:70
+include/svx/svdtypes.hxx:69
     enum SdrRepeatFunc Move
-include/svx/svdtypes.hxx:71
+include/svx/svdtypes.hxx:70
     enum SdrRepeatFunc Resize
-include/svx/svdtypes.hxx:72
+include/svx/svdtypes.hxx:71
     enum SdrRepeatFunc Rotate
-include/svx/svdview.hxx:58
+include/svx/svdview.hxx:56
     enum SdrViewContext GluePointEdit
-include/svx/svdview.hxx:93
+include/svx/svdview.hxx:91
     enum SdrMouseEventKind MOVE
 include/svx/SvxShapeTypes.hxx:65
     enum accessibility::SvxShapeTypes DRAWING_END
@@ -2570,37 +2856,43 @@ include/svx/swframeposstrings.hxx:77
     enum SvxSwFramePosString::StringId REL_LINE
 include/svx/xenum.hxx:26
     enum XFormTextShadow Slant
-include/toolkit/controls/unocontrols.hxx:729
+include/toolkit/controls/unocontrols.hxx:730
     enum UnoControlListBoxModel::ConstructorMode ConstructWithoutProperties
-include/tools/cpuid.hxx:23
+include/tools/color.hxx:45
+    enum ColorTransparencyTag ColorTransparency
+include/tools/color.hxx:46
+    enum ColorAlphaTag ColorAlpha
+include/tools/cpuid.hxx:35
     enum cpuid::InstructionSetFlags HYPER
-include/tools/cpuid.hxx:24
+include/tools/cpuid.hxx:36
     enum cpuid::InstructionSetFlags SSE2
-include/tools/cpuid.hxx:25
+include/tools/cpuid.hxx:37
     enum cpuid::InstructionSetFlags SSSE3
-include/tools/cpuid.hxx:26
+include/tools/cpuid.hxx:38
     enum cpuid::InstructionSetFlags SSE41
-include/tools/cpuid.hxx:27
+include/tools/cpuid.hxx:39
     enum cpuid::InstructionSetFlags SSE42
-include/tools/cpuid.hxx:28
+include/tools/cpuid.hxx:40
     enum cpuid::InstructionSetFlags AVX
-include/tools/cpuid.hxx:29
+include/tools/cpuid.hxx:41
     enum cpuid::InstructionSetFlags AVX2
+include/tools/cpuid.hxx:42
+    enum cpuid::InstructionSetFlags AVX512F
 include/tools/date.hxx:63
     enum Date::DateInitSystem SYSTEM
 include/tools/date.hxx:68
     enum Date::DateInitEmpty EMPTY
-include/tools/datetime.hxx:34
-    enum DateTime::DateTimeInitSystem SYSTEM
 include/tools/datetime.hxx:39
+    enum DateTime::DateTimeInitSystem SYSTEM
+include/tools/datetime.hxx:44
     enum DateTime::DateTimeInitEmpty EMPTY
-include/tools/stream.hxx:53
-    enum StreamMode TEMPORARY
-include/tools/stream.hxx:61
+include/tools/Guid.hxx:97
+    enum tools::Guid::GenerateTag Generate
+include/tools/stream.hxx:63
     enum StreamMode STD_READ
-include/tools/stream.hxx:62
+include/tools/stream.hxx:64
     enum StreamMode STD_WRITE
-include/tools/stream.hxx:63
+include/tools/stream.hxx:65
     enum StreamMode STD_READWRITE
 include/tools/time.hxx:45
     enum tools::Time::TimeInitSystem SYSTEM
@@ -2610,65 +2902,47 @@ include/tools/urlobj.hxx:173
     enum FSysStyle Detect
 include/tools/urlobj.hxx:243
     enum INetURLObject::DecodeMechanism WithCharset
-include/tools/urlobj.hxx:785
+include/tools/urlobj.hxx:781
     enum INetURLObject::Part PART_USER_PASSWORD
-include/tools/urlobj.hxx:786
+include/tools/urlobj.hxx:782
     enum INetURLObject::Part PART_FPATH
-include/tools/urlobj.hxx:787
+include/tools/urlobj.hxx:783
     enum INetURLObject::Part PART_AUTHORITY
-include/tools/urlobj.hxx:788
+include/tools/urlobj.hxx:784
     enum INetURLObject::Part PART_REL_SEGMENT_EXTRA
-include/tools/urlobj.hxx:789
+include/tools/urlobj.hxx:785
     enum INetURLObject::Part PART_URIC
-include/tools/urlobj.hxx:790
+include/tools/urlobj.hxx:786
     enum INetURLObject::Part PART_HTTP_PATH
-include/tools/urlobj.hxx:791
+include/tools/urlobj.hxx:787
     enum INetURLObject::Part PART_MESSAGE_ID_PATH
-include/tools/urlobj.hxx:792
+include/tools/urlobj.hxx:788
     enum INetURLObject::Part PART_MAILTO
-include/tools/urlobj.hxx:793
+include/tools/urlobj.hxx:789
     enum INetURLObject::Part PART_PATH_BEFORE_QUERY
-include/tools/urlobj.hxx:794
+include/tools/urlobj.hxx:790
     enum INetURLObject::Part PART_PCHAR
-include/tools/urlobj.hxx:795
+include/tools/urlobj.hxx:791
     enum INetURLObject::Part PART_VISIBLE
-include/tools/urlobj.hxx:796
+include/tools/urlobj.hxx:792
     enum INetURLObject::Part PART_VISIBLE_NONSPECIAL
-include/tools/urlobj.hxx:797
+include/tools/urlobj.hxx:793
     enum INetURLObject::Part PART_UNO_PARAM_VALUE
-include/tools/urlobj.hxx:798
+include/tools/urlobj.hxx:794
     enum INetURLObject::Part PART_UNAMBIGUOUS
-include/tools/urlobj.hxx:799
+include/tools/urlobj.hxx:795
     enum INetURLObject::Part PART_URIC_NO_SLASH
-include/tools/urlobj.hxx:800
+include/tools/urlobj.hxx:796
     enum INetURLObject::Part PART_HTTP_QUERY
-include/tools/wintypes.hxx:241
-    enum SymbolAlign LEFT
-include/tools/wintypes.hxx:254
-    enum StandardButtonType More
-include/tools/wintypes.hxx:255
-    enum StandardButtonType Ignore
-include/tools/wintypes.hxx:256
-    enum StandardButtonType Abort
-include/tools/wintypes.hxx:257
-    enum StandardButtonType Less
-include/tools/wintypes.hxx:258
-    enum StandardButtonType Back
-include/tools/wintypes.hxx:259
-    enum StandardButtonType Next
-include/tools/wintypes.hxx:260
-    enum StandardButtonType Finish
-include/tools/wintypes.hxx:261
-    enum StandardButtonType Count
-include/tools/zcodec.hxx:39
+include/tools/zcodec.hxx:41
     enum ZCodec::State STATE_DECOMPRESS
 include/ucbhelper/content.hxx:77
     enum ucbhelper::ResultSetInclude INCLUDE_FOLDERS_AND_DOCUMENTS
 include/ucbhelper/simpleauthenticationrequest.hxx:73
     enum ucbhelper::SimpleAuthenticationRequest::EntityType ENTITY_FIXED
-include/unotest/filters-test.hxx:22
+include/unotest/filters-test.hxx:26
     enum test::filterStatus fail
-include/unotest/filters-test.hxx:23
+include/unotest/filters-test.hxx:27
     enum test::filterStatus pass
 include/unotools/bootstrap.hxx:59
     enum utl::Bootstrap::PathStatus DATA_UNKNOWN
@@ -2678,98 +2952,94 @@ include/unotools/bootstrap.hxx:83
     enum utl::Bootstrap::Status INVALID_USER_INSTALL
 include/unotools/bootstrap.hxx:84
     enum utl::Bootstrap::Status INVALID_BASE_INSTALL
-include/unotools/compatibility.hxx:68
-    enum SvtCompatibilityEntry::Index AddTableLineSpacing
 include/unotools/confignode.hxx:164
     enum utl::OConfigurationNode::NAMEORIGIN NO_CONFIGURATION
 include/unotools/confignode.hxx:194
     enum utl::OConfigurationTreeRoot::CREATION_MODE CM_UPDATABLE
-include/unotools/eventcfg.hxx:31
-    enum GlobalEventId DOCCREATED
 include/unotools/eventcfg.hxx:32
-    enum GlobalEventId CREATEDOC
+    enum GlobalEventId DOCCREATED
 include/unotools/eventcfg.hxx:33
-    enum GlobalEventId LOADFINISHED
+    enum GlobalEventId CREATEDOC
 include/unotools/eventcfg.hxx:34
-    enum GlobalEventId OPENDOC
+    enum GlobalEventId LOADFINISHED
 include/unotools/eventcfg.hxx:35
-    enum GlobalEventId PREPARECLOSEDOC
+    enum GlobalEventId OPENDOC
 include/unotools/eventcfg.hxx:36
-    enum GlobalEventId CLOSEDOC
+    enum GlobalEventId PREPARECLOSEDOC
 include/unotools/eventcfg.hxx:37
-    enum GlobalEventId SAVEDOC
+    enum GlobalEventId CLOSEDOC
 include/unotools/eventcfg.hxx:38
-    enum GlobalEventId SAVEDOCDONE
+    enum GlobalEventId SAVEDOC
 include/unotools/eventcfg.hxx:39
-    enum GlobalEventId SAVEDOCFAILED
+    enum GlobalEventId SAVEDOCDONE
 include/unotools/eventcfg.hxx:40
-    enum GlobalEventId SAVEASDOC
+    enum GlobalEventId SAVEDOCFAILED
 include/unotools/eventcfg.hxx:41
-    enum GlobalEventId SAVEASDOCDONE
+    enum GlobalEventId SAVEASDOC
 include/unotools/eventcfg.hxx:42
-    enum GlobalEventId SAVEASDOCFAILED
+    enum GlobalEventId SAVEASDOCDONE
 include/unotools/eventcfg.hxx:43
-    enum GlobalEventId SAVETODOC
+    enum GlobalEventId SAVEASDOCFAILED
 include/unotools/eventcfg.hxx:44
-    enum GlobalEventId SAVETODOCDONE
+    enum GlobalEventId SAVETODOC
 include/unotools/eventcfg.hxx:45
-    enum GlobalEventId SAVETODOCFAILED
+    enum GlobalEventId SAVETODOCDONE
 include/unotools/eventcfg.hxx:46
-    enum GlobalEventId ACTIVATEDOC
+    enum GlobalEventId SAVETODOCFAILED
 include/unotools/eventcfg.hxx:47
-    enum GlobalEventId DEACTIVATEDOC
+    enum GlobalEventId ACTIVATEDOC
 include/unotools/eventcfg.hxx:48
-    enum GlobalEventId PRINTDOC
+    enum GlobalEventId DEACTIVATEDOC
 include/unotools/eventcfg.hxx:49
-    enum GlobalEventId VIEWCREATED
+    enum GlobalEventId PRINTDOC
 include/unotools/eventcfg.hxx:50
-    enum GlobalEventId PREPARECLOSEVIEW
+    enum GlobalEventId VIEWCREATED
 include/unotools/eventcfg.hxx:51
-    enum GlobalEventId CLOSEVIEW
+    enum GlobalEventId PREPARECLOSEVIEW
 include/unotools/eventcfg.hxx:52
-    enum GlobalEventId MODIFYCHANGED
+    enum GlobalEventId CLOSEVIEW
 include/unotools/eventcfg.hxx:53
-    enum GlobalEventId TITLECHANGED
+    enum GlobalEventId MODIFYCHANGED
 include/unotools/eventcfg.hxx:54
-    enum GlobalEventId VISAREACHANGED
+    enum GlobalEventId TITLECHANGED
 include/unotools/eventcfg.hxx:55
-    enum GlobalEventId MODECHANGED
+    enum GlobalEventId VISAREACHANGED
 include/unotools/eventcfg.hxx:56
+    enum GlobalEventId MODECHANGED
+include/unotools/eventcfg.hxx:57
     enum GlobalEventId STORAGECHANGED
-include/unotools/fontcfg.hxx:65
+include/unotools/fontcfg.hxx:63
     enum ImplFontAttrs CJK_JP
-include/unotools/fontcfg.hxx:66
+include/unotools/fontcfg.hxx:64
     enum ImplFontAttrs CJK_SC
-include/unotools/fontcfg.hxx:67
+include/unotools/fontcfg.hxx:65
     enum ImplFontAttrs CJK_TC
-include/unotools/fontcfg.hxx:68
+include/unotools/fontcfg.hxx:66
     enum ImplFontAttrs CJK_KR
-include/unotools/fontcfg.hxx:76
+include/unotools/fontcfg.hxx:74
     enum ImplFontAttrs Script
-include/unotools/fontcfg.hxx:77
+include/unotools/fontcfg.hxx:75
     enum ImplFontAttrs Handwriting
-include/unotools/fontcfg.hxx:78
+include/unotools/fontcfg.hxx:76
     enum ImplFontAttrs Chancery
-include/unotools/fontcfg.hxx:79
+include/unotools/fontcfg.hxx:77
     enum ImplFontAttrs Comic
-include/unotools/fontcvt.hxx:30
+include/unotools/fontcvt.hxx:34
     enum FontToSubsFontFlags EXPORT
 include/unotools/options.hxx:34
     enum ConfigurationHints UiLocale
 include/unotools/options.hxx:37
     enum ConfigurationHints IgnoreLang
-include/unotools/options.hxx:38
+include/unotools/options.hxx:39
     enum ConfigurationHints CtlSettingsChanged
-include/unotools/readwritemutexguard.hxx:27
-    enum ReadWriteGuardMode ReadOnly
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::awt::XControl, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::awt::XControl>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
     enum utl::SharedUNOComponent<class com::sun::star::frame::XModel, class utl::CloseableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
-include/unotools/sharedunocomponent.hxx:149
-    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XResultSet, class utl::DisposableComponent>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection>::AssignmentMode NoTakeOwnership
+include/unotools/sharedunocomponent.hxx:150
+    enum utl::SharedUNOComponent<class com::sun::star::sdbc::XResultSet>::AssignmentMode NoTakeOwnership
 include/unotools/useroptions.hxx:32
     enum UserOptToken City
 include/unotools/useroptions.hxx:33
@@ -2808,6 +3078,12 @@ include/unotools/useroptions.hxx:50
     enum UserOptToken EncryptionKey
 include/unotools/useroptions.hxx:51
     enum UserOptToken EncryptToSelf
+include/unotools/viewoptions.hxx:205
+    enum SvtViewOptions::State STATE_FALSE
+include/vbahelper/vbafontbase.hxx:48
+    enum VbaFontBase::Component WORD
+include/vcl/animate/AnimationFrame.hxx:34
+    enum Blend Over
 include/vcl/decoview.hxx:49
     enum DrawHighlightFrameStyle Out
 include/vcl/EnumContext.hxx:41
@@ -2820,59 +3096,63 @@ include/vcl/EnumContext.hxx:69
     enum vcl::EnumContext::Context Axis
 include/vcl/EnumContext.hxx:72
     enum vcl::EnumContext::Context ChartElements
-include/vcl/EnumContext.hxx:75
+include/vcl/EnumContext.hxx:74
+    enum vcl::EnumContext::Context DrawFontwork
+include/vcl/EnumContext.hxx:76
     enum vcl::EnumContext::Context DrawPage
-include/vcl/EnumContext.hxx:78
+include/vcl/EnumContext.hxx:79
     enum vcl::EnumContext::Context ErrorBar
-include/vcl/EnumContext.hxx:80
+include/vcl/EnumContext.hxx:81
     enum vcl::EnumContext::Context Frame
-include/vcl/EnumContext.hxx:83
-    enum vcl::EnumContext::Context HandoutPage
 include/vcl/EnumContext.hxx:84
+    enum vcl::EnumContext::Context HandoutPage
+include/vcl/EnumContext.hxx:85
     enum vcl::EnumContext::Context MasterPage
-include/vcl/EnumContext.hxx:87
+include/vcl/EnumContext.hxx:86
+    enum vcl::EnumContext::Context Math
+include/vcl/EnumContext.hxx:89
     enum vcl::EnumContext::Context NotesPage
-include/vcl/EnumContext.hxx:91
+include/vcl/EnumContext.hxx:93
     enum vcl::EnumContext::Context Printpreview
-include/vcl/EnumContext.hxx:92
+include/vcl/EnumContext.hxx:94
     enum vcl::EnumContext::Context Series
-include/vcl/EnumContext.hxx:93
+include/vcl/EnumContext.hxx:95
     enum vcl::EnumContext::Context SlidesorterPage
-include/vcl/EnumContext.hxx:97
+include/vcl/EnumContext.hxx:99
     enum vcl::EnumContext::Context Trendline
-include/vcl/errcode.hxx:61
-    enum WarningFlag Yes
-include/vcl/event.hxx:81
+include/vcl/event.hxx:84
     enum MouseEventModifiers DRAGMOVE
-include/vcl/event.hxx:82
+include/vcl/event.hxx:85
     enum MouseEventModifiers DRAGCOPY
 include/vcl/filter/pdfdocument.hxx:294
     enum vcl::filter::TokenizeMode END_OF_STREAM
 include/vcl/filter/pdfdocument.hxx:300
     enum vcl::filter::TokenizeMode STORED_OBJECT
-include/vcl/floatwin.hxx:68
-    enum FloatWinTitleType Unknown
 include/vcl/fntstyle.hxx:31
     enum FontKerning FontSpecific
-include/vcl/font/Feature.hxx:29
-    enum vcl::font::FeatureParameterType BOOL
-include/vcl/font/Feature.hxx:35
-    enum vcl::font::FeatureType OpenType
-include/vcl/font/Feature.hxx:36
+include/vcl/font/Feature.hxx:38
     enum vcl::font::FeatureType Graphite
-include/vcl/formatter.hxx:80
+include/vcl/formatter.hxx:82
     enum FORMAT_CHANGE_TYPE CURRENCY_SYMBOL
-include/vcl/formatter.hxx:81
+include/vcl/formatter.hxx:83
     enum FORMAT_CHANGE_TYPE CURRSYM_POSITION
-include/vcl/formatter.hxx:118
+include/vcl/formatter.hxx:121
     enum Formatter::valueState valueDirty
-include/vcl/gdimtf.hxx:47
+include/vcl/gdimtf.hxx:48
     enum MtfConversion N8BitGreys
-include/vcl/GestureEvent.hxx:25
+include/vcl/GestureEventPan.hxx:24
     enum PanningOrientation Horizontal
-include/vcl/GestureEvent.hxx:26
+include/vcl/GestureEventPan.hxx:25
     enum PanningOrientation Vertical
-include/vcl/GraphicObject.hxx:40
+include/vcl/GestureEventRotate.hxx:17
+    enum GestureEventRotateType Begin
+include/vcl/GestureEventRotate.hxx:18
+    enum GestureEventRotateType Update
+include/vcl/GestureEventRotate.hxx:19
+    enum GestureEventRotateType End
+include/vcl/GestureEventZoom.hxx:19
+    enum GestureEventZoomType End
+include/vcl/GraphicObject.hxx:41
     enum GraphicAdjustmentFlags ALL
 include/vcl/graphictools.hxx:214
     enum SvtGraphicFill::FillRule fillNonZero
@@ -2885,7 +3165,7 @@ include/vcl/graphictools.hxx:246
 include/vcl/graphictools.hxx:249
     enum SvtGraphicFill::GradientType Rectangular
 include/vcl/graphictools.hxx:251
-    enum SvtGraphicFill::(anonymous at /home/noel/libo2/include/vcl/graphictools.hxx:251:5) gradientStepsInfinite
+    enum SvtGraphicFill::(unnamed at /home/noel/libo-plugin/include/vcl/graphictools.hxx:251:5) gradientStepsInfinite
 include/vcl/headbar.hxx:183
     enum HeaderBarItemBits LEFT
 include/vcl/headbar.hxx:192
@@ -2898,84 +3178,122 @@ include/vcl/image.hxx:37
     enum StockImage Yes
 include/vcl/inputctx.hxx:32
     enum InputContextFlags ExtText
-include/vcl/keycodes.hxx:168
+include/vcl/inputtypes.hxx:28
+    enum VclInputFlags KEYBOARD
+include/vcl/inputtypes.hxx:29
+    enum VclInputFlags PAINT
+include/vcl/inputtypes.hxx:32
+    enum VclInputFlags APPEVENT
+include/vcl/keycodes.hxx:172
     enum ModKeyFlags LeftMod1
-include/vcl/keycodes.hxx:169
+include/vcl/keycodes.hxx:173
     enum ModKeyFlags RightMod1
-include/vcl/keycodes.hxx:170
+include/vcl/keycodes.hxx:174
     enum ModKeyFlags LeftMod2
-include/vcl/keycodes.hxx:171
+include/vcl/keycodes.hxx:175
     enum ModKeyFlags RightMod2
-include/vcl/keycodes.hxx:172
+include/vcl/keycodes.hxx:176
     enum ModKeyFlags LeftMod3
-include/vcl/keycodes.hxx:173
+include/vcl/keycodes.hxx:177
     enum ModKeyFlags RightMod3
-include/vcl/keycodes.hxx:188
+include/vcl/keycodes.hxx:192
     enum KeyIndicatorState NUMLOCK
-include/vcl/layout.hxx:202
-    enum VclButtonBoxStyle Edge
-include/vcl/outdev.hxx:200
-    enum DrawModeFlags Default
-include/vcl/outdev.hxx:246
-    enum AddFontSubstituteFlags ScreenOnly
-include/vcl/outdev.hxx:278
+include/vcl/lazydelete.hxx:66
+    enum vcl::DeleteOnDeinitFlag Empty
+include/vcl/outdev.hxx:148
     enum OutDevViewType DontKnow
-include/vcl/outdev.hxx:278
+include/vcl/outdev.hxx:148
     enum OutDevViewType SlideShow
-include/vcl/pdf/PDFAnnotationMarker.hxx:56
+include/vcl/pdf/PDFAnnotationMarker.hxx:58
     enum vcl::pdf::PDFTextMarkerType Highlight
 include/vcl/pdf/PDFAnnotationSubType.hxx:33
     enum vcl::pdf::PDFAnnotationSubType Popup
-include/vcl/pdfwriter.hxx:537
+include/vcl/pdf/PDFAnnotationSubType.hxx:37
+    enum vcl::pdf::PDFAnnotationSubType Widget
+include/vcl/pdfwriter.hxx:124
+    enum vcl::PDFWriter::StructElement Article
+include/vcl/pdfwriter.hxx:124
+    enum vcl::PDFWriter::StructElement Section
+include/vcl/pdfwriter.hxx:125
+    enum vcl::PDFWriter::StructElement Index
+include/vcl/pdfwriter.hxx:125
+    enum vcl::PDFWriter::StructElement TOC
+include/vcl/pdfwriter.hxx:125
+    enum vcl::PDFWriter::StructElement TOCI
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement RB
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement RP
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement Ruby
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement WP
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement WT
+include/vcl/pdfwriter.hxx:134
+    enum vcl::PDFWriter::StructElement Warichu
+include/vcl/pdfwriter.hxx:170
+    enum vcl::PDFWriter::StructAttributeValue Background
+include/vcl/pdfwriter.hxx:217
+    enum vcl::PDFWriter::FormatType Text
+include/vcl/pdfwriter.hxx:582
     enum vcl::PDFWriter::ColorMode DrawColor
+include/vcl/printer/Options.hxx:41
+    enum vcl::printer::GradientMode Color
+include/vcl/printer/Options.hxx:48
+    enum vcl::printer::BitmapMode Resolution
+include/vcl/rendercontext/AddFontSubstituteFlags.hxx:28
+    enum AddFontSubstituteFlags ScreenOnly
+include/vcl/rendercontext/DrawModeFlags.hxx:27
+    enum DrawModeFlags Default
 include/vcl/salgtype.hxx:30
-    enum DeviceFormat DEFAULT
-include/vcl/salnativewidgets.hxx:131
-    enum ControlPart TrackHorzLeft
+    enum DeviceFormat WITH_ALPHA
 include/vcl/salnativewidgets.hxx:132
-    enum ControlPart TrackVertUpper
+    enum ControlPart TrackHorzLeft
 include/vcl/salnativewidgets.hxx:133
-    enum ControlPart TrackHorzRight
+    enum ControlPart TrackVertUpper
 include/vcl/salnativewidgets.hxx:134
+    enum ControlPart TrackHorzRight
+include/vcl/salnativewidgets.hxx:135
     enum ControlPart TrackVertLower
-include/vcl/salnativewidgets.hxx:196
-    enum ControlPart BackgroundWindow
 include/vcl/salnativewidgets.hxx:197
+    enum ControlPart BackgroundWindow
+include/vcl/salnativewidgets.hxx:198
     enum ControlPart BackgroundDialog
-include/vcl/salnativewidgets.hxx:236
+include/vcl/salnativewidgets.hxx:237
     enum ButtonValue DontKnow
-include/vcl/sysdata.hxx:60
-    enum SystemEnvData::Toolkit Gen
-include/vcl/sysdata.hxx:60
-    enum SystemEnvData::Toolkit Qt5
-include/vcl/sysdata.hxx:61
-    enum SystemEnvData::Platform Xcb
-include/vcl/syswin.hxx:48
+include/vcl/Scanline.hxx:48
+    enum ScanlineDirection BottomUp
+include/vcl/sysdata.hxx:54
+    enum SystemEnvData::Toolkit Qt
+include/vcl/syswin.hxx:50
     enum MenuBarMode Normal
 include/vcl/task.hxx:29
     enum TaskPriority HIGHEST
 include/vcl/task.hxx:30
     enum TaskPriority DEFAULT
-include/vcl/task.hxx:31
-    enum TaskPriority HIGH_IDLE
-include/vcl/task.hxx:32
-    enum TaskPriority RESIZE
 include/vcl/task.hxx:33
-    enum TaskPriority REPAINT
+    enum TaskPriority RESIZE
 include/vcl/task.hxx:34
+    enum TaskPriority REPAINT
+include/vcl/task.hxx:35
     enum TaskPriority POST_PAINT
-include/vcl/toolbox.hxx:52
+include/vcl/toolbox.hxx:51
     enum ToolBoxMenuType ClippedItems
-include/vcl/toolbox.hxx:62
+include/vcl/toolbox.hxx:61
     enum ToolBoxLayoutMode Normal
-include/vcl/toolbox.hxx:69
+include/vcl/toolbox.hxx:68
     enum ToolBoxTextPosition Bottom
 include/vcl/toolkit/dialog.hxx:46
     enum Dialog::InitFlag Default
-include/vcl/toolkit/ivctrl.hxx:52
+include/vcl/toolkit/floatwin.hxx:49
+    enum FloatWinTitleType Unknown
+include/vcl/toolkit/ivctrl.hxx:53
     enum SvxIconChoiceCtrlTextMode Short
-include/vcl/toolkit/ivctrl.hxx:57
+include/vcl/toolkit/ivctrl.hxx:58
     enum SvxIconChoiceCtrlPositionMode Free
+include/vcl/toolkit/prgsbar.hxx:59
+    enum ProgressBar::BarStyle Level
 include/vcl/toolkit/svlbitm.hxx:40
     enum SvBmp CHECKED
 include/vcl/toolkit/svlbitm.hxx:41
@@ -2986,9 +3304,9 @@ include/vcl/toolkit/svlbitm.hxx:43
     enum SvBmp HICHECKED
 include/vcl/toolkit/svlbitm.hxx:44
     enum SvBmp HITRISTATE
-include/vcl/toolkit/svtabbx.hxx:38
+include/vcl/toolkit/svtabbx.hxx:40
     enum SvTabJustify AdjustCenter
-include/vcl/toolkit/treelistbox.hxx:68
+include/vcl/toolkit/treelistbox.hxx:64
     enum SvLBoxTabFlags ADJUST_LEFT
 include/vcl/vclenum.hxx:38
     enum MenuItemBits HELP
@@ -2998,81 +3316,101 @@ include/vcl/vclenum.hxx:69
     enum ToolBoxItemType DONTKNOW
 include/vcl/vclenum.hxx:71
     enum ButtonType SYMBOLTEXT
-include/vcl/vclenum.hxx:103
+include/vcl/vclenum.hxx:101
     enum SymbolType MENU
-include/vcl/vclenum.hxx:111
+include/vcl/vclenum.hxx:109
     enum WindowBorderStyle NORMAL
-include/vcl/vclenum.hxx:136
-    enum WindowStateMask All
-include/vcl/vclenum.hxx:145
+include/vcl/vclenum.hxx:123
     enum TimeFormat Hour24
-include/vcl/vclenum.hxx:314
-    enum WindowStateState SystemMask
-include/vcl/vclenum.hxx:331
+include/vcl/vclenum.hxx:292
     enum vcl::ImageType Small
-include/vcl/vclenum.hxx:353
+include/vcl/vclenum.hxx:314
     enum DrawFrameFlags BorderWindowBorder
-include/vcl/vclevent.hxx:92
+include/vcl/vclenum.hxx:368
+    enum TrackingEventFlags Key
+include/vcl/vclevent.hxx:93
     enum VclEventId ScrollbarEndScroll
-include/vcl/vectorgraphicdata.hxx:108
+include/vcl/vectorgraphicdata.hxx:100
     enum VectorGraphicData::State PARSED
 include/vcl/VectorGraphicSearch.hxx:24
     enum SearchStartPosition Begin
 include/vcl/virdev.hxx:44
     enum VirtualDevice::RefDevMode Custom
-include/vcl/weld.hxx:793
+include/vcl/weld.hxx:896
     enum weld::ColumnToggleType Check
-include/vcl/window.hxx:108
-    enum TrackingEventFlags Key
-include/vcl/window.hxx:149
+include/vcl/weld.hxx:2400
+    enum weld::Placement End
+include/vcl/window.hxx:136
     enum PosSizeFlags PosSize
-include/vcl/window.hxx:150
+include/vcl/window.hxx:137
     enum PosSizeFlags All
-include/vcl/window.hxx:277
+include/vcl/window.hxx:251
     enum ShowTrackFlags Small
-include/vcl/window.hxx:281
+include/vcl/window.hxx:255
     enum ShowTrackFlags StyleMask
-include/vcl/window.hxx:294
+include/vcl/window.hxx:268
     enum StartTrackingFlags KeyMod
-include/vcl/window.hxx:333
+include/vcl/window.hxx:307
     enum StateChangedType Layout
-include/vcl/window.hxx:348
+include/vcl/window.hxx:322
     enum GetFocusFlags Around
-include/vcl/window.hxx:351
+include/vcl/window.hxx:325
     enum GetFocusFlags FloatWinPopupModeEndCancel
-include/vcl/window.hxx:388
+include/vcl/window.hxx:349
     enum EndExtTextInputFlags Complete
-include/xmloff/families.hxx:75
+include/vcl/windowstate.hxx:42
+    enum vcl::WindowState SystemMask
+include/vcl/windowstate.hxx:62
+    enum vcl::WindowDataMask All
+include/vcl/wintypes.hxx:240
+    enum SymbolAlign LEFT
+include/vcl/wintypes.hxx:253
+    enum StandardButtonType More
+include/vcl/wintypes.hxx:254
+    enum StandardButtonType Ignore
+include/vcl/wintypes.hxx:255
+    enum StandardButtonType Abort
+include/vcl/wintypes.hxx:256
+    enum StandardButtonType Less
+include/vcl/wintypes.hxx:257
+    enum StandardButtonType Back
+include/vcl/wintypes.hxx:258
+    enum StandardButtonType Next
+include/vcl/wintypes.hxx:259
+    enum StandardButtonType Finish
+include/vcl/wintypes.hxx:260
+    enum StandardButtonType Count
+include/xmloff/families.hxx:77
     enum XmlStyleFamily TABLE_TEMPLATE_ID
-include/xmloff/families.hxx:83
+include/xmloff/families.hxx:85
     enum XmlStyleFamily SD_PAGEMASTERCONTEXT_ID
-include/xmloff/families.hxx:84
+include/xmloff/families.hxx:86
     enum XmlStyleFamily SD_PAGEMASTERSTYLECONTEXT_ID
-include/xmloff/families.hxx:85
+include/xmloff/families.hxx:87
     enum XmlStyleFamily SD_PRESENTATIONPAGELAYOUT_ID
-include/xmloff/families.hxx:91
+include/xmloff/families.hxx:93
     enum XmlStyleFamily SD_GRADIENT_ID
-include/xmloff/families.hxx:92
+include/xmloff/families.hxx:94
     enum XmlStyleFamily SD_HATCH_ID
-include/xmloff/families.hxx:93
+include/xmloff/families.hxx:95
     enum XmlStyleFamily SD_FILL_IMAGE_ID
-include/xmloff/families.hxx:94
+include/xmloff/families.hxx:96
     enum XmlStyleFamily SD_MARKER_ID
-include/xmloff/families.hxx:95
+include/xmloff/families.hxx:97
     enum XmlStyleFamily SD_STROKE_DASH_ID
-include/xmloff/namespacemap.hxx:107
+include/xmloff/namespacemap.hxx:119
     enum SvXMLNamespaceMap::QNameMode AttrValue
-include/xmloff/shapeexport.hxx:55
+include/xmloff/shapeexport.hxx:56
     enum XMLShapeExportFlags SIZE
 include/xmloff/txtimp.hxx:76
     enum XMLTextType Footnote
-include/xmloff/txtparae.hxx:72
+include/xmloff/txtparae.hxx:75
     enum TextPNS ODF
-include/xmloff/txtparae.hxx:117
+include/xmloff/txtparae.hxx:126
     enum XMLTextParagraphExport::FieldmarkType CHECK
 include/xmloff/xmlerror.hxx:82
     enum SvXMLErrorFlags WARNING_OCCURRED
-include/xmloff/xmlexp.hxx:102
+include/xmloff/xmlexp.hxx:104
     enum SvXMLExportFlags ALL
 include/xmloff/xmlnumfi.hxx:53
     enum SvXMLDateElementAttributes XML_DEA_SHORT
@@ -3082,88 +3420,92 @@ include/xmloff/xmlnumfi.hxx:55
     enum SvXMLDateElementAttributes XML_DEA_TEXTSHORT
 include/xmloff/xmlnumfi.hxx:56
     enum SvXMLDateElementAttributes XML_DEA_TEXTLONG
-include/xmlreader/xmlreader.hxx:43
-    enum xmlreader::XmlReader::(anonymous at /home/noel/libo2/include/xmlreader/xmlreader.hxx:43:5) NAMESPACE_UNKNOWN
-include/xmlreader/xmlreader.hxx:45
+include/xmloff/xmlnumfi.hxx:124
+    enum SvXMLNumFormatContext::ImplicitCalendar DEFAULT_FROM_OTHER
+include/xmlreader/xmlreader.hxx:42
+    enum xmlreader::XmlReader::(unnamed at /home/noel/libo-plugin/include/xmlreader/xmlreader.hxx:42:5) NAMESPACE_UNKNOWN
+include/xmlreader/xmlreader.hxx:44
     enum xmlreader::XmlReader::Text Normalized
-include/xmlreader/xmlreader.hxx:126
+include/xmlreader/xmlreader.hxx:125
     enum xmlreader::XmlReader::State Done
 jvmfwk/inc/vendorplugin.hxx:57
     enum javaPluginError InvalidArg
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:62
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:58
     enum jfw_plugin::SunVersion::PreRelease Rel_INTERNAL
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:63
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:59
     enum jfw_plugin::SunVersion::PreRelease Rel_EA
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:64
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:60
     enum jfw_plugin::SunVersion::PreRelease Rel_EA1
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:65
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:61
     enum jfw_plugin::SunVersion::PreRelease Rel_EA2
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:66
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:62
     enum jfw_plugin::SunVersion::PreRelease Rel_EA3
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:67
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:63
     enum jfw_plugin::SunVersion::PreRelease Rel_BETA
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:68
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:64
     enum jfw_plugin::SunVersion::PreRelease Rel_BETA1
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:69
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:65
     enum jfw_plugin::SunVersion::PreRelease Rel_BETA2
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:70
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:66
     enum jfw_plugin::SunVersion::PreRelease Rel_BETA3
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:71
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:67
     enum jfw_plugin::SunVersion::PreRelease Rel_RC
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:72
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:68
     enum jfw_plugin::SunVersion::PreRelease Rel_RC1
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:73
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:69
     enum jfw_plugin::SunVersion::PreRelease Rel_RC2
-jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:74
+jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:70
     enum jfw_plugin::SunVersion::PreRelease Rel_RC3
-jvmfwk/plugins/sunmajor/pluginlib/util.cxx:192
+jvmfwk/plugins/sunmajor/pluginlib/util.cxx:193
     enum jfw_plugin::(anonymous namespace)::FileHandleReader::Result RESULT_EOF
-jvmfwk/plugins/sunmajor/pluginlib/util.cxx:202
-    enum jfw_plugin::(anonymous namespace)::FileHandleReader::(anonymous at /home/noel/libo2/jvmfwk/plugins/sunmajor/pluginlib/util.cxx:202:5) BUFFER_SIZE
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:75
-    enum (anonymous at /home/noel/libo2/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:68:1) PROP_LAST
-libreofficekit/source/gtk/lokdocview.cxx:271
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) LOAD_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:272
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) EDIT_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:273
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) COMMAND_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:274
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) SEARCH_NOT_FOUND
-libreofficekit/source/gtk/lokdocview.cxx:275
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) PART_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:276
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) SIZE_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:277
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) HYPERLINK_CLICKED
-libreofficekit/source/gtk/lokdocview.cxx:278
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) CURSOR_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:279
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) SEARCH_RESULT_COUNT
-libreofficekit/source/gtk/lokdocview.cxx:280
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) COMMAND_RESULT
-libreofficekit/source/gtk/lokdocview.cxx:281
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) ADDRESS_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:282
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) FORMULA_CHANGED
-libreofficekit/source/gtk/lokdocview.cxx:283
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) TEXT_SELECTION
-libreofficekit/source/gtk/lokdocview.cxx:284
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) PASSWORD_REQUIRED
+jvmfwk/plugins/sunmajor/pluginlib/util.cxx:203
+    enum jfw_plugin::(anonymous namespace)::FileHandleReader::(unnamed at /home/noel/libo-plugin/jvmfwk/plugins/sunmajor/pluginlib/util.cxx:203:5) BUFFER_SIZE
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:76
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:69:1) PROP_LAST
 libreofficekit/source/gtk/lokdocview.cxx:285
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) COMMENT
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) LOAD_CHANGED
 libreofficekit/source/gtk/lokdocview.cxx:286
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) RULER
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) EDIT_CHANGED
 libreofficekit/source/gtk/lokdocview.cxx:287
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) WINDOW
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) COMMAND_CHANGED
 libreofficekit/source/gtk/lokdocview.cxx:288
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) INVALIDATE_HEADER
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) SEARCH_NOT_FOUND
+libreofficekit/source/gtk/lokdocview.cxx:289
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) PART_CHANGED
 libreofficekit/source/gtk/lokdocview.cxx:290
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:269:1) LAST_SIGNAL
-libreofficekit/source/gtk/lokdocview.cxx:316
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:293:1) PROP_LAST
-libreofficekit/source/gtk/tilebuffer.hxx:174
-    enum (anonymous at /home/noel/libo2/libreofficekit/source/gtk/tilebuffer.hxx:171:1) LOK_TILEBUFFER_MEMORY
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) SIZE_CHANGED
+libreofficekit/source/gtk/lokdocview.cxx:291
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) HYPERLINK_CLICKED
+libreofficekit/source/gtk/lokdocview.cxx:292
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) CURSOR_CHANGED
+libreofficekit/source/gtk/lokdocview.cxx:293
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) SEARCH_RESULT_COUNT
+libreofficekit/source/gtk/lokdocview.cxx:294
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) COMMAND_RESULT
+libreofficekit/source/gtk/lokdocview.cxx:295
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) ADDRESS_CHANGED
+libreofficekit/source/gtk/lokdocview.cxx:296
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) FORMULA_CHANGED
+libreofficekit/source/gtk/lokdocview.cxx:297
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) TEXT_SELECTION
+libreofficekit/source/gtk/lokdocview.cxx:298
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) CONTENT_CONTROL
+libreofficekit/source/gtk/lokdocview.cxx:299
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) PASSWORD_REQUIRED
+libreofficekit/source/gtk/lokdocview.cxx:300
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) COMMENT
+libreofficekit/source/gtk/lokdocview.cxx:301
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) RULER
+libreofficekit/source/gtk/lokdocview.cxx:302
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) WINDOW
+libreofficekit/source/gtk/lokdocview.cxx:303
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) INVALIDATE_HEADER
+libreofficekit/source/gtk/lokdocview.cxx:305
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:283:1) LAST_SIGNAL
+libreofficekit/source/gtk/lokdocview.cxx:331
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/lokdocview.cxx:308:1) PROP_LAST
+libreofficekit/source/gtk/tilebuffer.hxx:172
+    enum (unnamed at /home/noel/libo-plugin/libreofficekit/source/gtk/tilebuffer.hxx:169:1) LOK_TILEBUFFER_MEMORY
 oox/inc/drawingml/chart/objectformatter.hxx:39
     enum oox::drawingml::chart::ObjectType OBJECTTYPE_CHARTTITLE
 oox/inc/drawingml/chart/objectformatter.hxx:40
@@ -3210,22 +3552,24 @@ oox/inc/drawingml/chart/objectformatter.hxx:62
     enum oox::drawingml::chart::ObjectType OBJECTTYPE_DOWNBAR
 oox/inc/drawingml/chart/objectformatter.hxx:63
     enum oox::drawingml::chart::ObjectType OBJECTTYPE_DATATABLE
-oox/inc/drawingml/chart/seriesmodel.hxx:172
+oox/inc/drawingml/chart/seriesmodel.hxx:181
     enum oox::drawingml::chart::SeriesModel::SourceType CATEGORIES
-oox/inc/drawingml/chart/seriesmodel.hxx:173
+oox/inc/drawingml/chart/seriesmodel.hxx:182
     enum oox::drawingml::chart::SeriesModel::SourceType VALUES
-oox/inc/drawingml/chart/seriesmodel.hxx:174
+oox/inc/drawingml/chart/seriesmodel.hxx:183
     enum oox::drawingml::chart::SeriesModel::SourceType POINTS
-oox/inc/drawingml/chart/typegroupconverter.hxx:58
+oox/inc/drawingml/chart/seriesmodel.hxx:184
+    enum oox::drawingml::chart::SeriesModel::SourceType DATALABELS
+oox/inc/drawingml/chart/typegroupconverter.hxx:59
     enum oox::drawingml::chart::TypeCategory TYPECATEGORY_LINE
-oox/inc/drawingml/chart/typegroupconverter.hxx:61
-    enum oox::drawingml::chart::TypeCategory TYPECATEGORY_SCATTER
 oox/inc/drawingml/chart/typegroupconverter.hxx:62
+    enum oox::drawingml::chart::TypeCategory TYPECATEGORY_SCATTER
+oox/inc/drawingml/chart/typegroupconverter.hxx:63
     enum oox::drawingml::chart::TypeCategory TYPECATEGORY_SURFACE
 oox/inc/drawingml/textspacing.hxx:35
     enum oox::drawingml::TextSpacing::Unit Points
-oox/source/export/shapes.cxx:1970
-    enum (anonymous at /home/noel/libo2/oox/source/export/shapes.cxx:1970:5) OTHER
+oox/source/export/shapes.cxx:2625
+    enum (unnamed at /home/noel/libo-plugin/oox/source/export/shapes.cxx:2625:5) OTHER
 pyuno/inc/pyuno.hxx:65
     enum pyuno::NotNull NOT_NULL
 pyuno/inc/pyuno.hxx:153
@@ -3262,75 +3606,75 @@ reportdesign/source/filter/xml/xmlEnums.hxx:46
     enum rptxml::XMLReportToken XML_TOK_SUB_FRAME
 reportdesign/source/filter/xml/xmlEnums.hxx:47
     enum rptxml::XMLReportToken XML_TOK_SUB_BODY
-reportdesign/source/filter/xml/xmlEnums.hxx:68
+reportdesign/source/filter/xml/xmlEnums.hxx:52
     enum rptxml::XMLSubDocument XML_TOK_MASTER_DETAIL_FIELD
-sal/osl/all/log.cxx:382
+sal/osl/all/log.cxx:434
     enum Sense NEGATIVE
-sal/rtl/bootstrap.cxx:86
-    enum (anonymous namespace)::LookupMode LOOKUP_MODE_URE_BOOTSTRAP_EXPANSION
-sal/rtl/rtl_process.cxx:44
-    enum (anonymous namespace)::Id::(anonymous at /home/noel/libo2/sal/rtl/rtl_process.cxx:44:5) UUID_SIZE
-sal/rtl/ustring.cxx:902
+sal/rtl/bootstrap.cxx:89
+    enum (anonymous namespace)::LookupMode URE_BOOTSTRAP_EXPANSION
+sal/rtl/rtl_process.cxx:43
+    enum (anonymous namespace)::Id::(unnamed at /home/noel/libo-plugin/sal/rtl/rtl_process.cxx:43:5) UUID_SIZE
+sal/rtl/ustring.cxx:561
     enum (anonymous namespace)::StrLifecycle CANNOT_RETURN
-sal/rtl/ustring.cxx:903
+sal/rtl/ustring.cxx:562
     enum (anonymous namespace)::StrLifecycle CAN_RETURN
-sc/inc/address.hxx:160
+sc/inc/address.hxx:172
     enum ScRefFlags BITS
-sc/inc/address.hxx:170
+sc/inc/address.hxx:182
     enum ScRefFlags TAB_ABS_3D
-sc/inc/address.hxx:172
+sc/inc/address.hxx:184
     enum ScRefFlags ADDR_ABS
-sc/inc/address.hxx:174
+sc/inc/address.hxx:186
     enum ScRefFlags RANGE_ABS
-sc/inc/address.hxx:176
+sc/inc/address.hxx:188
     enum ScRefFlags ADDR_ABS_3D
-sc/inc/address.hxx:177
+sc/inc/address.hxx:189
     enum ScRefFlags RANGE_ABS_3D
-sc/inc/address.hxx:208
+sc/inc/address.hxx:220
     enum ScAddress::Uninitialized UNINITIALIZED
-sc/inc/address.hxx:209
+sc/inc/address.hxx:221
     enum ScAddress::InitializeInvalid INITIALIZE_INVALID
-sc/inc/attrib.hxx:44
+sc/inc/attrib.hxx:43
     enum ScMF DpTable
-sc/inc/chartpos.hxx:96
+sc/inc/chartpos.hxx:94
     enum ScChartGlue Cols
-sc/inc/chartpos.hxx:98
+sc/inc/chartpos.hxx:96
     enum ScChartGlue Both
-sc/inc/chgtrack.hxx:596
+sc/inc/chgtrack.hxx:589
     enum ScChangeActionContentCellType SC_CACCT_NORMAL
-sc/inc/colorscale.hxx:191
+sc/inc/colorscale.hxx:190
     enum ScIconSetType IconSet_3Arrows
-sc/inc/colorscale.hxx:192
+sc/inc/colorscale.hxx:191
     enum ScIconSetType IconSet_3ArrowsGray
-sc/inc/colorscale.hxx:193
+sc/inc/colorscale.hxx:192
     enum ScIconSetType IconSet_3Flags
-sc/inc/colorscale.hxx:194
+sc/inc/colorscale.hxx:193
     enum ScIconSetType IconSet_3TrafficLights1
-sc/inc/colorscale.hxx:195
+sc/inc/colorscale.hxx:194
     enum ScIconSetType IconSet_3TrafficLights2
-sc/inc/colorscale.hxx:196
+sc/inc/colorscale.hxx:195
     enum ScIconSetType IconSet_3Signs
-sc/inc/colorscale.hxx:197
+sc/inc/colorscale.hxx:196
     enum ScIconSetType IconSet_3Symbols
-sc/inc/colorscale.hxx:198
+sc/inc/colorscale.hxx:197
     enum ScIconSetType IconSet_3Symbols2
-sc/inc/colorscale.hxx:203
+sc/inc/colorscale.hxx:202
     enum ScIconSetType IconSet_4Arrows
-sc/inc/colorscale.hxx:204
+sc/inc/colorscale.hxx:203
     enum ScIconSetType IconSet_4ArrowsGray
-sc/inc/colorscale.hxx:205
+sc/inc/colorscale.hxx:204
     enum ScIconSetType IconSet_4RedToBlack
-sc/inc/colorscale.hxx:206
+sc/inc/colorscale.hxx:205
     enum ScIconSetType IconSet_4Rating
-sc/inc/colorscale.hxx:207
+sc/inc/colorscale.hxx:206
     enum ScIconSetType IconSet_4TrafficLights
-sc/inc/colorscale.hxx:208
+sc/inc/colorscale.hxx:207
     enum ScIconSetType IconSet_5Arrows
-sc/inc/colorscale.hxx:209
+sc/inc/colorscale.hxx:208
     enum ScIconSetType IconSet_5ArrowsGray
-sc/inc/colorscale.hxx:210
+sc/inc/colorscale.hxx:209
     enum ScIconSetType IconSet_5Ratings
-sc/inc/colorscale.hxx:211
+sc/inc/colorscale.hxx:210
     enum ScIconSetType IconSet_5Quarters
 sc/inc/compiler.hxx:52
     enum ScCharFlags Illegal
@@ -3342,110 +3686,166 @@ sc/inc/compiler.hxx:75
     enum ScCharFlags CharName
 sc/inc/compiler.hxx:76
     enum ScCharFlags Name
-sc/inc/datastreamgettime.hxx:31
+sc/inc/datastreamgettime.hxx:30
     enum sc::DebugTime Render
-sc/inc/detfunc.hxx:46
+sc/inc/detfunc.hxx:45
     enum ScDetectiveObjType SC_DETOBJ_RECTANGLE
-sc/inc/dociter.hxx:256
-    enum ScQueryCellIterator::StopOnMismatchBits nStopOnMismatchDisabled
-sc/inc/dociter.hxx:257
-    enum ScQueryCellIterator::StopOnMismatchBits nStopOnMismatchEnabled
-sc/inc/dociter.hxx:258
-    enum ScQueryCellIterator::StopOnMismatchBits nStopOnMismatchOccurred
-sc/inc/dociter.hxx:264
-    enum ScQueryCellIterator::TestEqualConditionBits nTestEqualConditionDisabled
-sc/inc/dociter.hxx:265
-    enum ScQueryCellIterator::TestEqualConditionBits nTestEqualConditionEnabled
-sc/inc/dociter.hxx:266
-    enum ScQueryCellIterator::TestEqualConditionBits nTestEqualConditionMatched
-sc/inc/document.hxx:254
+sc/inc/document.hxx:265
     enum CommentCaptionState ALLSHOWN
-sc/inc/document.hxx:262
+sc/inc/document.hxx:273
     enum RangeNameScope SHEET
-sc/inc/document.hxx:307
+sc/inc/document.hxx:318
     enum ScMutationGuardFlags CORE
-sc/inc/document.hxx:349
+sc/inc/document.hxx:354
     enum ScDocument::HardRecalcState TEMPORARY
-sc/inc/dpglobal.hxx:47
+sc/inc/dpglobal.hxx:46
     enum ScDPValue::Type Value
-sc/inc/formulacell.hxx:172
+sc/inc/formulacell.hxx:188
     enum ScFormulaCell::CompareState EqualRelativeRef
-sc/inc/formulacell.hxx:273
+sc/inc/formulacell.hxx:286
     enum ScFormulaCell::RelNameRef SINGLE
-sc/inc/importfilterdata.hxx:34
+sc/inc/importfilterdata.hxx:33
     enum sc::ImportPostProcessData::DataStream::InsertPos InsertBottom
-sc/inc/lookupcache.hxx:56
+sc/inc/lookupcache.hxx:55
     enum ScLookupCache::QueryOp LESS_EQUAL
-sc/inc/lookupcache.hxx:57
+sc/inc/lookupcache.hxx:56
     enum ScLookupCache::QueryOp GREATER_EQUAL
-sc/inc/patattr.hxx:46
-    enum ScAutoFontColorMode SC_AUTOCOL_DISPLAY
-sc/inc/PivotTableDataSequence.hxx:35
+sc/inc/patattr.hxx:50
+    enum ScAutoFontColorMode Display
+sc/inc/PivotTableDataSequence.hxx:36
     enum sc::ValueType Empty
-sc/inc/rangenam.hxx:51
+sc/inc/queryiter.hxx:158
+    enum ScQueryCellIteratorBase::StopOnMismatchBits nStopOnMismatchEnabled
+sc/inc/queryiter.hxx:158
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchEnabled
+sc/inc/queryiter.hxx:158
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchEnabled
+sc/inc/queryiter.hxx:158
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchEnabled
+sc/inc/queryiter.hxx:158
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchEnabled
+sc/inc/queryiter.hxx:159
+    enum ScQueryCellIteratorBase::StopOnMismatchBits nStopOnMismatchOccurred
+sc/inc/queryiter.hxx:159
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchOccurred
+sc/inc/queryiter.hxx:159
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchOccurred
+sc/inc/queryiter.hxx:159
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::StopOnMismatchBits nStopOnMismatchOccurred
+sc/inc/queryiter.hxx:159
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::StopOnMismatchBits nStopOnMismatchOccurred
+sc/inc/queryiter.hxx:166
+    enum ScQueryCellIteratorBase::TestEqualConditionBits nTestEqualConditionEnabled
+sc/inc/queryiter.hxx:166
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionEnabled
+sc/inc/queryiter.hxx:166
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionEnabled
+sc/inc/queryiter.hxx:166
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionEnabled
+sc/inc/queryiter.hxx:166
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionEnabled
+sc/inc/queryiter.hxx:167
+    enum ScQueryCellIteratorBase::TestEqualConditionBits nTestEqualConditionMatched
+sc/inc/queryiter.hxx:167
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionMatched
+sc/inc/queryiter.hxx:167
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionMatched
+sc/inc/queryiter.hxx:167
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::TestEqualConditionBits nTestEqualConditionMatched
+sc/inc/queryiter.hxx:167
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::Generic>::TestEqualConditionBits nTestEqualConditionMatched
+sc/inc/queryiter.hxx:173
+    enum ScQueryCellIteratorBase::SortedBinarySearchBits nBinarySearchDisabled
+sc/inc/queryiter.hxx:173
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::Direct, ScQueryCellIteratorType::CountIf>::SortedBinarySearchBits nBinarySearchDisabled
+sc/inc/queryiter.hxx:173
+    enum ScQueryCellIteratorBase<ScQueryCellIteratorAccess::SortedCache, ScQueryCellIteratorType::CountIf>::SortedBinarySearchBits nBinarySearchDisabled
+sc/inc/rangecache.hxx:63
+    enum ScSortedRangeCache::ValueType StringsCaseInsensitive
+sc/inc/rangenam.hxx:50
     enum ScRangeData::Type Name
-sc/inc/rangenam.hxx:52
+sc/inc/rangenam.hxx:51
     enum ScRangeData::Type Database
-sc/inc/rangenam.hxx:53
+sc/inc/rangenam.hxx:52
     enum ScRangeData::Type Criteria
-sc/inc/rangenam.hxx:54
+sc/inc/rangenam.hxx:53
     enum ScRangeData::Type PrintArea
-sc/inc/rangenam.hxx:55
+sc/inc/rangenam.hxx:54
     enum ScRangeData::Type ColHeader
-sc/inc/rangenam.hxx:56
+sc/inc/rangenam.hxx:55
     enum ScRangeData::Type RowHeader
-sc/inc/sheetevents.hxx:29
+sc/inc/rangenam.hxx:59
+    enum ScRangeData::Type Hidden
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId CALCULATE
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId CHANGE
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId DOUBLECLICK
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId FOCUS
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId RIGHTCLICK
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId SELECT
-sc/inc/sheetevents.hxx:29
+sc/inc/sheetevents.hxx:28
     enum ScSheetEventId UNFOCUS
-sc/inc/stlsheet.hxx:39
+sc/inc/SolverSettings.hxx:75
+    enum sc::ConstraintOperator CO_EQUAL
+sc/inc/SolverSettings.hxx:76
+    enum sc::ConstraintOperator CO_GREATER_EQUAL
+sc/inc/SolverSettings.hxx:77
+    enum sc::ConstraintOperator CO_INTEGER
+sc/inc/SolverSettings.hxx:78
+    enum sc::ConstraintOperator CO_BINARY
+sc/inc/SolverSettings.hxx:84
+    enum sc::ConstraintPart CP_LEFT_HAND_SIDE
+sc/inc/SolverSettings.hxx:85
+    enum sc::ConstraintPart CP_OPERATOR
+sc/inc/SolverSettings.hxx:86
+    enum sc::ConstraintPart CP_RIGHT_HAND_SIDE
+sc/inc/SparklineData.hxx:35
+    enum sc::RangeOrientation Col
+sc/inc/stlsheet.hxx:38
     enum ScStyleSheet::Usage NOTUSED
-sc/inc/stringutil.hxx:58
+sc/inc/stringutil.hxx:57
     enum ScSetStringParam::TextFormatPolicy Keep
-sc/inc/tabprotection.hxx:101
+sc/inc/tabprotection.hxx:100
     enum ScDocProtection::Option STRUCTURE
-sc/inc/tabprotection.hxx:102
+sc/inc/tabprotection.hxx:101
     enum ScDocProtection::Option WINDOWS
-sc/inc/tabprotection.hxx:172
+sc/inc/tabprotection.hxx:171
     enum ScTableProtection::Option AUTOFILTER
-sc/inc/tabprotection.hxx:173
+sc/inc/tabprotection.hxx:172
     enum ScTableProtection::Option DELETE_COLUMNS
-sc/inc/tabprotection.hxx:174
+sc/inc/tabprotection.hxx:173
     enum ScTableProtection::Option DELETE_ROWS
-sc/inc/tabprotection.hxx:175
+sc/inc/tabprotection.hxx:174
     enum ScTableProtection::Option FORMAT_CELLS
-sc/inc/tabprotection.hxx:176
+sc/inc/tabprotection.hxx:175
     enum ScTableProtection::Option FORMAT_COLUMNS
-sc/inc/tabprotection.hxx:177
+sc/inc/tabprotection.hxx:176
     enum ScTableProtection::Option FORMAT_ROWS
-sc/inc/tabprotection.hxx:178
+sc/inc/tabprotection.hxx:177
     enum ScTableProtection::Option INSERT_COLUMNS
-sc/inc/tabprotection.hxx:179
+sc/inc/tabprotection.hxx:178
     enum ScTableProtection::Option INSERT_HYPERLINKS
-sc/inc/tabprotection.hxx:180
+sc/inc/tabprotection.hxx:179
     enum ScTableProtection::Option INSERT_ROWS
-sc/inc/tabprotection.hxx:181
+sc/inc/tabprotection.hxx:180
     enum ScTableProtection::Option OBJECTS
-sc/inc/tabprotection.hxx:182
+sc/inc/tabprotection.hxx:181
     enum ScTableProtection::Option PIVOT_TABLES
-sc/inc/tabprotection.hxx:183
+sc/inc/tabprotection.hxx:182
     enum ScTableProtection::Option SCENARIOS
-sc/inc/tabprotection.hxx:184
+sc/inc/tabprotection.hxx:183
     enum ScTableProtection::Option SELECT_LOCKED_CELLS
-sc/inc/tabprotection.hxx:185
+sc/inc/tabprotection.hxx:184
     enum ScTableProtection::Option SELECT_UNLOCKED_CELLS
-sc/inc/tabprotection.hxx:186
+sc/inc/tabprotection.hxx:185
     enum ScTableProtection::Option SORT
+sc/inc/typedstrdata.hxx:21
+    enum ScTypedStrData::StringType MRU
 sc/inc/typedstrdata.hxx:22
     enum ScTypedStrData::StringType Standard
 sc/inc/typedstrdata.hxx:23
@@ -3454,20 +3854,24 @@ sc/inc/typedstrdata.hxx:24
     enum ScTypedStrData::StringType DbName
 sc/inc/typedstrdata.hxx:25
     enum ScTypedStrData::StringType Header
-sc/inc/types.hxx:79
+sc/inc/types.hxx:78
     enum sc::GroupCalcState GroupCalcEnabled
-sc/inc/types.hxx:100
+sc/inc/types.hxx:99
     enum sc::MultiDataCellState::StateType Invalid
-sc/inc/userdat.hxx:35
-    enum ScDrawObjData::Type DrawingObject
-sc/inc/viewopti.hxx:33
+sc/inc/types.hxx:139
+    enum ScQueryCellIteratorType Generic
+sc/inc/types.hxx:146
+    enum ScQueryCellIteratorAccess Direct
+sc/inc/viewopti.hxx:32
     enum ScViewOption VOPT_FORMULAS
-sc/inc/viewopti.hxx:34
+sc/inc/viewopti.hxx:33
     enum ScViewOption VOPT_NULLVALS
-sc/inc/viewopti.hxx:35
+sc/inc/viewopti.hxx:34
     enum ScViewOption VOPT_SYNTAX
-sc/inc/viewopti.hxx:36
+sc/inc/viewopti.hxx:35
     enum ScViewOption VOPT_NOTES
+sc/inc/viewopti.hxx:36
+    enum ScViewOption VOPT_FORMULAS_MARKS
 sc/inc/viewopti.hxx:37
     enum ScViewOption VOPT_VSCROLL
 sc/inc/viewopti.hxx:38
@@ -3490,326 +3894,354 @@ sc/inc/viewopti.hxx:46
     enum ScViewOption VOPT_PAGEBREAKS
 sc/inc/viewopti.hxx:47
     enum ScViewOption VOPT_SUMMARY
-sc/inc/viewopti.hxx:53
+sc/inc/viewopti.hxx:49
+    enum ScViewOption VOPT_COPY_SHEET
+sc/inc/viewopti.hxx:55
     enum ScVObjType VOBJ_TYPE_OLE
-sc/inc/viewopti.hxx:54
+sc/inc/viewopti.hxx:56
     enum ScVObjType VOBJ_TYPE_CHART
-sc/inc/xmlwrap.hxx:50
+sc/inc/xmlwrap.hxx:49
     enum ImportFlags All
-sc/source/core/data/document10.cxx:647
+sc/qa/extras/scpdfexport.cxx:645
+    enum (unnamed at /home/noel/libo-plugin/sc/qa/extras/scpdfexport.cxx:642:5) Artifact
+sc/qa/extras/scpdfexport.cxx:646
+    enum (unnamed at /home/noel/libo-plugin/sc/qa/extras/scpdfexport.cxx:642:5) Tagged
+sc/source/core/data/document10.cxx:661
     enum (anonymous namespace)::MightReferenceSheet CODE
-sc/source/core/inc/refupdat.hxx:33
+sc/source/core/inc/refupdat.hxx:32
     enum ScRefUpdateRes UR_UPDATED
-sc/source/core/inc/refupdat.hxx:35
+sc/source/core/inc/refupdat.hxx:34
     enum ScRefUpdateRes UR_STICKY
-sc/source/core/opencl/op_statistical.cxx:7653
-    enum sc::opencl::(anonymous namespace)::MixDoubleString svDoubleVectorRefNULL
-sc/source/core/opencl/op_statistical.cxx:7657
-    enum sc::opencl::(anonymous namespace)::MixDoubleString svSingleVectorRefNULL
+sc/source/core/opencl/opbase.hxx:362
+    enum sc::opencl::SlidingFunctionBase::GenerateArgTypeType DoNotGenerateArgType
 sc/source/core/tool/cellkeytranslator.cxx:39
     enum (anonymous namespace)::LocaleMatch LOCALE_MATCH_LANG
 sc/source/core/tool/cellkeytranslator.cxx:40
     enum (anonymous namespace)::LocaleMatch LOCALE_MATCH_LANG_SCRIPT
 sc/source/core/tool/cellkeytranslator.cxx:41
     enum (anonymous namespace)::LocaleMatch LOCALE_MATCH_LANG_SCRIPT_COUNTRY
-sc/source/core/tool/token.cxx:2764
+sc/source/core/tool/token.cxx:2846
     enum (anonymous namespace)::ShrinkResult UNMODIFIED
 sc/source/filter/excel/xeformula.cxx:227
     enum (anonymous namespace)::XclExpFmlaClassType EXC_CLASSTYPE_ARRAY
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_DashDot
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_DashDotDot
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_Dashed
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_Dotted
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_DoubleThin
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_FineDashed
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_Last
-sc/source/filter/excel/xestyle.cxx:1614
+sc/source/filter/excel/xestyle.cxx:1620
     enum CalcLineIndex Idx_Solid
-sc/source/filter/excel/xestyle.cxx:1615
+sc/source/filter/excel/xestyle.cxx:1621
     enum ExcelWidthIndex Width_Hair
-sc/source/filter/excel/xestyle.cxx:1615
+sc/source/filter/excel/xestyle.cxx:1621
     enum ExcelWidthIndex Width_Last
-sc/source/filter/excel/xestyle.cxx:1615
+sc/source/filter/excel/xestyle.cxx:1621
     enum ExcelWidthIndex Width_Medium
-sc/source/filter/excel/xestyle.cxx:1615
+sc/source/filter/excel/xestyle.cxx:1621
     enum ExcelWidthIndex Width_Thick
-sc/source/filter/excel/xestyle.cxx:1615
+sc/source/filter/excel/xestyle.cxx:1621
     enum ExcelWidthIndex Width_Thin
-sc/source/filter/excel/xiescher.cxx:473
-    enum (anonymous at /home/noel/libo2/sc/source/filter/excel/xiescher.cxx:473:17) eCreateFromMSOCXControl
-sc/source/filter/excel/xiescher.cxx:473
-    enum (anonymous at /home/noel/libo2/sc/source/filter/excel/xiescher.cxx:473:17) eCreateFromMSTBXControl
-sc/source/filter/inc/colrowst.hxx:31
+sc/source/filter/excel/xiescher.cxx:481
+    enum (unnamed at /home/noel/libo-plugin/sc/source/filter/excel/xiescher.cxx:481:17) eCreateFromMSOCXControl
+sc/source/filter/excel/xiescher.cxx:481
+    enum (unnamed at /home/noel/libo-plugin/sc/source/filter/excel/xiescher.cxx:481:17) eCreateFromMSTBXControl
+sc/source/filter/inc/colrowst.hxx:30
     enum ExcColRowFlags Hidden
-sc/source/filter/inc/decl.h:24
+sc/source/filter/inc/decl.h:23
     enum WKTYP eWK_UNKNOWN
-sc/source/filter/inc/externallinkbuffer.hxx:149
+sc/source/filter/inc/externallinkbuffer.hxx:148
     enum oox::xls::LinkSheetRange::LinkSheetRangeType LINKSHEETRANGE_INTERNAL
 sc/source/filter/inc/formel.hxx:49
     enum FORMULA_TYPE FT_CellFormula
-sc/source/filter/inc/formulabase.hxx:371
+sc/source/filter/inc/formulabase.hxx:370
     enum oox::xls::FuncParamValidity Regular
-sc/source/filter/inc/formulabase.hxx:468
+sc/source/filter/inc/formulabase.hxx:467
     enum oox::xls::FunctionLibraryType FUNCLIB_EUROTOOL
-sc/source/filter/inc/htmlpars.hxx:224
+sc/source/filter/inc/htmlpars.hxx:230
     enum ScHTMLOrient tdRow
-sc/source/filter/inc/orcusinterface.hxx:233
+sc/source/filter/inc/orcusinterface.hxx:245
     enum ScOrcusFormula::ResultType Empty
-sc/source/filter/inc/orcusinterface.hxx:233
+sc/source/filter/inc/orcusinterface.hxx:245
     enum ScOrcusFormula::ResultType NotSet
-sc/source/filter/inc/xeextlst.hxx:22
+sc/source/filter/inc/xeextlst.hxx:21
     enum XclExpExtType XclExpExtDataBarType
-sc/source/filter/inc/xeextlst.hxx:23
+sc/source/filter/inc/xeextlst.hxx:22
     enum XclExpExtType XclExpExtDataFooType
-sc/source/filter/inc/xelink.hxx:48
+sc/source/filter/inc/xeextlst.hxx:23
+    enum XclExpExtType XclExpExtSparklineType
+sc/source/filter/inc/xelink.hxx:47
     enum ExcTabBufFlags Ignore
-sc/source/filter/inc/xelink.hxx:49
+sc/source/filter/inc/xelink.hxx:48
     enum ExcTabBufFlags Extern
-sc/source/filter/inc/xelink.hxx:50
+sc/source/filter/inc/xelink.hxx:49
     enum ExcTabBufFlags SkipMask
-sc/source/filter/inc/xelink.hxx:51
+sc/source/filter/inc/xelink.hxx:50
     enum ExcTabBufFlags Visible
-sc/source/filter/inc/xelink.hxx:52
+sc/source/filter/inc/xelink.hxx:51
     enum ExcTabBufFlags Selected
-sc/source/filter/inc/xelink.hxx:53
+sc/source/filter/inc/xelink.hxx:52
     enum ExcTabBufFlags Mirrored
-sc/source/filter/inc/xicontent.hxx:217
+sc/source/filter/inc/xicontent.hxx:216
     enum XclImpWebQuery::XclImpWebQueryMode xlWQDocument
-sc/source/filter/inc/xihelper.hxx:187
+sc/source/filter/inc/xihelper.hxx:191
     enum XclImpHFConverter::XclImpHFPortion EXC_HF_PORTION_COUNT
 sc/source/filter/inc/xistyle.hxx:644
     enum XclImpXFRangeBuffer::XclImpXFInsertMode xlXFModeCell
-sc/source/filter/inc/xlchart.hxx:1113
-    enum XclChObjectType EXC_CHOBJTYPE_BACKGROUND
 sc/source/filter/inc/xlchart.hxx:1114
+    enum XclChObjectType EXC_CHOBJTYPE_BACKGROUND
+sc/source/filter/inc/xlchart.hxx:1115
     enum XclChObjectType EXC_CHOBJTYPE_PLOTFRAME
-sc/source/filter/inc/xlchart.hxx:1117
-    enum XclChObjectType EXC_CHOBJTYPE_TEXT
 sc/source/filter/inc/xlchart.hxx:1118
+    enum XclChObjectType EXC_CHOBJTYPE_TEXT
+sc/source/filter/inc/xlchart.hxx:1119
     enum XclChObjectType EXC_CHOBJTYPE_LEGEND
-sc/source/filter/inc/xlchart.hxx:1121
-    enum XclChObjectType EXC_CHOBJTYPE_AXISLINE
 sc/source/filter/inc/xlchart.hxx:1122
-    enum XclChObjectType EXC_CHOBJTYPE_GRIDLINE
+    enum XclChObjectType EXC_CHOBJTYPE_AXISLINE
 sc/source/filter/inc/xlchart.hxx:1123
-    enum XclChObjectType EXC_CHOBJTYPE_TRENDLINE
+    enum XclChObjectType EXC_CHOBJTYPE_GRIDLINE
 sc/source/filter/inc/xlchart.hxx:1124
-    enum XclChObjectType EXC_CHOBJTYPE_ERRORBAR
+    enum XclChObjectType EXC_CHOBJTYPE_TRENDLINE
 sc/source/filter/inc/xlchart.hxx:1125
-    enum XclChObjectType EXC_CHOBJTYPE_CONNECTLINE
+    enum XclChObjectType EXC_CHOBJTYPE_ERRORBAR
 sc/source/filter/inc/xlchart.hxx:1126
-    enum XclChObjectType EXC_CHOBJTYPE_HILOLINE
+    enum XclChObjectType EXC_CHOBJTYPE_CONNECTLINE
 sc/source/filter/inc/xlchart.hxx:1127
-    enum XclChObjectType EXC_CHOBJTYPE_WHITEDROPBAR
+    enum XclChObjectType EXC_CHOBJTYPE_HILOLINE
 sc/source/filter/inc/xlchart.hxx:1128
+    enum XclChObjectType EXC_CHOBJTYPE_WHITEDROPBAR
+sc/source/filter/inc/xlchart.hxx:1129
     enum XclChObjectType EXC_CHOBJTYPE_BLACKDROPBAR
-sc/source/filter/inc/xlchart.hxx:1171
-    enum XclChTypeId EXC_CHTYPEID_BAR
 sc/source/filter/inc/xlchart.hxx:1172
-    enum XclChTypeId EXC_CHTYPEID_HORBAR
+    enum XclChTypeId EXC_CHTYPEID_BAR
 sc/source/filter/inc/xlchart.hxx:1173
-    enum XclChTypeId EXC_CHTYPEID_LINE
+    enum XclChTypeId EXC_CHTYPEID_HORBAR
 sc/source/filter/inc/xlchart.hxx:1174
+    enum XclChTypeId EXC_CHTYPEID_LINE
+sc/source/filter/inc/xlchart.hxx:1175
     enum XclChTypeId EXC_CHTYPEID_AREA
-sc/source/filter/inc/xlchart.hxx:1176
-    enum XclChTypeId EXC_CHTYPEID_RADARLINE
 sc/source/filter/inc/xlchart.hxx:1177
-    enum XclChTypeId EXC_CHTYPEID_RADARAREA
+    enum XclChTypeId EXC_CHTYPEID_RADARLINE
 sc/source/filter/inc/xlchart.hxx:1178
+    enum XclChTypeId EXC_CHTYPEID_RADARAREA
+sc/source/filter/inc/xlchart.hxx:1179
     enum XclChTypeId EXC_CHTYPEID_PIE
-sc/source/filter/inc/xlchart.hxx:1181
+sc/source/filter/inc/xlchart.hxx:1182
     enum XclChTypeId EXC_CHTYPEID_SCATTER
-sc/source/filter/inc/xlchart.hxx:1195
+sc/source/filter/inc/xlchart.hxx:1196
     enum XclChTypeCateg EXC_CHTYPECATEG_SURFACE
-sc/source/filter/inc/xlescher.hxx:408
+sc/source/filter/inc/xlescher.hxx:407
     enum XclTbxEventType EXC_TBX_EVENT_ACTION
-sc/source/filter/inc/xlescher.hxx:409
+sc/source/filter/inc/xlescher.hxx:408
     enum XclTbxEventType EXC_TBX_EVENT_MOUSE
-sc/source/filter/inc/xlescher.hxx:410
+sc/source/filter/inc/xlescher.hxx:409
     enum XclTbxEventType EXC_TBX_EVENT_TEXT
-sc/source/filter/inc/xlescher.hxx:411
+sc/source/filter/inc/xlescher.hxx:410
     enum XclTbxEventType EXC_TBX_EVENT_VALUE
-sc/source/filter/inc/xlescher.hxx:412
+sc/source/filter/inc/xlescher.hxx:411
     enum XclTbxEventType EXC_TBX_EVENT_CHANGE
-sc/source/filter/inc/xlformula.hxx:166
+sc/source/filter/inc/xlformula.hxx:165
     enum XclFormulaType EXC_FMLATYPE_DATAVAL
-sc/source/filter/inc/xlformula.hxx:167
+sc/source/filter/inc/xlformula.hxx:166
     enum XclFormulaType EXC_FMLATYPE_NAME
-sc/source/filter/inc/xlformula.hxx:169
+sc/source/filter/inc/xlformula.hxx:168
     enum XclFormulaType EXC_FMLATYPE_CONTROL
-sc/source/filter/inc/xlformula.hxx:170
+sc/source/filter/inc/xlformula.hxx:169
     enum XclFormulaType EXC_FMLATYPE_WQUERY
-sc/source/filter/inc/xlformula.hxx:171
+sc/source/filter/inc/xlformula.hxx:170
     enum XclFormulaType EXC_FMLATYPE_LISTVAL
-sc/source/filter/inc/xlformula.hxx:180
+sc/source/filter/inc/xlformula.hxx:179
     enum XclFuncParamValidity EXC_PARAM_REGULAR
-sc/source/filter/inc/xlstyle.hxx:391
+sc/source/filter/inc/xlstyle.hxx:390
     enum XclFontItemType Editeng
-sc/source/filter/oox/formulabase.cxx:62
+sc/source/filter/oox/formulabase.cxx:65
     enum (anonymous namespace)::FuncFlags MACROCALL_NEW
 sc/source/filter/oox/pagesettings.cxx:354
     enum oox::xls::(anonymous namespace)::HFPortionId HF_COUNT
 sc/source/filter/oox/revisionfragment.cxx:44
     enum oox::xls::(anonymous namespace)::RevisionType REV_UNKNOWN
-sc/source/filter/xml/XMLConverter.hxx:102
+sc/source/filter/xml/XMLConverter.hxx:96
     enum ScXMLConditionToken XML_COND_INVALID
-sc/source/ui/dbgui/scuiasciiopt.cxx:58
+sc/source/ui/dbgui/scuiasciiopt.cxx:73
     enum (anonymous namespace)::CSVImportOptionsIndex CSVIO_Text2ColSkipEmptyCells
-sc/source/ui/inc/AccessibleEditObject.hxx:52
+sc/source/ui/inc/AccessibleEditObject.hxx:51
     enum ScAccessibleEditObject::EditObjectType EditLine
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) UNKNOWN_SLOTID
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl<class SfxModelessDialogController, true>::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) UNKNOWN_SLOTID
-sc/source/ui/inc/anyrefdg.hxx:143
-    enum ScRefHdlrControllerImpl<class SfxTabDialogController, false>::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:143:5) UNKNOWN_SLOTID
-sc/source/ui/inc/checklistmenu.hxx:32
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) UNKNOWN_SLOTID
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl<class SfxModelessDialogController>::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) UNKNOWN_SLOTID
+sc/source/ui/inc/anyrefdg.hxx:142
+    enum ScRefHdlrControllerImpl<class SfxTabDialogController, false>::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/anyrefdg.hxx:142:5) UNKNOWN_SLOTID
+sc/source/ui/inc/checklistmenu.hxx:30
     enum ScCheckListMember::DatePartType YEAR
-sc/source/ui/inc/checklistmenu.hxx:33
+sc/source/ui/inc/checklistmenu.hxx:31
     enum ScCheckListMember::DatePartType MONTH
-sc/source/ui/inc/csvcontrol.hxx:93
+sc/source/ui/inc/csvcontrol.hxx:92
     enum ScCsvDiff HeaderWidth
-sc/source/ui/inc/csvcontrol.hxx:94
+sc/source/ui/inc/csvcontrol.hxx:93
     enum ScCsvDiff CharWidth
-sc/source/ui/inc/csvcontrol.hxx:95
+sc/source/ui/inc/csvcontrol.hxx:94
     enum ScCsvDiff LineCount
-sc/source/ui/inc/csvcontrol.hxx:97
+sc/source/ui/inc/csvcontrol.hxx:96
     enum ScCsvDiff HeaderHeight
-sc/source/ui/inc/csvcontrol.hxx:98
+sc/source/ui/inc/csvcontrol.hxx:97
     enum ScCsvDiff LineHeight
-sc/source/ui/inc/csvcontrol.hxx:100
+sc/source/ui/inc/csvcontrol.hxx:99
     enum ScCsvDiff GridCursor
-sc/source/ui/inc/csvcontrol.hxx:103
+sc/source/ui/inc/csvcontrol.hxx:102
     enum ScCsvDiff VerticalMask
-sc/source/ui/inc/datastream.hxx:66
-    enum sc::DataStream::(anonymous at /home/noel/libo2/sc/source/ui/inc/datastream.hxx:66:5) VALUES_IN_LINE
-sc/source/ui/inc/olinewin.hxx:29
+sc/source/ui/inc/datatransformation.hxx:34
+    enum sc::TransformationType FINDREPLACE_TRANSFORMATION
+sc/source/ui/inc/datatransformation.hxx:35
+    enum sc::TransformationType DELETEROW_TRANSFORMATION
+sc/source/ui/inc/datatransformation.hxx:36
+    enum sc::TransformationType SWAPROWS_TRANSFORMATION
+sc/source/ui/inc/olinewin.hxx:28
     enum ScOutlineMode SC_OUTLINE_VER
+sc/source/ui/inc/pfuncache.hxx:35
+    enum ScPrintSelectionMode Invalid
 sc/source/ui/inc/pfuncache.hxx:36
-    enum ScPrintSelectionMode SC_PRINTSEL_INVALID
+    enum ScPrintSelectionMode Document
 sc/source/ui/inc/pfuncache.hxx:37
-    enum ScPrintSelectionMode SC_PRINTSEL_DOCUMENT
-sc/source/ui/inc/pfuncache.hxx:38
-    enum ScPrintSelectionMode SC_PRINTSEL_CURSOR
-sc/source/ui/inc/PivotLayoutTreeListBase.hxx:39
+    enum ScPrintSelectionMode Cursor
+sc/source/ui/inc/PivotLayoutTreeListBase.hxx:38
     enum ScPivotLayoutTreeListBase::SvPivotTreeListType UNDEFINED
-sc/source/ui/inc/selectionstate.hxx:31
+sc/source/ui/inc/selectionstate.hxx:30
     enum ScSelectionType SC_SELECTTYPE_EDITCELL
-sc/source/ui/inc/StatisticsInputOutputDialog.hxx:23
+sc/source/ui/inc/StatisticsInputOutputDialog.hxx:22
     enum ScStatisticsInputOutputDialog::GroupedBy BY_ROW
-sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:23
+sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:22
     enum ScStatisticsTwoVariableDialog::GroupedBy BY_ROW
-sc/source/ui/inc/tabview.hxx:120
+sc/source/ui/inc/tabview.hxx:119
     enum ScTabView::BlockMode Normal
-sc/source/ui/inc/undobase.hxx:76
+sc/source/ui/inc/undobase.hxx:78
     enum ScBlockUndoMode SC_UNDO_MANUALHEIGHT
-sc/source/ui/inc/undobase.hxx:76
+sc/source/ui/inc/undobase.hxx:78
     enum ScBlockUndoMode SC_UNDO_SIMPLE
-sc/source/ui/inc/validate.hxx:222
-    enum ScValidationDlg::(anonymous at /home/noel/libo2/sc/source/ui/inc/validate.hxx:222:5) SLOTID
-sc/source/ui/inc/viewdata.hxx:67
+sc/source/ui/inc/validate.hxx:223
+    enum ScValidationDlg::(unnamed at /home/noel/libo-plugin/sc/source/ui/inc/validate.hxx:223:5) SLOTID
+sc/source/ui/inc/viewdata.hxx:66
     enum ScMarkType SC_MARK_FILTERED
-sc/source/ui/inc/viewdata.hxx:93
+sc/source/ui/inc/viewdata.hxx:92
     enum ScDragSrc Undefined
-sc/source/ui/pagedlg/areasdlg.cxx:41
-    enum (anonymous at /home/noel/libo2/sc/source/ui/pagedlg/areasdlg.cxx:39:1) SC_AREASDLG_PR_USER
 sc/source/ui/pagedlg/areasdlg.cxx:42
-    enum (anonymous at /home/noel/libo2/sc/source/ui/pagedlg/areasdlg.cxx:39:1) SC_AREASDLG_PR_SELECT
-sc/source/ui/pagedlg/areasdlg.cxx:48
-    enum (anonymous at /home/noel/libo2/sc/source/ui/pagedlg/areasdlg.cxx:46:1) SC_AREASDLG_RR_USER
+    enum (unnamed at /home/noel/libo-plugin/sc/source/ui/pagedlg/areasdlg.cxx:40:1) SC_AREASDLG_PR_USER
+sc/source/ui/pagedlg/areasdlg.cxx:43
+    enum (unnamed at /home/noel/libo-plugin/sc/source/ui/pagedlg/areasdlg.cxx:40:1) SC_AREASDLG_PR_SELECT
 sc/source/ui/pagedlg/areasdlg.cxx:49
-    enum (anonymous at /home/noel/libo2/sc/source/ui/pagedlg/areasdlg.cxx:46:1) SC_AREASDLG_RR_OFFSET
-sc/source/ui/unoobj/cellsuno.cxx:9103
+    enum (unnamed at /home/noel/libo-plugin/sc/source/ui/pagedlg/areasdlg.cxx:47:1) SC_AREASDLG_RR_USER
+sc/source/ui/pagedlg/areasdlg.cxx:50
+    enum (unnamed at /home/noel/libo-plugin/sc/source/ui/pagedlg/areasdlg.cxx:47:1) SC_AREASDLG_RR_OFFSET
+sc/source/ui/unoobj/cellsuno.cxx:9018
     enum (anonymous namespace)::ScUniqueFormatsEntry::EntryState STATE_COMPLEX
-sc/source/ui/unoobj/chart2uno.cxx:449
+sc/source/ui/unoobj/chart2uno.cxx:448
     enum (anonymous namespace)::Chart2Positioner::GlueType GLUETYPE_COLS
-sc/source/ui/unoobj/chart2uno.cxx:450
+sc/source/ui/unoobj/chart2uno.cxx:449
     enum (anonymous namespace)::Chart2Positioner::GlueType GLUETYPE_ROWS
-sc/source/ui/unoobj/chart2uno.cxx:451
+sc/source/ui/unoobj/chart2uno.cxx:450
     enum (anonymous namespace)::Chart2Positioner::GlueType GLUETYPE_BOTH
-sc/source/ui/unoobj/chart2uno.cxx:601
+sc/source/ui/unoobj/chart2uno.cxx:607
     enum (anonymous namespace)::State Glue
-sc/source/ui/unoobj/fielduno.cxx:155
+sc/source/ui/unoobj/fielduno.cxx:148
     enum (anonymous namespace)::ScUnoCollectMode SC_UNO_COLLECT_COUNT
-sc/source/ui/view/prevloc.cxx:37
-    enum (anonymous namespace)::ScPreviewLocationType SC_PLOC_NOTEMARK
+sc/source/ui/vba/vbarange.hxx:72
+    enum RangeValueType value2
 sc/source/ui/view/prevloc.cxx:38
+    enum (anonymous namespace)::ScPreviewLocationType SC_PLOC_NOTEMARK
+sc/source/ui/view/prevloc.cxx:39
     enum (anonymous namespace)::ScPreviewLocationType SC_PLOC_NOTETEXT
-sc/source/ui/view/tabview3.cxx:1463
-    enum (anonymous at /home/noel/libo2/sc/source/ui/view/tabview3.cxx:1463:5) MOD_BOTH
-sc/source/ui/view/viewfun2.cxx:254
+sc/source/ui/view/tabview3.cxx:1502
+    enum (unnamed at /home/noel/libo-plugin/sc/source/ui/view/tabview3.cxx:1502:5) MOD_BOTH
+sc/source/ui/view/viewfun2.cxx:257
     enum (anonymous namespace)::ScAutoSum ScAutoSumAverage
-sc/source/ui/view/viewfun2.cxx:255
+sc/source/ui/view/viewfun2.cxx:258
     enum (anonymous namespace)::ScAutoSum ScAutoSumMax
-sc/source/ui/view/viewfun2.cxx:256
+sc/source/ui/view/viewfun2.cxx:259
     enum (anonymous namespace)::ScAutoSum ScAutoSumMin
-scaddins/source/analysis/analysishelper.hxx:494
+sc/source/ui/view/viewfun2.cxx:260
+    enum (anonymous namespace)::ScAutoSum ScAutoSumCount
+sc/source/ui/view/viewfun2.cxx:261
+    enum (anonymous namespace)::ScAutoSum ScAutoSumCountA
+sc/source/ui/view/viewfun2.cxx:262
+    enum (anonymous namespace)::ScAutoSum ScAutoSumProduct
+sc/source/ui/view/viewfun2.cxx:263
+    enum (anonymous namespace)::ScAutoSum ScAutoSumStDev
+sc/source/ui/view/viewfun2.cxx:264
+    enum (anonymous namespace)::ScAutoSum ScAutoSumStDevP
+sc/source/ui/view/viewfun2.cxx:265
+    enum (anonymous namespace)::ScAutoSum ScAutoSumVar
+sc/source/ui/view/viewfun2.cxx:266
+    enum (anonymous namespace)::ScAutoSum ScAutoSumVarP
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Energy
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Force
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Length
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Magnetism
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Mass
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Power
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Pressure
-scaddins/source/analysis/analysishelper.hxx:494
+scaddins/source/analysis/analysishelper.hxx:490
     enum sca::analysis::ConvertDataClass CDC_Time
-scaddins/source/analysis/analysishelper.hxx:495
+scaddins/source/analysis/analysishelper.hxx:491
     enum sca::analysis::ConvertDataClass CDC_Area
-scaddins/source/analysis/analysishelper.hxx:495
+scaddins/source/analysis/analysishelper.hxx:491
     enum sca::analysis::ConvertDataClass CDC_Speed
-scaddins/source/analysis/analysishelper.hxx:495
+scaddins/source/analysis/analysishelper.hxx:491
     enum sca::analysis::ConvertDataClass CDC_Temperature
-scaddins/source/analysis/analysishelper.hxx:495
+scaddins/source/analysis/analysishelper.hxx:491
     enum sca::analysis::ConvertDataClass CDC_Volume
-sd/inc/diadef.h:27
+sd/inc/diadef.h:26
     enum PresChange SemiAuto
-sd/inc/sdenumdef.hxx:29
+sd/inc/sdenumdef.hxx:28
     enum SnapKind Point
-sd/inc/sdmod.hxx:54
+sd/inc/sdmod.hxx:56
     enum SdOptionStreamMode Load
-sd/inc/sdxmlwrp.hxx:31
+sd/inc/sdxmlwrp.hxx:30
     enum SdXMLFilterMode Normal
-sd/source/filter/eppt/pptx-epptooxml.cxx:136
-    enum (anonymous namespace)::PPTXLayout LAYOUT_BLANK
-sd/source/filter/eppt/pptx-epptooxml.cxx:137
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_SLIDE
-sd/source/filter/eppt/pptx-epptooxml.cxx:138
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:139
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_2CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:140
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE
-sd/source/filter/eppt/pptx-epptooxml.cxx:141
-    enum (anonymous namespace)::PPTXLayout LAYOUT_CENTERED_TEXT
-sd/source/filter/eppt/pptx-epptooxml.cxx:142
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_2CONTENT_CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:143
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_CONTENT_2CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:144
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_2CONTENT_OVER_CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:145
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_CONTENT_OVER_CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:146
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_4CONTENT
-sd/source/filter/eppt/pptx-epptooxml.cxx:147
-    enum (anonymous namespace)::PPTXLayout LAYOUT_TITLE_6CONTENT
+sd/source/console/PresenterBitmapContainer.hxx:66
+    enum sdext::presenter::PresenterBitmapContainer::BitmapDescriptor::TexturingMode Once
+sd/source/console/PresenterConfigurationAccess.hxx:51
+    enum sdext::presenter::PresenterConfigurationAccess::WriteMode READ_WRITE
+sd/source/console/PresenterPaneBorderPainter.cxx:81
+    enum sdext::presenter::(anonymous namespace)::RendererPaneStyle::Anchor Center
+sd/source/console/PresenterScrollBar.hxx:145
+    enum sdext::presenter::PresenterScrollBar::Area Pager
+sd/source/console/PresenterScrollBar.hxx:145
+    enum sdext::presenter::PresenterScrollBar::Area Total
+sd/source/console/PresenterWindowManager.hxx:88
+    enum sdext::presenter::PresenterWindowManager::LayoutMode LM_Generic
+sd/source/ui/dlg/present.cxx:43
+    enum (anonymous namespace)::PresenterConsoleMode Windowed
 sd/source/ui/inc/DrawController.hxx:94
     enum sd::DrawController::PropertyHandle PROPERTY_UPDATEACC
 sd/source/ui/inc/DrawController.hxx:95
     enum sd::DrawController::PropertyHandle PROPERTY_PAGE_CHANGE
+sd/source/ui/inc/TableDesignPane.hxx:42
+    enum sd::TableCheckBox CB_HEADER_ROW
+sd/source/ui/inc/TableDesignPane.hxx:43
+    enum sd::TableCheckBox CB_TOTAL_ROW
+sd/source/ui/inc/TableDesignPane.hxx:44
+    enum sd::TableCheckBox CB_BANDED_ROWS
+sd/source/ui/inc/TableDesignPane.hxx:45
+    enum sd::TableCheckBox CB_FIRST_COLUMN
+sd/source/ui/inc/TableDesignPane.hxx:46
+    enum sd::TableCheckBox CB_LAST_COLUMN
+sd/source/ui/inc/TableDesignPane.hxx:48
+    enum sd::TableCheckBox CB_COUNT
 sd/source/ui/inc/ToolBarManager.hxx:131
     enum sd::ToolBarManager::ToolBarGroup Permanent
 sd/source/ui/inc/ToolBarManager.hxx:132
@@ -3818,252 +4250,166 @@ sd/source/ui/inc/ToolBarManager.hxx:133
     enum sd::ToolBarManager::ToolBarGroup CommonTask
 sd/source/ui/inc/ToolBarManager.hxx:134
     enum sd::ToolBarManager::ToolBarGroup MasterMode
-sd/source/ui/inc/tools/ConfigurationAccess.hxx:44
+sd/source/ui/inc/tools/ConfigurationAccess.hxx:43
     enum sd::tools::ConfigurationAccess::WriteMode READ_WRITE
-sd/source/ui/inc/tools/IdleDetection.hxx:35
+sd/source/ui/inc/tools/IdleDetection.hxx:34
     enum sd::tools::IdleState SystemEventPending
-sd/source/ui/inc/tools/IdleDetection.hxx:45
+sd/source/ui/inc/tools/IdleDetection.hxx:44
     enum sd::tools::IdleState WindowShowActive
-sd/source/ui/inc/tools/IdleDetection.hxx:49
+sd/source/ui/inc/tools/IdleDetection.hxx:48
     enum sd::tools::IdleState WindowPainting
-sd/source/ui/remotecontrol/BluetoothServer.cxx:97
+sd/source/ui/remotecontrol/BluetoothServer.cxx:100
     enum sd::BluetoothServer::Impl::BluezVersion BLUEZ4
-sd/source/ui/remotecontrol/BluetoothServer.hxx:48
-    enum sd::BluetoothServer::(anonymous at /home/noel/libo2/sd/source/ui/remotecontrol/BluetoothServer.hxx:48:9) DISCOVERABLE
-sd/source/ui/sidebar/MasterPageContainer.cxx:120
+sd/source/ui/remotecontrol/BluetoothServer.hxx:47
+    enum sd::BluetoothServer::(unnamed at /home/noel/libo-plugin/sd/source/ui/remotecontrol/BluetoothServer.hxx:47:9) DISCOVERABLE
+sd/source/ui/sidebar/MasterPageContainer.cxx:121
     enum sd::sidebar::MasterPageContainer::Implementation::InitializationState Initialized
-sd/source/ui/sidebar/MasterPageContainer.cxx:120
+sd/source/ui/sidebar/MasterPageContainer.cxx:121
     enum sd::sidebar::MasterPageContainer::Implementation::InitializationState Initializing
-sd/source/ui/sidebar/MasterPageContainer.hxx:64
+sd/source/ui/sidebar/MasterPageContainer.hxx:63
     enum sd::sidebar::MasterPageContainer::PreviewSize LARGE
-sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:34
+sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:33
     enum sd::slidesorter::cache::RequestPriorityClass VISIBLE_NO_PREVIEW
-sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:36
+sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx:35
     enum sd::slidesorter::cache::RequestPriorityClass VISIBLE_OUTDATED_PREVIEW
-sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:46
+sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:45
     enum sd::slidesorter::controller::Animator::AnimationMode AM_Immediate
-sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx:46
+sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx:45
     enum sd::slidesorter::controller::InsertionIndicatorHandler::Mode MoveMode
-sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx:80
+sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx:79
     enum sd::slidesorter::view::PageObjectLayouter::CoordinateSystem ModelCoordinateSystem
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:70
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:69
     enum sd::slidesorter::view::Theme::ColorType ColorType_Size_
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:75
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:74
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_NormalPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:76
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:75
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_SelectedPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:77
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:76
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_SelectedAndFocusedPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:78
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:77
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_MouseOverPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:79
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:78
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_MouseOverSelected
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:80
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:79
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_MouseOverSelectedAndFocusedPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:81
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:80
     enum sd::slidesorter::view::Theme::GradientColorType Gradient_FocusedPage
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:82
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:81
     enum sd::slidesorter::view::Theme::GradientColorType GradientColorType_Size_
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:105
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:104
     enum sd::slidesorter::view::Theme::IconType Icon_RawShadow
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:106
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:105
     enum sd::slidesorter::view::Theme::IconType Icon_RawInsertShadow
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:107
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:106
     enum sd::slidesorter::view::Theme::IconType Icon_HideSlideOverlay
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:108
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:107
     enum sd::slidesorter::view::Theme::IconType Icon_FocusBorder
-sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:109
+sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:108
     enum sd::slidesorter::view::Theme::IconType IconType_Size_
-sd/source/ui/table/TableDesignPane.hxx:42
-    enum sd::TableCheckBox CB_HEADER_ROW
-sd/source/ui/table/TableDesignPane.hxx:43
-    enum sd::TableCheckBox CB_TOTAL_ROW
-sd/source/ui/table/TableDesignPane.hxx:44
-    enum sd::TableCheckBox CB_BANDED_ROWS
-sd/source/ui/table/TableDesignPane.hxx:45
-    enum sd::TableCheckBox CB_FIRST_COLUMN
-sd/source/ui/table/TableDesignPane.hxx:46
-    enum sd::TableCheckBox CB_LAST_COLUMN
-sd/source/ui/table/TableDesignPane.hxx:48
-    enum sd::TableCheckBox CB_COUNT
-sdext/source/minimizer/pppoptimizertoken.hxx:50
+sdext/source/minimizer/pppoptimizertoken.hxx:27
+    enum PPPOptimizerTokenEnum TK_btnNavFinish
+sdext/source/minimizer/pppoptimizertoken.hxx:30
     enum PPPOptimizerTokenEnum TK_FileSizeDestination
-sdext/source/minimizer/pppoptimizertoken.hxx:51
+sdext/source/minimizer/pppoptimizertoken.hxx:31
     enum PPPOptimizerTokenEnum TK_FileSizeSource
-sdext/source/minimizer/pppoptimizertoken.hxx:56
+sdext/source/minimizer/pppoptimizertoken.hxx:37
     enum PPPOptimizerTokenEnum TK_Progress
-sdext/source/minimizer/pppoptimizertoken.hxx:78
+sdext/source/minimizer/pppoptimizertoken.hxx:59
     enum PPPOptimizerTokenEnum TK_Status
-sdext/source/minimizer/pppoptimizertoken.hxx:79
+sdext/source/minimizer/pppoptimizertoken.hxx:60
     enum PPPOptimizerTokenEnum TK_Pages
-sdext/source/minimizer/pppoptimizertoken.hxx:81
+sdext/source/minimizer/pppoptimizertoken.hxx:62
     enum PPPOptimizerTokenEnum STR_SUN_OPTIMIZATION_WIZARD2
-sdext/source/minimizer/pppoptimizertoken.hxx:82
-    enum PPPOptimizerTokenEnum STR_STEPS
-sdext/source/minimizer/pppoptimizertoken.hxx:83
-    enum PPPOptimizerTokenEnum STR_BACK
-sdext/source/minimizer/pppoptimizertoken.hxx:84
-    enum PPPOptimizerTokenEnum STR_NEXT
-sdext/source/minimizer/pppoptimizertoken.hxx:85
-    enum PPPOptimizerTokenEnum STR_FINISH
-sdext/source/minimizer/pppoptimizertoken.hxx:86
-    enum PPPOptimizerTokenEnum STR_CANCEL
-sdext/source/minimizer/pppoptimizertoken.hxx:87
+sdext/source/minimizer/pppoptimizertoken.hxx:63
     enum PPPOptimizerTokenEnum STR_INTRODUCTION
-sdext/source/minimizer/pppoptimizertoken.hxx:88
-    enum PPPOptimizerTokenEnum STR_INTRODUCTION_T
-sdext/source/minimizer/pppoptimizertoken.hxx:89
-    enum PPPOptimizerTokenEnum STR_CHOSE_SETTINGS
-sdext/source/minimizer/pppoptimizertoken.hxx:90
-    enum PPPOptimizerTokenEnum STR_REMOVE
-sdext/source/minimizer/pppoptimizertoken.hxx:91
-    enum PPPOptimizerTokenEnum STR_GRAPHIC_OPTIMIZATION
-sdext/source/minimizer/pppoptimizertoken.hxx:92
+sdext/source/minimizer/pppoptimizertoken.hxx:64
     enum PPPOptimizerTokenEnum STR_IMAGE_OPTIMIZATION
-sdext/source/minimizer/pppoptimizertoken.hxx:93
-    enum PPPOptimizerTokenEnum STR_LOSSLESS_COMPRESSION
-sdext/source/minimizer/pppoptimizertoken.hxx:94
-    enum PPPOptimizerTokenEnum STR_JPEG_COMPRESSION
-sdext/source/minimizer/pppoptimizertoken.hxx:95
-    enum PPPOptimizerTokenEnum STR_QUALITY
-sdext/source/minimizer/pppoptimizertoken.hxx:96
-    enum PPPOptimizerTokenEnum STR_REMOVE_CROP_AREA
-sdext/source/minimizer/pppoptimizertoken.hxx:97
-    enum PPPOptimizerTokenEnum STR_IMAGE_RESOLUTION
-sdext/source/minimizer/pppoptimizertoken.hxx:98
-    enum PPPOptimizerTokenEnum STR_IMAGE_RESOLUTION_0
-sdext/source/minimizer/pppoptimizertoken.hxx:99
-    enum PPPOptimizerTokenEnum STR_IMAGE_RESOLUTION_1
-sdext/source/minimizer/pppoptimizertoken.hxx:100
-    enum PPPOptimizerTokenEnum STR_IMAGE_RESOLUTION_2
-sdext/source/minimizer/pppoptimizertoken.hxx:102
-    enum PPPOptimizerTokenEnum STR_EMBED_LINKED_GRAPHICS
-sdext/source/minimizer/pppoptimizertoken.hxx:103
+sdext/source/minimizer/pppoptimizertoken.hxx:65
     enum PPPOptimizerTokenEnum STR_OLE_OBJECTS
-sdext/source/minimizer/pppoptimizertoken.hxx:104
-    enum PPPOptimizerTokenEnum STR_OLE_OPTIMIZATION
-sdext/source/minimizer/pppoptimizertoken.hxx:105
-    enum PPPOptimizerTokenEnum STR_OLE_REPLACE
-sdext/source/minimizer/pppoptimizertoken.hxx:106
-    enum PPPOptimizerTokenEnum STR_ALL_OLE_OBJECTS
-sdext/source/minimizer/pppoptimizertoken.hxx:107
-    enum PPPOptimizerTokenEnum STR_ALIEN_OLE_OBJECTS_ONLY
-sdext/source/minimizer/pppoptimizertoken.hxx:108
+sdext/source/minimizer/pppoptimizertoken.hxx:66
     enum PPPOptimizerTokenEnum STR_OLE_OBJECTS_DESC
-sdext/source/minimizer/pppoptimizertoken.hxx:109
+sdext/source/minimizer/pppoptimizertoken.hxx:67
     enum PPPOptimizerTokenEnum STR_NO_OLE_OBJECTS_DESC
-sdext/source/minimizer/pppoptimizertoken.hxx:110
+sdext/source/minimizer/pppoptimizertoken.hxx:68
     enum PPPOptimizerTokenEnum STR_SLIDES
-sdext/source/minimizer/pppoptimizertoken.hxx:111
-    enum PPPOptimizerTokenEnum STR_CHOOSE_SLIDES
-sdext/source/minimizer/pppoptimizertoken.hxx:112
-    enum PPPOptimizerTokenEnum STR_DELETE_MASTER_PAGES
-sdext/source/minimizer/pppoptimizertoken.hxx:113
-    enum PPPOptimizerTokenEnum STR_DELETE_NOTES_PAGES
-sdext/source/minimizer/pppoptimizertoken.hxx:114
-    enum PPPOptimizerTokenEnum STR_DELETE_HIDDEN_SLIDES
-sdext/source/minimizer/pppoptimizertoken.hxx:115
-    enum PPPOptimizerTokenEnum STR_CUSTOM_SHOW
-sdext/source/minimizer/pppoptimizertoken.hxx:116
+sdext/source/minimizer/pppoptimizertoken.hxx:69
     enum PPPOptimizerTokenEnum STR_SUMMARY
-sdext/source/minimizer/pppoptimizertoken.hxx:117
-    enum PPPOptimizerTokenEnum STR_SUMMARY_TITLE
-sdext/source/minimizer/pppoptimizertoken.hxx:118
-    enum PPPOptimizerTokenEnum STR_APPLY_TO_CURRENT
-sdext/source/minimizer/pppoptimizertoken.hxx:119
-    enum PPPOptimizerTokenEnum STR_AUTOMATICALLY_OPEN
-sdext/source/minimizer/pppoptimizertoken.hxx:120
-    enum PPPOptimizerTokenEnum STR_SAVE_SETTINGS
-sdext/source/minimizer/pppoptimizertoken.hxx:121
-    enum PPPOptimizerTokenEnum STR_SAVE_AS
-sdext/source/minimizer/pppoptimizertoken.hxx:122
+sdext/source/minimizer/pppoptimizertoken.hxx:70
     enum PPPOptimizerTokenEnum STR_DELETE_SLIDES
-sdext/source/minimizer/pppoptimizertoken.hxx:123
+sdext/source/minimizer/pppoptimizertoken.hxx:71
     enum PPPOptimizerTokenEnum STR_OPTIMIZE_IMAGES
-sdext/source/minimizer/pppoptimizertoken.hxx:124
+sdext/source/minimizer/pppoptimizertoken.hxx:72
     enum PPPOptimizerTokenEnum STR_CREATE_REPLACEMENT
-sdext/source/minimizer/pppoptimizertoken.hxx:125
-    enum PPPOptimizerTokenEnum STR_CURRENT_FILESIZE
-sdext/source/minimizer/pppoptimizertoken.hxx:126
-    enum PPPOptimizerTokenEnum STR_ESTIMATED_FILESIZE
-sdext/source/minimizer/pppoptimizertoken.hxx:127
+sdext/source/minimizer/pppoptimizertoken.hxx:73
     enum PPPOptimizerTokenEnum STR_MY_SETTINGS
-sdext/source/minimizer/pppoptimizertoken.hxx:128
+sdext/source/minimizer/pppoptimizertoken.hxx:74
     enum PPPOptimizerTokenEnum STR_OK
-sdext/source/minimizer/pppoptimizertoken.hxx:129
-    enum PPPOptimizerTokenEnum STR_INFO_1
-sdext/source/minimizer/pppoptimizertoken.hxx:130
-    enum PPPOptimizerTokenEnum STR_INFO_2
-sdext/source/minimizer/pppoptimizertoken.hxx:131
-    enum PPPOptimizerTokenEnum STR_INFO_3
-sdext/source/minimizer/pppoptimizertoken.hxx:132
-    enum PPPOptimizerTokenEnum STR_INFO_4
-sdext/source/minimizer/pppoptimizertoken.hxx:133
+sdext/source/minimizer/pppoptimizertoken.hxx:75
+    enum PPPOptimizerTokenEnum STR_INFO_PRIMARY
+sdext/source/minimizer/pppoptimizertoken.hxx:76
+    enum PPPOptimizerTokenEnum STR_INFO_SECONDARY_1
+sdext/source/minimizer/pppoptimizertoken.hxx:77
+    enum PPPOptimizerTokenEnum STR_INFO_SECONDARY_2
+sdext/source/minimizer/pppoptimizertoken.hxx:78
+    enum PPPOptimizerTokenEnum STR_INFO_SECONDARY_3
+sdext/source/minimizer/pppoptimizertoken.hxx:79
+    enum PPPOptimizerTokenEnum STR_INFO_SECONDARY_4
+sdext/source/minimizer/pppoptimizertoken.hxx:80
     enum PPPOptimizerTokenEnum STR_DUPLICATING_PRESENTATION
-sdext/source/minimizer/pppoptimizertoken.hxx:134
+sdext/source/minimizer/pppoptimizertoken.hxx:81
     enum PPPOptimizerTokenEnum STR_DELETING_SLIDES
-sdext/source/minimizer/pppoptimizertoken.hxx:135
+sdext/source/minimizer/pppoptimizertoken.hxx:82
     enum PPPOptimizerTokenEnum STR_OPTIMIZING_GRAPHICS
-sdext/source/minimizer/pppoptimizertoken.hxx:136
+sdext/source/minimizer/pppoptimizertoken.hxx:83
     enum PPPOptimizerTokenEnum STR_CREATING_OLE_REPLACEMENTS
-sdext/source/minimizer/pppoptimizertoken.hxx:137
+sdext/source/minimizer/pppoptimizertoken.hxx:84
     enum PPPOptimizerTokenEnum STR_FILESIZESEPARATOR
-sdext/source/minimizer/pppoptimizertoken.hxx:138
+sdext/source/minimizer/pppoptimizertoken.hxx:85
     enum PPPOptimizerTokenEnum STR_FILENAME_SUFFIX
-sdext/source/minimizer/pppoptimizertoken.hxx:139
+sdext/source/minimizer/pppoptimizertoken.hxx:86
     enum PPPOptimizerTokenEnum STR_WARN_UNSAVED_PRESENTATION
-sdext/source/minimizer/pppoptimizertoken.hxx:140
+sdext/source/minimizer/pppoptimizertoken.hxx:87
     enum PPPOptimizerTokenEnum TK_NotFound
-sdext/source/pdfimport/inc/genericelements.hxx:202
+sdext/source/pdfimport/inc/genericelements.hxx:206
     enum pdfi::ParagraphElement::ParagraphType Normal
-sdext/source/pdfimport/tree/drawtreevisiting.hxx:98
+sdext/source/pdfimport/tree/drawtreevisiting.hxx:96
     enum pdfi::DrawXmlEmitter::DocType IMPRESS_DOC
-sdext/source/pdfimport/wrapper/wrapper.cxx:92
+sdext/source/pdfimport/wrapper/wrapper.cxx:89
     enum pdfi::(anonymous namespace)::parseKey HYPERLINK
-sdext/source/pdfimport/wrapper/wrapper.cxx:93
+sdext/source/pdfimport/wrapper/wrapper.cxx:90
     enum pdfi::(anonymous namespace)::parseKey INTERSECTCLIP
-sdext/source/pdfimport/wrapper/wrapper.cxx:94
+sdext/source/pdfimport/wrapper/wrapper.cxx:91
     enum pdfi::(anonymous namespace)::parseKey INTERSECTEOCLIP
-sdext/source/pdfimport/wrapper/wrapper.cxx:95
+sdext/source/pdfimport/wrapper/wrapper.cxx:92
     enum pdfi::(anonymous namespace)::parseKey POPSTATE
-sdext/source/pdfimport/wrapper/wrapper.cxx:96
+sdext/source/pdfimport/wrapper/wrapper.cxx:93
     enum pdfi::(anonymous namespace)::parseKey PUSHSTATE
-sdext/source/pdfimport/wrapper/wrapper.cxx:99
+sdext/source/pdfimport/wrapper/wrapper.cxx:96
     enum pdfi::(anonymous namespace)::parseKey SETBLENDMODE
-sdext/source/pdfimport/wrapper/wrapper.cxx:100
+sdext/source/pdfimport/wrapper/wrapper.cxx:97
     enum pdfi::(anonymous namespace)::parseKey SETFILLCOLOR
-sdext/source/pdfimport/wrapper/wrapper.cxx:101
+sdext/source/pdfimport/wrapper/wrapper.cxx:98
     enum pdfi::(anonymous namespace)::parseKey SETFONT
-sdext/source/pdfimport/wrapper/wrapper.cxx:102
+sdext/source/pdfimport/wrapper/wrapper.cxx:99
     enum pdfi::(anonymous namespace)::parseKey SETLINECAP
-sdext/source/pdfimport/wrapper/wrapper.cxx:103
+sdext/source/pdfimport/wrapper/wrapper.cxx:100
     enum pdfi::(anonymous namespace)::parseKey SETLINEDASH
-sdext/source/pdfimport/wrapper/wrapper.cxx:104
+sdext/source/pdfimport/wrapper/wrapper.cxx:101
     enum pdfi::(anonymous namespace)::parseKey SETLINEJOIN
-sdext/source/pdfimport/wrapper/wrapper.cxx:105
+sdext/source/pdfimport/wrapper/wrapper.cxx:102
     enum pdfi::(anonymous namespace)::parseKey SETLINEWIDTH
-sdext/source/pdfimport/wrapper/wrapper.cxx:106
+sdext/source/pdfimport/wrapper/wrapper.cxx:103
     enum pdfi::(anonymous namespace)::parseKey SETMITERLIMIT
-sdext/source/pdfimport/wrapper/wrapper.cxx:108
+sdext/source/pdfimport/wrapper/wrapper.cxx:105
     enum pdfi::(anonymous namespace)::parseKey SETSTROKECOLOR
-sdext/source/pdfimport/wrapper/wrapper.cxx:110
+sdext/source/pdfimport/wrapper/wrapper.cxx:107
     enum pdfi::(anonymous namespace)::parseKey SETTRANSFORMATION
-sdext/source/pdfimport/wrapper/wrapper.cxx:113
+sdext/source/pdfimport/wrapper/wrapper.cxx:111
     enum pdfi::(anonymous namespace)::parseKey UPDATEBLENDMODE
-sdext/source/pdfimport/wrapper/wrapper.cxx:116
+sdext/source/pdfimport/wrapper/wrapper.cxx:114
     enum pdfi::(anonymous namespace)::parseKey UPDATEFILLOPACITY
-sdext/source/presenter/PresenterBitmapContainer.hxx:67
-    enum sdext::presenter::PresenterBitmapContainer::BitmapDescriptor::TexturingMode Once
-sdext/source/presenter/PresenterConfigurationAccess.hxx:51
-    enum sdext::presenter::PresenterConfigurationAccess::WriteMode READ_WRITE
-sdext/source/presenter/PresenterPaneBorderPainter.cxx:80
-    enum sdext::presenter::(anonymous namespace)::RendererPaneStyle::Anchor Center
-sdext/source/presenter/PresenterScrollBar.hxx:145
-    enum sdext::presenter::PresenterScrollBar::Area Pager
-sdext/source/presenter/PresenterScrollBar.hxx:145
-    enum sdext::presenter::PresenterScrollBar::Area Total
-sdext/source/presenter/PresenterWindowManager.hxx:88
-    enum sdext::presenter::PresenterWindowManager::LayoutMode LM_Generic
+sfx2/inc/dinfdlg.hrc:62
+    enum CustomProperties Custom_Type_Unknown
 sfx2/source/control/unoctitm.cxx:88
     enum (anonymous namespace)::URLTypeId URLType_BOOL
 sfx2/source/control/unoctitm.cxx:89
@@ -4082,25 +4428,43 @@ sfx2/source/control/unoctitm.cxx:95
     enum (anonymous namespace)::URLTypeId URLType_DOUBLE
 sfx2/source/control/unoctitm.cxx:96
     enum (anonymous namespace)::URLTypeId URLType_COUNT
-sfx2/source/dialog/filedlghelper.cxx:805
+sfx2/source/dialog/filedlghelper.cxx:823
     enum sfx2::(anonymous namespace)::open_or_save_t SAVE
-sfx2/source/dialog/filedlghelper.cxx:805
+sfx2/source/dialog/filedlghelper.cxx:823
     enum sfx2::(anonymous namespace)::open_or_save_t UNDEFINED
-sfx2/source/dialog/securitypage.cxx:45
+sfx2/source/dialog/securitypage.cxx:46
     enum (anonymous namespace)::RedliningMode RL_CALC
-sfx2/source/doc/docmacromode.cxx:158
+sfx2/source/doc/docmacromode.cxx:125
     enum AutoConfirmation eAutoConfirmReject
 sfx2/source/inc/docundomanager.hxx:70
     enum SfxModelGuard::AllowedModelState E_FULLY_ALIVE
-sfx2/source/inc/workwin.hxx:69
+sfx2/source/inc/workwin.hxx:70
     enum SfxChildVisibility NOT_VISIBLE
-sfx2/source/inc/workwin.hxx:72
+sfx2/source/inc/workwin.hxx:73
     enum SfxChildVisibility FITS_IN
+shell/source/backends/kf5be/kf5access.cxx:67
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:67:30) Size
+shell/source/backends/kf5be/kf5access.cxx:112
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:112:57) Size
+shell/source/backends/kf5be/kf5access.cxx:121
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:121:26) Size
+shell/source/backends/kf5be/kf5access.cxx:139
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:139:57) Size
+shell/source/backends/kf5be/kf5access.cxx:148
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:148:26) Size
+shell/source/backends/kf5be/kf5access.cxx:166
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:166:58) Size
+shell/source/backends/kf5be/kf5access.cxx:175
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:175:26) Size
+shell/source/backends/kf5be/kf5access.cxx:193
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:193:58) Size
+shell/source/backends/kf5be/kf5access.cxx:202
+    enum (unnamed at /home/noel/libo-plugin/shell/source/backends/kf5be/kf5access.cxx:202:26) Size
 slideshow/source/engine/shapes/viewshape.hxx:41
     enum UpdateFlags Transformation
 slideshow/source/engine/shapes/viewshape.hxx:44
     enum UpdateFlags Position
-slideshow/source/engine/slide/layer.hxx:207
+slideshow/source/engine/slide/layer.hxx:208
     enum slideshow::internal::Layer::Dummy BackgroundLayer
 slideshow/source/engine/slide/slideimpl.cxx:171
     enum slideshow::internal::(anonymous namespace)::SlideImpl::SlideAnimationState CONSTRUCTING_STATE
@@ -4228,313 +4592,387 @@ sot/source/sdstor/stgio.hxx:38
     enum FatError OnFileError
 sot/source/sdstor/stgio.hxx:39
     enum FatError BothError
-starmath/inc/node.hxx:134
+starmath/inc/mathml/def.hxx:129
+    enum SmMlAttributeValueForm MlPrefix
+starmath/inc/mathml/def.hxx:130
+    enum SmMlAttributeValueForm MlInfix
+starmath/inc/mathml/def.hxx:131
+    enum SmMlAttributeValueForm MlPosfix
+starmath/inc/mathml/mathmlattr.hxx:30
+    enum MathMLLengthUnit Ex
+starmath/inc/mathml/mathmlattr.hxx:31
+    enum MathMLLengthUnit Px
+starmath/inc/mathml/mathmlattr.hxx:32
+    enum MathMLLengthUnit In
+starmath/inc/mathml/mathmlattr.hxx:33
+    enum MathMLLengthUnit Cm
+starmath/inc/mathml/mathmlattr.hxx:34
+    enum MathMLLengthUnit Mm
+starmath/inc/mathml/mathmlattr.hxx:35
+    enum MathMLLengthUnit Pt
+starmath/inc/mathml/mathmlattr.hxx:36
+    enum MathMLLengthUnit Pc
+starmath/inc/mathml/mathmlattr.hxx:37
+    enum MathMLLengthUnit Percent
+starmath/inc/mathml/mathmlMo.hxx:38
+    enum moOpDP nonedp
+starmath/inc/mathml/mathmlMo.hxx:39
+    enum moOpDP accent
+starmath/inc/mathml/mathmlMo.hxx:40
+    enum moOpDP fence
+starmath/inc/mathml/mathmlMo.hxx:41
+    enum moOpDP stretchy
+starmath/inc/mathml/mathmlMo.hxx:42
+    enum moOpDP symmetric
+starmath/inc/mathml/mathmlMo.hxx:43
+    enum moOpDP separator
+starmath/inc/mathml/mathmlMo.hxx:44
+    enum moOpDP linebreakstyleAfter
+starmath/inc/mathml/mathmlMo.hxx:45
+    enum moOpDP largeop
+starmath/inc/mathml/mathmlMo.hxx:49
+    enum moOpDP stretchyfence
+starmath/inc/mathml/mathmlMo.hxx:50
+    enum moOpDP movablelargeop
+starmath/inc/mathml/mathmlMo.hxx:56
+    enum moOpDF prefix
+starmath/inc/mathml/mathmlMo.hxx:57
+    enum moOpDF infix
+starmath/inc/mathml/mathmlMo.hxx:58
+    enum moOpDF postfix
+starmath/inc/mathml/mathmlMo.hxx:59
+    enum moOpDF prepostfix
+starmath/inc/nodetype.hxx:52
     enum SmNodeType Rectangle
-starmath/inc/token.hxx:48
-    enum TG Attribute
+starmath/inc/parsebase.hxx:39
+    enum SmParseError UnexpectedChar
+starmath/inc/parsebase.hxx:40
+    enum SmParseError UnexpectedToken
+starmath/inc/parsebase.hxx:41
+    enum SmParseError PoundExpected
+starmath/inc/parsebase.hxx:42
+    enum SmParseError ColorExpected
+starmath/inc/parsebase.hxx:43
+    enum SmParseError LgroupExpected
+starmath/inc/parsebase.hxx:44
+    enum SmParseError RgroupExpected
+starmath/inc/parsebase.hxx:45
+    enum SmParseError LbraceExpected
+starmath/inc/parsebase.hxx:46
+    enum SmParseError RbraceExpected
+starmath/inc/parsebase.hxx:47
+    enum SmParseError ParentMismatch
+starmath/inc/parsebase.hxx:48
+    enum SmParseError RightExpected
+starmath/inc/parsebase.hxx:49
+    enum SmParseError FontExpected
+starmath/inc/parsebase.hxx:50
+    enum SmParseError SizeExpected
+starmath/inc/parsebase.hxx:51
+    enum SmParseError DoubleAlign
+starmath/inc/parsebase.hxx:52
+    enum SmParseError DoubleSubsupscript
+starmath/inc/parsebase.hxx:53
+    enum SmParseError NumberExpected
 starmath/inc/token.hxx:49
+    enum TG Attribute
+starmath/inc/token.hxx:50
     enum TG Align
-starmath/inc/token.hxx:51
+starmath/inc/token.hxx:52
     enum TG Blank
-starmath/inc/token.hxx:54
-    enum TG Color
 starmath/inc/token.hxx:55
-    enum TG Font
+    enum TG Color
 starmath/inc/token.hxx:56
+    enum TG Font
+starmath/inc/token.hxx:57
     enum TG Standalone
-starmath/inc/token.hxx:58
+starmath/inc/token.hxx:59
     enum TG FontAttr
-starmath/inc/token.hxx:79
+starmath/inc/token.hxx:80
     enum SmTokenType TGE
-starmath/inc/token.hxx:79
+starmath/inc/token.hxx:80
     enum SmTokenType TGT
-starmath/inc/token.hxx:79
+starmath/inc/token.hxx:80
     enum SmTokenType TLE
-starmath/inc/token.hxx:79
-    enum SmTokenType TLT
 starmath/inc/token.hxx:80
+    enum SmTokenType TLT
+starmath/inc/token.hxx:81
     enum SmTokenType TASSIGN
-starmath/inc/token.hxx:80
+starmath/inc/token.hxx:81
     enum SmTokenType TGG
-starmath/inc/token.hxx:80
+starmath/inc/token.hxx:81
     enum SmTokenType TLL
-starmath/inc/token.hxx:80
-    enum SmTokenType TNEQ
 starmath/inc/token.hxx:81
+    enum SmTokenType TNEQ
+starmath/inc/token.hxx:82
     enum SmTokenType TEQUIV
-starmath/inc/token.hxx:81
+starmath/inc/token.hxx:82
     enum SmTokenType TORTHO
-starmath/inc/token.hxx:81
+starmath/inc/token.hxx:82
     enum SmTokenType TPARALLEL
-starmath/inc/token.hxx:84
+starmath/inc/token.hxx:85
     enum SmTokenType TSIM
-starmath/inc/token.hxx:84
+starmath/inc/token.hxx:85
     enum SmTokenType TSIMEQ
-starmath/inc/token.hxx:86
+starmath/inc/token.hxx:88
     enum SmTokenType TDIV
-starmath/inc/token.hxx:86
+starmath/inc/token.hxx:88
     enum SmTokenType TTIMES
-starmath/inc/token.hxx:87
+starmath/inc/token.hxx:89
     enum SmTokenType TBACKSLASH
-starmath/inc/token.hxx:87
+starmath/inc/token.hxx:89
     enum SmTokenType TSLASH
-starmath/inc/token.hxx:88
+starmath/inc/token.hxx:90
     enum SmTokenType TIT
-starmath/inc/token.hxx:92
+starmath/inc/token.hxx:94
     enum SmTokenType TAND
-starmath/inc/token.hxx:92
+starmath/inc/token.hxx:94
     enum SmTokenType TOR
-starmath/inc/token.hxx:93
+starmath/inc/token.hxx:95
     enum SmTokenType TNOTPRECEDES
-starmath/inc/token.hxx:93
+starmath/inc/token.hxx:95
     enum SmTokenType TNOTSUCCEEDS
-starmath/inc/token.hxx:93
+starmath/inc/token.hxx:95
     enum SmTokenType TPRECEDES
-starmath/inc/token.hxx:93
+starmath/inc/token.hxx:95
     enum SmTokenType TSUCCEEDS
-starmath/inc/token.hxx:94
+starmath/inc/token.hxx:96
     enum SmTokenType TPRECEDESEQUAL
-starmath/inc/token.hxx:94
+starmath/inc/token.hxx:96
     enum SmTokenType TPRECEDESEQUIV
-starmath/inc/token.hxx:94
+starmath/inc/token.hxx:96
     enum SmTokenType TSUCCEEDSEQUAL
-starmath/inc/token.hxx:94
-    enum SmTokenType TSUCCEEDSEQUIV
 starmath/inc/token.hxx:96
+    enum SmTokenType TSUCCEEDSEQUIV
+starmath/inc/token.hxx:98
     enum SmTokenType TDEF
-starmath/inc/token.hxx:97
+starmath/inc/token.hxx:99
     enum SmTokenType TAPPROX
-starmath/inc/token.hxx:97
+starmath/inc/token.hxx:99
     enum SmTokenType TDIVIDES
-starmath/inc/token.hxx:97
+starmath/inc/token.hxx:99
     enum SmTokenType TNDIVIDES
-starmath/inc/token.hxx:97
+starmath/inc/token.hxx:99
     enum SmTokenType TPROP
-starmath/inc/token.hxx:98
+starmath/inc/token.hxx:100
     enum SmTokenType TGESLANT
-starmath/inc/token.hxx:98
+starmath/inc/token.hxx:100
     enum SmTokenType TLESLANT
-starmath/inc/token.hxx:98
+starmath/inc/token.hxx:100
     enum SmTokenType TTRANSL
-starmath/inc/token.hxx:98
-    enum SmTokenType TTRANSR
 starmath/inc/token.hxx:100
+    enum SmTokenType TTRANSR
+starmath/inc/token.hxx:102
     enum SmTokenType TODIVIDE
-starmath/inc/token.hxx:100
+starmath/inc/token.hxx:102
     enum SmTokenType TODOT
-starmath/inc/token.hxx:100
+starmath/inc/token.hxx:102
     enum SmTokenType TOMINUS
-starmath/inc/token.hxx:100
+starmath/inc/token.hxx:102
     enum SmTokenType TOPLUS
-starmath/inc/token.hxx:100
+starmath/inc/token.hxx:102
     enum SmTokenType TOTIMES
-starmath/inc/token.hxx:107
+starmath/inc/token.hxx:109
     enum SmTokenType TIN
-starmath/inc/token.hxx:107
+starmath/inc/token.hxx:109
     enum SmTokenType TNI
-starmath/inc/token.hxx:107
+starmath/inc/token.hxx:109
     enum SmTokenType TNOTIN
-starmath/inc/token.hxx:108
+starmath/inc/token.hxx:110
     enum SmTokenType TSUBSET
-starmath/inc/token.hxx:108
+starmath/inc/token.hxx:110
     enum SmTokenType TSUBSETEQ
-starmath/inc/token.hxx:108
+starmath/inc/token.hxx:110
     enum SmTokenType TSUPSET
-starmath/inc/token.hxx:108
+starmath/inc/token.hxx:110
     enum SmTokenType TSUPSETEQ
-starmath/inc/token.hxx:109
+starmath/inc/token.hxx:111
     enum SmTokenType TNSUBSET
-starmath/inc/token.hxx:109
+starmath/inc/token.hxx:111
     enum SmTokenType TNSUBSETEQ
-starmath/inc/token.hxx:109
+starmath/inc/token.hxx:111
     enum SmTokenType TNSUPSET
-starmath/inc/token.hxx:109
+starmath/inc/token.hxx:111
     enum SmTokenType TNSUPSETEQ
-starmath/inc/token.hxx:110
+starmath/inc/token.hxx:112
     enum SmTokenType TINTERSECT
-starmath/inc/token.hxx:110
+starmath/inc/token.hxx:112
     enum SmTokenType TSETMINUS
-starmath/inc/token.hxx:110
+starmath/inc/token.hxx:112
     enum SmTokenType TSETQUOTIENT
-starmath/inc/token.hxx:110
+starmath/inc/token.hxx:112
     enum SmTokenType TUNION
-starmath/inc/token.hxx:121
+starmath/inc/token.hxx:123
     enum SmTokenType THARPOON
-starmath/inc/token.hxx:138
+starmath/inc/token.hxx:140
     enum SmTokenType TEXP
-starmath/inc/token.hxx:138
+starmath/inc/token.hxx:140
     enum SmTokenType TLN
-starmath/inc/token.hxx:138
+starmath/inc/token.hxx:140
     enum SmTokenType TLOG
-starmath/inc/token.hxx:139
+starmath/inc/token.hxx:141
     enum SmTokenType TCOS
-starmath/inc/token.hxx:139
+starmath/inc/token.hxx:141
     enum SmTokenType TCOT
-starmath/inc/token.hxx:139
+starmath/inc/token.hxx:141
     enum SmTokenType TSIN
-starmath/inc/token.hxx:139
+starmath/inc/token.hxx:141
     enum SmTokenType TTAN
-starmath/inc/token.hxx:140
+starmath/inc/token.hxx:142
+    enum SmTokenType TCSC
+starmath/inc/token.hxx:142
+    enum SmTokenType TCSCH
+starmath/inc/token.hxx:142
+    enum SmTokenType TSEC
+starmath/inc/token.hxx:142
+    enum SmTokenType TSECH
+starmath/inc/token.hxx:143
     enum SmTokenType TCOSH
-starmath/inc/token.hxx:140
+starmath/inc/token.hxx:143
     enum SmTokenType TCOTH
-starmath/inc/token.hxx:140
+starmath/inc/token.hxx:143
     enum SmTokenType TSINH
-starmath/inc/token.hxx:140
+starmath/inc/token.hxx:143
     enum SmTokenType TTANH
-starmath/inc/token.hxx:141
+starmath/inc/token.hxx:144
     enum SmTokenType TACOS
-starmath/inc/token.hxx:141
+starmath/inc/token.hxx:144
     enum SmTokenType TACOT
-starmath/inc/token.hxx:141
+starmath/inc/token.hxx:144
     enum SmTokenType TASIN
-starmath/inc/token.hxx:141
+starmath/inc/token.hxx:144
     enum SmTokenType TATAN
-starmath/inc/token.hxx:142
+starmath/inc/token.hxx:145
     enum SmTokenType TACOSH
-starmath/inc/token.hxx:142
+starmath/inc/token.hxx:145
     enum SmTokenType TACOTH
-starmath/inc/token.hxx:142
+starmath/inc/token.hxx:145
     enum SmTokenType TASINH
-starmath/inc/token.hxx:142
+starmath/inc/token.hxx:145
     enum SmTokenType TATANH
-starmath/source/mathmlattr.hxx:28
-    enum MathMLLengthUnit Ex
-starmath/source/mathmlattr.hxx:29
-    enum MathMLLengthUnit Px
-starmath/source/mathmlattr.hxx:30
-    enum MathMLLengthUnit In
-starmath/source/mathmlattr.hxx:31
-    enum MathMLLengthUnit Cm
-starmath/source/mathmlattr.hxx:32
-    enum MathMLLengthUnit Mm
-starmath/source/mathmlattr.hxx:33
-    enum MathMLLengthUnit Pt
-starmath/source/mathmlattr.hxx:34
-    enum MathMLLengthUnit Pc
-starmath/source/mathmlattr.hxx:35
-    enum MathMLLengthUnit Percent
-starmath/source/ooxmlimport.cxx:388
+starmath/source/ooxmlimport.cxx:391
     enum operation_t noBar
 stoc/source/inspect/introspection.cxx:1829
     enum MethodType GETSET_METHOD
 stoc/source/inspect/introspection.cxx:1831
     enum MethodType REMOVE_LISTENER_METHOD
-stoc/source/security/permissions.h:37
+stoc/source/security/permissions.h:38
     enum stoc_sec::Permission::t_type ALL
-store/source/stordata.hxx:572
+store/source/stordata.hxx:571
     enum store::OStoreDirectoryPageData::ChunkScope SCOPE_UNKNOWN
-svgio/inc/svgmarkernode.hxx:35
+svgio/inc/svgmarkernode.hxx:34
     enum svgio::svgreader::SvgMarkerNode::MarkerUnits userSpaceOnUse
-svgio/inc/svgnode.hxx:47
-    enum svgio::svgreader::XmlSpace XmlSpace_preserve
-svgio/inc/svgnode.hxx:53
-    enum svgio::svgreader::Display Display_inline
+svgio/inc/svgmarkernode.hxx:39
+    enum svgio::svgreader::SvgMarkerNode::MarkerOrient notset
+svgio/inc/svgnode.hxx:48
+    enum svgio::svgreader::XmlSpace Preserve
 svgio/inc/svgnode.hxx:54
-    enum svgio::svgreader::Display Display_block
+    enum svgio::svgreader::Display Inline
 svgio/inc/svgnode.hxx:55
-    enum svgio::svgreader::Display Display_list_item
+    enum svgio::svgreader::Display Block
 svgio/inc/svgnode.hxx:56
-    enum svgio::svgreader::Display Display_run_in
+    enum svgio::svgreader::Display ListItem
 svgio/inc/svgnode.hxx:57
-    enum svgio::svgreader::Display Display_compact
+    enum svgio::svgreader::Display RunIn
 svgio/inc/svgnode.hxx:58
-    enum svgio::svgreader::Display Display_marker
+    enum svgio::svgreader::Display Compact
 svgio/inc/svgnode.hxx:59
-    enum svgio::svgreader::Display Display_table
+    enum svgio::svgreader::Display Marker
 svgio/inc/svgnode.hxx:60
-    enum svgio::svgreader::Display Display_inline_table
+    enum svgio::svgreader::Display Table
 svgio/inc/svgnode.hxx:61
-    enum svgio::svgreader::Display Display_table_row_group
+    enum svgio::svgreader::Display InlineTable
 svgio/inc/svgnode.hxx:62
-    enum svgio::svgreader::Display Display_table_header_group
+    enum svgio::svgreader::Display TableRowGroup
 svgio/inc/svgnode.hxx:63
-    enum svgio::svgreader::Display Display_table_footer_group
+    enum svgio::svgreader::Display TableHeaderGroup
 svgio/inc/svgnode.hxx:64
-    enum svgio::svgreader::Display Display_table_row
+    enum svgio::svgreader::Display TableFooterGroup
 svgio/inc/svgnode.hxx:65
-    enum svgio::svgreader::Display Display_table_column_group
+    enum svgio::svgreader::Display TableRow
 svgio/inc/svgnode.hxx:66
-    enum svgio::svgreader::Display Display_table_column
+    enum svgio::svgreader::Display TableColumnGroup
 svgio/inc/svgnode.hxx:67
-    enum svgio::svgreader::Display Display_table_cell
+    enum svgio::svgreader::Display TableColumn
 svgio/inc/svgnode.hxx:68
-    enum svgio::svgreader::Display Display_table_caption
-svgio/inc/svgnode.hxx:70
-    enum svgio::svgreader::Display Display_inherit
-svgio/inc/svgstyleattributes.hxx:46
-    enum svgio::svgreader::StrokeLinecap StrokeLinecap_butt
-svgio/inc/svgstyleattributes.hxx:54
-    enum svgio::svgreader::StrokeLinejoin StrokeLinejoin_miter
-svgio/inc/svgstyleattributes.hxx:96
-    enum svgio::svgreader::FontStyle FontStyle_normal
-svgio/inc/svgstyleattributes.hxx:133
-    enum svgio::svgreader::TextDecoration TextDecoration_none
-svgio/inc/svgstyleattributes.hxx:137
-    enum svgio::svgreader::TextDecoration TextDecoration_blink
-svgio/inc/svgstyleattributes.hxx:152
-    enum svgio::svgreader::FillRule FillRule_evenodd
-svgio/inc/svgstyleattributes.hxx:157
-    enum svgio::svgreader::BaselineShift BaselineShift_Baseline
-svgio/inc/svgstyleattributes.hxx:169
-    enum svgio::svgreader::Visibility Visibility_collapse
-svgio/inc/svgtoken.hxx:42
-    enum svgio::svgreader::SVGToken SVGTokenXmlns
-svgio/inc/svgtools.hxx:57
+    enum svgio::svgreader::Display TableCell
+svgio/inc/svgnode.hxx:69
+    enum svgio::svgreader::Display TableCaption
+svgio/inc/svgnode.hxx:71
+    enum svgio::svgreader::Display Inherit
+svgio/inc/SvgNumber.hxx:32
     enum svgio::svgreader::NumberType length
-svgio/inc/svgtools.hxx:140
-    enum svgio::svgreader::SvgAlign Align_xMinYMin
-svgio/source/svgreader/svgtools.cxx:552
+svgio/inc/svgstyleattributes.hxx:47
+    enum svgio::svgreader::StrokeLinecap butt
+svgio/inc/svgstyleattributes.hxx:55
+    enum svgio::svgreader::StrokeLinejoin miter
+svgio/inc/svgstyleattributes.hxx:97
+    enum svgio::svgreader::FontStyle normal
+svgio/inc/svgstyleattributes.hxx:134
+    enum svgio::svgreader::TextDecoration none
+svgio/inc/svgstyleattributes.hxx:138
+    enum svgio::svgreader::TextDecoration blink
+svgio/inc/svgstyleattributes.hxx:152
+    enum svgio::svgreader::FillRule nonzero
+svgio/inc/svgstyleattributes.hxx:176
+    enum svgio::svgreader::Overflow hidden
+svgio/inc/svgstyleattributes.hxx:185
+    enum svgio::svgreader::Visibility collapse
+svgio/inc/svgtoken.hxx:41
+    enum svgio::svgreader::SVGToken Xmlns
+svgio/inc/svgtools.hxx:53
+    enum svgio::svgreader::SvgAlign xMinYMin
+svgio/source/svgreader/svgtools.cxx:566
     enum DegreeType rad
 svl/source/misc/adrparse.cxx:26
     enum (anonymous namespace)::ElementType ELEMENT_START
-svl/source/misc/strmadpt.cxx:40
+svl/source/misc/strmadpt.cxx:41
     enum SvDataPipe_Impl::SeekResult SEEK_BEFORE_MARKED
-svl/source/misc/strmadpt.cxx:40
+svl/source/misc/strmadpt.cxx:41
     enum SvDataPipe_Impl::SeekResult SEEK_PAST_END
-svl/source/numbers/zforscan.hxx:47
+svl/source/numbers/zforscan.hxx:48
     enum ImpSvNumberformatScan::KeywordLocalization LocaleLegacy
-svtools/inc/table/tablecontrolinterface.hxx:81
-    enum svt::table::TableCellArea CellContent
-svtools/inc/table/tablemodel.hxx:68
-    enum svt::table::ScrollbarVisibility ScrollbarShowSmart
-svtools/inc/table/tablesort.hxx:34
-    enum svt::table::ColumnSortDirection ColumnSortDescending
-svtools/source/config/miscopt.cxx:119
+svtools/source/config/colorcfg.cxx:388
+    enum ColorType clLight
+svtools/source/config/colorcfg.cxx:389
+    enum ColorType clDark
+svtools/source/config/colorcfg.cxx:390
+    enum ColorType nColorTypes
+svtools/source/config/miscopt.cxx:96
     enum SvtMiscOptions_Impl::SetModifiedFlag DONT_SET
-svtools/source/control/ctrltool.cxx:97
+svtools/source/control/ctrltool.cxx:100
     enum (anonymous namespace)::FontListFontNameType SCREEN
-svtools/source/control/valueset.cxx:62
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) ITEM_OFFSET
 svtools/source/control/valueset.cxx:63
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) ITEM_OFFSET_DOUBLE
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) ITEM_OFFSET
 svtools/source/control/valueset.cxx:64
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) NAME_LINE_OFF_X
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) ITEM_OFFSET_DOUBLE
 svtools/source/control/valueset.cxx:65
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) NAME_LINE_OFF_Y
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) NAME_LINE_OFF_X
 svtools/source/control/valueset.cxx:66
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) NAME_LINE_HEIGHT
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) NAME_LINE_OFF_Y
 svtools/source/control/valueset.cxx:67
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/svtools/source/control/valueset.cxx:60:1) NAME_OFFSET
-svtools/source/svhtml/parhtml.cxx:1887
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) NAME_LINE_HEIGHT
+svtools/source/control/valueset.cxx:68
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/svtools/source/control/valueset.cxx:61:1) NAME_OFFSET
+svtools/source/svhtml/parhtml.cxx:1939
     enum (anonymous namespace)::HtmlMeta Generator
-svtools/source/svhtml/parhtml.cxx:1888
+svtools/source/svhtml/parhtml.cxx:1940
     enum (anonymous namespace)::HtmlMeta SDFootnote
-svtools/source/svhtml/parhtml.cxx:1889
+svtools/source/svhtml/parhtml.cxx:1941
     enum (anonymous namespace)::HtmlMeta SDEndnote
 svx/inc/sdr/overlay/overlaytools.hxx:204
     enum drawinglayer::primitive2d::HelplineStyle HELPLINESTYLE_POINT
 svx/inc/sxmkitm.hxx:25
     enum SdrMeasureKind SDRMEASURE_STD
-svx/source/dialog/srchdlg.cxx:99
+svx/source/dialog/srchdlg.cxx:97
     enum ModifyFlags Formulas
-svx/source/dialog/srchdlg.cxx:100
+svx/source/dialog/srchdlg.cxx:98
     enum ModifyFlags Values
-svx/source/dialog/srchdlg.cxx:101
+svx/source/dialog/srchdlg.cxx:99
     enum ModifyFlags CalcNotes
-svx/source/fmcomp/fmgridcl.cxx:776
+svx/source/fmcomp/fmgridcl.cxx:813
     enum (anonymous namespace)::InspectorAction eOpenInspector
-svx/source/inc/datanavi.hxx:70
+svx/source/inc/datanavi.hxx:72
     enum svxform::DataItemType DITElement
 svx/source/inc/docrecovery.hxx:75
     enum EDocStates Unknown
@@ -4554,13 +4992,13 @@ svx/source/inc/fmdocumentclassification.hxx:38
     enum svxform::DocumentType eDatabaseReport
 svx/source/inc/fmexpl.hxx:380
     enum svxform::NavigatorTree::SELDATA_ITEMS SDI_ALL
-svx/source/inc/fmshimp.hxx:80
+svx/source/inc/fmshimp.hxx:83
     enum LoadFormsFlags Load
-svx/source/inc/fmshimp.hxx:81
+svx/source/inc/fmshimp.hxx:84
     enum LoadFormsFlags Sync
 svx/source/inc/fmtextcontrolshell.hxx:146
     enum svx::FmTextControlShell::AttributeSet eParaAttribs
-svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:533
+svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:535
     enum sdr::contact::ViewObjectContactOfUnoControl_Impl::ViewControlMode eAlive
 svx/source/stbctrls/modctrl.cxx:45
     enum SvxModifyControl::ImplData::ModificationState MODIFICATION_STATE_NO
@@ -4568,55 +5006,63 @@ svx/source/stbctrls/modctrl.cxx:47
     enum SvxModifyControl::ImplData::ModificationState MODIFICATION_STATE_FEEDBACK
 svx/source/stbctrls/modctrl.cxx:48
     enum SvxModifyControl::ImplData::ModificationState MODIFICATION_STATE_SIZE
-svx/source/svdraw/svdocapt.cxx:58
+svx/source/svdraw/svdocapt.cxx:57
     enum (anonymous namespace)::EscDir UNT
 svx/source/table/tablehandles.hxx:28
     enum sdr::table::TableEdgeState Empty
 svx/source/table/tablehandles.hxx:28
     enum sdr::table::TableEdgeState Invisible
-svx/source/tbxctrls/tbcontrl.cxx:2200
+svx/source/tbxctrls/tbcontrl.cxx:2520
     enum (anonymous namespace)::FrmValidFlags AllMask
 svx/source/tbxctrls/tbunosearchcontrollers.cxx:710
     enum (anonymous namespace)::UpDownSearchToolboxController::Type DOWN
-svx/source/unodraw/recoveryui.cxx:49
+svx/source/unodraw/recoveryui.cxx:50
     enum (anonymous namespace)::RecoveryUI::EJob E_JOB_UNKNOWN
-sw/inc/calbck.hxx:119
+svx/source/xml/xmlxtimp.cxx:64
+    enum (anonymous namespace)::SvxXMLTableImportContextEnum Gradient
+sw/inc/calbck.hxx:128
     enum sw::IteratorMode Exact
 sw/inc/chpfld.hxx:31
     enum SwChapterFormat CF_BEGIN
+sw/inc/contentindex.hxx:125
+    enum SwContentIndexReg::UpdateMode Default
+sw/inc/crsrsh.hxx:337
+    enum SwCursorShell::StartsWith HiddenPara
+sw/inc/crsrsh.hxx:337
+    enum SwCursorShell::StartsWith HiddenSection
 sw/inc/crstate.hxx:57
     enum MultiPortionType TWOLINE
 sw/inc/crstate.hxx:126
     enum CursorMoveState LeftMargin
-sw/inc/dbmgr.hxx:98
+sw/inc/dbmgr.hxx:99
     enum SwDBSelect QUERY
-sw/inc/doc.hxx:321
+sw/inc/doc.hxx:334
     enum SwDoc::MissingDictionary False
-sw/inc/doc.hxx:391
+sw/inc/doc.hxx:406
     enum SwDoc::DocumentType DOCTYPE_NATIVE
-sw/inc/docary.hxx:68
+sw/inc/doc.hxx:1215
+    enum SwDoc::RowColMode DeleteRow
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase<class SwFrameFormat *>::DestructorPolicy KeepElements
-sw/inc/docary.hxx:68
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase<class SwGrfFormatColl *>::DestructorPolicy KeepElements
-sw/inc/docary.hxx:68
+sw/inc/docary.hxx:72
     enum SwVectorModifyBase<class SwTextFormatColl *>::DestructorPolicy KeepElements
-sw/inc/docstyle.hxx:67
+sw/inc/docstyle.hxx:69
     enum SwDocStyleSheet::FillStyleType FillOnlyName
-sw/inc/docufld.hxx:39
+sw/inc/docufld.hxx:44
     enum SwAuthorFormat AF_BEGIN
-sw/inc/docufld.hxx:48
+sw/inc/docufld.hxx:53
     enum SwDocStatSubType DS_BEGIN
-sw/inc/docufld.hxx:119
-    enum SwJumpEditFormat JE_FMT_TEXT
-sw/inc/fesh.hxx:64
+sw/inc/fesh.hxx:65
     enum FrameTypeFlags PAGE
-sw/inc/fesh.hxx:96
+sw/inc/fesh.hxx:97
     enum GotoObjFlags Any
-sw/inc/fesh.hxx:111
+sw/inc/fesh.hxx:112
     enum FlyProtectFlags Fixed
-sw/inc/fesh.hxx:131
+sw/inc/fesh.hxx:132
     enum ObjCntType OBJCNT_DONTCARE
-sw/inc/fesh.hxx:140
+sw/inc/fesh.hxx:141
     enum CurRectType Frame
 sw/inc/flyenum.hxx:36
     enum SwChainRet NOT_EMPTY
@@ -4630,35 +5076,39 @@ sw/inc/flyenum.hxx:41
     enum SwChainRet SOURCE_CHAINED
 sw/inc/flyenum.hxx:42
     enum SwChainRet SELF
-sw/inc/fmtcol.hxx:165
+sw/inc/fmtcol.hxx:198
     enum Master_CollCondition PARA_IN_LIST
-sw/inc/fmtcol.hxx:166
+sw/inc/fmtcol.hxx:199
     enum Master_CollCondition PARA_IN_OUTLINE
-sw/inc/fmtcol.hxx:167
+sw/inc/fmtcol.hxx:200
     enum Master_CollCondition PARA_IN_FRAME
-sw/inc/fmtcol.hxx:170
+sw/inc/fmtcol.hxx:203
     enum Master_CollCondition PARA_IN_SECTION
-sw/inc/fmtcol.hxx:171
+sw/inc/fmtcol.hxx:204
     enum Master_CollCondition PARA_IN_FOOTNOTE
-sw/inc/fmtcol.hxx:174
+sw/inc/fmtcol.hxx:207
     enum Master_CollCondition PARA_IN_ENDNOTE
 sw/inc/fmtftntx.hxx:34
     enum SwFootnoteEndPosEnum FTNEND_ATTXTEND_END
-sw/inc/IDocumentContentOperations.hxx:48
+sw/inc/hints.hxx:338
+    enum TableFormulaUpdateFlags TBL_CALC
+sw/inc/IDocumentContentOperations.hxx:47
     enum SwMoveFlags DEFAULT
-sw/inc/IDocumentContentOperations.hxx:62
+sw/inc/IDocumentContentOperations.hxx:61
     enum SwInsertFlags DEFAULT
-sw/inc/IDocumentContentOperations.hxx:74
+sw/inc/IDocumentContentOperations.hxx:73
     enum SwCopyFlags Default
-sw/inc/IDocumentExternalData.hxx:28
+sw/inc/IDocumentContentOperations.hxx:86
+    enum SwDeleteFlags Default
+sw/inc/IDocumentExternalData.hxx:27
     enum sw::tExternalDataType FIB
-sw/inc/IDocumentExternalData.hxx:28
+sw/inc/IDocumentExternalData.hxx:27
     enum sw::tExternalDataType STTBF_ASSOC
-sw/inc/IDocumentRedlineAccess.hxx:136
+sw/inc/IDocumentRedlineAccess.hxx:134
     enum IDocumentRedlineAccess::AppendResult MERGED
 sw/inc/IMark.hxx:34
     enum sw::mark::InsertMode CopyText
-sw/inc/istyleaccess.hxx:35
+sw/inc/istyleaccess.hxx:37
     enum IStyleAccess::SwAutoStyleFamily AUTO_STYLE_NOTXT
 sw/inc/itabenum.hxx:31
     enum SwInsertTableFlags HeadlineNoBorder
@@ -4666,132 +5116,136 @@ sw/inc/itabenum.hxx:32
     enum SwInsertTableFlags All
 sw/inc/ndhints.hxx:33
     enum CopyOrNewType New
-sw/inc/ndtxt.hxx:178
-    enum SwTextNode::WrongState PENDING
 sw/inc/pagedesc.hxx:130
     enum UseOnPage NoHeaderShare
 sw/inc/pagedesc.hxx:131
     enum UseOnPage NoFooterShare
 sw/inc/pagedesc.hxx:132
     enum UseOnPage NoFirstShare
-sw/inc/redline.hxx:236
+sw/inc/redline.hxx:255
     enum SwRangeRedline::Invalidation Remove
-sw/inc/reffld.hxx:47
+sw/inc/reffld.hxx:64
     enum REFERENCEMARK REF_BEGIN
-sw/inc/sortopt.hxx:28
+sw/inc/sortopt.hxx:27
     enum SwSortOrder Descending
-sw/inc/sortopt.hxx:29
+sw/inc/sortopt.hxx:28
     enum SwSortDirection Columns
-sw/inc/SwAppletImpl.hxx:31
+sw/inc/SwAppletImpl.hxx:32
     enum SwHtmlOptType IGNORE
-sw/inc/swmodule.hxx:63
+sw/inc/swcrsr.hxx:65
+    enum SwCursorSkipMode Chars
+sw/inc/swmodule.hxx:62
     enum SvViewOpt DestView
-sw/inc/swtypes.hxx:137
+sw/inc/swregion.hxx:58
+    enum SwRegionRects::CompressType CompressExact
+sw/inc/swtypes.hxx:134
     enum SetAttrMode DEFAULT
-sw/inc/swtypes.hxx:200
+sw/inc/swtypes.hxx:209
     enum PrepareHint FixSizeChanged
-sw/inc/swtypes.hxx:201
+sw/inc/swtypes.hxx:210
     enum PrepareHint FollowFollows
-sw/inc/swtypes.hxx:203
-    enum PrepareHint FlyFrameSizeChanged
 sw/inc/swtypes.hxx:212
+    enum PrepareHint FlyFrameSizeChanged
+sw/inc/swtypes.hxx:221
     enum PrepareHint ULSpaceChanged
 sw/inc/swundo.hxx:32
     enum SwUndoId STD_BEGIN
-sw/inc/ToxTabStopTokenHandler.hxx:56
+sw/inc/ToxTabStopTokenHandler.hxx:57
     enum sw::DefaultToxTabStopTokenHandler::TabStopReferencePolicy TABSTOPS_RELATIVE_TO_PAGE
-sw/inc/undobj.hxx:138
+sw/inc/undobj.hxx:139
     enum DelContentType AllMask
-sw/inc/unobaseclass.hxx:50
+sw/inc/unobaseclass.hxx:51
     enum CursorType All
-sw/inc/unocoll.hxx:126
+sw/inc/unobaseclass.hxx:63
+    enum sw::DeleteAndInsertMode Default
+sw/inc/unocoll.hxx:128
     enum SwServiceType FieldTypeDummy1
-sw/inc/unocoll.hxx:127
+sw/inc/unocoll.hxx:129
     enum SwServiceType FieldTypeDummy2
-sw/inc/unocoll.hxx:128
+sw/inc/unocoll.hxx:130
     enum SwServiceType FieldTypeDummy3
-sw/inc/unocrsrhelper.hxx:56
+sw/inc/unocrsrhelper.hxx:57
     enum SwGetPropertyStatesCaller SW_PROPERTY_STATE_CALLER_DEFAULT
 sw/inc/unostyle.hxx:248
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) FIRST_ROW_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) FIRST_ROW_STYLE
 sw/inc/unostyle.hxx:249
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) LAST_ROW_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) LAST_ROW_STYLE
 sw/inc/unostyle.hxx:250
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) FIRST_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) FIRST_COLUMN_STYLE
 sw/inc/unostyle.hxx:251
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) LAST_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) LAST_COLUMN_STYLE
 sw/inc/unostyle.hxx:252
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) EVEN_ROWS_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) EVEN_ROWS_STYLE
 sw/inc/unostyle.hxx:253
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) ODD_ROWS_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) ODD_ROWS_STYLE
 sw/inc/unostyle.hxx:254
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) EVEN_COLUMNS_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) EVEN_COLUMNS_STYLE
 sw/inc/unostyle.hxx:255
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) ODD_COLUMNS_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) ODD_COLUMNS_STYLE
 sw/inc/unostyle.hxx:256
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) BODY_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) BODY_STYLE
 sw/inc/unostyle.hxx:257
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) BACKGROUND_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) BACKGROUND_STYLE
 sw/inc/unostyle.hxx:259
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) FIRST_ROW_START_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) FIRST_ROW_START_COLUMN_STYLE
 sw/inc/unostyle.hxx:260
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) FIRST_ROW_END_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) FIRST_ROW_END_COLUMN_STYLE
 sw/inc/unostyle.hxx:261
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) LAST_ROW_START_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) LAST_ROW_START_COLUMN_STYLE
 sw/inc/unostyle.hxx:262
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) LAST_ROW_END_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) LAST_ROW_END_COLUMN_STYLE
 sw/inc/unostyle.hxx:263
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) FIRST_ROW_EVEN_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) FIRST_ROW_EVEN_COLUMN_STYLE
 sw/inc/unostyle.hxx:264
-    enum SwXTextTableStyle::(anonymous at /home/noel/libo2/sw/inc/unostyle.hxx:247:5) LAST_ROW_EVEN_COLUMN_STYLE
+    enum SwXTextTableStyle::(unnamed at /home/noel/libo-plugin/sw/inc/unostyle.hxx:247:5) LAST_ROW_EVEN_COLUMN_STYLE
 sw/inc/unotextrange.hxx:59
     enum sw::TextRangeMode RequireTextNode
-sw/inc/unotextrange.hxx:101
+sw/inc/unotextrange.hxx:112
     enum SwXTextRange::RangePosition RANGE_IN_TEXT
-sw/inc/view.hxx:98
+sw/inc/view.hxx:101
     enum ShellMode Media
-sw/inc/view.hxx:99
+sw/inc/view.hxx:102
     enum ShellMode ExtrudedCustomShape
-sw/inc/view.hxx:100
+sw/inc/view.hxx:103
     enum ShellMode FontWork
-sw/inc/view.hxx:101
+sw/inc/view.hxx:104
     enum ShellMode PostIt
-sw/inc/view.hxx:649
+sw/inc/view.hxx:691
     enum SwView::CachedStringID OldGrfCat
-sw/inc/view.hxx:650
+sw/inc/view.hxx:692
     enum SwView::CachedStringID OldTabCat
-sw/inc/view.hxx:651
+sw/inc/view.hxx:693
     enum SwView::CachedStringID OldFrameCat
-sw/inc/view.hxx:652
+sw/inc/view.hxx:694
     enum SwView::CachedStringID OldDrwCat
-sw/inc/view.hxx:653
+sw/inc/view.hxx:695
     enum SwView::CachedStringID CachedStrings
-sw/inc/viewopt.hxx:46
-    enum ViewOptFlags1 Pagebreak
-sw/inc/viewopt.hxx:47
-    enum ViewOptFlags1 Columnbreak
-sw/inc/viewopt.hxx:50
-    enum ViewOptFlags1 Ref
-sw/inc/viewopt.hxx:92
+sw/inc/viewopt.hxx:162
     enum ViewOptFlags2 Modified
-sw/inc/viewopt.hxx:114
+sw/inc/viewopt.hxx:184
     enum ViewOptFlags DocBoundaries
-sw/inc/viewopt.hxx:115
+sw/inc/viewopt.hxx:185
     enum ViewOptFlags ObjectBoundaries
-sw/inc/viewopt.hxx:116
+sw/inc/viewopt.hxx:186
     enum ViewOptFlags TableBoundaries
-sw/inc/viewopt.hxx:117
+sw/inc/viewopt.hxx:187
     enum ViewOptFlags IndexShadings
-sw/inc/viewopt.hxx:118
+sw/inc/viewopt.hxx:188
     enum ViewOptFlags Links
-sw/inc/viewopt.hxx:119
+sw/inc/viewopt.hxx:189
     enum ViewOptFlags VisitedLinks
-sw/inc/viewopt.hxx:120
+sw/inc/viewopt.hxx:190
     enum ViewOptFlags FieldShadings
-sw/inc/viewopt.hxx:121
+sw/inc/viewopt.hxx:191
     enum ViewOptFlags SectionBoundaries
-sw/inc/viewopt.hxx:122
+sw/inc/viewopt.hxx:192
     enum ViewOptFlags Shadow
+sw/qa/extras/globalfilter/globalfilter.cxx:1342
+    enum (unnamed at /home/noel/libo-plugin/sw/qa/extras/globalfilter/globalfilter.cxx:1338:5) LblFoundText
+sw/qa/extras/globalfilter/globalfilter.cxx:1736
+    enum (unnamed at /home/noel/libo-plugin/sw/qa/extras/globalfilter/globalfilter.cxx:1733:5) Artifact
+sw/qa/extras/globalfilter/globalfilter.cxx:1737
+    enum (unnamed at /home/noel/libo-plugin/sw/qa/extras/globalfilter/globalfilter.cxx:1733:5) Tagged
 sw/source/core/access/accfrmobjmap.hxx:36
     enum SwAccessibleChildMapKey::LayerId CONTROLS
 sw/source/core/access/accfrmobjmap.hxx:36
@@ -4804,531 +5258,509 @@ sw/source/core/access/accfrmobjmap.hxx:36
     enum SwAccessibleChildMapKey::LayerId TEXT
 sw/source/core/access/accfrmobjmap.hxx:36
     enum SwAccessibleChildMapKey::LayerId XWINDOW
-sw/source/core/fields/cellfml.cxx:58
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/sw/source/core/fields/cellfml.cxx:56:1) cMAXSTACKSIZE
+sw/source/core/fields/cellfml.cxx:61
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/sw/source/core/fields/cellfml.cxx:59:1) cMAXSTACKSIZE
 sw/source/core/inc/ascharanchoredobjectposition.hxx:51
     enum sw::LineAlign TOP
 sw/source/core/inc/dbg_lay.hxx:56
     enum DbgAction NextSect
 sw/source/core/inc/dbg_lay.hxx:56
     enum DbgAction PrevSect
-sw/source/core/inc/frame.hxx:474
+sw/source/core/inc/frame.hxx:492
     enum SwFrame::InvalidationType INVALID_LINENUM
-sw/source/core/inc/frame.hxx:474
+sw/source/core/inc/frame.hxx:492
     enum SwFrame::InvalidationType INVALID_PRTAREA
-sw/source/core/inc/frame.hxx:474
+sw/source/core/inc/frame.hxx:492
     enum SwFrame::InvalidationType INVALID_SIZE
-sw/source/core/inc/mvsave.hxx:72
+sw/source/core/inc/layact.hxx:201
+    enum IdleJobArea ALL
+sw/source/core/inc/mvsave.hxx:73
     enum sw::mark::RestoreMode All
-sw/source/core/inc/rolbck.hxx:60
+sw/source/core/inc/rolbck.hxx:62
     enum HISTORY_HINT HSTRY_SETFMTHNT
-sw/source/core/inc/rolbck.hxx:61
+sw/source/core/inc/rolbck.hxx:63
     enum HISTORY_HINT HSTRY_RESETFMTHNT
-sw/source/core/inc/rolbck.hxx:62
+sw/source/core/inc/rolbck.hxx:64
     enum HISTORY_HINT HSTRY_SETTXTHNT
-sw/source/core/inc/rolbck.hxx:63
+sw/source/core/inc/rolbck.hxx:65
     enum HISTORY_HINT HSTRY_SETTXTFLDHNT
-sw/source/core/inc/rolbck.hxx:64
-    enum HISTORY_HINT HSTRY_SETREFMARKHNT
-sw/source/core/inc/rolbck.hxx:67
+sw/source/core/inc/rolbck.hxx:69
     enum HISTORY_HINT HSTRY_SETFTNHNT
-sw/source/core/inc/rolbck.hxx:68
-    enum HISTORY_HINT HSTRY_CHGFMTCOLL
 sw/source/core/inc/rolbck.hxx:70
-    enum HISTORY_HINT HSTRY_BOOKMARK
-sw/source/core/inc/rolbck.hxx:71
+    enum HISTORY_HINT HSTRY_CHGFMTCOLL
+sw/source/core/inc/rolbck.hxx:73
     enum HISTORY_HINT HSTRY_SETATTRSET
-sw/source/core/inc/rolbck.hxx:72
+sw/source/core/inc/rolbck.hxx:74
     enum HISTORY_HINT HSTRY_CHGFLYANCHOR
-sw/source/core/inc/rolbck.hxx:73
+sw/source/core/inc/rolbck.hxx:75
     enum HISTORY_HINT HSTRY_CHGFLYCHAIN
-sw/source/core/inc/rolbck.hxx:74
+sw/source/core/inc/rolbck.hxx:76
     enum HISTORY_HINT HSTRY_CHGCHARFMT
-sw/source/core/inc/rolbck.hxx:75
+sw/source/core/inc/rolbck.hxx:77
     enum HISTORY_HINT HSTRY_NOTEXTFIELDMARK
-sw/source/core/inc/rolbck.hxx:76
+sw/source/core/inc/rolbck.hxx:78
     enum HISTORY_HINT HSTRY_TEXTFIELDMARK
-sw/source/core/inc/rootfrm.hxx:72
+sw/source/core/inc/rootfrm.hxx:51
+    enum sw::ParagraphBreakMode Shown
+sw/source/core/inc/rootfrm.hxx:73
     enum SwRemoveResult Prev
-sw/source/core/inc/sectfrm.hxx:33
+sw/source/core/inc/rootfrm.hxx:346
+    enum SwRootFrame::RectsMode Default
+sw/source/core/inc/scriptinfo.hxx:47
+    enum SwScriptInfo::CompType SPECIAL_RIGHT
+sw/source/core/inc/sectfrm.hxx:35
     enum SwFindMode LastCnt
-sw/source/core/inc/SwXMLBlockImport.hxx:103
+sw/source/core/inc/SwXMLBlockImport.hxx:102
     enum SwXMLBlockListToken ABBREVIATED_NAME
-sw/source/core/inc/SwXMLBlockImport.hxx:106
+sw/source/core/inc/SwXMLBlockImport.hxx:105
     enum SwXMLBlockListToken LIST_NAME
-sw/source/core/inc/SwXMLBlockImport.hxx:107
+sw/source/core/inc/SwXMLBlockImport.hxx:106
     enum SwXMLBlockListToken NAME
-sw/source/core/inc/SwXMLBlockImport.hxx:108
+sw/source/core/inc/SwXMLBlockImport.hxx:107
     enum SwXMLBlockListToken PACKAGE_NAME
-sw/source/core/inc/SwXMLBlockImport.hxx:109
+sw/source/core/inc/SwXMLBlockImport.hxx:108
     enum SwXMLBlockListToken UNFORMATTED_TEXT
-sw/source/core/inc/txmsrt.hxx:43
+sw/source/core/inc/txmsrt.hxx:46
     enum TOXSortType TOX_SORT_AUTHORITY
-sw/source/core/inc/txtfrm.hxx:102
+sw/source/core/inc/txtfrm.hxx:110
     enum sw::FrameMode New
-sw/source/core/inc/txtfrm.hxx:127
-    enum sw::Recreate ThisNode
-sw/source/core/inc/UndoManager.hxx:121
+sw/source/core/inc/UndoManager.hxx:132
     enum sw::UndoManager::UndoOrRedoType Redo
-sw/source/core/inc/wrong.hxx:62
+sw/source/core/inc/wrong.hxx:60
     enum WrongListType WRONGLIST_CHANGETRACKING
-sw/source/core/layout/paintfrm.cxx:2247
+sw/source/core/layout/paintfrm.cxx:2258
     enum (anonymous namespace)::SwLineEntry::OverlapType NO_OVERLAP
-sw/source/core/text/pormulti.hxx:41
+sw/source/core/text/inftxt.hxx:524
+    enum SwTextFormatInfo::TabSeen Left
+sw/source/core/text/porlay.hxx:325
+    enum SwParaPortion::FootnoteOrNot OnlyNumbering
+sw/source/core/text/pormulti.hxx:40
     enum SwMultiCreatorId Double
-sw/source/core/text/pormulti.hxx:47
-    enum RubyPosition BELOW
-sw/source/filter/html/css1atr.cxx:105
-    enum (anonymous namespace)::Css1Background Attr
-sw/source/filter/html/css1atr.cxx:109
-    enum (anonymous namespace)::Css1Background Section
-sw/source/filter/html/css1atr.cxx:115
+sw/source/core/txtnode/justify.cxx:22
+    enum (anonymous namespace)::IdeographicPunctuationClass CLOSE_BRACKET
+sw/source/core/txtnode/justify.cxx:23
+    enum (anonymous namespace)::IdeographicPunctuationClass COMMA_OR_FULLSTOP
+sw/source/core/unocore/unoportenum.cxx:91
+    enum (anonymous namespace)::BkmType Start
+sw/source/filter/html/css1atr.cxx:110
     enum (anonymous namespace)::Css1FrameSize MinHeight
-sw/source/filter/html/css1atr.cxx:116
+sw/source/filter/html/css1atr.cxx:111
     enum (anonymous namespace)::Css1FrameSize FixHeight
-sw/source/filter/html/htmlatr.cxx:1060
+sw/source/filter/html/htmlatr.cxx:1082
     enum (anonymous namespace)::HTMLOnOffState HTML_NOT_SUPPORTED
-sw/source/filter/html/htmlfly.hxx:34
-    enum SwHTMLFrameType HTML_FRMTYPE_TABLE
 sw/source/filter/html/htmlfly.hxx:35
-    enum SwHTMLFrameType HTML_FRMTYPE_TABLE_CAP
+    enum SwHTMLFrameType HTML_FRMTYPE_TABLE
 sw/source/filter/html/htmlfly.hxx:36
-    enum SwHTMLFrameType HTML_FRMTYPE_MULTICOL
+    enum SwHTMLFrameType HTML_FRMTYPE_TABLE_CAP
 sw/source/filter/html/htmlfly.hxx:37
-    enum SwHTMLFrameType HTML_FRMTYPE_EMPTY
+    enum SwHTMLFrameType HTML_FRMTYPE_MULTICOL
 sw/source/filter/html/htmlfly.hxx:38
-    enum SwHTMLFrameType HTML_FRMTYPE_TEXT
+    enum SwHTMLFrameType HTML_FRMTYPE_EMPTY
 sw/source/filter/html/htmlfly.hxx:39
-    enum SwHTMLFrameType HTML_FRMTYPE_GRF
+    enum SwHTMLFrameType HTML_FRMTYPE_TEXT
 sw/source/filter/html/htmlfly.hxx:40
-    enum SwHTMLFrameType HTML_FRMTYPE_PLUGIN
+    enum SwHTMLFrameType HTML_FRMTYPE_GRF
 sw/source/filter/html/htmlfly.hxx:41
-    enum SwHTMLFrameType HTML_FRMTYPE_APPLET
+    enum SwHTMLFrameType HTML_FRMTYPE_PLUGIN
 sw/source/filter/html/htmlfly.hxx:42
-    enum SwHTMLFrameType HTML_FRMTYPE_IFRAME
+    enum SwHTMLFrameType HTML_FRMTYPE_APPLET
 sw/source/filter/html/htmlfly.hxx:43
-    enum SwHTMLFrameType HTML_FRMTYPE_OLE
+    enum SwHTMLFrameType HTML_FRMTYPE_IFRAME
 sw/source/filter/html/htmlfly.hxx:44
-    enum SwHTMLFrameType HTML_FRMTYPE_MARQUEE
+    enum SwHTMLFrameType HTML_FRMTYPE_OLE
 sw/source/filter/html/htmlfly.hxx:45
-    enum SwHTMLFrameType HTML_FRMTYPE_CONTROL
+    enum SwHTMLFrameType HTML_FRMTYPE_MARQUEE
 sw/source/filter/html/htmlfly.hxx:46
-    enum SwHTMLFrameType HTML_FRMTYPE_DRAW
+    enum SwHTMLFrameType HTML_FRMTYPE_CONTROL
 sw/source/filter/html/htmlfly.hxx:47
-    enum SwHTMLFrameType HTML_FRMTYPE_END
-sw/source/filter/html/htmlfly.hxx:66
-    enum HtmlPosition Prefix
+    enum SwHTMLFrameType HTML_FRMTYPE_DRAW
 sw/source/filter/html/htmlfly.hxx:67
+    enum HtmlPosition Prefix
+sw/source/filter/html/htmlfly.hxx:68
     enum HtmlPosition Before
-sw/source/filter/html/htmlform.cxx:106
+sw/source/filter/html/htmlform.cxx:112
     enum (anonymous namespace)::HTMLWordWrapMode HTML_WM_SOFT
-sw/source/filter/html/htmlforw.cxx:697
+sw/source/filter/html/htmlforw.cxx:691
     enum Tag TAG_INPUT
-sw/source/filter/html/htmlforw.cxx:703
+sw/source/filter/html/htmlforw.cxx:697
     enum Type TYPE_PASSWORD
-sw/source/filter/html/htmlforw.cxx:704
+sw/source/filter/html/htmlforw.cxx:698
     enum Type TYPE_BUTTON
-sw/source/filter/html/htmlforw.cxx:704
+sw/source/filter/html/htmlforw.cxx:698
     enum Type TYPE_RESET
-sw/source/filter/html/htmlforw.cxx:704
+sw/source/filter/html/htmlforw.cxx:698
     enum Type TYPE_SUBMIT
-sw/source/filter/html/parcss1.hxx:66
+sw/source/filter/html/parcss1.hxx:67
     enum CSS1ParserState CSS1_PAR_ACCEPTED
 sw/source/filter/html/svxcss1.hxx:42
     enum SvxCSS1Position SVX_CSS1_POS_STATIC
 sw/source/filter/html/svxcss1.hxx:44
     enum SvxCSS1Position SVX_CSS1_POS_RELATIVE
-sw/source/filter/html/svxcss1.hxx:50
-    enum SvxCSS1LengthType SVX_CSS1_LTYPE_AUTO
 sw/source/filter/html/svxcss1.hxx:59
     enum SvxCSS1SizeType SVX_CSS1_STYPE_AUTO
-sw/source/filter/html/swhtml.hxx:198
+sw/source/filter/html/swhtml.hxx:204
     enum SwHTMLAppendMode AM_NORMAL
-sw/source/filter/html/swhtml.hxx:318
+sw/source/filter/html/swhtml.hxx:324
     enum HtmlContextFlags MultiColMask
-sw/source/filter/html/wrthtml.hxx:108
-    enum HtmlFrmOpts GenImgAllMask
 sw/source/filter/html/wrthtml.hxx:109
+    enum HtmlFrmOpts GenImgAllMask
+sw/source/filter/html/wrthtml.hxx:110
     enum HtmlFrmOpts GenImgMask
-sw/source/filter/inc/fltshell.hxx:102
+sw/source/filter/html/wrthtml.hxx:262
+    enum sw::Css1Background Attr
+sw/source/filter/html/wrthtml.hxx:266
+    enum sw::Css1Background Section
+sw/source/filter/inc/fltshell.hxx:100
     enum SwFltStackEntry::RegionMode NoCheck
-sw/source/filter/inc/fltshell.hxx:147
+sw/source/filter/inc/fltshell.hxx:128
     enum SwFltControlStack::MoveAttrsMode DEFAULT
-sw/source/filter/inc/fltshell.hxx:151
+sw/source/filter/inc/fltshell.hxx:132
     enum SwFltControlStack::Flags HYPO
-sw/source/filter/inc/fltshell.hxx:152
+sw/source/filter/inc/fltshell.hxx:133
     enum SwFltControlStack::Flags TAGS_DO_ID
-sw/source/filter/inc/fltshell.hxx:153
+sw/source/filter/inc/fltshell.hxx:134
     enum SwFltControlStack::Flags TAGS_VISIBLE
-sw/source/filter/inc/fltshell.hxx:154
+sw/source/filter/inc/fltshell.hxx:135
     enum SwFltControlStack::Flags BOOK_TO_VAR_REF
-sw/source/filter/inc/fltshell.hxx:155
+sw/source/filter/inc/fltshell.hxx:136
     enum SwFltControlStack::Flags BOOK_AND_REF
-sw/source/filter/inc/fltshell.hxx:156
+sw/source/filter/inc/fltshell.hxx:137
     enum SwFltControlStack::Flags TAGS_IN_TEXT
-sw/source/filter/inc/fltshell.hxx:157
+sw/source/filter/inc/fltshell.hxx:138
     enum SwFltControlStack::Flags ALLOW_FLD_CR
-sw/source/filter/inc/wrt_fn.hxx:42
-    enum RES_NODE RES_NODE_BEGIN
 sw/source/filter/inc/wrt_fn.hxx:43
-    enum RES_NODE RES_TXTNODE
+    enum RES_NODE RES_NODE_BEGIN
 sw/source/filter/inc/wrt_fn.hxx:44
-    enum RES_NODE RES_GRFNODE
+    enum RES_NODE RES_TXTNODE
 sw/source/filter/inc/wrt_fn.hxx:45
-    enum RES_NODE RES_OLENODE
+    enum RES_NODE RES_GRFNODE
 sw/source/filter/inc/wrt_fn.hxx:46
+    enum RES_NODE RES_OLENODE
+sw/source/filter/inc/wrt_fn.hxx:47
     enum RES_NODE RES_NODE_END
-sw/source/filter/ww8/sprmids.hxx:244
-    enum NS_sprm::SGC paragraph
+sw/source/filter/ww8/docxattributeoutput.hxx:1031
+    enum DocxAttributeOutput::ParentStatus IsParent
+sw/source/filter/ww8/docxattributeoutput.hxx:1115
+    enum DocxAttributeOutput::hasProperties no
 sw/source/filter/ww8/sprmids.hxx:245
-    enum NS_sprm::SGC character
+    enum NS_sprm::SGC paragraph
 sw/source/filter/ww8/sprmids.hxx:246
-    enum NS_sprm::SGC picture
+    enum NS_sprm::SGC character
 sw/source/filter/ww8/sprmids.hxx:247
-    enum NS_sprm::SGC section
+    enum NS_sprm::SGC picture
 sw/source/filter/ww8/sprmids.hxx:248
+    enum NS_sprm::SGC section
+sw/source/filter/ww8/sprmids.hxx:249
     enum NS_sprm::SGC table
-sw/source/filter/ww8/sprmids.hxx:252
-    enum NS_sprm::SPRA operand_toggle_1b_0
 sw/source/filter/ww8/sprmids.hxx:253
-    enum NS_sprm::SPRA operand_1b_1
+    enum NS_sprm::SPRA operand_toggle_1b_0
 sw/source/filter/ww8/sprmids.hxx:254
-    enum NS_sprm::SPRA operand_2b_2
+    enum NS_sprm::SPRA operand_1b_1
 sw/source/filter/ww8/sprmids.hxx:255
-    enum NS_sprm::SPRA operand_4b_3
+    enum NS_sprm::SPRA operand_2b_2
 sw/source/filter/ww8/sprmids.hxx:256
-    enum NS_sprm::SPRA operand_2b_4
+    enum NS_sprm::SPRA operand_4b_3
 sw/source/filter/ww8/sprmids.hxx:257
+    enum NS_sprm::SPRA operand_2b_4
+sw/source/filter/ww8/sprmids.hxx:258
     enum NS_sprm::SPRA operand_2b_5
-sw/source/filter/ww8/sprmids.hxx:259
+sw/source/filter/ww8/sprmids.hxx:260
     enum NS_sprm::SPRA operand_3b_7
-sw/source/filter/ww8/wrtww8.hxx:815
+sw/source/filter/ww8/wrtww8.hxx:831
     enum MSWordExportBase::ExportFormat DOC
-sw/source/filter/ww8/ww8par2.cxx:1637
+sw/source/filter/ww8/ww8par2.cxx:1634
     enum (anonymous namespace)::wwTableSprm sprmNil
-sw/source/filter/ww8/ww8par2.hxx:292
+sw/source/filter/ww8/ww8par2.hxx:300
     enum WW8LvlType WW8_Sequence
-sw/source/filter/ww8/ww8par.cxx:5778
-    enum (anonymous at /home/noel/libo2/sw/source/filter/ww8/ww8par.cxx:5778:5) Other
-sw/source/filter/ww8/ww8par.hxx:155
+sw/source/filter/ww8/ww8par.cxx:5795
+    enum (unnamed at /home/noel/libo-plugin/sw/source/filter/ww8/ww8par.cxx:5795:5) Other
+sw/source/filter/ww8/ww8par.hxx:157
     enum WW8ListManager::ListLevel nMinLevel
-sw/source/filter/ww8/ww8scan.hxx:384
+sw/source/filter/ww8/ww8scan.hxx:385
     enum ePLCFT PLCF_END
-sw/source/filter/ww8/ww8scan.hxx:387
+sw/source/filter/ww8/ww8scan.hxx:388
     enum eExtSprm eATNBKN
-sw/source/filter/ww8/ww8scan.hxx:387
+sw/source/filter/ww8/ww8scan.hxx:388
     enum eExtSprm eBKN
-sw/source/filter/ww8/ww8scan.hxx:387
+sw/source/filter/ww8/ww8scan.hxx:388
     enum eExtSprm eFACTOIDBKN
 sw/source/filter/ww8/ww8scan.hxx:746
     enum eBookStatus BOOK_NORMAL
 sw/source/filter/ww8/ww8scan.hxx:866
     enum ManMaskTypes MAN_MASK_NEW_SEP
-sw/source/filter/ww8/ww8scan.hxx:935
+sw/source/filter/ww8/ww8scan.hxx:934
     enum WW8PLCFMan::WW8PLCFManLimits MAN_PLCF_COUNT
 sw/source/filter/ww8/ww8struc.hxx:358
     enum BRC_Sides WW8_BETW
 sw/source/filter/ww8/ww8struc.hxx:950
     enum WW8_FSPA::FSPAOrient RelPageBorder
 sw/source/filter/xml/xmlitemi.cxx:75
-    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(anonymous at /home/noel/libo2/sw/source/filter/xml/xmlitemi.cxx:75:5) BOTTOM
+    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(unnamed at /home/noel/libo-plugin/sw/source/filter/xml/xmlitemi.cxx:75:5) BOTTOM
 sw/source/filter/xml/xmlitemi.cxx:75
-    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(anonymous at /home/noel/libo2/sw/source/filter/xml/xmlitemi.cxx:75:5) LEFT
+    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(unnamed at /home/noel/libo-plugin/sw/source/filter/xml/xmlitemi.cxx:75:5) LEFT
 sw/source/filter/xml/xmlitemi.cxx:75
-    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(anonymous at /home/noel/libo2/sw/source/filter/xml/xmlitemi.cxx:75:5) RIGHT
+    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(unnamed at /home/noel/libo-plugin/sw/source/filter/xml/xmlitemi.cxx:75:5) RIGHT
 sw/source/filter/xml/xmlitemi.cxx:75
-    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(anonymous at /home/noel/libo2/sw/source/filter/xml/xmlitemi.cxx:75:5) TOP
-sw/source/filter/xml/xmlmeta.cxx:71
-    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_TABLE
+    enum (anonymous namespace)::SwXMLImportTableItemMapper_Impl::(unnamed at /home/noel/libo-plugin/sw/source/filter/xml/xmlitemi.cxx:75:5) TOP
 sw/source/filter/xml/xmlmeta.cxx:72
-    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_IMAGE
+    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_TABLE
 sw/source/filter/xml/xmlmeta.cxx:73
+    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_IMAGE
+sw/source/filter/xml/xmlmeta.cxx:74
     enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_OLE
-sw/source/filter/xml/xmlmeta.cxx:76
-    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_WORD
 sw/source/filter/xml/xmlmeta.cxx:77
-    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_CHAR
+    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_WORD
 sw/source/filter/xml/xmlmeta.cxx:78
-    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_NON_WHITE_SPACE_CHAR
+    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_CHAR
 sw/source/filter/xml/xmlmeta.cxx:79
+    enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_NON_WHITE_SPACE_CHAR
+sw/source/filter/xml/xmlmeta.cxx:80
     enum (anonymous namespace)::SvXMLTokenMapAttrs XML_TOK_META_STAT_END
-sw/source/ui/fldui/fldref.cxx:738
+sw/source/ui/fldui/fldref.cxx:55
+    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_TEXT_IDX
+sw/source/ui/fldui/fldref.cxx:56
+    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_UPDOWN_IDX
+sw/source/ui/fldui/fldref.cxx:57
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_PAGE_PGDSC_IDX
-sw/source/ui/fldui/fldref.cxx:741
+sw/source/ui/fldui/fldref.cxx:60
     enum (anonymous namespace)::FMT_REF_IDX FMT_REF_ONLYSEQNO_IDX
-sw/source/ui/fldui/fldref.cxx:742
-    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_NUMBER_IDX
-sw/source/ui/fldui/fldref.cxx:743
-    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_NUMBER_NO_CONTEXT_IDX
-sw/source/ui/fldui/fldref.cxx:744
-    enum (anonymous namespace)::FMT_REF_IDX FMT_REF_NUMBER_FULL_CONTEXT_IDX
-sw/source/ui/frmdlg/frmpage.cxx:97
+sw/source/ui/frmdlg/frmpage.cxx:101
     enum (anonymous namespace)::LB Frame
-sw/source/ui/frmdlg/frmpage.cxx:98
+sw/source/ui/frmdlg/frmpage.cxx:102
     enum (anonymous namespace)::LB PrintArea
-sw/source/ui/frmdlg/frmpage.cxx:99
+sw/source/ui/frmdlg/frmpage.cxx:103
     enum (anonymous namespace)::LB VertFrame
-sw/source/ui/frmdlg/frmpage.cxx:100
+sw/source/ui/frmdlg/frmpage.cxx:104
     enum (anonymous namespace)::LB VertPrintArea
-sw/source/ui/frmdlg/frmpage.cxx:101
+sw/source/ui/frmdlg/frmpage.cxx:105
     enum (anonymous namespace)::LB RelFrameLeft
-sw/source/ui/frmdlg/frmpage.cxx:102
+sw/source/ui/frmdlg/frmpage.cxx:106
     enum (anonymous namespace)::LB RelFrameRight
-sw/source/ui/frmdlg/frmpage.cxx:104
+sw/source/ui/frmdlg/frmpage.cxx:108
     enum (anonymous namespace)::LB RelPageLeft
-sw/source/ui/frmdlg/frmpage.cxx:105
+sw/source/ui/frmdlg/frmpage.cxx:109
     enum (anonymous namespace)::LB RelPageRight
-sw/source/ui/frmdlg/frmpage.cxx:106
+sw/source/ui/frmdlg/frmpage.cxx:110
     enum (anonymous namespace)::LB RelPageFrame
-sw/source/ui/frmdlg/frmpage.cxx:107
+sw/source/ui/frmdlg/frmpage.cxx:111
     enum (anonymous namespace)::LB RelPagePrintArea
-sw/source/ui/frmdlg/frmpage.cxx:109
+sw/source/ui/frmdlg/frmpage.cxx:113
     enum (anonymous namespace)::LB FlyRelPageLeft
-sw/source/ui/frmdlg/frmpage.cxx:110
+sw/source/ui/frmdlg/frmpage.cxx:114
     enum (anonymous namespace)::LB FlyRelPageRight
-sw/source/ui/frmdlg/frmpage.cxx:111
+sw/source/ui/frmdlg/frmpage.cxx:115
     enum (anonymous namespace)::LB FlyRelPageFrame
-sw/source/ui/frmdlg/frmpage.cxx:112
+sw/source/ui/frmdlg/frmpage.cxx:116
     enum (anonymous namespace)::LB FlyRelPagePrintArea
-sw/source/ui/frmdlg/frmpage.cxx:114
+sw/source/ui/frmdlg/frmpage.cxx:118
     enum (anonymous namespace)::LB RelBase
-sw/source/ui/frmdlg/frmpage.cxx:116
+sw/source/ui/frmdlg/frmpage.cxx:120
     enum (anonymous namespace)::LB RelRow
-sw/source/ui/frmdlg/frmpage.cxx:118
+sw/source/ui/frmdlg/frmpage.cxx:122
     enum (anonymous namespace)::LB FlyVertFrame
-sw/source/ui/frmdlg/frmpage.cxx:119
+sw/source/ui/frmdlg/frmpage.cxx:123
     enum (anonymous namespace)::LB FlyVertPrintArea
-sw/source/ui/frmdlg/frmpage.cxx:121
+sw/source/ui/frmdlg/frmpage.cxx:125
     enum (anonymous namespace)::LB VertLine
-sw/source/uibase/dbui/dbmgr.cxx:151
+sw/source/uibase/dbui/dbmgr.cxx:168
     enum (anonymous namespace)::WorkingDocType COPY
-sw/source/uibase/docvw/edtwin.cxx:1607
+sw/source/uibase/docvw/edtwin.cxx:1673
     enum SwKeyState NumOrNoNum
-sw/source/uibase/docvw/edtwin.cxx:6115
+sw/source/uibase/docvw/edtwin.cxx:6416
     enum Capitalization CASE_OTHER
-sw/source/uibase/fldui/fldmgr.cxx:84
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_DOC_BEGIN
-sw/source/uibase/fldui/fldmgr.cxx:85
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_DOC_END
-sw/source/uibase/fldui/fldmgr.cxx:87
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_FKT_BEGIN
-sw/source/uibase/fldui/fldmgr.cxx:88
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_FKT_END
-sw/source/uibase/fldui/fldmgr.cxx:90
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_REF_BEGIN
-sw/source/uibase/fldui/fldmgr.cxx:91
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_REF_END
 sw/source/uibase/fldui/fldmgr.cxx:93
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_REG_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_DOC_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:94
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_REG_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_DOC_END
 sw/source/uibase/fldui/fldmgr.cxx:96
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_DB_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_FKT_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:97
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_DB_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_FKT_END
 sw/source/uibase/fldui/fldmgr.cxx:99
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_VAR_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_REF_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:100
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:82:1) GRP_VAR_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_REF_END
+sw/source/uibase/fldui/fldmgr.cxx:102
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_REG_BEGIN
+sw/source/uibase/fldui/fldmgr.cxx:103
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_REG_END
 sw/source/uibase/fldui/fldmgr.cxx:105
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_DOC_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_DB_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:106
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_DOC_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_DB_END
 sw/source/uibase/fldui/fldmgr.cxx:108
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_FKT_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_VAR_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:109
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_FKT_END
-sw/source/uibase/fldui/fldmgr.cxx:111
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_REF_BEGIN
-sw/source/uibase/fldui/fldmgr.cxx:112
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_REF_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:91:1) GRP_VAR_END
 sw/source/uibase/fldui/fldmgr.cxx:114
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_REG_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_DOC_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:115
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_REG_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_DOC_END
 sw/source/uibase/fldui/fldmgr.cxx:117
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_DB_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_FKT_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:118
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_DB_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_FKT_END
 sw/source/uibase/fldui/fldmgr.cxx:120
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_VAR_BEGIN
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_REF_BEGIN
 sw/source/uibase/fldui/fldmgr.cxx:121
-    enum (anonymous at /home/noel/libo2/sw/source/uibase/fldui/fldmgr.cxx:103:1) GRP_WEB_VAR_END
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_REF_END
+sw/source/uibase/fldui/fldmgr.cxx:123
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_REG_BEGIN
+sw/source/uibase/fldui/fldmgr.cxx:124
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_REG_END
+sw/source/uibase/fldui/fldmgr.cxx:126
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_DB_BEGIN
+sw/source/uibase/fldui/fldmgr.cxx:127
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_DB_END
+sw/source/uibase/fldui/fldmgr.cxx:129
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_VAR_BEGIN
+sw/source/uibase/fldui/fldmgr.cxx:130
+    enum (unnamed at /home/noel/libo-plugin/sw/source/uibase/fldui/fldmgr.cxx:112:1) GRP_WEB_VAR_END
 sw/source/uibase/inc/chrdlgmodes.hxx:15
     enum SwCharDlgMode Env
 sw/source/uibase/inc/frmmgr.hxx:47
     enum Frmmgr_Type ENVELP
-sw/source/uibase/inc/pview.hxx:123
+sw/source/uibase/inc/pview.hxx:122
     enum SwPagePreviewWin::MoveMode MV_SPECIFIC_PAGE
-sw/source/uibase/inc/swdtflvr.hxx:61
+sw/source/uibase/inc/swdtflvr.hxx:62
     enum TransferBufferType Drawing
-sw/source/uibase/inc/swdtflvr.hxx:69
+sw/source/uibase/inc/swdtflvr.hxx:70
     enum PasteTableType PASTE_DEFAULT
-sw/source/uibase/inc/wrtsh.hxx:79
+sw/source/uibase/inc/wrtsh.hxx:85
     enum SelectionType All
-sw/source/uibase/inc/wrtsh.hxx:354
+sw/source/uibase/inc/wrtsh.hxx:365
     enum SwWrtShell::GetStyle GETSTYLE_CREATESOME
-sw/source/uibase/inc/wrtsh.hxx:522
+sw/source/uibase/inc/wrtsh.hxx:550
     enum SwWrtShell::PageMove MV_PAGE_UP
-sw/source/uibase/inc/wrtsh.hxx:523
+sw/source/uibase/inc/wrtsh.hxx:551
     enum SwWrtShell::PageMove MV_PAGE_DOWN
-sw/source/uibase/ribbar/workctrl.cxx:938
+sw/source/uibase/ribbar/workctrl.cxx:799
     enum (anonymous namespace)::PrevNextScrollToolboxController::Type NEXT
-sw/source/uibase/uno/unomailmerge.cxx:89
+sw/source/uibase/uno/unomailmerge.cxx:92
     enum (anonymous namespace)::CloseResult eSuccess
-sw/source/uibase/uno/unomailmerge.cxx:91
+sw/source/uibase/uno/unomailmerge.cxx:94
     enum (anonymous namespace)::CloseResult eFailed
-sw/source/uibase/utlui/content.cxx:848
-    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_HYPERLINK
-sw/source/uibase/utlui/content.cxx:852
+sw/source/uibase/utlui/content.cxx:1064
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_ACTIVE_VIEW
-sw/source/uibase/utlui/content.cxx:853
+sw/source/uibase/utlui/content.cxx:1065
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_HIDDEN
-sw/source/uibase/utlui/content.cxx:854
+sw/source/uibase/utlui/content.cxx:1066
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_ACTIVE
-sw/source/uibase/utlui/content.cxx:859
+sw/source/uibase/utlui/content.cxx:1067
+    enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_INACTIVE
+sw/source/uibase/utlui/content.cxx:1071
     enum (anonymous namespace)::STR_CONTEXT_IDX IDX_STR_OUTLINE_TRACKING
-sw/source/uibase/utlui/glbltree.cxx:95
+sw/source/uibase/utlui/glbltree.cxx:99
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_INSERT_TEXT
-sw/source/uibase/utlui/glbltree.cxx:101
+sw/source/uibase/utlui/glbltree.cxx:105
     enum (anonymous namespace)::GLOBAL_CONTEXT_IDX IDX_STR_BROKEN_LINK
-sw/source/uibase/utlui/navipi.cxx:485
-    enum (anonymous namespace)::StatusIndex IDX_STR_HIDDEN
-sw/source/uibase/utlui/navipi.cxx:486
-    enum (anonymous namespace)::StatusIndex IDX_STR_ACTIVE
-sw/source/uibase/utlui/navipi.cxx:487
-    enum (anonymous namespace)::StatusIndex IDX_STR_INACTIVE
-toolkit/inc/helper/msgbox.hxx:33
+toolkit/inc/controls/table/tablecontrolinterface.hxx:75
+    enum svt::table::TableCellArea CellContent
+toolkit/inc/controls/table/tablemodel.hxx:68
+    enum svt::table::ScrollbarVisibility ScrollbarShowSmart
+toolkit/inc/controls/table/tablesort.hxx:33
+    enum svt::table::ColumnSortDirection ColumnSortDescending
+toolkit/inc/helper/msgbox.hxx:34
     enum MessBoxStyle DefaultOk
-toolkit/source/helper/vclunohelper.cxx:355
+toolkit/source/helper/vclunohelper.cxx:351
     enum (anonymous namespace)::UnitConversionDirection MeasurementUnitToFieldUnit
-tools/source/fsys/urlobj.cxx:307
+tools/source/fsys/urlobj.cxx:309
     enum INetURLObject::PrefixInfo::Kind Official
-tools/source/fsys/urlobj.cxx:439
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PA
-tools/source/fsys/urlobj.cxx:440
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PD
-tools/source/fsys/urlobj.cxx:441
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PE
-tools/source/fsys/urlobj.cxx:442
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PF
-tools/source/fsys/urlobj.cxx:443
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PG
-tools/source/fsys/urlobj.cxx:444
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PH
-tools/source/fsys/urlobj.cxx:445
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PI
-tools/source/fsys/urlobj.cxx:446
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PJ
-tools/source/fsys/urlobj.cxx:447
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PK
-tools/source/fsys/urlobj.cxx:448
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PL
-tools/source/fsys/urlobj.cxx:449
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PM
-tools/source/fsys/urlobj.cxx:450
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PN
-tools/source/fsys/urlobj.cxx:451
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PO
-tools/source/fsys/urlobj.cxx:452
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PP
-tools/source/fsys/urlobj.cxx:453
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PQ
-tools/source/fsys/urlobj.cxx:454
-    enum (anonymous namespace)::(anonymous at /home/noel/libo2/tools/source/fsys/urlobj.cxx:437:1) PR
-tools/source/fsys/urlobj.cxx:1616
+tools/source/fsys/urlobj.cxx:471
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PA
+tools/source/fsys/urlobj.cxx:472
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PD
+tools/source/fsys/urlobj.cxx:473
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PE
+tools/source/fsys/urlobj.cxx:474
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PF
+tools/source/fsys/urlobj.cxx:475
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PG
+tools/source/fsys/urlobj.cxx:476
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PH
+tools/source/fsys/urlobj.cxx:477
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PI
+tools/source/fsys/urlobj.cxx:478
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PJ
+tools/source/fsys/urlobj.cxx:479
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PK
+tools/source/fsys/urlobj.cxx:480
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PL
+tools/source/fsys/urlobj.cxx:481
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PM
+tools/source/fsys/urlobj.cxx:482
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PN
+tools/source/fsys/urlobj.cxx:483
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PO
+tools/source/fsys/urlobj.cxx:484
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PP
+tools/source/fsys/urlobj.cxx:485
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PQ
+tools/source/fsys/urlobj.cxx:486
+    enum (anonymous namespace)::(unnamed at /home/noel/libo-plugin/tools/source/fsys/urlobj.cxx:469:1) PR
+tools/source/fsys/urlobj.cxx:1725
     enum State STATE_DONE
-ucb/source/ucp/ext/ucpext_content.hxx:43
+ucb/source/ucp/ext/ucpext_content.hxx:42
     enum ucb::ucp::ext::ExtensionContentType E_UNKNOWN
-ucb/source/ucp/ftp/ftpdirp.hxx:66
-    enum ftp::FTPDirentryMode INETCOREFTP_FILEMODE_READ
-ucb/source/ucp/ftp/ftpdirp.hxx:69
-    enum ftp::FTPDirentryMode INETCOREFTP_FILEMODE_ISLINK
-ucb/source/ucp/hierarchy/hierarchycontent.hxx:103
+ucb/source/ucp/hierarchy/hierarchycontent.hxx:102
     enum hierarchy_ucp::HierarchyContent::ContentState DEAD
-ucb/source/ucp/package/pkgcontent.hxx:90
+ucb/source/ucp/package/pkgcontent.hxx:92
     enum package_ucp::Content::ContentState TRANSIENT
-ucb/source/ucp/package/pkgcontent.hxx:93
+ucb/source/ucp/package/pkgcontent.hxx:95
     enum package_ucp::Content::ContentState DEAD
-ucb/source/ucp/tdoc/tdoc_content.hxx:90
+ucb/source/ucp/tdoc/tdoc_content.hxx:94
     enum tdoc_ucp::Content::ContentState DEAD
 ucb/source/ucp/tdoc/tdoc_uri.hxx:34
     enum tdoc_ucp::Uri::State INVALID
-ucb/source/ucp/webdav-neon/DAVException.hxx:131
-    enum webdav_ucp::DAVException::ExceptionCode DAV_HTTP_FAILED
-ucb/source/ucp/webdav-neon/DAVException.hxx:137
-    enum webdav_ucp::DAVException::ExceptionCode DAV_SESSION_CREATE
-ucb/source/ucp/webdav-neon/DAVTypes.hxx:192
-    enum webdav_ucp::Depth DAVONE
-ucb/source/ucp/webdav-neon/DAVTypes.hxx:192
-    enum webdav_ucp::Depth DAVZERO
-ucb/source/ucp/webdav-neon/DAVTypes.hxx:194
-    enum webdav_ucp::ProppatchOperation PROPREMOVE
-unoidl/source/sourceprovider-parser-requires.hxx:27
+ucb/source/ucp/webdav-curl/DAVException.hxx:124
+    enum http_dav_ucp::DAVException::ExceptionCode DAV_HTTP_FAILED
+ucb/source/ucp/webdav-curl/DAVException.hxx:130
+    enum http_dav_ucp::DAVException::ExceptionCode DAV_SESSION_CREATE
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:52
+    enum (anonymous namespace)::WebDAVNamespace WebDAVNamespace_unknown
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:79
+    enum (anonymous namespace)::WebDAVName WebDAVName_unknown
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:82
+    enum (anonymous namespace)::WebDAVName WebDAVName_multistatus
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:86
+    enum (anonymous namespace)::WebDAVName WebDAVName_prop
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:92
+    enum (anonymous namespace)::WebDAVName WebDAVName_lockscope
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:96
+    enum (anonymous namespace)::WebDAVName WebDAVName_locktype
+ucb/source/ucp/webdav-curl/webdavresponseparser.cxx:301
+    enum (anonymous namespace)::WebDAVResponseParserMode WebDAVResponseParserMode_Lock
+unoidl/source/sourceprovider-parser-requires.hxx:28
     enum unoidl::detail::SourceProviderAccessDecls ACCESS_DECL_GET
-unoidl/source/sourceprovider-parser-requires.hxx:27
+unoidl/source/sourceprovider-parser-requires.hxx:28
     enum unoidl::detail::SourceProviderAccessDecls ACCESS_DECL_SET
-unoidl/source/unoidl-read.cxx:138
+unoidl/source/unoidl-read.cxx:143
     enum (anonymous namespace)::Entity::Written DECLARATION
-unoidl/source/unoidlprovider.cxx:467
+unoidl/source/unoidlprovider.cxx:469
     enum unoidl::detail::(anonymous namespace)::Compare COMPARE_EQUAL
-unotools/source/config/fltrcfg.cxx:41
-    enum (anonymous namespace)::ConfigFlags MathLoad
-unotools/source/config/fltrcfg.cxx:42
-    enum (anonymous namespace)::ConfigFlags MathSave
-unotools/source/config/fltrcfg.cxx:43
-    enum (anonymous namespace)::ConfigFlags WriterLoad
-unotools/source/config/fltrcfg.cxx:44
-    enum (anonymous namespace)::ConfigFlags WriterSave
-unotools/source/config/fltrcfg.cxx:45
-    enum (anonymous namespace)::ConfigFlags CalcLoad
-unotools/source/config/fltrcfg.cxx:46
-    enum (anonymous namespace)::ConfigFlags CalcSave
-unotools/source/config/fltrcfg.cxx:47
-    enum (anonymous namespace)::ConfigFlags ImpressLoad
-unotools/source/config/fltrcfg.cxx:48
-    enum (anonymous namespace)::ConfigFlags ImpressSave
-unotools/source/config/fltrcfg.cxx:50
-    enum (anonymous namespace)::ConfigFlags EnablePowerPointPreview
-unotools/source/config/fltrcfg.cxx:51
-    enum (anonymous namespace)::ConfigFlags EnableExcelPreview
-unotools/source/config/fltrcfg.cxx:52
-    enum (anonymous namespace)::ConfigFlags EnableWordPreview
-unotools/source/config/fltrcfg.cxx:53
-    enum (anonymous namespace)::ConfigFlags UseEnhancedFields
-unotools/source/config/fltrcfg.cxx:55
-    enum (anonymous namespace)::ConfigFlags SmartArtShapeLoad
-unotools/source/config/fltrcfg.cxx:56
-    enum (anonymous namespace)::ConfigFlags CharBackgroundToHighlighting
-unotools/source/config/fltrcfg.cxx:57
-    enum (anonymous namespace)::ConfigFlags CreateMSOLockFiles
-unotools/source/config/fltrcfg.cxx:58
-    enum (anonymous namespace)::ConfigFlags VisioLoad
-unotools/source/config/viewoptions.cxx:85
-    enum SvtViewOptionsBase_Impl::State STATE_FALSE
-unotools/source/misc/fontcvt.cxx:1018
+unotools/source/misc/fontcvt.cxx:1015
     enum (anonymous namespace)::SymbolFont MonotypeSorts
-unotools/source/misc/fontcvt.cxx:1018
+unotools/source/misc/fontcvt.cxx:1015
     enum (anonymous namespace)::SymbolFont Symbol
-unotools/source/misc/fontcvt.cxx:1018
+unotools/source/misc/fontcvt.cxx:1015
     enum (anonymous namespace)::SymbolFont Webdings
-unotools/source/misc/fontcvt.cxx:1018
+unotools/source/misc/fontcvt.cxx:1015
     enum (anonymous namespace)::SymbolFont Wingdings
-unotools/source/misc/fontcvt.cxx:1018
+unotools/source/misc/fontcvt.cxx:1015
     enum (anonymous namespace)::SymbolFont Wingdings2
-unotools/source/misc/fontcvt.cxx:1019
+unotools/source/misc/fontcvt.cxx:1016
     enum (anonymous namespace)::SymbolFont MTExtra
-unotools/source/misc/fontcvt.cxx:1019
+unotools/source/misc/fontcvt.cxx:1016
     enum (anonymous namespace)::SymbolFont TimesNewRoman
-unotools/source/misc/fontcvt.cxx:1019
+unotools/source/misc/fontcvt.cxx:1016
     enum (anonymous namespace)::SymbolFont Wingdings3
-unotools/source/ucbhelper/ucblockbytes.cxx:210
+unotools/source/ucbhelper/ucblockbytes.cxx:215
     enum utl::(anonymous namespace)::Moderator::ResultType GENERAL
-uui/source/iahndl-errorhandler.cxx:147
+uui/source/iahndl-errorhandler.cxx:148
     enum Source SOURCE_DEFAULT
-uui/source/iahndl-errorhandler.cxx:147
+uui/source/iahndl-errorhandler.cxx:148
     enum Source SOURCE_SVX
-uui/source/iahndl-errorhandler.cxx:147
+uui/source/iahndl-errorhandler.cxx:148
     enum Source SOURCE_UUI
 vcl/inc/driverblocklist.hxx:59
     enum DriverBlocklist::OperatingSystem DRIVER_OS_UNKNOWN
@@ -5352,209 +5784,253 @@ vcl/inc/driverblocklist.hxx:72
     enum DriverBlocklist::OperatingSystem DRIVER_OS_OSX_10_8
 vcl/inc/driverblocklist.hxx:75
     enum DriverBlocklist::OperatingSystem DRIVER_OS_ANDROID
-vcl/inc/headless/svpgdi.hxx:77
+vcl/inc/font/LogicalFontInstance.hxx:153
+    enum LogicalFontInstance::FontFamilyEnum Unclassified
+vcl/inc/font/PhysicalFontFace.hxx:105
+    vcl::font::NameID NAME_ID_FONT_FAMILY
+vcl/inc/fontsubset.hxx:34
+    enum FontType NO_FONT
+vcl/inc/fontsubset.hxx:36
+    enum FontType SFNT_CFF
+vcl/inc/headless/CairoCommon.hxx:109
     enum PaintMode Over
-vcl/inc/headless/svpinst.hxx:61
+vcl/inc/headless/svpinst.hxx:60
     enum SvpRequest MainThreadDispatchOneEvent
-vcl/inc/ppdparser.hxx:42
+vcl/inc/pdf/pdfwriter_impl.hxx:94
+    enum vcl::pdf::GraphicsStateUpdateFlags All
+vcl/inc/pdf/pdfwriter_impl.hxx:669
+    enum vcl::pdf::Mode DEFAULT
+vcl/inc/pdf/pdfwriter_impl.hxx:1062
+    enum vcl::PDFWriterImpl::EndMode Default
+vcl/inc/ppdparser.hxx:44
     enum psp::PPDValueType eQuoted
-vcl/inc/ppdparser.hxx:42
+vcl/inc/ppdparser.hxx:44
     enum psp::PPDValueType eString
-vcl/inc/ppdparser.hxx:42
+vcl/inc/ppdparser.hxx:44
     enum psp::PPDValueType eSymbol
-vcl/inc/ppdparser.hxx:77
-    enum psp::PPDKey::SetupType ExitServer
-vcl/inc/ppdparser.hxx:77
-    enum psp::PPDKey::SetupType JCLSetup
-vcl/inc/ppdparser.hxx:77
-    enum psp::PPDKey::SetupType Prolog
-vcl/inc/qt5/Qt5Graphics_Controls.hxx:86
-    enum Qt5Graphics_Controls::Round Floor
-vcl/inc/qt5/Qt5Widget.hxx:45
-    enum Qt5Widget::ButtonKeyState Released
-vcl/inc/regband.hxx:45
+vcl/inc/qt5/QtGraphics_Controls.hxx:87
+    enum QtGraphics_Controls::Round Floor
+vcl/inc/regband.hxx:47
     enum LineType Ascending
-vcl/inc/regband.hxx:45
+vcl/inc/regband.hxx:47
     enum LineType Descending
 vcl/inc/salframe.hxx:72
     enum SalFrameStyleFlags NOSHADOW
-vcl/inc/salptype.hxx:32
+vcl/inc/salptype.hxx:33
     enum JobSetFlags ALL
-vcl/inc/svimpbox.hxx:108
+vcl/inc/svimpbox.hxx:106
     enum SvImpLBox::ImageType NodeExpanded
-vcl/inc/svimpbox.hxx:109
+vcl/inc/svimpbox.hxx:107
     enum SvImpLBox::ImageType NodeCollapsed
-vcl/inc/svimpbox.hxx:110
-    enum SvImpLBox::ImageType NodeDontKnow
-vcl/inc/svimpbox.hxx:111
+vcl/inc/svimpbox.hxx:108
     enum SvImpLBox::ImageType EntryDefExpanded
-vcl/inc/svimpbox.hxx:112
+vcl/inc/svimpbox.hxx:109
     enum SvImpLBox::ImageType EntryDefCollapsed
-vcl/inc/unx/desktops.hxx:30
+vcl/inc/unx/desktops.hxx:29
     enum DesktopType DESKTOP_UNKNOWN
+vcl/inc/unx/gtk/gtkinst.hxx:245
+    enum SelectionType SELECTION_PRIMARY
 vcl/inc/unx/i18n_cb.hxx:69
     enum PreeditStatus DontKnow
-vcl/inc/unx/printergfx.hxx:47
-    enum psp::PrinterColor::ColorSpace eRGB
-vcl/inc/unx/printergfx.hxx:235
-    enum psp::PrinterGfx::pspath_t moveto
-vcl/inc/unx/saldisp.hxx:64
+vcl/inc/unx/saldisp.hxx:62
     srv_vendor_t vendor_unknown
-vcl/inc/unx/saldisp.hxx:71
-    enum SalRGB RBG
-vcl/inc/unx/saldisp.hxx:72
-    enum SalRGB GBR
-vcl/inc/unx/saldisp.hxx:72
-    enum SalRGB GRB
-vcl/inc/unx/saldisp.hxx:73
-    enum SalRGB BRG
 vcl/inc/unx/salframe.h:52
     enum WMWindowType Normal
-vcl/inc/unx/wmadaptor.hxx:42
+vcl/inc/unx/sessioninhibitor.hxx:22
+    enum ApplicationInhibitFlags APPLICATION_INHIBIT_LOGOUT
+vcl/inc/unx/wmadaptor.hxx:40
     enum vcl_sal::WMAdaptor::WMAtom UTF8_STRING
-vcl/inc/unx/wmadaptor.hxx:45
+vcl/inc/unx/wmadaptor.hxx:43
     enum vcl_sal::WMAdaptor::WMAtom NET_ACTIVE_WINDOW
-vcl/inc/unx/wmadaptor.hxx:46
+vcl/inc/unx/wmadaptor.hxx:44
     enum vcl_sal::WMAdaptor::WMAtom NET_SUPPORTED
-vcl/inc/unx/wmadaptor.hxx:47
+vcl/inc/unx/wmadaptor.hxx:45
     enum vcl_sal::WMAdaptor::WMAtom NET_SUPPORTING_WM_CHECK
-vcl/inc/unx/wmadaptor.hxx:48
+vcl/inc/unx/wmadaptor.hxx:46
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_NAME
-vcl/inc/unx/wmadaptor.hxx:49
+vcl/inc/unx/wmadaptor.hxx:47
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_DESKTOP
-vcl/inc/unx/wmadaptor.hxx:50
+vcl/inc/unx/wmadaptor.hxx:48
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_ICON_NAME
-vcl/inc/unx/wmadaptor.hxx:51
+vcl/inc/unx/wmadaptor.hxx:49
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_PID
-vcl/inc/unx/wmadaptor.hxx:52
+vcl/inc/unx/wmadaptor.hxx:50
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_PING
-vcl/inc/unx/wmadaptor.hxx:53
+vcl/inc/unx/wmadaptor.hxx:51
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE
-vcl/inc/unx/wmadaptor.hxx:54
+vcl/inc/unx/wmadaptor.hxx:52
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_MAXIMIZED_HORZ
-vcl/inc/unx/wmadaptor.hxx:55
+vcl/inc/unx/wmadaptor.hxx:53
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_MAXIMIZED_VERT
-vcl/inc/unx/wmadaptor.hxx:56
+vcl/inc/unx/wmadaptor.hxx:54
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_MODAL
-vcl/inc/unx/wmadaptor.hxx:57
-    enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_SHADED
-vcl/inc/unx/wmadaptor.hxx:58
+vcl/inc/unx/wmadaptor.hxx:55
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_SKIP_PAGER
-vcl/inc/unx/wmadaptor.hxx:59
+vcl/inc/unx/wmadaptor.hxx:56
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_SKIP_TASKBAR
-vcl/inc/unx/wmadaptor.hxx:61
+vcl/inc/unx/wmadaptor.hxx:58
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_STICKY
-vcl/inc/unx/wmadaptor.hxx:62
+vcl/inc/unx/wmadaptor.hxx:59
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STATE_FULLSCREEN
-vcl/inc/unx/wmadaptor.hxx:63
+vcl/inc/unx/wmadaptor.hxx:60
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STRUT
-vcl/inc/unx/wmadaptor.hxx:64
+vcl/inc/unx/wmadaptor.hxx:61
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_STRUT_PARTIAL
-vcl/inc/unx/wmadaptor.hxx:65
+vcl/inc/unx/wmadaptor.hxx:62
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_USER_TIME
-vcl/inc/unx/wmadaptor.hxx:66
+vcl/inc/unx/wmadaptor.hxx:63
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE
-vcl/inc/unx/wmadaptor.hxx:67
+vcl/inc/unx/wmadaptor.hxx:64
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_DESKTOP
-vcl/inc/unx/wmadaptor.hxx:68
+vcl/inc/unx/wmadaptor.hxx:65
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_DIALOG
-vcl/inc/unx/wmadaptor.hxx:69
+vcl/inc/unx/wmadaptor.hxx:66
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_DOCK
-vcl/inc/unx/wmadaptor.hxx:70
+vcl/inc/unx/wmadaptor.hxx:67
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_MENU
-vcl/inc/unx/wmadaptor.hxx:71
+vcl/inc/unx/wmadaptor.hxx:68
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_NORMAL
-vcl/inc/unx/wmadaptor.hxx:72
+vcl/inc/unx/wmadaptor.hxx:69
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_TOOLBAR
-vcl/inc/unx/wmadaptor.hxx:73
+vcl/inc/unx/wmadaptor.hxx:70
     enum vcl_sal::WMAdaptor::WMAtom KDE_NET_WM_WINDOW_TYPE_OVERRIDE
-vcl/inc/unx/wmadaptor.hxx:74
+vcl/inc/unx/wmadaptor.hxx:71
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_SPLASH
-vcl/inc/unx/wmadaptor.hxx:75
+vcl/inc/unx/wmadaptor.hxx:72
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_WINDOW_TYPE_UTILITY
-vcl/inc/unx/wmadaptor.hxx:76
+vcl/inc/unx/wmadaptor.hxx:73
     enum vcl_sal::WMAdaptor::WMAtom NET_NUMBER_OF_DESKTOPS
-vcl/inc/unx/wmadaptor.hxx:77
+vcl/inc/unx/wmadaptor.hxx:74
     enum vcl_sal::WMAdaptor::WMAtom NET_CURRENT_DESKTOP
-vcl/inc/unx/wmadaptor.hxx:78
+vcl/inc/unx/wmadaptor.hxx:75
     enum vcl_sal::WMAdaptor::WMAtom NET_WORKAREA
-vcl/inc/unx/wmadaptor.hxx:79
+vcl/inc/unx/wmadaptor.hxx:76
     enum vcl_sal::WMAdaptor::WMAtom NET_WM_ICON
-vcl/inc/unx/wmadaptor.hxx:82
+vcl/inc/unx/wmadaptor.hxx:79
     enum vcl_sal::WMAdaptor::WMAtom WIN_SUPPORTING_WM_CHECK
-vcl/inc/unx/wmadaptor.hxx:83
+vcl/inc/unx/wmadaptor.hxx:80
     enum vcl_sal::WMAdaptor::WMAtom WIN_PROTOCOLS
-vcl/inc/unx/wmadaptor.hxx:84
+vcl/inc/unx/wmadaptor.hxx:81
     enum vcl_sal::WMAdaptor::WMAtom WIN_WORKSPACE_COUNT
-vcl/inc/unx/wmadaptor.hxx:85
+vcl/inc/unx/wmadaptor.hxx:82
     enum vcl_sal::WMAdaptor::WMAtom WIN_WORKSPACE
-vcl/inc/unx/wmadaptor.hxx:87
+vcl/inc/unx/wmadaptor.hxx:84
     enum vcl_sal::WMAdaptor::WMAtom WIN_STATE
-vcl/inc/unx/wmadaptor.hxx:88
+vcl/inc/unx/wmadaptor.hxx:85
     enum vcl_sal::WMAdaptor::WMAtom WIN_HINTS
-vcl/inc/unx/wmadaptor.hxx:89
+vcl/inc/unx/wmadaptor.hxx:86
     enum vcl_sal::WMAdaptor::WMAtom WIN_APP_STATE
-vcl/inc/unx/wmadaptor.hxx:90
+vcl/inc/unx/wmadaptor.hxx:87
     enum vcl_sal::WMAdaptor::WMAtom WIN_EXPANDED_SIZE
-vcl/inc/unx/wmadaptor.hxx:91
+vcl/inc/unx/wmadaptor.hxx:88
     enum vcl_sal::WMAdaptor::WMAtom WIN_ICONS
-vcl/inc/unx/wmadaptor.hxx:92
+vcl/inc/unx/wmadaptor.hxx:89
     enum vcl_sal::WMAdaptor::WMAtom WIN_CLIENT_LIST
-vcl/inc/unx/wmadaptor.hxx:95
+vcl/inc/unx/wmadaptor.hxx:92
     enum vcl_sal::WMAdaptor::WMAtom WM_STATE
-vcl/inc/unx/wmadaptor.hxx:96
+vcl/inc/unx/wmadaptor.hxx:93
     enum vcl_sal::WMAdaptor::WMAtom MOTIF_WM_HINTS
-vcl/inc/unx/wmadaptor.hxx:97
+vcl/inc/unx/wmadaptor.hxx:94
     enum vcl_sal::WMAdaptor::WMAtom WM_PROTOCOLS
-vcl/inc/unx/wmadaptor.hxx:98
+vcl/inc/unx/wmadaptor.hxx:95
     enum vcl_sal::WMAdaptor::WMAtom WM_DELETE_WINDOW
-vcl/inc/unx/wmadaptor.hxx:99
+vcl/inc/unx/wmadaptor.hxx:96
     enum vcl_sal::WMAdaptor::WMAtom WM_TAKE_FOCUS
-vcl/inc/unx/wmadaptor.hxx:100
+vcl/inc/unx/wmadaptor.hxx:97
     enum vcl_sal::WMAdaptor::WMAtom WM_CLIENT_LEADER
-vcl/inc/unx/wmadaptor.hxx:101
+vcl/inc/unx/wmadaptor.hxx:98
     enum vcl_sal::WMAdaptor::WMAtom WM_COMMAND
-vcl/inc/unx/wmadaptor.hxx:102
+vcl/inc/unx/wmadaptor.hxx:99
     enum vcl_sal::WMAdaptor::WMAtom WM_LOCALE_NAME
-vcl/inc/unx/wmadaptor.hxx:103
+vcl/inc/unx/wmadaptor.hxx:100
     enum vcl_sal::WMAdaptor::WMAtom WM_TRANSIENT_FOR
-vcl/inc/unx/wmadaptor.hxx:106
+vcl/inc/unx/wmadaptor.hxx:103
     enum vcl_sal::WMAdaptor::WMAtom SAL_QUITEVENT
-vcl/inc/unx/wmadaptor.hxx:107
+vcl/inc/unx/wmadaptor.hxx:104
     enum vcl_sal::WMAdaptor::WMAtom SAL_USEREVENT
-vcl/inc/unx/wmadaptor.hxx:108
+vcl/inc/unx/wmadaptor.hxx:105
     enum vcl_sal::WMAdaptor::WMAtom SAL_EXTTEXTEVENT
-vcl/inc/unx/wmadaptor.hxx:109
+vcl/inc/unx/wmadaptor.hxx:106
     enum vcl_sal::WMAdaptor::WMAtom SAL_GETTIMEEVENT
-vcl/inc/unx/wmadaptor.hxx:110
+vcl/inc/unx/wmadaptor.hxx:107
     enum vcl_sal::WMAdaptor::WMAtom VCL_SYSTEM_SETTINGS
-vcl/inc/unx/wmadaptor.hxx:111
+vcl/inc/unx/wmadaptor.hxx:108
     enum vcl_sal::WMAdaptor::WMAtom XSETTINGS
-vcl/inc/unx/wmadaptor.hxx:112
+vcl/inc/unx/wmadaptor.hxx:109
     enum vcl_sal::WMAdaptor::WMAtom XEMBED
-vcl/inc/unx/wmadaptor.hxx:113
+vcl/inc/unx/wmadaptor.hxx:110
     enum vcl_sal::WMAdaptor::WMAtom XEMBED_INFO
-vcl/inc/unx/wmadaptor.hxx:114
+vcl/inc/unx/wmadaptor.hxx:111
     enum vcl_sal::WMAdaptor::WMAtom NetAtomMax
-vcl/qt5/Qt5FilePicker.cxx:323
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5FilePicker.cxx:323:27) Size
-vcl/qt5/Qt5Instance.cxx:249
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5Instance.cxx:249:45) Size
-vcl/qt5/Qt5Transferable.cxx:78
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5Transferable.cxx:78:26) Size
-vcl/qt5/Qt5Transferable.cxx:138
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5Transferable.cxx:138:52) Size
-vcl/qt5/Qt5Transferable.cxx:269
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5Transferable.cxx:269:22) Size
-vcl/qt5/Qt5Transferable.cxx:271
-    enum (anonymous at /home/noel/libo2/vcl/qt5/Qt5Transferable.cxx:271:22) Size
-vcl/source/control/imivctl.hxx:88
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1303
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1300:5) Artifact
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1306
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1300:5) Tagged
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1410
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1407:5) Artifact
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1411
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1407:5) Tagged
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1523
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1520:5) Artifact
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1524
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:1520:5) Tagged
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:3330
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:3327:5) Artifact
+vcl/qa/cppunit/pdfexport/pdfexport2.cxx:3331
+    enum (unnamed at /home/noel/libo-plugin/vcl/qa/cppunit/pdfexport/pdfexport2.cxx:3327:5) Tagged
+vcl/qt5/QtFilePicker.cxx:360
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtFilePicker.cxx:360:27) Size
+vcl/qt5/QtInstance.cxx:313
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtInstance.cxx:313:45) Size
+vcl/qt5/QtTransferable.cxx:73
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtTransferable.cxx:73:26) Size
+vcl/qt5/QtTransferable.cxx:134
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtTransferable.cxx:134:56) Size
+vcl/qt5/QtTransferable.cxx:139
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtTransferable.cxx:139:56) Size
+vcl/qt5/QtTransferable.cxx:274
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtTransferable.cxx:274:22) Size
+vcl/qt5/QtTransferable.cxx:276
+    enum (unnamed at /home/noel/libo-plugin/vcl/qt5/QtTransferable.cxx:276:22) Size
+vcl/source/control/imivctl.hxx:87
     enum IcnViewFieldType Image
-vcl/source/filter/ixbm/xbmread.cxx:35
+vcl/source/filter/ipict/ipict.cxx:73
+    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DASH
+vcl/source/filter/ipict/ipict.cxx:73
+    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DASHDOT
+vcl/source/filter/ipict/ipict.cxx:73
+    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_DOT
+vcl/source/filter/ipict/ipict.cxx:73
+    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_NULL
+vcl/source/filter/ipict/ipict.cxx:73
+    enum PictReaderInternal::(anonymous namespace)::Pattern::PenStyle PEN_SOLID
+vcl/source/filter/ipict/ipict.cxx:74
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_HORZ
+vcl/source/filter/ipict/ipict.cxx:74
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_SOLID
+vcl/source/filter/ipict/ipict.cxx:74
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_VERT
+vcl/source/filter/ipict/ipict.cxx:75
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_CROSS
+vcl/source/filter/ipict/ipict.cxx:75
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_DIAGCROSS
+vcl/source/filter/ipict/ipict.cxx:75
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_DOWNDIAG
+vcl/source/filter/ipict/ipict.cxx:75
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_UPDIAG
+vcl/source/filter/ipict/ipict.cxx:76
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_25
+vcl/source/filter/ipict/ipict.cxx:76
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_50
+vcl/source/filter/ipict/ipict.cxx:76
+    enum PictReaderInternal::(anonymous namespace)::Pattern::BrushStyle BRUSH_75
+vcl/source/filter/ipict/ipict.cxx:147
+    enum (anonymous namespace)::PictDrawingMethod UNDEFINED
+vcl/source/filter/ixbm/xbmread.cxx:37
     enum (anonymous namespace)::XBMFormat XBM11
-vcl/source/filter/ixbm/xbmread.cxx:40
+vcl/source/filter/ixbm/xbmread.cxx:42
     enum (anonymous namespace)::ReadState XBMREAD_OK
-vcl/source/filter/ixpm/xpmread.cxx:50
+vcl/source/filter/ixpm/xpmread.cxx:54
     enum (anonymous namespace)::ReadState XPMREAD_OK
 vcl/source/filter/jpeg/Exif.hxx:29
     enum exif::Orientation TOP_RIGHT
@@ -5566,8 +6042,6 @@ vcl/source/filter/jpeg/Exif.hxx:34
     enum exif::Orientation RIGHT_BOTTOM
 vcl/source/filter/jpeg/JpegReader.hxx:32
     enum ReadState JPEGREAD_OK
-vcl/source/filter/png/PngImageReader.cxx:42
-    enum (anonymous at /home/noel/libo2/vcl/source/filter/png/PngImageReader.cxx:40:5) PNG_SIGNATURE_SIZE
 vcl/source/filter/wmf/emfwr.cxx:100
     enum EmfPlusRecordType Header
 vcl/source/filter/wmf/emfwr.cxx:101
@@ -5584,173 +6058,853 @@ vcl/source/filter/wmf/emfwr.cxx:106
     enum EmfPlusRecordType SetPixelOffsetMode
 vcl/source/filter/wmf/emfwr.cxx:107
     enum EmfPlusRecordType SetCompositingQuality
-vcl/source/fontsubset/ttcr.hxx:49
+vcl/source/fontsubset/ttcr.hxx:46
     enum vcl::TTCRErrCodes TTCR_OK
-vcl/source/fontsubset/ttcr.hxx:50
+vcl/source/fontsubset/ttcr.hxx:47
     enum vcl::TTCRErrCodes TTCR_ZEROGLYPHS
-vcl/source/fontsubset/ttcr.hxx:51
-    enum vcl::TTCRErrCodes TTCR_UNKNOWN
-vcl/source/fontsubset/ttcr.hxx:52
+vcl/source/fontsubset/ttcr.hxx:49
     enum vcl::TTCRErrCodes TTCR_NONAMES
-vcl/source/fontsubset/ttcr.hxx:53
+vcl/source/fontsubset/ttcr.hxx:50
     enum vcl::TTCRErrCodes TTCR_NAMETOOLONG
-vcl/source/fontsubset/ttcr.hxx:54
+vcl/source/fontsubset/ttcr.hxx:51
     enum vcl::TTCRErrCodes TTCR_POSTFORMAT
-vcl/source/gdi/pdfwriter_impl.hxx:91
-    enum vcl::pdf::GraphicsStateUpdateFlags All
-vcl/source/gdi/pdfwriter_impl.hxx:625
-    enum vcl::pdf::Mode DEFAULT
-vcl/source/gdi/region.cxx:1538
+vcl/source/gdi/region.cxx:1546
     enum RegionType REGION_COMPLEX
-vcl/source/gdi/region.cxx:1538
+vcl/source/gdi/region.cxx:1546
     enum RegionType REGION_RECTANGLE
-vcl/source/gdi/regionband.cxx:199
+vcl/source/gdi/regionband.cxx:200
     enum (anonymous namespace)::StreamEntryType STREAMENTRY_SEPARATION
-vcl/source/opengl/OpenGLHelper.cxx:727
+vcl/source/opengl/OpenGLHelper.cxx:766
     enum (anonymous namespace)::CrashWatchdogTimingMode NORMAL
-vcl/source/opengl/x11/X11DeviceInfo.cxx:128
-    enum (anonymous at /home/noel/libo2/vcl/source/opengl/x11/X11DeviceInfo.cxx:128:5) buf_size
-vcl/unx/generic/app/sm.cxx:188
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:188:1) eCloneCommand
-vcl/unx/generic/app/sm.cxx:188
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:188:1) eProgram
-vcl/unx/generic/app/sm.cxx:188
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:188:1) eRestartCommand
-vcl/unx/generic/app/sm.cxx:188
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:188:1) eRestartStyleHint
-vcl/unx/generic/app/sm.cxx:188
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:188:1) eUserId
+vcl/source/treelist/iconviewimpl.hxx:67
+    enum IconViewImpl::CallbackResult Continue
+vcl/unx/generic/app/sm.cxx:189
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:189:1) eCloneCommand
 vcl/unx/generic/app/sm.cxx:189
-    enum (anonymous at /home/noel/libo2/vcl/unx/generic/app/sm.cxx:189:1) eDiscardCommand
-vcl/unx/generic/dtrans/X11_selection.hxx:179
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:189:1) eProgram
+vcl/unx/generic/app/sm.cxx:189
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:189:1) eRestartCommand
+vcl/unx/generic/app/sm.cxx:189
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:189:1) eRestartStyleHint
+vcl/unx/generic/app/sm.cxx:189
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:189:1) eUserId
+vcl/unx/generic/app/sm.cxx:190
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/generic/app/sm.cxx:190:1) eDiscardCommand
+vcl/unx/generic/dtrans/X11_selection.hxx:178
     enum x11::SelectionManager::Selection::State Inactive
-vcl/unx/glxtest.cxx:90
-    enum (anonymous at /home/noel/libo2/vcl/unx/glxtest.cxx:90:3) bufsize
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:81
+vcl/unx/gtk3/a11y/atktextattributes.cxx:84
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_CASEMAP
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:83
+vcl/unx/gtk3/a11y/atktextattributes.cxx:86
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_CONTOURED
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:84
+vcl/unx/gtk3/a11y/atktextattributes.cxx:87
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_CHAR_ESCAPEMENT
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:85
+vcl/unx/gtk3/a11y/atktextattributes.cxx:88
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_BLINKING
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:86
+vcl/unx/gtk3/a11y/atktextattributes.cxx:89
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_FONT_NAME
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:87
+vcl/unx/gtk3/a11y/atktextattributes.cxx:90
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_HEIGHT
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:88
+vcl/unx/gtk3/a11y/atktextattributes.cxx:91
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_HIDDEN
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:89
+vcl/unx/gtk3/a11y/atktextattributes.cxx:92
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_KERNING
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:90
+vcl/unx/gtk3/a11y/atktextattributes.cxx:93
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_LOCALE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:91
+vcl/unx/gtk3/a11y/atktextattributes.cxx:94
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_POSTURE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:92
+vcl/unx/gtk3/a11y/atktextattributes.cxx:95
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_RELIEF
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:93
+vcl/unx/gtk3/a11y/atktextattributes.cxx:96
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_ROTATION
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:94
+vcl/unx/gtk3/a11y/atktextattributes.cxx:97
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_SCALE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:95
+vcl/unx/gtk3/a11y/atktextattributes.cxx:98
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_SHADOWED
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:96
+vcl/unx/gtk3/a11y/atktextattributes.cxx:99
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_STRIKETHROUGH
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:97
+vcl/unx/gtk3/a11y/atktextattributes.cxx:100
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_UNDERLINE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:98
+vcl/unx/gtk3/a11y/atktextattributes.cxx:101
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_WEIGHT
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:100
+vcl/unx/gtk3/a11y/atktextattributes.cxx:103
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_MM_TO_PIXEL_RATIO
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:101
+vcl/unx/gtk3/a11y/atktextattributes.cxx:104
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_JUSTIFICATION
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:102
+vcl/unx/gtk3/a11y/atktextattributes.cxx:105
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_BOTTOM_MARGIN
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:103
+vcl/unx/gtk3/a11y/atktextattributes.cxx:106
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_FIRST_LINE_INDENT
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:104
+vcl/unx/gtk3/a11y/atktextattributes.cxx:107
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_LEFT_MARGIN
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:105
+vcl/unx/gtk3/a11y/atktextattributes.cxx:108
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_LINE_SPACING
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:106
+vcl/unx/gtk3/a11y/atktextattributes.cxx:109
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_RIGHT_MARGIN
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:107
+vcl/unx/gtk3/a11y/atktextattributes.cxx:110
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_STYLE_NAME
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:108
+vcl/unx/gtk3/a11y/atktextattributes.cxx:111
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_TAB_STOPS
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:109
+vcl/unx/gtk3/a11y/atktextattributes.cxx:112
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_TOP_MARGIN
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:110
+vcl/unx/gtk3/a11y/atktextattributes.cxx:113
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_WRITING_MODE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:111
+vcl/unx/gtk3/a11y/atktextattributes.cxx:114
     enum (anonymous namespace)::ExportedAttribute TEXT_ATTRIBUTE_LAST
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:775
-    enum (anonymous at /home/noel/libo2/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:772:1) DECORATION_BLINK
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:776
-    enum (anonymous at /home/noel/libo2/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:772:1) DECORATION_UNDERLINE
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:777
-    enum (anonymous at /home/noel/libo2/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx:772:1) DECORATION_LINE_THROUGH
+vcl/unx/gtk3/a11y/atktextattributes.cxx:772
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/a11y/atktextattributes.cxx:769:1) DECORATION_BLINK
+vcl/unx/gtk3/a11y/atktextattributes.cxx:773
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/a11y/atktextattributes.cxx:769:1) DECORATION_UNDERLINE
+vcl/unx/gtk3/a11y/atktextattributes.cxx:774
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/a11y/atktextattributes.cxx:769:1) DECORATION_LINE_THROUGH
+vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:173
+    enum SalGtkFilePicker::(unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:172:9) OK
+vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:174
+    enum SalGtkFilePicker::(unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:172:9) CANCEL
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:175
-    enum SalGtkFilePicker::(anonymous at /home/noel/libo2/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:174:9) PLAY
-writerfilter/source/dmapper/BorderHandler.hxx:38
-    enum writerfilter::dmapper::BorderHandler::BorderPosition Top
+    enum SalGtkFilePicker::(unnamed at /home/noel/libo-plugin/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx:172:9) PLAY
+vcl/unx/gtk3/gtkframe.cxx:1345
+    enum (anonymous namespace)::ColorScheme DEFAULT
+vcl/unx/kf5/KFFilePicker.cxx:63
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:63:33) Size
+vcl/unx/kf5/KFFilePicker.cxx:63
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:63:57) Size
+vcl/unx/kf5/KFFilePicker.cxx:63
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:63:9) Size
+vcl/unx/kf5/KFFilePicker.cxx:64
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:64:35) Size
+vcl/unx/kf5/KFFilePicker.cxx:64
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:64:62) Size
+vcl/unx/kf5/KFFilePicker.cxx:64
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:64:9) Size
+vcl/unx/kf5/KFFilePicker.cxx:65
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFFilePicker.cxx:65:9) Size
+vcl/unx/kf5/KFSalInstance.cxx:57
+    enum (unnamed at /home/noel/libo-plugin/vcl/unx/kf5/KFSalInstance.cxx:57:60) Size
 writerfilter/source/dmapper/BorderHandler.hxx:39
-    enum writerfilter::dmapper::BorderHandler::BorderPosition Left
+    enum writerfilter::dmapper::BorderHandler::BorderPosition Top
 writerfilter/source/dmapper/BorderHandler.hxx:40
-    enum writerfilter::dmapper::BorderHandler::BorderPosition Bottom
+    enum writerfilter::dmapper::BorderHandler::BorderPosition Left
 writerfilter/source/dmapper/BorderHandler.hxx:41
-    enum writerfilter::dmapper::BorderHandler::BorderPosition Right
+    enum writerfilter::dmapper::BorderHandler::BorderPosition Bottom
 writerfilter/source/dmapper/BorderHandler.hxx:42
-    enum writerfilter::dmapper::BorderHandler::BorderPosition Horizontal
+    enum writerfilter::dmapper::BorderHandler::BorderPosition Right
 writerfilter/source/dmapper/BorderHandler.hxx:43
+    enum writerfilter::dmapper::BorderHandler::BorderPosition Horizontal
+writerfilter/source/dmapper/BorderHandler.hxx:44
     enum writerfilter::dmapper::BorderHandler::BorderPosition Vertical
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:100
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:120
+    enum writerfilter::dmapper::PaperSourceElement PAPER_SOURCE_OTHER
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:130
     enum writerfilter::dmapper::ContextType CONTEXT_LIST
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:121
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:152
     enum writerfilter::dmapper::SkipFootnoteSeparator OFF
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:516
-    enum writerfilter::dmapper::DomainMapper_Impl::HeaderFooterImportState header
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:517
-    enum writerfilter::dmapper::DomainMapper_Impl::HeaderFooterImportState footer
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:160
+    enum writerfilter::dmapper::StoredRedlines FRAME
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:161
+    enum writerfilter::dmapper::StoredRedlines FOOTNOTE
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:162
+    enum writerfilter::dmapper::StoredRedlines ENDNOTE
 writerfilter/source/dmapper/PropertyIds.hxx:28
     enum writerfilter::dmapper::PropertyIds PROP_ID_START
-writerfilter/source/dmapper/PropertyMap.hxx:67
-    enum writerfilter::dmapper::BorderPosition BORDER_LEFT
+writerfilter/source/dmapper/PropertyIds.hxx:29
+    enum writerfilter::dmapper::PropertyIds META_PROP_CELL_MAR_BOTTOM
+writerfilter/source/dmapper/PropertyIds.hxx:30
+    enum writerfilter::dmapper::PropertyIds META_PROP_CELL_MAR_LEFT
+writerfilter/source/dmapper/PropertyIds.hxx:31
+    enum writerfilter::dmapper::PropertyIds META_PROP_CELL_MAR_RIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:32
+    enum writerfilter::dmapper::PropertyIds META_PROP_CELL_MAR_TOP
+writerfilter/source/dmapper/PropertyIds.hxx:34
+    enum writerfilter::dmapper::PropertyIds META_PROP_TABLE_STYLE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:36
+    enum writerfilter::dmapper::PropertyIds PROP_ADJUST
+writerfilter/source/dmapper/PropertyIds.hxx:37
+    enum writerfilter::dmapper::PropertyIds PROP_ADJUST_CONTRAST
+writerfilter/source/dmapper/PropertyIds.hxx:38
+    enum writerfilter::dmapper::PropertyIds PROP_ADJUST_LUMINANCE
+writerfilter/source/dmapper/PropertyIds.hxx:39
+    enum writerfilter::dmapper::PropertyIds PROP_ALLOW_OVERLAP
+writerfilter/source/dmapper/PropertyIds.hxx:40
+    enum writerfilter::dmapper::PropertyIds PROP_ALTERNATIVE_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:41
+    enum writerfilter::dmapper::PropertyIds PROP_ANCHOR_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:42
+    enum writerfilter::dmapper::PropertyIds PROP_AUTOMATIC_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:43
+    enum writerfilter::dmapper::PropertyIds PROP_BACK_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:44
+    enum writerfilter::dmapper::PropertyIds PROP_BACK_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:45
+    enum writerfilter::dmapper::PropertyIds PROP_BACK_COLOR_TRANSPARENCY
+writerfilter/source/dmapper/PropertyIds.hxx:46
+    enum writerfilter::dmapper::PropertyIds PROP_BITMAP
+writerfilter/source/dmapper/PropertyIds.hxx:47
+    enum writerfilter::dmapper::PropertyIds PROP_BORDER_LEFT_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:48
+    enum writerfilter::dmapper::PropertyIds PROP_BORDER_RIGHT_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:49
+    enum writerfilter::dmapper::PropertyIds PROP_BORDER_TOP_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:50
+    enum writerfilter::dmapper::PropertyIds PROP_BORDER_BOTTOM_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:52
+    enum writerfilter::dmapper::PropertyIds PROP_BOTTOM_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:53
+    enum writerfilter::dmapper::PropertyIds PROP_BOTTOM_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:54
+    enum writerfilter::dmapper::PropertyIds PROP_BREAK_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:55
+    enum writerfilter::dmapper::PropertyIds PROP_BULLET_CHAR
+writerfilter/source/dmapper/PropertyIds.hxx:56
+    enum writerfilter::dmapper::PropertyIds PROP_BULLET_FONT_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:57
+    enum writerfilter::dmapper::PropertyIds PROP_CHAPTER_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:59
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_AUTO_KERNING
+writerfilter/source/dmapper/PropertyIds.hxx:60
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BACK_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:61
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BACKGROUND_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:62
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_CASE_MAP
+writerfilter/source/dmapper/PropertyIds.hxx:63
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_CHAR_KERNING
+writerfilter/source/dmapper/PropertyIds.hxx:64
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:65
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:66
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_COMBINE_IS_ON
+writerfilter/source/dmapper/PropertyIds.hxx:67
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_COMBINE_PREFIX
+writerfilter/source/dmapper/PropertyIds.hxx:68
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_COMBINE_SUFFIX
+writerfilter/source/dmapper/PropertyIds.hxx:69
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_CONTOURED
+writerfilter/source/dmapper/PropertyIds.hxx:70
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LEFT_BORDER
+writerfilter/source/dmapper/PropertyIds.hxx:71
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_RIGHT_BORDER
+writerfilter/source/dmapper/PropertyIds.hxx:72
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_TOP_BORDER
+writerfilter/source/dmapper/PropertyIds.hxx:73
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BOTTOM_BORDER
+writerfilter/source/dmapper/PropertyIds.hxx:74
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LEFT_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:75
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_RIGHT_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:76
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_TOP_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:77
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BOTTOM_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:78
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BORDER_LEFT_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:79
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BORDER_RIGHT_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:80
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BORDER_TOP_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:81
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_BORDER_BOTTOM_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:82
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_EMPHASIS
+writerfilter/source/dmapper/PropertyIds.hxx:83
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_ESCAPEMENT
+writerfilter/source/dmapper/PropertyIds.hxx:84
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_ESCAPEMENT_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:85
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_FLASH
+writerfilter/source/dmapper/PropertyIds.hxx:86
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_FONT_CHAR_SET
+writerfilter/source/dmapper/PropertyIds.hxx:87
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_FONT_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:88
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_FONT_NAME_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:89
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_FONT_NAME_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:91
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_HEIGHT_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:92
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_HEIGHT_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:93
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_HIDDEN
+writerfilter/source/dmapper/PropertyIds.hxx:94
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_HIGHLIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:95
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LOCALE
+writerfilter/source/dmapper/PropertyIds.hxx:96
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LOCALE_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:97
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LOCALE_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:98
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_POSTURE
+writerfilter/source/dmapper/PropertyIds.hxx:99
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_POSTURE_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:100
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_POSTURE_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:101
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_PROP_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:102
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_PROP_HEIGHT_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:103
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_PROP_HEIGHT_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:104
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_RELIEF
+writerfilter/source/dmapper/PropertyIds.hxx:105
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_ROTATION
+writerfilter/source/dmapper/PropertyIds.hxx:106
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_ROTATION_IS_FIT_TO_LINE
+writerfilter/source/dmapper/PropertyIds.hxx:107
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SCALE_WIDTH
+writerfilter/source/dmapper/PropertyIds.hxx:108
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SHADOW_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:109
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SHADING_MARKER
+writerfilter/source/dmapper/PropertyIds.hxx:110
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SHADING_VALUE
+writerfilter/source/dmapper/PropertyIds.hxx:111
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SHADOWED
+writerfilter/source/dmapper/PropertyIds.hxx:112
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_STRIKEOUT
+writerfilter/source/dmapper/PropertyIds.hxx:114
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_TEXTOUTLINE_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:115
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_TEXTFILL_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:116
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_NAME_ASCII
+writerfilter/source/dmapper/PropertyIds.hxx:117
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_NAME_CS
+writerfilter/source/dmapper/PropertyIds.hxx:118
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_NAME_H_ANSI
+writerfilter/source/dmapper/PropertyIds.hxx:119
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_NAME_EAST_ASIA
+writerfilter/source/dmapper/PropertyIds.hxx:120
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_FONT_NAME_ASCII
+writerfilter/source/dmapper/PropertyIds.hxx:121
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_FONT_NAME_CS
+writerfilter/source/dmapper/PropertyIds.hxx:122
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_FONT_NAME_EAST_ASIA
+writerfilter/source/dmapper/PropertyIds.hxx:123
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:124
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_ORIGINAL_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:125
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_COLOR_SHADE
+writerfilter/source/dmapper/PropertyIds.hxx:126
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_FILL
+writerfilter/source/dmapper/PropertyIds.hxx:127
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_THEME_COLOR_TINT
+writerfilter/source/dmapper/PropertyIds.hxx:128
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_UNDERLINE
+writerfilter/source/dmapper/PropertyIds.hxx:129
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_UNDERLINE_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:130
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_UNDERLINE_COMPLEX_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:131
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_UNDERLINE_HAS_COLOR
+writerfilter/source/dmapper/PropertyIds.hxx:132
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_WEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:133
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_WEIGHT_ASIAN
+writerfilter/source/dmapper/PropertyIds.hxx:134
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_WEIGHT_COMPLEX
+writerfilter/source/dmapper/PropertyIds.hxx:135
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_WORD_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:136
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_GLOW_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:137
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SHADOW_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:138
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_REFLECTION_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:139
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_SCENE3D_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:140
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_PROPS3D_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:141
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_LIGATURES_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:142
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_NUMFORM_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:143
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_NUMSPACING_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:144
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_STYLISTICSETS_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:145
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_CNTXTALTS_TEXT_EFFECT
+writerfilter/source/dmapper/PropertyIds.hxx:147
+    enum writerfilter::dmapper::PropertyIds PROP_CONTENT
+writerfilter/source/dmapper/PropertyIds.hxx:148
+    enum writerfilter::dmapper::PropertyIds PROP_CONTOUR_OUTSIDE
+writerfilter/source/dmapper/PropertyIds.hxx:149
+    enum writerfilter::dmapper::PropertyIds PROP_CONTOUR_POLY_POLYGON
+writerfilter/source/dmapper/PropertyIds.hxx:150
+    enum writerfilter::dmapper::PropertyIds PROP_COUNT_EMPTY_LINES
+writerfilter/source/dmapper/PropertyIds.hxx:151
+    enum writerfilter::dmapper::PropertyIds PROP_COUNT_LINES_IN_FRAMES
+writerfilter/source/dmapper/PropertyIds.hxx:152
+    enum writerfilter::dmapper::PropertyIds PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES
+writerfilter/source/dmapper/PropertyIds.hxx:153
+    enum writerfilter::dmapper::PropertyIds PROP_CREATE_FROM_MARKS
+writerfilter/source/dmapper/PropertyIds.hxx:154
+    enum writerfilter::dmapper::PropertyIds PROP_CREATE_FROM_OUTLINE
+writerfilter/source/dmapper/PropertyIds.hxx:155
+    enum writerfilter::dmapper::PropertyIds PROP_CURRENT_PRESENTATION
+writerfilter/source/dmapper/PropertyIds.hxx:156
+    enum writerfilter::dmapper::PropertyIds PROP_DECORATIVE
+writerfilter/source/dmapper/PropertyIds.hxx:157
+    enum writerfilter::dmapper::PropertyIds PROP_DELETE
+writerfilter/source/dmapper/PropertyIds.hxx:158
+    enum writerfilter::dmapper::PropertyIds PROP_DESCRIPTION
+writerfilter/source/dmapper/PropertyIds.hxx:159
+    enum writerfilter::dmapper::PropertyIds PROP_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:160
+    enum writerfilter::dmapper::PropertyIds PROP_DROP_CAP_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:161
+    enum writerfilter::dmapper::PropertyIds PROP_FILE_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:163
+    enum writerfilter::dmapper::PropertyIds PROP_FIRST_LINE_OFFSET
+writerfilter/source/dmapper/PropertyIds.hxx:164
+    enum writerfilter::dmapper::PropertyIds PROP_FIRST_PAGE
+writerfilter/source/dmapper/PropertyIds.hxx:165
+    enum writerfilter::dmapper::PropertyIds PROP_FIRST_IS_SHARED
+writerfilter/source/dmapper/PropertyIds.hxx:166
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_BODY_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:167
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_DYNAMIC_SPACING
+writerfilter/source/dmapper/PropertyIds.hxx:168
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:169
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_IS_DYNAMIC_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:170
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_IS_ON
+writerfilter/source/dmapper/PropertyIds.hxx:171
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_IS_SHARED
+writerfilter/source/dmapper/PropertyIds.hxx:172
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:173
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_TEXT_LEFT
+writerfilter/source/dmapper/PropertyIds.hxx:174
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTER_TEXT_FIRST
+writerfilter/source/dmapper/PropertyIds.hxx:175
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTNOTE_COUNTING
+writerfilter/source/dmapper/PropertyIds.hxx:176
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTNOTE_LINE_ADJUST
+writerfilter/source/dmapper/PropertyIds.hxx:177
+    enum writerfilter::dmapper::PropertyIds PROP_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:178
+    enum writerfilter::dmapper::PropertyIds PROP_FULL_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:179
+    enum writerfilter::dmapper::PropertyIds PROP_GRAPHIC
+writerfilter/source/dmapper/PropertyIds.hxx:180
+    enum writerfilter::dmapper::PropertyIds PROP_GRAPHIC_COLOR_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:181
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_BASE_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:182
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_BASE_WIDTH
+writerfilter/source/dmapper/PropertyIds.hxx:183
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_DISPLAY
+writerfilter/source/dmapper/PropertyIds.hxx:184
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_LINES
+writerfilter/source/dmapper/PropertyIds.hxx:185
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:186
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_PRINT
+writerfilter/source/dmapper/PropertyIds.hxx:187
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_RUBY_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:188
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_BODY_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:189
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_DYNAMIC_SPACING
+writerfilter/source/dmapper/PropertyIds.hxx:190
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:191
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_IS_DYNAMIC_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:192
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_IS_ON
+writerfilter/source/dmapper/PropertyIds.hxx:193
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_IS_SHARED
+writerfilter/source/dmapper/PropertyIds.hxx:194
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_ROW_COUNT
+writerfilter/source/dmapper/PropertyIds.hxx:195
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:196
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_TEXT_LEFT
+writerfilter/source/dmapper/PropertyIds.hxx:197
+    enum writerfilter::dmapper::PropertyIds PROP_HEADER_TEXT_FIRST
+writerfilter/source/dmapper/PropertyIds.hxx:198
+    enum writerfilter::dmapper::PropertyIds PROP_HEADING_STYLE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:199
+    enum writerfilter::dmapper::PropertyIds PROP_HEIGHT
+writerfilter/source/dmapper/PropertyIds.hxx:200
+    enum writerfilter::dmapper::PropertyIds PROP_HELP
+writerfilter/source/dmapper/PropertyIds.hxx:201
+    enum writerfilter::dmapper::PropertyIds PROP_HINT
+writerfilter/source/dmapper/PropertyIds.hxx:202
+    enum writerfilter::dmapper::PropertyIds PROP_HORI_ORIENT
+writerfilter/source/dmapper/PropertyIds.hxx:203
+    enum writerfilter::dmapper::PropertyIds PROP_HORI_ORIENT_POSITION
+writerfilter/source/dmapper/PropertyIds.hxx:204
+    enum writerfilter::dmapper::PropertyIds PROP_HORI_ORIENT_RELATION
+writerfilter/source/dmapper/PropertyIds.hxx:205
+    enum writerfilter::dmapper::PropertyIds PROP_HYPER_LINK_U_R_L
+writerfilter/source/dmapper/PropertyIds.hxx:206
+    enum writerfilter::dmapper::PropertyIds PROP_HYPERLINK
+writerfilter/source/dmapper/PropertyIds.hxx:208
+    enum writerfilter::dmapper::PropertyIds PROP_INPUT_STREAM
+writerfilter/source/dmapper/PropertyIds.hxx:209
+    enum writerfilter::dmapper::PropertyIds PROP_INSERT
+writerfilter/source/dmapper/PropertyIds.hxx:210
+    enum writerfilter::dmapper::PropertyIds PROP_INTERVAL
+writerfilter/source/dmapper/PropertyIds.hxx:211
+    enum writerfilter::dmapper::PropertyIds PROP_IS_DATE
+writerfilter/source/dmapper/PropertyIds.hxx:212
+    enum writerfilter::dmapper::PropertyIds PROP_IS_FIXED
+writerfilter/source/dmapper/PropertyIds.hxx:213
+    enum writerfilter::dmapper::PropertyIds PROP_IS_INPUT
+writerfilter/source/dmapper/PropertyIds.hxx:214
+    enum writerfilter::dmapper::PropertyIds PROP_IS_LANDSCAPE
+writerfilter/source/dmapper/PropertyIds.hxx:215
+    enum writerfilter::dmapper::PropertyIds PROP_IS_ON
+writerfilter/source/dmapper/PropertyIds.hxx:216
+    enum writerfilter::dmapper::PropertyIds PROP_IS_SPLIT_ALLOWED
+writerfilter/source/dmapper/PropertyIds.hxx:217
+    enum writerfilter::dmapper::PropertyIds PROP_IS_VISIBLE
+writerfilter/source/dmapper/PropertyIds.hxx:218
+    enum writerfilter::dmapper::PropertyIds PROP_LABEL_CATEGORY
+writerfilter/source/dmapper/PropertyIds.hxx:220
+    enum writerfilter::dmapper::PropertyIds PROP_LEFT_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:222
+    enum writerfilter::dmapper::PropertyIds PROP_LEVEL
+writerfilter/source/dmapper/PropertyIds.hxx:223
+    enum writerfilter::dmapper::PropertyIds PROP_LEVEL_FOLLOW
+writerfilter/source/dmapper/PropertyIds.hxx:224
+    enum writerfilter::dmapper::PropertyIds PROP_LEVEL_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:225
+    enum writerfilter::dmapper::PropertyIds PROP_LEVEL_PARAGRAPH_STYLES
+writerfilter/source/dmapper/PropertyIds.hxx:226
+    enum writerfilter::dmapper::PropertyIds PROP_LEVEL_IS_LEGAL
+writerfilter/source/dmapper/PropertyIds.hxx:227
+    enum writerfilter::dmapper::PropertyIds PROP_LISTTAB_STOP_POSITION
+writerfilter/source/dmapper/PropertyIds.hxx:228
+    enum writerfilter::dmapper::PropertyIds PROP_LIST_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:229
+    enum writerfilter::dmapper::PropertyIds PROP_MACRO_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:230
+    enum writerfilter::dmapper::PropertyIds PROP_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:231
+    enum writerfilter::dmapper::PropertyIds PROP_NUMBERING_LEVEL
+writerfilter/source/dmapper/PropertyIds.hxx:233
+    enum writerfilter::dmapper::PropertyIds PROP_NUMBERING_STYLE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:234
+    enum writerfilter::dmapper::PropertyIds PROP_NUMBERING_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:235
+    enum writerfilter::dmapper::PropertyIds PROP_NUMBER_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:236
+    enum writerfilter::dmapper::PropertyIds PROP_NUMBER_POSITION
+writerfilter/source/dmapper/PropertyIds.hxx:237
+    enum writerfilter::dmapper::PropertyIds PROP_OPAQUE
+writerfilter/source/dmapper/PropertyIds.hxx:238
+    enum writerfilter::dmapper::PropertyIds PROP_OUTLINE_LEVEL
+writerfilter/source/dmapper/PropertyIds.hxx:239
+    enum writerfilter::dmapper::PropertyIds PROP_PAGE_DESC_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:240
+    enum writerfilter::dmapper::PropertyIds PROP_PAGE_NUMBER_OFFSET
+writerfilter/source/dmapper/PropertyIds.hxx:241
+    enum writerfilter::dmapper::PropertyIds PROP_PAGE_TOGGLE
+writerfilter/source/dmapper/PropertyIds.hxx:242
+    enum writerfilter::dmapper::PropertyIds PROP_PARAGRAPH_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:243
+    enum writerfilter::dmapper::PropertyIds PROP_PARAGRAPH_STYLES
+writerfilter/source/dmapper/PropertyIds.hxx:245
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_BOTTOM_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:247
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_IS_HANGING_PUNCTUATION
+writerfilter/source/dmapper/PropertyIds.hxx:248
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_IS_HYPHENATION
+writerfilter/source/dmapper/PropertyIds.hxx:249
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_HYPHENATION_NO_CAPS
+writerfilter/source/dmapper/PropertyIds.hxx:250
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_HYPHENATION_ZONE
+writerfilter/source/dmapper/PropertyIds.hxx:251
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_KEEP_TOGETHER
+writerfilter/source/dmapper/PropertyIds.hxx:254
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_LINE_NUMBER_COUNT
+writerfilter/source/dmapper/PropertyIds.hxx:255
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_LINE_NUMBER_START_VALUE
+writerfilter/source/dmapper/PropertyIds.hxx:257
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_ORPHANS
+writerfilter/source/dmapper/PropertyIds.hxx:259
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_SPLIT
+writerfilter/source/dmapper/PropertyIds.hxx:262
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_TOP_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:263
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_VERT_ALIGNMENT
+writerfilter/source/dmapper/PropertyIds.hxx:265
+    enum writerfilter::dmapper::PropertyIds PROP_PAPER_TRAY
+writerfilter/source/dmapper/PropertyIds.hxx:266
+    enum writerfilter::dmapper::PropertyIds PROP_PARENT_NUMBERING
+writerfilter/source/dmapper/PropertyIds.hxx:267
+    enum writerfilter::dmapper::PropertyIds PROP_POSITION_AND_SPACE_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:268
+    enum writerfilter::dmapper::PropertyIds PROP_POSITION_PROTECTED
+writerfilter/source/dmapper/PropertyIds.hxx:269
+    enum writerfilter::dmapper::PropertyIds PROP_IS_PROTECTED
+writerfilter/source/dmapper/PropertyIds.hxx:270
+    enum writerfilter::dmapper::PropertyIds PROP_REDLINE_AUTHOR
+writerfilter/source/dmapper/PropertyIds.hxx:271
+    enum writerfilter::dmapper::PropertyIds PROP_REDLINE_DATE_TIME
+writerfilter/source/dmapper/PropertyIds.hxx:272
+    enum writerfilter::dmapper::PropertyIds PROP_REDLINE_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:273
+    enum writerfilter::dmapper::PropertyIds PROP_REDLINE_REVERT_PROPERTIES
+writerfilter/source/dmapper/PropertyIds.hxx:274
+    enum writerfilter::dmapper::PropertyIds PROP_REFERENCE_FIELD_FLAGS
+writerfilter/source/dmapper/PropertyIds.hxx:275
+    enum writerfilter::dmapper::PropertyIds PROP_REFERENCE_FIELD_PART
+writerfilter/source/dmapper/PropertyIds.hxx:276
+    enum writerfilter::dmapper::PropertyIds PROP_REFERENCE_FIELD_SOURCE
+writerfilter/source/dmapper/PropertyIds.hxx:277
+    enum writerfilter::dmapper::PropertyIds PROP_RESTART_AT_EACH_PAGE
+writerfilter/source/dmapper/PropertyIds.hxx:279
+    enum writerfilter::dmapper::PropertyIds PROP_RIGHT_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:280
+    enum writerfilter::dmapper::PropertyIds PROP_RIGHT_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:281
+    enum writerfilter::dmapper::PropertyIds PROP_SERVICE_CHAR_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:282
+    enum writerfilter::dmapper::PropertyIds PROP_SERVICE_PARA_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:283
+    enum writerfilter::dmapper::PropertyIds PROP_SIZE
+writerfilter/source/dmapper/PropertyIds.hxx:284
+    enum writerfilter::dmapper::PropertyIds PROP_SIZE100th_M_M
+writerfilter/source/dmapper/PropertyIds.hxx:285
+    enum writerfilter::dmapper::PropertyIds PROP_SIZE_PIXEL
+writerfilter/source/dmapper/PropertyIds.hxx:286
+    enum writerfilter::dmapper::PropertyIds PROP_SIZE_PROTECTED
+writerfilter/source/dmapper/PropertyIds.hxx:287
+    enum writerfilter::dmapper::PropertyIds PROP_SIZE_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:288
+    enum writerfilter::dmapper::PropertyIds PROP_SOURCE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:289
+    enum writerfilter::dmapper::PropertyIds PROP_SPLIT
+writerfilter/source/dmapper/PropertyIds.hxx:290
+    enum writerfilter::dmapper::PropertyIds PROP_STANDARD
+writerfilter/source/dmapper/PropertyIds.hxx:291
+    enum writerfilter::dmapper::PropertyIds PROP_START_AT
+writerfilter/source/dmapper/PropertyIds.hxx:292
+    enum writerfilter::dmapper::PropertyIds PROP_START_WITH
+writerfilter/source/dmapper/PropertyIds.hxx:293
+    enum writerfilter::dmapper::PropertyIds PROP_STREAM_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:294
+    enum writerfilter::dmapper::PropertyIds PROP_SUB_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:295
+    enum writerfilter::dmapper::PropertyIds PROP_SURROUND
+writerfilter/source/dmapper/PropertyIds.hxx:296
+    enum writerfilter::dmapper::PropertyIds PROP_SURROUND_CONTOUR
+writerfilter/source/dmapper/PropertyIds.hxx:297
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_BORDER
+writerfilter/source/dmapper/PropertyIds.hxx:298
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_BORDER_DISTANCES
+writerfilter/source/dmapper/PropertyIds.hxx:300
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_REDLINE_PARAMS
+writerfilter/source/dmapper/PropertyIds.hxx:301
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_ROW_DELETE
+writerfilter/source/dmapper/PropertyIds.hxx:302
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_ROW_INSERT
+writerfilter/source/dmapper/PropertyIds.hxx:303
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_CELL_DELETE
+writerfilter/source/dmapper/PropertyIds.hxx:304
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_CELL_INSERT
+writerfilter/source/dmapper/PropertyIds.hxx:305
+    enum writerfilter::dmapper::PropertyIds PROP_TABS_RELATIVE_TO_INDENT
+writerfilter/source/dmapper/PropertyIds.hxx:306
+    enum writerfilter::dmapper::PropertyIds PROP_TAB_STOP_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:307
+    enum writerfilter::dmapper::PropertyIds PROP_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:308
+    enum writerfilter::dmapper::PropertyIds PROP_TEXT_COLUMNS
+writerfilter/source/dmapper/PropertyIds.hxx:309
+    enum writerfilter::dmapper::PropertyIds PROP_TEXT_RANGE
+writerfilter/source/dmapper/PropertyIds.hxx:310
+    enum writerfilter::dmapper::PropertyIds PROP_TEXT_VERTICAL_ADJUST
+writerfilter/source/dmapper/PropertyIds.hxx:311
+    enum writerfilter::dmapper::PropertyIds PROP_TITLE
+writerfilter/source/dmapper/PropertyIds.hxx:312
+    enum writerfilter::dmapper::PropertyIds PROP_TOKEN_CHAPTER_INFO
+writerfilter/source/dmapper/PropertyIds.hxx:313
+    enum writerfilter::dmapper::PropertyIds PROP_TOKEN_HYPERLINK_END
+writerfilter/source/dmapper/PropertyIds.hxx:314
+    enum writerfilter::dmapper::PropertyIds PROP_TOKEN_HYPERLINK_START
+writerfilter/source/dmapper/PropertyIds.hxx:315
+    enum writerfilter::dmapper::PropertyIds PROP_TOKEN_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:316
+    enum writerfilter::dmapper::PropertyIds PROP_TOKEN_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:318
+    enum writerfilter::dmapper::PropertyIds PROP_TOP_BORDER_DISTANCE
+writerfilter/source/dmapper/PropertyIds.hxx:320
+    enum writerfilter::dmapper::PropertyIds PROP_VERTICAL_MERGE
+writerfilter/source/dmapper/PropertyIds.hxx:321
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_STANDARD_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:322
+    enum writerfilter::dmapper::PropertyIds PROP_VERT_ORIENT
+writerfilter/source/dmapper/PropertyIds.hxx:323
+    enum writerfilter::dmapper::PropertyIds PROP_VERT_ORIENT_POSITION
+writerfilter/source/dmapper/PropertyIds.hxx:324
+    enum writerfilter::dmapper::PropertyIds PROP_VERT_ORIENT_RELATION
+writerfilter/source/dmapper/PropertyIds.hxx:325
+    enum writerfilter::dmapper::PropertyIds PROP_WIDTH
+writerfilter/source/dmapper/PropertyIds.hxx:326
+    enum writerfilter::dmapper::PropertyIds PROP_WIDTH_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:327
+    enum writerfilter::dmapper::PropertyIds PROP_TBL_LOOK
+writerfilter/source/dmapper/PropertyIds.hxx:328
+    enum writerfilter::dmapper::PropertyIds PROP_WRITING_MODE
+writerfilter/source/dmapper/PropertyIds.hxx:329
+    enum writerfilter::dmapper::PropertyIds PROP_FRM_DIRECTION
+writerfilter/source/dmapper/PropertyIds.hxx:330
+    enum writerfilter::dmapper::PropertyIds PROP_EMBEDDED_OBJECT
+writerfilter/source/dmapper/PropertyIds.hxx:331
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_CONTEXT_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:332
+    enum writerfilter::dmapper::PropertyIds PROP_PAGE_STYLE_LAYOUT
+writerfilter/source/dmapper/PropertyIds.hxx:333
+    enum writerfilter::dmapper::PropertyIds PROP_Z_ORDER
+writerfilter/source/dmapper/PropertyIds.hxx:334
+    enum writerfilter::dmapper::PropertyIds PROP_EMBED_FONTS
+writerfilter/source/dmapper/PropertyIds.hxx:335
+    enum writerfilter::dmapper::PropertyIds PROP_EMBED_SYSTEM_FONTS
+writerfilter/source/dmapper/PropertyIds.hxx:336
+    enum writerfilter::dmapper::PropertyIds PROP_SHADOW_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:337
+    enum writerfilter::dmapper::PropertyIds PROP_RELATIVE_WIDTH
+writerfilter/source/dmapper/PropertyIds.hxx:338
+    enum writerfilter::dmapper::PropertyIds PROP_IS_WIDTH_RELATIVE
+writerfilter/source/dmapper/PropertyIds.hxx:339
+    enum writerfilter::dmapper::PropertyIds PROP_GRAPHIC_BITMAP
+writerfilter/source/dmapper/PropertyIds.hxx:340
+    enum writerfilter::dmapper::PropertyIds PROP_GRAPHIC_SIZE
+writerfilter/source/dmapper/PropertyIds.hxx:341
+    enum writerfilter::dmapper::PropertyIds PROP_MIRROR_INDENTS
+writerfilter/source/dmapper/PropertyIds.hxx:342
+    enum writerfilter::dmapper::PropertyIds PROP_SURROUND_TEXT_WRAP_SMALL
+writerfilter/source/dmapper/PropertyIds.hxx:343
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_SHADOW_FORMAT
+writerfilter/source/dmapper/PropertyIds.hxx:344
+    enum writerfilter::dmapper::PropertyIds PROP_FOOTNOTE_LINE_RELATIVE_WIDTH
+writerfilter/source/dmapper/PropertyIds.hxx:345
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING
+writerfilter/source/dmapper/PropertyIds.hxx:346
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING
+writerfilter/source/dmapper/PropertyIds.hxx:347
+    enum writerfilter::dmapper::PropertyIds PROP_TBL_HEADER
+writerfilter/source/dmapper/PropertyIds.hxx:348
+    enum writerfilter::dmapper::PropertyIds PROP_HORIZONTAL_MERGE
+writerfilter/source/dmapper/PropertyIds.hxx:349
+    enum writerfilter::dmapper::PropertyIds PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS
+writerfilter/source/dmapper/PropertyIds.hxx:350
+    enum writerfilter::dmapper::PropertyIds PROP_TAB_IN_TOC
+writerfilter/source/dmapper/PropertyIds.hxx:351
+    enum writerfilter::dmapper::PropertyIds PROP_TOC_BOOKMARK
+writerfilter/source/dmapper/PropertyIds.hxx:352
+    enum writerfilter::dmapper::PropertyIds PROP_TOC_NEW_LINE
+writerfilter/source/dmapper/PropertyIds.hxx:353
+    enum writerfilter::dmapper::PropertyIds PROP_TOC_PARAGRAPH_OUTLINE_LEVEL
+writerfilter/source/dmapper/PropertyIds.hxx:354
+    enum writerfilter::dmapper::PropertyIds PROP_SDTPR
+writerfilter/source/dmapper/PropertyIds.hxx:356
+    enum writerfilter::dmapper::PropertyIds PROP_TABLE_INTEROP_GRAB_BAG
+writerfilter/source/dmapper/PropertyIds.hxx:357
+    enum writerfilter::dmapper::PropertyIds PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
+writerfilter/source/dmapper/PropertyIds.hxx:358
+    enum writerfilter::dmapper::PropertyIds PROP_SDT_END_BEFORE
+writerfilter/source/dmapper/PropertyIds.hxx:359
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_SDT_END_BEFORE
+writerfilter/source/dmapper/PropertyIds.hxx:360
+    enum writerfilter::dmapper::PropertyIds META_PROP_TABLE_LOOK
+writerfilter/source/dmapper/PropertyIds.hxx:361
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_CNF_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:362
+    enum writerfilter::dmapper::PropertyIds PROP_CELL_CNF_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:363
+    enum writerfilter::dmapper::PropertyIds PROP_ROW_CNF_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:364
+    enum writerfilter::dmapper::PropertyIds PROP_CELL_HIDE_MARK
+writerfilter/source/dmapper/PropertyIds.hxx:365
+    enum writerfilter::dmapper::PropertyIds PROP_FOLLOW_TEXT_FLOW
+writerfilter/source/dmapper/PropertyIds.hxx:369
+    enum writerfilter::dmapper::PropertyIds PROP_SNAP_TO_GRID
+writerfilter/source/dmapper/PropertyIds.hxx:370
+    enum writerfilter::dmapper::PropertyIds PROP_GRID_SNAP_TO_CHARS
+writerfilter/source/dmapper/PropertyIds.hxx:371
+    enum writerfilter::dmapper::PropertyIds PROP_RUBY_STYLE
+writerfilter/source/dmapper/PropertyIds.hxx:372
+    enum writerfilter::dmapper::PropertyIds PROP_RUBY_TEXT
+writerfilter/source/dmapper/PropertyIds.hxx:373
+    enum writerfilter::dmapper::PropertyIds PROP_RUBY_ADJUST
+writerfilter/source/dmapper/PropertyIds.hxx:374
+    enum writerfilter::dmapper::PropertyIds PROP_RUBY_POSITION
+writerfilter/source/dmapper/PropertyIds.hxx:375
+    enum writerfilter::dmapper::PropertyIds PROP_DATABASE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:376
+    enum writerfilter::dmapper::PropertyIds PROP_COMMAND_TYPE
+writerfilter/source/dmapper/PropertyIds.hxx:377
+    enum writerfilter::dmapper::PropertyIds PROP_DATATABLE_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:378
+    enum writerfilter::dmapper::PropertyIds PROP_DATACOLUMN_NAME
+writerfilter/source/dmapper/PropertyIds.hxx:379
+    enum writerfilter::dmapper::PropertyIds PROP_CHAR_TRANSPARENCE
+writerfilter/source/dmapper/PropertyIds.hxx:380
+    enum writerfilter::dmapper::PropertyIds PROP_CELL_FORMULA
+writerfilter/source/dmapper/PropertyIds.hxx:381
+    enum writerfilter::dmapper::PropertyIds PROP_CELL_FORMULA_CONVERTED
+writerfilter/source/dmapper/PropertyIds.hxx:382
+    enum writerfilter::dmapper::PropertyIds PROP_GUTTER_MARGIN
+writerfilter/source/dmapper/PropertyIds.hxx:383
+    enum writerfilter::dmapper::PropertyIds PROP_RTL_GUTTER
+writerfilter/source/dmapper/PropertyIds.hxx:384
+    enum writerfilter::dmapper::PropertyIds PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
+writerfilter/source/dmapper/PropertyIds.hxx:385
+    enum writerfilter::dmapper::PropertyIds PROP_PARA_CONNECT_BORDERS
 writerfilter/source/dmapper/PropertyMap.hxx:68
-    enum writerfilter::dmapper::BorderPosition BORDER_RIGHT
+    enum writerfilter::dmapper::BorderPosition BORDER_LEFT
 writerfilter/source/dmapper/PropertyMap.hxx:69
-    enum writerfilter::dmapper::BorderPosition BORDER_TOP
+    enum writerfilter::dmapper::BorderPosition BORDER_RIGHT
 writerfilter/source/dmapper/PropertyMap.hxx:70
+    enum writerfilter::dmapper::BorderPosition BORDER_TOP
+writerfilter/source/dmapper/PropertyMap.hxx:71
     enum writerfilter::dmapper::BorderPosition BORDER_BOTTOM
-writerfilter/source/dmapper/PropertyMap.hxx:75
+writerfilter/source/dmapper/PropertyMap.hxx:76
     enum writerfilter::dmapper::GrabBagType NO_GRAB_BAG
-writerfilter/source/dmapper/PropertyMap.hxx:215
+writerfilter/source/dmapper/PropertyMap.hxx:235
+    enum writerfilter::dmapper::SectionPropertyMap::BorderApply ToAllInSection
+writerfilter/source/dmapper/PropertyMap.hxx:236
+    enum writerfilter::dmapper::SectionPropertyMap::BorderApply ToFirstPageInSection
+writerfilter/source/dmapper/PropertyMap.hxx:237
+    enum writerfilter::dmapper::SectionPropertyMap::BorderApply ToAllButFirstInSection
+writerfilter/source/dmapper/PropertyMap.hxx:241
     enum writerfilter::dmapper::SectionPropertyMap::BorderOffsetFrom Text
-writerfilter/source/dmapper/PropertyMap.hxx:552
+writerfilter/source/dmapper/PropertyMap.hxx:600
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget TablePropertyMapTarget_START
-writerfilter/source/dmapper/PropertyMap.hxx:553
+writerfilter/source/dmapper/PropertyMap.hxx:601
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget CELL_MAR_LEFT
-writerfilter/source/dmapper/PropertyMap.hxx:554
+writerfilter/source/dmapper/PropertyMap.hxx:602
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget CELL_MAR_RIGHT
-writerfilter/source/dmapper/PropertyMap.hxx:555
+writerfilter/source/dmapper/PropertyMap.hxx:603
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget CELL_MAR_TOP
-writerfilter/source/dmapper/PropertyMap.hxx:556
+writerfilter/source/dmapper/PropertyMap.hxx:604
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget CELL_MAR_BOTTOM
-writerfilter/source/dmapper/PropertyMap.hxx:557
+writerfilter/source/dmapper/PropertyMap.hxx:605
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget TABLE_WIDTH
-writerfilter/source/dmapper/PropertyMap.hxx:558
+writerfilter/source/dmapper/PropertyMap.hxx:606
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget TABLE_WIDTH_TYPE
-writerfilter/source/dmapper/PropertyMap.hxx:559
-    enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget GAP_HALF
-writerfilter/source/dmapper/PropertyMap.hxx:560
+writerfilter/source/dmapper/PropertyMap.hxx:607
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget LEFT_MARGIN
-writerfilter/source/dmapper/PropertyMap.hxx:561
+writerfilter/source/dmapper/PropertyMap.hxx:608
     enum writerfilter::dmapper::TablePropertyMap::TablePropertyMapTarget HORI_ORIENT
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:42
+writerfilter/source/dmapper/SdtHelper.hxx:50
+    enum writerfilter::dmapper::SdtControlType unsupported
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:40
     enum writerfilter::ooxml::OOXMLFastContextHandler::ResourceEnum_t PROPERTIES
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:42
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:40
     enum writerfilter::ooxml::OOXMLFastContextHandler::ResourceEnum_t SHAPE
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:42
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:40
     enum writerfilter::ooxml::OOXMLFastContextHandler::ResourceEnum_t TABLE
 writerfilter/source/rtftok/rtfdocumentimpl.hxx:97
     enum writerfilter::rtftok::RTFFormFieldType TEXT
@@ -5760,258 +6914,260 @@ writerfilter/source/rtftok/rtfdocumentimpl.hxx:106
     enum writerfilter::rtftok::RTFBmpStyle JPEG
 writerfilter/source/rtftok/rtfdocumentimpl.hxx:114
     enum writerfilter::rtftok::RTFFieldStatus RESULT
-writerperfect/source/writer/exp/xmlimp.hxx:61
+writerperfect/source/writer/exp/xmlimp.hxx:60
     enum writerperfect::exp::PopupState Consumed
 xmlhelp/source/cxxhelp/inc/tvread.hxx:44
-    enum treeview::ConfigData::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) PRODUCTNAME
+    enum treeview::ConfigData::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) PRODUCTNAME
 xmlhelp/source/cxxhelp/inc/tvread.hxx:44
-    enum treeview::ConfigData::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) PRODUCTVERSION
+    enum treeview::ConfigData::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) PRODUCTVERSION
 xmlhelp/source/cxxhelp/inc/tvread.hxx:44
-    enum treeview::ConfigData::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORNAME
+    enum treeview::ConfigData::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORNAME
 xmlhelp/source/cxxhelp/inc/tvread.hxx:44
-    enum treeview::ConfigData::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORVERSION
+    enum treeview::ConfigData::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORVERSION
 xmlhelp/source/cxxhelp/inc/tvread.hxx:45
-    enum treeview::ConfigData::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORSHORT
-xmlhelp/source/cxxhelp/provider/databases.hxx:232
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) PRODUCTNAME
-xmlhelp/source/cxxhelp/provider/databases.hxx:233
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) PRODUCTVERSION
-xmlhelp/source/cxxhelp/provider/databases.hxx:234
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) VENDORNAME
-xmlhelp/source/cxxhelp/provider/databases.hxx:235
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) VENDORVERSION
-xmlhelp/source/cxxhelp/provider/databases.hxx:236
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) VENDORSHORT
-xmlhelp/source/cxxhelp/provider/databases.hxx:237
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) NEWPRODUCTNAME
-xmlhelp/source/cxxhelp/provider/databases.hxx:238
-    enum chelp::Databases::(anonymous at /home/noel/libo2/xmlhelp/source/cxxhelp/provider/databases.hxx:231:9) NEWPRODUCTVERSION
-xmlhelp/source/treeview/tvread.cxx:80
-    enum treeview::TVDom::Kind tree_node
+    enum treeview::ConfigData::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/inc/tvread.hxx:43:9) VENDORSHORT
+xmlhelp/source/cxxhelp/provider/databases.hxx:241
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) PRODUCTNAME
+xmlhelp/source/cxxhelp/provider/databases.hxx:242
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) PRODUCTVERSION
+xmlhelp/source/cxxhelp/provider/databases.hxx:243
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) VENDORNAME
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) VENDORVERSION
+xmlhelp/source/cxxhelp/provider/databases.hxx:245
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) VENDORSHORT
+xmlhelp/source/cxxhelp/provider/databases.hxx:246
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) NEWPRODUCTNAME
+xmlhelp/source/cxxhelp/provider/databases.hxx:247
+    enum chelp::Databases::(unnamed at /home/noel/libo-plugin/xmlhelp/source/cxxhelp/provider/databases.hxx:240:9) NEWPRODUCTVERSION
 xmlhelp/source/treeview/tvread.cxx:82
+    enum treeview::TVDom::Kind tree_node
+xmlhelp/source/treeview/tvread.cxx:84
     enum treeview::TVDom::Kind other
-xmloff/inc/EnhancedCustomShapeToken.hxx:89
-    enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_CustomShapeEngine
 xmloff/inc/EnhancedCustomShapeToken.hxx:90
+    enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_CustomShapeEngine
+xmloff/inc/EnhancedCustomShapeToken.hxx:91
     enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_CustomShapeData
-xmloff/inc/EnhancedCustomShapeToken.hxx:102
+xmloff/inc/EnhancedCustomShapeToken.hxx:103
     enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_Equation
-xmloff/inc/EnhancedCustomShapeToken.hxx:106
+xmloff/inc/EnhancedCustomShapeToken.hxx:107
     enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_Handle
-xmloff/inc/EnhancedCustomShapeToken.hxx:143
+xmloff/inc/EnhancedCustomShapeToken.hxx:145
     enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_GluePointLeavingDirections
-xmloff/inc/EnhancedCustomShapeToken.hxx:153
+xmloff/inc/EnhancedCustomShapeToken.hxx:155
     enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum EAS_NotFound
-xmloff/inc/forms/property_ids.hxx:38
+xmloff/inc/forms/property_ids.hxx:37
     enum xmloff::PropertyId PID_INVALID
-xmloff/source/chart/SchXMLPlotAreaContext.hxx:231
+xmloff/source/chart/SchXMLPlotAreaContext.hxx:229
     enum SchXMLWallFloorContext::ContextType CONTEXT_TYPE_FLOOR
-xmloff/source/chart/SchXMLTools.hxx:56
+xmloff/source/chart/SchXMLTools.hxx:55
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_LINE
-xmloff/source/chart/SchXMLTools.hxx:57
+xmloff/source/chart/SchXMLTools.hxx:56
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_AREA
-xmloff/source/chart/SchXMLTools.hxx:58
+xmloff/source/chart/SchXMLTools.hxx:57
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_CIRCLE
-xmloff/source/chart/SchXMLTools.hxx:59
+xmloff/source/chart/SchXMLTools.hxx:58
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_RING
-xmloff/source/chart/SchXMLTools.hxx:60
+xmloff/source/chart/SchXMLTools.hxx:59
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_SCATTER
-xmloff/source/chart/SchXMLTools.hxx:61
+xmloff/source/chart/SchXMLTools.hxx:60
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_RADAR
-xmloff/source/chart/SchXMLTools.hxx:62
+xmloff/source/chart/SchXMLTools.hxx:61
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_FILLED_RADAR
-xmloff/source/chart/SchXMLTools.hxx:63
+xmloff/source/chart/SchXMLTools.hxx:62
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_BAR
-xmloff/source/chart/SchXMLTools.hxx:65
+xmloff/source/chart/SchXMLTools.hxx:64
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_BUBBLE
-xmloff/source/chart/SchXMLTools.hxx:66
+xmloff/source/chart/SchXMLTools.hxx:65
     enum SchXMLTools::SchXMLChartTypeEnum XML_CHART_CLASS_ADDIN
 xmloff/source/chart/transporttypes.hxx:31
     enum SchXMLCellType SCH_CELL_TYPE_UNKNOWN
-xmloff/source/core/xmlenums.hxx:25
+xmloff/source/core/xmlenums.hxx:24
     enum XMLForbiddenCharactersEnum XML_FORBIDDEN_CHARACTER_LANGUAGE
-xmloff/source/core/xmlenums.hxx:26
+xmloff/source/core/xmlenums.hxx:25
     enum XMLForbiddenCharactersEnum XML_FORBIDDEN_CHARACTER_COUNTRY
-xmloff/source/core/xmlenums.hxx:27
+xmloff/source/core/xmlenums.hxx:26
     enum XMLForbiddenCharactersEnum XML_FORBIDDEN_CHARACTER_VARIANT
-xmloff/source/core/xmlenums.hxx:28
+xmloff/source/core/xmlenums.hxx:27
     enum XMLForbiddenCharactersEnum XML_FORBIDDEN_CHARACTER_BEGIN_LINE
-xmloff/source/core/xmlenums.hxx:29
+xmloff/source/core/xmlenums.hxx:28
     enum XMLForbiddenCharactersEnum XML_FORBIDDEN_CHARACTER_END_LINE
-xmloff/source/core/xmlenums.hxx:35
+xmloff/source/core/xmlenums.hxx:34
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_NAME
-xmloff/source/core/xmlenums.hxx:36
+xmloff/source/core/xmlenums.hxx:35
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_EXPORT_NAME
-xmloff/source/core/xmlenums.hxx:37
+xmloff/source/core/xmlenums.hxx:36
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_SYMBOL_SET
-xmloff/source/core/xmlenums.hxx:38
+xmloff/source/core/xmlenums.hxx:37
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_CHARACTER
-xmloff/source/core/xmlenums.hxx:39
+xmloff/source/core/xmlenums.hxx:38
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_FONT_NAME
-xmloff/source/core/xmlenums.hxx:40
+xmloff/source/core/xmlenums.hxx:39
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_CHAR_SET
-xmloff/source/core/xmlenums.hxx:41
+xmloff/source/core/xmlenums.hxx:40
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_FAMILY
-xmloff/source/core/xmlenums.hxx:42
+xmloff/source/core/xmlenums.hxx:41
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_PITCH
-xmloff/source/core/xmlenums.hxx:43
+xmloff/source/core/xmlenums.hxx:42
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_WEIGHT
-xmloff/source/core/xmlenums.hxx:44
+xmloff/source/core/xmlenums.hxx:43
     enum XMLSymbolDescriptorsEnum XML_SYMBOL_DESCRIPTOR_ITALIC
-xmloff/source/draw/XMLNumberStyles.cxx:75
-    enum DataStyleNumber Day
 xmloff/source/draw/XMLNumberStyles.cxx:76
-    enum DataStyleNumber DayLong
+    enum DataStyleNumber Day
 xmloff/source/draw/XMLNumberStyles.cxx:77
-    enum DataStyleNumber MonthLong
+    enum DataStyleNumber DayLong
 xmloff/source/draw/XMLNumberStyles.cxx:78
-    enum DataStyleNumber MonthText
+    enum DataStyleNumber MonthLong
 xmloff/source/draw/XMLNumberStyles.cxx:79
-    enum DataStyleNumber MonthLongText
+    enum DataStyleNumber MonthText
 xmloff/source/draw/XMLNumberStyles.cxx:80
-    enum DataStyleNumber Year
+    enum DataStyleNumber MonthLongText
 xmloff/source/draw/XMLNumberStyles.cxx:81
-    enum DataStyleNumber YearLong
+    enum DataStyleNumber Year
 xmloff/source/draw/XMLNumberStyles.cxx:82
-    enum DataStyleNumber DayOfWeek
+    enum DataStyleNumber YearLong
 xmloff/source/draw/XMLNumberStyles.cxx:83
-    enum DataStyleNumber DayOfWeekLong
+    enum DataStyleNumber DayOfWeek
 xmloff/source/draw/XMLNumberStyles.cxx:84
+    enum DataStyleNumber DayOfWeekLong
+xmloff/source/draw/XMLNumberStyles.cxx:85
     enum DataStyleNumber TextPoint
-xmloff/source/draw/XMLNumberStyles.cxx:86
-    enum DataStyleNumber TextCommaSpace
 xmloff/source/draw/XMLNumberStyles.cxx:87
-    enum DataStyleNumber TextPointSpace
+    enum DataStyleNumber TextCommaSpace
 xmloff/source/draw/XMLNumberStyles.cxx:88
-    enum DataStyleNumber Hours
+    enum DataStyleNumber TextPointSpace
 xmloff/source/draw/XMLNumberStyles.cxx:89
-    enum DataStyleNumber Minutes
+    enum DataStyleNumber Hours
 xmloff/source/draw/XMLNumberStyles.cxx:90
-    enum DataStyleNumber TextColon
+    enum DataStyleNumber Minutes
 xmloff/source/draw/XMLNumberStyles.cxx:91
-    enum DataStyleNumber AmPm
+    enum DataStyleNumber TextColon
 xmloff/source/draw/XMLNumberStyles.cxx:92
-    enum DataStyleNumber Seconds
+    enum DataStyleNumber AmPm
 xmloff/source/draw/XMLNumberStyles.cxx:93
+    enum DataStyleNumber Seconds
+xmloff/source/draw/XMLNumberStyles.cxx:94
     enum DataStyleNumber Seconds_02
-xmloff/source/forms/controlelement.hxx:53
+xmloff/source/forms/controlelement.hxx:52
     enum xmloff::OControlElement::ElementType GENERIC_CONTROL
-xmloff/source/forms/formattributes.hxx:101
+xmloff/source/forms/formattributes.hxx:100
     enum EAFlags ControlEvents
-xmloff/source/forms/formattributes.hxx:102
+xmloff/source/forms/formattributes.hxx:101
     enum EAFlags OnChange
-xmloff/source/forms/formattributes.hxx:103
+xmloff/source/forms/formattributes.hxx:102
     enum EAFlags OnClick
-xmloff/source/forms/formattributes.hxx:104
+xmloff/source/forms/formattributes.hxx:103
     enum EAFlags OnDoubleClick
-xmloff/source/forms/formattributes.hxx:105
+xmloff/source/forms/formattributes.hxx:104
     enum EAFlags OnSelect
-xmloff/source/forms/propertyexport.hxx:36
+xmloff/source/forms/propertyexport.hxx:35
     enum BoolAttrFlags DefaultFalse
-xmloff/source/style/PagePropertySetContext.hxx:27
+xmloff/source/style/PagePropertySetContext.hxx:26
     enum PageContextType Page
-xmloff/source/text/txtparae.cxx:341
+xmloff/source/text/txtparae.cxx:484
     enum (anonymous namespace)::eParagraphPropertyNamesEnumAuto NUMBERING_RULES_AUTO
-xmloff/source/text/txtparae.cxx:342
+xmloff/source/text/txtparae.cxx:485
     enum (anonymous namespace)::eParagraphPropertyNamesEnumAuto PARA_CONDITIONAL_STYLE_NAME_AUTO
-xmloff/source/text/txtparae.cxx:343
+xmloff/source/text/txtparae.cxx:486
     enum (anonymous namespace)::eParagraphPropertyNamesEnumAuto PARA_STYLE_NAME_AUTO
-xmloff/source/text/txtparae.cxx:364
+xmloff/source/text/txtparae.cxx:507
     enum (anonymous namespace)::eParagraphPropertyNamesEnum NUMBERING_IS_NUMBER
-xmloff/source/text/txtparae.cxx:365
+xmloff/source/text/txtparae.cxx:508
     enum (anonymous namespace)::eParagraphPropertyNamesEnum PARA_NUMBERING_STYLENAME
-xmloff/source/text/txtparae.cxx:366
+xmloff/source/text/txtparae.cxx:509
     enum (anonymous namespace)::eParagraphPropertyNamesEnum PARA_OUTLINE_LEVEL
-xmloff/source/text/txtparae.cxx:367
+xmloff/source/text/txtparae.cxx:510
     enum (anonymous namespace)::eParagraphPropertyNamesEnum PARA_CONDITIONAL_STYLE_NAME
-xmloff/source/text/txtparae.cxx:368
+xmloff/source/text/txtparae.cxx:511
     enum (anonymous namespace)::eParagraphPropertyNamesEnum PARA_STYLE_NAME
-xmloff/source/text/txtparae.cxx:369
+xmloff/source/text/txtparae.cxx:512
     enum (anonymous namespace)::eParagraphPropertyNamesEnum TEXT_SECTION
-xmloff/source/text/txtparae.cxx:370
+xmloff/source/text/txtparae.cxx:513
     enum (anonymous namespace)::eParagraphPropertyNamesEnum PARA_OUTLINE_CONTENT_VISIBLE
-xmloff/source/text/XMLIndexTOCContext.hxx:43
+xmloff/source/text/XMLIndexTOCContext.hxx:42
     enum IndexTypeEnum TEXT_INDEX_UNKNOWN
-xmloff/source/text/XMLSectionExport.cxx:1056
+xmloff/source/text/XMLSectionExport.cxx:1077
     enum (anonymous namespace)::TemplateTypeEnum TOK_TTYPE_INVALID
-xmloff/source/text/XMLSectionExport.hxx:58
+xmloff/source/text/XMLSectionExport.hxx:57
     enum SectionTypeEnum TEXT_SECTION_TYPE_UNKNOWN
-xmloff/source/transform/AttrTransformerAction.hxx:27
+xmloff/source/transform/AttrTransformerAction.hxx:26
     enum XMLAttrTransformerAction XML_ATACTION_EOT
-xmloff/source/transform/AttrTransformerAction.hxx:124
+xmloff/source/transform/AttrTransformerAction.hxx:123
     enum XMLAttrTransformerAction XML_ATACTION_USER_DEFINED
-xmloff/source/transform/ElemTransformerAction.hxx:27
+xmloff/source/transform/ElemTransformerAction.hxx:26
     enum XMLElemTransformerAction XML_ETACTION_EOT
-xmloff/source/transform/FamilyType.hxx:26
+xmloff/source/transform/FamilyType.hxx:25
     enum XMLFamilyType XML_FAMILY_TYPE_PRESENTATION
-xmloff/source/transform/FamilyType.hxx:27
+xmloff/source/transform/FamilyType.hxx:26
     enum XMLFamilyType XML_FAMILY_TYPE_DRAWING_PAGE
-xmloff/source/transform/FamilyType.hxx:28
+xmloff/source/transform/FamilyType.hxx:27
     enum XMLFamilyType XML_FAMILY_TYPE_MASTER_PAGE
-xmloff/source/transform/FamilyType.hxx:29
+xmloff/source/transform/FamilyType.hxx:28
     enum XMLFamilyType XML_FAMILY_TYPE_PAGE_LAYOUT
-xmloff/source/transform/FamilyType.hxx:30
+xmloff/source/transform/FamilyType.hxx:29
     enum XMLFamilyType XML_FAMILY_TYPE_HEADER_FOOTER
-xmloff/source/transform/FamilyType.hxx:31
+xmloff/source/transform/FamilyType.hxx:30
     enum XMLFamilyType XML_FAMILY_TYPE_TEXT
-xmloff/source/transform/FamilyType.hxx:32
+xmloff/source/transform/FamilyType.hxx:31
     enum XMLFamilyType XML_FAMILY_TYPE_PARAGRAPH
-xmloff/source/transform/FamilyType.hxx:33
+xmloff/source/transform/FamilyType.hxx:32
     enum XMLFamilyType XML_FAMILY_TYPE_RUBY
-xmloff/source/transform/FamilyType.hxx:34
+xmloff/source/transform/FamilyType.hxx:33
     enum XMLFamilyType XML_FAMILY_TYPE_SECTION
-xmloff/source/transform/FamilyType.hxx:35
+xmloff/source/transform/FamilyType.hxx:34
     enum XMLFamilyType XML_FAMILY_TYPE_TABLE
-xmloff/source/transform/FamilyType.hxx:36
+xmloff/source/transform/FamilyType.hxx:35
     enum XMLFamilyType XML_FAMILY_TYPE_TABLE_COLUMN
-xmloff/source/transform/FamilyType.hxx:37
+xmloff/source/transform/FamilyType.hxx:36
     enum XMLFamilyType XML_FAMILY_TYPE_TABLE_ROW
-xmloff/source/transform/FamilyType.hxx:38
+xmloff/source/transform/FamilyType.hxx:37
     enum XMLFamilyType XML_FAMILY_TYPE_TABLE_CELL
-xmloff/source/transform/FamilyType.hxx:39
+xmloff/source/transform/FamilyType.hxx:38
     enum XMLFamilyType XML_FAMILY_TYPE_LIST
-xmloff/source/transform/FamilyType.hxx:40
+xmloff/source/transform/FamilyType.hxx:39
     enum XMLFamilyType XML_FAMILY_TYPE_CHART
-xmloff/source/transform/FamilyType.hxx:41
+xmloff/source/transform/FamilyType.hxx:40
     enum XMLFamilyType XML_FAMILY_TYPE_DATA
-xmloff/source/transform/FamilyType.hxx:42
+xmloff/source/transform/FamilyType.hxx:41
     enum XMLFamilyType XML_FAMILY_TYPE_GRADIENT
-xmloff/source/transform/FamilyType.hxx:43
+xmloff/source/transform/FamilyType.hxx:42
     enum XMLFamilyType XML_FAMILY_TYPE_HATCH
-xmloff/source/transform/FamilyType.hxx:44
+xmloff/source/transform/FamilyType.hxx:43
     enum XMLFamilyType XML_FAMILY_TYPE_FILL_IMAGE
-xmloff/source/transform/FamilyType.hxx:45
+xmloff/source/transform/FamilyType.hxx:44
     enum XMLFamilyType XML_FAMILY_TYPE_STROKE_DASH
-xmloff/source/transform/FamilyType.hxx:46
+xmloff/source/transform/FamilyType.hxx:45
     enum XMLFamilyType XML_FAMILY_TYPE_MARKER
-xmloff/source/transform/PropType.hxx:25
+xmloff/source/transform/PropType.hxx:24
     enum XMLPropType XML_PROP_TYPE_GRAPHIC
-xmloff/source/transform/PropType.hxx:26
+xmloff/source/transform/PropType.hxx:25
     enum XMLPropType XML_PROP_TYPE_DRAWING_PAGE
-xmloff/source/transform/PropType.hxx:27
+xmloff/source/transform/PropType.hxx:26
     enum XMLPropType XML_PROP_TYPE_PAGE_LAYOUT
-xmloff/source/transform/PropType.hxx:28
+xmloff/source/transform/PropType.hxx:27
     enum XMLPropType XML_PROP_TYPE_HEADER_FOOTER
-xmloff/source/transform/PropType.hxx:29
+xmloff/source/transform/PropType.hxx:28
     enum XMLPropType XML_PROP_TYPE_TEXT
-xmloff/source/transform/PropType.hxx:30
+xmloff/source/transform/PropType.hxx:29
     enum XMLPropType XML_PROP_TYPE_PARAGRAPH
-xmloff/source/transform/PropType.hxx:31
+xmloff/source/transform/PropType.hxx:30
     enum XMLPropType XML_PROP_TYPE_RUBY
-xmloff/source/transform/PropType.hxx:32
+xmloff/source/transform/PropType.hxx:31
     enum XMLPropType XML_PROP_TYPE_SECTION
-xmloff/source/transform/PropType.hxx:33
+xmloff/source/transform/PropType.hxx:32
     enum XMLPropType XML_PROP_TYPE_TABLE
-xmloff/source/transform/PropType.hxx:34
+xmloff/source/transform/PropType.hxx:33
     enum XMLPropType XML_PROP_TYPE_TABLE_COLUMN
-xmloff/source/transform/PropType.hxx:35
+xmloff/source/transform/PropType.hxx:34
     enum XMLPropType XML_PROP_TYPE_TABLE_ROW
-xmloff/source/transform/PropType.hxx:36
+xmloff/source/transform/PropType.hxx:35
     enum XMLPropType XML_PROP_TYPE_TABLE_CELL
-xmloff/source/transform/PropType.hxx:37
+xmloff/source/transform/PropType.hxx:36
     enum XMLPropType XML_PROP_TYPE_LIST_LEVEL
-xmloff/source/transform/PropType.hxx:38
+xmloff/source/transform/PropType.hxx:37
     enum XMLPropType XML_PROP_TYPE_CHART
+xmlsecurity/inc/biginteger.hxx:43
+    enum xmlsecurity::EqualMode NOCOMPAT
 xmlsecurity/inc/documentsignaturehelper.hxx:45
     enum DocumentSignatureAlgorithm OOo3_0
 xmlsecurity/inc/xsecctl.hxx:192
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index 7a8df9939d02..35381632755a 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -25,9 +25,7 @@
 #include "compat.hxx"
 #include "check.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
 This performs two analyses:
@@ -41,11 +39,11 @@ Be warned that it produces around 5G of log file.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedfields' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='unusedfields' check
   $ ./compilerplugins/clang/unusedfields.py
 
 and then
-  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedfieldsremove' $dir; done
+  $ for dir in *; do make FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedfieldsremove' $dir; done
 to auto-remove the method declarations
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
@@ -170,9 +168,10 @@ private:
     void checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memberExpr);
     bool isSomeKindOfZero(const Expr* arg);
     bool checkForWriteWhenUsingCollectionType(const CXXMethodDecl * calleeMethodDecl);
+    bool checkForUsingMap(const CXXMethodDecl * calleeMethodDecl);
     bool IsPassedByNonConst(const FieldDecl* fieldDecl, const Stmt * child, CallerWrapper callExpr,
                                         CalleeWrapper calleeFunctionDecl);
-    llvm::Optional<CalleeWrapper> getCallee(CallExpr const *);
+    compat::optional<CalleeWrapper> getCallee(CallExpr const *);
 
     RecordDecl *   insideMoveOrCopyOrCloneDeclParent = nullptr;
     RecordDecl *   insideStreamOutputOperator = nullptr;
@@ -184,6 +183,8 @@ private:
 
 void UnusedFields::run()
 {
+    handler.enableTreeWideAnalysisMode();
+
     TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
     if (!isUnitTestMode())
@@ -214,25 +215,25 @@ void UnusedFields::run()
             report(
                 DiagnosticsEngine::Warning,
                 "read %0",
-                compat::getBeginLoc(s.parentRecord))
+                s.parentRecord->getBeginLoc())
                 << s.fieldName;
         for (const MyFieldInfo & s : writeToSet)
             report(
                 DiagnosticsEngine::Warning,
                 "write %0",
-                compat::getBeginLoc(s.parentRecord))
+                s.parentRecord->getBeginLoc())
                 << s.fieldName;
         for (const MyFieldInfo & s : touchedFromOutsideConstructorSet)
             report(
                 DiagnosticsEngine::Warning,
                 "outside-constructor %0",
-                compat::getBeginLoc(s.parentRecord))
+                s.parentRecord->getBeginLoc())
                 << s.fieldName;
         for (const MyFieldInfo & s : touchedFromOutsideSet)
             report(
                 DiagnosticsEngine::Warning,
                 "outside %0",
-                compat::getBeginLoc(s.parentRecord))
+                s.parentRecord->getBeginLoc())
                 << s.fieldName;
     }
 }
@@ -284,7 +285,7 @@ MyFieldInfo UnusedFields::niceName(const FieldDecl* fieldDecl)
 bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl )
 {
     fieldDecl = fieldDecl->getCanonicalDecl();
-    if (ignoreLocation( fieldDecl )) {
+    if (ignoreLocation( fieldDecl->getBeginLoc() )) {
         return true;
     }
     // ignore stuff that forms part of the stable URE interface
@@ -349,8 +350,8 @@ bool UnusedFields::isSomeKindOfZero(const Expr* arg)
     // Get the expression contents.
     // This helps us find params which are always initialised with something like "OUString()".
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = compat::getBeginLoc(arg);
-    SourceLocation endLoc = compat::getEndLoc(arg);
+    SourceLocation startLoc = arg->getBeginLoc();
+    SourceLocation endLoc = arg->getEndLoc();
     const char *p1 = SM.getCharacterData( startLoc );
     const char *p2 = SM.getCharacterData( endLoc );
     if (!p1 || !p2 || (p2 - p1) < 0 || (p2 - p1) > 40) {
@@ -368,12 +369,6 @@ bool UnusedFields::isSomeKindOfZero(const Expr* arg)
         return true;
     else if (s == "OString()")
         return true;
-    else if (s == "aEmptyOUStr") //sw
-        return true;
-    else if (s == "EMPTY_OUSTRING")//sc
-        return true;
-    else if (s == "GetEmptyOUString()") //sc
-        return true;
     return false;
 }
 
@@ -392,7 +387,7 @@ bool startswith(const std::string& rStr, const char* pSubStr)
 bool UnusedFields::TraverseCXXConstructorDecl(CXXConstructorDecl* cxxConstructorDecl)
 {
     auto copy = insideMoveOrCopyOrCloneDeclParent;
-    if (!ignoreLocation(cxxConstructorDecl) && cxxConstructorDecl->isThisDeclarationADefinition())
+    if (!ignoreLocation(cxxConstructorDecl->getBeginLoc()) && cxxConstructorDecl->isThisDeclarationADefinition())
     {
         if (cxxConstructorDecl->isCopyOrMoveConstructor())
             insideMoveOrCopyOrCloneDeclParent = cxxConstructorDecl->getParent();
@@ -406,14 +401,14 @@ bool UnusedFields::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl)
 {
     auto copy1 = insideMoveOrCopyOrCloneDeclParent;
     auto copy2 = insideFunctionDecl;
-    if (!ignoreLocation(cxxMethodDecl) && cxxMethodDecl->isThisDeclarationADefinition())
+    if (!ignoreLocation(cxxMethodDecl->getBeginLoc()) && cxxMethodDecl->isThisDeclarationADefinition())
     {
         if (cxxMethodDecl->isCopyAssignmentOperator()
             || cxxMethodDecl->isMoveAssignmentOperator()
             || (cxxMethodDecl->getIdentifier()
-                && (cxxMethodDecl->getName().startswith("Clone")
-                    || cxxMethodDecl->getName().startswith("clone")
-                    || cxxMethodDecl->getName().startswith("createClone"))))
+                && (compat::starts_with(cxxMethodDecl->getName(), "Clone")
+                    || compat::starts_with(cxxMethodDecl->getName(), "clone")
+                    || compat::starts_with(cxxMethodDecl->getName(), "createClone"))))
             insideMoveOrCopyOrCloneDeclParent = cxxMethodDecl->getParent();
         // these are similar in that they tend to simply enumerate all the fields of an object without putting
         // them to some useful purpose
@@ -433,7 +428,7 @@ bool UnusedFields::TraverseFunctionDecl(FunctionDecl* functionDecl)
     auto copy1 = insideStreamOutputOperator;
     auto copy2 = insideFunctionDecl;
     auto copy3 = insideMoveOrCopyOrCloneDeclParent;
-    if (functionDecl->getLocation().isValid() && !ignoreLocation(functionDecl) && functionDecl->isThisDeclarationADefinition())
+    if (functionDecl->getLocation().isValid() && !ignoreLocation(functionDecl->getBeginLoc()) && functionDecl->isThisDeclarationADefinition())
     {
         auto op = functionDecl->getOverloadedOperator();
         if (op == OO_LessLess
@@ -500,7 +495,7 @@ bool UnusedFields::VisitMemberExpr( const MemberExpr* memberExpr )
         return true;
     }
     fieldDecl = fieldDecl->getCanonicalDecl();
-    if (ignoreLocation(fieldDecl)) {
+    if (ignoreLocation(fieldDecl->getBeginLoc())) {
         return true;
     }
     // ignore stuff that forms part of the stable URE interface
@@ -729,6 +724,16 @@ void UnusedFields::checkIfReadFrom(const FieldDecl* fieldDecl, const Expr* membe
         {
             break;
         }
+        else if (isa<DeclRefExpr>(parent)) // things like o3tl::convertNarrowing pass members as template params
+        {
+            bPotentiallyReadFrom = true;
+            break;
+        }
+        else if (isa<DesignatedInitExpr>(parent))
+        {
+            bPotentiallyReadFrom = true;
+            break;
+        }
         else
         {
             bPotentiallyReadFrom = true;
@@ -742,12 +747,12 @@ void UnusedFields::checkIfReadFrom(const FieldDecl* fieldDecl, const Expr* membe
         report(
              DiagnosticsEngine::Warning,
              "oh dear, what can the matter be?",
-              compat::getBeginLoc(memberExpr))
+              memberExpr->getBeginLoc())
               << memberExpr->getSourceRange();
         report(
              DiagnosticsEngine::Note,
              "parent over here",
-              compat::getBeginLoc(parent))
+              parent->getBeginLoc())
               << parent->getSourceRange();
         parent->dump();
         memberExpr->dump();
@@ -837,6 +842,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
         }
         else if (auto operatorCallExpr = dyn_cast<CXXOperatorCallExpr>(parent))
         {
+            bool walk = false;
             auto callee = getCallee(operatorCallExpr);
             if (callee)
             {
@@ -845,16 +851,24 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
                 if (calleeMethodDecl && operatorCallExpr->getArg(0) == child)
                 {
                     if (!calleeMethodDecl->isConst())
-                        bPotentiallyWrittenTo = checkForWriteWhenUsingCollectionType(calleeMethodDecl);
+                    {
+                        // If we are accessing a map entry, we want to keep walking up to determine
+                        // if it is written to.
+                        if (checkForUsingMap(calleeMethodDecl))
+                            walk = true;
+                        else
+                            bPotentiallyWrittenTo = checkForWriteWhenUsingCollectionType(calleeMethodDecl);
+                    }
                 }
                 else if (IsPassedByNonConst(fieldDecl, child, operatorCallExpr, *callee))
-                {
                     bPotentiallyWrittenTo = true;
-                }
             }
             else
                 bPotentiallyWrittenTo = true; // conservative, could improve
-            break;
+            if (walk)
+                walkUp();
+            else
+                break;
         }
         else if (auto cxxMemberCallExpr = dyn_cast<CXXMemberCallExpr>(parent))
         {
@@ -945,6 +959,15 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
         {
             break;
         }
+        else if (isa<DeclRefExpr>(parent)) // things like o3tl::convertNarrowing pass members as template params
+        {
+            break;
+        }
+        else if (isa<DesignatedInitExpr>(parent))
+        {
+            bPotentiallyWrittenTo = true;
+            break;
+        }
         else
         {
             bPotentiallyWrittenTo = true;
@@ -958,7 +981,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
         report(
              DiagnosticsEngine::Warning,
              "oh dear, what can the matter be? writtenTo=%0",
-              compat::getBeginLoc(memberExpr))
+              memberExpr->getBeginLoc())
               << bPotentiallyWrittenTo
               << memberExpr->getSourceRange();
         if (parent)
@@ -966,7 +989,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
             report(
                  DiagnosticsEngine::Note,
                  "parent over here",
-                  compat::getBeginLoc(parent))
+                  parent->getBeginLoc())
                   << parent->getSourceRange();
             parent->dump();
         }
@@ -986,20 +1009,20 @@ bool UnusedFields::checkForWriteWhenUsingCollectionType(const CXXMethodDecl * ca
 {
     auto const tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
     bool listLike = false, setLike = false, mapLike = false, cssSequence = false;
-    if (tc.Class("deque").StdNamespace()
-        || tc.Class("list").StdNamespace()
-        || tc.Class("queue").StdNamespace()
-        || tc.Class("vector").StdNamespace())
+    // Noting that I am deliberately not calling StdNamespace() on these checks, the loplugin::TypeCheck
+    // code seems to be unreliable when dealing with ClassTemplateSpecializationDecl.
+    if (tc.Class("deque")
+        || tc.Class("list")
+        || tc.Class("queue")
+        || tc.Class("vector"))
     {
         listLike = true;
     }
-    else if (tc.Class("set").StdNamespace()
-        || tc.Class("unordered_set").StdNamespace())
+    else if (tc.Class("set") || tc.Class("unordered_set"))
     {
         setLike = true;
     }
-    else if (tc.Class("map").StdNamespace()
-        || tc.Class("unordered_map").StdNamespace())
+    else if (tc.Class("map") || tc.Class("unordered_map"))
     {
         mapLike = true;
     }
@@ -1046,6 +1069,16 @@ bool UnusedFields::checkForWriteWhenUsingCollectionType(const CXXMethodDecl * ca
     return true;
 }
 
+bool UnusedFields::checkForUsingMap(const CXXMethodDecl * calleeMethodDecl)
+{
+    auto const tc = loplugin::TypeCheck(calleeMethodDecl->getParent());
+    if (!(tc.Class("map") || tc.Class("unordered_map")))
+        return false;
+    if (!calleeMethodDecl->isOverloadedOperator())
+        return false;
+    return calleeMethodDecl->getOverloadedOperator() == OO_Subscript;
+}
+
 bool UnusedFields::IsPassedByNonConst(const FieldDecl* fieldDecl, const Stmt * child, CallerWrapper callExpr,
                                          CalleeWrapper calleeFunctionDecl)
 {
@@ -1074,7 +1107,7 @@ bool UnusedFields::IsPassedByNonConst(const FieldDecl* fieldDecl, const Stmt * c
 // have to do it here
 bool UnusedFields::VisitCXXConstructorDecl( const CXXConstructorDecl* cxxConstructorDecl )
 {
-    if (ignoreLocation( cxxConstructorDecl )) {
+    if (ignoreLocation( cxxConstructorDecl->getBeginLoc() )) {
         return true;
     }
     // ignore stuff that forms part of the stable URE interface
@@ -1107,7 +1140,7 @@ bool UnusedFields::VisitCXXConstructorDecl( const CXXConstructorDecl* cxxConstru
 // have to do it here.
 bool UnusedFields::VisitInitListExpr( const InitListExpr* initListExpr)
 {
-    if (ignoreLocation( initListExpr ))
+    if (ignoreLocation( initListExpr->getBeginLoc() ))
         return true;
 
     QualType varType = initListExpr->getType().getDesugaredType(compiler.getASTContext());
@@ -1133,7 +1166,7 @@ bool UnusedFields::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
         return true;
     }
     fieldDecl = fieldDecl->getCanonicalDecl();
-    if (ignoreLocation(fieldDecl)) {
+    if (ignoreLocation(fieldDecl->getBeginLoc())) {
         return true;
     }
     // ignore stuff that forms part of the stable URE interface
@@ -1179,7 +1212,7 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
     }
 }
 
-llvm::Optional<CalleeWrapper> UnusedFields::getCallee(CallExpr const * callExpr)
+compat::optional<CalleeWrapper> UnusedFields::getCallee(CallExpr const * callExpr)
 {
     FunctionDecl const * functionDecl = callExpr->getDirectCallee();
     if (functionDecl)
@@ -1193,7 +1226,7 @@ llvm::Optional<CalleeWrapper> UnusedFields::getCallee(CallExpr const * callExpr)
         }
     }
 
-    return llvm::Optional<CalleeWrapper>();
+    return compat::optional<CalleeWrapper>();
 }
 
 loplugin::Plugin::Registration< UnusedFields > X("unusedfields", false);
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index f25624a14c94..4ef9ab5fd47d 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -1,72 +1,104 @@
 basegfx/source/polygon/b2dpolygontriangulator.cxx:112
-    basegfx::(anonymous namespace)::Triangulator maStartEntries basegfx::(anonymous namespace)::EdgeEntries
-basegfx/source/polygon/b2dtrapezoid.cxx:205
-    basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
-basegfx/source/polygon/b2dtrapezoid.cxx:256
+    basegfx::(anonymous namespace)::Triangulator maStartEntries EdgeEntries
+basegfx/source/polygon/b2dtrapezoid.cxx:208
+    basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock B2DPoint[32]
+basegfx/source/polygon/b2dtrapezoid.cxx:259
     basegfx::trapezoidhelper::(anonymous namespace)::TrapezoidSubdivider maPoints std::vector<B2DPoint>
 basic/qa/cppunit/basictest.hxx:27
-    MacroSnippet maDll class BasicDLL
+    MacroSnippet maDll BasicDLL
+basic/qa/cppunit/test_global_array.cxx:25
+    (anonymous namespace)::GlobalArrayTest lib BasicDLL
+basic/qa/cppunit/test_global_as_new.cxx:25
+    (anonymous namespace)::GlobalAsNewTest lib BasicDLL
 binaryurp/source/unmarshal.hxx:86
     binaryurp::Unmarshal buffer_ com::sun::star::uno::Sequence<sal_Int8>
-binaryurp/source/writer.hxx:147
-    binaryurp::Writer state_ struct binaryurp::WriterState
+binaryurp/source/writer.hxx:135
+    binaryurp::Writer state_ WriterState
 canvas/source/tools/surfaceproxy.hxx:104
-    canvas::SurfaceProxy mpPageManager canvas::PageManagerSharedPtr
-canvas/source/vcl/impltools.hxx:114
-    vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
+    canvas::SurfaceProxy mpPageManager PageManagerSharedPtr
+canvas/source/vcl/impltools.hxx:119
+    vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
 chart2/source/controller/accessibility/AccessibleChartShape.hxx:78
     chart::AccessibleChartShape m_aShapeTreeInfo ::accessibility::AccessibleShapeTreeInfo
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:70
-    chart::ThreeD_SceneIllumination_TabPage m_aModelChangeListener class chart::ModifyListenerCallBack
+    chart::ThreeD_SceneIllumination_TabPage m_aModelChangeListener ModifyListenerCallBack
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:76
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light1 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:77
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light2 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:78
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light3 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:79
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light4 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:80
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light5 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:81
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light6 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:82
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light7 LightButton
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:83
+    chart::ThreeD_SceneIllumination_TabPage m_aBtn_Light8 LightButton
 chart2/source/controller/inc/dlg_View3D.hxx:46
-    chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper
-chart2/source/controller/inc/RangeSelectionListener.hxx:61
-    chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
-connectivity/source/commontools/RowFunctionParser.cxx:372
-    connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
+    chart::View3DDialog m_aControllerLocker ControllerLockHelper
+chart2/source/controller/inc/RangeSelectionListener.hxx:65
+    chart::RangeSelectionListener m_aControllerLockGuard ControllerLockGuardUNO
+chart2/source/view/charttypes/AreaChart.hxx:68
+    chart::AreaChart m_aMainPosHelper PlottingPositionHelper
 connectivity/source/commontools/RowFunctionParser.cxx:373
-    connectivity::(anonymous namespace)::ExpressionGrammar::definition assignment ::boost::spirit::classic::rule<ScannerT>
+    connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:374
+    connectivity::(anonymous namespace)::ExpressionGrammar::definition assignment ::boost::spirit::classic::rule<ScannerT>
+connectivity/source/commontools/RowFunctionParser.cxx:375
     connectivity::(anonymous namespace)::ExpressionGrammar::definition argument ::boost::spirit::classic::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:374
-    connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:375
+    connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::classic::rule<ScannerT>
+connectivity/source/commontools/RowFunctionParser.cxx:376
     connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::classic::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:375
+connectivity/source/commontools/RowFunctionParser.cxx:376
     connectivity::(anonymous namespace)::ExpressionGrammar::definition orExpression ::boost::spirit::classic::rule<ScannerT>
-connectivity/source/inc/component/CResultSet.hxx:42
+connectivity/source/drivers/evoab2/EApi.h:121
+    EContactAddress address_format char *
+connectivity/source/drivers/evoab2/EApi.h:125
+    EContactAddress ext char *
+connectivity/source/drivers/firebird/Driver.hxx:48
+    connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory ::utl::TempFileNamed
+connectivity/source/drivers/firebird/Driver.hxx:49
+    connectivity::firebird::FirebirdDriver m_firebirdLockDirectory ::utl::TempFileNamed
+connectivity/source/drivers/postgresql/pq_statics.hxx:105
+    pq_sdbc_driver::ImplementationStatics types css::uno::Sequence<css::uno::Type>
+connectivity/source/inc/component/CResultSet.hxx:41
     connectivity::component::OComponentResultSet m_bBookmarkable _Bool
-connectivity/source/inc/dbase/DResultSet.hxx:41
+connectivity/source/inc/dbase/DResultSet.hxx:40
     connectivity::dbase::ODbaseResultSet m_bBookmarkable _Bool
+connectivity/source/inc/file/FStatement.hxx:84
+    connectivity::file::OStatement_Base m_aCursorName OUString
 connectivity/source/inc/file/FStatement.hxx:85
-    connectivity::file::OStatement_Base m_aCursorName class rtl::OUString
-connectivity/source/inc/file/FStatement.hxx:86
     connectivity::file::OStatement_Base m_nMaxFieldSize sal_Int32
-connectivity/source/inc/file/FStatement.hxx:87
+connectivity/source/inc/file/FStatement.hxx:86
     connectivity::file::OStatement_Base m_nMaxRows sal_Int32
-connectivity/source/inc/file/FStatement.hxx:88
+connectivity/source/inc/file/FStatement.hxx:87
     connectivity::file::OStatement_Base m_nQueryTimeOut sal_Int32
-connectivity/source/inc/file/FStatement.hxx:89
+connectivity/source/inc/file/FStatement.hxx:88
     connectivity::file::OStatement_Base m_nFetchSize sal_Int32
-connectivity/source/inc/file/FStatement.hxx:90
+connectivity/source/inc/file/FStatement.hxx:89
     connectivity::file::OStatement_Base m_nResultSetType sal_Int32
-connectivity/source/inc/file/FStatement.hxx:91
+connectivity/source/inc/file/FStatement.hxx:90
     connectivity::file::OStatement_Base m_nFetchDirection sal_Int32
-connectivity/source/inc/file/FStatement.hxx:92
+connectivity/source/inc/file/FStatement.hxx:91
     connectivity::file::OStatement_Base m_nResultSetConcurrency sal_Int32
-connectivity/source/inc/file/FStatement.hxx:93
+connectivity/source/inc/file/FStatement.hxx:92
     connectivity::file::OStatement_Base m_bEscapeProcessing _Bool
-connectivity/source/inc/flat/EResultSet.hxx:40
+connectivity/source/inc/flat/EResultSet.hxx:39
     connectivity::flat::OFlatResultSet m_bBookmarkable _Bool
-connectivity/source/inc/java/lang/Object.hxx:38
+connectivity/source/inc/java/lang/Object.hxx:37
     connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard
-cppcanvas/source/mtfrenderer/textaction.cxx:808
+cppcanvas/source/mtfrenderer/textaction.cxx:812
     cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo
-cppcanvas/source/mtfrenderer/textaction.cxx:1643
+cppcanvas/source/mtfrenderer/textaction.cxx:1645
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo
-cppu/source/threadpool/threadpool.cxx:365
+cppu/source/threadpool/threadpool.cxx:352
     _uno_ThreadPool dummy sal_Int32
-cppu/source/typelib/typelib.cxx:59
+cppu/source/typelib/typelib.cxx:57
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:38
     (anonymous namespace)::C1 n1 sal_Int16
@@ -74,276 +106,342 @@ cppu/source/uno/check.cxx:67
     (anonymous namespace)::D d sal_Int16
 cppu/source/uno/check.cxx:68
     (anonymous namespace)::D e sal_Int32
-cppu/source/uno/check.cxx:72
-    (anonymous namespace)::E a sal_Bool
 cppu/source/uno/check.cxx:73
+    (anonymous namespace)::E a sal_Bool
+cppu/source/uno/check.cxx:75
     (anonymous namespace)::E b sal_Bool
-cppu/source/uno/check.cxx:74
+cppu/source/uno/check.cxx:77
     (anonymous namespace)::E c sal_Bool
-cppu/source/uno/check.cxx:75
+cppu/source/uno/check.cxx:78
     (anonymous namespace)::E d sal_Int16
-cppu/source/uno/check.cxx:76
+cppu/source/uno/check.cxx:79
     (anonymous namespace)::E e sal_Int32
-cppu/source/uno/check.cxx:81
+cppu/source/uno/check.cxx:84
     (anonymous namespace)::M n sal_Int32
-cppu/source/uno/check.cxx:82
+cppu/source/uno/check.cxx:85
     (anonymous namespace)::M o sal_Int16
-cppu/source/uno/check.cxx:91
-    (anonymous namespace)::N2 m struct (anonymous namespace)::M
-cppu/source/uno/check.cxx:92
+cppu/source/uno/check.cxx:94
+    (anonymous namespace)::N2 m M
+cppu/source/uno/check.cxx:95
     (anonymous namespace)::N2 p sal_Int16
-cppu/source/uno/check.cxx:97
+cppu/source/uno/check.cxx:100
     (anonymous namespace)::O p double
-cppu/source/uno/check.cxx:98
+cppu/source/uno/check.cxx:101
     (anonymous namespace)::O q sal_Int16
-cppu/source/uno/check.cxx:107
+cppu/source/uno/check.cxx:110
     (anonymous namespace)::P p2 double
-cppu/source/uno/check.cxx:115
+cppu/source/uno/check.cxx:118
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:126
+cppu/source/uno/check.cxx:129
     (anonymous namespace)::Char1 c1 char
-cppu/source/uno/check.cxx:130
+cppu/source/uno/check.cxx:133
     (anonymous namespace)::Char2 c2 char
-cppu/source/uno/check.cxx:134
+cppu/source/uno/check.cxx:137
     (anonymous namespace)::Char3 c3 char
-cppu/source/uno/check.cxx:258
-    (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/dialogs/colorpicker.cxx:736
-    cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1395
-    (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
+cppu/source/uno/check.cxx:267
+    (anonymous namespace)::Char4 chars Char3
+cui/source/dialogs/colorpicker.cxx:748
+    cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious ColorPreviewControl
+cui/source/factory/dlgfact.cxx:1245
+    (anonymous namespace)::SvxMacroAssignDialog_Impl m_aItems SfxItemSet
 cui/source/inc/AdditionsDialog.hxx:47
-    AdditionInfo sReleaseVersion class rtl::OUString
-cui/source/inc/AdditionsDialog.hxx:84
-    AdditionsDialog m_sTag class rtl::OUString
-cui/source/inc/cfgutil.hxx:235
-    SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
-cui/source/inc/cuitabarea.hxx:223
-    SvxAreaTabPage maFixed_ChangeType enum ChangeType
-cui/source/inc/cuitabarea.hxx:231
-    SvxAreaTabPage m_aXFillAttr class XFillAttrSetItem
+    AdditionInfo sReleaseVersion OUString
+cui/source/inc/AdditionsDialog.hxx:83
+    AdditionsDialog m_sTag OUString
+cui/source/inc/cfgutil.hxx:240
+    SvxScriptSelectorDialog m_aStylesInfo SfxStylesInfo_Impl
+cui/source/inc/cuitabarea.hxx:230
+    SvxAreaTabPage maFixed_ChangeType ChangeType
+cui/source/inc/cuitabarea.hxx:238
+    SvxAreaTabPage m_aXFillAttr XFillAttrSetItem
 cui/source/inc/tabstpge.hxx:84
-    SvxTabulatorTabPage m_aLeftWin class TabWin_Impl
+    SvxTabulatorTabPage m_aLeftWin TabWin_Impl
 cui/source/inc/tabstpge.hxx:85
-    SvxTabulatorTabPage m_aRightWin class TabWin_Impl
+    SvxTabulatorTabPage m_aRightWin TabWin_Impl
 cui/source/inc/tabstpge.hxx:86
-    SvxTabulatorTabPage m_aCenterWin class TabWin_Impl
+    SvxTabulatorTabPage m_aCenterWin TabWin_Impl
 cui/source/inc/tabstpge.hxx:87
-    SvxTabulatorTabPage m_aDezWin class TabWin_Impl
-cui/source/options/optcolor.cxx:237
-    (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor class Color
-dbaccess/source/core/api/RowSet.hxx:107
-    dbaccess::ORowSet m_aURL class rtl::OUString
-dbaccess/source/core/api/RowSet.hxx:121
-    dbaccess::ORowSet m_nMaxFieldSize sal_Int32
+    SvxTabulatorTabPage m_aDezWin TabWin_Impl
+cui/source/options/optcolor.cxx:282
+    (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor Color
+dbaccess/source/core/api/RowSet.hxx:108
+    dbaccess::ORowSet m_aURL OUString
 dbaccess/source/core/api/RowSet.hxx:123
-    dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+    dbaccess::ORowSet m_nMaxFieldSize sal_Int32
 dbaccess/source/core/api/RowSet.hxx:125
+    dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+dbaccess/source/core/api/RowSet.hxx:127
     dbaccess::ORowSet m_nTransactionIsolation sal_Int32
-dbaccess/source/core/api/RowSet.hxx:137
-    dbaccess::ORowSet m_bIsBookmarkable _Bool
 dbaccess/source/core/api/RowSet.hxx:139
+    dbaccess::ORowSet m_bIsBookmarkable _Bool
+dbaccess/source/core/api/RowSet.hxx:141
     dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:455
+dbaccess/source/core/api/RowSet.hxx:453
     dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:456
+dbaccess/source/core/api/RowSet.hxx:454
     dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:457
+dbaccess/source/core/api/RowSet.hxx:455
     dbaccess::ORowSetClone m_bIsBookmarkable _Bool
 dbaccess/source/core/dataaccess/connection.hxx:101
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
-dbaccess/source/core/inc/databasecontext.hxx:84
-    dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2905
-      class AllSettings &
+dbaccess/source/core/inc/databasecontext.hxx:82
+    dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
+dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:79
+    dbaccess::OSingleSelectQueryComposer m_aNeutralContext ::svxform::ONeutralParseContext
 drawinglayer/inc/texture/texture3d.hxx:55
-    drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
-drawinglayer/inc/texture/texture3d.hxx:57
-    drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap
-drawinglayer/source/tools/emfphelperdata.hxx:197
-    emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
+    drawinglayer::texture::GeoTexSvxBitmapEx maBitmapEx BitmapEx
+drawinglayer/inc/texture/texture3d.hxx:56
+    drawinglayer::texture::GeoTexSvxBitmapEx maBitmap Bitmap
+drawinglayer/inc/texture/texture3d.hxx:58
+    drawinglayer::texture::GeoTexSvxBitmapEx maTransparence Bitmap
 drawinglayer/source/tools/emfphelperdata.hxx:198
+    emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
+drawinglayer/source/tools/emfphelperdata.hxx:199
     emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
-editeng/source/editeng/impedit.hxx:520
-    ImpEditEngine aSelFuncSet class EditSelFunctionSet
-extensions/source/bibliography/datman.cxx:407
-    (anonymous namespace)::DBChangeDialog_Impl aConfig class DBChangeDialogConfig_Impl
-filter/source/graphicfilter/icgm/chart.hxx:49
+editeng/source/editeng/impedit.hxx:552
+    ImpEditEngine maSelFuncSet EditSelFunctionSet
+embeddedobj/source/msole/olecomponent.hxx:51
+    OleComponent m_pInterfaceContainer comphelper::OMultiTypeInterfaceContainerHelper2 *
+embeddedobj/source/msole/olecomponent.hxx:53
+    OleComponent m_bDisposed _Bool
+embeddedobj/source/msole/olecomponent.hxx:54
+    OleComponent m_bModified _Bool
+embeddedobj/source/msole/olecomponent.hxx:55
+    OleComponent m_pNativeImpl OleComponentNative_Impl *
+embeddedobj/source/msole/olecomponent.hxx:57
+    OleComponent m_pUnoOleObject OleEmbeddedObject *
+embeddedobj/source/msole/olecomponent.hxx:58
+    OleComponent m_pOleWrapClientSite OleWrapperClientSite *
+embeddedobj/source/msole/olecomponent.hxx:59
+    OleComponent m_pImplAdviseSink OleWrapperAdviseSink *
+embeddedobj/source/msole/olecomponent.hxx:61
+    OleComponent m_nOLEMiscFlags sal_Int32
+embeddedobj/source/msole/olecomponent.hxx:62
+    OleComponent m_nAdvConn sal_Int32
+embeddedobj/source/msole/olecomponent.hxx:64
+    OleComponent m_aVerbList css::uno::Sequence<css::embed::VerbDescriptor>
+embeddedobj/source/msole/olecomponent.hxx:65
+    OleComponent m_aDataFlavors css::uno::Sequence<css::datatransfer::DataFlavor>
+embeddedobj/source/msole/olecomponent.hxx:69
+    OleComponent m_bOleInitialized _Bool
+extensions/source/bibliography/datman.cxx:410
+    (anonymous namespace)::DBChangeDialog_Impl aConfig DBChangeDialogConfig_Impl
+extensions/source/bibliography/framectr.cxx:126
+    BibFrameCtrl_Impl aMutex Mutex
+filter/source/graphicfilter/icgm/chart.hxx:48
     DataNode nBoxX1 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:50
+filter/source/graphicfilter/icgm/chart.hxx:49
     DataNode nBoxY1 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:51
+filter/source/graphicfilter/icgm/chart.hxx:50
     DataNode nBoxX2 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:52
+filter/source/graphicfilter/icgm/chart.hxx:51
     DataNode nBoxY2 sal_Int16
-helpcompiler/inc/HelpCompiler.hxx:201
+helpcompiler/inc/HelpCompiler.hxx:200
     HelpCompiler lang const std::string
-include/basic/basmgr.hxx:56
-    BasicError nReason enum BasicErrorReason
+include/comphelper/seqstream.hxx:75
+    comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8>
+include/docmodel/theme/FormatScheme.hxx:373
+    model::DashStop mnDashLength sal_Int32
+include/docmodel/theme/FormatScheme.hxx:374
+    model::DashStop mnStopLength sal_Int32
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
-    drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
-include/filter/msfilter/svdfppt.hxx:877
+    drawinglayer::primitive2d::TextLayouterDevice maSolarGuard SolarMutexGuard
+include/filter/msfilter/svdfppt.hxx:889
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:878
+include/filter/msfilter/svdfppt.hxx:890
     ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:879
+include/filter/msfilter/svdfppt.hxx:891
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
-include/LibreOfficeKit/LibreOfficeKitGtk.h:33
+include/formula/formulahelper.hxx:39
+    formula::FormulaHelper m_aSysLocale SvtSysLocale
+include/LibreOfficeKit/LibreOfficeKitGtk.h:40
     _LOKDocView aDrawingArea GtkDrawingArea
-include/LibreOfficeKit/LibreOfficeKitGtk.h:38
+include/LibreOfficeKit/LibreOfficeKitGtk.h:45
     _LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/export/shapes.hxx:102
-    oox::drawingml::ShapeExport maShapeMap oox::drawingml::ShapeExport::ShapeHashMap
+include/oox/export/shapes.hxx:104
+    oox::drawingml::ShapeExport maShapeMap ShapeHashMap
 include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/classificationhelper.hxx:132
-    sfx::ClassificationKeyCreator m_ePolicyType const enum SfxClassificationPolicyType
-include/sfx2/msg.hxx:117
+include/sfx2/classificationhelper.hxx:134
+    sfx::ClassificationKeyCreator m_ePolicyType const SfxClassificationPolicyType
+include/sfx2/lokhelper.hxx:258
+    SfxLokLanguageGuard m_pNewShell const SfxViewShell *
+include/sfx2/msg.hxx:116
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:119
+include/sfx2/msg.hxx:118
     SfxType0 nAttribs sal_uInt16
+include/sfx2/msg.hxx:131
+    SfxType1 aAttrib SfxTypeAttrib[1]
+include/sfx2/msg.hxx:131
+    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:131
+    SfxType1 nAttribs sal_uInt16
+include/sfx2/msg.hxx:131
+    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
-    SfxType1 aAttrib struct SfxTypeAttrib [1]
+    SfxType2 aAttrib SfxTypeAttrib[2]
 include/sfx2/msg.hxx:132
-    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
-    SfxType1 nAttribs sal_uInt16
+    SfxType2 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
-    SfxType2 aAttrib struct SfxTypeAttrib [2]
+    SfxType3 aAttrib SfxTypeAttrib[3]
 include/sfx2/msg.hxx:133
-    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
-    SfxType2 nAttribs sal_uInt16
+    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
+    SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:134
-    SfxType3 aAttrib struct SfxTypeAttrib [3]
+    SfxType4 aAttrib SfxTypeAttrib[4]
 include/sfx2/msg.hxx:134
-    SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
+    SfxType4 nAttribs sal_uInt16
 include/sfx2/msg.hxx:134
-    SfxType3 pType const std::type_info *
+    SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:135
-    SfxType4 aAttrib struct SfxTypeAttrib [4]
+    SfxType5 aAttrib SfxTypeAttrib[5]
 include/sfx2/msg.hxx:135
-    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
-    SfxType4 nAttribs sal_uInt16
+    SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
-    SfxType4 pType const std::type_info *
+    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:136
-    SfxType5 aAttrib struct SfxTypeAttrib [5]
+    SfxType6 aAttrib SfxTypeAttrib[6]
 include/sfx2/msg.hxx:136
-    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:136
-    SfxType5 nAttribs sal_uInt16
+    SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 pType const std::type_info *
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
-    SfxType6 aAttrib struct SfxTypeAttrib [6]
+    SfxType7 aAttrib SfxTypeAttrib[7]
 include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:137
-    SfxType6 nAttribs sal_uInt16
+    SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
+    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:138
-    SfxType7 aAttrib struct SfxTypeAttrib [7]
+    SfxType8 aAttrib SfxTypeAttrib[8]
 include/sfx2/msg.hxx:138
-    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:138
-    SfxType7 nAttribs sal_uInt16
+    SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
+    SfxType8 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
+    SfxType10 aAttrib SfxTypeAttrib[10]
 include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:139
-    SfxType8 nAttribs sal_uInt16
+    SfxType10 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
-    SfxType8 pType const std::type_info *
-include/sfx2/msg.hxx:140
-    SfxType10 aAttrib struct SfxTypeAttrib [10]
-include/sfx2/msg.hxx:140
-    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType10 pType const std::type_info *
 include/sfx2/msg.hxx:140
-    SfxType10 nAttribs sal_uInt16
+    SfxType11 aAttrib SfxTypeAttrib[11]
 include/sfx2/msg.hxx:140
-    SfxType10 pType const std::type_info *
-include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
-include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 pType const std::type_info *
+include/sfx2/msg.hxx:142
+    SfxType13 aAttrib SfxTypeAttrib[13]
+include/sfx2/msg.hxx:142
+    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:142
+    SfxType13 nAttribs sal_uInt16
+include/sfx2/msg.hxx:142
+    SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:143
-    SfxType13 aAttrib struct SfxTypeAttrib [13]
+    SfxType14 aAttrib SfxTypeAttrib[14]
 include/sfx2/msg.hxx:143
-    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:143
-    SfxType13 nAttribs sal_uInt16
+    SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
-    SfxType13 pType const std::type_info *
+    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
-    SfxType14 aAttrib struct SfxTypeAttrib [14]
+    SfxType16 aAttrib SfxTypeAttrib[16]
 include/sfx2/msg.hxx:144
-    SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:144
-    SfxType14 nAttribs sal_uInt16
+    SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
+    SfxType16 pType const std::type_info *
 include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
+    SfxType17 aAttrib SfxTypeAttrib[17]
 include/sfx2/msg.hxx:145
-    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 nAttribs sal_uInt16
+    SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
-    SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
-    SfxType17 aAttrib struct SfxTypeAttrib [17]
-include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:146
-    SfxType17 nAttribs sal_uInt16
+    SfxType23 aAttrib SfxTypeAttrib[23]
 include/sfx2/msg.hxx:146
-    SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:147
-    SfxType23 aAttrib struct SfxTypeAttrib [23]
-include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 nAttribs sal_uInt16
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 pType const std::type_info *
-include/svl/ondemand.hxx:55
-    OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svx/ClassificationDialog.hxx:35
-    svx::ClassificationDialog maInternationalHelper class SfxClassificationHelper
+    svx::ClassificationDialog maInternationalHelper SfxClassificationHelper
 include/svx/ClassificationDialog.hxx:37
     svx::ClassificationDialog m_bPerParagraph const _Bool
+include/svx/dialog/ThemeColorEditDialog.hxx:23
+    svx::ThemeColorEditDialog maColorSet model::ColorSet
+include/svx/fmsrccfg.hxx:100
+    svxform::FmSearchConfigItem m_aMutex std::mutex
 include/svx/imapdlg.hxx:91
-    SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/vcl/commandevent.hxx:310
-    CommandGestureData mfX const double
-include/vcl/commandevent.hxx:311
-    CommandGestureData mfY const double
-include/vcl/commandevent.hxx:315
-    CommandGestureData meOrientation const enum PanningOrientation
-include/vcl/font/Feature.hxx:100
-    vcl::font::Feature m_eType enum vcl::font::FeatureType
-include/vcl/pdf/PDFAnnotationMarker.hxx:65
-    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
-include/xmloff/shapeimport.hxx:56
+    SvxIMapDlg aIMapItem SvxIMapDlgItem
+include/test/screenshot_test.hxx:36
+    ScreenshotTest maParent weld::GenericDialogController
+include/vcl/commandevent.hxx:317
+    CommandGesturePanData mfX const double
+include/vcl/commandevent.hxx:318
+    CommandGesturePanData mfY const double
+include/vcl/commandevent.hxx:321
+    CommandGesturePanData meOrientation const PanningOrientation
+include/vcl/commandevent.hxx:336
+    CommandGestureZoomData mfX const double
+include/vcl/commandevent.hxx:337
+    CommandGestureZoomData mfY const double
+include/vcl/commandevent.hxx:352
+    CommandGestureRotateData mfX const double
+include/vcl/commandevent.hxx:353
+    CommandGestureRotateData mfY const double
+include/vcl/commandevent.hxx:354
+    CommandGestureRotateData meEventType const GestureEventRotateType
+include/vcl/commandevent.hxx:355
+    CommandGestureRotateData mfAngleDelta const double
+include/vcl/GestureEventRotate.hxx:25
+    GestureEventRotate mnX sal_Int32
+include/vcl/GestureEventRotate.hxx:26
+    GestureEventRotate mnY sal_Int32
+include/vcl/GestureEventRotate.hxx:28
+    GestureEventRotate meEventType GestureEventRotateType
+include/vcl/GestureEventRotate.hxx:32
+    GestureEventRotate mfAngleDelta double
+include/vcl/GestureEventZoom.hxx:25
+    GestureEventZoom mnX sal_Int32
+include/vcl/GestureEventZoom.hxx:26
+    GestureEventZoom mnY sal_Int32
+include/vcl/GestureEventZoom.hxx:28
+    GestureEventZoom meEventType GestureEventZoomType
+include/vcl/GestureEventZoom.hxx:32
+    GestureEventZoom mfScaleDelta double
+include/vcl/idletask.hxx:31
+    IdleTask maIdle Idle
+include/vcl/pdf/PDFAnnotationMarker.hxx:67
+    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType PDFTextMarkerType
+include/xmloff/shapeimport.hxx:57
     SdXML3DLightContext mbSpecular _Bool
-include/xmloff/xmltkmap.hxx:38
-    SvXMLTokenMapEntry nFastToken sal_Int32
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
     GtvApplicationWindow parent_instance GtkApplicationWindow
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
@@ -368,68 +466,70 @@ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:33
     GtvLokDialogClass parentClass GtkDialogClass
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:28
     GtvMainToolbar parent GtkBox
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:38
     GtvMainToolbarClass parentClass GtkBoxClass
-lingucomponent/source/languageguessing/simpleguesser.cxx:81
+lingucomponent/source/languageguessing/simpleguesser.cxx:75
     (anonymous namespace)::textcat_t maxsize uint4
-lingucomponent/source/languageguessing/simpleguesser.cxx:83
-    (anonymous namespace)::textcat_t output char [1024]
+lingucomponent/source/languageguessing/simpleguesser.cxx:77
+    (anonymous namespace)::textcat_t output char[1024]
 lotuswordpro/source/filter/bento.hxx:351
-    OpenStormBento::CBenNamedObject cNameListElmt class OpenStormBento::CBenNamedObjectListElmt
+    OpenStormBento::CBenNamedObject cNameListElmt CBenNamedObjectListElmt
 lotuswordpro/source/filter/clone.hxx:23
-    detail::has_clone::(anonymous) a char [2]
-oox/source/drawingml/diagram/layoutnodecontext.cxx:93
+    detail::has_clone::no a char[2]
+oox/source/drawingml/diagram/layoutnodecontext.cxx:94
     oox::drawingml::(anonymous namespace)::AlgorithmContext mnRevision sal_Int32
-oox/source/drawingml/diagram/layoutnodecontext.cxx:135
-    oox::drawingml::(anonymous namespace)::ChooseContext msName class rtl::OUString
-oox/source/drawingml/hyperlinkcontext.hxx:41
-    oox::drawingml::HyperLinkContext maProperties class oox::PropertyMap &
-oox/source/ppt/timenodelistcontext.cxx:200
-    oox::ppt::(anonymous namespace)::MediaNodeContext mbIsNarration _Bool
-oox/source/ppt/timenodelistcontext.cxx:201
+oox/source/drawingml/diagram/layoutnodecontext.cxx:136
+    oox::drawingml::(anonymous namespace)::ChooseContext msName OUString
+oox/source/ppt/timenodelistcontext.cxx:207
     oox::ppt::(anonymous namespace)::MediaNodeContext mbFullScrn _Bool
-oox/source/ppt/timenodelistcontext.cxx:395
+oox/source/ppt/timenodelistcontext.cxx:402
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
-oox/source/ppt/timenodelistcontext.cxx:396
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnNextAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:396
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnPrevAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:632
+oox/source/ppt/timenodelistcontext.cxx:641
     oox::ppt::(anonymous namespace)::AnimContext mnValueType sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:714
+oox/source/ppt/timenodelistcontext.cxx:723
     oox::ppt::(anonymous namespace)::AnimScaleContext mbZoomContents _Bool
-oox/source/ppt/timenodelistcontext.cxx:854
-    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes class rtl::OUString
-oox/source/ppt/timenodelistcontext.cxx:855
+oox/source/ppt/timenodelistcontext.cxx:863
+    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes OUString
+oox/source/ppt/timenodelistcontext.cxx:864
     oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:856
+oox/source/ppt/timenodelistcontext.cxx:865
     oox::ppt::(anonymous namespace)::AnimMotionContext mnAngle sal_Int32
 pyuno/source/module/pyuno_callable.cxx:45
     pyuno::(anonymous namespace)::PyUNO_callable ob_base PyObject
-pyuno/source/module/pyuno_impl.hxx:138
-    pyuno::(anonymous) ob_base PyObject
-pyuno/source/module/pyuno_impl.hxx:238
+pyuno/source/module/pyuno_impl.hxx:137
+    pyuno::PyUNO ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:151
+    pyuno::PyUNO_iterator ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:166
+    pyuno::PyUNO_list_iterator ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:237
     pyuno::stRuntimeImpl ob_base PyObject
-reportdesign/source/core/api/ReportDefinition.cxx:237
+reportdesign/source/core/api/ReportDefinition.cxx:241
     reportdesign::(anonymous namespace)::OStyle m_aSize awt::Size
-sal/qa/osl/condition/osl_Condition.cxx:72
+sal/qa/osl/condition/osl_Condition.cxx:78
     osl_Condition::ctors bRes1 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:202
+sal/qa/osl/condition/osl_Condition.cxx:208
     osl_Condition::wait bRes2 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:273
+sal/qa/osl/condition/osl_Condition.cxx:279
     osl_Condition::check bRes2 _Bool
-sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:3417
-    osl_File::setAttributes rItem_hidden class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1383
+    osl_FileStatus::isValid rItem_link DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1560
+    osl_FileStatus::getFileType m_aFifoItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1560
+    osl_FileStatus::getFileType m_aVolumeItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aLinkItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aSocketItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aSpecialItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:2053
+    osl_FileStatus::getLinkTargetURL rItem DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
     osl_Module::ctors bRes1 _Bool
 sal/qa/osl/module/osl_Module.cxx:114
@@ -440,395 +540,445 @@ sal/qa/osl/module/osl_Module.cxx:201
     osl_Module::unload bRes1 _Bool
 sal/qa/osl/module/osl_Module.cxx:342
     osl_Module::getFunctionSymbol bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:358
+sal/qa/osl/pipe/osl_Pipe.cxx:353
     osl_Pipe::clear bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
+sal/qa/osl/pipe/osl_Pipe.cxx:518
     osl_Pipe::getError bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
+sal/qa/osl/pipe/osl_Pipe.cxx:518
     osl_Pipe::getError bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:561
+sal/qa/osl/pipe/osl_Pipe.cxx:556
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
+sal/qa/osl/pipe/osl_Pipe.cxx:843
     osl_StreamPipe::recv bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
+sal/qa/osl/pipe/osl_Pipe.cxx:843
     osl_StreamPipe::recv bRes1 _Bool
-sal/qa/osl/process/osl_process.cxx:151
-    Test_osl_executeProcess env_param_ const class rtl::OUString
-sal/qa/osl/security/osl_Security.cxx:59
+sal/qa/osl/process/osl_process.cxx:139
+    Test_osl_executeProcess env_param_ const OUString
+sal/qa/osl/security/osl_Security.cxx:57
     osl_Security::ctors bRes _Bool
-sal/qa/osl/security/osl_Security.cxx:59
+sal/qa/osl/security/osl_Security.cxx:57
     osl_Security::ctors bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:124
+sal/qa/osl/security/osl_Security.cxx:122
     osl_Security::getUserIdent bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:154
+sal/qa/osl/security/osl_Security.cxx:152
     osl_Security::getUserName bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:188
+sal/qa/osl/security/osl_Security.cxx:186
     osl_Security::getConfigDir bRes1 _Bool
-sal/textenc/textenc.cxx:406
+sal/textenc/textenc.cxx:401
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
-sc/inc/column.hxx:126
-    ScColumn maCellsEvent sc::CellStoreEvent
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:268
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:266
+sc/inc/compiler.hxx:270
     ScCompiler::AddInMap pUpper const char *
-sc/inc/token.hxx:403
-    SingleDoubleRefModifier aDub struct ScComplexRefData
-sc/source/core/data/document.cxx:1240
+sc/inc/editutil.hxx:113
+    ScEnginePoolHelper bDeleteEnginePool _Bool
+sc/inc/mtvelements.hxx:171
+    sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator
+sc/inc/patattr.hxx:117
+    ScPatternAttr m_nSerialNumber sal_uInt32
+sc/inc/queryevaluator.hxx:61
+    ScQueryEvaluator mnEntryCount const SCSIZE
+sc/inc/queryevaluator.hxx:65
+    ScQueryEvaluator maBool _Bool[32]
+sc/inc/queryevaluator.hxx:66
+    ScQueryEvaluator maTest _Bool[32]
+sc/inc/SolverSettings.hxx:105
+    sc::SolverSettings m_rTable ScTable &
+sc/inc/SolverSettings.hxx:168
+    sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString>
+sc/inc/token.hxx:402
+    SingleDoubleRefModifier aDub ScComplexRefData
+sc/qa/unit/tiledrendering/tiledrendering.cxx:444
+    (anonymous namespace)::ViewCallback m_callbackWrapper TestLokCallbackWrapper
+sc/source/core/data/document.cxx:1234
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1241
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
-sc/source/filter/html/htmlpars.cxx:3018
-    (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3019
-    (anonymous namespace)::CSSHandler::MemStr mn size_t
-sc/source/filter/inc/htmlpars.hxx:614
+sc/source/core/data/document.cxx:1235
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
+sc/source/core/data/table2.cxx:811
+    (anonymous namespace)::TransClipHandler mnEndRow size_t
+sc/source/filter/inc/htmlpars.hxx:627
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
-sc/source/filter/inc/sheetdatacontext.hxx:51
-    oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/filter/inc/XclImpChangeTrack.hxx:56
+sc/source/filter/inc/lotattr.hxx:92
+    LotAttrCache pDocPool ScDocumentPool *
+sc/source/filter/inc/sheetdatacontext.hxx:50
+    oox::xls::SheetDataContext aReleaser SolarMutexReleaser
+sc/source/filter/inc/XclImpChangeTrack.hxx:55
     XclImpChangeTrack xInStrm tools::SvRef<SotStorageStream>
-sc/source/filter/inc/xetable.hxx:1005
-    XclExpCellTable maArrayBfr class XclExpArrayBuffer
-sc/source/filter/inc/xetable.hxx:1006
-    XclExpCellTable maShrfmlaBfr class XclExpShrfmlaBuffer
-sc/source/filter/inc/xiescher.hxx:1206
-    XclImpDffPropSet maDummyStrm class SvMemoryStream
-sc/source/filter/inc/xihelper.hxx:328
-    XclImpCachedValue mxTokArr XclImpCachedValue::ScTokenArrayPtr
-sc/source/filter/inc/xistream.hxx:172
+sc/source/filter/inc/xetable.hxx:1016
+    XclExpCellTable maArrayBfr XclExpArrayBuffer
+sc/source/filter/inc/xetable.hxx:1017
+    XclExpCellTable maShrfmlaBfr XclExpShrfmlaBuffer
+sc/source/filter/inc/xiescher.hxx:1211
+    XclImpDffPropSet maDummyStrm SvMemoryStream
+sc/source/filter/inc/xihelper.hxx:327
+    XclImpCachedValue mxTokArr ScTokenArrayPtr
+sc/source/filter/inc/xistream.hxx:171
     XclImpBiff8StdDecrypter maCodec ::msfilter::MSCodec_Std97
-sc/source/filter/inc/xistream.hxx:194
+sc/source/filter/inc/xistream.hxx:193
     XclImpBiff8CryptoAPIDecrypter maCodec ::msfilter::MSCodec_CryptoAPI
-sc/source/filter/oox/worksheethelper.cxx:383
-    oox::xls::WorksheetGlobals mxProgressBar oox::ISegmentProgressBarRef
-sc/source/filter/xml/xmldrani.hxx:72
+sc/source/filter/oox/worksheethelper.cxx:396
+    oox::xls::WorksheetGlobals mxProgressBar ISegmentProgressBarRef
+sc/source/filter/xml/xmldrani.hxx:71
     ScXMLDatabaseRangeContext bIsSelection _Bool
-sc/source/filter/xml/xmlexternaltabi.hxx:111
+sc/source/filter/xml/xmlexternaltabi.hxx:110
     ScXMLExternalRefCellContext mnCellType sal_Int16
-sc/source/filter/xml/xmltransformationi.hxx:155
-    ScXMLDateTimeContext aType class rtl::OUString
-sc/source/ui/inc/acredlin.hxx:52
-    ScAcceptChgDlg aReOpenIdle class Idle
+sc/source/filter/xml/xmltransformationi.hxx:154
+    ScXMLDateTimeContext aType OUString
+sc/source/ui/inc/acredlin.hxx:51
+    ScAcceptChgDlg aReOpenIdle Idle
+sc/source/ui/inc/msgpool.hxx:34
+    ScMessagePool aGlobalStringItem SfxStringItem
 sc/source/ui/inc/msgpool.hxx:35
-    ScMessagePool aGlobalStringItem class SfxStringItem
+    ScMessagePool aGlobalSearchItem SvxSearchItem
 sc/source/ui/inc/msgpool.hxx:36
-    ScMessagePool aGlobalSearchItem class SvxSearchItem
+    ScMessagePool aGlobalSortItem ScSortItem
 sc/source/ui/inc/msgpool.hxx:37
-    ScMessagePool aGlobalSortItem class ScSortItem
+    ScMessagePool aGlobalQueryItem ScQueryItem
 sc/source/ui/inc/msgpool.hxx:38
-    ScMessagePool aGlobalQueryItem class ScQueryItem
+    ScMessagePool aGlobalSubTotalItem ScSubTotalItem
 sc/source/ui/inc/msgpool.hxx:39
-    ScMessagePool aGlobalSubTotalItem class ScSubTotalItem
+    ScMessagePool aGlobalConsolidateItem ScConsolidateItem
 sc/source/ui/inc/msgpool.hxx:40
-    ScMessagePool aGlobalConsolidateItem class ScConsolidateItem
+    ScMessagePool aGlobalPivotItem ScPivotItem
 sc/source/ui/inc/msgpool.hxx:41
-    ScMessagePool aGlobalPivotItem class ScPivotItem
+    ScMessagePool aGlobalSolveItem ScSolveItem
 sc/source/ui/inc/msgpool.hxx:42
-    ScMessagePool aGlobalSolveItem class ScSolveItem
+    ScMessagePool aGlobalUserListItem ScUserListItem
 sc/source/ui/inc/msgpool.hxx:43
-    ScMessagePool aGlobalUserListItem class ScUserListItem
-sc/source/ui/inc/msgpool.hxx:44
-    ScMessagePool aCondFormatDlgItem class ScCondFormatDlgItem
-sc/source/ui/inc/notemark.hxx:46
-    ScNoteMarker m_aTimer class Timer
-sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
-    ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
-sc/source/ui/inc/xmlsourcedlg.hxx:61
-    ScXMLSourceDlg maCustomCompare struct CustomCompare
-sccomp/source/solver/DifferentialEvolution.hxx:35
+    ScMessagePool aCondFormatDlgItem ScCondFormatDlgItem
+sc/source/ui/inc/namepast.hxx:42
+    ScNamePasteDlg m_RangeMap std::map<OUString, ScRangeName>
+sc/source/ui/inc/notemark.hxx:45
+    ScNoteMarker m_aTimer Timer
+sc/source/ui/inc/PivotLayoutTreeListBase.hxx:47
+    ScPivotLayoutTreeListBase maDropTargetHelper ScPivotLayoutTreeDropTarget
+sc/source/ui/inc/SparklineShell.hxx:37
+    sc::SparklineShell m_pViewShell ScTabViewShell *
+sc/source/ui/inc/xmlsourcedlg.hxx:60
+    ScXMLSourceDlg maCustomCompare CustomCompare
+sc/source/ui/vba/vbachartobject.hxx:43
+    ScVbaChartObject oShapeHelper std::optional<ov::ShapeHelper>
+sccomp/source/solver/DifferentialEvolution.hxx:34
     DifferentialEvolutionAlgorithm maRandomDevice std::random_device
-sccomp/source/solver/ParticelSwarmOptimization.hxx:56
+sccomp/source/solver/ParticelSwarmOptimization.hxx:55
     ParticleSwarmOptimizationAlgorithm maRandomDevice std::random_device
-scripting/source/stringresource/stringresource.cxx:1277
+scripting/source/stringresource/stringresource.cxx:1246
     stringresource::(anonymous namespace)::BinaryInput m_aData Sequence<sal_Int8>
-sd/inc/anminfo.hxx:52
-    SdAnimationInfo maSecondSoundFile class rtl::OUString
+sd/inc/anminfo.hxx:51
+    SdAnimationInfo maSecondSoundFile OUString
 sd/source/filter/eppt/epptbase.hxx:348
-    PPTWriterBase maFraction class Fraction
-sd/source/filter/ppt/pptin.hxx:82
-    SdPPTImport maParam struct PowerPointImportParam
-sd/source/ui/animations/CustomAnimationList.hxx:124
-    sd::CustomAnimationList maDropTargetHelper class sd::CustomAnimationListDropTarget
-sd/source/ui/inc/AccessibleDocumentViewBase.hxx:261
-    accessibility::AccessibleDocumentViewBase maViewForwarder class accessibility::AccessibleViewForwarder
-sd/source/ui/inc/OutlineBulletDlg.hxx:44
-    sd::OutlineBulletDlg m_aInputSet class SfxItemSet
-sd/source/ui/remotecontrol/Receiver.hxx:35
-    sd::Receiver pTransmitter class sd::Transmitter *
-sd/source/ui/remotecontrol/ZeroconfService.hxx:32
+    PPTWriterBase maFraction Fraction
+sd/source/filter/ppt/pptin.hxx:81
+    SdPPTImport maParam PowerPointImportParam
+sd/source/ui/inc/AccessibleDocumentViewBase.hxx:258
+    accessibility::AccessibleDocumentViewBase maViewForwarder AccessibleViewForwarder
+sd/source/ui/inc/CustomAnimationList.hxx:127
+    sd::CustomAnimationList maDropTargetHelper CustomAnimationListDropTarget
+sd/source/ui/inc/OutlineBulletDlg.hxx:43
+    sd::OutlineBulletDlg m_aInputSet SfxItemSet
+sd/source/ui/remotecontrol/Receiver.hxx:34
+    sd::Receiver pTransmitter Transmitter *
+sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
-sd/source/ui/view/DocumentRenderer.cxx:1340
+sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1168
+sd/source/ui/view/viewshel.cxx:1200
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1169
+sd/source/ui/view/viewshel.cxx:1201
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1170
+sd/source/ui/view/viewshel.cxx:1202
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1171
+sd/source/ui/view/viewshel.cxx:1203
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition name rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition simple_type rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition stream rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:268
     (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition dict_begin rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:270
     (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:270
     (anonymous namespace)::PDFGrammar::definition array_end rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:270
     (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:270
     (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:270
     (anonymous namespace)::PDFGrammar::definition object_end rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:271
     (anonymous namespace)::PDFGrammar::definition trailer rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:271
     (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
-sfx2/inc/autoredactdialog.hxx:94
-    SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
+sfx2/inc/autoredactdialog.hxx:99
+    SfxAutoRedactDialog m_xDocShell SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:46
-    SfxModelessDialog_Impl aMoveIdle class Idle
-sfx2/source/doc/doctempl.cxx:104
-    DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
+    SfxModelessDialog_Impl aMoveIdle Idle
+sfx2/source/doc/doctempl.cxx:105
+    DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell SfxObjectShellLock
+sfx2/source/inc/templdgi.hxx:92
+    SfxCommonTemplateDialog_Impl m_aStyleListUpdateFamily Link<void *, void>
 slideshow/source/engine/animationnodes/animationbasenode.hxx:88
-    slideshow::internal::AnimationBaseNode mpSubsetManager slideshow::internal::SubsettableShapeManagerSharedPtr
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+    slideshow::internal::AnimationBaseNode mpSubsetManager SubsettableShapeManagerSharedPtr
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats x GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats y GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats z GLfloat
-slideshow/source/engine/opengl/TransitionImpl.hxx:301
+slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex normal glm::vec3
-slideshow/source/engine/opengl/TransitionImpl.hxx:302
+slideshow/source/engine/opengl/TransitionImpl.hxx:298
     Vertex texcoord glm::vec2
 slideshow/source/engine/slide/slideimpl.cxx:200
     slideshow::internal::(anonymous namespace)::SlideImpl mpBox2DWorld box2d::utils::Box2DWorldSharedPtr
-slideshow/source/engine/smilfunctionparser.cxx:491
+slideshow/source/engine/smilfunctionparser.cxx:494
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:492
+slideshow/source/engine/smilfunctionparser.cxx:495
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::classic::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:493
+slideshow/source/engine/smilfunctionparser.cxx:496
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::classic::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:494
+slideshow/source/engine/smilfunctionparser.cxx:497
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:495
+slideshow/source/engine/smilfunctionparser.cxx:498
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::classic::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:496
+slideshow/source/engine/smilfunctionparser.cxx:499
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::classic::rule<ScannerT>
-starmath/inc/view.hxx:216
-    SmViewShell maGraphicController class SmGraphicController
-starmath/source/accessibility.hxx:270
-    SmEditSource rEditAcc class SmEditAccessible &
-svgio/inc/svgcharacternode.hxx:85
+starmath/inc/mathml/mathmlMo.hxx:64
+    moOperatorData m_motxt OUString
+starmath/inc/mathml/mathmlMo.hxx:65
+    moOperatorData m_form moOpDF
+starmath/inc/mathml/mathmlMo.hxx:66
+    moOperatorData m_priority sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:67
+    moOperatorData m_lspace sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:68
+    moOperatorData m_rspace sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:69
+    moOperatorData m_properties moOpDP
+starmath/inc/view.hxx:252
+    SmViewShell maGraphicController SmGraphicController
+svgio/inc/svgtextposition.hxx:36
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
-svl/source/crypto/cryptosign.cxx:122
+svl/source/crypto/cryptosign.cxx:115
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:123
+svl/source/crypto/cryptosign.cxx:116
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:124
+svl/source/crypto/cryptosign.cxx:117
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:282
+svl/source/crypto/cryptosign.cxx:275
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:283
+svl/source/crypto/cryptosign.cxx:276
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
-svx/inc/GalleryControl.hxx:42
-    svx::sidebar::GalleryControl mpGallery class Gallery *
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
+svx/inc/GalleryControl.hxx:43
+    svx::sidebar::GalleryControl mpGallery Gallery *
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1088
     (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1089
     (anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1085
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1090
     (anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1086
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
     (anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1087
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
     (anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1088
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
     (anonymous namespace)::ExpressionGrammar::definition ternaryFunction ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1089
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1094
     (anonymous namespace)::ExpressionGrammar::definition funcRef_decl ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1090
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1095
     (anonymous namespace)::ExpressionGrammar::definition functionReference ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1096
     (anonymous namespace)::ExpressionGrammar::definition modRef_decl ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1097
     (anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::classic::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1098
     (anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::classic::rule<ScannerT>
 svx/source/dialog/contimp.hxx:75
-    SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/framelinkarray.cxx:385
-    svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow size_t
-svx/source/dialog/imapwnd.hxx:87
-    IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/dialog/weldeditview.cxx:371
-    (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/inc/datanavi.hxx:190
-    svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
-svx/source/stbctrls/pszctrl.cxx:95
-    (anonymous namespace)::FunctionPopup_Impl m_aBuilder class VclBuilder
+    SvxSuperContourDlg aContourItem SvxContourDlgItem
+svx/source/dialog/framelinkarray.cxx:570
+    svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow sal_Int32
+svx/source/dialog/imapwnd.hxx:88
+    IMapWindow maItemInfos SfxItemInfo[1]
+svx/source/dialog/weldeditview.cxx:457
+    (anonymous namespace)::WeldEditSource m_rEditAcc WeldEditAccessible &
+svx/source/inc/datanavi.hxx:194
+    svxform::XFormsPage m_aDropHelper DataTreeDropTarget
 svx/source/svdraw/svdcrtv.cxx:48
     ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
-svx/source/svdraw/svdmrkv.cxx:132
+svx/source/svdraw/svdmrkv.cxx:136
     MarkingSubSelectionOverlay maObjects sdr::overlay::OverlayObjectList
 svx/source/tbxctrls/extrusioncontrols.hxx:66
-    svx::ExtrusionDirectionWindow maImgDirection class Image [9]
-svx/source/xml/xmleohlp.cxx:69
-    OutputStorageWrapper_Impl aTempFile class utl::TempFile
-svx/source/xml/xmlgrhlp.cxx:88
-    (anonymous namespace)::GraphicInputStream maTempFile utl::TempFile
-sw/inc/tox.hxx:59
-    sw::FindContentFrameHint m_isReadOnlyAvailable const _Bool
-sw/inc/unosett.hxx:149
+    svx::ExtrusionDirectionWindow maImgDirection Image[9]
+svx/source/xml/xmleohlp.cxx:71
+    OutputStorageWrapper_Impl aTempFile TempFileFast
+svx/source/xml/xmlgrhlp.cxx:93
+    (anonymous namespace)::GraphicInputStream maTempFile utl::TempFileFast
+sw/inc/unosett.hxx:143
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
-    (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4620
-    (anonymous namespace)::IdleTask maIdle class Idle
-sw/source/core/crsr/crbm.cxx:64
-    (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
-sw/source/core/inc/swfont.hxx:980
+    (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType SwChapterFieldType
+sw/qa/extras/uiwriter/uiwriter5.cxx:67
+    SwUiWriterTest5 m_aSavedSettings AllSettings
+sw/source/core/crsr/crbm.cxx:62
+    (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
+sw/source/core/inc/ftnboss.hxx:34
+    SwSaveFootnoteHeight aGuard SwFrameDeleteGuard
+sw/source/core/inc/pamtyp.hxx:79
+    SwMoveFnCollection fnNds GoNds
+sw/source/core/inc/swfont.hxx:990
     SvStatistics nGetStretchTextSize sal_uInt16
-sw/source/core/layout/dbg_lay.cxx:179
-    SwImplEnterLeave m_nAction enum DbgAction
-sw/source/core/text/inftxt.cxx:565
-    (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
-sw/source/core/text/inftxt.hxx:675
-    SwTextSlot aText class rtl::OUString
-sw/source/core/text/porfld.cxx:142
-    (anonymous namespace)::SwFieldSlot aText class rtl::OUString
+sw/source/core/layout/dbg_lay.cxx:181
+    SwImplEnterLeave m_nAction DbgAction
+sw/source/core/text/inftxt.cxx:546
+    (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<VirtualDevice>
+sw/source/core/text/inftxt.hxx:700
+    SwTextSlot aText OUString
+sw/source/core/text/porfld.cxx:145
+    (anonymous namespace)::SwFieldSlot aText OUString
+sw/source/core/text/porrst.hxx:191
+    SwBookmarkPortion m_bHasCustomColor _Bool
 sw/source/core/text/redlnitr.hxx:78
-    SwRedlineItr m_nNdIdx const sal_uLong
-sw/source/uibase/docvw/romenu.hxx:34
-    SwReadOnlyPopup m_aBuilder class VclBuilder
-sw/source/uibase/docvw/romenu.hxx:46
+    SwRedlineItr m_nNdIdx const SwNodeOffset
+sw/source/uibase/docvw/romenu.hxx:35
+    SwReadOnlyPopup m_aBuilder VclBuilder
+sw/source/uibase/docvw/romenu.hxx:47
     SwReadOnlyPopup m_nReadonlyGraphictogallery sal_uInt16
-sw/source/uibase/docvw/romenu.hxx:50
+sw/source/uibase/docvw/romenu.hxx:51
     SwReadOnlyPopup m_nReadonlyBackgroundtogallery sal_uInt16
 sw/source/uibase/inc/condedit.hxx:43
-    ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:300
-    SwGlobalTree m_aDropTargetHelper class SwGlobalTreeDropTarget
-sw/source/uibase/inc/olmenu.hxx:77
-    SwSpellPopup m_aBuilder class VclBuilder
-sw/source/uibase/inc/swuicnttab.hxx:240
-    SwTokenWindow m_aAdjustPositionsIdle class Idle
-sw/source/uibase/inc/uivwimp.hxx:93
-    SwView_Impl xTmpSelDocSh class SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:45
-    SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard class SolarMutexGuard
-toolkit/source/awt/stylesettings.cxx:94
-    toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard class SolarMutexGuard
-ucb/source/ucp/gio/gio_mount.hxx:74
+    ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
+sw/source/uibase/inc/conttree.hxx:334
+    SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
+sw/source/uibase/inc/olmenu.hxx:78
+    SwSpellPopup m_aBuilder VclBuilder
+sw/source/uibase/inc/swuicnttab.hxx:243
+    SwTokenWindow m_aAdjustPositionsIdle Idle
+sw/source/uibase/inc/tmpdlg.hxx:35
+    SwTemplateDlgController m_bNewStyle _Bool
+sw/source/uibase/inc/uivwimp.hxx:95
+    SwView_Impl m_xTmpSelDocShell SfxObjectShellLock
+sw/source/uibase/inc/unodispatch.hxx:43
+    SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard SolarMutexGuard
+toolkit/source/awt/stylesettings.cxx:74
+    toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard SolarMutexGuard
+ucb/source/ucp/gio/gio_mount.hxx:73
     OOoMountOperationClass parent_class GMountOperationClass
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:76
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:77
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:78
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:80
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-vcl/headless/svpgdi.cxx:397
-    (anonymous namespace)::BitmapHelper aTmpBmp class SvpSalBitmap
-vcl/inc/canvasbitmap.hxx:40
-    vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
-vcl/inc/graphic/Manager.hxx:39
-    vcl::graphic::Manager maSwapOutTimer class Timer
-vcl/inc/salvtables.hxx:543
-    SalInstanceEntry m_aTextFilter class WeldTextFilter
-vcl/inc/salvtables.hxx:925
-    SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
-vcl/inc/svimpbox.hxx:120
-    SvImpLBox m_aFctSet class ImpLBSelEng
-vcl/inc/unx/i18n_ic.hxx:40
+uui/source/iahndl.hxx:64
+    InteractionHandlerData ServiceName OUString
+vcl/inc/graphic/Manager.hxx:41
+    vcl::graphic::Manager maSwapOutTimer Timer
+vcl/inc/headless/BitmapHelper.hxx:32
+    BitmapHelper aTmpBmp SvpSalBitmap
+vcl/inc/jsdialog/jsdialogbuilder.hxx:728
+    JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
+vcl/inc/pdf/pdfbuildin_fonts.hxx:34
+    vcl::pdf::BuildinFont m_nAscent const int
+vcl/inc/pdf/pdfbuildin_fonts.hxx:35
+    vcl::pdf::BuildinFont m_nDescent const int
+vcl/inc/pdf/pdfbuildin_fonts.hxx:42
+    vcl::pdf::BuildinFont m_aWidths const int[256]
+vcl/inc/salprn.hxx:48
+    SalPrinterQueueInfo moPortName std::optional<OUString>
+vcl/inc/salvtables.hxx:620
+    SalInstanceEntry m_aTextFilter WeldTextFilter
+vcl/inc/salvtables.hxx:1011
+    SalInstanceComboBoxWithEdit m_aTextFilter WeldTextFilter
+vcl/inc/sft.hxx:178
+    vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
+vcl/inc/skia/zone.hxx:29
+    SkiaZone g SolarMutexGuard
+vcl/inc/svimpbox.hxx:117
+    SvImpLBox m_aFctSet ImpLBSelEng
+vcl/inc/unx/genpspgraphics.h:52
+    GenPspGraphics m_aCairoCommon CairoCommon
+vcl/inc/unx/i18n_ic.hxx:39
     SalI18N_InputContext maPreeditStartCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:41
+vcl/inc/unx/i18n_ic.hxx:40
     SalI18N_InputContext maPreeditDoneCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:42
+vcl/inc/unx/i18n_ic.hxx:41
     SalI18N_InputContext maPreeditDrawCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:43
+vcl/inc/unx/i18n_ic.hxx:42
     SalI18N_InputContext maPreeditCaretCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:44
+vcl/inc/unx/i18n_ic.hxx:43
     SalI18N_InputContext maCommitStringCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:45
+vcl/inc/unx/i18n_ic.hxx:44
     SalI18N_InputContext maSwitchIMCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:46
+vcl/inc/unx/i18n_ic.hxx:45
     SalI18N_InputContext maDestroyCallback XIMCallback
-vcl/inc/WidgetThemeLibrary.hxx:100
-    vcl::ControlDrawParameters nSize uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:101
-    vcl::ControlDrawParameters pCairo vcl::ControlDrawParameters::cairo_t *
-vcl/inc/WidgetThemeLibrary.hxx:102
-    vcl::ControlDrawParameters ePart enum ControlPart
-vcl/inc/WidgetThemeLibrary.hxx:103
-    vcl::ControlDrawParameters eState enum ControlState
-vcl/inc/WidgetThemeLibrary.hxx:119
-    vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/gdi/jobset.cxx:37
-    (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:38
-    (anonymous namespace)::ImplOldJobSetupData cPortName char [32]
-vcl/source/gdi/pdfbuildin_fonts.hxx:32
-    vcl::pdf::BuildinFont m_nAscent const int
-vcl/source/gdi/pdfbuildin_fonts.hxx:33
-    vcl::pdf::BuildinFont m_nDescent const int
-vcl/source/gdi/pdfbuildin_fonts.hxx:40
-    vcl::pdf::BuildinFont m_aWidths const int [256]
+vcl/inc/unx/saldisp.hxx:101
+    SalColormap m_aPalette std::vector<Color>
+vcl/inc/unx/saldisp.hxx:106
+    SalColormap m_nUsed Pixel
+vcl/source/app/salvtables.cxx:246
+    SalFlashAttention m_aOrigBackground Wallpaper
+vcl/source/fontsubset/ttcr.hxx:40
+    vcl::longHorMetrics aw sal_uInt16
+vcl/source/fontsubset/ttcr.hxx:41
+    vcl::longHorMetrics lsb sal_Int16
+vcl/source/gdi/jobset.cxx:39
+    (anonymous namespace)::ImplOldJobSetupData cDeviceName char[32]
+vcl/source/gdi/jobset.cxx:40
+    (anonymous namespace)::ImplOldJobSetupData cPortName char[32]
+vcl/source/pdf/PDFiumLibrary.cxx:430
+    vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl m_aFormCallbacks FPDF_FORMFILLINFO
+vcl/unx/gtk3/a11y/atkhypertext.cxx:31
+    (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
 vcl/unx/gtk3/a11y/atkwrapper.hxx:51
-    AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk3/a11y/atkwrapper.hxx:79
+    AtkObjectWrapper aParent GtkWidgetAccessible
+vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
-    (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
-vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
+vcl/unx/gtk3/customcellrenderer.hxx:19
+    _CustomCellRenderer parent GtkCellRendererText
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    CustomCellRendererClass parent_class GtkCellRendererTextClass
+vcl/unx/gtk3/gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3glomenu.cxx:14
+vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4933
+vcl/unx/gtk3/gtkinst.cxx:7381
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:5306
-    (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5450
-    (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5458
-    (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
-vcl/unx/gtk3/gtk3gtkinst.cxx:7791
-    (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkContainer *
-vcl/unx/gtk3/gtk3gtkinst.cxx:14190
+vcl/unx/gtk3/gtkinst.cxx:11037
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox *
+vcl/unx/gtk3/gtkinst.cxx:11039
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton GtkMenuButton *
+vcl/unx/gtk3/gtkinst.cxx:21038
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtk3gtkinst.cxx:14196
+vcl/unx/gtk3/gtkinst.cxx:21044
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
-writerfilter/source/dmapper/PropertyMap.hxx:220
+writerfilter/source/dmapper/PropertyMap.hxx:246
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-xmloff/source/text/XMLTextListBlockContext.hxx:35
-    XMLTextListBlockContext msListStyleName class rtl::OUString
-xmloff/source/text/XMLTextListBlockContext.hxx:41
+xmloff/inc/XMLThemeContext.hxx:47
+    XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color>
+xmloff/source/text/XMLTextListBlockContext.hxx:40
     XMLTextListBlockContext mbSetDefaults _Bool
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))
 
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index d3d3eb099d56..94fc3425c6ac 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1,12 +1,14 @@
-basegfx/source/polygon/b2dtrapezoid.cxx:205
-    basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
-basic/source/inc/expr.hxx:92
-    SbiExprNode::(anonymous) nTypeStrId sal_uInt16
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:63
+basctl/source/inc/BasicColorConfig.hxx:65
+    basctl::BasicColorConfig aColorConfig const svtools::ColorConfig
+basegfx/source/polygon/b2dtrapezoid.cxx:208
+    basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock B2DPoint[32]
+basegfx/test/B2DPolyPolygonTest.cxx:66
+    basegfx::b2dpolypolygon rng std::mt19937
+basic/source/inc/expr.hxx:111
+    SbiExprNode::(anonymous union at /home/noel/libo-plugin/basic/source/inc/expr.hxx:110:5) nTypeStrId sal_uInt16
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:61
     Data rdx sal_uInt64
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:64
-    Data xmm0 double
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:65
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:63
     Data xmm1 double
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:128
     __cxxabiv1::__cxa_exception exceptionType std::type_info *
@@ -17,7 +19,7 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:130
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:131
     __cxxabiv1::__cxa_exception terminateHandler std::terminate_handler
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:132
-    __cxxabiv1::__cxa_exception nextException struct __cxxabiv1::__cxa_exception *
+    __cxxabiv1::__cxa_exception nextException __cxa_exception *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:133
     __cxxabiv1::__cxa_exception handlerCount int
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:134
@@ -33,7 +35,7 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:138
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:139
     __cxxabiv1::__cxa_exception unwindHeader _Unwind_Exception
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:148
-    __cxxabiv1::__cxa_eh_globals caughtExceptions struct __cxxabiv1::__cxa_exception *
+    __cxxabiv1::__cxa_eh_globals caughtExceptions __cxa_exception *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:149
     __cxxabiv1::__cxa_eh_globals uncaughtExceptions unsigned int
 bridges/source/jni_uno/jni_info.h:67
@@ -46,34 +48,40 @@ bridges/source/jni_uno/jni_java2uno.cxx:153
     jni_uno::(anonymous namespace)::largest p void *
 bridges/source/jni_uno/jni_java2uno.cxx:154
     jni_uno::(anonymous namespace)::largest a uno_Any
-chart2/source/model/main/DataPoint.hxx:107
+chart2/source/model/main/DataPoint.hxx:104
     chart::DataPoint m_bNoParentPropAllowed _Bool
 codemaker/source/javamaker/classfile.cxx:508
-     uint32Bytes sal_uInt32
+    (unnamed union at /home/noel/libo-plugin/codemaker/source/javamaker/classfile.cxx:508:5) uint32Bytes sal_uInt32
 codemaker/source/javamaker/classfile.cxx:540
-     uint64Bytes sal_uInt64
-connectivity/inc/sdbcx/VCatalog.hxx:65
-    connectivity::sdbcx::OCatalog m_pViews std::unique_ptr<OCollection>
+    (unnamed union at /home/noel/libo-plugin/codemaker/source/javamaker/classfile.cxx:540:5) uint64Bytes sal_uInt64
 connectivity/inc/sdbcx/VCatalog.hxx:66
     connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
 connectivity/inc/sdbcx/VGroup.hxx:52
     connectivity::sdbcx::OGroup m_pUsers std::unique_ptr<OUsers>
-connectivity/inc/sdbcx/VKey.hxx:69
+connectivity/inc/sdbcx/VKey.hxx:70
     connectivity::sdbcx::OKey m_pColumns std::unique_ptr<OCollection>
 connectivity/inc/sdbcx/VUser.hxx:52
     connectivity::sdbcx::OUser m_pGroups std::unique_ptr<OGroups>
 connectivity/qa/connectivity/resource/sharedresources_test.cxx:53
     connectivity_test::SharedResourcesTest m_aResource ::connectivity::SharedResources
-connectivity/source/drivers/firebird/Driver.hxx:47
-    connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory ::utl::TempFile
-connectivity/source/drivers/firebird/Driver.hxx:48
-    connectivity::firebird::FirebirdDriver m_firebirdLockDirectory ::utl::TempFile
-connectivity/source/inc/dbase/DIndexIter.hxx:34
+connectivity/source/drivers/evoab2/EApi.h:124
+    EContactAddress po char *
+connectivity/source/drivers/evoab2/EApi.h:126
+    EContactAddress street char *
+connectivity/source/drivers/evoab2/EApi.h:127
+    EContactAddress locality char *
+connectivity/source/drivers/evoab2/EApi.h:128
+    EContactAddress region char *
+connectivity/source/drivers/evoab2/EApi.h:129
+    EContactAddress code char *
+connectivity/source/drivers/evoab2/EApi.h:130
+    EContactAddress country char *
+connectivity/source/inc/dbase/DIndexIter.hxx:33
     connectivity::dbase::OIndexIterator m_pOperator file::OBoolOperator *
-connectivity/source/inc/dbase/DIndexIter.hxx:35
+connectivity/source/inc/dbase/DIndexIter.hxx:34
     connectivity::dbase::OIndexIterator m_pOperand const file::OOperand *
 connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:109
-    connectivity::ODatabaseMetaDataResultSet m_aEmptyValue class connectivity::ORowSetValue
+    connectivity::ODatabaseMetaDataResultSet m_aEmptyValue ORowSetValue
 connectivity/source/inc/OColumn.hxx:41
     connectivity::OColumn m_AutoIncrement _Bool
 connectivity/source/inc/OColumn.hxx:42
@@ -86,11 +94,11 @@ connectivity/source/inc/OColumn.hxx:47
     connectivity::OColumn m_Writable _Bool
 connectivity/source/inc/OColumn.hxx:48
     connectivity::OColumn m_DefinitelyWritable _Bool
-connectivity/source/inc/TConnection.hxx:55
-    connectivity::OMetaConnection m_aResources class connectivity::SharedResources
-connectivity/source/inc/writer/WTable.hxx:44
+connectivity/source/inc/TConnection.hxx:54
+    connectivity::OMetaConnection m_aResources SharedResources
+connectivity/source/inc/writer/WTable.hxx:43
     connectivity::writer::OWriterTable m_nStartCol sal_Int32
-cppcanvas/source/mtfrenderer/textaction.cxx:1651
+cppcanvas/source/mtfrenderer/textaction.cxx:1653
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextFillColor const ::Color
 cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:36
     (anonymous namespace)::Mapping m_from uno::Environment
@@ -100,420 +108,516 @@ cppu/source/helper/purpenv/Proxy.hxx:35
     Proxy m_from css::uno::Environment
 cppu/source/helper/purpenv/Proxy.hxx:36
     Proxy m_to css::uno::Environment
-cppu/source/uno/cascade_mapping.cxx:42
-    (anonymous namespace)::MediatorMapping m_from uno::Environment
 cppu/source/uno/cascade_mapping.cxx:43
-    (anonymous namespace)::MediatorMapping m_interm uno::Environment
+    (anonymous namespace)::MediatorMapping m_from uno::Environment
 cppu/source/uno/cascade_mapping.cxx:44
+    (anonymous namespace)::MediatorMapping m_interm uno::Environment
+cppu/source/uno/cascade_mapping.cxx:45
     (anonymous namespace)::MediatorMapping m_to uno::Environment
 cppu/source/uno/check.cxx:38
     (anonymous namespace)::C1 n1 sal_Int16
+cppu/source/uno/check.cxx:42
+    (anonymous namespace)::C2 n2 sal_Int32
+cppu/source/uno/check.cxx:46
+    (anonymous namespace)::C3 d3 double
+cppu/source/uno/check.cxx:47
+    (anonymous namespace)::C3 n3 sal_Int32
+cppu/source/uno/check.cxx:51
+    (anonymous namespace)::C4 n4 sal_Int32
+cppu/source/uno/check.cxx:52
+    (anonymous namespace)::C4 d4 double
+cppu/source/uno/check.cxx:56
+    (anonymous namespace)::C5 n5 sal_Int64
+cppu/source/uno/check.cxx:57
+    (anonymous namespace)::C5 b5 sal_Bool
+cppu/source/uno/check.cxx:61
+    (anonymous namespace)::C6 c6 C5
+cppu/source/uno/check.cxx:62
+    (anonymous namespace)::C6 b6 sal_Bool
 cppu/source/uno/check.cxx:67
     (anonymous namespace)::D d sal_Int16
 cppu/source/uno/check.cxx:68
     (anonymous namespace)::D e sal_Int32
-cppu/source/uno/check.cxx:72
-    (anonymous namespace)::E a sal_Bool
 cppu/source/uno/check.cxx:73
+    (anonymous namespace)::E a sal_Bool
+cppu/source/uno/check.cxx:75
     (anonymous namespace)::E b sal_Bool
-cppu/source/uno/check.cxx:74
+cppu/source/uno/check.cxx:77
     (anonymous namespace)::E c sal_Bool
-cppu/source/uno/check.cxx:75
+cppu/source/uno/check.cxx:78
     (anonymous namespace)::E d sal_Int16
-cppu/source/uno/check.cxx:76
+cppu/source/uno/check.cxx:79
     (anonymous namespace)::E e sal_Int32
-cppu/source/uno/check.cxx:81
+cppu/source/uno/check.cxx:84
     (anonymous namespace)::M n sal_Int32
-cppu/source/uno/check.cxx:82
+cppu/source/uno/check.cxx:85
     (anonymous namespace)::M o sal_Int16
-cppu/source/uno/check.cxx:91
-    (anonymous namespace)::N2 m struct (anonymous namespace)::M
-cppu/source/uno/check.cxx:92
+cppu/source/uno/check.cxx:90
+    (anonymous namespace)::N p sal_Int16
+cppu/source/uno/check.cxx:94
+    (anonymous namespace)::N2 m M
+cppu/source/uno/check.cxx:95
     (anonymous namespace)::N2 p sal_Int16
-cppu/source/uno/check.cxx:97
+cppu/source/uno/check.cxx:100
     (anonymous namespace)::O p double
-cppu/source/uno/check.cxx:98
+cppu/source/uno/check.cxx:101
     (anonymous namespace)::O q sal_Int16
-cppu/source/uno/check.cxx:107
+cppu/source/uno/check.cxx:105
+    (anonymous namespace)::O2 p2 sal_Int16
+cppu/source/uno/check.cxx:110
     (anonymous namespace)::P p2 double
-cppu/source/uno/check.cxx:115
+cppu/source/uno/check.cxx:118
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:126
+cppu/source/uno/check.cxx:129
     (anonymous namespace)::Char1 c1 char
-cppu/source/uno/check.cxx:130
+cppu/source/uno/check.cxx:133
     (anonymous namespace)::Char2 c2 char
-cppu/source/uno/check.cxx:134
+cppu/source/uno/check.cxx:137
     (anonymous namespace)::Char3 c3 char
-cppu/source/uno/check.cxx:258
-    (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/options/optcolor.cxx:255
-    (anonymous namespace)::ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
-cui/source/options/optpath.cxx:65
-    OptPath_Impl m_aDefOpt class SvtDefaultOptions
-dbaccess/source/core/api/RowSetBase.hxx:84
+cppu/source/uno/check.cxx:267
+    (anonymous namespace)::Char4 chars Char3
+cppu/source/uno/check.cxx:271
+    (anonymous namespace)::Char4 c char
+cppuhelper/inc/interfacecontainer4.hxx:266
+    cppuhelper::OInterfaceContainerHelper4::NotifySingleListener m_pMethod const NotificationMethod
+cui/source/options/optcolor.cxx:303
+    (anonymous namespace)::ColorConfigWindow_Impl aModuleOptions SvtModuleOptions
+dbaccess/source/core/api/RowSetBase.hxx:82
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
-dbaccess/source/core/api/RowSetBase.hxx:95
+dbaccess/source/core/api/RowSetBase.hxx:93
     dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
-dbaccess/source/core/dataaccess/documentcontainer.cxx:66
+dbaccess/source/core/dataaccess/documentcontainer.cxx:68
     dbaccess::(anonymous namespace)::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:102
+dbaccess/source/core/inc/ContentHelper.hxx:101
     dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
 dbaccess/source/filter/hsqldb/parseschema.hxx:34
     dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
 dbaccess/source/ui/control/tabletree.cxx:127
     dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
-dbaccess/source/ui/inc/charsetlistbox.hxx:43
-    dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
-dbaccess/source/ui/inc/sqledit.hxx:40
+dbaccess/source/ui/dlg/advancedsettings.hxx:34
+    dbaui::SpecialSettingsPage m_xIsSQL92Check std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:35
+    dbaui::SpecialSettingsPage m_xAppendTableAlias std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:36
+    dbaui::SpecialSettingsPage m_xAsBeforeCorrelationName std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:37
+    dbaui::SpecialSettingsPage m_xEnableOuterJoin std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:38
+    dbaui::SpecialSettingsPage m_xIgnoreDriverPrivileges std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:39
+    dbaui::SpecialSettingsPage m_xParameterSubstitution std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:40
+    dbaui::SpecialSettingsPage m_xSuppressVersionColumn std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:41
+    dbaui::SpecialSettingsPage m_xCatalog std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:42
+    dbaui::SpecialSettingsPage m_xSchema std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:43
+    dbaui::SpecialSettingsPage m_xIndexAppendix std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:44
+    dbaui::SpecialSettingsPage m_xDosLineEnds std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:45
+    dbaui::SpecialSettingsPage m_xCheckRequiredFields std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:46
+    dbaui::SpecialSettingsPage m_xIgnoreCurrency std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:47
+    dbaui::SpecialSettingsPage m_xEscapeDateTime std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:48
+    dbaui::SpecialSettingsPage m_xPrimaryKeySupport std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/dlg/advancedsettings.hxx:49
+    dbaui::SpecialSettingsPage m_xRespectDriverResultSetType std::unique_ptr<weld::CheckButton>
+dbaccess/source/ui/inc/charsetlistbox.hxx:45
+    dbaui::CharSetListBox m_aCharSets OCharsetDisplay
+dbaccess/source/ui/inc/sqledit.hxx:42
     dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig
 dbaccess/source/ui/inc/WCopyTable.hxx:258
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
-drawinglayer/inc/processor3d/defaultprocessor3d.hxx:87
-    drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer
-drawinglayer/source/processor2d/vclprocessor2d.hxx:77
-    drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
-editeng/source/editeng/impedit.hxx:509
+editeng/source/editeng/impedit.hxx:542
     ImpEditEngine maColorConfig svtools::ColorConfig
-embeddedobj/source/inc/commonembobj.hxx:103
-    OCommonEmbeddedObject m_aClassName class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:123
-    OleEmbeddedObject m_pOleComponent class OleComponent *
-embeddedobj/source/inc/oleembobj.hxx:143
-    OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:165
+embeddedobj/source/inc/commonembobj.hxx:114
+    OCommonEmbeddedObject m_aClassName OUString
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:182
-    OleEmbeddedObject m_aLinkURL class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:188
+embeddedobj/source/inc/oleembobj.hxx:184
+    OleEmbeddedObject m_aLinkURL OUString
+embeddedobj/source/inc/oleembobj.hxx:190
     OleEmbeddedObject m_bFromClipboard _Bool
-extensions/source/propctrlr/eformshelper.hxx:61
-    pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
-extensions/source/propctrlr/eformshelper.hxx:63
-    pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet
-filter/source/graphicfilter/eps/eps.cxx:114
-    (anonymous namespace)::PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
-filter/source/graphicfilter/icgm/cgm.hxx:58
-    CGM mbPicture _Bool
-filter/source/graphicfilter/icgm/chart.hxx:49
+embeddedobj/source/msole/olecomponent.hxx:73
+    OleComponent m_bWorkaroundActive _Bool
+extensions/source/propctrlr/eformshelper.hxx:60
+    pcr::EFormsHelper m_aSubmissionUINames MapStringToPropertySet
+extensions/source/propctrlr/eformshelper.hxx:62
+    pcr::EFormsHelper m_aBindingUINames MapStringToPropertySet
+extensions/source/update/check/updatehdl.hxx:89
+    UpdateHandler mbStringsLoaded _Bool
+filter/source/graphicfilter/icgm/chart.hxx:48
     DataNode nBoxX1 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:50
+filter/source/graphicfilter/icgm/chart.hxx:49
     DataNode nBoxY1 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:51
+filter/source/graphicfilter/icgm/chart.hxx:50
     DataNode nBoxX2 sal_Int16
-filter/source/graphicfilter/icgm/chart.hxx:52
+filter/source/graphicfilter/icgm/chart.hxx:51
     DataNode nBoxY2 sal_Int16
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:54
-    DXF2GDIMetaFile aDefaultLineInfo const class LineInfo
-filter/source/graphicfilter/idxf/dxfreprd.hxx:76
-    DXFRepresentation aPalette class DXFPalette
-filter/source/graphicfilter/iras/iras.cxx:55
-    (anonymous namespace)::RASReader mnRepCount sal_uInt8
-filter/source/graphicfilter/itga/itga.cxx:55
-    (anonymous namespace)::TGAFileFooter nSignature sal_uInt32 [4]
-filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:86
-    XMLFilterSettingsDialog maModuleOpt class SvtModuleOptions
-framework/inc/dispatch/dispatchprovider.hxx:77
-    framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache
+filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:85
+    XMLFilterSettingsDialog maModuleOpt SvtModuleOptions
+framework/inc/dispatch/dispatchprovider.hxx:76
+    framework::DispatchProvider m_aProtocolHandlerCache HandlerCache
 framework/inc/helper/uiconfigelementwrapperbase.hxx:128
     framework::UIConfigElementWrapperBase m_bConfigListening _Bool
-framework/inc/xml/menudocumenthandler.hxx:187
+framework/inc/xml/menudocumenthandler.hxx:186
     framework::OReadMenuPopupHandler m_bMenuMode _Bool
+framework/source/fwe/classes/addonsoptions.cxx:348
+    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<PropertyValue> >
 framework/source/fwe/classes/addonsoptions.cxx:349
-    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
-framework/source/fwe/classes/addonsoptions.cxx:350
-    framework::AddonsOptions_Impl m_aEmptyAddonNotebookBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
+    framework::AddonsOptions_Impl m_aEmptyAddonNotebookBar Sequence<Sequence<PropertyValue> >
+i18npool/inc/textconversion.hxx:78
+    i18npool::Hangul_Index code sal_Unicode
 i18npool/inc/textconversion.hxx:79
-    i18npool::(anonymous) code sal_Unicode
+    i18npool::Hangul_Index address sal_Int16
 i18npool/inc/textconversion.hxx:80
-    i18npool::(anonymous) address sal_Int16
-i18npool/inc/textconversion.hxx:81
-    i18npool::(anonymous) count sal_Int16
-include/basic/sbstar.hxx:50
-    StarBASIC aErrorHdl Link<class StarBASIC *, _Bool>
+    i18npool::Hangul_Index count sal_Int16
+include/basegfx/utils/gradienttools.hxx:43
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:42:9) mValue sal_uInt32
+include/basegfx/utils/gradienttools.hxx:51
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union)::(anonymous struct at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) B sal_uInt8
+include/basegfx/utils/gradienttools.hxx:52
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union)::(anonymous struct at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) G sal_uInt8
+include/basegfx/utils/gradienttools.hxx:53
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union)::(anonymous struct at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) R sal_uInt8
 include/basic/sbstar.hxx:51
-    StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags>
-include/comphelper/interfacecontainer3.hxx:222
-    comphelper::OInterfaceContainerHelper3::NotifySingleListener m_pMethod const comphelper::OInterfaceContainerHelper3::NotifySingleListener::NotificationMethod
-include/comphelper/parallelsort.hxx:163
-    comphelper::(anonymous namespace)::Binner maLabels uint8_t [mnMaxStaticSize]
-include/comphelper/servicedecl.hxx:131
-    comphelper::service_decl::ServiceDecl m_createFunc const detail::CreateFuncF
-include/comphelper/servicedecl.hxx:132
-    comphelper::service_decl::ServiceDecl m_pImplName const char *const
-include/comphelper/servicedecl.hxx:133
-    comphelper::service_decl::ServiceDecl m_pServiceNames const char *const
+    StarBASIC aErrorHdl Link<StarBASIC *, _Bool>
+include/basic/sbstar.hxx:52
+    StarBASIC aBreakHdl Link<StarBASIC *, BasicDebugFlags>
+include/comphelper/parallelsort.hxx:164
+    comphelper::(anonymous namespace)::Binner maLabels uint8_t[51200]
 include/connectivity/DriversConfig.hxx:76
-    connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
-include/connectivity/sdbcx/VDescriptor.hxx:51
+    connectivity::DriversConfig m_aNode OSharedConfigNode
+include/connectivity/sdbcx/VDescriptor.hxx:49
     connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
 include/connectivity/sdbcx/VTable.hxx:77
-    connectivity::sdbcx::OTable m_xColumns rtl::Reference<OCollection>
+    connectivity::sdbcx::OTable m_xColumns std::unique_ptr<OCollection>
 include/connectivity/sdbcx/VTable.hxx:78
-    connectivity::sdbcx::OTable m_xIndexes rtl::Reference<OCollection>
+    connectivity::sdbcx::OTable m_xIndexes std::unique_ptr<OCollection>
 include/connectivity/sqlparse.hxx:104
     connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
-include/editeng/brushitem.hxx:51
-    SvxBrushItem maSecOptions class SvtSecurityOptions
-include/filter/msfilter/svdfppt.hxx:706
-    PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [10]
-include/filter/msfilter/svdfppt.hxx:877
+include/docmodel/theme/FormatScheme.hxx:239
+    model::BlipEffect mnRadius sal_Int32
+include/docmodel/theme/FormatScheme.hxx:240
+    model::BlipEffect mbGrow _Bool
+include/docmodel/theme/FormatScheme.hxx:241
+    model::BlipEffect mnAlpha sal_Int32
+include/docmodel/theme/FormatScheme.hxx:243
+    model::BlipEffect mnHue sal_Int32
+include/docmodel/theme/FormatScheme.hxx:244
+    model::BlipEffect mnSaturation sal_Int32
+include/docmodel/theme/FormatScheme.hxx:245
+    model::BlipEffect mnLuminance sal_Int32
+include/editeng/lrspitem.hxx:254
+    SvxGutterRightMarginItem m_nRightGutterMargin tools::Long
+include/filter/msfilter/svdfppt.hxx:718
+    PPTExtParaSheet aExtParaLevel PPTExtParaLevel[10]
+include/filter/msfilter/svdfppt.hxx:889
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:878
+include/filter/msfilter/svdfppt.hxx:890
     ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:879
+include/filter/msfilter/svdfppt.hxx:891
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
-include/oox/core/contexthandler2.hxx:216
+include/formula/formulahelper.hxx:39
+    formula::FormulaHelper m_aSysLocale SvtSysLocale
+include/oox/core/contexthandler2.hxx:231
     oox::core::ContextHandler2Helper mnRootStackSize size_t
-include/oox/ole/axbinarywriter.hxx:150
-    oox::ole::AxBinaryPropertyWriter maStreamProps oox::ole::AxBinaryPropertyWriter::ComplexPropVector
-include/registry/refltype.hxx:65
-    RTUik m_Data1 sal_uInt32
-include/registry/refltype.hxx:66
-    RTUik m_Data2 sal_uInt16
-include/registry/refltype.hxx:67
-    RTUik m_Data3 sal_uInt16
-include/registry/refltype.hxx:68
-    RTUik m_Data4 sal_uInt32
-include/registry/refltype.hxx:69
-    RTUik m_Data5 sal_uInt32
-include/sfx2/msg.hxx:95
+include/oox/ole/axbinarywriter.hxx:153
+    oox::ole::AxBinaryPropertyWriter maStreamProps ComplexPropVector
+include/sfx2/lokhelper.hxx:66
+    LokMouseEventData maLogicPosition std::optional<Point>
+include/sfx2/msg.hxx:94
     SfxTypeAttrib nAID sal_uInt16
-include/sfx2/msg.hxx:96
+include/sfx2/msg.hxx:95
     SfxTypeAttrib pName const char *
-include/sfx2/msg.hxx:105
+include/sfx2/msg.hxx:104
     SfxType createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:106
+include/sfx2/msg.hxx:105
     SfxType pType const std::type_info *
-include/sfx2/msg.hxx:107
+include/sfx2/msg.hxx:106
     SfxType nAttribs sal_uInt16
-include/sfx2/msg.hxx:108
-    SfxType aAttrib struct SfxTypeAttrib [1]
-include/sfx2/msg.hxx:118
+include/sfx2/msg.hxx:107
+    SfxType aAttrib SfxTypeAttrib[1]
+include/sfx2/msg.hxx:117
     SfxType0 pType const std::type_info *
 include/svl/ondemand.hxx:55
-    OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
+    OnDemandLocaleDataWrapper aSysLocale SvtSysLocale
+include/svx/diagram/IDiagramHelper.hxx:72
+    svx::diagram::IDiagramHelper mbUseDiagramThemeData _Bool
+include/svx/diagram/IDiagramHelper.hxx:81
+    svx::diagram::IDiagramHelper mbForceThemePtrRecreation _Bool
 include/svx/graphctl.hxx:52
-    GraphCtrl xVD ScopedVclPtrInstance<class VirtualDevice>
+    GraphCtrl xVD ScopedVclPtrInstance<VirtualDevice>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49
     sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
-include/svx/sdr/overlay/overlaymanager.hxx:70
-    sdr::overlay::OverlayManager maDrawinglayerOpt class SvtOptionsDrawinglayer
+include/svx/svdetc.hxx:182
+    SdrGlobalData maSysLocale SvtSysLocale
 include/svx/svdmark.hxx:141
-    SdrMarkList maPointName class rtl::OUString
+    SdrMarkList maPointName OUString
 include/svx/svdmark.hxx:142
-    SdrMarkList maGluePointName class rtl::OUString
-include/svx/svdoedge.hxx:160
+    SdrMarkList maGluePointName OUString
+include/svx/svdoedge.hxx:166
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
-include/svx/svdpntv.hxx:154
-    SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
-include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
-include/unoidl/unoidl.hxx:444
-    unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
-    unoidl::ConstantValue::(anonymous) byteValue sal_Int8
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5)
 include/unoidl/unoidl.hxx:446
-    unoidl::ConstantValue::(anonymous) shortValue sal_Int16
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) booleanValue _Bool
 include/unoidl/unoidl.hxx:447
-    unoidl::ConstantValue::(anonymous) unsignedShortValue sal_uInt16
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) byteValue sal_Int8
 include/unoidl/unoidl.hxx:448
-    unoidl::ConstantValue::(anonymous) longValue sal_Int32
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) shortValue sal_Int16
 include/unoidl/unoidl.hxx:449
-    unoidl::ConstantValue::(anonymous) unsignedLongValue sal_uInt32
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) unsignedShortValue sal_uInt16
 include/unoidl/unoidl.hxx:450
-    unoidl::ConstantValue::(anonymous) hyperValue sal_Int64
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) longValue sal_Int32
 include/unoidl/unoidl.hxx:451
-    unoidl::ConstantValue::(anonymous) unsignedHyperValue sal_uInt64
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) unsignedLongValue sal_uInt32
 include/unoidl/unoidl.hxx:452
-    unoidl::ConstantValue::(anonymous) floatValue float
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) hyperValue sal_Int64
 include/unoidl/unoidl.hxx:453
-    unoidl::ConstantValue::(anonymous) doubleValue double
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) unsignedHyperValue sal_uInt64
+include/unoidl/unoidl.hxx:454
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) floatValue float
+include/unoidl/unoidl.hxx:455
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) doubleValue double
 include/unotest/bootstrapfixturebase.hxx:52
-    test::BootstrapFixtureBase m_directories class test::Directories
-io/source/stm/odata.cxx:559
-    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
-io/source/stm/odata.cxx:559
-    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:47
+    test::BootstrapFixtureBase m_directories Directories
+include/vcl/bitmap.hxx:105
+    BitmapSystemData mnWidth int
+include/vcl/bitmap.hxx:106
+    BitmapSystemData mnHeight int
+include/vcl/formatter.hxx:128
+    Formatter m_aStaticFormatter StaticFormatter
+include/vcl/toolkit/field.hxx:399
+    DateFormatter maStaticFormatter class Formatter::StaticFormatter
+include/xmloff/xmlstyle.hxx:128
+    SvXMLStylesContext mxParaStyles css::uno::Reference<css::container::XNameContainer>
+include/xmloff/xmlstyle.hxx:130
+    SvXMLStylesContext mxTextStyles css::uno::Reference<css::container::XNameContainer>
+include/xmloff/xmlstyle.hxx:132
+    SvXMLStylesContext mxParaAutoStyles css::uno::Reference<css::style::XAutoStyleFamily>
+include/xmloff/xmlstyle.hxx:134
+    SvXMLStylesContext mxTextAutoStyles css::uno::Reference<css::style::XAutoStyleFamily>
+io/source/stm/odata.cxx:234
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:234:5) f float
+io/source/stm/odata.cxx:241
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:241:5) d double
+io/source/stm/odata.cxx:550
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:550:5) n sal_uInt32
+io/source/stm/odata.cxx:557
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:557:5) ad struct (unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:557:23)
+io/source/stm/odata.cxx:557
+    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:557:23) n1 sal_uInt32
+io/source/stm/odata.cxx:557
+    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:557:23) n2 sal_uInt32
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:48
     (anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
-libreofficekit/source/gtk/lokdocview.cxx:85
+libreofficekit/source/gtk/lokdocview.cxx:86
     (anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading _Bool
-lingucomponent/source/languageguessing/simpleguesser.cxx:78
+lingucomponent/source/languageguessing/simpleguesser.cxx:72
     (anonymous namespace)::textcat_t fprint void **
-lingucomponent/source/languageguessing/simpleguesser.cxx:80
+lingucomponent/source/languageguessing/simpleguesser.cxx:74
     (anonymous namespace)::textcat_t size uint4
 linguistic/source/dlistimp.hxx:55
-    DicList aOpt class LinguOptions
-oox/qa/token/tokenmap-test.cxx:34
-    oox::TokenmapTest tokenMap class oox::TokenMap
+    DicList aOpt LinguOptions
+oox/inc/drawingml/table/tablecell.hxx:85
+    oox::drawingml::table::TableCell maLinePropertiesInsideH oox::drawingml::LineProperties
+oox/inc/drawingml/table/tablecell.hxx:86
+    oox::drawingml::table::TableCell maLinePropertiesInsideV oox::drawingml::LineProperties
+oox/qa/token/tokenmap-test.cxx:35
+    oox::TokenmapTest tokenMap TokenMap
 oox/qa/unit/vba_compression.cxx:70
     TestVbaCompression m_directories test::Directories
-oox/source/drawingml/chart/objectformatter.cxx:717
-    oox::drawingml::chart::ObjectFormatterData maFromLocale struct com::sun::star::lang::Locale
-registry/source/reflwrit.cxx:140
-    writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
-registry/source/reflwrit.cxx:141
-    writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b2 sal_uInt32
-registry/source/reflwrit.cxx:181
-    (anonymous namespace)::CPInfo::(anonymous) aUik struct RTUik *
+oox/source/drawingml/chart/objectformatter.cxx:723
+    oox::drawingml::chart::ObjectFormatterData maFromLocale Locale
 reportdesign/source/ui/inc/ColorListener.hxx:35
     rptui::OColorListener m_aColorConfig svtools::ColorConfig
-sal/osl/unx/process.cxx:827
-    (anonymous namespace)::osl_procStat signal char [24]
-sal/osl/unx/process.cxx:828
-    (anonymous namespace)::osl_procStat blocked char [24]
-sal/osl/unx/process.cxx:829
-    (anonymous namespace)::osl_procStat sigignore char [24]
-sal/osl/unx/process.cxx:830
-    (anonymous namespace)::osl_procStat sigcatch char [24]
-sal/qa/OStringBuffer/rtl_OStringBuffer.cxx:1432
-    rtl_OStringBuffer::append_001 empty class rtl::OString
+sal/osl/unx/process.cxx:836
+    (anonymous namespace)::osl_procStat signal char[24]
+sal/osl/unx/process.cxx:837
+    (anonymous namespace)::osl_procStat blocked char[24]
+sal/osl/unx/process.cxx:838
+    (anonymous namespace)::osl_procStat sigignore char[24]
+sal/osl/unx/process.cxx:839
+    (anonymous namespace)::osl_procStat sigcatch char[24]
+sal/qa/OStringBuffer/rtl_OStringBuffer.cxx:1674
+    rtl_OStringBuffer::append_001 empty OString
 sal/rtl/alloc_arena.hxx:100
-    rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64]
+    rtl_arena_st m_hash_table_0 rtl_arena_segment_type *[64]
 sal/rtl/digest.cxx:188
-    (anonymous namespace)::DigestContextMD2 m_state sal_uInt32 [16]
+    (anonymous namespace)::DigestContextMD2 m_state sal_uInt32[16]
 sal/rtl/digest.cxx:189
-    (anonymous namespace)::DigestContextMD2 m_chksum sal_uInt32 [16]
-sal/rtl/uuid.cxx:66
+    (anonymous namespace)::DigestContextMD2 m_chksum sal_uInt32[16]
+sal/rtl/uuid.cxx:58
     (anonymous namespace)::UUID clock_seq_low sal_uInt8
-sal/rtl/uuid.cxx:67
-    (anonymous namespace)::UUID node sal_uInt8 [6]
-sc/inc/attarray.hxx:68
-    ScMergePatternState pItemSet std::unique_ptr<SfxItemSet>
-sc/inc/compiler.hxx:129
-    ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
-sc/inc/compiler.hxx:130
-    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:127:9)
-sc/inc/compiler.hxx:135
-    ScRawToken::(anonymous) pMat class ScMatrix *
-sc/inc/formulagroup.hxx:39
-    sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
-sc/inc/reordermap.hxx:21
-    sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/source/core/inc/adiasync.hxx:42
-    ScAddInAsync::(anonymous) pStr class rtl::OUString *
-sc/source/core/inc/interpre.hxx:101
+sal/rtl/uuid.cxx:59
+    (anonymous namespace)::UUID node sal_uInt8[6]
+sc/inc/attarray.hxx:69
+    ScMergePatternState pItemSet std::optional<SfxItemSet>
+sc/inc/cellvalue.hxx:113
+    ScRefCellValue::(anonymous union at /home/noel/libo-plugin/sc/inc/cellvalue.hxx:111:5) mpString const svl::SharedString *
+sc/inc/cellvalue.hxx:114
+    ScRefCellValue::(anonymous union at /home/noel/libo-plugin/sc/inc/cellvalue.hxx:111:5) mpEditText const EditTextObject *
+sc/inc/compiler.hxx:132
+    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sc/inc/compiler.hxx:131:9) nIndex sal_uInt16
+sc/inc/compiler.hxx:133
+    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sc/inc/compiler.hxx:131:9) eItem class ScTableRefToken::Item
+sc/inc/compiler.hxx:134
+    ScRawToken::(anonymous union at /home/noel/libo-plugin/sc/inc/compiler.hxx:109:5) table struct (unnamed struct at /home/noel/libo-plugin/sc/inc/compiler.hxx:131:9)
+sc/inc/compiler.hxx:139
+    ScRawToken::(anonymous union at /home/noel/libo-plugin/sc/inc/compiler.hxx:109:5) pMat ScMatrix *
+sc/inc/formulagroup.hxx:38
+    sc::FormulaGroupEntry::(anonymous union at /home/noel/libo-plugin/sc/inc/formulagroup.hxx:35:5) mpCells ScFormulaCell **
+sc/inc/reordermap.hxx:20
+    sc::ColRowReorderMapType maData DataType
+sc/inc/scmod.hxx:96
+    ScModule m_pCTLOptions std::unique_ptr<SvtCTLOptions>
+sc/inc/userlist.hxx:64
+    ScUserList maData DataType
+sc/source/core/inc/adiasync.hxx:41
+    ScAddInAsync::(anonymous union at /home/noel/libo-plugin/sc/source/core/inc/adiasync.hxx:38:5) pStr OUString *
+sc/source/core/inc/interpre.hxx:99
     ScTokenStack pPointer const formula::FormulaToken *[512]
-sc/source/filter/excel/xltoolbar.cxx:28
+sc/source/filter/excel/xltoolbar.cxx:31
     (anonymous namespace)::MSOExcelCommandConvertor msoToOOcmd IdToString
-sc/source/filter/excel/xltoolbar.cxx:29
+sc/source/filter/excel/xltoolbar.cxx:32
     (anonymous namespace)::MSOExcelCommandConvertor tcidToOOcmd IdToString
-sc/source/filter/inc/commentsbuffer.hxx:41
+sc/source/filter/inc/commentsbuffer.hxx:40
     oox::xls::CommentModel maAnchor css::awt::Rectangle
-sc/source/filter/inc/htmlexp.hxx:118
-    ScHTMLExport pFileNameMap ScHTMLExport::FileNameMapPtr
-sc/source/filter/inc/htmlpars.hxx:57
-    ScHTMLStyles maEmpty const class rtl::OUString
-sc/source/filter/inc/namebuff.hxx:81
+sc/source/filter/inc/htmlexp.hxx:117
+    ScHTMLExport pFileNameMap FileNameMapPtr
+sc/source/filter/inc/htmlpars.hxx:58
+    ScHTMLStyles maEmpty const OUString
+sc/source/filter/inc/namebuff.hxx:80
     RangeNameBufferWK3::Entry nAbsInd sal_uInt16
-sc/source/filter/inc/qproform.hxx:55
-    QProToSc mnAddToken struct TokenId
-sc/source/filter/inc/stylesbuffer.hxx:675
+sc/source/filter/inc/qproform.hxx:54
+    QProToSc mnAddToken TokenId
+sc/source/filter/inc/stylesbuffer.hxx:686
     oox::xls::Dxf mxAlignment std::shared_ptr<Alignment>
-sc/source/filter/inc/stylesbuffer.hxx:677
+sc/source/filter/inc/stylesbuffer.hxx:688
     oox::xls::Dxf mxProtection std::shared_ptr<Protection>
-sc/source/filter/inc/stylesbuffer.hxx:766
-    oox::xls::CellStyleBuffer maBuiltinStyles oox::xls::CellStyleBuffer::CellStyleVector
-sc/source/filter/inc/stylesbuffer.hxx:767
-    oox::xls::CellStyleBuffer maUserStyles oox::xls::CellStyleBuffer::CellStyleVector
-sc/source/filter/inc/XclExpChangeTrack.hxx:348
+sc/source/filter/inc/stylesbuffer.hxx:777
+    oox::xls::CellStyleBuffer maBuiltinStyles CellStyleVector
+sc/source/filter/inc/stylesbuffer.hxx:778
+    oox::xls::CellStyleBuffer maUserStyles CellStyleVector
+sc/source/filter/inc/XclExpChangeTrack.hxx:349
     XclExpChTrAction pAddAction std::unique_ptr<XclExpChTrAction>
-sc/source/filter/inc/xepage.hxx:122
-    XclExpChartPageSettings maData struct XclPageData
+sc/source/filter/inc/xepage.hxx:121
+    XclExpChartPageSettings maData XclPageData
+sc/source/filter/inc/xestyle.hxx:352
+    XclExpCellBorder maComplexColorDiagonal model::ComplexColor
+sc/source/filter/inc/xestyle.hxx:386
+    XclExpCellArea maBackgroundComplexColor model::ComplexColor
 sc/source/filter/inc/xistyle.hxx:518
-    XclImpXFBuffer maBuiltinStyles XclImpXFBuffer::XclImpStyleList
+    XclImpXFBuffer maBuiltinStyles XclImpStyleList
 sc/source/filter/inc/xistyle.hxx:519
-    XclImpXFBuffer maUserStyles XclImpXFBuffer::XclImpStyleList
-sc/source/filter/inc/xltracer.hxx:82
+    XclImpXFBuffer maUserStyles XclImpStyleList
+sc/source/filter/inc/xltracer.hxx:81
     XclTracer mbEnabled _Bool
-sc/source/filter/xml/xmlcelli.hxx:96
+sc/source/filter/xml/xmlcelli.hxx:94
     ScXMLTableRowCellContext mbEditEngineHasText _Bool
+sc/source/ui/inc/csvruler.hxx:37
+    ScCsvRuler maBackgrDev ScopedVclPtrInstance<VirtualDevice>
 sc/source/ui/inc/csvruler.hxx:38
-    ScCsvRuler maBackgrDev ScopedVclPtrInstance<class VirtualDevice>
-sc/source/ui/inc/csvruler.hxx:39
-    ScCsvRuler maRulerDev ScopedVclPtrInstance<class VirtualDevice>
-sc/source/ui/inc/inputhdl.hxx:67
+    ScCsvRuler maRulerDev ScopedVclPtrInstance<VirtualDevice>
+sc/source/ui/inc/inputhdl.hxx:66
     ScInputHandler pColumnData std::unique_ptr<ScTypedCaseStrSet>
-sc/source/ui/inc/inputhdl.hxx:68
+sc/source/ui/inc/inputhdl.hxx:67
     ScInputHandler pFormulaData std::unique_ptr<ScTypedCaseStrSet>
-sc/source/ui/inc/inputhdl.hxx:69
+sc/source/ui/inc/inputhdl.hxx:68
     ScInputHandler pFormulaDataPara std::unique_ptr<ScTypedCaseStrSet>
-sc/source/ui/inc/tabcont.hxx:38
+sc/source/ui/inc/tabcont.hxx:37
     ScTabControl bErrorShown _Bool
-sc/source/ui/vba/vbaformatconditions.hxx:37
-    ScVbaFormatConditions mxSheetConditionalEntries css::uno::Reference<css::sheet::XSheetConditionalEntries>
+sc/source/ui/inc/undoblk.hxx:348
+    ScUndoSelectionAttr aApplyPattern const CellAttributeHolder
+sc/source/ui/inc/undocell.hxx:61
+    ScUndoCursorAttr aOldPattern const CellAttributeHolder
+sc/source/ui/inc/undocell.hxx:62
+    ScUndoCursorAttr aNewPattern const CellAttributeHolder
+sc/source/ui/inc/undocell.hxx:63
+    ScUndoCursorAttr aApplyPattern const CellAttributeHolder
 sc/source/ui/vba/vbaformatconditions.hxx:38
-    ScVbaFormatConditions mxStyles css::uno::Reference<ov::excel::XStyles>
+    ScVbaFormatConditions mxSheetConditionalEntries css::uno::Reference<css::sheet::XSheetConditionalEntries>
 sc/source/ui/vba/vbaformatconditions.hxx:39
-    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+    ScVbaFormatConditions mxStyles rtl::Reference<ScVbaStyles>
 sc/source/ui/vba/vbaformatconditions.hxx:40
+    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+sc/source/ui/vba/vbaformatconditions.hxx:41
     ScVbaFormatConditions mxParentRangePropertySet css::uno::Reference<css::beans::XPropertySet>
-sc/source/ui/vba/vbaworksheet.hxx:50
-    ScVbaWorksheet mxButtons ::rtl::Reference<ScVbaSheetObjectsBase> [2]
-sd/inc/Outliner.hxx:286
-    SdOutliner mpFirstObj class SdrObject *
-sd/inc/sdmod.hxx:119
+sc/source/ui/vba/vbaworksheet.hxx:49
+    ScVbaWorksheet mxButtons ::rtl::Reference<ScVbaSheetObjectsBase>[2]
+sd/inc/Outliner.hxx:289
+    SdOutliner mpFirstObj SdrObject *
+sd/inc/sdmod.hxx:131
     SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
-sd/inc/sdmod.hxx:120
+sd/inc/sdmod.hxx:132
     SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
+sd/source/core/CustomAnimationCloner.cxx:69
+    sd::(anonymous namespace)::CustomAnimationClonerImpl maShapeMap ::std::map<Reference<XShape>, Reference<XShape> >
 sd/source/core/CustomAnimationCloner.cxx:70
     sd::(anonymous namespace)::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
 sd/source/core/CustomAnimationCloner.cxx:71
     sd::(anonymous namespace)::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> >
-sd/source/ui/inc/unopage.hxx:165
+sd/source/ui/inc/unopage.hxx:162
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/inc/unopage.hxx:226
+sd/source/ui/inc/unopage.hxx:222
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/remotecontrol/DiscoveryService.hxx:37
-    sd::DiscoveryService zService class sd::ZeroconfService *
-sd/source/ui/sidebar/MasterPageContainer.cxx:140
-    sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
 sd/source/ui/sidebar/MasterPageContainer.cxx:141
-    sd::sidebar::MasterPageContainer::Implementation maSmallPreviewBeingCreated class Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:146
-    sd::sidebar::MasterPageContainer::Implementation maLargePreviewNotAvailable class Image
+    sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated Image
+sd/source/ui/sidebar/MasterPageContainer.cxx:142
+    sd::sidebar::MasterPageContainer::Implementation maSmallPreviewBeingCreated Image
 sd/source/ui/sidebar/MasterPageContainer.cxx:147
-    sd::sidebar::MasterPageContainer::Implementation maSmallPreviewNotAvailable class Image
-sd/source/ui/slideshow/showwindow.hxx:99
+    sd::sidebar::MasterPageContainer::Implementation maLargePreviewNotAvailable Image
+sd/source/ui/sidebar/MasterPageContainer.cxx:148
+    sd::sidebar::MasterPageContainer::Implementation maSmallPreviewNotAvailable Image
+sd/source/ui/slideshow/showwindow.hxx:98
     sd::ShowWindow mbMouseCursorHidden _Bool
-sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx:141
+sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx:144
     sd::slidesorter::cache::PageCacheManager::RecentlyUsedPageCaches maMap std::map<key_type, mapped_type>
-sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:97
+sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:96
     sd::slidesorter::controller::Animator maElapsedTime ::canvas::tools::ElapsedTime
-sdext/source/pdfimport/inc/pdfihelper.hxx:100
+sdext/source/pdfimport/inc/pdfihelper.hxx:103
     pdfi::GraphicsContext BlendMode sal_Int8
 sdext/source/pdfimport/tree/style.hxx:44
-    pdfi::StyleContainer::Style Contents class rtl::OUString
-sfx2/source/appl/lnkbase2.cxx:99
-    sfx2::(anonymous namespace)::ImplDdeItem pLink class sfx2::SvBaseLink *
-slideshow/source/engine/slideshowimpl.cxx:137
+    pdfi::StyleContainer::Style Contents OUString
+sfx2/source/appl/lnkbase2.cxx:82
+    sfx2::(anonymous namespace)::ImplDdeItem pLink SvBaseLink *
+sfx2/source/inc/appdata.hxx:68
+    SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *>
+slideshow/source/engine/slideshowimpl.cxx:144
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
-sot/source/sdstor/ucbstorage.cxx:403
-    UCBStorageStream_Impl m_aKey class rtl::OString
-store/source/storbios.cxx:59
-    (anonymous namespace)::OStoreSuperBlock m_aMarked (anonymous namespace)::OStoreSuperBlock::L
-svl/source/crypto/cryptosign.cxx:281
+sot/source/sdstor/ucbstorage.cxx:408
+    UCBStorageStream_Impl m_aKey OString
+starmath/inc/ElementsDockingWindow.hxx:42
+    SmElementsControl maFormat SmFormat
+store/source/storbios.cxx:52
+    (anonymous namespace)::OStoreSuperBlock m_aMarked L
+svl/source/crypto/cryptosign.cxx:274
     (anonymous namespace)::PKIStatusInfo status SECItem
-svl/source/crypto/cryptosign.cxx:301
-    (anonymous namespace)::TimeStampResp status struct (anonymous namespace)::PKIStatusInfo
-svl/source/crypto/cryptosign.cxx:302
+svl/source/crypto/cryptosign.cxx:294
+    (anonymous namespace)::TimeStampResp status PKIStatusInfo
+svl/source/crypto/cryptosign.cxx:295
     (anonymous namespace)::TimeStampResp timeStampToken SECItem
-svl/source/misc/strmadpt.cxx:51
-    SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1]
+svl/source/misc/strmadpt.cxx:52
+    SvDataPipe_Impl::Page m_aBuffer sal_Int8[1]
 svl/source/uno/pathservice.cxx:37
-    (anonymous namespace)::PathService m_aOptions class SvtPathOptions
-svtools/source/control/tabbar.cxx:200
-    ImplTabBarItem maHelpId class rtl::OString
+    (anonymous namespace)::PathService m_aOptions SvtPathOptions
+svtools/source/control/tabbar.cxx:209
+    ImplTabBarItem maHelpId OString
 svtools/source/dialogs/insdlg.cxx:54
     (anonymous namespace)::OleObjectDescriptor cbSize sal_uInt32
 svtools/source/dialogs/insdlg.cxx:55
@@ -530,376 +634,206 @@ svtools/source/dialogs/insdlg.cxx:60
     (anonymous namespace)::OleObjectDescriptor dwFullUserTypeName sal_uInt32
 svtools/source/dialogs/insdlg.cxx:61
     (anonymous namespace)::OleObjectDescriptor dwSrcOfCopy sal_uInt32
-svtools/source/table/gridtablerenderer.cxx:71
-    svt::table::(anonymous namespace)::CachedSortIndicator m_sortAscending class BitmapEx
-svtools/source/table/gridtablerenderer.cxx:72
-    svt::table::(anonymous namespace)::CachedSortIndicator m_sortDescending class BitmapEx
 svx/inc/sdr/overlay/overlayrectangle.hxx:41
     sdr::overlay::OverlayRectangle mbOverlayState _Bool
-svx/source/inc/datanavi.hxx:182
-    svxform::XFormsPage m_aMethodString class svxform::MethodString
 svx/source/inc/datanavi.hxx:183
-    svxform::XFormsPage m_aReplaceString class svxform::ReplaceString
-svx/source/inc/datanavi.hxx:489
-    svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString
-svx/source/inc/datanavi.hxx:490
-    svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString
-svx/source/inc/gridcell.hxx:527
+    svxform::XFormsPage m_aMethodString MethodString
+svx/source/inc/datanavi.hxx:184
+    svxform::XFormsPage m_aReplaceString ReplaceString
+svx/source/inc/datanavi.hxx:494
+    svxform::AddSubmissionDialog m_aMethodString MethodString
+svx/source/inc/datanavi.hxx:495
+    svxform::AddSubmissionDialog m_aReplaceString ReplaceString
+svx/source/inc/gridcell.hxx:513
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/inc/gridcell.hxx:528
+svx/source/inc/gridcell.hxx:514
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/inc/svdpdf.hxx:64
-    ImpSdrPdfImport maDash class XDash
+svx/source/inc/svdpdf.hxx:61
+    ImpSdrPdfImport maDash XDash
+svx/source/unodraw/recoveryui.cxx:64
+    (anonymous namespace)::RecoveryUI m_pParentWindow weld::Window *
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
-sw/inc/breakit.hxx:38
+sw/inc/breakit.hxx:39
     SwBreakIt m_xLanguageTag std::unique_ptr<LanguageTag>
-sw/inc/calc.hxx:204
-    SwCalc m_aSysLocale class SvtSysLocale
-sw/inc/dpage.hxx:35
+sw/inc/dpage.hxx:38
     SwDPage m_pGridLst std::unique_ptr<SdrPageGridFrameList>
-sw/inc/hints.hxx:268
+sw/inc/hints.hxx:365
     SwAttrSetChg m_bDelSet _Bool
-sw/inc/shellio.hxx:147
+sw/inc/shellio.hxx:149
     SwReader mpStg tools::SvRef<SotStorage>
 sw/inc/swevent.hxx:71
-    SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat *
+    SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat *
+sw/inc/swmodule.hxx:90
+    SwModule m_pCTLOptions std::unique_ptr<SvtCTLOptions>
+sw/qa/api/SwXHeadFootText.cxx:76
+    (anonymous namespace)::SwXHeadFootText mxTextContent Reference<text::XTextContent>
 sw/source/core/access/accfrmobjmap.hxx:100
     SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/access/acchypertextdata.hxx:40
     SwAccessibleHyperTextData maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:107
-    SwAccessibleContextMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:290
-    SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type, SwShapeFunc>
-sw/source/core/access/accmap.cxx:647
+sw/source/core/access/accmap.cxx:95
+    SwAccessibleContextMap_Impl maMap std::unordered_map<key_type, mapped_type>
+sw/source/core/access/accmap.cxx:269
+    SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type>
+sw/source/core/access/accmap.cxx:621
     SwAccessibleEventMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:691
+sw/source/core/access/accmap.cxx:665
     SwAccessibleSelectedParas_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/doc/swstylemanager.cxx:60
-    (anonymous namespace)::SwStyleManager m_aAutoCharPool class StylePool
-sw/source/core/doc/swstylemanager.cxx:61
-    (anonymous namespace)::SwStyleManager m_aAutoParaPool class StylePool
+sw/source/core/doc/swstylemanager.cxx:62
+    (anonymous namespace)::SwStyleManager m_aAutoCharPool StylePool
+sw/source/core/doc/swstylemanager.cxx:63
+    (anonymous namespace)::SwStyleManager m_aAutoParaPool StylePool
 sw/source/core/inc/swblocks.hxx:69
     SwImpBlocks m_bInPutMuchBlocks _Bool
-sw/source/core/text/atrhndl.hxx:48
-    SwAttrHandler m_pFnt std::unique_ptr<SwFont>
-sw/source/core/text/inftxt.cxx:565
-    (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
+sw/source/core/text/atrhndl.hxx:47
+    SwAttrHandler m_oFnt std::optional<SwFont>
+sw/source/core/text/inftxt.cxx:546
+    (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<VirtualDevice>
 sw/source/core/text/redlnitr.hxx:75
     SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
-sw/source/filter/html/htmltab.cxx:2829
+sw/source/filter/html/htmltab.cxx:2853
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:33
-    RTFSurround::(anonymous) nVal sal_uInt8
-sw/source/filter/writer/writer.cxx:68
-    Writer_Impl pFileNameMap std::unique_ptr<std::map<OUString, OUString> >
-sw/source/ui/dbui/dbinsdlg.cxx:102
-    DB_Column::(anonymous) pText class rtl::OUString *
+    RTFSurround::(unnamed union at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) nVal sal_uInt8
 sw/source/ui/dbui/dbinsdlg.cxx:104
-    DB_Column::(anonymous) nFormat sal_uInt32
-sw/source/uibase/dbui/mmconfigitem.cxx:112
+    DB_Column::(anonymous union at /home/noel/libo-plugin/sw/source/ui/dbui/dbinsdlg.cxx:103:5) pText OUString *
+sw/source/ui/dbui/dbinsdlg.cxx:106
+    DB_Column::(anonymous union at /home/noel/libo-plugin/sw/source/ui/dbui/dbinsdlg.cxx:103:5) nFormat sal_uInt32
+sw/source/uibase/dbui/mmconfigitem.cxx:113
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
-sw/source/uibase/dbui/mmconfigitem.cxx:114
+sw/source/uibase/dbui/mmconfigitem.cxx:115
     SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString>
-sw/source/uibase/dbui/mmconfigitem.cxx:116
+sw/source/uibase/dbui/mmconfigitem.cxx:117
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
-sw/source/uibase/inc/fldmgr.hxx:79
+sw/source/uibase/inc/fldmgr.hxx:80
     SwInsertField_Data m_aDBDataSource css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:440
+toolkit/source/awt/vclxtoolkit.cxx:437
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
-ucb/source/ucp/gio/gio_mount.hxx:74
+toolkit/source/controls/table/gridtablerenderer.cxx:71
+    svt::table::(anonymous namespace)::CachedSortIndicator m_sortAscending BitmapEx
+toolkit/source/controls/table/gridtablerenderer.cxx:72
+    svt::table::(anonymous namespace)::CachedSortIndicator m_sortDescending BitmapEx
+ucb/source/ucp/gio/gio_mount.hxx:73
     OOoMountOperationClass parent_class GMountOperationClass
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:76
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:77
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:78
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:80
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:76
-    hierarchy_ucp::DataSupplier_Impl m_aIterator class HierarchyEntry::iterator
-ucb/source/ucp/package/pkgprovider.hxx:51
+ucb/source/ucp/package/pkgprovider.hxx:48
     package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages>
-ucbhelper/source/client/proxydecider.cxx:133
-    ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const struct ucbhelper::InternetProxyServer
+ucb/source/ucp/webdav-curl/CurlSession.cxx:133
+    (anonymous namespace)::CurlOption::(anonymous union at /home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:132:5) pValue const void *const
+ucbhelper/source/client/proxydecider.cxx:130
+    ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const InternetProxyServer
+ucbhelper/source/provider/propertyvalueset.cxx:79
+    ucbhelper_impl::PropertyValue aString OUString
+ucbhelper/source/provider/propertyvalueset.cxx:80
+    ucbhelper_impl::PropertyValue bBoolean _Bool
+ucbhelper/source/provider/propertyvalueset.cxx:81
+    ucbhelper_impl::PropertyValue nByte sal_Int8
+ucbhelper/source/provider/propertyvalueset.cxx:82
+    ucbhelper_impl::PropertyValue nShort sal_Int16
+ucbhelper/source/provider/propertyvalueset.cxx:83
+    ucbhelper_impl::PropertyValue nInt sal_Int32
+ucbhelper/source/provider/propertyvalueset.cxx:84
+    ucbhelper_impl::PropertyValue nLong sal_Int64
 ucbhelper/source/provider/propertyvalueset.cxx:88
-    ucbhelper_impl::PropertyValue aString class rtl::OUString
+    ucbhelper_impl::PropertyValue aBytes Sequence<sal_Int8>
 ucbhelper/source/provider/propertyvalueset.cxx:89
-    ucbhelper_impl::PropertyValue bBoolean _Bool
+    ucbhelper_impl::PropertyValue aDate Date
 ucbhelper/source/provider/propertyvalueset.cxx:90
-    ucbhelper_impl::PropertyValue nByte sal_Int8
+    ucbhelper_impl::PropertyValue aTime Time
 ucbhelper/source/provider/propertyvalueset.cxx:91
-    ucbhelper_impl::PropertyValue nShort sal_Int16
+    ucbhelper_impl::PropertyValue aTimestamp DateTime
 ucbhelper/source/provider/propertyvalueset.cxx:92
-    ucbhelper_impl::PropertyValue nInt sal_Int32
+    ucbhelper_impl::PropertyValue xBinaryStream Reference<XInputStream>
 ucbhelper/source/provider/propertyvalueset.cxx:93
-    ucbhelper_impl::PropertyValue nLong sal_Int64
+    ucbhelper_impl::PropertyValue xCharacterStream Reference<XInputStream>
+ucbhelper/source/provider/propertyvalueset.cxx:94
+    ucbhelper_impl::PropertyValue xRef Reference<XRef>
+ucbhelper/source/provider/propertyvalueset.cxx:95
+    ucbhelper_impl::PropertyValue xBlob Reference<XBlob>
+ucbhelper/source/provider/propertyvalueset.cxx:96
+    ucbhelper_impl::PropertyValue xClob Reference<XClob>
 ucbhelper/source/provider/propertyvalueset.cxx:97
-    ucbhelper_impl::PropertyValue aBytes Sequence<sal_Int8>
-ucbhelper/source/provider/propertyvalueset.cxx:98
-    ucbhelper_impl::PropertyValue aDate struct com::sun::star::util::Date
-ucbhelper/source/provider/propertyvalueset.cxx:99
-    ucbhelper_impl::PropertyValue aTime struct com::sun::star::util::Time
-ucbhelper/source/provider/propertyvalueset.cxx:100
-    ucbhelper_impl::PropertyValue aTimestamp struct com::sun::star::util::DateTime
-ucbhelper/source/provider/propertyvalueset.cxx:101
-    ucbhelper_impl::PropertyValue xBinaryStream Reference<class com::sun::star::io::XInputStream>
-ucbhelper/source/provider/propertyvalueset.cxx:102
-    ucbhelper_impl::PropertyValue xCharacterStream Reference<class com::sun::star::io::XInputStream>
-ucbhelper/source/provider/propertyvalueset.cxx:103
-    ucbhelper_impl::PropertyValue xRef Reference<class com::sun::star::sdbc::XRef>
-ucbhelper/source/provider/propertyvalueset.cxx:104
-    ucbhelper_impl::PropertyValue xBlob Reference<class com::sun::star::sdbc::XBlob>
-ucbhelper/source/provider/propertyvalueset.cxx:105
-    ucbhelper_impl::PropertyValue xClob Reference<class com::sun::star::sdbc::XClob>
-ucbhelper/source/provider/propertyvalueset.cxx:106
-    ucbhelper_impl::PropertyValue xArray Reference<class com::sun::star::sdbc::XArray>
+    ucbhelper_impl::PropertyValue xArray Reference<XArray>
 unoidl/source/sourceprovider-scanner.hxx:147
     unoidl::detail::SourceProviderInterfaceTypeEntityPad directMandatoryBases std::vector<DirectBase>
 unoidl/source/sourceprovider-scanner.hxx:148
     unoidl::detail::SourceProviderInterfaceTypeEntityPad directOptionalBases std::vector<DirectBase>
-unoidl/source/sourceprovider-scanner.hxx:247
-    unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directMandatoryBaseServices std::vector<unoidl::AnnotatedReference>
-unoidl/source/sourceprovider-scanner.hxx:248
-    unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directOptionalBaseServices std::vector<unoidl::AnnotatedReference>
-unoidl/source/sourceprovider-scanner.hxx:249
-    unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directMandatoryBaseInterfaces std::vector<unoidl::AnnotatedReference>
-unoidl/source/sourceprovider-scanner.hxx:250
-    unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directOptionalBaseInterfaces std::vector<unoidl::AnnotatedReference>
-unoidl/source/unoidl-read.cxx:148
+unoidl/source/unoidl-read.cxx:152
     (anonymous namespace)::Entity dependencies std::set<OUString>
-unoidl/source/unoidl-read.cxx:149
+unoidl/source/unoidl-read.cxx:153
     (anonymous namespace)::Entity interfaceDependencies std::set<OUString>
-unoidl/source/unoidlprovider.cxx:87
-    unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char [2]
-unoidl/source/unoidlprovider.cxx:97
-    unoidl::detail::(anonymous namespace)::Memory32 byte unsigned char [4]
-unoidl/source/unoidlprovider.cxx:128
-    unoidl::detail::(anonymous namespace)::Memory64 byte unsigned char [8]
-unoidl/source/unoidlprovider.cxx:456
-    unoidl::detail::MapEntry name struct unoidl::detail::(anonymous namespace)::Memory32
-unoidl/source/unoidlprovider.cxx:457
-    unoidl::detail::MapEntry data struct unoidl::detail::(anonymous namespace)::Memory32
-unotools/source/config/pathoptions.cxx:85
-    SvtPathOptions_Impl m_aEmptyString class rtl::OUString
-unotools/source/config/saveopt.cxx:82
-    (anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave _Bool
+unoidl/source/unoidl-write.cxx:177
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidl-write.cxx:176:5) buf unsigned char[4]
+unoidl/source/unoidl-write.cxx:190
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidl-write.cxx:189:5) buf unsigned char[8]
+unoidl/source/unoidlprovider.cxx:89
+    unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char[2]
+unoidl/source/unoidlprovider.cxx:99
+    unoidl::detail::(anonymous namespace)::Memory32 byte unsigned char[4]
+unoidl/source/unoidlprovider.cxx:111
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidlprovider.cxx:109:9) f float
+unoidl/source/unoidlprovider.cxx:130
+    unoidl::detail::(anonymous namespace)::Memory64 byte unsigned char[8]
+unoidl/source/unoidlprovider.cxx:146
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidlprovider.cxx:144:9) d double
+unoidl/source/unoidlprovider.cxx:458
+    unoidl::detail::MapEntry name Memory32
+unoidl/source/unoidlprovider.cxx:459
+    unoidl::detail::MapEntry data Memory32
+unotools/source/config/pathoptions.cxx:84
+    SvtPathOptions_Impl m_aEmptyString OUString
 vcl/inc/bitmap/BitmapFastScaleFilter.hxx:31
-    BitmapFastScaleFilter maSize class Size
-vcl/inc/ppdparser.hxx:131
-    psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
+    BitmapFastScaleFilter maSize Size
+vcl/inc/ppdparser.hxx:129
+    psp::PPDParser::PPDConstraint m_pKey1 const PPDKey *
 vcl/inc/printerinfomanager.hxx:75
-    psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
-vcl/inc/salwtype.hxx:164
+    psp::PrinterInfoManager::SystemPrintQueue m_aComment OUString
+vcl/inc/salinst.hxx:83
+    SalInstance m_bSupportsBitmap32 _Bool
+vcl/inc/salwtype.hxx:171
     SalWheelMouseEvent mbDeltaIsPixel _Bool
-vcl/inc/salwtype.hxx:218
+vcl/inc/salwtype.hxx:224
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:316
+vcl/inc/svdata.hxx:276
+    ImplSVWinData mbIsLiveResize _Bool
+vcl/inc/svdata.hxx:328
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/toolbox.h:108
-    vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
-vcl/inc/unx/saldisp.hxx:281
-    SalDisplay m_aInvalidScreenData struct SalDisplay::ScreenData
-vcl/inc/widgetdraw/WidgetDefinition.hxx:226
-    vcl::WidgetDefinitionStyle maDefaultButtonTextColor class Color
-vcl/inc/widgetdraw/WidgetDefinition.hxx:230
-    vcl::WidgetDefinitionStyle maFlatButtonTextColor class Color
+vcl/inc/svdata.hxx:335
+    ImplSVNWFData mbNoFrameJunctionForPopups _Bool
+vcl/inc/toolbox.h:110
+    vcl::ToolBoxLayoutData m_aLineItemIds std::vector<ToolBoxItemId>
+vcl/inc/unx/saldisp.hxx:245
+    SalDisplay m_aInvalidScreenData ScreenData
+vcl/inc/widgetdraw/WidgetDefinition.hxx:224
+    vcl::WidgetDefinitionStyle maDefaultButtonTextColor Color
+vcl/inc/widgetdraw/WidgetDefinition.hxx:228
+    vcl::WidgetDefinitionStyle maFlatButtonTextColor Color
+vcl/inc/widgetdraw/WidgetDefinition.hxx:229
+    vcl::WidgetDefinitionStyle maDefaultButtonRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:231
-    vcl::WidgetDefinitionStyle maDefaultButtonRolloverTextColor class Color
+    vcl::WidgetDefinitionStyle maDefaultActionButtonRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:233
-    vcl::WidgetDefinitionStyle maDefaultActionButtonRolloverTextColor class Color
+    vcl::WidgetDefinitionStyle maFlatButtonRolloverTextColor Color
+vcl/inc/widgetdraw/WidgetDefinition.hxx:234
+    vcl::WidgetDefinitionStyle maDefaultButtonPressedRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:235
-    vcl::WidgetDefinitionStyle maFlatButtonRolloverTextColor class Color
+    vcl::WidgetDefinitionStyle maButtonPressedRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:236
-    vcl::WidgetDefinitionStyle maDefaultButtonPressedRolloverTextColor class Color
+    vcl::WidgetDefinitionStyle maDefaultActionButtonPressedRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:237
-    vcl::WidgetDefinitionStyle maButtonPressedRolloverTextColor class Color
+    vcl::WidgetDefinitionStyle maActionButtonPressedRolloverTextColor Color
 vcl/inc/widgetdraw/WidgetDefinition.hxx:238
-    vcl::WidgetDefinitionStyle maDefaultActionButtonPressedRolloverTextColor class Color
-vcl/inc/widgetdraw/WidgetDefinition.hxx:239
-    vcl::WidgetDefinitionStyle maActionButtonPressedRolloverTextColor class Color
-vcl/inc/widgetdraw/WidgetDefinition.hxx:240
-    vcl::WidgetDefinitionStyle maFlatButtonPressedRolloverTextColor class Color
-vcl/inc/WidgetThemeLibrary.hxx:21
-    vcl::WidgetDrawStyle maFaceColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:22
-    vcl::WidgetDrawStyle maCheckedColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:23
-    vcl::WidgetDrawStyle maLightColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:24
-    vcl::WidgetDrawStyle maLightBorderColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:25
-    vcl::WidgetDrawStyle maShadowColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:26
-    vcl::WidgetDrawStyle maDarkShadowColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:27
-    vcl::WidgetDrawStyle maDefaultButtonTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:28
-    vcl::WidgetDrawStyle maButtonTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:29
-    vcl::WidgetDrawStyle maDefaultActionButtonTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:30
-    vcl::WidgetDrawStyle maActionButtonTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:31
-    vcl::WidgetDrawStyle maFlatButtonTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:32
-    vcl::WidgetDrawStyle maDefaultButtonRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:33
-    vcl::WidgetDrawStyle maButtonRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:34
-    vcl::WidgetDrawStyle maDefaultActionButtonRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:35
-    vcl::WidgetDrawStyle maActionButtonRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:36
-    vcl::WidgetDrawStyle maFlatButtonRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:37
-    vcl::WidgetDrawStyle maDefaultButtonPressedRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:38
-    vcl::WidgetDrawStyle maButtonPressedRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:39
-    vcl::WidgetDrawStyle maDefaultActionButtonPressedRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:40
-    vcl::WidgetDrawStyle maActionButtonPressedRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:41
-    vcl::WidgetDrawStyle maFlatButtonPressedRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:42
-    vcl::WidgetDrawStyle maRadioCheckTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:43
-    vcl::WidgetDrawStyle maGroupTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:44
-    vcl::WidgetDrawStyle maLabelTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:45
-    vcl::WidgetDrawStyle maWindowColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:46
-    vcl::WidgetDrawStyle maWindowTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:47
-    vcl::WidgetDrawStyle maDialogColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:48
-    vcl::WidgetDrawStyle maDialogTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:49
-    vcl::WidgetDrawStyle maWorkspaceColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:50
-    vcl::WidgetDrawStyle maMonoColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:51
-    vcl::WidgetDrawStyle maFieldColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:52
-    vcl::WidgetDrawStyle maFieldTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:53
-    vcl::WidgetDrawStyle maFieldRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:54
-    vcl::WidgetDrawStyle maActiveColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:55
-    vcl::WidgetDrawStyle maActiveTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:56
-    vcl::WidgetDrawStyle maActiveBorderColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:57
-    vcl::WidgetDrawStyle maDeactiveColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:58
-    vcl::WidgetDrawStyle maDeactiveTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:59
-    vcl::WidgetDrawStyle maDeactiveBorderColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:60
-    vcl::WidgetDrawStyle maMenuColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:61
-    vcl::WidgetDrawStyle maMenuBarColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:62
-    vcl::WidgetDrawStyle maMenuBarRolloverColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:63
-    vcl::WidgetDrawStyle maMenuBorderColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:64
-    vcl::WidgetDrawStyle maMenuTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:65
-    vcl::WidgetDrawStyle maMenuBarTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:66
-    vcl::WidgetDrawStyle maMenuBarRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:67
-    vcl::WidgetDrawStyle maMenuBarHighlightTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:68
-    vcl::WidgetDrawStyle maMenuHighlightColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:69
-    vcl::WidgetDrawStyle maMenuHighlightTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:70
-    vcl::WidgetDrawStyle maHighlightColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:71
-    vcl::WidgetDrawStyle maHighlightTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:72
-    vcl::WidgetDrawStyle maActiveTabColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:73
-    vcl::WidgetDrawStyle maInactiveTabColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:74
-    vcl::WidgetDrawStyle maTabTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:75
-    vcl::WidgetDrawStyle maTabRolloverTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:76
-    vcl::WidgetDrawStyle maTabHighlightTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:77
-    vcl::WidgetDrawStyle maDisableColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:78
-    vcl::WidgetDrawStyle maHelpColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:79
-    vcl::WidgetDrawStyle maHelpTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:80
-    vcl::WidgetDrawStyle maLinkColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:81
-    vcl::WidgetDrawStyle maVisitedLinkColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:82
-    vcl::WidgetDrawStyle maToolTextColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:83
-    vcl::WidgetDrawStyle maFontColor uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:121
-    vcl::WidgetThemeLibrary_t isNativeControlSupported _Bool (*)(enum ControlType, enum ControlPart)
-vcl/inc/WidgetThemeLibrary.hxx:122
-    vcl::WidgetThemeLibrary_t getRegion _Bool (*)(enum ControlType, enum ControlPart, enum ControlState, const vcl::rectangle_t &, vcl::rectangle_t &, vcl::rectangle_t &)
-vcl/inc/WidgetThemeLibrary.hxx:126
-    vcl::WidgetThemeLibrary_t drawPushButton _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:128
-    vcl::WidgetThemeLibrary_t drawRadiobutton _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:130
-    vcl::WidgetThemeLibrary_t drawCheckbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:132
-    vcl::WidgetThemeLibrary_t drawCombobox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:134
-    vcl::WidgetThemeLibrary_t drawEditbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:136
-    vcl::WidgetThemeLibrary_t drawScrollbar _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:138
-    vcl::WidgetThemeLibrary_t drawSpinButtons _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:140
-    vcl::WidgetThemeLibrary_t drawSpinbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:142
-    vcl::WidgetThemeLibrary_t drawTabItem _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:144
-    vcl::WidgetThemeLibrary_t drawTabPane _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:146
-    vcl::WidgetThemeLibrary_t drawTabHeader _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:148
-    vcl::WidgetThemeLibrary_t drawTabBody _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:150
-    vcl::WidgetThemeLibrary_t drawSlider _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:152
-    vcl::WidgetThemeLibrary_t drawFixedline _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:154
-    vcl::WidgetThemeLibrary_t drawToolbar _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:156
-    vcl::WidgetThemeLibrary_t drawProgress _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:158
-    vcl::WidgetThemeLibrary_t drawWindowsBackground _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:160
-    vcl::WidgetThemeLibrary_t drawListbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:162
-    vcl::WidgetThemeLibrary_t drawFrame _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:164
-    vcl::WidgetThemeLibrary_t drawListNode _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:166
-    vcl::WidgetThemeLibrary_t drawListNet _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:168
-    vcl::WidgetThemeLibrary_t drawListHeader _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
-vcl/inc/WidgetThemeLibrary.hxx:171
-    vcl::WidgetThemeLibrary_t updateSettings _Bool (*)(struct vcl::WidgetDrawStyle &)
-vcl/source/app/settings.cxx:196
-    ImplStyleData maDialogStyle struct DialogStyle
+    vcl::WidgetDefinitionStyle maFlatButtonPressedRolloverTextColor Color
+vcl/source/app/settings.cxx:201
+    ImplStyleData maDialogStyle DialogStyle
 vcl/source/bitmap/dibtools.cxx:52
     (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
 vcl/source/bitmap/dibtools.cxx:53
@@ -907,90 +841,90 @@ vcl/source/bitmap/dibtools.cxx:53
 vcl/source/bitmap/dibtools.cxx:54
     (anonymous namespace)::CIEXYZ aXyzZ FXPT2DOT30
 vcl/source/bitmap/dibtools.cxx:65
-    (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ
+    (anonymous namespace)::CIEXYZTriple aXyzRed CIEXYZ
 vcl/source/bitmap/dibtools.cxx:66
-    (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ
+    (anonymous namespace)::CIEXYZTriple aXyzGreen CIEXYZ
 vcl/source/bitmap/dibtools.cxx:67
-    (anonymous namespace)::CIEXYZTriple aXyzBlue struct (anonymous namespace)::CIEXYZ
+    (anonymous namespace)::CIEXYZTriple aXyzBlue CIEXYZ
 vcl/source/bitmap/dibtools.cxx:107
-    (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5AlphaMask sal_uInt32
 vcl/source/bitmap/dibtools.cxx:108
-    (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5CSType sal_uInt32
 vcl/source/bitmap/dibtools.cxx:109
-    (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32
+    (anonymous namespace)::DIBV5Header aV5Endpoints CIEXYZTriple
 vcl/source/bitmap/dibtools.cxx:110
-    (anonymous namespace)::DIBV5Header nV5AlphaMask sal_uInt32
-vcl/source/bitmap/dibtools.cxx:112
-    (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple
-vcl/source/bitmap/dibtools.cxx:113
     (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32
-vcl/source/bitmap/dibtools.cxx:114
+vcl/source/bitmap/dibtools.cxx:111
     (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32
-vcl/source/bitmap/dibtools.cxx:115
+vcl/source/bitmap/dibtools.cxx:112
     (anonymous namespace)::DIBV5Header nV5GammaBlue sal_uInt32
-vcl/source/bitmap/dibtools.cxx:117
+vcl/source/bitmap/dibtools.cxx:113
+    (anonymous namespace)::DIBV5Header nV5Intent sal_uInt32
+vcl/source/bitmap/dibtools.cxx:114
     (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32
-vcl/source/bitmap/dibtools.cxx:118
+vcl/source/bitmap/dibtools.cxx:115
     (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
-vcl/source/bitmap/dibtools.cxx:119
+vcl/source/bitmap/dibtools.cxx:116
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/control/roadmapwizard.cxx:63
-    vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
-vcl/source/control/tabctrl.cxx:82
-    ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
+vcl/source/control/wizimpldata.hxx:88
+    vcl::RoadmapWizardImpl aStateDescriptors StateDescriptions
+vcl/source/filter/eps/eps.cxx:116
+    (anonymous namespace)::PSWriter pVDev ScopedVclPtrInstance<VirtualDevice>
+vcl/source/filter/idxf/dxf2mtf.hxx:53
+    DXF2GDIMetaFile aDefaultLineInfo const LineInfo
+vcl/source/filter/idxf/dxfreprd.hxx:74
+    DXFRepresentation aPalette DXFPalette
+vcl/source/filter/iras/iras.cxx:56
+    (anonymous namespace)::RASReader mnRepCount sal_uInt8
+vcl/source/filter/itga/itga.cxx:55
+    (anonymous namespace)::TGAFileFooter nSignature sal_uInt32[4]
 vcl/source/filter/jpeg/Exif.hxx:54
-    Exif::ExifIFD tag sal_uInt8 [2]
+    Exif::ExifIFD tag sal_uInt8[2]
 vcl/source/filter/jpeg/Exif.hxx:55
-    Exif::ExifIFD type sal_uInt8 [2]
+    Exif::ExifIFD type sal_uInt8[2]
 vcl/source/filter/jpeg/Exif.hxx:56
-    Exif::ExifIFD count sal_uInt8 [4]
+    Exif::ExifIFD count sal_uInt8[4]
 vcl/source/filter/jpeg/Exif.hxx:61
     Exif::TiffHeader byteOrder sal_uInt16
 vcl/source/filter/jpeg/transupp.h:132
-    (anonymous) slow_hflip boolean
+    jpeg_transform_info slow_hflip boolean
 vcl/source/filter/jpeg/transupp.h:144
-    (anonymous) crop_width_set JCROP_CODE
+    jpeg_transform_info crop_width_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:146
-    (anonymous) crop_height_set JCROP_CODE
+    jpeg_transform_info crop_height_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:148
-    (anonymous) crop_xoffset_set JCROP_CODE
+    jpeg_transform_info crop_xoffset_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:150
-    (anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/gdi/pdfwriter_impl.hxx:274
-    vcl::pdf::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
+    jpeg_transform_info crop_yoffset_set JCROP_CODE
 vcl/source/treelist/headbar.cxx:41
-    ImplHeadItem maHelpId class rtl::OString
+    ImplHeadItem maHelpId OString
 vcl/source/treelist/headbar.cxx:42
-    ImplHeadItem maImage class Image
+    ImplHeadItem maImage Image
 vcl/unx/gtk3/a11y/atkwrapper.hxx:51
-    AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk3/a11y/atkwrapper.hxx:79
+    AtkObjectWrapper aParent GtkWidgetAccessible
+vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk3/gtk3glomenu.cxx:14
+vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1653
-     out gpointer *
-writerfilter/source/ooxml/OOXMLFactory.hxx:57
-    writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t
-writerfilter/source/ooxml/OOXMLFactory.hxx:58
-    writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType
 writerfilter/source/ooxml/OOXMLFactory.hxx:59
+    writerfilter::ooxml::AttributeInfo m_nToken Token_t
+writerfilter/source/ooxml/OOXMLFactory.hxx:60
+    writerfilter::ooxml::AttributeInfo m_nResource ResourceType
+writerfilter/source/ooxml/OOXMLFactory.hxx:61
     writerfilter::ooxml::AttributeInfo m_nRef Id
-xmloff/inc/MultiPropertySetHelper.hxx:86
+xmloff/inc/MultiPropertySetHelper.hxx:85
     MultiPropertySetHelper aEmptyAny css::uno::Any
-xmloff/source/chart/SchXMLChartContext.cxx:443
-    (anonymous namespace)::NewDonutSeries msStyleName class rtl::OUString
-xmloff/source/chart/SchXMLChartContext.hxx:52
+xmloff/source/chart/SchXMLChartContext.cxx:447
+    (anonymous namespace)::NewDonutSeries msStyleName OUString
+xmloff/source/chart/SchXMLChartContext.hxx:51
     SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:53
+xmloff/source/chart/SchXMLChartContext.hxx:52
     SeriesDefaultsAndStyles maErrorCategoryDefault css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:54
+xmloff/source/chart/SchXMLChartContext.hxx:53
     SeriesDefaultsAndStyles maConstantErrorLowDefault css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:55
+xmloff/source/chart/SchXMLChartContext.hxx:54
     SeriesDefaultsAndStyles maConstantErrorHighDefault css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:56
+xmloff/source/chart/SchXMLChartContext.hxx:55
     SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:57
+xmloff/source/chart/SchXMLChartContext.hxx:56
     SeriesDefaultsAndStyles maErrorMarginDefault css::uno::Any
-xmloff/source/core/xmlexp.cxx:262
-    SvXMLExport_Impl maSaveOptions class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index ebea1b49599a..e2e869b05b89 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -1,199 +1,297 @@
-basctl/source/inc/dlged.hxx:122
+basctl/source/inc/dlged.hxx:121
     basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
 basic/qa/cppunit/basictest.hxx:27
-    MacroSnippet maDll class BasicDLL
+    MacroSnippet maDll BasicDLL
+basic/qa/cppunit/test_global_array.cxx:25
+    (anonymous namespace)::GlobalArrayTest lib BasicDLL
+basic/qa/cppunit/test_global_as_new.cxx:25
+    (anonymous namespace)::GlobalAsNewTest lib BasicDLL
 canvas/source/vcl/canvasbitmap.hxx:113
     vclcanvas::CanvasBitmap mxDevice css::uno::Reference<css::rendering::XGraphicDevice>
-canvas/source/vcl/impltools.hxx:114
-    vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
-chart2/source/controller/inc/RangeSelectionListener.hxx:61
-    chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
-chart2/source/inc/ModifyListenerCallBack.hxx:53
+canvas/source/vcl/impltools.hxx:119
+    vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
+chart2/source/controller/inc/dlg_DataEditor.hxx:55
+    chart::DataEditor m_xContext css::uno::Reference<css::uno::XComponentContext>
+chart2/source/controller/inc/RangeSelectionListener.hxx:65
+    chart::RangeSelectionListener m_aControllerLockGuard ControllerLockGuardUNO
+chart2/source/inc/ModifyListenerCallBack.hxx:52
     chart::ModifyListenerCallBack m_xModifyListener css::uno::Reference<css::util::XModifyListener>
 comphelper/source/container/enumerablemap.cxx:297
-    comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface>
-cppu/source/threadpool/threadpool.cxx:365
+    comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<XInterface>
+comphelper/source/misc/logging.cxx:41
+    comphelper::EventLogger_Impl m_aContext Reference<XComponentContext>
+connectivity/source/drivers/evoab2/EApi.h:121
+    EContactAddress address_format char *
+connectivity/source/drivers/evoab2/EApi.h:125
+    EContactAddress ext char *
+connectivity/source/drivers/mysqlc/mysqlc_view.hxx:65
+    connectivity::mysqlc::View m_xConnection css::uno::Reference<css::sdbc::XConnection>
+connectivity/source/drivers/postgresql/pq_statics.hxx:105
+    pq_sdbc_driver::ImplementationStatics types css::uno::Sequence<css::uno::Type>
+cppu/source/threadpool/threadpool.cxx:352
     _uno_ThreadPool dummy sal_Int32
-cppu/source/typelib/typelib.cxx:59
+cppu/source/typelib/typelib.cxx:57
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cui/source/inc/AdditionsDialog.hxx:47
-    AdditionInfo sReleaseVersion class rtl::OUString
-dbaccess/source/core/inc/databasecontext.hxx:84
-    dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
+    AdditionInfo sReleaseVersion OUString
+cui/source/inc/AdditionsDialog.hxx:74
+    AdditionsDialog m_xContentWindow std::unique_ptr<weld::ScrolledWindow>
+cui/source/inc/fileextcheckdlg.hxx:28
+    FileExtCheckDialog m_pText std::unique_ptr<weld::Label>
+cui/source/inc/fileextcheckdlg.hxx:29
+    FileExtCheckDialog m_pPerformCheck std::unique_ptr<weld::CheckButton>
+cui/source/inc/fileextcheckdlg.hxx:30
+    FileExtCheckDialog m_pOk std::unique_ptr<weld::Button>
+cui/source/options/optinet2.hxx:108
+    SvxSecurityTabPage m_xCertPathImg std::unique_ptr<weld::Widget>
+cui/source/options/optinet2.hxx:109
+    SvxSecurityTabPage m_xCertPathLabel std::unique_ptr<weld::Label>
+dbaccess/source/core/inc/databasecontext.hxx:82
+    dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
+dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2905
-      class AllSettings &
-emfio/source/emfuno/xemfparser.cxx:50
+embeddedobj/source/msole/olecomponent.hxx:50
+    OleComponent m_aMutex ::osl::Mutex
+embeddedobj/source/msole/olecomponent.hxx:51
+    OleComponent m_pInterfaceContainer comphelper::OMultiTypeInterfaceContainerHelper2 *
+embeddedobj/source/msole/olecomponent.hxx:53
+    OleComponent m_bDisposed _Bool
+embeddedobj/source/msole/olecomponent.hxx:54
+    OleComponent m_bModified _Bool
+embeddedobj/source/msole/olecomponent.hxx:55
+    OleComponent m_pNativeImpl OleComponentNative_Impl *
+embeddedobj/source/msole/olecomponent.hxx:57
+    OleComponent m_pUnoOleObject OleEmbeddedObject *
+embeddedobj/source/msole/olecomponent.hxx:58
+    OleComponent m_pOleWrapClientSite OleWrapperClientSite *
+embeddedobj/source/msole/olecomponent.hxx:59
+    OleComponent m_pImplAdviseSink OleWrapperAdviseSink *
+embeddedobj/source/msole/olecomponent.hxx:61
+    OleComponent m_nOLEMiscFlags sal_Int32
+embeddedobj/source/msole/olecomponent.hxx:62
+    OleComponent m_nAdvConn sal_Int32
+embeddedobj/source/msole/olecomponent.hxx:64
+    OleComponent m_aVerbList css::uno::Sequence<css::embed::VerbDescriptor>
+embeddedobj/source/msole/olecomponent.hxx:65
+    OleComponent m_aDataFlavors css::uno::Sequence<css::datatransfer::DataFlavor>
+embeddedobj/source/msole/olecomponent.hxx:67
+    OleComponent m_xContext css::uno::Reference<css::uno::XComponentContext>
+embeddedobj/source/msole/olecomponent.hxx:69
+    OleComponent m_bOleInitialized _Bool
+emfio/source/emfuno/xemfparser.cxx:49
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:43
     ScannerManager maProtector osl::Mutex
-helpcompiler/inc/HelpCompiler.hxx:201
+filter/source/xsltdialog/xmlfiltertabpagebasic.hxx:35
+    XMLFilterTabPageBasic m_xContainer std::unique_ptr<weld::Widget>
+filter/source/xsltdialog/xmlfiltertabpagexslt.hxx:45
+    XMLFilterTabPageXSLT m_xContainer std::unique_ptr<weld::Widget>
+helpcompiler/inc/HelpCompiler.hxx:200
     HelpCompiler lang const std::string
-include/basegfx/DrawCommands.hxx:142
+include/basegfx/DrawCommands.hxx:143
     gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo>
+include/comphelper/seqstream.hxx:75
+    comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8>
+include/docmodel/theme/FormatScheme.hxx:373
+    model::DashStop mnDashLength sal_Int32
+include/docmodel/theme/FormatScheme.hxx:374
+    model::DashStop mnStopLength sal_Int32
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
-    drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
-include/editeng/unotext.hxx:605
+    drawinglayer::primitive2d::TextLayouterDevice maSolarGuard SolarMutexGuard
+include/editeng/unotext.hxx:618
     SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
-include/LibreOfficeKit/LibreOfficeKitGtk.h:33
+include/filter/msfilter/svdfppt.hxx:546
+    ProcessData aBackgroundColoredObjects ::std::vector<rtl::Reference<SdrObject> >
+include/LibreOfficeKit/LibreOfficeKitGtk.h:40
     _LOKDocView aDrawingArea GtkDrawingArea
-include/LibreOfficeKit/LibreOfficeKitGtk.h:38
+include/LibreOfficeKit/LibreOfficeKitGtk.h:45
     _LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/vml/vmlshapecontext.hxx:115
+include/oox/vml/vmlshapecontext.hxx:116
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
 include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/msg.hxx:117
+include/sfx2/msg.hxx:116
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:119
+include/sfx2/msg.hxx:118
     SfxType0 nAttribs sal_uInt16
+include/sfx2/msg.hxx:131
+    SfxType1 aAttrib SfxTypeAttrib[1]
+include/sfx2/msg.hxx:131
+    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:131
+    SfxType1 nAttribs sal_uInt16
+include/sfx2/msg.hxx:131
+    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
-    SfxType1 aAttrib struct SfxTypeAttrib [1]
+    SfxType2 aAttrib SfxTypeAttrib[2]
 include/sfx2/msg.hxx:132
-    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
-    SfxType1 nAttribs sal_uInt16
+    SfxType2 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
-    SfxType2 aAttrib struct SfxTypeAttrib [2]
+    SfxType3 aAttrib SfxTypeAttrib[3]
 include/sfx2/msg.hxx:133
-    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
-    SfxType2 nAttribs sal_uInt16
+    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
+    SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:134
-    SfxType3 aAttrib struct SfxTypeAttrib [3]
+    SfxType4 aAttrib SfxTypeAttrib[4]
 include/sfx2/msg.hxx:134
-    SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
+    SfxType4 nAttribs sal_uInt16
 include/sfx2/msg.hxx:134
-    SfxType3 pType const std::type_info *
+    SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:135
-    SfxType4 aAttrib struct SfxTypeAttrib [4]
+    SfxType5 aAttrib SfxTypeAttrib[5]
 include/sfx2/msg.hxx:135
-    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
-    SfxType4 nAttribs sal_uInt16
+    SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
-    SfxType4 pType const std::type_info *
+    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:136
-    SfxType5 aAttrib struct SfxTypeAttrib [5]
+    SfxType6 aAttrib SfxTypeAttrib[6]
 include/sfx2/msg.hxx:136
-    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:136
-    SfxType5 nAttribs sal_uInt16
+    SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 pType const std::type_info *
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
-    SfxType6 aAttrib struct SfxTypeAttrib [6]
+    SfxType7 aAttrib SfxTypeAttrib[7]
 include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:137
-    SfxType6 nAttribs sal_uInt16
+    SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
+    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:138
-    SfxType7 aAttrib struct SfxTypeAttrib [7]
+    SfxType8 aAttrib SfxTypeAttrib[8]
 include/sfx2/msg.hxx:138
-    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:138
-    SfxType7 nAttribs sal_uInt16
+    SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
+    SfxType8 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
+    SfxType10 aAttrib SfxTypeAttrib[10]
 include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:139
-    SfxType8 nAttribs sal_uInt16
+    SfxType10 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
-    SfxType8 pType const std::type_info *
-include/sfx2/msg.hxx:140
-    SfxType10 aAttrib struct SfxTypeAttrib [10]
-include/sfx2/msg.hxx:140
-    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType10 pType const std::type_info *
 include/sfx2/msg.hxx:140
-    SfxType10 nAttribs sal_uInt16
+    SfxType11 aAttrib SfxTypeAttrib[11]
 include/sfx2/msg.hxx:140
-    SfxType10 pType const std::type_info *
-include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
-include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 pType const std::type_info *
+include/sfx2/msg.hxx:142
+    SfxType13 aAttrib SfxTypeAttrib[13]
+include/sfx2/msg.hxx:142
+    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:142
+    SfxType13 nAttribs sal_uInt16
+include/sfx2/msg.hxx:142
+    SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:143
-    SfxType13 aAttrib struct SfxTypeAttrib [13]
+    SfxType14 aAttrib SfxTypeAttrib[14]
 include/sfx2/msg.hxx:143
-    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:143
-    SfxType13 nAttribs sal_uInt16
+    SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
-    SfxType13 pType const std::type_info *
+    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
-    SfxType14 aAttrib struct SfxTypeAttrib [14]
+    SfxType16 aAttrib SfxTypeAttrib[16]
 include/sfx2/msg.hxx:144
-    SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:144
-    SfxType14 nAttribs sal_uInt16
+    SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
+    SfxType16 pType const std::type_info *
 include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
+    SfxType17 aAttrib SfxTypeAttrib[17]
 include/sfx2/msg.hxx:145
-    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 nAttribs sal_uInt16
+    SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
-    SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
-    SfxType17 aAttrib struct SfxTypeAttrib [17]
-include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:146
-    SfxType17 nAttribs sal_uInt16
+    SfxType23 aAttrib SfxTypeAttrib[23]
 include/sfx2/msg.hxx:146
-    SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:147
-    SfxType23 aAttrib struct SfxTypeAttrib [23]
-include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 nAttribs sal_uInt16
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 pType const std::type_info *
+include/svtools/genericasyncunodialog.hxx:54
+    svt::OGenericUnoAsyncDialog::UnoAsyncDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/genericunodialog.hxx:154
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/unoevent.hxx:162
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
+include/svx/dialog/ThemeColorEditDialog.hxx:23
+    svx::ThemeColorEditDialog maColorSet model::ColorSet
 include/svx/imapdlg.hxx:91
-    SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/unotest/macros_test.hxx:86
+    SvxIMapDlg aIMapItem SvxIMapDlgItem
+include/tools/inetstrm.hxx:40
+    INetMIMEMessageStream pMsgStrm std::unique_ptr<SvStream>
+include/unotest/macros_test.hxx:113
     unotest::MacrosTest mpDll std::unique_ptr<BasicDLL>
-include/vcl/commandevent.hxx:310
-    CommandGestureData mfX const double
-include/vcl/commandevent.hxx:311
-    CommandGestureData mfY const double
-include/vcl/commandevent.hxx:315
-    CommandGestureData meOrientation const enum PanningOrientation
-include/vcl/filter/PngImageReader.hxx:31
+include/vcl/commandevent.hxx:317
+    CommandGesturePanData mfX const double
+include/vcl/commandevent.hxx:318
+    CommandGesturePanData mfY const double
+include/vcl/commandevent.hxx:321
+    CommandGesturePanData meOrientation const PanningOrientation
+include/vcl/commandevent.hxx:336
+    CommandGestureZoomData mfX const double
+include/vcl/commandevent.hxx:337
+    CommandGestureZoomData mfY const double
+include/vcl/commandevent.hxx:352
+    CommandGestureRotateData mfX const double
+include/vcl/commandevent.hxx:353
+    CommandGestureRotateData mfY const double
+include/vcl/commandevent.hxx:354
+    CommandGestureRotateData meEventType const GestureEventRotateType
+include/vcl/commandevent.hxx:355
+    CommandGestureRotateData mfAngleDelta const double
+include/vcl/filter/PngImageReader.hxx:52
     vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
-include/vcl/font/Feature.hxx:100
-    vcl::font::Feature m_eType enum vcl::font::FeatureType
-include/vcl/pdf/PDFAnnotationMarker.hxx:65
-    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
-include/vcl/uitest/uiobject.hxx:283
-    TabPageUIObject mxTabPage VclPtr<class TabPage>
+include/vcl/filter/PngImageWriter.hxx:32
+    vcl::PngImageWriter mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
+include/vcl/GestureEventRotate.hxx:25
+    GestureEventRotate mnX sal_Int32
+include/vcl/GestureEventRotate.hxx:26
+    GestureEventRotate mnY sal_Int32
+include/vcl/GestureEventRotate.hxx:28
+    GestureEventRotate meEventType GestureEventRotateType
+include/vcl/GestureEventRotate.hxx:32
+    GestureEventRotate mfAngleDelta double
+include/vcl/GestureEventZoom.hxx:25
+    GestureEventZoom mnX sal_Int32
+include/vcl/GestureEventZoom.hxx:26
+    GestureEventZoom mnY sal_Int32
+include/vcl/GestureEventZoom.hxx:28
+    GestureEventZoom meEventType GestureEventZoomType
+include/vcl/GestureEventZoom.hxx:32
+    GestureEventZoom mfScaleDelta double
+include/vcl/pdf/PDFAnnotationMarker.hxx:67
+    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType PDFTextMarkerType
+include/vcl/uitest/uiobject.hxx:309
+    TabPageUIObject mxTabPage VclPtr<TabPage>
 include/xmloff/formlayerexport.hxx:172
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
-include/xmloff/xmltkmap.hxx:38
-    SvXMLTokenMapEntry nFastToken sal_Int32
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
     GtvApplicationWindow parent_instance GtkApplicationWindow
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
@@ -218,40 +316,46 @@ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:33
     GtvLokDialogClass parentClass GtkDialogClass
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:28
     GtvMainToolbar parent GtkBox
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:38
     GtvMainToolbarClass parentClass GtkBoxClass
-lingucomponent/source/languageguessing/simpleguesser.cxx:81
+lingucomponent/source/languageguessing/simpleguesser.cxx:75
     (anonymous namespace)::textcat_t maxsize uint4
-lingucomponent/source/languageguessing/simpleguesser.cxx:83
-    (anonymous namespace)::textcat_t output char [1024]
+lingucomponent/source/languageguessing/simpleguesser.cxx:77
+    (anonymous namespace)::textcat_t output char[1024]
 lotuswordpro/source/filter/clone.hxx:23
-    detail::has_clone::(anonymous) a char [2]
+    detail::has_clone::no a char[2]
 pyuno/source/module/pyuno_callable.cxx:45
     pyuno::(anonymous namespace)::PyUNO_callable ob_base PyObject
-pyuno/source/module/pyuno_impl.hxx:138
-    pyuno::(anonymous) ob_base PyObject
-pyuno/source/module/pyuno_impl.hxx:238
+pyuno/source/module/pyuno_impl.hxx:137
+    pyuno::PyUNO ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:151
+    pyuno::PyUNO_iterator ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:166
+    pyuno::PyUNO_list_iterator ob_base PyObject
+pyuno/source/module/pyuno_impl.hxx:237
     pyuno::stRuntimeImpl ob_base PyObject
 reportdesign/source/ui/inc/ReportWindow.hxx:52
     rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
-sal/qa/osl/condition/osl_Condition.cxx:72
+sal/qa/osl/condition/osl_Condition.cxx:78
     osl_Condition::ctors bRes1 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:202
+sal/qa/osl/condition/osl_Condition.cxx:208
     osl_Condition::wait bRes2 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:273
+sal/qa/osl/condition/osl_Condition.cxx:279
     osl_Condition::check bRes2 _Bool
-sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:3417
-    osl_File::setAttributes rItem_hidden class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1383
+    osl_FileStatus::isValid rItem_link DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1560
+    osl_FileStatus::getFileType m_aFifoItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1560
+    osl_FileStatus::getFileType m_aVolumeItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aLinkItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aSocketItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1561
+    osl_FileStatus::getFileType m_aSpecialItem DirectoryItem
+sal/qa/osl/file/osl_File.cxx:2053
+    osl_FileStatus::getLinkTargetURL rItem DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
     osl_Module::ctors bRes1 _Bool
 sal/qa/osl/module/osl_Module.cxx:114
@@ -262,171 +366,219 @@ sal/qa/osl/module/osl_Module.cxx:201
     osl_Module::unload bRes1 _Bool
 sal/qa/osl/module/osl_Module.cxx:342
     osl_Module::getFunctionSymbol bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:358
+sal/qa/osl/pipe/osl_Pipe.cxx:353
     osl_Pipe::clear bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
+sal/qa/osl/pipe/osl_Pipe.cxx:518
     osl_Pipe::getError bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
+sal/qa/osl/pipe/osl_Pipe.cxx:518
     osl_Pipe::getError bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:561
+sal/qa/osl/pipe/osl_Pipe.cxx:556
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
+sal/qa/osl/pipe/osl_Pipe.cxx:843
     osl_StreamPipe::recv bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
+sal/qa/osl/pipe/osl_Pipe.cxx:843
     osl_StreamPipe::recv bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:59
+sal/qa/osl/security/osl_Security.cxx:57
     osl_Security::ctors bRes _Bool
-sal/qa/osl/security/osl_Security.cxx:59
+sal/qa/osl/security/osl_Security.cxx:57
     osl_Security::ctors bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:124
+sal/qa/osl/security/osl_Security.cxx:122
     osl_Security::getUserIdent bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:154
+sal/qa/osl/security/osl_Security.cxx:152
     osl_Security::getUserName bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:188
+sal/qa/osl/security/osl_Security.cxx:186
     osl_Security::getConfigDir bRes1 _Bool
-sc/source/core/data/document.cxx:1240
+sc/inc/editutil.hxx:111
+    ScEnginePoolHelper pEnginePool rtl::Reference<SfxItemPool>
+sc/inc/editutil.hxx:113
+    ScEnginePoolHelper bDeleteEnginePool _Bool
+sc/inc/mtvelements.hxx:171
+    sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator
+sc/inc/patattr.hxx:117
+    ScPatternAttr m_nSerialNumber sal_uInt32
+sc/inc/SolverSettings.hxx:168
+    sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString>
+sc/source/core/data/document.cxx:1234
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1241
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
-sc/source/filter/html/htmlpars.cxx:3018
-    (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3019
-    (anonymous namespace)::CSSHandler::MemStr mn size_t
-sc/source/filter/inc/sheetdatacontext.hxx:51
-    oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:455
+sc/source/core/data/document.cxx:1235
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
+sc/source/filter/inc/sheetdatacontext.hxx:50
+    oox::xls::SheetDataContext aReleaser SolarMutexReleaser
+sc/source/ui/inc/docsh.hxx:457
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
-sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
-    ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
-sd/source/ui/animations/CustomAnimationList.hxx:124
-    sd::CustomAnimationList maDropTargetHelper class sd::CustomAnimationListDropTarget
-sd/source/ui/inc/sdtreelb.hxx:73
-    SdPageObjsTLV m_xDropTargetHelper std::unique_ptr<SdPageObjsTLVDropTarget>
-sd/source/ui/remotecontrol/ZeroconfService.hxx:32
+sc/source/ui/inc/PivotLayoutTreeListBase.hxx:47
+    ScPivotLayoutTreeListBase maDropTargetHelper ScPivotLayoutTreeDropTarget
+sd/source/ui/inc/CustomAnimationList.hxx:127
+    sd::CustomAnimationList maDropTargetHelper CustomAnimationListDropTarget
+sd/source/ui/inc/custsdlg.hxx:68
+    SdDefineCustomShowDlg m_xDropTargetHelper std::unique_ptr<weld::ReorderingDropTarget>
+sd/source/ui/inc/TableDesignPane.hxx:116
+    sd::TableDesignPane m_xImpl std::unique_ptr<TableDesignWidget>
+sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
-sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
+sd/source/ui/slidesorter/view/SlsLayouter.cxx:63
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
-sd/source/ui/view/DocumentRenderer.cxx:1340
+sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1168
+sd/source/ui/view/viewshel.cxx:1200
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1169
+sd/source/ui/view/viewshel.cxx:1201
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1170
+sd/source/ui/view/viewshel.cxx:1202
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1171
+sd/source/ui/view/viewshel.cxx:1203
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sd/source/ui/view/ViewShellBase.cxx:188
+sd/source/ui/view/ViewShellBase.cxx:190
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:269
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
-sfx2/inc/autoredactdialog.hxx:94
-    SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/inc/sidebar/TitleBar.hxx:56
-    sfx2::sidebar::TitleBar mxToolBoxController std::unique_ptr<ToolbarUnoDispatcher>
+sfx2/inc/autoredactdialog.hxx:99
+    SfxAutoRedactDialog m_xDocShell SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:46
-    SfxModelessDialog_Impl aMoveIdle class Idle
-sfx2/source/doc/doctempl.cxx:104
-    DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
+    SfxModelessDialog_Impl aMoveIdle Idle
+sfx2/source/doc/doctempl.cxx:105
+    DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell SfxObjectShellLock
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+sfx2/source/inc/templdgi.hxx:92
+    SfxCommonTemplateDialog_Impl m_aStyleListUpdateFamily Link<void *, void>
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats x GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats y GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats z GLfloat
-starmath/inc/smmod.hxx:70
-    SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
-starmath/inc/view.hxx:216
-    SmViewShell maGraphicController class SmGraphicController
-starmath/source/accessibility.hxx:270
-    SmEditSource rEditAcc class SmEditAccessible &
-svl/source/crypto/cryptosign.cxx:122
+starmath/inc/mathml/mathmlMo.hxx:64
+    moOperatorData m_motxt OUString
+starmath/inc/mathml/mathmlMo.hxx:65
+    moOperatorData m_form moOpDF
+starmath/inc/mathml/mathmlMo.hxx:66
+    moOperatorData m_priority sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:67
+    moOperatorData m_lspace sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:68
+    moOperatorData m_rspace sal_uInt16
+starmath/inc/mathml/mathmlMo.hxx:69
+    moOperatorData m_properties moOpDP
+starmath/inc/view.hxx:252
+    SmViewShell maGraphicController SmGraphicController
+svl/source/crypto/cryptosign.cxx:115
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:123
+svl/source/crypto/cryptosign.cxx:116
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:124
+svl/source/crypto/cryptosign.cxx:117
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:282
+svl/source/crypto/cryptosign.cxx:275
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:283
+svl/source/crypto/cryptosign.cxx:276
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
+svtools/source/filter/exportdialog.hxx:124
+    ExportDialog mxEncoding std::unique_ptr<weld::Widget>
 svx/source/dialog/contimp.hxx:75
-    SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/weldeditview.cxx:371
-    (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/inc/datanavi.hxx:190
-    svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
-svx/source/tbxctrls/layctrl.cxx:434
+    SvxSuperContourDlg aContourItem SvxContourDlgItem
+svx/source/dialog/weldeditview.cxx:457
+    (anonymous namespace)::WeldEditSource m_rEditAcc WeldEditAccessible &
+svx/source/inc/datanavi.hxx:194
+    svxform::XFormsPage m_aDropHelper DataTreeDropTarget
+svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx:41
+    svx::sidebar::FontworkPropertyPanel m_xToolbar std::unique_ptr<ToolbarUnoDispatcher>
+svx/source/svdraw/svdmodel.cxx:92
+    SdrModelImpl mpThemeColorChanger std::shared_ptr<svx::IThemeColorChanger>
+svx/source/tbxctrls/layctrl.cxx:431
     (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
-sw/inc/tox.hxx:59
-    sw::FindContentFrameHint m_isReadOnlyAvailable const _Bool
-sw/source/core/crsr/crbm.cxx:64
-    (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
-sw/source/core/frmedt/fetab.cxx:75
+sw/qa/extras/uiwriter/uiwriter5.cxx:67
+    SwUiWriterTest5 m_aSavedSettings AllSettings
+sw/source/core/crsr/crbm.cxx:62
+    (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
+sw/source/core/frmedt/fetab.cxx:80
     (anonymous namespace)::TableWait m_pWait const std::unique_ptr<SwWait>
-sw/source/core/layout/dbg_lay.cxx:179
-    SwImplEnterLeave m_nAction enum DbgAction
+sw/source/core/inc/ftnboss.hxx:34
+    SwSaveFootnoteHeight aGuard SwFrameDeleteGuard
+sw/source/core/inc/pamtyp.hxx:79
+    SwMoveFnCollection fnNds GoNds
+sw/source/core/layout/dbg_lay.cxx:181
+    SwImplEnterLeave m_nAction DbgAction
+sw/source/ui/envelp/swuilabimp.hxx:32
+    SwLabPage m_xAddressFrame std::unique_ptr<weld::Widget>
 sw/source/uibase/inc/condedit.hxx:43
-    ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:300
-    SwGlobalTree m_aDropTargetHelper class SwGlobalTreeDropTarget
-sw/source/uibase/inc/swuicnttab.hxx:240
-    SwTokenWindow m_aAdjustPositionsIdle class Idle
-sw/source/uibase/inc/uivwimp.hxx:93
-    SwView_Impl xTmpSelDocSh class SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:45
-    SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard class SolarMutexGuard
-toolkit/source/awt/stylesettings.cxx:94
-    toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard class SolarMutexGuard
-unoidl/source/unoidlprovider.cxx:673
+    ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
+sw/source/uibase/inc/conttree.hxx:334
+    SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
+sw/source/uibase/inc/frmpage.hxx:94
+    SwFramePage m_xAnchorFrame std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/insfnote.hxx:38
+    SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/mailmrge.hxx:72
+    SwMailMergeDlg m_xSingleJobsCB std::unique_ptr<weld::CheckButton>
+sw/source/uibase/inc/num.hxx:47
+    SwNumPositionTabPage m_xPositionFrame std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/pagenumberdlg.hxx:31
+    SwPageNumberDlg m_xCancel std::unique_ptr<weld::Button>
+sw/source/uibase/inc/swuicnttab.hxx:243
+    SwTokenWindow m_aAdjustPositionsIdle Idle
+sw/source/uibase/inc/titlepage.hxx:34
+    SwTitlePageDlg m_xInsertNewPagesRB std::unique_ptr<weld::RadioButton>
+sw/source/uibase/inc/uivwimp.hxx:95
+    SwView_Impl m_xTmpSelDocShell SfxObjectShellLock
+sw/source/uibase/inc/unodispatch.hxx:43
+    SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard SolarMutexGuard
+sw/source/uibase/sidebar/ThemePanel.hxx:41
+    sw::sidebar::ThemePanel mxListBoxFonts std::unique_ptr<weld::TreeView>
+toolkit/source/awt/stylesettings.cxx:74
+    toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard SolarMutexGuard
+unoidl/source/unoidlprovider.cxx:675
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider>
-unoidl/source/unoidlprovider.cxx:674
+unoidl/source/unoidlprovider.cxx:676
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
-vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
-    Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
-vcl/inc/salprn.hxx:45
-    SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
-vcl/inc/WidgetThemeLibrary.hxx:100
-    vcl::ControlDrawParameters nSize uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:101
-    vcl::ControlDrawParameters pCairo vcl::ControlDrawParameters::cairo_t *
-vcl/inc/WidgetThemeLibrary.hxx:102
-    vcl::ControlDrawParameters ePart enum ControlPart
-vcl/inc/WidgetThemeLibrary.hxx:103
-    vcl::ControlDrawParameters eState enum ControlState
-vcl/inc/WidgetThemeLibrary.hxx:119
-    vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/gdi/jobset.cxx:37
-    (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:38
-    (anonymous namespace)::ImplOldJobSetupData cPortName char [32]
-vcl/source/gdi/pdfbuildin_fonts.hxx:32
+uui/source/iahndl.hxx:64
+    InteractionHandlerData ServiceName OUString
+uui/source/openlocked.hxx:36
+    vcl::OpenLockedQueryBox mxQuestionMarkImage std::unique_ptr<weld::Image>
+vcl/inc/jsdialog/jsdialogbuilder.hxx:728
+    JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
+vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
-vcl/source/gdi/pdfbuildin_fonts.hxx:33
+vcl/inc/pdf/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
-vcl/source/gdi/pdfbuildin_fonts.hxx:40
-    vcl::pdf::BuildinFont m_aWidths const int [256]
-vcl/source/graphic/VectorGraphicSearch.cxx:205
-    VectorGraphicSearch::Implementation mpPDFium std::shared_ptr<vcl::pdf::PDFium>
-vcl/source/uitest/uno/uitest_uno.cxx:34
-    (anonymous namespace)::UITestUnoObj mpUITest std::unique_ptr<UITest>
-vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
+vcl/inc/pdf/pdfbuildin_fonts.hxx:42
+    vcl::pdf::BuildinFont m_aWidths const int[256]
+vcl/inc/salprn.hxx:48
+    SalPrinterQueueInfo moPortName std::optional<OUString>
+vcl/inc/sft.hxx:178
+    vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
+vcl/inc/skia/zone.hxx:29
+    SkiaZone g SolarMutexGuard
+vcl/source/app/salvtables.cxx:246
+    SalFlashAttention m_aOrigBackground Wallpaper
+vcl/source/fontsubset/ttcr.hxx:40
+    vcl::longHorMetrics aw sal_uInt16
+vcl/source/fontsubset/ttcr.hxx:41
+    vcl::longHorMetrics lsb sal_Int16
+vcl/source/gdi/jobset.cxx:39
+    (anonymous namespace)::ImplOldJobSetupData cDeviceName char[32]
+vcl/source/gdi/jobset.cxx:40
+    (anonymous namespace)::ImplOldJobSetupData cPortName char[32]
+vcl/source/graphic/BinaryDataContainer.cxx:111
+    (anonymous namespace)::ReferencedMemoryStream mpData std::shared_ptr<std::vector<sal_uInt8> >
+vcl/source/graphic/BinaryDataContainer.cxx:123
+    (anonymous namespace)::ReferencedXInputStream mpData std::shared_ptr<std::vector<sal_uInt8> >
+vcl/unx/generic/print/prtsetup.hxx:71
+    RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
+vcl/unx/generic/print/prtsetup.hxx:107
+    RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
+vcl/unx/gtk3/a11y/atkhypertext.cxx:31
     (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
-vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
+vcl/unx/gtk3/customcellrenderer.hxx:19
+    _CustomCellRenderer parent GtkCellRendererText
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    CustomCellRendererClass parent_class GtkCellRendererTextClass
+vcl/unx/gtk3/gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:5306
-    (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5450
-    (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5458
-    (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
-writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42
+writerfilter/source/ooxml/OOXMLStreamImpl.hxx:41
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
-xmlsecurity/qa/unit/signing/signing2.cxx:42
-    SigningTest2 mxSEInitializer uno::Reference<xml::crypto::XSEInitializer>
-xmlsecurity/qa/unit/signing/signing2.cxx:43
-    SigningTest2 mxSecurityContext uno::Reference<xml::crypto::XXMLSecurityContext>
+xmloff/inc/XMLThemeContext.hxx:47
+    XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color>
+xmlscript/source/xmldlg_imexp/imp_share.hxx:537
+    xmlscript::BulletinBoardElement mxDialogImport rtl::Reference<DialogImport>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 08a42aded279..a2110d149d2c 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1,37 +1,41 @@
-basctl/source/basicide/moduldlg.hxx:135
+basctl/source/basicide/moduldlg.hxx:134
     basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget>
-basctl/source/inc/basidesh.hxx:87
-    basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
+basctl/source/inc/basidesh.hxx:98
+    basctl::Shell m_aNotifier DocumentEventNotifier
 basctl/source/inc/bastype2.hxx:182
-    basctl::SbTreeListBox m_aNotifier class basctl::DocumentEventNotifier
+    basctl::SbTreeListBox m_aNotifier DocumentEventNotifier
+basctl/source/inc/colorscheme.hxx:29
+    basctl::ColorScheme m_sSchemeName OUString
+basctl/source/inc/colorscheme.hxx:30
+    basctl::ColorScheme m_bIsDefault _Bool
 basctl/source/inc/IDEComboBox.hxx:113
-    basctl::DocListenerBox maNotifier class basctl::DocumentEventNotifier
+    basctl::DocListenerBox maNotifier DocumentEventNotifier
 basegfx/source/polygon/b2dpolygontriangulator.cxx:113
     basegfx::(anonymous namespace)::Triangulator maNewEdgeEntries std::vector<std::unique_ptr<EdgeEntry> >
 basic/qa/cppunit/test_scanner.cxx:24
     (anonymous namespace)::Symbol line sal_uInt16
 basic/qa/cppunit/test_scanner.cxx:25
     (anonymous namespace)::Symbol col1 sal_uInt16
-basic/source/inc/runtime.hxx:252
+basic/source/inc/runtime.hxx:254
     SbiRuntime aRefSaved std::vector<SbxVariableRef>
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:56
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:54
     Data pMethod sal_uInt64
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:57
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:55
     Data pStack sal_uInt64 *
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:58
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:56
     Data nStack sal_uInt32
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:59
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:57
     Data pGPR sal_uInt64 *
-bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:60
+bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:58
     Data pFPR double *
-bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx:438
-    bridges::cpp_uno::shared::VtableFactory::Slot fn void *
+bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx:447
+    bridges::cpp_uno::shared::VtableFactory::Slot fn const void *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:130
     __cxxabiv1::__cxa_exception unexpectedHandler void (*)(void)
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:131
     __cxxabiv1::__cxa_exception terminateHandler std::terminate_handler
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:132
-    __cxxabiv1::__cxa_exception nextException struct __cxxabiv1::__cxa_exception *
+    __cxxabiv1::__cxa_exception nextException __cxa_exception *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:133
     __cxxabiv1::__cxa_exception handlerCount int
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:134
@@ -54,283 +58,401 @@ bridges/source/jni_uno/jni_java2uno.cxx:153
     jni_uno::(anonymous namespace)::largest p void *
 bridges/source/jni_uno/jni_java2uno.cxx:154
     jni_uno::(anonymous namespace)::largest a uno_Any
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex a float
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex b float
-canvas/inc/rendering/irendermodule.hxx:35
+canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex g float
-canvas/inc/rendering/irendermodule.hxx:35
-    canvas::Vertex r float
 canvas/inc/rendering/irendermodule.hxx:36
+    canvas::Vertex r float
+canvas/inc/rendering/irendermodule.hxx:37
     canvas::Vertex u float
-canvas/inc/rendering/irendermodule.hxx:36
-    canvas::Vertex v float
 canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex v float
+canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex x float
-canvas/inc/rendering/irendermodule.hxx:37
+canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex y float
-canvas/inc/rendering/irendermodule.hxx:37
+canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex z float
-canvas/source/cairo/cairo_canvasbitmap.hxx:119
+canvas/source/cairo/cairo_canvasbitmap.hxx:118
     cairocanvas::CanvasBitmap mpBufferCairo ::cairo::CairoSharedPtr
 canvas/source/cairo/cairo_spritedevicehelper.hxx:73
     cairocanvas::SpriteDeviceHelper mbFullScreen _Bool
 canvas/source/cairo/cairo_spritehelper.hxx:98
     cairocanvas::SpriteHelper mbTextureDirty _Bool
-chart2/inc/ChartModel.hxx:143
+chart2/inc/ChartModel.hxx:153
     chart::ChartModel m_aGraphicObjectVector std::vector<GraphicObject>
-chart2/inc/ChartModel.hxx:473
+chart2/inc/ChartModel.hxx:485
     chart::ChartModel mnStart sal_Int32
-chart2/inc/ChartModel.hxx:474
+chart2/inc/ChartModel.hxx:486
     chart::ChartModel mnEnd sal_Int32
-chart2/source/controller/dialogs/DialogModel.cxx:173
-    (anonymous namespace)::lcl_DataSeriesContainerAppend m_rDestCnt (anonymous namespace)::lcl_DataSeriesContainerAppend::tContainerType *
-chart2/source/controller/dialogs/DialogModel.cxx:232
-    (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt (anonymous namespace)::lcl_RolesWithRangeAppend::tContainerType *
-chart2/source/controller/inc/ChartController.hxx:413
+chart2/source/controller/dialogs/DialogModel.cxx:179
+    (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt tContainerType *
+chart2/source/controller/inc/ChartController.hxx:414
     chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper>
+chart2/source/controller/inc/dlg_ChartType_UNO.hxx:62
+    chart::ChartTypeUnoDlg m_xChartModel rtl::Reference< ::chart::ChartModel>
 chart2/source/controller/inc/dlg_View3D.hxx:53
     chart::View3DDialog m_xIllumination std::unique_ptr<ThreeD_SceneIllumination_TabPage>
 chart2/source/controller/main/ElementSelector.hxx:37
     chart::ListBoxEntryData nHierarchyDepth sal_Int32
 chart2/source/inc/MediaDescriptorHelper.hxx:71
     apphelper::MediaDescriptorHelper ReadOnly _Bool
-chart2/source/view/charttypes/PieChart.hxx:128
+chart2/source/view/charttypes/PieChart.hxx:140
     chart::PieChart::PieLabelInfo fValue double
 codemaker/source/cppumaker/dependencies.hxx:108
     codemaker::cppumaker::Dependencies m_voidDependency _Bool
 codemaker/source/javamaker/classfile.cxx:508
-     floatBytes float
+    (unnamed union at /home/noel/libo-plugin/codemaker/source/javamaker/classfile.cxx:508:5) floatBytes float
 codemaker/source/javamaker/classfile.cxx:540
-     doubleBytes double
+    (unnamed union at /home/noel/libo-plugin/codemaker/source/javamaker/classfile.cxx:540:5) doubleBytes double
 comphelper/qa/container/comphelper_ifcontainer.cxx:44
-    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const
+    (anonymous namespace)::ContainerListener m_pStats ContainerStats *const
 comphelper/qa/unit/parallelsorttest.cxx:44
     ParallelSortTest mnThreads size_t
-comphelper/source/misc/asyncnotification.cxx:86
+comphelper/source/misc/asyncnotification.cxx:69
     comphelper::EventNotifierImpl pKeepThisAlive std::shared_ptr<AsyncEventNotifierAutoJoin>
-configmgr/source/components.cxx:162
+configmgr/source/components.cxx:164
     configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> *
+connectivity/source/drivers/evoab2/NConnection.hxx:53
+    connectivity::evoab::OEvoabConnection m_aPassword OString
+connectivity/source/drivers/postgresql/pq_statics.hxx:142
+    pq_sdbc_driver::Statics NO_NULLS OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:143
+    pq_sdbc_driver::Statics NULABLE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:144
+    pq_sdbc_driver::Statics NULLABLE_UNKNOWN OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:145
+    pq_sdbc_driver::Statics SELECT OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:146
+    pq_sdbc_driver::Statics UPDATE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:147
+    pq_sdbc_driver::Statics INSERT OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:148
+    pq_sdbc_driver::Statics DELETE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:149
+    pq_sdbc_driver::Statics RULE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:150
+    pq_sdbc_driver::Statics REFERENCES OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:151
+    pq_sdbc_driver::Statics TRIGGER OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:152
+    pq_sdbc_driver::Statics EXECUTE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:153
+    pq_sdbc_driver::Statics USAGE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:154
+    pq_sdbc_driver::Statics CREATE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:155
+    pq_sdbc_driver::Statics TEMPORARY OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:188
+    pq_sdbc_driver::Statics KEY_COLUMN OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:194
+    pq_sdbc_driver::Statics CURSOR_NAME OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:195
+    pq_sdbc_driver::Statics ESCAPE_PROCESSING OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:196
+    pq_sdbc_driver::Statics FETCH_DIRECTION OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:197
+    pq_sdbc_driver::Statics FETCH_SIZE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:198
+    pq_sdbc_driver::Statics IS_BOOKMARKABLE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:200
+    pq_sdbc_driver::Statics RESULT_SET_TYPE OUString
+connectivity/source/drivers/postgresql/pq_statics.hxx:212
+    pq_sdbc_driver::Statics HELP_TEXT OUString
 connectivity/source/inc/calc/CConnection.hxx:51
     connectivity::calc::OCalcConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
-connectivity/source/inc/odbc/OConnection.hxx:54
-    connectivity::odbc::OConnection m_sUser class rtl::OUString
-connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx:71
+connectivity/source/inc/odbc/OConnection.hxx:53
+    connectivity::odbc::OConnection m_sUser OUString
+connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx:70
     connectivity::odbc::ODatabaseMetaDataResultSet m_aStatement css::uno::WeakReferenceHelper
+connectivity/source/inc/OTypeInfo.hxx:30
+    connectivity::OTypeInfo aTypeName OUString
 connectivity/source/inc/OTypeInfo.hxx:31
-    connectivity::OTypeInfo aTypeName class rtl::OUString
-connectivity/source/inc/OTypeInfo.hxx:32
-    connectivity::OTypeInfo aLocalTypeName class rtl::OUString
-connectivity/source/inc/OTypeInfo.hxx:34
+    connectivity::OTypeInfo aLocalTypeName OUString
+connectivity/source/inc/OTypeInfo.hxx:33
     connectivity::OTypeInfo nPrecision sal_Int32
-connectivity/source/inc/OTypeInfo.hxx:36
+connectivity/source/inc/OTypeInfo.hxx:35
     connectivity::OTypeInfo nMaximumScale sal_Int16
-connectivity/source/inc/OTypeInfo.hxx:38
+connectivity/source/inc/OTypeInfo.hxx:37
     connectivity::OTypeInfo nType sal_Int16
-connectivity/source/inc/writer/WConnection.hxx:55
+connectivity/source/inc/writer/WConnection.hxx:54
     connectivity::writer::OWriterConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
-cppcanvas/source/inc/implrenderer.hxx:207
-    cppcanvas::internal::ImplRenderer aBaseTransform struct cppcanvas::internal::XForm
-cppu/source/typelib/typelib.cxx:905
-    (anonymous namespace)::BaseList set (anonymous namespace)::BaseList::Set
+cppcanvas/source/inc/implrenderer.hxx:210
+    cppcanvas::internal::ImplRenderer aBaseTransform XForm
 cppu/source/uno/check.cxx:38
     (anonymous namespace)::C1 n1 sal_Int16
+cppu/source/uno/check.cxx:42
+    (anonymous namespace)::C2 n2 sal_Int32
+cppu/source/uno/check.cxx:46
+    (anonymous namespace)::C3 d3 double
+cppu/source/uno/check.cxx:47
+    (anonymous namespace)::C3 n3 sal_Int32
+cppu/source/uno/check.cxx:51
+    (anonymous namespace)::C4 n4 sal_Int32
+cppu/source/uno/check.cxx:52
+    (anonymous namespace)::C4 d4 double
+cppu/source/uno/check.cxx:56
+    (anonymous namespace)::C5 n5 sal_Int64
+cppu/source/uno/check.cxx:57
+    (anonymous namespace)::C5 b5 sal_Bool
+cppu/source/uno/check.cxx:61
+    (anonymous namespace)::C6 c6 C5
+cppu/source/uno/check.cxx:62
+    (anonymous namespace)::C6 b6 sal_Bool
 cppu/source/uno/check.cxx:67
     (anonymous namespace)::D d sal_Int16
 cppu/source/uno/check.cxx:68
     (anonymous namespace)::D e sal_Int32
-cppu/source/uno/check.cxx:72
-    (anonymous namespace)::E a sal_Bool
 cppu/source/uno/check.cxx:73
+    (anonymous namespace)::E a sal_Bool
+cppu/source/uno/check.cxx:75
     (anonymous namespace)::E b sal_Bool
-cppu/source/uno/check.cxx:74
+cppu/source/uno/check.cxx:77
     (anonymous namespace)::E c sal_Bool
-cppu/source/uno/check.cxx:75
+cppu/source/uno/check.cxx:78
     (anonymous namespace)::E d sal_Int16
-cppu/source/uno/check.cxx:76
+cppu/source/uno/check.cxx:79
     (anonymous namespace)::E e sal_Int32
-cppu/source/uno/check.cxx:81
+cppu/source/uno/check.cxx:84
     (anonymous namespace)::M n sal_Int32
-cppu/source/uno/check.cxx:82
+cppu/source/uno/check.cxx:85
     (anonymous namespace)::M o sal_Int16
-cppu/source/uno/check.cxx:91
-    (anonymous namespace)::N2 m struct (anonymous namespace)::M
-cppu/source/uno/check.cxx:92
+cppu/source/uno/check.cxx:90
+    (anonymous namespace)::N p sal_Int16
+cppu/source/uno/check.cxx:94
+    (anonymous namespace)::N2 m M
+cppu/source/uno/check.cxx:95
     (anonymous namespace)::N2 p sal_Int16
-cppu/source/uno/check.cxx:97
+cppu/source/uno/check.cxx:100
     (anonymous namespace)::O p double
-cppu/source/uno/check.cxx:98
+cppu/source/uno/check.cxx:101
     (anonymous namespace)::O q sal_Int16
-cppu/source/uno/check.cxx:107
+cppu/source/uno/check.cxx:105
+    (anonymous namespace)::O2 p2 sal_Int16
+cppu/source/uno/check.cxx:110
     (anonymous namespace)::P p2 double
-cppu/source/uno/check.cxx:115
+cppu/source/uno/check.cxx:118
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:126
+cppu/source/uno/check.cxx:129
     (anonymous namespace)::Char1 c1 char
-cppu/source/uno/check.cxx:130
+cppu/source/uno/check.cxx:133
     (anonymous namespace)::Char2 c2 char
-cppu/source/uno/check.cxx:134
+cppu/source/uno/check.cxx:137
     (anonymous namespace)::Char3 c3 char
-cppu/source/uno/check.cxx:258
-    (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
+cppu/source/uno/check.cxx:267
+    (anonymous namespace)::Char4 chars Char3
+cppu/source/uno/check.cxx:271
+    (anonymous namespace)::Char4 c char
 cppu/source/uno/copy.hxx:38
     cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32
 cppu/source/uno/copy.hxx:39
     cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32
-cppuhelper/source/access_control.cxx:79
+cppuhelper/source/access_control.cxx:73
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
-cppuhelper/source/access_control.cxx:80
+cppuhelper/source/access_control.cxx:74
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
-cppuhelper/source/typemanager.cxx:826
+cppuhelper/source/typemanager.cxx:846
     (anonymous namespace)::BaseOffset set_ std::set<OUString>
-cui/source/inc/cfg.hxx:406
+cui/source/inc/cfg.hxx:408
     SvxConfigPage m_xDropTargetHelper std::unique_ptr<SvxConfigPageFunctionDropTarget>
 cui/source/inc/cuihyperdlg.hxx:46
-    SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
-cui/source/inc/cuihyperdlg.hxx:77
-    SvxHpLinkDlg maCtrl class SvxHlinkCtrl
+    SvxHlinkCtrl aRdOnlyForwarder SfxStatusForwarder
+cui/source/inc/cuihyperdlg.hxx:79
+    SvxHpLinkDlg maCtrl SvxHlinkCtrl
+cui/source/inc/GraphicsTestsDialog.hxx:42
+    GraphicsTestsDialog m_xGraphicTestEntries std::vector<std::unique_ptr<GraphicTestEntry> >
 cui/source/inc/screenshotannotationdlg.hxx:29
     ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
-dbaccess/source/core/dataaccess/databasedocument.hxx:176
+dbaccess/source/core/dataaccess/databasedocument.hxx:174
     dbaccess::ODatabaseDocument m_pEventExecutor ::rtl::Reference<DocumentEventExecutor>
-dbaccess/source/core/dataaccess/documentdefinition.cxx:288
-    dbaccess::(anonymous namespace)::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
-dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:83
+dbaccess/source/core/dataaccess/documentdefinition.cxx:290
+    dbaccess::(anonymous namespace)::LifetimeCoupler m_xClient Reference<XInterface>
+dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:84
     dbaccess::OSingleSelectQueryComposer m_aColumnsCollection std::vector<std::unique_ptr<OPrivateColumns> >
-dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:85
+dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:86
     dbaccess::OSingleSelectQueryComposer m_aTablesCollection std::vector<std::unique_ptr<OPrivateTables> >
-dbaccess/source/core/inc/TableDeco.hxx:65
+dbaccess/source/core/inc/TableDeco.hxx:64
     dbaccess::ODBTableDecorator m_xColumnMediator css::uno::Reference<css::container::XContainerListener>
-dbaccess/source/filter/xml/dbloader2.cxx:200
-    dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader>
+dbaccess/source/filter/xml/dbloader2.cxx:201
+    dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf Reference<XFrameLoader>
 dbaccess/source/ui/app/AppDetailView.hxx:107
-    dbaui::OApplicationDetailView m_aExternalMnemonics class MnemonicGenerator
-dbaccess/source/ui/browser/dbloader.cxx:59
-    (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:283
+    dbaui::OApplicationDetailView m_aExternalMnemonics MnemonicGenerator
+dbaccess/source/ui/browser/dbloader.cxx:60
+    (anonymous namespace)::DBContentLoader m_xListener Reference<XLoadEventListener>
+dbaccess/source/ui/inc/RelationController.hxx:36
+    dbaui::ORelationController m_xWaitObject std::unique_ptr<weld::WaitObject>
+desktop/qa/desktop_lib/test_desktop_lib.cxx:314
     DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1210
-    desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1211
+desktop/source/app/app.cxx:1247
+    desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions std::unique_ptr<SvtCTLOptions>
+desktop/source/app/app.cxx:1248
     desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
-desktop/source/deployment/gui/dp_gui_extlistbox.hxx:137
+desktop/source/deployment/gui/dp_gui_extlistbox.hxx:138
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
-desktop/source/deployment/gui/dp_gui_updatedialog.hxx:150
+desktop/source/deployment/gui/dp_gui_updatedialog.hxx:148
     dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager>
-desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:101
+desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:102
     dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
-desktop/source/deployment/manager/dp_managerfac.cxx:43
-    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xUserMgr Reference<deployment::XPackageManager>
 desktop/source/deployment/manager/dp_managerfac.cxx:44
-    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xSharedMgr Reference<deployment::XPackageManager>
+    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xUserMgr Reference<deployment::XPackageManager>
 desktop/source/deployment/manager/dp_managerfac.cxx:45
-    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBundledMgr Reference<deployment::XPackageManager>
+    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xSharedMgr Reference<deployment::XPackageManager>
 desktop/source/deployment/manager/dp_managerfac.cxx:46
-    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xTmpMgr Reference<deployment::XPackageManager>
+    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBundledMgr Reference<deployment::XPackageManager>
 desktop/source/deployment/manager/dp_managerfac.cxx:47
+    dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xTmpMgr Reference<deployment::XPackageManager>
+desktop/source/deployment/manager/dp_managerfac.cxx:48
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
-desktop/unx/source/splashx.c:371
-     decorations unsigned long
-desktop/unx/source/splashx.c:371
-     flags unsigned long
-desktop/unx/source/splashx.c:371
-     functions unsigned long
-desktop/unx/source/splashx.c:372
-     input_mode long
-drawinglayer/inc/texture/texture.hxx:58
+desktop/unx/source/splashx.c:369
+    struct (unnamed at /home/noel/libo-plugin/desktop/unx/source/splashx.c:367:5) decorations unsigned long
+desktop/unx/source/splashx.c:369
+    struct (unnamed at /home/noel/libo-plugin/desktop/unx/source/splashx.c:367:5) flags unsigned long
+desktop/unx/source/splashx.c:369
+    struct (unnamed at /home/noel/libo-plugin/desktop/unx/source/splashx.c:367:5) functions unsigned long
+desktop/unx/source/splashx.c:370
+    struct (unnamed at /home/noel/libo-plugin/desktop/unx/source/splashx.c:367:5) input_mode long
+drawinglayer/inc/texture/texture.hxx:50
     drawinglayer::texture::GeoTexSvxGradient maDefinitionRange basegfx::B2DRange
-drawinglayer/inc/texture/texture.hxx:61
+drawinglayer/inc/texture/texture.hxx:53
     drawinglayer::texture::GeoTexSvxGradient mfBorder double
-drawinglayer/inc/texture/texture.hxx:210
+drawinglayer/inc/texture/texture.hxx:193
     drawinglayer::texture::GeoTexSvxHatch mfAngle double
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:45
     drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool
-drawinglayer/source/attribute/sdrsceneattribute3d.cxx:30
+drawinglayer/source/attribute/sdrsceneattribute3d.cxx:29
     drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double
-embeddedobj/source/inc/oleembobj.hxx:131
+drawinglayer/source/tools/emfpcustomlinecap.hxx:32
+    emfplushelper::EMFPCustomLineCap mbIsFilled _Bool
+embeddedobj/source/inc/oleembobj.hxx:133
     OleEmbeddedObject m_nTargetState sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:143
+embeddedobj/source/inc/oleembobj.hxx:145
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:165
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:188
+embeddedobj/source/inc/oleembobj.hxx:190
     OleEmbeddedObject m_bFromClipboard _Bool
-emfio/inc/mtftools.hxx:515
+emfio/inc/mtftools.hxx:688
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:65
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
 extensions/source/scanner/scanner.hxx:45
     ScannerManager mpData void *
-framework/inc/services/layoutmanager.hxx:248
+framework/inc/services/layoutmanager.hxx:249
     framework::LayoutManager m_bGlobalSettings _Bool
-framework/inc/services/layoutmanager.hxx:262
+framework/inc/services/layoutmanager.hxx:263
     framework::LayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
-framework/inc/uielement/langselectionmenucontroller.hxx:70
+framework/inc/uielement/langselectionmenucontroller.hxx:69
     framework::LanguageSelectionMenuController m_xMenuDispatch_Lang css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/langselectionmenucontroller.hxx:72
+framework/inc/uielement/langselectionmenucontroller.hxx:71
     framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/langselectionmenucontroller.hxx:74
+framework/inc/uielement/langselectionmenucontroller.hxx:73
     framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
-framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
+framework/inc/xml/imagesdocumenthandler.hxx:124
+    framework::OWriteImagesDocumentHandler m_xEmptyList css::uno::Reference<css::xml::sax::XAttributeList>
+framework/inc/xml/statusbardocumenthandler.hxx:125
+    framework::OWriteStatusBarDocumentHandler m_xEmptyList css::uno::Reference<css::xml::sax::XAttributeList>
+framework/source/layoutmanager/toolbarlayoutmanager.hxx:273
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
-framework/source/layoutmanager/toolbarlayoutmanager.hxx:276
+framework/source/layoutmanager/toolbarlayoutmanager.hxx:277
     framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-i18nutil/source/utility/paper.cxx:307
+helpcompiler/inc/HelpCompiler.hxx:204
+    HelpCompiler gui std::string
+i18nutil/source/utility/paper.cxx:318
     paperword string char *
-include/basegfx/DrawCommands.hxx:81
+include/basegfx/DrawCommands.hxx:82
     gfx::LinearGradientInfo maMatrix basegfx::B2DHomMatrix
-include/basic/basmgr.hxx:56
-    BasicError nReason enum BasicErrorReason
+include/basegfx/utils/gradienttools.hxx:54
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union)::(anonymous struct at /home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) T sal_uInt8
 include/basic/sbxvar.hxx:75
-    SbxValues::(anonymous) pData void *
+    SbxValues::(anonymous union at /home/noel/libo-plugin/include/basic/sbxvar.hxx:43:5) pData void *
 include/basic/sbxvar.hxx:247
     SbxVariable m_xComListener css::uno::Reference<css::uno::XInterface>
 include/basic/sbxvar.hxx:248
-    SbxVariable m_pComListenerParentBasic class StarBASIC *
+    SbxVariable m_pComListenerParentBasic StarBASIC *
 include/comphelper/parallelsort.hxx:88
     comphelper::(anonymous namespace)::ProfileZone mbDummy _Bool
-include/comphelper/unique_disposing_ptr.hxx:30
+include/comphelper/unique_disposing_ptr.hxx:31
     comphelper::unique_disposing_ptr m_xTerminateListener css::uno::Reference<css::frame::XTerminateListener>
+include/docmodel/theme/FormatScheme.hxx:92
+    model::GradientFill mbRotateWithShape _Bool
+include/docmodel/theme/FormatScheme.hxx:366
+    model::LineEnd meType LineEndType
+include/docmodel/theme/FormatScheme.hxx:367
+    model::LineEnd meWidth LineEndWidth
+include/docmodel/theme/FormatScheme.hxx:368
+    model::LineEnd meLength LineEndLength
+include/docmodel/theme/FormatScheme.hxx:380
+    model::LineDash maCustomList std::vector<DashStop>
+include/docmodel/theme/FormatScheme.hxx:392
+    model::LineStyle maHeadEnd LineEnd
+include/docmodel/theme/FormatScheme.hxx:393
+    model::LineStyle maTailEnd LineEnd
+include/docmodel/theme/FormatScheme.hxx:414
+    model::Effect mnRadius sal_Int32
+include/docmodel/theme/FormatScheme.hxx:417
+    model::Effect mnScaleX sal_Int32
+include/docmodel/theme/FormatScheme.hxx:418
+    model::Effect mnScaley sal_Int32
+include/docmodel/theme/FormatScheme.hxx:419
+    model::Effect mnScewX sal_Int32
+include/docmodel/theme/FormatScheme.hxx:420
+    model::Effect mnScewY sal_Int32
+include/docmodel/theme/FormatScheme.hxx:424
+    model::Effect mnEndAlpha double
+include/docmodel/theme/FormatScheme.hxx:425
+    model::Effect mnEndPosition double
+include/docmodel/theme/FormatScheme.hxx:426
+    model::Effect mnStartAlpha double
+include/docmodel/theme/FormatScheme.hxx:427
+    model::Effect mnStartPosition double
+include/docmodel/theme/FormatScheme.hxx:428
+    model::Effect mnFadeDirection sal_Int32
+include/docmodel/theme/FormatScheme.hxx:429
+    model::Effect mbGrow _Bool
 include/drawinglayer/attribute/sdrallattribute3d.hxx:42
-    drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const class drawinglayer::attribute::SdrLineStartEndAttribute
+    drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const SdrLineStartEndAttribute
 include/drawinglayer/primitive2d/mediaprimitive2d.hxx:48
-    drawinglayer::primitive2d::MediaPrimitive2D maURL class rtl::OUString
+    drawinglayer::primitive2d::MediaPrimitive2D maURL OUString
 include/editeng/adjustitem.hxx:37
     SvxAdjustItem bLeft _Bool
 include/editeng/outlobj.hxx:44
     OutlinerParaObjData mbIsEditDoc _Bool
-include/editeng/unotext.hxx:417
+include/editeng/splwrap.hxx:52
+    SvxSpellWrapper xWait std::unique_ptr<weld::WaitObject>
+include/editeng/unotext.hxx:430
     SvxUnoTextBase xParentText css::uno::Reference<css::text::XText>
-include/editeng/unotext.hxx:586
+include/editeng/unotext.hxx:599
     SvxUnoTextContentEnumeration mxParentText css::uno::Reference<css::text::XText>
 include/framework/addonsoptions.hxx:75
-    framework::MergeNotebookBarInstruction aMergePoint class rtl::OUString
+    framework::MergeNotebookBarInstruction aMergePoint OUString
 include/framework/addonsoptions.hxx:76
-    framework::MergeNotebookBarInstruction aMergeCommand class rtl::OUString
+    framework::MergeNotebookBarInstruction aMergeCommand OUString
 include/framework/addonsoptions.hxx:77
-    framework::MergeNotebookBarInstruction aMergeCommandParameter class rtl::OUString
+    framework::MergeNotebookBarInstruction aMergeCommandParameter OUString
 include/framework/addonsoptions.hxx:78
-    framework::MergeNotebookBarInstruction aMergeFallback class rtl::OUString
+    framework::MergeNotebookBarInstruction aMergeFallback OUString
 include/framework/addonsoptions.hxx:79
-    framework::MergeNotebookBarInstruction aMergeContext class rtl::OUString
-include/framework/dispatchhelper.hxx:74
+    framework::MergeNotebookBarInstruction aMergeContext OUString
+include/framework/dispatchhelper.hxx:73
     framework::DispatchHelper m_xBroadcaster css::uno::Reference<css::uno::XInterface>
 include/framework/framelistanalyzer.hxx:122
     framework::FrameListAnalyzer m_xHelp css::uno::Reference<css::frame::XFrame>
-include/LibreOfficeKit/LibreOfficeKit.h:326
+include/LibreOfficeKit/LibreOfficeKit.h:357
     _LibreOfficeKitDocumentClass getPartInfo char *(*)(LibreOfficeKitDocument *, int)
-include/LibreOfficeKit/LibreOfficeKit.h:331
+include/LibreOfficeKit/LibreOfficeKit.h:362
     _LibreOfficeKitDocumentClass paintWindowDPI void (*)(LibreOfficeKitDocument *, unsigned int, unsigned char *, const int, const int, const int, const int, const double)
 include/opencl/openclwrapper.hxx:34
     openclwrapper::KernelEnv mpkProgram cl_program
@@ -342,25 +464,87 @@ include/opencl/platforminfo.hxx:30
     OpenCLDeviceInfo mnComputeUnits size_t
 include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
-include/sfx2/minfitem.hxx:35
-    SfxMacroInfoItem aCommentText class rtl::OUString
-include/sfx2/templdlg.hxx:42
-    SfxTemplatePanelControl pImpl std::unique_ptr<SfxTemplateDialog_Impl>
-include/svtools/brwbox.hxx:326
+include/sfx2/AccessibilityIssue.hxx:64
+    sfx::AccessibilityIssue m_pParent weld::Window *
+include/sfx2/minfitem.hxx:38
+    SfxMacroInfoItem aCommentText OUString
+include/sfx2/viewsh.hxx:188
+    SfxViewShell m_xHelper std::shared_ptr<SfxStoringHelper>
+include/svl/poolitem.hxx:160
+    SfxPoolItem m_bDeleted _Bool
+include/svl/sigstruct.hxx:127
+    SignatureInformation hasInconsistentSigningTime _Bool
+include/svtools/brwbox.hxx:325
     BrowseBox::CursorMoveAttempt m_nCol sal_Int32
-include/svtools/brwbox.hxx:327
+include/svtools/brwbox.hxx:326
     BrowseBox::CursorMoveAttempt m_nRow sal_Int32
-include/svtools/brwbox.hxx:328
+include/svtools/brwbox.hxx:327
     BrowseBox::CursorMoveAttempt m_bScrolledToReachCell _Bool
-include/svtools/ctrltool.hxx:149
-    FontList mpDev2 VclPtr<class OutputDevice>
-include/svx/AccessibilityCheckDialog.hxx:44
-    svx::AccessibilityCheckDialog m_aAccessibilityCheckEntries std::vector<std::unique_ptr<AccessibilityCheckEntry> >
+include/svtools/ctrltool.hxx:147
+    FontList mpDev VclPtr<OutputDevice>
+include/svtools/ctrltool.hxx:148
+    FontList mpDev2 VclPtr<OutputDevice>
 include/svx/bmpmask.hxx:127
-    SvxBmpMask aSelItem class SvxBmpMaskSelectItem
+    SvxBmpMask aSelItem SvxBmpMaskSelectItem
+include/svx/diagram/datamodel.hxx:116
+    svx::diagram::Point msColorTransformCategoryId OUString
+include/svx/diagram/datamodel.hxx:117
+    svx::diagram::Point msColorTransformTypeId OUString
+include/svx/diagram/datamodel.hxx:118
+    svx::diagram::Point msLayoutCategoryId OUString
+include/svx/diagram/datamodel.hxx:119
+    svx::diagram::Point msLayoutTypeId OUString
+include/svx/diagram/datamodel.hxx:120
+    svx::diagram::Point msPlaceholderText OUString
+include/svx/diagram/datamodel.hxx:124
+    svx::diagram::Point msQuickStyleCategoryId OUString
+include/svx/diagram/datamodel.hxx:125
+    svx::diagram::Point msQuickStyleTypeId OUString
+include/svx/diagram/datamodel.hxx:128
+    svx::diagram::Point mnMaxChildren sal_Int32
+include/svx/diagram/datamodel.hxx:129
+    svx::diagram::Point mnPreferredChildren sal_Int32
+include/svx/diagram/datamodel.hxx:132
+    svx::diagram::Point mnResizeHandles sal_Int32
+include/svx/diagram/datamodel.hxx:133
+    svx::diagram::Point mnCustomAngle sal_Int32
+include/svx/diagram/datamodel.hxx:134
+    svx::diagram::Point mnPercentageNeighbourWidth sal_Int32
+include/svx/diagram/datamodel.hxx:135
+    svx::diagram::Point mnPercentageNeighbourHeight sal_Int32
+include/svx/diagram/datamodel.hxx:136
+    svx::diagram::Point mnPercentageOwnWidth sal_Int32
+include/svx/diagram/datamodel.hxx:137
+    svx::diagram::Point mnPercentageOwnHeight sal_Int32
+include/svx/diagram/datamodel.hxx:138
+    svx::diagram::Point mnIncludeAngleScale sal_Int32
+include/svx/diagram/datamodel.hxx:139
+    svx::diagram::Point mnRadiusScale sal_Int32
+include/svx/diagram/datamodel.hxx:140
+    svx::diagram::Point mnWidthScale sal_Int32
+include/svx/diagram/datamodel.hxx:141
+    svx::diagram::Point mnHeightScale sal_Int32
+include/svx/diagram/datamodel.hxx:142
+    svx::diagram::Point mnWidthOverride sal_Int32
+include/svx/diagram/datamodel.hxx:143
+    svx::diagram::Point mnHeightOverride sal_Int32
+include/svx/diagram/datamodel.hxx:147
+    svx::diagram::Point mbOrgChartEnabled _Bool
+include/svx/diagram/datamodel.hxx:148
+    svx::diagram::Point mbBulletEnabled _Bool
+include/svx/diagram/datamodel.hxx:149
+    svx::diagram::Point mbCoherent3DOffset _Bool
+include/svx/diagram/datamodel.hxx:150
+    svx::diagram::Point mbCustomHorizontalFlip _Bool
+include/svx/diagram/datamodel.hxx:151
+    svx::diagram::Point mbCustomVerticalFlip _Bool
+include/svx/diagram/datamodel.hxx:153
+    svx::diagram::Point mbIsPlaceholder _Bool
+include/svx/diagram/datamodel.hxx:264
+    svx::diagram::DiagramData maConnectionNameMap ConnectionNameMap
 include/svx/fillctrl.hxx:83
     FillControl mxColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-include/svx/float3d.hxx:203
+include/svx/float3d.hxx:202
     Svx3DWin pControllerItem std::unique_ptr<Svx3DCtrlItem>
 include/svx/fmtools.hxx:135
     FmXDisposeListener m_pAdapter rtl::Reference<FmXDisposeMultiplexer>
@@ -368,100 +552,136 @@ include/svx/galctrl.hxx:38
     GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 include/svx/galctrl.hxx:91
     GalleryIconView mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
-include/svx/gridctrl.hxx:258
+include/svx/GenericCheckDialog.hxx:91
+    svx::GenericCheckDialog m_aCheckEntries std::vector<std::unique_ptr<GenericCheckEntry> >
+include/svx/gridctrl.hxx:260
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
-    OfaRefItem mxRef rtl::Reference<reference_type>
-include/svx/srchdlg.hxx:165
-    SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
+    OfaXColorListItem mxRef rtl::Reference<XColorList>
+include/svx/sdasitm.hxx:55
+    SdrCustomShapeGeometryItem m_aHash size_t
 include/svx/srchdlg.hxx:166
+    SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
+include/svx/srchdlg.hxx:167
     SvxSearchDialog pOptionsController std::unique_ptr<SvxSearchController>
-include/svx/svdmrkv.hxx:100
+include/svx/svdmrkv.hxx:99
     SdrMarkView mpMarkingSubSelectionOverlay std::unique_ptr<MarkingSubSelectionOverlay>
+include/svx/tbcontrl.hxx:265
+    SvxCurrencyToolBoxControl::SvxCurrencyData m_onlyIsoCode _Bool
+include/svx/theme/ThemeColorPaletteManager.hxx:44
+    svx::ThemePaletteColorData maBaseColor Color
 include/svx/viewpt3d.hxx:62
-    Viewport3D::(anonymous) H double
+    Viewport3D::(unnamed struct at /home/noel/libo-plugin/include/svx/viewpt3d.hxx:60:5) H double
 include/svx/viewpt3d.hxx:62
-    Viewport3D::(anonymous) X double
+    Viewport3D::(unnamed struct at /home/noel/libo-plugin/include/svx/viewpt3d.hxx:60:5) X double
 include/svx/viewpt3d.hxx:62
-    Viewport3D::(anonymous) Y double
+    Viewport3D::(unnamed struct at /home/noel/libo-plugin/include/svx/viewpt3d.hxx:60:5) Y double
 include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
-include/unotools/fontcfg.hxx:159
-    utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/menu.hxx:470
-    MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
+include/unotools/fontcfg.hxx:157
+    utl::FontSubstConfiguration maSubstHash UniqueSubstHash
 include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:43
-    AddonNotebookBarItem sTarget class rtl::OUString
+    AddonNotebookBarItem sTarget OUString
 include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:44
-    AddonNotebookBarItem sContext class rtl::OUString
+    AddonNotebookBarItem sContext OUString
 include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:45
-    AddonNotebookBarItem sControlType class rtl::OUString
+    AddonNotebookBarItem sControlType OUString
 include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:46
     AddonNotebookBarItem nWidth sal_uInt16
 include/vcl/opengl/OpenGLContext.hxx:27
     GLWindow bMultiSampleSupported _Bool
-include/vcl/pdfextoutdevdata.hxx:83
+include/vcl/pdfextoutdevdata.hxx:87
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
-include/vcl/salnativewidgets.hxx:467
-    ToolbarValue mbIsTopDockingArea _Bool
-include/vcl/salnativewidgets.hxx:533
-    PushButtonValue mbBevelButton _Bool
-include/vcl/salnativewidgets.hxx:534
+include/vcl/salnativewidgets.hxx:493
     PushButtonValue mbSingleLine _Bool
-include/vcl/sysdata.hxx:65
-    SystemEnvData pSalFrame void *
+include/vcl/sysdata.hxx:69
+    SystemEnvData pSalFrame SalFrame *
 include/vcl/textrectinfo.hxx:35
     TextRectInfo mnLineCount sal_uInt16
-include/vcl/vclenum.hxx:202
+include/vcl/vclenum.hxx:170
     ItalicMatrix xx double
-include/vcl/vclenum.hxx:202
+include/vcl/vclenum.hxx:170
     ItalicMatrix xy double
-include/vcl/vclenum.hxx:202
+include/vcl/vclenum.hxx:170
     ItalicMatrix yx double
-include/vcl/vclenum.hxx:202
+include/vcl/vclenum.hxx:170
     ItalicMatrix yy double
-include/xmloff/shapeimport.hxx:94
-    SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 include/xmloff/shapeimport.hxx:95
-    SdXML3DSceneAttributesHelper mbVPNUsed _Bool
-include/xmloff/shapeimport.hxx:96
-    SdXML3DSceneAttributesHelper mbVUPUsed _Bool
-io/source/stm/odata.cxx:243
-    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
-io/source/stm/odata.cxx:243
-    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
-jvmfwk/inc/vendorbase.hxx:171
-    jfw_plugin::VendorBase m_sArch class rtl::OUString
-l10ntools/inc/common.hxx:33
+    SdXML3DSceneAttributesHelper mbVRPUsed _Bool
+include/xmloff/txtparae.hxx:118
+    XMLTextParagraphExport maFrameRecurseGuard o3tl::sorted_vector<css::uno::Reference<css::text::XTextFrame> >
+include/xmloff/txtparae.hxx:119
+    XMLTextParagraphExport maShapeRecurseGuard o3tl::sorted_vector<css::uno::Reference<css::drawing::XShape> >
+io/source/stm/odata.cxx:234
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:234:5) n sal_uInt32
+io/source/stm/odata.cxx:241
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:241:5) ad struct (unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:241:23)
+io/source/stm/odata.cxx:241
+    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:241:23) n1 sal_uInt32
+io/source/stm/odata.cxx:241
+    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/io/source/stm/odata.cxx:241:23) n2 sal_uInt32
+io/source/stm/odata.cxx:550
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:550:5) f float
+io/source/stm/odata.cxx:557
+    (unnamed union at /home/noel/libo-plugin/io/source/stm/odata.cxx:557:5) d double
+jvmfwk/inc/vendorbase.hxx:179
+    jfw_plugin::VendorBase m_sArch OUString
+l10ntools/inc/common.hxx:32
     common::HandledArgs m_bUTF8BOM _Bool
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:28
     GtvRenderingArgs m_aBackgroundColor std::string
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:62
     GtvApplicationWindow statusbar GtkWidget *
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:37
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:38
     (anonymous namespace)::GtvMainToolbarPrivateImpl m_pPartModeSelector GtkWidget *
-package/inc/ByteChucker.hxx:38
+package/inc/ByteChucker.hxx:33
     ByteChucker p2Sequence sal_Int8 *const
-package/inc/ByteChucker.hxx:38
+package/inc/ByteChucker.hxx:33
     ByteChucker p4Sequence sal_Int8 *const
-registry/source/reflread.cxx:477
-    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32
-registry/source/reflread.cxx:478
-    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b2 sal_uInt32
+package/inc/ByteChucker.hxx:33
+    ByteChucker p8Sequence sal_Int8 *const
+registry/source/reflread.cxx:435
+    (unnamed union at /home/noel/libo-plugin/registry/source/reflread.cxx:432:5) b sal_uInt32
+registry/source/reflread.cxx:460
+    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/registry/source/reflread.cxx:458:9) b1 sal_uInt32
+registry/source/reflread.cxx:461
+    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/registry/source/reflread.cxx:458:9) b2 sal_uInt32
+registry/source/reflread.cxx:462
+    (unnamed union at /home/noel/libo-plugin/registry/source/reflread.cxx:455:5) b struct (unnamed struct at /home/noel/libo-plugin/registry/source/reflread.cxx:458:9)
 reportdesign/inc/RptObject.hxx:69
     rptui::OObjectBase m_xKeepShapeAlive css::uno::Reference<css::uno::XInterface>
-sal/qa/osl/file/osl_File.cxx:4151
-    osl_Directory::isOpen nError1 osl::class FileBase::RC
-sal/qa/osl/file/osl_File.cxx:4151
-    osl_Directory::isOpen nError2 osl::class FileBase::RC
-sal/qa/osl/file/osl_File.cxx:4209
-    osl_Directory::close nError2 osl::class FileBase::RC
+sal/qa/rtl/strings/test_oustring_endswith.cxx:73
+    Data str1 const char *
+sal/qa/rtl/strings/test_oustring_endswith.cxx:74
+    Data str1Len sal_Int32
+sal/qa/rtl/strings/test_oustring_endswith.cxx:75
+    Data str2 const char *
+sal/qa/rtl/strings/test_oustring_endswith.cxx:76
+    Data str2Len sal_Int32
+sal/qa/rtl/strings/test_oustring_endswith.cxx:77
+    Data endsWith _Bool
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3096
+    Data mime const char *
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3097
+    Data encoding rtl_TextEncoding
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3098
+    Data reverse _Bool
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3214
+    Data codePage sal_uInt32
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3310
+    Data flag sal_uInt32
+sal/qa/rtl/textenc/rtl_textcvt.cxx:3311
+    Data value _Bool
+sal/qa/rtl/uri/rtl_testuri.cxx:262
+    RelToAbsTest pBase const char *
+sal/qa/rtl/uri/rtl_testuri.cxx:263
+    RelToAbsTest pRel const char *
+sal/qa/rtl/uri/rtl_testuri.cxx:264
+    RelToAbsTest pAbs const char *
 sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
 sal/rtl/alloc_arena.hxx:36
     rtl_arena_stat_type m_mem_alloc sal_Size
-sal/rtl/math.cxx:1031
-     md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:98
     (anonymous namespace)::ImplUTF7ToUCContextData mbShifted _Bool
 sal/textenc/tcvtutf7.cxx:99
@@ -478,267 +698,309 @@ sal/textenc/tcvtutf7.cxx:422
     (anonymous namespace)::ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
 sal/textenc/tcvtutf7.cxx:423
     (anonymous namespace)::ImplUTF7FromUCContextData mnBufferBits sal_uInt32
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:268
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:266
+sc/inc/compiler.hxx:270
     ScCompiler::AddInMap pUpper const char *
-sc/inc/compressedarray.hxx:70
+sc/inc/compressedarray.hxx:68
     ScCompressedArray::RangeData mnRow2 A
-sc/inc/patattr.hxx:56
-    ScPatternAttr mxHashCode std::optional<size_t>
-sc/inc/pivot.hxx:76
+sc/inc/fillinfo.hxx:287
+    ScTableInfo mDataBarInfos std::vector<std::unique_ptr<const ScDataBarInfo> >
+sc/inc/fillinfo.hxx:288
+    ScTableInfo mIconSetInfos std::vector<std::unique_ptr<const ScIconSetInfo> >
+sc/inc/patattr.hxx:118
+    ScPatternAttr m_bDeleted _Bool
+sc/inc/pivot.hxx:75
     ScDPLabelData mnFlags sal_Int32
-sc/inc/pivot.hxx:79
+sc/inc/pivot.hxx:78
     ScDPLabelData mbIsValue _Bool
-sc/inc/scmatrix.hxx:118
+sc/inc/scmatrix.hxx:105
     ScMatrix mbCloneIfConst _Bool
-sc/inc/scmod.hxx:101
+sc/inc/scmod.hxx:98
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
-sc/inc/tabopparams.hxx:38
+sc/inc/tabopparams.hxx:37
     ScInterpreterTableOpParams bValid _Bool
-sc/source/core/data/column4.cxx:1310
+sc/qa/unit/subsequent_export_test.cxx:2230
+    (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2228:18) mnRow SCROW
+sc/qa/unit/subsequent_export_test.cxx:2231
+    (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2228:18) mnStyle SvxBorderLineStyle
+sc/qa/unit/subsequent_export_test.cxx:2232
+    (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2228:18) mnWidth tools::Long
+sc/source/core/data/column4.cxx:1453
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
-sc/source/core/data/column.cxx:1409
+sc/source/core/data/column.cxx:1244
     (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
-sc/source/core/data/column.cxx:1410
-    (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags enum ScCloneFlags
-sc/source/core/data/table2.cxx:3725
-    (anonymous namespace)::OutlineArrayFinder mpArray class ScOutlineArray *
-sc/source/filter/excel/xltoolbar.hxx:25
+sc/source/core/data/column.cxx:1245
+    (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags ScCloneFlags
+sc/source/core/data/table2.cxx:4020
+    (anonymous namespace)::OutlineArrayFinder mpArray ScOutlineArray *
+sc/source/filter/excel/xltoolbar.hxx:24
     TBCCmd A _Bool
-sc/source/filter/excel/xltoolbar.hxx:26
+sc/source/filter/excel/xltoolbar.hxx:25
     TBCCmd B _Bool
-sc/source/filter/excel/xltoolbar.hxx:27
+sc/source/filter/excel/xltoolbar.hxx:26
     TBCCmd cmdType sal_uInt16
-sc/source/filter/excel/xltoolbar.hxx:28
+sc/source/filter/excel/xltoolbar.hxx:27
     TBCCmd C _Bool
-sc/source/filter/excel/xltoolbar.hxx:29
+sc/source/filter/excel/xltoolbar.hxx:28
     TBCCmd reserved3 sal_uInt16
-sc/source/filter/excel/xltoolbar.hxx:54
+sc/source/filter/excel/xltoolbar.hxx:53
     ScCTB rVisualData std::vector<TBVisualData>
-sc/source/filter/excel/xltools.cxx:102
-     smD union sal_math_Double
-sc/source/filter/html/htmlpars.cxx:3026
-    (anonymous namespace)::CSSHandler maPropName struct (anonymous namespace)::CSSHandler::MemStr
-sc/source/filter/html/htmlpars.cxx:3027
-    (anonymous namespace)::CSSHandler maPropValue struct (anonymous namespace)::CSSHandler::MemStr
-sc/source/filter/inc/exp_op.hxx:48
-    ExportBiff5 pExcRoot struct RootData *
-sc/source/filter/inc/imp_op.hxx:84
-    ImportExcel::LastFormula mpCell class ScFormulaCell *
+sc/source/filter/excel/xltools.cxx:103
+    (anonymous union at /home/noel/libo-plugin/sc/source/filter/excel/xltools.cxx:100:5) smD sal_math_Double
+sc/source/filter/inc/exp_op.hxx:47
+    ExportBiff5 pExcRoot RootData *
+sc/source/filter/inc/imp_op.hxx:83
+    ImportExcel::LastFormula mpCell ScFormulaCell *
+sc/source/filter/inc/lotattr.hxx:92
+    LotAttrCache pDocPool ScDocumentPool *
+sc/source/filter/inc/namebuff.hxx:37
+    StringHashEntry aString OUString
 sc/source/filter/inc/namebuff.hxx:38
-    StringHashEntry aString class rtl::OUString
-sc/source/filter/inc/namebuff.hxx:39
     StringHashEntry nHash sal_uInt32
-sc/source/filter/inc/orcusinterface.hxx:386
-    ScOrcusStyles::fill maBgColor class Color
+sc/source/filter/inc/orcusinterface.hxx:393
+    ScOrcusFill maBgColor std::optional<Color>
+sc/source/filter/inc/orcusinterface.hxx:436
+    ScOrcusXf mnStyleXf std::size_t
+sc/source/filter/inc/orcusinterface.hxx:453
+    ScOrcusCellStyle maDisplayName OUString
 sc/source/filter/inc/orcusinterface.hxx:456
-    ScOrcusStyles::xf mnStyleXf size_t
-sc/source/filter/inc/orcusinterface.hxx:476
-    ScOrcusStyles::cell_style mnBuiltInId size_t
+    ScOrcusCellStyle mnBuiltInId std::size_t
 sc/source/filter/inc/tokstack.hxx:142
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
-sc/source/filter/lotus/lotfilter.hxx:54
-    LotusContext eActType enum Lotus123Typ
-sc/source/filter/xml/xmlcondformat.hxx:111
-    ScXMLIconSetFormatContext mpFormatData struct ScIconSetFormatData *
-sc/source/filter/xml/XMLDetectiveContext.hxx:97
+sc/source/filter/lotus/lotfilter.hxx:53
+    LotusContext eActType Lotus123Typ
+sc/source/filter/xml/xmlcondformat.hxx:110
+    ScXMLIconSetFormatContext mpFormatData ScIconSetFormatData *
+sc/source/filter/xml/XMLDetectiveContext.hxx:96
     ScXMLDetectiveHighlightedContext pDetectiveObjVec ScMyImpDetectiveObjVec *
-sc/source/filter/xml/xmldpimp.hxx:248
+sc/source/filter/xml/xmldpimp.hxx:250
     ScXMLDataPilotFieldContext mbHasHiddenMember _Bool
-sc/source/filter/xml/xmldrani.hxx:72
+sc/source/filter/xml/xmldrani.hxx:71
     ScXMLDatabaseRangeContext bIsSelection _Bool
-sc/source/filter/xml/xmlexternaltabi.hxx:111
+sc/source/filter/xml/xmlexternaltabi.hxx:110
     ScXMLExternalRefCellContext mnCellType sal_Int16
-sc/source/ui/inc/AccessibleText.hxx:198
+sc/source/ui/inc/AccessibleText.hxx:197
     ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
-sc/source/ui/inc/datastream.hxx:105
-    sc::DataStream mnSettings sal_uInt32
-sc/source/ui/inc/drawview.hxx:42
+sc/source/ui/inc/drawview.hxx:41
     ScDrawView pDropMarker std::unique_ptr<SdrDropMarkerOverlay>
-sc/source/ui/inc/drwtrans.hxx:45
+sc/source/ui/inc/drwtrans.hxx:44
     ScDrawTransferObj m_aDrawPersistRef SfxObjectShellRef
-sc/source/ui/inc/filtdlg.hxx:186
+sc/source/ui/inc/dwfunctr.hxx:53
+    ScFunctionWin xConfigChange std::unique_ptr<EnglishFunctionNameChange>
+sc/source/ui/inc/filtdlg.hxx:193
     ScSpecialFilterDlg pOptionsMgr std::unique_ptr<ScFilterOptionsMgr>
-sc/source/ui/inc/instbdlg.hxx:58
+sc/source/ui/inc/instbdlg.hxx:57
     ScInsertTableDlg aDocShTablesRef SfxObjectShellRef
-sc/source/ui/inc/linkarea.hxx:38
+sc/source/ui/inc/linkarea.hxx:36
     ScLinkedAreaDlg aSourceRef SfxObjectShellRef
-sc/source/ui/inc/pfuncache.hxx:49
-    ScPrintSelectionStatus aRanges class ScRangeList
+sc/source/ui/inc/pfuncache.hxx:48
+    ScPrintSelectionStatus aRanges ScRangeList
 sc/source/ui/inc/PivotLayoutTreeList.hxx:20
     ScPivotLayoutTreeList maItemValues std::vector<std::unique_ptr<ScItemValue> >
 sc/source/ui/inc/PivotLayoutTreeListData.hxx:37
     ScPivotLayoutTreeListData maDataItemValues std::vector<std::unique_ptr<ScItemValue> >
-sc/source/ui/inc/preview.hxx:47
+sc/source/ui/inc/preview.hxx:46
     ScPreview nTabPage tools::Long
-sc/source/ui/inc/tabvwsh.hxx:121
+sc/source/ui/inc/tabvwsh.hxx:144
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
-sc/source/ui/inc/transobj.hxx:47
+sc/source/ui/inc/transobj.hxx:48
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
+sc/source/ui/inc/uiitems.hxx:46
+    ScInputStatusItem aStartPos ScAddress
 sc/source/ui/inc/uiitems.hxx:47
-    ScInputStatusItem aStartPos class ScAddress
-sc/source/ui/inc/uiitems.hxx:48
-    ScInputStatusItem aEndPos class ScAddress
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:81
+    ScInputStatusItem aEndPos ScAddress
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:76
     sc::sidebar::AlignmentPropertyPanel mxHorizontalAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:84
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:79
     sc::sidebar::AlignmentPropertyPanel mxVertAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:87
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:82
     sc::sidebar::AlignmentPropertyPanel mxWriteDirectionDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:90
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:85
     sc::sidebar::AlignmentPropertyPanel mxIndentButtonsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:79
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:75
     sc::sidebar::CellAppearancePropertyPanel mxBackColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:83
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:79
     sc::sidebar::CellAppearancePropertyPanel mxLineColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:70
+sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:65
     sc::sidebar::NumberFormatPropertyPanel mxCategoryDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/vba/vbachartobject.hxx:44
-    ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
-sd/inc/sdmod.hxx:133
+sc/source/ui/vba/vbachartobject.hxx:43
+    ScVbaChartObject oShapeHelper std::optional<ov::ShapeHelper>
+sd/inc/sdmod.hxx:145
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:196
+sd/qa/unit/tiledrendering/tiledrendering.cxx:86
     SdTiledRenderingTest m_bFound _Bool
-sd/qa/unit/tiledrendering/tiledrendering.cxx:197
+sd/qa/unit/tiledrendering/tiledrendering.cxx:87
     SdTiledRenderingTest m_nPart sal_Int32
-sd/qa/unit/tiledrendering/tiledrendering.cxx:199
+sd/qa/unit/tiledrendering/tiledrendering.cxx:89
     SdTiledRenderingTest m_aSearchResultPart std::vector<int>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:200
+sd/qa/unit/tiledrendering/tiledrendering.cxx:90
     SdTiledRenderingTest m_nSelectionBeforeSearchResult int
-sd/qa/unit/tiledrendering/tiledrendering.cxx:201
+sd/qa/unit/tiledrendering/tiledrendering.cxx:91
     SdTiledRenderingTest m_nSelectionAfterSearchResult int
-sd/source/ui/dlg/RemoteDialogClientBox.hxx:67
+sd/source/console/PresenterTimer.cxx:105
+    sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
+sd/source/ui/dlg/RemoteDialogClientBox.hxx:66
     sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
-sd/source/ui/framework/module/ToolBarModule.hxx:75
+sd/source/ui/framework/module/ToolBarModule.hxx:74
     sd::framework::ToolBarModule mpToolBarManagerLock std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
-sd/source/ui/inc/AccessibleDocumentViewBase.hxx:243
-    accessibility::AccessibleDocumentViewBase mpWindow VclPtr< ::sd::Window>
 sd/source/ui/inc/animobjs.hxx:122
     sd::AnimationWindow pControllerItem std::unique_ptr<AnimationControllerItem>
-sd/source/ui/inc/fudspord.hxx:51
+sd/source/ui/inc/custsdlg.hxx:60
+    SdDefineCustomShowDlg bModified _Bool
+sd/source/ui/inc/fudspord.hxx:50
     sd::FuDisplayOrder mpOverlay std::unique_ptr<SdrDropMarkerOverlay>
-sd/source/ui/inc/navigatr.hxx:124
+sd/source/ui/inc/navigatr.hxx:143
     SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
-sd/source/ui/inc/navigatr.hxx:125
+sd/source/ui/inc/navigatr.hxx:144
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
-sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
+sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:72
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
-sd/source/ui/inc/unopage.hxx:279
+sd/source/ui/inc/unopage.hxx:275
     SdPageLinkTargets mxPage css::uno::Reference<css::drawing::XDrawPage>
-sd/source/ui/inc/ViewShellImplementation.hxx:79
+sd/source/ui/inc/ViewShellImplementation.hxx:78
     sd::ViewShell::Implementation::ToolBarManagerLock mpLock ::std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
-sd/source/ui/inc/ViewShellImplementation.hxx:90
+sd/source/ui/inc/ViewShellImplementation.hxx:89
     sd::ViewShell::Implementation::ToolBarManagerLock mpSelf std::shared_ptr<ToolBarManagerLock>
-sd/source/ui/remotecontrol/Receiver.hxx:35
-    sd::Receiver pTransmitter class sd::Transmitter *
-sd/source/ui/sidebar/MasterPageContainerProviders.hxx:145
-    sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
-sd/source/ui/slideshow/slideshowimpl.hxx:333
+sd/source/ui/remotecontrol/Receiver.hxx:34
+    sd::Receiver pTransmitter Transmitter *
+sd/source/ui/sidebar/MasterPageContainerProviders.hxx:144
+    sd::sidebar::TemplatePreviewProvider msURL OUString
+sd/source/ui/slideshow/slideshowimpl.hxx:342
     sd::SlideshowImpl mpPaneHider ::std::unique_ptr<PaneHider>
-sd/source/ui/slideshow/SlideShowRestarter.hxx:74
+sd/source/ui/slideshow/SlideShowRestarter.hxx:72
     sd::SlideShowRestarter mpSelf ::std::shared_ptr<SlideShowRestarter>
-sd/source/ui/slidesorter/controller/SlsListener.hxx:142
+sd/source/ui/slidesorter/controller/SlsListener.hxx:140
     sd::slidesorter::controller::Listener mpModelChangeLock std::shared_ptr<SlideSorterController::ModelChangeLock>
-sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:116
+sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:114
     sd::slidesorter::controller::Clipboard mxUndoContext std::unique_ptr<UndoContext>
-sd/source/ui/table/TableDesignPane.hxx:101
-    sd::TableDesignPane m_xImpl std::unique_ptr<TableDesignWidget>
-sd/source/ui/view/ToolBarManager.cxx:316
+sd/source/ui/view/ToolBarManager.cxx:318
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
-sdext/source/presenter/PresenterTimer.cxx:103
-    sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
-sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
+sfx2/inc/commandpopup/CommandPopup.hxx:108
+    CommandPopupHandler mpListBox std::unique_ptr<CommandListBox>
+sfx2/inc/notebookbar/NotebookbarTabControl.hxx:42
     NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/doc/sfxbasemodel.cxx:448
+sfx2/source/doc/sfxbasemodel.cxx:482
     (anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
-sfx2/source/inc/appdata.hxx:71
-    SfxAppData_Impl pDocTopics std::unique_ptr<SfxDdeDocTopics_Impl>
-sfx2/source/inc/appdata.hxx:72
+sfx2/source/inc/appdata.hxx:68
+    SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *>
+sfx2/source/inc/appdata.hxx:69
     SfxAppData_Impl pTriggerTopic std::unique_ptr<SfxDdeTriggerTopic_Impl>
-sfx2/source/inc/appdata.hxx:73
+sfx2/source/inc/appdata.hxx:70
     SfxAppData_Impl pDdeService2 std::unique_ptr<DdeService>
-sfx2/source/inc/appdata.hxx:82
-    SfxAppData_Impl m_pToolsErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:83
-    SfxAppData_Impl m_pSoErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:85
-    SfxAppData_Impl m_pSbxErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:88
-    SfxAppData_Impl mxAppPickList std::unique_ptr<SfxPickList>
+sfx2/source/inc/appdata.hxx:78
+    SfxAppData_Impl m_pToolsErrorHdl std::optional<SfxErrorHandler>
+sfx2/source/inc/appdata.hxx:79
+    SfxAppData_Impl m_pSoErrorHdl std::optional<SfxErrorHandler>
+sfx2/source/inc/appdata.hxx:81
+    SfxAppData_Impl m_pSbxErrorHdl std::optional<SfxErrorHandler>
+sfx2/source/inc/appdata.hxx:84
+    SfxAppData_Impl mxAppPickList std::optional<SfxPickList>
 sfx2/source/inc/splitwin.hxx:52
-    SfxSplitWindow pActive VclPtr<class SfxDockingWindow>
-sfx2/source/inc/templdgi.hxx:102
-    SfxCommonTemplateDialog_Impl m_xTreeView1DropTargetHelper std::unique_ptr<TreeViewDropTarget>
-sfx2/source/inc/templdgi.hxx:103
-    SfxCommonTemplateDialog_Impl m_xTreeView2DropTargetHelper std::unique_ptr<TreeViewDropTarget>
-sfx2/source/inc/templdgi.hxx:264
+    SfxSplitWindow pActive VclPtr<SfxDockingWindow>
+sfx2/source/inc/StyleList.hxx:231
+    StyleList m_xTreeView1DropTargetHelper std::unique_ptr<TreeViewDropTarget>
+sfx2/source/inc/StyleList.hxx:232
+    StyleList m_xTreeView2DropTargetHelper std::unique_ptr<TreeViewDropTarget>
+sfx2/source/inc/templdgi.hxx:207
     SfxTemplateDialog_Impl m_xToolbarDropTargetHelper std::unique_ptr<ToolbarDropTarget>
 sfx2/source/view/classificationcontroller.cxx:73
-    sfx2::(anonymous namespace)::ClassificationCategoriesController m_aPropertyListener class sfx2::(anonymous namespace)::ClassificationPropertyListener
-slideshow/source/engine/opengl/TransitionImpl.hxx:301
+    sfx2::(anonymous namespace)::ClassificationCategoriesController m_aPropertyListener ClassificationPropertyListener
+sfx2/source/view/viewsh.cxx:747
+    LOKDocumentFocusListener m_aRefList std::unordered_set<uno::Reference<uno::XInterface> >
+slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex normal glm::vec3
-slideshow/source/engine/opengl/TransitionImpl.hxx:302
+slideshow/source/engine/opengl/TransitionImpl.hxx:298
     Vertex texcoord glm::vec2
-slideshow/source/engine/slideshowimpl.cxx:1045
-    (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
-slideshow/test/testview.cxx:50
+slideshow/source/engine/slideshowimpl.cxx:444
+    (anonymous namespace)::SlideShowImpl mpNavigationPrev std::shared_ptr<SlideOverlayButton>
+slideshow/source/engine/slideshowimpl.cxx:445
+    (anonymous namespace)::SlideShowImpl mpNavigationMenu std::shared_ptr<SlideOverlayButton>
+slideshow/source/engine/slideshowimpl.cxx:446
+    (anonymous namespace)::SlideShowImpl mpNavigationNext std::shared_ptr<SlideOverlayButton>
+slideshow/source/engine/slideshowimpl.cxx:1059
+    (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl SlideShowImpl *const
+slideshow/test/testview.cxx:51
     (anonymous namespace)::ImplTestView maCreatedSprites std::vector<std::pair<basegfx::B2DVector, double> >
-slideshow/test/testview.cxx:53
+slideshow/test/testview.cxx:54
     (anonymous namespace)::ImplTestView maPriority basegfx::B1DRange
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
-starmath/inc/view.hxx:157
-    SmCmdBoxWindow aController class SmEditController
-stoc/source/servicemanager/servicemanager.cxx:392
-    (anonymous namespace)::OServiceManager m_SetLoadedFactories (anonymous namespace)::HashSet_Ref
-store/source/storbios.cxx:58
+starmath/inc/mathml/mathmlimport.hxx:47
+    SmXMLImportWrapper m_bUseHTMLMLEntities _Bool
+starmath/inc/view.hxx:192
+    SmCmdBoxWindow aController SmEditController
+stoc/source/servicemanager/servicemanager.cxx:389
+    (anonymous namespace)::OServiceManager m_SetLoadedFactories HashSet_Ref
+store/source/storbios.cxx:51
     (anonymous namespace)::OStoreSuperBlock m_nMarked sal_uInt32
-store/source/storbios.cxx:59
-    (anonymous namespace)::OStoreSuperBlock m_aMarked (anonymous namespace)::OStoreSuperBlock::L
-svgio/inc/svgcharacternode.hxx:85
+store/source/storbios.cxx:52
+    (anonymous namespace)::OStoreSuperBlock m_aMarked L
+svgio/inc/svgdocument.hxx:38
+    svgio::svgreader::SvgDocument maOrphanNodes SvgNodeVector
+svgio/inc/svgsvgnode.hxx:41
+    svgio::svgreader::SvgSvgNode maVersion SvgNumber
+svgio/inc/svgsymbolnode.hxx:32
+    svgio::svgreader::SvgSymbolNode maSvgAspectRatio SvgAspectRatio
+svgio/inc/svgtextposition.hxx:36
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
-svgio/inc/svgsvgnode.hxx:42
-    svgio::svgreader::SvgSvgNode maVersion class svgio::svgreader::SvgNumber
-svgio/inc/svgsymbolnode.hxx:33
-    svgio::svgreader::SvgSymbolNode maSvgAspectRatio class svgio::svgreader::SvgAspectRatio
+svgio/inc/svgusenode.hxx:40
+    svgio::svgreader::SvgUseNode maWidth SvgNumber
 svgio/inc/svgusenode.hxx:41
-    svgio::svgreader::SvgUseNode maWidth class svgio::svgreader::SvgNumber
-svgio/inc/svgusenode.hxx:42
-    svgio::svgreader::SvgUseNode maHeight class svgio::svgreader::SvgNumber
-svl/source/crypto/cryptosign.cxx:111
+    svgio::svgreader::SvgUseNode maHeight SvgNumber
+svl/qa/unit/svl.cxx:257
+    (unnamed struct at /home/noel/libo-plugin/svl/qa/unit/svl.cxx:256:5) eStart NfIndexTableOffset
+svl/qa/unit/svl.cxx:258
+    (unnamed struct at /home/noel/libo-plugin/svl/qa/unit/svl.cxx:256:5) eEnd NfIndexTableOffset
+svl/qa/unit/svl.cxx:259
+    (unnamed struct at /home/noel/libo-plugin/svl/qa/unit/svl.cxx:256:5) nSize size_t
+svl/qa/unit/svl.cxx:260
+    (unnamed struct at /home/noel/libo-plugin/svl/qa/unit/svl.cxx:256:5) pCodes const char **
+svl/qa/unit/svl.cxx:1149
+    NumberFormatData pFormat const char *
+svl/qa/unit/svl.cxx:1150
+    NumberFormatData bIsNumber _Bool
+svl/qa/unit/test_URIHelper.cxx:225
+    Data base const char *
+svl/qa/unit/test_URIHelper.cxx:289
+    Data input const char *
+svl/qa/unit/test_URIHelper.cxx:291
+    Data begin sal_Int32
+svl/qa/unit/test_URIHelper.cxx:292
+    Data end sal_Int32
+svl/source/crypto/cryptosign.cxx:104
     (anonymous namespace)::MessageImprint hashedMessage SECItem
-svl/source/crypto/cryptosign.cxx:146
+svl/source/crypto/cryptosign.cxx:139
     (anonymous namespace)::TimeStampReq version SECItem
-svl/source/crypto/cryptosign.cxx:148
+svl/source/crypto/cryptosign.cxx:141
     (anonymous namespace)::TimeStampReq reqPolicy SECItem
-svl/source/crypto/cryptosign.cxx:149
+svl/source/crypto/cryptosign.cxx:142
     (anonymous namespace)::TimeStampReq nonce SECItem
-svl/source/crypto/cryptosign.cxx:150
+svl/source/crypto/cryptosign.cxx:143
     (anonymous namespace)::TimeStampReq certReq SECItem
-svl/source/crypto/cryptosign.cxx:151
-    (anonymous namespace)::TimeStampReq extensions struct (anonymous namespace)::Extension *
-svl/source/crypto/cryptosign.cxx:159
+svl/source/crypto/cryptosign.cxx:144
+    (anonymous namespace)::TimeStampReq extensions Extension *
+svl/source/crypto/cryptosign.cxx:152
     (anonymous namespace)::GeneralName name CERTName
-svl/source/crypto/cryptosign.cxx:167
-    (anonymous namespace)::GeneralNames names struct (anonymous namespace)::GeneralName
-svl/source/crypto/cryptosign.cxx:175
-    (anonymous namespace)::IssuerSerial issuer struct (anonymous namespace)::GeneralNames
-svl/source/crypto/cryptosign.cxx:176
+svl/source/crypto/cryptosign.cxx:160
+    (anonymous namespace)::GeneralNames names GeneralName
+svl/source/crypto/cryptosign.cxx:168
+    (anonymous namespace)::IssuerSerial issuer GeneralNames
+svl/source/crypto/cryptosign.cxx:169
     (anonymous namespace)::IssuerSerial serialNumber SECItem
-svl/source/crypto/cryptosign.cxx:186
+svl/source/crypto/cryptosign.cxx:179
     (anonymous namespace)::ESSCertIDv2 certHash SECItem
-svl/source/crypto/cryptosign.cxx:187
-    (anonymous namespace)::ESSCertIDv2 issuerSerial struct (anonymous namespace)::IssuerSerial
-svl/source/crypto/cryptosign.cxx:195
-    (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
+svl/source/crypto/cryptosign.cxx:180
+    (anonymous namespace)::ESSCertIDv2 issuerSerial IssuerSerial
+svl/source/crypto/cryptosign.cxx:188
+    (anonymous namespace)::SigningCertificateV2 certs ESSCertIDv2 **
 svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
-svl/source/undo/undo.cxx:313
+svl/source/undo/undo.cxx:312
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
 svx/inc/galbrws2.hxx:82
     GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
@@ -748,379 +1010,355 @@ svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:44
     drawinglayer::primitive2d::SdrOleContentPrimitive2D mnGraphicVersion sal_uInt32
 svx/source/form/dataaccessdescriptor.cxx:39
     svx::ODADescriptorImpl m_bSetOutOfDate _Bool
-svx/source/form/formcontroller.cxx:209
+svx/source/form/formcontroller.cxx:208
     svxform::(anonymous namespace)::ColumnInfo nNullable sal_Int32
-svx/source/inc/datanavi.hxx:319
+svx/source/inc/datanavi.hxx:326
     svxform::DataNavigator m_xDataWin std::unique_ptr<DataNavigatorWindow>
-svx/source/inc/docrecovery.hxx:131
-    svx::DocRecovery::TURLInfo Module class rtl::OUString
-svx/source/inc/StylesPreviewToolBoxControl.hxx:33
+svx/source/inc/docrecovery.hxx:132
+    svx::DocRecovery::TURLInfo Module OUString
+svx/source/inc/StylesPreviewToolBoxControl.hxx:32
     StylesPreviewToolBoxControl m_xWeldBox std::unique_ptr<StylesPreviewWindow_Base>
-svx/source/sdr/attribute/sdrformtextattribute.cxx:153
+svx/source/inc/StylesPreviewWindow.hxx:106
+    StylesPreviewWindow_Base m_pStylePoolChangeListener std::unique_ptr<StylePoolChangeListener>
+svx/source/sdr/attribute/sdrformtextattribute.cxx:152
     drawinglayer::attribute::ImpSdrFormTextAttribute mnFormTextShdwTransp sal_uInt16
-svx/source/sdr/attribute/sdrtextattribute.cxx:49
+svx/source/sdr/attribute/sdrtextattribute.cxx:48
     drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32
-svx/source/sdr/attribute/sdrtextattribute.cxx:63
+svx/source/sdr/attribute/sdrtextattribute.cxx:62
     drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell _Bool
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:41
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:35
     svx::sidebar::EffectPropertyPanel maGlowColorController sfx2::sidebar::ControllerItem
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:42
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:36
     svx::sidebar::EffectPropertyPanel maGlowRadiusController sfx2::sidebar::ControllerItem
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:43
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:37
     svx::sidebar::EffectPropertyPanel maGlowTransparencyController sfx2::sidebar::ControllerItem
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:45
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:39
     svx::sidebar::EffectPropertyPanel maSoftEdgeRadiusController sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:83
+svx/source/sidebar/line/LinePropertyPanel.hxx:81
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:84
+svx/source/sidebar/line/LinePropertyPanel.hxx:82
     svx::sidebar::LinePropertyPanel maDashControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:86
+svx/source/sidebar/line/LinePropertyPanel.hxx:84
     svx::sidebar::LinePropertyPanel maTransControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:87
+svx/source/sidebar/line/LinePropertyPanel.hxx:85
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:88
+svx/source/sidebar/line/LinePropertyPanel.hxx:86
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
-svx/source/sidebar/lists/ListsPropertyPanel.hxx:42
+svx/source/sidebar/lists/ListsPropertyPanel.hxx:41
     svx::sidebar::ListsPropertyPanel mxNumBulletDispatcher std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/lists/ListsPropertyPanel.hxx:44
+svx/source/sidebar/lists/ListsPropertyPanel.hxx:43
     svx::sidebar::ListsPropertyPanel mxOutlineDispatcher std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:79
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:77
     svx::sidebar::ParaPropertyPanel mxHorzAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:81
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:79
     svx::sidebar::ParaPropertyPanel mxVertAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:84
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:82
     svx::sidebar::ParaPropertyPanel mxNumBulletDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:86
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:84
     svx::sidebar::ParaPropertyPanel mxBackColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:89
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:87
     svx::sidebar::ParaPropertyPanel mxWriteDirectionDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:91
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:89
     svx::sidebar::ParaPropertyPanel mxParaSpacingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:93
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:91
     svx::sidebar::ParaPropertyPanel mxLineSpacingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:95
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:93
     svx::sidebar::ParaPropertyPanel mxIndentDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:109
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:105
     svx::sidebar::PosSizePropertyPanel mxFlipDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:112
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:108
     svx::sidebar::PosSizePropertyPanel mxArrangeDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:114
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:110
     svx::sidebar::PosSizePropertyPanel mxArrangeDispatch2 std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:117
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:113
     svx::sidebar::PosSizePropertyPanel mxAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:119
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:115
     svx::sidebar::PosSizePropertyPanel mxAlignDispatch2 std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/styles/StylesPropertyPanel.hxx:13
+svx/source/sidebar/styles/StylesPropertyPanel.hxx:20
     svx::sidebar::StylesPropertyPanel m_xFontStyleDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/styles/StylesPropertyPanel.hxx:16
+svx/source/sidebar/styles/StylesPropertyPanel.hxx:23
     svx::sidebar::StylesPropertyPanel m_xStyleDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:50
+svx/source/sidebar/text/TextPropertyPanel.hxx:49
     svx::sidebar::TextPropertyPanel mxFontDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:52
+svx/source/sidebar/text/TextPropertyPanel.hxx:51
     svx::sidebar::TextPropertyPanel mxFontHeightDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:54
+svx/source/sidebar/text/TextPropertyPanel.hxx:53
     svx::sidebar::TextPropertyPanel mxFontEffectsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:56
+svx/source/sidebar/text/TextPropertyPanel.hxx:55
     svx::sidebar::TextPropertyPanel mxFontAdjustDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:58
-    svx::sidebar::TextPropertyPanel mxToolBoxFontColorSwDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:60
+svx/source/sidebar/text/TextPropertyPanel.hxx:57
     svx::sidebar::TextPropertyPanel mxToolBoxFontColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:62
+svx/source/sidebar/text/TextPropertyPanel.hxx:59
     svx::sidebar::TextPropertyPanel mxToolBoxBackgroundColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:64
+svx/source/sidebar/text/TextPropertyPanel.hxx:61
     svx::sidebar::TextPropertyPanel mxResetBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:66
+svx/source/sidebar/text/TextPropertyPanel.hxx:63
     svx::sidebar::TextPropertyPanel mxDefaultBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:68
+svx/source/sidebar/text/TextPropertyPanel.hxx:65
     svx::sidebar::TextPropertyPanel mxPositionBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/text/TextPropertyPanel.hxx:70
+svx/source/sidebar/text/TextPropertyPanel.hxx:67
     svx::sidebar::TextPropertyPanel mxSpacingBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/tbxctrls/tbcontrl.cxx:310
+svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:40
+    svx::sidebar::TextColumnsPropertyPanel maColumnsNumberController sfx2::sidebar::ControllerItem
+svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:41
+    svx::sidebar::TextColumnsPropertyPanel maColumnsSpacingController sfx2::sidebar::ControllerItem
+svx/source/tbxctrls/tbcontrl.cxx:338
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList>
-sw/inc/accmap.hxx:96
+sw/inc/accmap.hxx:95
     SwAccessibleMap mvShapes SwShapeList_Impl
-sw/inc/swmodule.hxx:95
+sw/inc/swmodule.hxx:93
     SwModule m_pErrorHandler std::unique_ptr<SfxErrorHandler>
-sw/inc/swmodule.hxx:108
+sw/inc/swmodule.hxx:106
     SwModule m_xLinguServiceEventListener css::uno::Reference<css::linguistic2::XLinguServiceEventListener>
 sw/inc/swwait.hxx:45
     SwWait mpLockedDispatchers o3tl::sorted_vector<SfxDispatcher *>
-sw/inc/unoframe.hxx:311
+sw/inc/textboxhelper.hxx:215
+    SwTextBoxNode m_bIsCloningInProgress _Bool
+sw/inc/unoframe.hxx:303
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
-sw/inc/view.hxx:182
+sw/inc/view.hxx:197
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
-sw/source/core/inc/swfont.hxx:978
+sw/inc/viewopt.hxx:46
+    ViewOptFlags1 bPagebreak _Bool
+sw/inc/viewopt.hxx:47
+    ViewOptFlags1 bColumnbreak _Bool
+sw/inc/viewopt.hxx:50
+    ViewOptFlags1 bRef _Bool
+sw/qa/core/doc/doc.cxx:404
+    (anonymous namespace)::SelectionChangeListener m_aAnchors std::vector<uno::Reference<text::XTextRange> >
+sw/source/core/inc/swfont.hxx:988
     SvStatistics nGetTextSize sal_uInt16
-sw/source/core/inc/swfont.hxx:979
+sw/source/core/inc/swfont.hxx:989
     SvStatistics nDrawText sal_uInt16
-sw/source/core/inc/swfont.hxx:980
+sw/source/core/inc/swfont.hxx:990
     SvStatistics nGetStretchTextSize sal_uInt16
-sw/source/core/inc/swfont.hxx:981
+sw/source/core/inc/swfont.hxx:991
     SvStatistics nDrawStretchText sal_uInt16
-sw/source/core/inc/swfont.hxx:982
+sw/source/core/inc/swfont.hxx:992
     SvStatistics nChangeFont sal_uInt16
-sw/source/core/inc/unoflatpara.hxx:135
-    SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> >
-sw/source/core/layout/dbg_lay.cxx:133
+sw/source/core/layout/dbg_lay.cxx:135
     SwImplProtocol m_aVars std::vector<tools::Long>
-sw/source/core/table/swtable.cxx:2590
-    SwTableCellInfo::Impl m_HandledTableBoxes SwTableCellInfo::Impl::TableBoxes_t
-sw/source/core/text/porfld.hxx:65
-    SwFieldPortion m_nAttrFieldType sal_uInt16
-sw/source/filter/html/swhtml.hxx:384
+sw/source/core/table/swtable.cxx:3054
+    SwTableCellInfo::Impl m_HandledTableBoxes TableBoxes_t
+sw/source/filter/html/swhtml.hxx:390
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> >
 sw/source/filter/inc/rtf.hxx:29
-    RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) nGoldCut sal_uInt8
 sw/source/filter/inc/rtf.hxx:30
-    RTFSurround::(anonymous union)::(anonymous) nOrder sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) nOrder sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:32
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
-sw/source/uibase/inc/glossary.hxx:63
+    RTFSurround::(unnamed union at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) Flags struct (unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9)
+sw/source/filter/writer/writer.cxx:48
+    Writer_Impl aFontRemoveLst std::vector<SfxPoolItemHolder>
+sw/source/uibase/inc/glossary.hxx:65
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
-sw/source/uibase/inc/maildispatcher.hxx:144
+sw/source/uibase/inc/glossary.hxx:81
+    SwGlossaryDlg m_xDropTarget std::unique_ptr<SwGlossaryDropTarget>
+sw/source/uibase/inc/maildispatcher.hxx:143
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
-sw/source/uibase/inc/maildispatcher.hxx:150
+sw/source/uibase/inc/maildispatcher.hxx:149
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
-sw/source/uibase/inc/navipi.hxx:60
-    SwNavigationPI m_xContent2Dispatch std::unique_ptr<ToolbarUnoDispatcher>
 sw/source/uibase/inc/navipi.hxx:61
     SwNavigationPI m_xContent3Dispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/inc/redlndlg.hxx:62
-    SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
-sw/source/uibase/inc/swuiccoll.hxx:37
-    SwCondCollPage m_bNewTemplate _Bool
-sw/source/uibase/sidebar/TableEditPanel.hxx:51
+sw/source/uibase/inc/redlndlg.hxx:64
+    SwRedlineAcceptDlg m_RedlinData std::vector<std::unique_ptr<RedlinData> >
+sw/source/uibase/inc/redlndlg.hxx:65
+    SwRedlineAcceptDlg m_aUsedSeqNo SwRedlineDataParentSortArr
+sw/source/uibase/sidebar/TableEditPanel.hxx:48
     sw::sidebar::TableEditPanel m_xInsertDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:53
+sw/source/uibase/sidebar/TableEditPanel.hxx:50
     sw::sidebar::TableEditPanel m_xSelectDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:55
+sw/source/uibase/sidebar/TableEditPanel.hxx:52
     sw::sidebar::TableEditPanel m_xRowSizingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:57
+sw/source/uibase/sidebar/TableEditPanel.hxx:54
     sw::sidebar::TableEditPanel m_xColumnSizingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:59
+sw/source/uibase/sidebar/TableEditPanel.hxx:56
     sw::sidebar::TableEditPanel m_xDeleteDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:61
+sw/source/uibase/sidebar/TableEditPanel.hxx:58
     sw::sidebar::TableEditPanel m_xSplitMergeDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:63
+sw/source/uibase/sidebar/TableEditPanel.hxx:60
     sw::sidebar::TableEditPanel m_xMiscDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/WrapPropertyPanel.hxx:74
+sw/source/uibase/sidebar/WrapPropertyPanel.hxx:73
     sw::sidebar::WrapPropertyPanel mxWrapOptionsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-testtools/source/bridgetest/cppobj.cxx:153
-    bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
-ucb/source/ucp/gio/gio_mount.hxx:74
+testtools/source/bridgetest/cppobj.cxx:154
+    bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<TestElement>
+ucb/source/ucp/gio/gio_mount.hxx:73
     OOoMountOperationClass parent_class GMountOperationClass
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:76
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:77
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:78
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:80
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-ucb/source/ucp/webdav-neon/NeonSession.cxx:164
-    (anonymous namespace)::NeonRequestContext pResource struct webdav_ucp::DAVResource *
-unoidl/source/legacyprovider.cxx:86
-    unoidl::detail::(anonymous namespace)::Cursor manager_ rtl::Reference<Manager>
-unoidl/source/unoidl.cxx:83
+unoidl/source/unoidl-write.cxx:178
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidl-write.cxx:176:5) f float
+unoidl/source/unoidl-write.cxx:191
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidl-write.cxx:189:5) d float
+unoidl/source/unoidl.cxx:84
     unoidl::(anonymous namespace)::AggregatingCursor seen_ std::set<OUString>
-unoidl/source/unoidlprovider.hxx:32
-    unoidl::detail::NestedMap trace std::set<Map>
-unotools/source/config/defaultoptions.cxx:70
-    SvtDefaultOptions_Impl m_aAddinPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:71
-    SvtDefaultOptions_Impl m_aAutoCorrectPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:72
-    SvtDefaultOptions_Impl m_aAutoTextPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:73
-    SvtDefaultOptions_Impl m_aBackupPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:74
-    SvtDefaultOptions_Impl m_aBasicPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:75
-    SvtDefaultOptions_Impl m_aBitmapPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:76
-    SvtDefaultOptions_Impl m_aConfigPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:77
-    SvtDefaultOptions_Impl m_aDictionaryPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:78
-    SvtDefaultOptions_Impl m_aFavoritesPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:79
-    SvtDefaultOptions_Impl m_aFilterPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:80
-    SvtDefaultOptions_Impl m_aGalleryPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:81
-    SvtDefaultOptions_Impl m_aGraphicPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:82
-    SvtDefaultOptions_Impl m_aHelpPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:83
-    SvtDefaultOptions_Impl m_aLinguisticPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:84
-    SvtDefaultOptions_Impl m_aModulePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:85
-    SvtDefaultOptions_Impl m_aPalettePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:86
-    SvtDefaultOptions_Impl m_aPluginPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:87
-    SvtDefaultOptions_Impl m_aTempPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:88
-    SvtDefaultOptions_Impl m_aTemplatePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:89
-    SvtDefaultOptions_Impl m_aUserConfigPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:90
-    SvtDefaultOptions_Impl m_aWorkPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:91
-    SvtDefaultOptions_Impl m_aClassificationPath class rtl::OUString
-unoxml/source/rdf/librdf_repository.cxx:469
+unoidl/source/unoidlprovider.cxx:110
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidlprovider.cxx:109:9) buf unsigned char[4]
+unoidl/source/unoidlprovider.cxx:145
+    (unnamed union at /home/noel/libo-plugin/unoidl/source/unoidlprovider.cxx:144:9) buf unsigned char[8]
+unoxml/source/rdf/librdf_repository.cxx:470
     (anonymous namespace)::librdf_GraphResult m_pQuery const std::shared_ptr<librdf_query>
-unoxml/source/rdf/librdf_repository.cxx:622
+unoxml/source/rdf/librdf_repository.cxx:623
     (anonymous namespace)::librdf_QuerySelectResult m_pQuery const std::shared_ptr<librdf_query>
-unoxml/source/xpath/nodelist.hxx:52
+unoxml/source/xpath/nodelist.hxx:51
     XPath::CNodeList m_pXPathObj std::shared_ptr<xmlXPathObject>
 vbahelper/source/vbahelper/vbafillformat.hxx:36
     ScVbaFillFormat m_nForeColor sal_Int32
-vcl/inc/accel.h:33
-    ImplAccelEntry mpAutoAccel class Accelerator *
-vcl/inc/driverblocklist.hxx:114
-    DriverBlocklist::DriverInfo maMsg class rtl::OUString
-vcl/inc/fontselect.hxx:62
-    FontSelectPattern mfExactHeight float
-vcl/inc/pdf/BitmapID.hxx:23
+vcl/inc/accel.hxx:37
+    ImplAccelEntry mpAutoAccel Accelerator *
+vcl/inc/driverblocklist.hxx:113
+    DriverBlocklist::DriverInfo maMsg OUString
+vcl/inc/font/FontSelectPattern.hxx:65
+    vcl::font::FontSelectPattern mfExactHeight float
+vcl/inc/pdf/BitmapID.hxx:22
     vcl::pdf::BitmapID m_nChecksum BitmapChecksum
-vcl/inc/pdf/BitmapID.hxx:24
+vcl/inc/pdf/BitmapID.hxx:23
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/inc/qt5/Qt5Instance.hxx:62
-    Qt5Instance m_pQApplication std::unique_ptr<QApplication>
-vcl/inc/qt5/Qt5Instance.hxx:63
-    Qt5Instance m_pFakeArgvFreeable std::vector<FreeableCStr>
-vcl/inc/qt5/Qt5Instance.hxx:64
-    Qt5Instance m_pFakeArgv std::unique_ptr<char *[]>
-vcl/inc/qt5/Qt5Instance.hxx:65
-    Qt5Instance m_pFakeArgc std::unique_ptr<int>
-vcl/inc/salmenu.hxx:33
-    SalItemParams pMenu VclPtr<class Menu>
+vcl/inc/qt5/QtInstance.hxx:64
+    QtInstance m_pQApplication std::unique_ptr<QApplication>
+vcl/inc/qt5/QtInstance.hxx:65
+    QtInstance m_pFakeArgvFreeable std::vector<FreeableCStr>
+vcl/inc/qt5/QtInstance.hxx:66
+    QtInstance m_pFakeArgv std::unique_ptr<char *[]>
+vcl/inc/qt5/QtInstance.hxx:67
+    QtInstance m_pFakeArgc std::unique_ptr<int>
 vcl/inc/salmenu.hxx:34
-    SalItemParams aText class rtl::OUString
-vcl/inc/salmenu.hxx:37
-    SalItemParams nBits enum MenuItemBits
-vcl/inc/salwtype.hxx:206
+    SalItemParams pMenu VclPtr<Menu>
+vcl/inc/salmenu.hxx:35
+    SalItemParams aText OUString
+vcl/inc/salmenu.hxx:38
+    SalItemParams nBits MenuItemBits
+vcl/inc/salwtype.hxx:213
     SalSurroundingTextRequestEvent mnEnd sal_uLong
-vcl/inc/salwtype.hxx:217
+vcl/inc/salwtype.hxx:225
+    SalQueryCharPositionEvent maCursorBound AbsoluteScreenPixelRectangle
+vcl/inc/salwtype.hxx:226
     SalQueryCharPositionEvent mbValid _Bool
-vcl/inc/salwtype.hxx:219
+vcl/inc/salwtype.hxx:227
     SalQueryCharPositionEvent mbVertical _Bool
-vcl/inc/salwtype.hxx:220
-    SalQueryCharPositionEvent mnCursorBoundX tools::Long
-vcl/inc/salwtype.hxx:221
-    SalQueryCharPositionEvent mnCursorBoundY tools::Long
-vcl/inc/salwtype.hxx:222
-    SalQueryCharPositionEvent mnCursorBoundWidth tools::Long
-vcl/inc/salwtype.hxx:223
-    SalQueryCharPositionEvent mnCursorBoundHeight tools::Long
-vcl/inc/salwtype.hxx:250
+vcl/inc/salwtype.hxx:240
     SalInputContext mpFont rtl::Reference<LogicalFontInstance>
-vcl/inc/salwtype.hxx:257
-    SalSwipeEvent mnVelocityY double
+vcl/inc/salwtype.hxx:247
+    SalGestureSwipeEvent mnVelocityY double
 vcl/inc/scanlinewriter.hxx:35
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/inc/svdata.hxx:454
+vcl/inc/sft.hxx:168
+    vcl::TTGlobalFontInfo_ linegap int
+vcl/inc/sft.hxx:172
+    vcl::TTGlobalFontInfo_ typoLineGap int
+vcl/inc/svdata.hxx:472
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
-vcl/inc/unx/gtk/gtkframe.hxx:78
+vcl/inc/toolbarvalue.hxx:47
+    ToolbarValue mbIsTopDockingArea _Bool
+vcl/inc/unx/gtk/gtkdata.hxx:225
+    DocumentFocusListener m_aRefList o3tl::sorted_vector<css::uno::Reference<css::uno::XInterface> >
+vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
-vcl/inc/unx/gtk/gtkframe.hxx:79
+vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
-vcl/inc/unx/gtk/gtkframe.hxx:80
+vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
-vcl/inc/WidgetThemeLibrary.hxx:20
-    vcl::WidgetDrawStyle nSize uint32_t
-vcl/inc/WidgetThemeLibrary.hxx:104
-    vcl::ControlDrawParameters eButtonValue enum ButtonValue
-vcl/inc/WidgetThemeLibrary.hxx:105
-    vcl::ControlDrawParameters bIsAction _Bool
-vcl/inc/WidgetThemeLibrary.hxx:106
-    vcl::ControlDrawParameters nValue int64_t
-vcl/qa/cppunit/pdfexport/pdfexport.cxx:70
-    (anonymous namespace)::PdfExportTest mpPDFium std::shared_ptr<vcl::pdf::PDFium>
-vcl/source/filter/graphicfilter.cxx:612
-    (anonymous namespace)::ImpFilterLibCacheEntry maFiltername class rtl::OUString
-vcl/source/filter/graphicfilter.cxx:715
-    (anonymous namespace)::ImpFilterLibCache mpLast struct (anonymous namespace)::ImpFilterLibCacheEntry *
-vcl/source/filter/jpeg/Exif.hxx:54
-    Exif::ExifIFD tag sal_uInt8 [2]
-vcl/source/filter/wmf/wmfwr.hxx:95
-    WMFWriter aDstClipRegion vcl::Region
-vcl/source/fontsubset/sft.cxx:92
+vcl/source/components/dtranscomp.cxx:210
+    vcl::(anonymous namespace)::GenericDragSource m_xTrans css::uno::Reference<css::datatransfer::XTransferable>
+vcl/source/fontsubset/sft.cxx:66
+    vcl::(anonymous namespace)::TTGlyphMetrics xMin sal_Int16
+vcl/source/fontsubset/sft.cxx:67
+    vcl::(anonymous namespace)::TTGlyphMetrics yMin sal_Int16
+vcl/source/fontsubset/sft.cxx:68
+    vcl::(anonymous namespace)::TTGlyphMetrics xMax sal_Int16
+vcl/source/fontsubset/sft.cxx:69
+    vcl::(anonymous namespace)::TTGlyphMetrics yMax sal_Int16
+vcl/source/fontsubset/sft.cxx:70
+    vcl::(anonymous namespace)::TTGlyphMetrics aw sal_uInt16
+vcl/source/fontsubset/sft.cxx:71
     vcl::(anonymous namespace)::TTGlyphMetrics lsb sal_Int16
-vcl/source/fontsubset/ttcr.cxx:350
-    vcl::(anonymous namespace)::tdata_post ptr void *
-vcl/unx/generic/app/wmadaptor.cxx:1270
+vcl/source/fontsubset/sft.cxx:72
+    vcl::(anonymous namespace)::TTGlyphMetrics ah sal_uInt16
+vcl/unx/generic/app/wmadaptor.cxx:1268
     _mwmhints deco unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1270
+vcl/unx/generic/app/wmadaptor.cxx:1268
     _mwmhints flags unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1270
+vcl/unx/generic/app/wmadaptor.cxx:1268
     _mwmhints func unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1271
+vcl/unx/generic/app/wmadaptor.cxx:1269
     _mwmhints input_mode tools::Long
-vcl/unx/generic/app/wmadaptor.cxx:1272
+vcl/unx/generic/app/wmadaptor.cxx:1270
     _mwmhints status unsigned long
-vcl/unx/generic/gdi/cairotextrender.cxx:39
-    (anonymous namespace)::CairoFontsCache::CacheId maFace (anonymous namespace)::FT_Face
-vcl/unx/generic/gdi/cairotextrender.cxx:41
+vcl/unx/generic/gdi/cairotextrender.cxx:51
+    (anonymous namespace)::CairoFontsCache::CacheId maFace FT_Face
+vcl/unx/generic/gdi/cairotextrender.cxx:53
     (anonymous namespace)::CairoFontsCache::CacheId mbEmbolden _Bool
-vcl/unx/generic/gdi/cairotextrender.cxx:42
+vcl/unx/generic/gdi/cairotextrender.cxx:54
     (anonymous namespace)::CairoFontsCache::CacheId mbVerticalMetrics _Bool
 vcl/unx/gtk3/a11y/atkwrapper.hxx:51
-    AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk3/a11y/atkwrapper.hxx:79
+    AtkObjectWrapper aParent GtkWidgetAccessible
+vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk3/a11y/gtk3atkutil.cxx:138
-    DocumentFocusListener m_aRefList o3tl::sorted_vector<uno::Reference<uno::XInterface> >
-vcl/unx/gtk3/gtk3glomenu.cxx:14
+vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1653
-     in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:14200
+vcl/unx/gtk3/gtkinst.cxx:21049
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
-vcl/unx/gtk3/gtk3hudawareness.cxx:18
-    (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
-vcl/unx/gtk3/gtk3hudawareness.cxx:21
+vcl/unx/gtk3/hudawareness.cxx:18
+    (anonymous namespace)::HudAwarenessHandle connection gpointer
+vcl/unx/gtk3/hudawareness.cxx:21
     (anonymous namespace)::HudAwarenessHandle notify GDestroyNotify
-vcl/workben/vcldemo.cxx:1737
+vcl/workben/vcldemo.cxx:1739
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
-writerfilter/source/dmapper/DomainMapperTableHandler.cxx:239
+writerfilter/source/dmapper/DocumentProtection.hxx:50
+    writerfilter::dmapper::DocumentProtection m_sRedlineProtectionKey OUString
+writerfilter/source/dmapper/DomainMapperTableHandler.cxx:244
     writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
-writerfilter/source/dmapper/PropertyMap.hxx:220
+writerfilter/source/dmapper/PropertyMap.hxx:246
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-writerfilter/source/dmapper/SettingsTable.cxx:264
-    writerfilter::dmapper::SettingsTable_Impl m_sRedlineProtectionKey class rtl::OUString
-xmlhelp/source/cxxhelp/provider/databases.hxx:250
-    chelp::Databases m_aDatabases chelp::Databases::DatabasesTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:256
-    chelp::Databases m_aModInfo chelp::Databases::ModInfoTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:259
-    chelp::Databases m_aKeywordInfo chelp::Databases::KeywordInfoTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:265
-    chelp::Databases m_aZipFileTable chelp::Databases::ZipFileTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:271
-    chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable
-xmloff/source/draw/ximpstyl.hxx:216
+writerfilter/source/dmapper/PropertyMap.hxx:429
+    writerfilter::dmapper::SectionPropertyMap m_bRightHeader _Bool
+writerfilter/source/dmapper/PropertyMap.hxx:430
+    writerfilter::dmapper::SectionPropertyMap m_bRightFooter _Bool
+writerfilter/source/dmapper/WriteProtection.hxx:36
+    writerfilter::dmapper::WriteProtection m_nCryptProviderType sal_Int32
+xmlhelp/source/cxxhelp/provider/databases.hxx:258
+    chelp::Databases m_aDatabases DatabasesTable
+xmlhelp/source/cxxhelp/provider/databases.hxx:264
+    chelp::Databases m_aModInfo ModInfoTable
+xmlhelp/source/cxxhelp/provider/databases.hxx:267
+    chelp::Databases m_aKeywordInfo KeywordInfoTable
+xmlhelp/source/cxxhelp/provider/databases.hxx:273
+    chelp::Databases m_aZipFileTable ZipFileTable
+xmlhelp/source/cxxhelp/provider/databases.hxx:279
+    chelp::Databases m_aCollatorTable CollatorTable
+xmloff/qa/unit/uxmloff.cxx:107
+    (unnamed struct at /home/noel/libo-plugin/xmloff/qa/unit/uxmloff.cxx:106:12) generator const char *const
+xmloff/qa/unit/uxmloff.cxx:108
+    (unnamed struct at /home/noel/libo-plugin/xmloff/qa/unit/uxmloff.cxx:106:12) buildId const char *const
+xmloff/qa/unit/uxmloff.cxx:109
+    (unnamed struct at /home/noel/libo-plugin/xmloff/qa/unit/uxmloff.cxx:106:12) result const sal_uInt16
+xmloff/source/draw/ximpstyl.hxx:215
     SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> >
-xmloff/source/forms/elementexport.hxx:47
+xmloff/source/forms/elementexport.hxx:45
     xmloff::OElementExport m_pXMLElement std::unique_ptr<SvXMLElementExport>
-xmloff/source/forms/elementexport.hxx:104
+xmloff/source/forms/elementexport.hxx:102
     xmloff::OControlExport m_pOuterElement std::unique_ptr<SvXMLElementExport>
-xmloff/source/forms/officeforms.hxx:69
+xmloff/source/forms/officeforms.hxx:68
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/text/txtimp.cxx:104
     XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper>
-xmlsecurity/inc/certificatechooser.hxx:52
+xmlsecurity/inc/certificatechooser.hxx:57
     CertificateChooser mvUserData std::vector<std::shared_ptr<UserData> >
-xmlsecurity/inc/certificateviewer.hxx:50
-    CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP>
 xmlsecurity/inc/certificateviewer.hxx:51
+    CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP>
+xmlsecurity/inc/certificateviewer.hxx:52
     CertificateViewer mxDetailsPage std::unique_ptr<CertificateViewerDetailsTP>
-xmlsecurity/source/helper/pdfsignaturehelper.cxx:243
+xmlsecurity/qa/unit/signing/signing2.cxx:48
+    SigningTest2 mxSecurityContext uno::Reference<xml::crypto::XXMLSecurityContext>
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:237
     (anonymous namespace)::PageChecksum m_nPageContent BitmapChecksum
-xmlsecurity/source/helper/pdfsignaturehelper.cxx:244
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:238
     (anonymous namespace)::PageChecksum m_aAnnotations std::vector<basegfx::B2DRectangle>
diff --git a/compilerplugins/clang/unusedmember.cxx b/compilerplugins/clang/unusedmember.cxx
index 1d3017134892..610c94e162b3 100644
--- a/compilerplugins/clang/unusedmember.cxx
+++ b/compilerplugins/clang/unusedmember.cxx
@@ -18,8 +18,6 @@
 #include <cassert>
 #include <set>
 
-#include "config_clang.h"
-
 #include "check.hxx"
 #include "compat.hxx"
 #include "plugin.hxx"
@@ -60,40 +58,21 @@ public:
     {
     }
 
-#if CLANG_VERSION < 60000
-
-    bool TraverseAlignedAttr(AlignedAttr* attr)
-    {
-        bool ret = FilteringPlugin::TraverseAlignedAttr(attr);
-        PostTraverseAlignedAttr(attr, ret);
-        return ret;
-    }
-
-    bool PostTraverseAlignedAttr(AlignedAttr* attr, bool run)
+    bool VisitDeclaratorDecl(DeclaratorDecl const* decl)
     {
-        if (!run)
-        {
-            return false;
-        }
-        if (attr->isAlignmentExpr())
-        {
-            if (!TraverseStmt(attr->getAlignmentExpr()))
-            {
-                return false;
-            }
-        }
-        else if (auto const tsi = attr->getAlignmentType())
+        // For declarations like
+        //
+        //   enum E { ... } e;
+        //
+        // it may be that the declaration of E is not marked as referenced even though the
+        // declaration of e clearly references it:
+        if (auto const t = decl->getType()->getAs<EnumType>())
         {
-            if (!TraverseTypeLoc(tsi->getTypeLoc()))
-            {
-                return false;
-            }
+            deferred_.erase(t->getDecl());
         }
         return true;
     }
 
-#endif
-
     bool VisitCXXRecordDecl(CXXRecordDecl const* decl) //TODO: non-CXX RecordDecl?
     {
         if (ignoreLocation(decl))
@@ -147,6 +126,8 @@ public:
                 {
 #if 0 //TODO: friend function definitions are not marked as referenced even if used?
                     if (!d3->isThisDeclarationADefinition()) //TODO: do this check for all kinds?
+#else
+                    (void)d3;
 #endif
                     {
                         continue;
@@ -174,7 +155,7 @@ public:
             }
             if (auto const d1 = dyn_cast<FieldDecl>(d))
             {
-                if (d1->isUnnamedBitfield())
+                if (compat::isUnnamedBitField(d1))
                 {
                     continue;
                 }
@@ -241,6 +222,10 @@ public:
             return true;
         }
         auto const t1 = expr->getTypeSourceInfo()->getType();
+        if (t1->isTemplateTypeParmType())
+        {
+            return true;
+        }
         RecordDecl const* d;
         if (auto const t2 = t1->getAs<InjectedClassNameType>())
         {
@@ -264,9 +249,7 @@ public:
         {
             case UETT_SizeOf:
             case UETT_AlignOf:
-#if CLANG_VERSION >= 80000
             case UETT_PreferredAlignOf:
-#endif
                 break;
             default:
                 return true;
@@ -459,4 +442,6 @@ private:
 loplugin::Plugin::Registration<UnusedMember> unusedmember("unusedmember");
 }
 
+// Cannot be shared, uses TraverseStmt().
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index b854238d2688..5b10eae7e9df 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -17,6 +17,8 @@
 
 #include "clang/AST/Attr.h"
 
+#include "config_clang.h"
+
 #include "plugin.hxx"
 
 /**
@@ -33,11 +35,11 @@ Be warned that it produces around 15G of log file.
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedmethods' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='unusedmethods' check
   $ ./compilerplugins/clang/unusedmethods.py
 
 and then
-  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
+  $ for dir in *; do make FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
 to auto-remove the method declarations
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
@@ -82,6 +84,13 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
+        StringRef fn(handler.getMainFileName());
+        // ignore external code, makes this run faster
+        if (fn.contains("UnpackedTarball"))
+             return;
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -90,10 +99,8 @@ public:
         std::string output;
         for (const MyFuncInfo & s : definitionSet)
         {
-            // ignore external code
-            if (s.sourceLocation.rfind("external/", 0) != 0)
-                output += "definition:\t" + s.access + "\t" + s.returnType + "\t" + s.nameAndParams
-                          + "\t" + s.sourceLocation + "\t" + s.virtualness + "\n";
+            output += "definition:\t" + s.access + "\t" + s.returnType + "\t" + s.nameAndParams
+                      + "\t" + s.sourceLocation + "\t" + s.virtualness + "\n";
         }
         // for the "unused method" analysis
         for (const MyFuncInfo & s : callSet)
@@ -128,6 +135,7 @@ private:
     MyFuncInfo niceName(const FunctionDecl* functionDecl);
     std::string toString(SourceLocation loc);
     void functionTouchedFromExpr( const FunctionDecl* calleeFunctionDecl, const Expr* expr );
+
     CXXRecordDecl const * currentCxxRecordDecl = nullptr;
     FunctionDecl const * currentFunctionDecl = nullptr;
 };
@@ -138,10 +146,6 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
     {
         if (functionDecl->getInstantiatedFromMemberFunction())
             functionDecl = functionDecl->getInstantiatedFromMemberFunction();
-#if CLANG_VERSION < 90000
-        else if (functionDecl->getClassScopeSpecializationPattern())
-            functionDecl = functionDecl->getClassScopeSpecializationPattern();
-#endif
         else if (functionDecl->getTemplateInstantiationPattern())
             functionDecl = functionDecl->getTemplateInstantiationPattern();
         else
@@ -221,7 +225,7 @@ void UnusedMethods::logCallToRootMethods(const FunctionDecl* functionDecl, std::
     {
         while (functionDecl->getTemplateInstantiationPattern())
             functionDecl = functionDecl->getTemplateInstantiationPattern();
-        if (functionDecl->getLocation().isValid() && !ignoreLocation( functionDecl )
+        if (functionDecl->getLocation().isValid() && !ignoreLocation( functionDecl->getBeginLoc() )
              && !functionDecl->isExternC())
             funcSet.insert(niceName(functionDecl));
     }
@@ -266,7 +270,7 @@ gotfunc:
     {
         const FunctionDecl* parentFunctionOfCallSite = getParentFunctionDecl(expr);
         if (parentFunctionOfCallSite != calleeFunctionDecl) {
-            if (!parentFunctionOfCallSite || !ignoreLocation(parentFunctionOfCallSite)) {
+            if (!parentFunctionOfCallSite || !ignoreLocation(parentFunctionOfCallSite->getBeginLoc())) {
                 calledFromOutsideSet.insert(niceName(calleeFunctionDecl));
             }
         }
@@ -306,7 +310,7 @@ bool UnusedMethods::VisitCXXConstructExpr( const CXXConstructExpr* constructExpr
     const CXXConstructorDecl* constructorDecl = constructExpr->getConstructor();
     constructorDecl = constructorDecl->getCanonicalDecl();
 
-    if (!constructorDecl->getLocation().isValid() || ignoreLocation(constructorDecl)) {
+    if (!constructorDecl->getLocation().isValid() || ignoreLocation(constructorDecl->getBeginLoc())) {
         return true;
     }
 
@@ -337,7 +341,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
     {
         return true;
     }
-    if (!canonicalFunctionDecl->getLocation().isValid() || ignoreLocation(canonicalFunctionDecl)) {
+    if (!canonicalFunctionDecl->getLocation().isValid() || ignoreLocation(canonicalFunctionDecl->getBeginLoc())) {
         return true;
     }
     // ignore method overrides, since the call will show up as being directed to the root method
@@ -367,7 +371,7 @@ bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
     {
         const FunctionDecl* parentFunctionOfCallSite = getParentFunctionDecl(declRefExpr);
         if (parentFunctionOfCallSite != functionDecl) {
-            if (!parentFunctionOfCallSite || !ignoreLocation(parentFunctionOfCallSite)) {
+            if (!parentFunctionOfCallSite || !ignoreLocation(parentFunctionOfCallSite->getBeginLoc())) {
                 calledFromOutsideSet.insert(niceName(functionDecl));
             }
         }
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 803b0b87733b..9d8297f4935d 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -25,9 +24,14 @@ usedReturnSet = set() # set of tuple(return_type, name_and_params)
 
 # clang does not always use exactly the same numbers in the type-parameter vars it generates
 # so I need to substitute them to ensure we can match correctly.
-normalizeTypeParamsRegex = re.compile(r"type-parameter-\d+-\d+")
+normalizeTypeParamsRegex1 = re.compile(r"type-parameter-\d+-\d+")
+# clang sometimes generates a type name as either "class Foo" or "Foo"
+# so I need to substitute them to ensure we can match correctly.
+normalizeTypeParamsRegex2 = re.compile(r"class ")
 def normalizeTypeParams( line ):
-    return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
+    line = normalizeTypeParamsRegex1.sub("type-parameter-?-?", line)
+    line = normalizeTypeParamsRegex2.sub("", line)
+    return line
 
 # --------------------------------------------------------------------------------------------
 # primary input loop
@@ -159,6 +163,7 @@ for d in definitionSet:
        continue
     # ignore lambdas
     if (" ::operator " in method) or (" ::__invoke(" in method) or (" ::operator())" in method): continue
+    if ("(lambda at " in method): continue
     # ignore stuff generated by std::function parameters
     if ("(anonymous)::operator " in method) and ("(*)" in method): continue
     # stuff generated by Qt
@@ -227,19 +232,32 @@ for d in definitionSet:
     # debug code
     if d[1] == "writerfilter::ooxml::OOXMLPropertySet::toString()":
         continue
+    # ignore lambdas
+    if "::__invoke(" in d[1]:
+        continue;
+    if "(lambda at " in d[1]:
+        continue;
+    if "::operator " in d[1] and "(*)(" in d[1]:
+        continue;
     location = definitionToSourceLocationMap[d];
     # windows only
     if location.startswith("include/svl/svdde.hxx"): continue
     # fluent API (return ref to self)
     if location.startswith("include/tools/stream.hxx"): continue
+    if location.startswith("include/oox/helper/refvector.hxx"): continue
+    if location.startswith("include/oox/drawingml/chart/modelbase.hxx"): continue
+    # templates
+    if location.startswith("include/vcl/vclptr.hxx"): continue
+    # external API
+    if location.startswith("include/LibreOfficeKit/LibreOfficeKit.hxx"): continue
     tmp2set.add((method, location))
 
 #Disable this for now, not really using it
 # print output, sorted by name and line number
-#with open("compilerplugins/clang/unusedmethods.unused-returns.results", "wt") as f:
-#    for t in sort_set_by_natural_key(tmp2set):
-#        f.write(t[1] + "\n")
-#        f.write("    " +  t[0] + "\n")
+with open("compilerplugins/clang/unusedmethods.unused-returns.results", "wt") as f:
+    for t in sort_set_by_natural_key(tmp2set):
+        f.write(t[1] + "\n")
+        f.write("    " +  t[0] + "\n")
 
 
 # --------------------------------------------------------------------------------------------
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 6673bd00e62a..be4adf18f3be 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,4 +1,6 @@
-basegfx/source/range/b2drangeclipper.cxx:688
+basctl/source/basicide/baside2.hxx:405
+    rtl::OUString basctl::ModulWindow::GetEditorColorScheme()
+basegfx/source/range/b2drangeclipper.cxx:686
     type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
 basic/source/inc/buffer.hxx:40
     void SbiBuffer::operator+=(signed char)
@@ -21,105 +23,147 @@ canvas/inc/rendering/icolorbuffer.hxx:70
 canvas/inc/rendering/isurfaceproxy.hxx:38
     void canvas::ISurfaceProxy::setColorBufferDirty()
 canvas/inc/rendering/isurfaceproxy.hxx:51
-    _Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint &,const class basegfx::B2DHomMatrix &)
+    _Bool canvas::ISurfaceProxy::draw(double,const basegfx::B2DPoint &,const basegfx::B2DHomMatrix &)
 canvas/inc/rendering/isurfaceproxy.hxx:71
-    _Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint &,const class basegfx::B2DRange &,const class basegfx::B2DHomMatrix &)
+    _Bool canvas::ISurfaceProxy::draw(double,const basegfx::B2DPoint &,const basegfx::B2DRange &,const basegfx::B2DHomMatrix &)
 canvas/inc/rendering/isurfaceproxy.hxx:91
-    _Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint &,const class basegfx::B2DPolyPolygon &,const class basegfx::B2DHomMatrix &)
+    _Bool canvas::ISurfaceProxy::draw(double,const basegfx::B2DPoint &,const basegfx::B2DPolyPolygon &,const basegfx::B2DHomMatrix &)
 canvas/inc/rendering/isurfaceproxymanager.hxx:57
-    class std::shared_ptr<struct canvas::ISurfaceProxy> canvas::ISurfaceProxyManager::createSurfaceProxy(const class std::shared_ptr<struct canvas::IColorBuffer> &) const
+    std::shared_ptr<struct canvas::ISurfaceProxy> canvas::ISurfaceProxyManager::createSurfaceProxy(const std::shared_ptr<struct canvas::IColorBuffer> &) const
 canvas/inc/rendering/isurfaceproxymanager.hxx:63
-    class std::shared_ptr<struct canvas::ISurfaceProxyManager> canvas::createSurfaceProxyManager(const class std::shared_ptr<struct canvas::IRenderModule> &)
+    std::shared_ptr<struct canvas::ISurfaceProxyManager> canvas::createSurfaceProxyManager(const std::shared_ptr<struct canvas::IRenderModule> &)
 canvas/inc/vclwrapper.hxx:66
      canvas::vcltools::VCLObject::VCLObject<Wrappee_>(unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> >)
-canvas/inc/vclwrapper.hxx:135
-    type-parameter-?-? & canvas::vcltools::VCLObject::get()
-canvas/inc/vclwrapper.hxx:136
-    const type-parameter-?-? & canvas::vcltools::VCLObject::get() const
 canvas/inc/vclwrapper.hxx:138
     void canvas::vcltools::VCLObject::swap(VCLObject<Wrappee_> &)
-canvas/source/vcl/impltools.hxx:102
+canvas/source/vcl/canvasfont.hxx:78
+    const struct com::sun::star::geometry::Matrix2D & vclcanvas::CanvasFont::getFontMatrix() const
+canvas/source/vcl/impltools.hxx:107
      vclcanvas::tools::LocalGuard::LocalGuard()
+chart2/source/view/axes/VAxisBase.hxx:73
+    std::shared_ptr<chart::DataTableView> chart::VAxisBase::getDataTableView()
 connectivity/inc/sdbcx/VGroup.hxx:61
      connectivity::sdbcx::OGroup::OGroup(_Bool)
 connectivity/inc/sdbcx/VGroup.hxx:62
-     connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool)
-connectivity/source/drivers/firebird/Driver.hxx:60
-    const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> & connectivity::firebird::FirebirdDriver::getContext() const
+     connectivity::sdbcx::OGroup::OGroup(const rtl::OUString &,_Bool)
+connectivity/source/drivers/evoab2/NResultSet.hxx:60
+    rtl::OString connectivity::evoab::OEvoabVersionHelper::getUserName(void *)
+connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:49
+    com::sun::star::uno::Reference<com::sun::star::sdbc::XResultSetMetaData> connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
+connectivity/source/drivers/firebird/Driver.hxx:61
+    const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> & connectivity::firebird::FirebirdDriver::getContext() const
 connectivity/source/drivers/firebird/Util.hxx:66
-     connectivity::firebird::ColumnTypeInfo::ColumnTypeInfo(short,const class rtl::OUString &)
+     connectivity::firebird::ColumnTypeInfo::ColumnTypeInfo(short,rtl::OUString)
 connectivity/source/drivers/firebird/Util.hxx:71
     short connectivity::firebird::ColumnTypeInfo::getType() const
 connectivity/source/drivers/firebird/Util.hxx:72
     short connectivity::firebird::ColumnTypeInfo::getSubType() const
 connectivity/source/drivers/firebird/Util.hxx:74
-    const class rtl::OUString & connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
-connectivity/source/drivers/mysqlc/mysqlc_connection.hxx:176
-    class rtl::OUString connectivity::mysqlc::OConnection::transFormPreparedStatement(const class rtl::OUString &)
-connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:94
+    const rtl::OUString & connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
+connectivity/source/drivers/mysqlc/mysqlc_connection.hxx:180
+    rtl::OUString connectivity::mysqlc::OConnection::transFormPreparedStatement(const rtl::OUString &)
+connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:91
     type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::safelyRetrieveValue(const int)
-connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:95
+connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:92
     type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::retrieveValue(const int)
-connectivity/source/inc/dbase/dindexnode.hxx:65
-    _Bool connectivity::dbase::ONDXKey::operator<(const class connectivity::dbase::ONDXKey &) const
-connectivity/source/inc/java/sql/Connection.hxx:61
-    class rtl::OUString connectivity::java_sql_Connection::transFormPreparedStatement(const class rtl::OUString &)
+connectivity/source/drivers/mysqlc/mysqlc_user.hxx:28
+     connectivity::mysqlc::User::User(com::sun::star::uno::Reference<com::sun::star::sdbc::XConnection>)
+connectivity/source/inc/calc/CDriver.hxx:30
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> connectivity::calc::ODriver_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+connectivity/source/inc/dbase/DDriver.hxx:29
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> connectivity::dbase::ODriver_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+connectivity/source/inc/dbase/dindexnode.hxx:64
+    _Bool connectivity::dbase::ONDXKey::operator<(const connectivity::dbase::ONDXKey &) const
+connectivity/source/inc/flat/EDriver.hxx:29
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> connectivity::flat::ODriver_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+connectivity/source/inc/java/sql/Connection.hxx:60
+    rtl::OUString connectivity::java_sql_Connection::transFormPreparedStatement(const rtl::OUString &)
 connectivity/source/inc/OColumn.hxx:103
     _Bool connectivity::OColumn::isReadOnly() const
 connectivity/source/inc/OColumn.hxx:104
     _Bool connectivity::OColumn::isWritable() const
 connectivity/source/inc/OColumn.hxx:105
     _Bool connectivity::OColumn::isDefinitelyWritable() const
-connectivity/source/inc/odbc/OConnection.hxx:118
-    class connectivity::odbc::ODBCDriver * connectivity::odbc::OConnection::getDriver() const
-connectivity/source/inc/odbc/ODriver.hxx:72
-    const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> & connectivity::odbc::ODBCDriver::getContext() const
-connectivity/source/inc/odbc/OPreparedStatement.hxx:71
+connectivity/source/inc/odbc/OConnection.hxx:117
+    connectivity::odbc::ODBCDriver * connectivity::odbc::OConnection::getDriver() const
+connectivity/source/inc/odbc/ODriver.hxx:71
+    const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> & connectivity::odbc::ODBCDriver::getContext() const
+connectivity/source/inc/odbc/OPreparedStatement.hxx:70
     void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,const type-parameter-?-?)
-connectivity/source/inc/odbc/OPreparedStatement.hxx:72
+connectivity/source/inc/odbc/OPreparedStatement.hxx:71
     void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,int,const type-parameter-?-?)
-connectivity/source/inc/OTypeInfo.hxx:46
+connectivity/source/inc/OTypeInfo.hxx:45
     _Bool connectivity::OTypeInfo::operator==(const struct connectivity::OTypeInfo &) const
-connectivity/source/inc/OTypeInfo.hxx:47
+connectivity/source/inc/OTypeInfo.hxx:46
     _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const
-cui/source/dialogs/SpellAttrib.hxx:72
+cppuhelper/inc/compbase2.hxx:60
+    void cppuhelper::WeakComponentImplHelperBase2::throwIfDisposed(std::unique_lock<std::mutex> &)
+cppuhelper/inc/interfacecontainer4.hxx:93
+    void cppuhelper::OInterfaceIteratorHelper4::remove(std::unique_lock<std::mutex> &)
+cppuhelper/inc/interfacecontainer4.hxx:142
+    int cppuhelper::OInterfaceContainerHelper4::getLength(std::unique_lock<std::mutex> &) const
+cppuhelper/inc/interfacecontainer4.hxx:150
+    vector<Reference<type-parameter-?-?>, allocator<Reference<type-parameter-?-?> > > cppuhelper::OInterfaceContainerHelper4::getElements(std::unique_lock<std::mutex> &) const
+cppuhelper/inc/interfacecontainer4.hxx:195
+    void cppuhelper::OInterfaceContainerHelper4::clear(std::unique_lock<std::mutex> &)
+cppuhelper/inc/interfacecontainer4.hxx:210
+    void cppuhelper::OInterfaceContainerHelper4::forEach(std::unique_lock<std::mutex> &,const type-parameter-?-? &) const
+cppuhelper/inc/interfacecontainer4.hxx:235
+    void cppuhelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::lang::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+cppuhelper/inc/interfacecontainer4.hxx:235
+    void cppuhelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (type-parameter-?-?::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+cppuhelper/inc/interfacecontainer4.hxx:270
+     cppuhelper::OInterfaceContainerHelper4::NotifySingleListener::NotifySingleListener<EventT>(void (type-parameter-?-?::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+cppuhelper/inc/interfacecontainer4.hxx:277
+    void cppuhelper::OInterfaceContainerHelper4::NotifySingleListener::operator()(const Reference<type-parameter-?-?> &) const
+cui/source/dialogs/SpellAttrib.hxx:73
     _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const
 cui/source/inc/CustomNotebookbarGenerator.hxx:30
      CustomNotebookbarGenerator::CustomNotebookbarGenerator()
+cui/source/inc/fileextcheckdlg.hxx:32
+    void FileExtCheckDialog::LinkStubOnOkClick(void *,weld::Button &)
+cui/source/inc/fileextcheckdlg.hxx:32
+    void FileExtCheckDialog::OnOkClick(weld::Button &)
+cui/source/inc/fileextcheckdlg.hxx:35
+     FileExtCheckDialog::FileExtCheckDialog(weld::Window *,const rtl::OUString &,const rtl::OUString &)
+cui/source/inc/GraphicsTestsDialog.hxx:48
+    void GraphicsTestsDialog::HandleResultViewRequest(weld::Button &)
+cui/source/inc/GraphicsTestsDialog.hxx:48
+    void GraphicsTestsDialog::LinkStubHandleResultViewRequest(void *,weld::Button &)
 cui/source/inc/SvxNotebookbarConfigPage.hxx:40
     void SvxNotebookbarConfigPage::SetElement()
+cui/source/options/optsave.hxx:82
+    void SvxSaveTabPage::DetectHiddenControls()
 dbaccess/source/filter/hsqldb/fbalterparser.hxx:19
     void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
 dbaccess/source/filter/hsqldb/parseschema.hxx:80
-    const class std::__debug::map<class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> >, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > > > > & dbahsql::SchemaParser::getPrimaryKeys() const
+    const std::map<rtl::OUString, std::vector<rtl::OUString> > & dbahsql::SchemaParser::getPrimaryKeys() const
+dbaccess/source/ui/inc/dsmeta.hxx:87
+    __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, std::set<int> > dbaui::FeatureSet::begin() const
 dbaccess/source/ui/inc/dsmeta.hxx:88
-    class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::begin() const
-dbaccess/source/ui/inc/dsmeta.hxx:89
-    class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::end() const
-dbaccess/source/ui/inc/FieldControls.hxx:67
-    class rtl::OUString dbaui::OPropNumericEditCtrl::get_text() const
-dbaccess/source/ui/inc/FieldControls.hxx:72
+    __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, std::set<int> > dbaui::FeatureSet::end() const
+dbaccess/source/ui/inc/FieldControls.hxx:68
+    rtl::OUString dbaui::OPropNumericEditCtrl::get_text() const
+dbaccess/source/ui/inc/FieldControls.hxx:73
     void dbaui::OPropNumericEditCtrl::set_min(int)
-dbaccess/source/ui/inc/indexcollection.hxx:52
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::begin() const
-dbaccess/source/ui/inc/indexcollection.hxx:56
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::end() const
-dbaccess/source/ui/inc/indexcollection.hxx:61
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::find(const class rtl::OUString &) const
-dbaccess/source/ui/inc/indexcollection.hxx:63
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const
-dbaccess/source/ui/inc/sbamultiplex.hxx:384
-    class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &)
-dbaccess/source/ui/inc/unodatbr.hxx:313
-    _Bool dbaui::SbaTableQueryBrowser::implCopyObject(class ODataClipboard &,const class weld::TreeIter &,int)
-desktop/source/deployment/gui/dp_gui_dialog2.hxx:132
-    void dp_gui::ExtMgrDialog::LinkStubHandleUpdateBtn(void *,class weld::Button &)
+dbaccess/source/ui/inc/indexcollection.hxx:51
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, std::__cxx1998::vector<struct dbaui::OIndex> >, std::vector<struct dbaui::OIndex> > dbaui::OIndexCollection::begin() const
+dbaccess/source/ui/inc/indexcollection.hxx:55
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, std::__cxx1998::vector<struct dbaui::OIndex> >, std::vector<struct dbaui::OIndex> > dbaui::OIndexCollection::end() const
+dbaccess/source/ui/inc/indexcollection.hxx:60
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, std::__cxx1998::vector<struct dbaui::OIndex> >, std::vector<struct dbaui::OIndex> > dbaui::OIndexCollection::find(const rtl::OUString &) const
+dbaccess/source/ui/inc/indexcollection.hxx:62
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, std::__cxx1998::vector<struct dbaui::OIndex> >, std::vector<struct dbaui::OIndex> > dbaui::OIndexCollection::findOriginal(const rtl::OUString &) const
+dbaccess/source/ui/inc/unodatbr.hxx:316
+    _Bool dbaui::SbaTableQueryBrowser::implCopyObject(ODataClipboard &,const weld::TreeIter &,int)
+desktop/inc/lib/init.hxx:142
+     desktop::CallbackFlushHandler::CallbackData::CallbackData(const tools::Rectangle *,int)
 desktop/source/lib/lokclipboard.hxx:95
      LOKClipboardFactory::LOKClipboardFactory()
 drawinglayer/inc/texture/texture.hxx:39
-    _Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const
-drawinglayer/source/tools/emfpcustomlinecap.hxx:37
-    void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &)
+    _Bool drawinglayer::texture::GeoTexSvx::operator!=(const drawinglayer::texture::GeoTexSvx &) const
+drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.hxx:37
+    drawinglayer::geometry::ViewInformation2D drawinglayer::primitive2d::expandB2DRangeAtViewInformation2D(const drawinglayer::geometry::ViewInformation2D &,double)
 drawinglayer/source/tools/emfpstringformat.hxx:93
     _Bool emfplushelper::EMFPStringFormat::NoFitBlackBox() const
 drawinglayer/source/tools/emfpstringformat.hxx:94
@@ -136,400 +180,864 @@ drawinglayer/source/tools/emfpstringformat.hxx:99
     _Bool emfplushelper::EMFPStringFormat::NoClip() const
 drawinglayer/source/tools/emfpstringformat.hxx:100
     _Bool emfplushelper::EMFPStringFormat::BypassGDI() const
+editeng/inc/EditLine.hxx:102
+    _Bool EditLine::IsInvalid() const
 editeng/inc/edtspell.hxx:103
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::begin() const
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, std::__cxx1998::vector<struct editeng::MisspellRange> >, std::vector<struct editeng::MisspellRange> > WrongList::begin() const
 editeng/inc/edtspell.hxx:104
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::end() const
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, std::__cxx1998::vector<struct editeng::MisspellRange> >, std::vector<struct editeng::MisspellRange> > WrongList::end() const
+editeng/inc/ParagraphPortionList.hxx:59
+    void ParaPortionList::Append(std::unique_ptr<ParaPortion>)
+editeng/inc/ParagraphPortionList.hxx:71
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const std::unique_ptr<ParaPortion> *, std::__cxx1998::vector<std::unique_ptr<ParaPortion> > >, std::vector<std::unique_ptr<ParaPortion> > > ParaPortionList::cbegin() const
+editeng/inc/ParagraphPortionList.hxx:72
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const std::unique_ptr<ParaPortion> *, std::__cxx1998::vector<std::unique_ptr<ParaPortion> > >, std::vector<std::unique_ptr<ParaPortion> > > ParaPortionList::cend() const
+editeng/source/editeng/impedit.hxx:236
+    tools::Rectangle LOKSpecialPositioning::GetWindowPos(const tools::Rectangle &,enum MapUnit) const
+editeng/source/editeng/impedit.hxx:801
+    double ImpEditEngine::scaleYFontValue(unsigned short) const
+embeddedobj/source/msole/olecomponent.hxx:75
+    _Bool OleComponent::InitializeObject_Impl()
+embeddedobj/source/msole/olecomponent.hxx:77
+    void OleComponent::CreateNewIStorage_Impl()
+embeddedobj/source/msole/olecomponent.hxx:78
+    void OleComponent::RetrieveObjectDataFlavors_Impl()
+embeddedobj/source/msole/olecomponent.hxx:79
+    void OleComponent::Dispose()
+embeddedobj/source/msole/olecomponent.hxx:83
+     OleComponent::OleComponent(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> &,OleEmbeddedObject *)
+embeddedobj/source/msole/olecomponent.hxx:88
+    OleComponent * OleComponent::createEmbeddedCopyOfLink()
+embeddedobj/source/msole/olecomponent.hxx:90
+    void OleComponent::disconnectEmbeddedObject()
+embeddedobj/source/msole/olecomponent.hxx:92
+    struct com::sun::star::awt::Size OleComponent::CalculateWithFactor(const struct com::sun::star::awt::Size &,const struct com::sun::star::awt::Size &,const struct com::sun::star::awt::Size &)
+embeddedobj/source/msole/olecomponent.hxx:96
+    struct com::sun::star::awt::Size OleComponent::CalculateTheRealSize(const struct com::sun::star::awt::Size &,_Bool)
+embeddedobj/source/msole/olecomponent.hxx:99
+    void OleComponent::LoadEmbeddedObject(const rtl::OUString &)
+embeddedobj/source/msole/olecomponent.hxx:100
+    void OleComponent::CreateObjectFromClipboard()
+embeddedobj/source/msole/olecomponent.hxx:101
+    void OleComponent::CreateNewEmbeddedObject(const com::sun::star::uno::Sequence<signed char> &)
+embeddedobj/source/msole/olecomponent.hxx:102
+    void OleComponent::CreateObjectFromData(const com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> &)
+embeddedobj/source/msole/olecomponent.hxx:104
+    void OleComponent::CreateObjectFromFile(const rtl::OUString &)
+embeddedobj/source/msole/olecomponent.hxx:105
+    void OleComponent::CreateLinkFromFile(const rtl::OUString &)
+embeddedobj/source/msole/olecomponent.hxx:106
+    void OleComponent::InitEmbeddedCopyOfLink(const rtl::Reference<OleComponent> &)
+embeddedobj/source/msole/olecomponent.hxx:109
+    void OleComponent::RunObject()
+embeddedobj/source/msole/olecomponent.hxx:110
+    void OleComponent::CloseObject()
+embeddedobj/source/msole/olecomponent.hxx:112
+    com::sun::star::uno::Sequence<struct com::sun::star::embed::VerbDescriptor> OleComponent::GetVerbList()
+embeddedobj/source/msole/olecomponent.hxx:114
+    void OleComponent::ExecuteVerb(int)
+embeddedobj/source/msole/olecomponent.hxx:115
+    void OleComponent::SetHostName(const rtl::OUString &)
+embeddedobj/source/msole/olecomponent.hxx:116
+    void OleComponent::SetExtent(const struct com::sun::star::awt::Size &,long)
+embeddedobj/source/msole/olecomponent.hxx:118
+    struct com::sun::star::awt::Size OleComponent::GetExtent(long)
+embeddedobj/source/msole/olecomponent.hxx:119
+    struct com::sun::star::awt::Size OleComponent::GetCachedExtent(long)
+embeddedobj/source/msole/olecomponent.hxx:120
+    struct com::sun::star::awt::Size OleComponent::GetRecommendedExtent(long)
+embeddedobj/source/msole/olecomponent.hxx:122
+    long OleComponent::GetMiscStatus(long)
+embeddedobj/source/msole/olecomponent.hxx:124
+    com::sun::star::uno::Sequence<signed char> OleComponent::GetCLSID()
+embeddedobj/source/msole/olecomponent.hxx:126
+    _Bool OleComponent::IsWorkaroundActive() const
+embeddedobj/source/msole/olecomponent.hxx:127
+    _Bool OleComponent::IsDirty()
+embeddedobj/source/msole/olecomponent.hxx:129
+    void OleComponent::StoreOwnTmpIfNecessary()
+embeddedobj/source/msole/olecomponent.hxx:131
+    _Bool OleComponent::SaveObject_Impl()
+embeddedobj/source/msole/olecomponent.hxx:132
+    _Bool OleComponent::OnShowWindow_Impl(_Bool)
+embeddedobj/source/msole/olecomponent.hxx:133
+    void OleComponent::OnViewChange_Impl(unsigned int)
+embeddedobj/source/msole/olecomponent.hxx:134
+    void OleComponent::OnClose_Impl()
 extensions/source/scanner/scanner.hxx:79
     void ScannerManager::SetData(void *)
-hwpfilter/source/mzstring.h:100
-    class MzString & MzString::operator<<(unsigned char)
-hwpfilter/source/mzstring.h:102
-    class MzString & MzString::operator<<(long)
-hwpfilter/source/mzstring.h:103
-    class MzString & MzString::operator<<(short)
-idl/source/prj/svidl.cxx:105
+extensions/source/scanner/scanner.hxx:83
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScannerManager_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+filter/source/svg/svgwriter.hxx:347
+    Color SVGActionWriter::ImplGetColorWithIntensity(const Color &,unsigned short)
+hwpfilter/source/hiodev.h:63
+    unsigned long HIODev::read4b(void *,unsigned long)
+idl/source/prj/svidl.cxx:103
     int main(int,char **)
-include/basegfx/color/bcolormodifier.hxx:76
-    _Bool basegfx::BColorModifier::operator!=(const class basegfx::BColorModifier &) const
+include/basegfx/color/bcolormodifier.hxx:392
+     basegfx::BColorModifier_randomize::BColorModifier_randomize(double)
+include/basegfx/curve/b2dcubicbezier.hxx:50
+    _Bool basegfx::B2DCubicBezier::operator==(const basegfx::B2DCubicBezier &) const
 include/basegfx/curve/b2dcubicbezier.hxx:51
-    _Bool basegfx::B2DCubicBezier::operator==(const class basegfx::B2DCubicBezier &) const
-include/basegfx/curve/b2dcubicbezier.hxx:52
-    _Bool basegfx::B2DCubicBezier::operator!=(const class basegfx::B2DCubicBezier &) const
-include/basegfx/curve/b2dcubicbezier.hxx:192
-    void basegfx::B2DCubicBezier::transform(const class basegfx::B2DHomMatrix &)
-include/basegfx/curve/b2dcubicbezier.hxx:195
+    _Bool basegfx::B2DCubicBezier::operator!=(const basegfx::B2DCubicBezier &) const
+include/basegfx/curve/b2dcubicbezier.hxx:194
+    void basegfx::B2DCubicBezier::transform(const basegfx::B2DHomMatrix &)
+include/basegfx/curve/b2dcubicbezier.hxx:197
     void basegfx::B2DCubicBezier::fround()
-include/basegfx/matrix/b2dhommatrix.hxx:103
-    void basegfx::B2DHomMatrix::translate(const class basegfx::B2DTuple &)
-include/basegfx/matrix/b2dhommatrix.hxx:106
-    void basegfx::B2DHomMatrix::scale(const class basegfx::B2DTuple &)
-include/basegfx/matrix/b2dhommatrix.hxx:112
-    class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator+=(const class basegfx::B2DHomMatrix &)
 include/basegfx/matrix/b2dhommatrix.hxx:113
-    class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator-=(const class basegfx::B2DHomMatrix &)
-include/basegfx/matrix/b2dhommatrix.hxx:118
-    class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator*=(double)
-include/basegfx/matrix/b2dhommatrix.hxx:119
-    class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator/=(double)
-include/basegfx/matrix/b2dhommatrixtools.hxx:131
-    class basegfx::B2DHomMatrix basegfx::utils::createRotateAroundCenterKeepAspectRatioStayInsideRange(const class basegfx::B2DRange &,double)
-include/basegfx/matrix/b2dhommatrixtools.hxx:217
+    void basegfx::B2DHomMatrix::scale(const basegfx::B2DTuple &)
+include/basegfx/matrix/b2dhommatrixtools.hxx:132
+    basegfx::B2DHomMatrix basegfx::utils::createRotateAroundCenterKeepAspectRatioStayInsideRange(const basegfx::B2DRange &,double)
+include/basegfx/matrix/b2dhommatrixtools.hxx:214
     double basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose::getShearX() const
 include/basegfx/matrix/b3dhommatrix.hxx:66
-    void basegfx::B3DHomMatrix::rotate(const class basegfx::B3DTuple &)
+    void basegfx::B3DHomMatrix::rotate(const basegfx::B3DTuple &)
 include/basegfx/matrix/b3dhommatrix.hxx:70
-    void basegfx::B3DHomMatrix::translate(const class basegfx::B3DTuple &)
+    void basegfx::B3DHomMatrix::translate(const basegfx::B3DTuple &)
 include/basegfx/matrix/b3dhommatrix.hxx:74
-    void basegfx::B3DHomMatrix::scale(const class basegfx::B3DTuple &)
+    void basegfx::B3DHomMatrix::scale(const basegfx::B3DTuple &)
 include/basegfx/matrix/b3dhommatrix.hxx:97
-    class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator+=(const class basegfx::B3DHomMatrix &)
+    basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator+=(const basegfx::B3DHomMatrix &)
 include/basegfx/matrix/b3dhommatrix.hxx:98
-    class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator-=(const class basegfx::B3DHomMatrix &)
+    basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator-=(const basegfx::B3DHomMatrix &)
+include/basegfx/matrix/b3dhommatrix.hxx:104
+    basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator*=(double)
 include/basegfx/matrix/b3dhommatrix.hxx:105
-    class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator*=(double)
-include/basegfx/matrix/b3dhommatrix.hxx:106
-    class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator/=(double)
-include/basegfx/numeric/ftools.hxx:145
+    basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator/=(double)
+include/basegfx/matrix/hommatrixtemplate.hxx:43
+     basegfx::internal::ImplMatLine::ImplMatLine<RowSize>(unsigned short)
+include/basegfx/matrix/hommatrixtemplate.hxx:297
+    _Bool basegfx::internal::ImplHomMatrixTemplate::isInvertible() const
+include/basegfx/numeric/ftools.hxx:116
     double basegfx::snapToRange(double,double,double)
-include/basegfx/numeric/ftools.hxx:149
+include/basegfx/numeric/ftools.hxx:120
     double basegfx::copySign(double,double)
 include/basegfx/pixel/bpixel.hxx:53
      basegfx::BPixel::BPixel(unsigned char,unsigned char,unsigned char,unsigned char)
 include/basegfx/pixel/bpixel.hxx:84
-    _Bool basegfx::BPixel::operator==(const class basegfx::BPixel &) const
+    _Bool basegfx::BPixel::operator==(const basegfx::BPixel &) const
 include/basegfx/pixel/bpixel.hxx:89
-    _Bool basegfx::BPixel::operator!=(const class basegfx::BPixel &) const
-include/basegfx/point/b2ipoint.hxx:70
-    class basegfx::B2IPoint & basegfx::B2IPoint::operator*=(const class basegfx::B2IPoint &)
-include/basegfx/point/b2ipoint.hxx:79
-    class basegfx::B2IPoint & basegfx::B2IPoint::operator*=(int)
-include/basegfx/point/b2ipoint.hxx:96
-    class basegfx::B2IPoint & basegfx::B2IPoint::operator*=(const class basegfx::B2DHomMatrix &)
-include/basegfx/point/b3dpoint.hxx:75
-    class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(const class basegfx::B3DPoint &)
-include/basegfx/point/b3dpoint.hxx:85
-    class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(double)
+    _Bool basegfx::BPixel::operator!=(const basegfx::BPixel &) const
+include/basegfx/point/b2ipoint.hxx:69
+    basegfx::B2IPoint & basegfx::B2IPoint::operator*=(const basegfx::B2IPoint &)
+include/basegfx/point/b2ipoint.hxx:78
+    basegfx::B2IPoint & basegfx::B2IPoint::operator*=(int)
+include/basegfx/point/b2ipoint.hxx:95
+    basegfx::B2IPoint & basegfx::B2IPoint::operator*=(const basegfx::B2DHomMatrix &)
+include/basegfx/point/b3dpoint.hxx:74
+    basegfx::B3DPoint & basegfx::B3DPoint::operator*=(const basegfx::B3DPoint &)
+include/basegfx/point/b3dpoint.hxx:84
+    basegfx::B3DPoint & basegfx::B3DPoint::operator*=(double)
 include/basegfx/polygon/b2dtrapezoid.hxx:70
-    class basegfx::B2DPolygon basegfx::B2DTrapezoid::getB2DPolygon() const
+    basegfx::B2DPolygon basegfx::B2DTrapezoid::getB2DPolygon() const
 include/basegfx/polygon/b2dtrapezoid.hxx:102
-    void basegfx::utils::createLineTrapezoidFromB2DPolygon(class std::__debug::vector<class basegfx::B2DTrapezoid, class std::allocator<class basegfx::B2DTrapezoid> > &,const class basegfx::B2DPolygon &,double)
+    void basegfx::utils::createLineTrapezoidFromB2DPolygon(std::vector<basegfx::B2DTrapezoid> &,const basegfx::B2DPolygon &,double)
 include/basegfx/polygon/b3dpolypolygon.hxx:88
     void basegfx::B3DPolyPolygon::remove(unsigned int,unsigned int)
 include/basegfx/polygon/b3dpolypolygon.hxx:108
-    class basegfx::B3DPolygon * basegfx::B3DPolyPolygon::begin()
+    basegfx::B3DPolygon * basegfx::B3DPolyPolygon::begin()
 include/basegfx/polygon/b3dpolypolygon.hxx:109
-    class basegfx::B3DPolygon * basegfx::B3DPolyPolygon::end()
+    basegfx::B3DPolygon * basegfx::B3DPolyPolygon::end()
 include/basegfx/range/b1drange.hxx:50
      basegfx::B1DRange::B1DRange(double)
-include/basegfx/range/b1drange.hxx:72
-    _Bool basegfx::B1DRange::operator==(const class basegfx::B1DRange &) const
 include/basegfx/range/b1drange.hxx:143
     double basegfx::B1DRange::clamp(double) const
 include/basegfx/range/b2dpolyrange.hxx:64
-    _Bool basegfx::B2DPolyRange::operator!=(const class basegfx::B2DPolyRange &) const
-include/basegfx/range/b2drange.hxx:277
-    class basegfx::B2DTuple basegfx::B2DRange::clamp(const class basegfx::B2DTuple &) const
-include/basegfx/range/b2drange.hxx:297
-    const class basegfx::B2DRange & basegfx::B2DRange::getUnitB2DRange()
-include/basegfx/range/b2drange.hxx:308
-    class basegfx::B2DRange basegfx::operator*(const class basegfx::B2DHomMatrix &,const class basegfx::B2DRange &)
+    _Bool basegfx::B2DPolyRange::operator!=(const basegfx::B2DPolyRange &) const
+include/basegfx/range/b2drange.hxx:127
+    const basegfx::B2DRange & basegfx::B2DRange::getUnitB2DRange()
+include/basegfx/range/b2drange.hxx:132
+    basegfx::B2DRange basegfx::operator*(const basegfx::B2DHomMatrix &,const basegfx::B2DRange &)
 include/basegfx/range/b2ibox.hxx:61
      basegfx::B2IBox::B2IBox()
 include/basegfx/range/b2ibox.hxx:64
-     basegfx::B2IBox::B2IBox(const class basegfx::B2ITuple &)
+     basegfx::B2IBox::B2IBox(const basegfx::B2ITuple &)
 include/basegfx/range/b2ibox.hxx:83
-     basegfx::B2IBox::B2IBox(const class basegfx::B2ITuple &,const class basegfx::B2ITuple &)
+     basegfx::B2IBox::B2IBox(const basegfx::B2ITuple &,const basegfx::B2ITuple &)
 include/basegfx/range/b2ibox.hxx:101
-    _Bool basegfx::B2IBox::operator==(const class basegfx::B2IBox &) const
+    _Bool basegfx::B2IBox::operator==(const basegfx::B2IBox &) const
 include/basegfx/range/b2ibox.hxx:107
-    _Bool basegfx::B2IBox::operator!=(const class basegfx::B2IBox &) const
+    _Bool basegfx::B2IBox::operator!=(const basegfx::B2IBox &) const
 include/basegfx/range/b2ibox.hxx:150
-    _Bool basegfx::B2IBox::isInside(const class basegfx::B2ITuple &) const
+    _Bool basegfx::B2IBox::isInside(const basegfx::B2ITuple &) const
 include/basegfx/range/b2ibox.hxx:166
-    void basegfx::B2IBox::intersect(const class basegfx::B2IBox &)
-include/basegfx/range/b2irange.hxx:196
-    void basegfx::B2IRange::expand(const class basegfx::B2IRange &)
-include/basegfx/range/b2irange.hxx:209
-    class basegfx::B2ITuple basegfx::B2IRange::clamp(const class basegfx::B2ITuple &) const
+    void basegfx::B2IBox::intersect(const basegfx::B2IBox &)
 include/basegfx/range/b3drange.hxx:97
-    _Bool basegfx::B3DRange::operator!=(const class basegfx::B3DRange &) const
+    _Bool basegfx::B3DRange::operator!=(const basegfx::B3DRange &) const
 include/basegfx/range/b3drange.hxx:198
-    class basegfx::B3DTuple basegfx::B3DRange::clamp(const class basegfx::B3DTuple &) const
+    basegfx::B3DTuple basegfx::B3DRange::clamp(const basegfx::B3DTuple &) const
 include/basegfx/range/b3drange.hxx:218
-    const class basegfx::B3DRange & basegfx::B3DRange::getUnitB3DRange()
+    const basegfx::B3DRange & basegfx::B3DRange::getUnitB3DRange()
 include/basegfx/range/b3drange.hxx:223
-    class basegfx::B3DRange basegfx::operator*(const class basegfx::B3DHomMatrix &,const class basegfx::B3DRange &)
-include/basegfx/tuple/b2i64tuple.hxx:46
-     basegfx::B2I64Tuple::B2I64Tuple()
-include/basegfx/tuple/b2i64tuple.hxx:89
-    const long & basegfx::B2I64Tuple::operator[](int) const
-include/basegfx/tuple/b2i64tuple.hxx:98
-    long & basegfx::B2I64Tuple::operator[](int)
-include/basegfx/tuple/b2i64tuple.hxx:109
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator+=(const class basegfx::B2I64Tuple &)
-include/basegfx/tuple/b2i64tuple.hxx:116
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator-=(const class basegfx::B2I64Tuple &)
-include/basegfx/tuple/b2i64tuple.hxx:123
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator/=(const class basegfx::B2I64Tuple &)
-include/basegfx/tuple/b2i64tuple.hxx:130
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator*=(const class basegfx::B2I64Tuple &)
-include/basegfx/tuple/b2i64tuple.hxx:137
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator*=(long)
-include/basegfx/tuple/b2i64tuple.hxx:144
-    class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator/=(long)
-include/basegfx/tuple/b2i64tuple.hxx:151
-    class basegfx::B2I64Tuple basegfx::B2I64Tuple::operator-() const
-include/basegfx/tuple/b2i64tuple.hxx:161
-    _Bool basegfx::B2I64Tuple::operator!=(const class basegfx::B2I64Tuple &) const
-include/basegfx/tuple/b2ituple.hxx:91
-    const int & basegfx::B2ITuple::operator[](int) const
-include/basegfx/tuple/b2ituple.hxx:100
-    int & basegfx::B2ITuple::operator[](int)
-include/basegfx/tuple/b2ituple.hxx:125
-    class basegfx::B2ITuple & basegfx::B2ITuple::operator/=(const class basegfx::B2ITuple &)
-include/basegfx/tuple/b2ituple.hxx:132
-    class basegfx::B2ITuple & basegfx::B2ITuple::operator*=(const class basegfx::B2ITuple &)
-include/basegfx/tuple/b2ituple.hxx:146
-    class basegfx::B2ITuple & basegfx::B2ITuple::operator/=(int)
-include/basegfx/tuple/b2ituple.hxx:153
-    class basegfx::B2ITuple basegfx::B2ITuple::operator-() const
-include/basegfx/tuple/b2ituple.hxx:158
-    _Bool basegfx::B2ITuple::equalZero() const
-include/basegfx/tuple/b3dtuple.hxx:170
-    class basegfx::B3DTuple & basegfx::B3DTuple::operator/=(const class basegfx::B3DTuple &)
-include/basegfx/tuple/b3ituple.hxx:47
+    basegfx::B3DRange basegfx::operator*(const basegfx::B3DHomMatrix &,const basegfx::B3DRange &)
+include/basegfx/range/Range2D.hxx:176
+    Tuple2D<type-parameter-?-?> basegfx::Range2D::clamp(const Tuple2D<type-parameter-?-?> &) const
+include/basegfx/tuple/b3ituple.hxx:43
      basegfx::B3ITuple::B3ITuple()
-include/basegfx/tuple/b3ituple.hxx:86
+include/basegfx/tuple/b3ituple.hxx:66
     const int & basegfx::B3ITuple::operator[](int) const
-include/basegfx/tuple/b3ituple.hxx:95
+include/basegfx/tuple/b3ituple.hxx:75
     int & basegfx::B3ITuple::operator[](int)
-include/basegfx/tuple/b3ituple.hxx:106
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator+=(const class basegfx::B3ITuple &)
-include/basegfx/tuple/b3ituple.hxx:114
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator-=(const class basegfx::B3ITuple &)
-include/basegfx/tuple/b3ituple.hxx:122
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator/=(const class basegfx::B3ITuple &)
-include/basegfx/tuple/b3ituple.hxx:130
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator*=(const class basegfx::B3ITuple &)
-include/basegfx/tuple/b3ituple.hxx:138
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator*=(int)
-include/basegfx/tuple/b3ituple.hxx:146
-    class basegfx::B3ITuple & basegfx::B3ITuple::operator/=(int)
-include/basegfx/tuple/b3ituple.hxx:154
-    class basegfx::B3ITuple basegfx::B3ITuple::operator-() const
-include/basegfx/tuple/b3ituple.hxx:164
-    _Bool basegfx::B3ITuple::operator!=(const class basegfx::B3ITuple &) const
+include/basegfx/tuple/Size2D.hxx:72
+    Size2D<TYPE> & basegfx::Size2D::operator/=(type-parameter-?-?)
+include/basegfx/tuple/Size2D.hxx:92
+    Size2D<type-parameter-?-?> basegfx::operator+(const Size2D<type-parameter-?-?> &,const Size2D<type-parameter-?-?> &)
+include/basegfx/tuple/Size2D.hxx:100
+    Size2D<type-parameter-?-?> basegfx::operator*(const Size2D<type-parameter-?-?> &,const Size2D<type-parameter-?-?> &)
+include/basegfx/tuple/Size2D.hxx:108
+    Size2D<type-parameter-?-?> basegfx::operator/(const Size2D<type-parameter-?-?> &,const Size2D<type-parameter-?-?> &)
+include/basegfx/tuple/Tuple2D.hxx:72
+    _Bool basegfx::Tuple2D::equal(const basegfx::Tuple2D<double> &) const
+include/basegfx/tuple/Tuple2D.hxx:72
+    _Bool basegfx::Tuple2D::equal(const basegfx::Tuple2D<int> &) const
+include/basegfx/tuple/Tuple2D.hxx:72
+    _Bool basegfx::Tuple2D::equal(const basegfx::Tuple2D<long> &) const
 include/basegfx/utils/b2dclipstate.hxx:72
-    _Bool basegfx::utils::B2DClipState::operator!=(const class basegfx::utils::B2DClipState &) const
-include/basegfx/utils/unopolypolygon.hxx:88
-    const class basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
-include/basegfx/vector/b2ivector.hxx:73
-    class basegfx::B2IVector & basegfx::B2IVector::operator*=(const class basegfx::B2IVector &)
-include/basegfx/vector/b2ivector.hxx:82
-    class basegfx::B2IVector & basegfx::B2IVector::operator*=(int)
-include/basegfx/vector/b2ivector.hxx:116
-    class basegfx::B2IVector & basegfx::B2IVector::operator*=(const class basegfx::B2DHomMatrix &)
-include/basegfx/vector/b3dvector.hxx:75
-    class basegfx::B3DVector & basegfx::B3DVector::operator*=(const class basegfx::B3DVector &)
+    _Bool basegfx::utils::B2DClipState::operator!=(const basegfx::utils::B2DClipState &) const
+include/basegfx/utils/bgradient.hxx:113
+     basegfx::BColorStops::BColorStops(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const basegfx::BColorStop *, std::__cxx1998::vector<basegfx::BColorStop> >, std::vector<basegfx::BColorStop> >,__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const basegfx::BColorStop *, std::__cxx1998::vector<basegfx::BColorStop> >, std::vector<basegfx::BColorStop> >)
+include/basegfx/utils/canvastools.hxx:111
+    struct com::sun::star::geometry::AffineMatrix3D & basegfx::unotools::affineMatrixFromHomMatrix3D(struct com::sun::star::geometry::AffineMatrix3D &,const basegfx::B3DHomMatrix &)
+include/basegfx/utils/canvastools.hxx:131
+    basegfx::B3DRange basegfx::unotools::b3DRectangleFromRealRectangle3D(const struct com::sun::star::geometry::RealRectangle3D &)
+include/basegfx/utils/gradienttools.hxx:84
+    int (anonymous namespace)::ColorToBColorConverter::operator int() const
+include/basegfx/utils/systemdependentdata.hxx:83
+    unsigned int basegfx::SystemDependentData::getCombinedHoldCyclesInSeconds() const
+include/basegfx/utils/unopolypolygon.hxx:87
+    const basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
+include/basegfx/vector/b2dsize.hxx:84
+    basic_ostream<type-parameter-?-?, type-parameter-?-?> & basegfx::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const basegfx::B2DSize &)
+include/basegfx/vector/b2dvector.hxx:68
+     basegfx::B2DVector::B2DVector(const basegfx::B2IVector &)
+include/basegfx/vector/b2dvector.hxx:81
+    basegfx::B2DVector & basegfx::B2DVector::operator*=(const basegfx::B2DVector &)
+include/basegfx/vector/b2isize.hxx:39
+     basegfx::B2ISize::B2ISize(const basegfx::Size2D<int> &)
+include/basegfx/vector/b2isize.hxx:52
+    basic_ostream<type-parameter-?-?, type-parameter-?-?> & basegfx::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const basegfx::B2ISize &)
+include/basegfx/vector/b2ivector.hxx:72
+    basegfx::B2IVector & basegfx::B2IVector::operator*=(const basegfx::B2IVector &)
+include/basegfx/vector/b2ivector.hxx:81
+    basegfx::B2IVector & basegfx::B2IVector::operator*=(int)
+include/basegfx/vector/b2ivector.hxx:115
+    basegfx::B2IVector & basegfx::B2IVector::operator*=(const basegfx::B2DHomMatrix &)
+include/basegfx/vector/b3dvector.hxx:74
+    basegfx::B3DVector & basegfx::B3DVector::operator*=(const basegfx::B3DVector &)
+include/basic/codecompletecache.hxx:82
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const CodeCompleteDataCache &)
 include/basic/sbxvar.hxx:138
     struct SbxValues * SbxValue::data()
-include/codemaker/global.hxx:55
-    class FileStream & operator<<(class FileStream &,const class rtl::OString *)
+include/codemaker/global.hxx:54
+    FileStream & operator<<(FileStream &,const rtl::OString *)
+include/codemaker/global.hxx:56
+    FileStream & operator<<(FileStream &,const rtl::OStringBuffer *)
 include/codemaker/global.hxx:57
-    class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer *)
-include/codemaker/global.hxx:58
-    class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer &)
-include/comphelper/asyncquithandler.hxx:45
-    _Bool AsyncQuitHandler::IsForceQuit() const
+    FileStream & operator<<(FileStream &,const rtl::OStringBuffer &)
+include/codemaker/options.hxx:54
+    const rtl::OString & Options::getProgramName() const
+include/codemaker/typemanager.hxx:46
+    const rtl::Reference<unoidl::Manager> & TypeManager::getManager() const
+include/codemaker/typemanager.hxx:50
+    const std::vector<rtl::Reference<unoidl::Provider> > & TypeManager::getPrimaryProviders() const
 include/comphelper/automationinvokedzone.hxx:26
      comphelper::Automation::AutomationInvokedZone::AutomationInvokedZone()
 include/comphelper/basicio.hxx:52
-    const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectInputStream> & comphelper::operator>>(const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectInputStream> &,unsigned int &)
+    const com::sun::star::uno::Reference<com::sun::star::io::XObjectInputStream> & comphelper::operator>>(const com::sun::star::uno::Reference<com::sun::star::io::XObjectInputStream> &,unsigned int &)
 include/comphelper/basicio.hxx:53
-    const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectOutputStream> & comphelper::operator<<(const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectOutputStream> &,unsigned int)
-include/comphelper/configuration.hxx:250
-    type-parameter-?-? comphelper::ConfigurationLocalizedProperty::get(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
-include/comphelper/configuration.hxx:266
-    void comphelper::ConfigurationLocalizedProperty::set(const type-parameter-?-? &,const class std::shared_ptr<class comphelper::ConfigurationChanges> &)
-include/comphelper/configuration.hxx:302
-    class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameReplace> comphelper::ConfigurationGroup::get(const class std::shared_ptr<class comphelper::ConfigurationChanges> &)
+    const com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> & comphelper::operator<<(const com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> &,unsigned int)
+include/comphelper/configuration.hxx:301
+    void comphelper::ConfigurationLocalizedProperty::set(const type-parameter-?-? &,const std::shared_ptr<comphelper::ConfigurationChanges> &)
+include/comphelper/configuration.hxx:324
+    _Bool comphelper::ConfigurationGroup::isReadOnly(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> &)
+include/comphelper/configuration.hxx:345
+    com::sun::star::uno::Reference<com::sun::star::container::XHierarchicalNameReplace> comphelper::ConfigurationGroup::get(const std::shared_ptr<comphelper::ConfigurationChanges> &)
+include/comphelper/errcode.hxx:96
+    _Bool ErrCode::operator<(const ErrCode &) const
+include/comphelper/errcode.hxx:97
+    _Bool ErrCode::operator<=(const ErrCode &) const
+include/comphelper/errcode.hxx:98
+    _Bool ErrCode::operator>(const ErrCode &) const
+include/comphelper/errcode.hxx:99
+    _Bool ErrCode::operator>=(const ErrCode &) const
+include/comphelper/errcode.hxx:193
+     ErrCodeMsg::ErrCodeMsg(ErrCode,const rtl::OUString &,const rtl::OUString &,struct std::source_location)
+include/comphelper/errcode.hxx:220
+    const std::optional<struct std::source_location> & ErrCodeMsg::GetSourceLocation() const
+include/comphelper/errcode.hxx:229
+    _Bool ErrCodeMsg::operator==(const ErrCodeMsg &) const
+include/comphelper/errcode.hxx:230
+    _Bool ErrCodeMsg::operator!=(const ErrCodeMsg &) const
 include/comphelper/flagguard.hxx:33
     ValueRestorationGuard_Impl<T> comphelper::<deduction guide for ValueRestorationGuard_Impl>(ValueRestorationGuard_Impl<T>)
 include/comphelper/flagguard.hxx:37
     ValueRestorationGuard_Impl<T> comphelper::<deduction guide for ValueRestorationGuard_Impl>(type-parameter-?-? &)
 include/comphelper/flagguard.hxx:46
     ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(ValueRestorationGuard<T>)
-include/comphelper/flagguard.hxx:50
+include/comphelper/flagguard.hxx:49
+    ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(type-parameter-?-? &)
+include/comphelper/flagguard.hxx:54
      comphelper::ValueRestorationGuard::ValueRestorationGuard(_Bool &,type-parameter-?-? &&)
-include/comphelper/flagguard.hxx:50
+include/comphelper/flagguard.hxx:54
+     comphelper::ValueRestorationGuard::ValueRestorationGuard(const drawinglayer::primitive2d::StructureTagPrimitive2D *&,type-parameter-?-? &&)
+include/comphelper/flagguard.hxx:54
+     comphelper::ValueRestorationGuard::ValueRestorationGuard(const unsigned char *&,type-parameter-?-? &&)
+include/comphelper/flagguard.hxx:54
+     comphelper::ValueRestorationGuard::ValueRestorationGuard(int &,type-parameter-?-? &&)
+include/comphelper/flagguard.hxx:54
+     comphelper::ValueRestorationGuard::ValueRestorationGuard(long &,type-parameter-?-? &&)
+include/comphelper/flagguard.hxx:54
      comphelper::ValueRestorationGuard::ValueRestorationGuard(unsigned char &,type-parameter-?-? &&)
-include/comphelper/flagguard.hxx:50
+include/comphelper/flagguard.hxx:54
     ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(type-parameter-?-? &,type-parameter-?-? &&)
-include/comphelper/interfacecontainer3.hxx:50
+include/comphelper/interfacecontainer3.hxx:48
     OInterfaceIteratorHelper3<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper3>(OInterfaceIteratorHelper3<ListenerT>)
-include/comphelper/interfacecontainer3.hxx:65
+include/comphelper/interfacecontainer3.hxx:63
     OInterfaceIteratorHelper3<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper3>(OInterfaceContainerHelper3<type-parameter-?-?> &)
-include/comphelper/interfacecontainer3.hxx:84
-    void comphelper::OInterfaceIteratorHelper3::remove()
-include/comphelper/interfacecontainer3.hxx:91
+include/comphelper/interfacecontainer3.hxx:92
     OInterfaceIteratorHelper3<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper3>(const OInterfaceIteratorHelper3<ListenerT> &)
-include/comphelper/interfacecontainer3.hxx:132
-    int comphelper::OInterfaceContainerHelper3::getLength() const
-include/comphelper/interfacecontainer3.hxx:137
-    vector<Reference<type-parameter-?-?>, allocator<Reference<type-parameter-?-?> > > comphelper::OInterfaceContainerHelper3::getElements() const
-include/comphelper/interfacecontainer3.hxx:168
-    void comphelper::OInterfaceContainerHelper3::disposeAndClear(const struct com::sun::star::lang::EventObject &)
-include/comphelper/interfacecontainer3.hxx:172
-    void comphelper::OInterfaceContainerHelper3::clear()
-include/comphelper/interfacecontainer3.hxx:184
-    void comphelper::OInterfaceContainerHelper3::forEach(const type-parameter-?-? &)
-include/comphelper/interfacecontainer3.hxx:207
-    void comphelper::OInterfaceContainerHelper3::notifyEach(void (class com::sun::star::document::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
-include/comphelper/interfacecontainer3.hxx:207
-    void comphelper::OInterfaceContainerHelper3::notifyEach(void (type-parameter-?-?::*)(const type-parameter-?-? &),const type-parameter-?-? &)
-include/comphelper/interfacecontainer3.hxx:226
-     comphelper::OInterfaceContainerHelper3::NotifySingleListener::NotifySingleListener<EventT>(void (type-parameter-?-?::*)(const type-parameter-?-? &),const type-parameter-?-? &)
-include/comphelper/interfacecontainer3.hxx:232
-    void comphelper::OInterfaceContainerHelper3::NotifySingleListener::operator()(const Reference<type-parameter-?-?> &) const
+include/comphelper/interfacecontainer3.hxx:170
+    const Reference<type-parameter-?-?> & comphelper::OInterfaceContainerHelper3::getInterface(int) const
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XActionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XDockableWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XFocusListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XItemListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XKeyHandler::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XKeyListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XMouseClickHandler::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XMouseListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XMouseMotionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XStyleChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XTextListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XTopWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XWindowListener2::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::awt::XWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::beans::XPropertiesChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::beans::XPropertyChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::beans::XPropertySetInfoChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::beans::XVetoableChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::container::XContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::document::XDocumentEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::document::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::document::XStorageChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XApproveActionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XConfirmDeleteListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XDatabaseParameterListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XFormControllerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XGridControlListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XLoadListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XResetListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XSubmitListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::XUpdateListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::binding::XListEntryListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::runtime::XFilterControllerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::submission::XSubmissionVetoListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::form::validation::XFormComponentValidityListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::frame::XStatusListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::lang::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::linguistic2::XDictionaryEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::linguistic2::XDictionaryListEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::linguistic2::XLinguServiceEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::presentation::XShapeEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::presentation::XSlideShowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::script::vba::XVBAScriptListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::XDatabaseRegistrationsListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::XRowSetApproveListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::XRowSetChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::XRowsChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::XSQLErrorListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdb::application::XCopyTableListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::sdbc::XRowSetListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::text::XPasteListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::ucb::XContentEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::ui::XContextMenuInterceptor::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XChangesListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XCloseListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XFlushListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XModeChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XModifyListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::util::XRefreshListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::view::XPrintJobListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer3.hxx:214
+    void comphelper::OInterfaceContainerHelper3::notifyEach(void (com::sun::star::view::XSelectionChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &)
+include/comphelper/interfacecontainer4.hxx:46
+    OInterfaceIteratorHelper4<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper4>(OInterfaceIteratorHelper4<ListenerT>)
+include/comphelper/interfacecontainer4.hxx:63
+    OInterfaceIteratorHelper4<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper4>(std::unique_lock<std::mutex> &,OInterfaceContainerHelper4<type-parameter-?-?> &)
+include/comphelper/interfacecontainer4.hxx:97
+    OInterfaceIteratorHelper4<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper4>(const OInterfaceIteratorHelper4<ListenerT> &)
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::accessibility::XAccessibleEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XActionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XAdjustmentListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XFocusListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XItemListListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XItemListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XKeyListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XMenuListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XMouseListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XMouseMotionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XPaintListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XSpinListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XTabListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XTextListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XTopWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XVclContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::XWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::grid::XGridColumnListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::grid::XGridDataListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::grid::XGridSelectionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::tab::XTabPageContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::tree::XTreeDataModelListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::tree::XTreeEditListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::awt::tree::XTreeExpansionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::beans::XPropertiesChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::beans::XPropertyChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::beans::XPropertySetInfoChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::beans::XVetoableChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::chart::XChartDataChangeEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::container::XContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::datatransfer::dnd::XDragGestureListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::datatransfer::dnd::XDropTargetListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::document::XDocumentEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::document::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::document::XStorageChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::document::XUndoManagerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::form::XGridControlListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::form::XLoadListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::form::XUpdateListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::frame::XStatusListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::io::XStreamListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::lang::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::presentation::XSlideShowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::script::XScriptListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::ucb::XContentEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::ui::XContextMenuInterceptor::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::ui::XUIConfigurationListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XChangesListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XCloseListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XFlushListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XModeChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XModifyListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::util::XRefreshListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::view::XPrintJobListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/comphelper/interfacecontainer4.hxx:230
+    void comphelper::OInterfaceContainerHelper4::notifyEach(std::unique_lock<std::mutex> &,void (com::sun::star::view::XSelectionChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
 include/comphelper/logging.hxx:58
-    class rtl::OUString comphelper::log::convert::convertLogArgToString(char16_t)
-include/comphelper/logging.hxx:225
+    rtl::OUString comphelper::log::convert::convertLogArgToString(char16_t)
+include/comphelper/logging.hxx:224
     void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:246
+include/comphelper/logging.hxx:245
     void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:258
+include/comphelper/logging.hxx:257
     void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:271
+include/comphelper/logging.hxx:270
     void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:295
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?) const
-include/comphelper/logging.hxx:304
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:314
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:325
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:337
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:350
-    void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:374
+include/comphelper/logging.hxx:294
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?) const
+include/comphelper/logging.hxx:303
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?,type-parameter-?-?) const
+include/comphelper/logging.hxx:313
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
+include/comphelper/logging.hxx:324
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
+include/comphelper/logging.hxx:336
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
+include/comphelper/logging.hxx:349
+    void comphelper::EventLogger::logp(const int,const char *,const char *,const rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
+include/comphelper/logging.hxx:373
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?) const
-include/comphelper/logging.hxx:383
+include/comphelper/logging.hxx:382
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:393
+include/comphelper/logging.hxx:392
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:404
+include/comphelper/logging.hxx:403
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:416
+include/comphelper/logging.hxx:415
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/logging.hxx:429
+include/comphelper/logging.hxx:428
     void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
-include/comphelper/lok.hxx:48
+include/comphelper/lok.hxx:49
     _Bool comphelper::LibreOfficeKit::isLocalRendering()
-include/comphelper/propagg.hxx:60
+include/comphelper/lok.hxx:117
+    void comphelper::LibreOfficeKit::setBlockedCommandList(const char *)
+include/comphelper/multicontainer2.hxx:112
+    void comphelper::OMultiTypeInterfaceContainerHelper2::clear()
+include/comphelper/multiinterfacecontainer3.hxx:75
+    _Bool comphelper::OMultiTypeInterfaceContainerHelperVar3::hasContainedTypes() const
+include/comphelper/multiinterfacecontainer3.hxx:179
+    void comphelper::OMultiTypeInterfaceContainerHelperVar3::clear()
+include/comphelper/multiinterfacecontainer4.hxx:174
+    void comphelper::OMultiTypeInterfaceContainerHelperVar4::clear(std::unique_lock<std::mutex> &)
+include/comphelper/profilezone.hxx:56
+     comphelper::ProfileZone::ProfileZone(const char *,const std::map<rtl::OUString, rtl::OUString> &)
+include/comphelper/propagg.hxx:59
     _Bool comphelper::internal::OPropertyAccessor::operator==(const struct comphelper::internal::OPropertyAccessor &) const
-include/comphelper/propagg.hxx:61
+include/comphelper/propagg.hxx:60
     _Bool comphelper::internal::OPropertyAccessor::operator<(const struct comphelper::internal::OPropertyAccessor &) const
 include/comphelper/proparrhlp.hxx:83
-    class cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper() const
+    cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper() const
 include/comphelper/PropertyInfoHash.hxx:36
-     comphelper::PropertyInfo::PropertyInfo(const class rtl::OUString &,int,const class com::sun::star::uno::Type &,short)
-include/comphelper/scopeguard.hxx:52
+     comphelper::PropertyInfo::PropertyInfo(const rtl::OUString &,int,const com::sun::star::uno::Type &,short)
+include/comphelper/propmultiplex2.hxx:58
+    void comphelper::OPropertyChangeListener2::disposeAdapter(std::unique_lock<std::mutex> &)
+include/comphelper/propmultiplex2.hxx:99
+    void comphelper::OPropertyChangeMultiplexer2::lock()
+include/comphelper/propmultiplex2.hxx:101
+    void comphelper::OPropertyChangeMultiplexer2::unlock()
+include/comphelper/propshlp.hxx:66
+     comphelper::OPropertySetHelper::OPropertySetHelper(_Bool)
+include/comphelper/scopeguard.hxx:54
     ScopeGuard<Func> comphelper::<deduction guide for ScopeGuard>(ScopeGuard<Func>)
-include/comphelper/scopeguard.hxx:57
+include/comphelper/scopeguard.hxx:59
     ScopeGuard<Func> comphelper::<deduction guide for ScopeGuard>(type-parameter-?-? &&)
-include/comphelper/scopeguard.hxx:84
+include/comphelper/scopeguard.hxx:75
     ScopeGuard<Func> comphelper::<deduction guide for ScopeGuard>(const ScopeGuard<Func> &)
-include/comphelper/sequence.hxx:200
-    Sequence<type-parameter-?-?> comphelper::containerToSequence(type-parameter-?-? const (&)[N])
-include/comphelper/sequence.hxx:200
-    Sequence<type-parameter-?-?> comphelper::containerToSequence(type-parameter-?-? const (&)[S])
-include/comphelper/servicedecl.hxx:108
-     comphelper::service_decl::ServiceDecl::ServiceDecl(const type-parameter-?-? &,const char *,const char *)
-include/comphelper/unique_disposing_ptr.hxx:46
+include/comphelper/sequence.hxx:206
+    Sequence<type-parameter-?-?> comphelper::containerToSequence(const type-parameter-?-? (&)[N])
+include/comphelper/sequence.hxx:206
+    Sequence<type-parameter-?-?> comphelper::containerToSequence(const type-parameter-?-? (&)[S])
+include/comphelper/sequenceashashmap.hxx:403
+    __gnu_debug::_Safe_iterator<struct std::__detail::_Node_const_iterator<struct std::pair<const struct comphelper::OUStringAndHashCode, com::sun::star::uno::Any>, false, true>, std::unordered_map<struct comphelper::OUStringAndHashCode, com::sun::star::uno::Any, struct comphelper::OUStringAndHashCodeHash, struct comphelper::OUStringAndHashCodeEqual> > comphelper::SequenceAsHashMap::find(const struct comphelper::OUStringAndHashCode &) const
+include/comphelper/singletonref.hxx:133
+    type-parameter-?-? & comphelper::SingletonRef::operator*() const
+include/comphelper/stl_types.hxx:78
+    _Bool comphelper::UniquePtrValueLess::operator()(const type-parameter-?-? &,const unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> > &) const
+include/comphelper/stl_types.hxx:84
+    _Bool comphelper::UniquePtrValueLess::operator()(const unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> > &,const type-parameter-?-? &) const
+include/comphelper/string.hxx:98
+    std::basic_string_view<char> comphelper::string::stripEnd(std::basic_string_view<char>,char)
+include/comphelper/traceevent.hxx:210
+    void comphelper::AsyncEvent::finish()
+include/comphelper/unique_disposing_ptr.hxx:47
     type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const
 include/comphelper/unwrapargs.hxx:51
-    void comphelper::detail::unwrapArgs(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
-include/connectivity/dbcharset.hxx:138
-    const class dbtools::OCharsetMap::CharsetIterator & dbtools::OCharsetMap::CharsetIterator::operator--()
-include/connectivity/FValue.hxx:318
-    unsigned short connectivity::ORowSetValue::operator unsigned short() const
-include/connectivity/FValue.hxx:387
+    void comphelper::detail::unwrapArgs(const com::sun::star::uno::Sequence<com::sun::star::uno::Any> &,int,const com::sun::star::uno::Reference<com::sun::star::uno::XInterface> &)
+include/comphelper/xmlsechelper.hxx:32
+    rtl::OUString comphelper::xmlsec::GetCertificateKind(const enum com::sun::star::security::CertificateKind &)
+include/connectivity/dbcharset.hxx:137
+    const dbtools::OCharsetMap::CharsetIterator & dbtools::OCharsetMap::CharsetIterator::operator--()
+include/connectivity/FValue.hxx:346
     unsigned char connectivity::ORowSetValue::getUInt8() const
-include/connectivity/FValue.hxx:469
+include/connectivity/FValue.hxx:428
      connectivity::TSetBound::TSetBound(_Bool)
-include/connectivity/FValue.hxx:470
-    void connectivity::TSetBound::operator()(class connectivity::ORowSetValue &) const
-include/connectivity/sqlparse.hxx:186
-    class rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int)
-include/drawinglayer/geometry/viewinformation2d.hxx:138
-    _Bool drawinglayer::geometry::ViewInformation2D::operator!=(const class drawinglayer::geometry::ViewInformation2D &) const
-include/drawinglayer/primitive2d/baseprimitive2d.hxx:139
-    _Bool drawinglayer::primitive2d::BasePrimitive2D::operator!=(const class drawinglayer::primitive2d::BasePrimitive2D &) const
-include/drawinglayer/primitive2d/softedgeprimitive2d.hxx:39
-    void drawinglayer::primitive2d::SoftEdgePrimitive2D::setMaskGeneration(_Bool) const
-include/drawinglayer/primitive3d/baseprimitive3d.hxx:112
-    _Bool drawinglayer::primitive3d::BasePrimitive3D::operator!=(const class drawinglayer::primitive3d::BasePrimitive3D &) const
+include/connectivity/FValue.hxx:429
+    void connectivity::TSetBound::operator()(connectivity::ORowSetValue &) const
+include/connectivity/sqlparse.hxx:190
+    rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int)
+include/connectivity/TTableHelper.hxx:153
+    const rtl::OUString & connectivity::OTableHelper::getTableName()
+include/desktop/crashreport.hxx:104
+    rtl::OUString CrashReporter::getActiveSfxObjectName()
+include/desktop/crashreport.hxx:109
+    rtl::OUString CrashReporter::getLoggedUnoCommands()
+include/docmodel/color/ComplexColor.hxx:117
+    void model::ComplexColor::setSystemColorType(enum model::SystemColorType)
+include/docmodel/color/ComplexColor.hxx:127
+    void model::ComplexColor::setTransformations(const std::vector<struct model::Transformation> &)
+include/docmodel/color/ComplexColor.hxx:144
+    void model::ComplexColor::clearTransformations()
+include/docmodel/theme/FormatScheme.hxx:450
+     model::FormatScheme::FormatScheme(const rtl::OUString &)
+include/docmodel/theme/Theme.hxx:123
+    void model::FontScheme::setMinorSupplementalFontList(const std::vector<struct model::ThemeSupplementalFont> &)
+include/docmodel/theme/Theme.hxx:148
+    void model::FontScheme::setMajorSupplementalFontList(const std::vector<struct model::ThemeSupplementalFont> &)
+include/docmodel/theme/Theme.hxx:173
+    void model::Theme::setFormatScheme(const model::FormatScheme &)
+include/docmodel/theme/Theme.hxx:190
+    std::vector<Color> model::Theme::GetColors() const
+include/drawinglayer/geometry/viewinformation2d.hxx:124
+    _Bool drawinglayer::geometry::ViewInformation2D::operator!=(const drawinglayer::geometry::ViewInformation2D &) const
+include/drawinglayer/primitive2d/baseprimitive2d.hxx:136
+    _Bool drawinglayer::primitive2d::BasePrimitive2D::operator!=(const drawinglayer::primitive2d::BasePrimitive2D &) const
+include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx:39
+    void drawinglayer::processor2d::setOffsetXYCreatedBitmap(drawinglayer::primitive2d::FillGraphicPrimitive2D &,const BitmapEx &)
+include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx:81
+    void drawinglayer::primitive2d::FillGraphicPrimitive2D::impSetOffsetXYCreatedBitmap(const BitmapEx &)
+include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx:95
+    const BitmapEx & drawinglayer::primitive2d::FillGraphicPrimitive2D::getOffsetXYCreatedBitmap() const
+include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx:85
+     drawinglayer::primitive2d::SingleLinePrimitive2D::SingleLinePrimitive2D(const basegfx::B2DPoint &,const basegfx::B2DPoint &,const basegfx::BColor &)
+include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx:126
+     drawinglayer::primitive2d::LineRectanglePrimitive2D::LineRectanglePrimitive2D(const basegfx::B2DRange &,const basegfx::BColor &)
+include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx:82
+     drawinglayer::primitive2d::FilledRectanglePrimitive2D::FilledRectanglePrimitive2D(const basegfx::B2DRange &,const basegfx::BColor &)
+include/drawinglayer/primitive3d/baseprimitive3d.hxx:63
+     drawinglayer::primitive3d::Primitive3DContainer::Primitive3DContainer(type-parameter-?-?,type-parameter-?-?)
+include/drawinglayer/primitive3d/baseprimitive3d.hxx:109
+    _Bool drawinglayer::primitive3d::BasePrimitive3D::operator!=(const drawinglayer::primitive3d::BasePrimitive3D &) const
+include/drawinglayer/processor2d/cairopixelprocessor2d.hxx:56
+    void drawinglayer::processor2d::CairoPixelProcessor2D::processUnifiedTransparencePrimitive2D(const drawinglayer::primitive2d::UnifiedTransparencePrimitive2D &)
+include/drawinglayer/processor2d/cairopixelprocessor2d.hxx:65
+    void drawinglayer::processor2d::CairoPixelProcessor2D::processMarkerArrayPrimitive2D(const drawinglayer::primitive2d::MarkerArrayPrimitive2D &)
+include/drawinglayer/processor2d/cairopixelprocessor2d.hxx:66
+    void drawinglayer::processor2d::CairoPixelProcessor2D::processBackgroundColorPrimitive2D(const drawinglayer::primitive2d::BackgroundColorPrimitive2D &)
+include/drawinglayer/processor2d/cairopixelprocessor2d.hxx:84
+     drawinglayer::processor2d::CairoPixelProcessor2D::CairoPixelProcessor2D(const drawinglayer::geometry::ViewInformation2D &)
 include/drawinglayer/tools/primitive2dxmldump.hxx:45
-    void drawinglayer::Primitive2dXmlDump::dump(const class drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
-include/editeng/editeng.hxx:241
-    _Bool EditEngine::GetDirectVertical() const
-include/editeng/editeng.hxx:243
+    void drawinglayer::Primitive2dXmlDump::dump(const drawinglayer::primitive2d::Primitive2DContainer &,const rtl::OUString &)
+include/editeng/colritem.hxx:76
+    void SvxColorItem::setComplexColor(const model::ComplexColor &)
+include/editeng/editeng.hxx:248
+    _Bool EditEngine::GetVertical() const
+include/editeng/editeng.hxx:250
     enum TextRotation EditEngine::GetRotation() const
-include/editeng/editeng.hxx:468
-    _Bool EditEngine::(anonymous)::__invoke(const class SvxFieldData *)
-include/editeng/editview.hxx:169
-    class OutputDevice & EditView::GetOutputDevice() const
-include/editeng/hyphenzoneitem.hxx:64
+include/editeng/hyphenzoneitem.hxx:67
     _Bool SvxHyphenZoneItem::IsPageEnd() const
-include/editeng/outliner.hxx:879
-    _Bool Outliner::(anonymous)::__invoke(const class SvxFieldData *)
+include/editeng/lrspitem.hxx:67
+     SvxLeftMarginItem::SvxLeftMarginItem(const long,const unsigned short)
+include/editeng/nhypitem.hxx:29
+    SfxPoolItem * SvxNoHyphenItem::CreateDefault()
+include/editeng/outlobj.hxx:146
+     std::optional::optional(struct std::in_place_t,type-parameter-?-? &&...)
+include/editeng/outlobj.hxx:165
+    _Bool std::optional::has_value() const
+include/editeng/outlobj.hxx:169
+    OutlinerParaObject & std::optional::value()
 include/filter/msfilter/mstoolbar.hxx:103
      Indent::Indent(_Bool)
-include/formula/opcode.hxx:522
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > OpCodeEnumToString(enum OpCode)
+include/formula/opcode.hxx:523
+    std::basic_string<char> OpCodeEnumToString(enum OpCode)
 include/formula/tokenarray.hxx:182
-    class formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int)
-include/formula/tokenarray.hxx:577
-    basic_ostream<type-parameter-?-?, type-parameter-?-?> & formula::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class formula::FormulaTokenArray &)
+    formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int)
+include/formula/tokenarray.hxx:586
+    basic_ostream<type-parameter-?-?, type-parameter-?-?> & formula::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const formula::FormulaTokenArray &)
 include/framework/addonsoptions.hxx:195
-    class rtl::OUString framework::AddonsOptions::GetAddonsNotebookBarResourceName(unsigned int) const
+    rtl::OUString framework::AddonsOptions::GetAddonsNotebookBarResourceName(unsigned int) const
 include/framework/addonsoptions.hxx:220
-    _Bool framework::AddonsOptions::GetMergeNotebookBarInstructions(const class rtl::OUString &,class std::__debug::vector<struct framework::MergeNotebookBarInstruction, class std::allocator<struct framework::MergeNotebookBarInstruction> > &) const
-include/i18nlangtag/languagetag.hxx:269
+    _Bool framework::AddonsOptions::GetMergeNotebookBarInstructions(const rtl::OUString &,std::vector<struct framework::MergeNotebookBarInstruction> &) const
+include/i18nlangtag/languagetag.hxx:270
     enum LanguageTag::ScriptType LanguageTag::getScriptType() const
 include/o3tl/any.hxx:155
-    class std::optional<const struct o3tl::detail::Void> o3tl::tryAccess(const class com::sun::star::uno::Any &)
-include/o3tl/cow_wrapper.hxx:323
+    std::optional<const struct o3tl::detail::Void> o3tl::tryAccess(const com::sun::star::uno::Any &)
+include/o3tl/cow_wrapper.hxx:333
     type-parameter-?-? * o3tl::cow_wrapper::get()
-include/o3tl/enumarray.hxx:105
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const Color &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const Image &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const Size &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const SwSubFont &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const _Bool &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const char *const &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const double &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const enum SwFieldTypesEnum &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const enum writerfilter::dmapper::PropertyIds &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const int &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const rtl::OUString &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const rtl::Reference<XPropertyList> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const short &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::shared_ptr<dbaccess::OContentHelper_Impl> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<ImageList> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<QCursor> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<SfxModule> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<SvxNumBulletItem> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<SwContentType> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<struct PPTCharSheet> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<struct PPTParaSheet> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::unique_ptr<weld::TreeIter> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const std::vector<vcl::Window *> &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const struct (anonymous namespace)::FactoryInfo &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const struct INetURLObject::SchemeInfo &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const struct PPTExtParaSheet &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const struct com::sun::star::table::BorderLine2 &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const unsigned long &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const unsigned short &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(const void *const &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:66
+     o3tl::enumarray::enumarray(struct _GdkCursor *const &,type-parameter-?-? &&...)
+include/o3tl/enumarray.hxx:122
     typename type-parameter-?-?::value_type * o3tl::enumarray_iterator::operator->() const
-include/o3tl/enumarray.hxx:130
+include/o3tl/enumarray.hxx:147
     const typename type-parameter-?-?::value_type * o3tl::enumarray_const_iterator::operator->() const
-include/o3tl/enumarray.hxx:133
+include/o3tl/enumarray.hxx:150
     _Bool o3tl::enumarray_const_iterator::operator==(const enumarray_const_iterator<EA> &) const
-include/o3tl/safeint.hxx:80
-    typename enable_if<std::is_unsigned<T>::value, type-parameter-?-?>::type o3tl::saturating_sub(type-parameter-?-?,type-parameter-?-?)
-include/o3tl/safeint.hxx:240
-    type-parameter-?-? o3tl::narrowing(type-parameter-?-?)
-include/o3tl/sorted_vector.hxx:225
+include/o3tl/float_int_conversion.hxx:64
+    typename enable_if<std::is_floating_point_v<F>, type-parameter-?-?>::type o3tl::roundAway(type-parameter-?-?)
+include/o3tl/hash_combine.hxx:19
+    typename enable_if<(sizeof(N) == 4), void>::type o3tl::hash_combine(type-parameter-?-? &,const type-parameter-?-? *,unsigned long)
+include/o3tl/hash_combine.hxx:30
+    typename enable_if<(sizeof(N) == 4), void>::type o3tl::hash_combine(type-parameter-?-? &,const type-parameter-?-? &)
+include/o3tl/hash_combine.hxx:37
+    typename enable_if<(sizeof(N) == 8), void>::type o3tl::hash_combine(type-parameter-?-? &,const type-parameter-?-? *,unsigned long)
+include/o3tl/intcmp.hxx:91
+    IntCmp<T> o3tl::<deduction guide for IntCmp>(IntCmp<T>)
+include/o3tl/intcmp.hxx:93
+    IntCmp<T> o3tl::<deduction guide for IntCmp>(type-parameter-?-?)
+include/o3tl/intcmp.hxx:101
+    _Bool o3tl::operator==(IntCmp<type-parameter-?-?>,IntCmp<type-parameter-?-?>)
+include/o3tl/intcmp.hxx:106
+    _Bool o3tl::operator!=(IntCmp<type-parameter-?-?>,IntCmp<type-parameter-?-?>)
+include/o3tl/intcmp.hxx:111
+    _Bool o3tl::operator<(IntCmp<type-parameter-?-?>,IntCmp<type-parameter-?-?>)
+include/o3tl/intcmp.hxx:116
+    _Bool o3tl::operator>(IntCmp<type-parameter-?-?>,IntCmp<type-parameter-?-?>)
+include/o3tl/intcmp.hxx:126
+    _Bool o3tl::operator>=(IntCmp<type-parameter-?-?>,IntCmp<type-parameter-?-?>)
+include/o3tl/sorted_vector.hxx:39
+    sorted_vector<Value, Compare, Find, > o3tl::<deduction guide for sorted_vector>(sorted_vector<Value, Compare, Find, >)
+include/o3tl/sorted_vector.hxx:52
+    sorted_vector<Value, Compare, Find, > o3tl::<deduction guide for sorted_vector>(initializer_list<type-parameter-?-?>)
+include/o3tl/sorted_vector.hxx:57
+    sorted_vector<Value, Compare, Find, > o3tl::<deduction guide for sorted_vector>()
+include/o3tl/sorted_vector.hxx:58
+    sorted_vector<Value, Compare, Find, > o3tl::<deduction guide for sorted_vector>(const sorted_vector<Value, Compare, Find, > &)
+include/o3tl/sorted_vector.hxx:59
+    sorted_vector<Value, Compare, Find, > o3tl::<deduction guide for sorted_vector>(sorted_vector<Value, Compare, Find, > &&)
+include/o3tl/sorted_vector.hxx:227
     _Bool o3tl::sorted_vector::operator!=(const sorted_vector<Value, Compare, Find, > &) const
-include/o3tl/span.hxx:51
-     o3tl::span::span(int (&)[N])
-include/o3tl/span.hxx:51
-     o3tl::span::span(int const (&)[N])
-include/o3tl/span.hxx:51
-     o3tl::span::span(unsigned short const (&)[N])
-include/o3tl/span.hxx:53
-     o3tl::span::span<T>(type-parameter-?-? *,unsigned long)
+include/o3tl/sorted_vector.hxx:242
+    void o3tl::sorted_vector::insert_sorted_unique_vector(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &)
 include/o3tl/strong_int.hxx:86
      o3tl::strong_int::strong_int(type-parameter-?-?,typename enable_if<std::is_integral<T>::value, int>::type)
-include/o3tl/strong_int.hxx:112
-    strong_int<UNDERLYING_TYPE, PHANTOM_TYPE> o3tl::strong_int::operator--(int)
 include/o3tl/strong_int.hxx:132
-    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Degree100Tag>,type-parameter-?-?...) const
+    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct FractionTag<100> >,type-parameter-?-?...) const
+include/o3tl/strong_int.hxx:132
+    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
     _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Tag_TextFrameIndex>,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
@@ -537,23 +1045,49 @@ include/o3tl/strong_int.hxx:132
 include/o3tl/strong_int.hxx:132
     _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellIdTag>,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
-    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<short, struct Degree10Tag>,type-parameter-?-?...) const
+    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<short, struct FractionTag<10> >,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
-    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned char, struct SdrLayerIDTag>,type-parameter-?-?...) const
+    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<short, struct SdrLayerIDTag>,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
     _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,type-parameter-?-?...) const
 include/o3tl/strong_int.hxx:132
     _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>,type-parameter-?-?...) const
-include/o3tl/typed_flags_set.hxx:114
+include/o3tl/strong_int.hxx:132
+    _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct ToolBoxItemIdTag>,type-parameter-?-?...) const
+include/o3tl/typed_flags_set.hxx:113
     typename typed_flags<type-parameter-?-?>::Wrap operator~(typename typed_flags<type-parameter-?-?>::Wrap)
-include/o3tl/typed_flags_set.hxx:147
+include/o3tl/typed_flags_set.hxx:146
     typename typed_flags<type-parameter-?-?>::Wrap operator^(typename typed_flags<type-parameter-?-?>::Wrap,type-parameter-?-?)
-include/o3tl/typed_flags_set.hxx:314
+include/o3tl/typed_flags_set.hxx:313
     typename typed_flags<type-parameter-?-?>::Self operator^=(type-parameter-?-? &,typename typed_flags<type-parameter-?-?>::Wrap)
-include/o3tl/vector_pool.hxx:83
+include/o3tl/vector_pool.hxx:84
      o3tl::detail::struct_from_value::type::type()
+include/oox/drawingml/clrscheme.hxx:80
+    const rtl::OUString & oox::drawingml::ClrScheme::GetName() const
+include/oox/drawingml/clrscheme.hxx:82
+    void oox::drawingml::ClrScheme::ToAny(com::sun::star::uno::Any &) const
+include/oox/drawingml/clrscheme.hxx:83
+    void oox::drawingml::ClrScheme::fill(model::ColorSet &) const
+include/oox/drawingml/color.hxx:127
+    _Bool oox::drawingml::Color::equals(const oox::drawingml::Color &,const oox::GraphicHelper &,Color) const
+include/oox/drawingml/ThemeFilterBase.hxx:35
+    void oox::drawingml::ThemeFilterBase::setCurrentTheme(const std::shared_ptr<oox::drawingml::Theme> &)
+include/oox/export/DMLPresetShapeExport.hxx:100
+    _Bool oox::drawingml::DMLPresetShapeExporter::HasHandleValue() const
+include/oox/export/DMLPresetShapeExport.hxx:129
+    com::sun::star::uno::Any oox::drawingml::DMLPresetShapeExporter::FindHandleValue(com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue>,std::basic_string_view<char16_t>)
+include/oox/export/drawingml.hxx:338
+    _Bool oox::drawingml::DrawingML::EqualGradients(const struct com::sun::star::awt::Gradient2 &,const struct com::sun::star::awt::Gradient2 &)
+include/oox/export/drawingml.hxx:375
+    _Bool oox::drawingml::DrawingML::WriteCharColor(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &)
+include/oox/export/drawingml.hxx:516
+    Color oox::drawingml::DrawingML::ColorWithIntensity(unsigned int,unsigned int)
+include/oox/helper/attributelist.hxx:68
+    long oox::AttributeConversion::decodeHyper(std::basic_string_view<char16_t>)
 include/oox/helper/containerhelper.hxx:51
     _Bool oox::ValueRange::operator!=(const struct oox::ValueRange &) const
+include/oox/helper/containerhelper.hxx:72
+    const std::vector<struct oox::ValueRange> & oox::ValueRangeSet::getRanges() const
 include/oox/helper/containerhelper.hxx:99
      oox::Matrix::Matrix<Type>(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::const_reference)
 include/oox/helper/containerhelper.hxx:110
@@ -570,504 +1104,1592 @@ include/oox/helper/containerhelper.hxx:123
     typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::iterator oox::Matrix::row_end(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type)
 include/oox/helper/containerhelper.hxx:126
     typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::reference oox::Matrix::row_front(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type)
-include/oox/helper/propertymap.hxx:113
-    void oox::PropertyMap::dumpCode(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
-include/oox/helper/propertymap.hxx:114
-    void oox::PropertyMap::dumpData(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
-include/opencl/openclconfig.hxx:57
+include/oox/helper/propertymap.hxx:115
+    void oox::PropertyMap::dumpCode(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &)
+include/oox/helper/propertymap.hxx:116
+    void oox::PropertyMap::dumpData(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &)
+include/oox/ppt/slidepersist.hxx:93
+    const std::shared_ptr<struct oox::drawingml::FillProperties> & oox::ppt::SlidePersist::getBackgroundProperties() const
+include/opencl/openclconfig.hxx:58
     _Bool OpenCLConfig::ImplMatcher::operator!=(const struct OpenCLConfig::ImplMatcher &) const
-include/sax/fshelper.hxx:131
-    void sax_fastparser::FastSerializerHelper::startElementNS(int,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &)
-include/sax/tools/converter.hxx:198
-    _Bool sax::Converter::convertAngle(short &,class std::basic_string_view<char16_t, struct std::char_traits<char16_t> >,_Bool)
-include/sfx2/childwin.hxx:163
+include/opencl/openclconfig.hxx:95
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const struct OpenCLConfig &)
+include/sax/tools/converter.hxx:206
+    _Bool sax::Converter::convertAngle(short &,std::basic_string_view<char16_t>,_Bool)
+include/sfx2/childwin.hxx:120
     void SfxChildWindow::ClearController()
 include/sfx2/docfilt.hxx:81
     _Bool SfxFilter::GetGpgEncryption() const
-include/sfx2/evntconf.hxx:60
+include/sfx2/evntconf.hxx:61
     struct SfxEventName & SfxEventNamesList::at(unsigned long)
 include/sfx2/infobar.hxx:104
-    void SfxInfoBarWindow::SetCommandHandler(class weld::Button &,const class rtl::OUString &)
-include/sfx2/lokcharthelper.hxx:42
+    void SfxInfoBarWindow::SetCommandHandler(weld::Button &,const rtl::OUString &)
+include/sfx2/lokcomponenthelpers.hxx:49
     void LokChartHelper::Invalidate()
-include/sfx2/msg.hxx:120
-    const class std::type_info * SfxType0::Type() const
-include/sfx2/viewsh.hxx:378
+include/sfx2/msg.hxx:119
+    const std::type_info * SfxType0::Type() const
+include/sfx2/viewsh.hxx:468
     enum LOKDeviceFormFactor SfxViewShell::GetLOKDeviceFormFactor() const
-include/sfx2/viewsh.hxx:380
-    _Bool SfxViewShell::isLOKDesktop() const
-include/svl/itempool.hxx:171
-    const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const
-include/svl/itempool.hxx:207
-    void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const
+include/svl/itemiter.hxx:44
+    _Bool SfxItemIter::IsAtEnd() const
+include/svl/itempool.hxx:97
+    unsigned short SfxItemPool::GetSize_Impl() const
+include/svl/itempool.hxx:117
+    void SfxItemPool::AddRef(const SfxPoolItem &)
+include/svl/itempool.hxx:118
+    unsigned int SfxItemPool::ReleaseRef(const SfxPoolItem &,unsigned int)
+include/svl/itempool.hxx:149
+    const type-parameter-?-? * SfxItemPool::GetPoolDefaultItem(TypedWhichId<type-parameter-?-?>) const
+include/svl/itempool.hxx:164
+    enum MapUnit SfxItemPool::GetDefaultMetric() const
+include/svl/itemset.hxx:117
+    _Bool SfxItemSet::empty() const
+include/svl/itemset.hxx:118
+    int SfxItemSet::size() const
+include/svl/itemset.hxx:119
+    const SfxPoolItem * SfxItemSet::operator[](int) const
 include/svl/lockfilecommon.hxx:60
-    void svt::LockFileCommon::SetURL(const class rtl::OUString &)
-include/svl/poolitem.hxx:154
-    type-parameter-?-? & SfxPoolItem::StaticWhichCast(TypedWhichId<type-parameter-?-?>)
-include/svl/poolitem.hxx:171
+    void svt::LockFileCommon::SetURL(const rtl::OUString &)
+include/svl/ondemand.hxx:346
+    const CharClass & OnDemandCharClass::operator*() const
+include/svl/poolitem.hxx:175
+    void SfxPoolItem::setDynamicDefault()
+include/svl/poolitem.hxx:254
     type-parameter-?-? * SfxPoolItem::DynamicWhichCast(TypedWhichId<type-parameter-?-?>)
-include/svtools/asynclink.hxx:43
-    void svtools::AsynchronLink::LinkStubHandleCall_Idle(void *,class Timer *)
+include/svl/poolitem.hxx:352
+    _Bool IsUserDefaultItem(const SfxPoolItem *)
+include/svl/poolitem.hxx:362
+    _Bool IsDynamicDefaultItem(const SfxPoolItem *)
+include/svl/poolitem.hxx:372
+    _Bool IsPooledItem(const SfxPoolItem *)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<CntUInt16Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<DatabaseMapItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<DbuTypeCollectionItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<DriverPoolingSettingsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<MediaItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<NameOrIndex, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OStringListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OfaPtrItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OfaXColorListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OptionalBoolItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SbxItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScCondFormatItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScConsolidateItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScHyphenateCell, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScIndentItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScLineBreakCell, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScMergeAttr, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScMergeFlagAttr, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScPageHFItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScPageScaleToItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScPivotItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScProtectionAttr, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScQueryItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScRotateValueItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScShrinkToFitCell, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScSolveItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScSortItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScSubTotalItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScTpCalcItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScTpDefaultsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScTpFormulaItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScTpPrintItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScTpViewItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScUserListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScVerticalStackCell, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScViewObjectModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsLayoutItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsMiscItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsPrintItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsSnapItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrAllPositionXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrAllPositionYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrAllSizeHeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrAllSizeWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrAngleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionEscAbsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionEscDirItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionEscIsRelItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionEscRelItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionFitLineLenItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionLineLenItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCaptionTypeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCircKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrCustomShapeGeometryItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeLineDeltaCountItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode1GlueDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode1HorzDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode1VertDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode2GlueDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode2HorzDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrEdgeNode2VertDistItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafBlueItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafContrastItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafCropItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafGamma100Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafGreenItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafInvertItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafLuminanceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafRedItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrGrafTransparenceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrHorzShearAllItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrHorzShearOneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrLayerIdItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrLayerNameItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrLogicSizeHeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrLogicSizeWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureBelowRefEdgeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureDecimalPlacesItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureFormatStringItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureOverhangItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureScaleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextAutoAngleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextFixedAngleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextHPosItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextIsFixedAngleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextRota90Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureTextVPosItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMeasureUnitItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMetricItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMoveXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrMoveYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrObjPrintableItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrObjVisibleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrOnOffItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrOnePositionXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrOnePositionYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrOneSizeHeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrOneSizeWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrPercentItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrResizeXAllItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrResizeXOneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrResizeYAllItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrResizeYOneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrRotateAllItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrRotateOneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrShearAngleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniAmountItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniCountItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniDelayItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniDirectionItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniStartInsideItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextAniStopInsideItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextFitToSizeTypeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextFixedCellHeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextHorzAdjustItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTextVertAdjustItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTransformRef1XItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTransformRef1YItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTransformRef2XItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrTransformRef2YItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrVertShearAllItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrVertShearOneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdrYesNoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxBoolItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxByteItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxDocumentInfoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxEnumItemInterface, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxEventNamesItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxFlagItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxFrameItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxGlobalNameItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxGrabBagItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxHyphenRegionItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxImageItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxInt16Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxInt32Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxInt64Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxIntegerListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxLinkItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxMacroInfoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxMetricItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxPointItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxPoolItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxRangeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxRectangleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxScriptOrganizerItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxStringItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxStringListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxTabDialogItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxUInt16Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxUInt32Item, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxUnoAnyItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxUnoFrameItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxVisibilityItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxVoidItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxWatermarkItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvXMLAttrContainerItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DCharacterModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DCloseBackItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DCloseFrontItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DNormalsKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DPerspectiveItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DReducedLineGeometryItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DShadeModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DSmoothLidsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DSmoothNormalsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DTextureKindItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DTextureModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DTextureProjectionXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<Svx3DTextureProjectionYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxAdjustItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxAutoKernItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxB3DVectorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBitmapListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBlinkItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBoxInfoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBoxItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBrushItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxBulletItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCaseMapItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCharHiddenItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCharReliefItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCharRotateItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCharScaleWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxChartColorTableItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxChartIndicateItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxChartKindErrorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxChartRegressItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxChartTextOrderItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxClipboardFormatItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxColorListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxColumnItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxContourItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxCrossedOutItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxDashListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxDoubleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxEmphasisMarkItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxEscapementItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFieldItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFirstLineIndentItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFontHeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFontItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFontListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxForbiddenRuleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFormatBreakItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFormatKeepItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFormatSplitItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxFrameDirectionItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGalleryItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGradientListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGraphicItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGrfCrop, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGridItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGutterLeftMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxGutterRightMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxHangingPunctuationItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxHatchListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxHorJustifyItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxHyperlinkItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxHyphenZoneItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxJustifyMethodItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxKerningItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLRSpaceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLanguageItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLeftMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLineEndListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLineItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLineSpacingItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLongLRSpaceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxLongULSpaceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxMacroItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxNoHyphenItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxNumBulletItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxNumberInfoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxObjectItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxOpaqueItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxOrientationItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxOrphansItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxOverlineItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPageItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPageModelItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPagePosSizeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPaperBinItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxParaGridItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxParaVertAlignItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPatternListItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPostItAuthorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPostItDateItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPostItIdItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPostItTextItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPostureItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxPrintItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxProtectItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxRectangleAlignmentItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxRightMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxRotateModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxRsidItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxScriptSpaceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxSearchItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxSetItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxShadowItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxShadowedItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxSizeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxSmartTagItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxStatusItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxTabStopItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxTextLeftMarginItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxTextRotateItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxTwoLinesItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxULSpaceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxUnderlineItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxVerJustifyItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxViewLayoutItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxWeightItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxWidowsItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxWordLineModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxWritingModeItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxZoomItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SvxZoomSliderItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwAddPrinterItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwAttrSetChg, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwChannelBGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwChannelGGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwChannelRGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwCharFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwCondCollItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwConditionTextFormatColl, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwContrastGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwCropGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwDocDisplayItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwDrawFrameFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwDrawModeGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwElemItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwEnvItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFindNearestNode, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFltAnchor, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFltRDFMark, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFltRedline, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFltTOX, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFlyFrameFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatAnchor, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatAutoFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatChain, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatCharFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatChg, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatCol, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatContent, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatContentControl, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatDrop, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatEditInReadonly, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatEndAtTextEnd, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatField, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFillOrder, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFlyCnt, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFlySplit, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFollowTextFlow, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFooter, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFootnote, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFootnoteAtTextEnd, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatFrameSize, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatHeader, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatHoriOrient, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatINetFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatLayoutSplit, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatLineBreak, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatLineNumber, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatMeta, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatNoBalancedColumns, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatPageDesc, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatRefMark, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatRowSplit, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatRuby, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatSurround, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatURL, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatVertOrient, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatWrapInfluenceOnObjPos, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFormatWrapTextAtFlyStart, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwFrameFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwGammaGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwGrfFormatColl, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwHeaderAndFooterEatSpacingItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwInvertGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwLuminanceGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwMirrorGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwMsgPoolItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwNumRuleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwPaMItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwPageFootnoteInfoItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwParaConnectBorderItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwPtrItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwPtrMsgPoolItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwRegisterItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwRotationGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwShadowCursorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTOXMark, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTableBoxFormula, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTableBoxNumFormat, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTableBoxValue, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTestItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTextFormatColl, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTextGridItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwTransparencyGrf, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwUINumRuleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwUpdateAttr, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SwWrtShellItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillAttrSetItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBackgroundItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBitmapItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpPosItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpPosOffsetXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpPosOffsetYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpSizeLogItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpSizeYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpStretchItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpTileItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpTileOffsetXItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillBmpTileOffsetYItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillFloatTransparenceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillGradientItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillHatchItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillStyleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillTransparenceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFillUseSlideBackgroundItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextAdjustItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextDistanceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextHideFormItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextMirrorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextOutlineItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextShadowColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextShadowItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextShadowTranspItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextShadowXValItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextShadowYValItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextStartItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XFormTextStyleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XGradientStepCountItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineAttrSetItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineCapItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineDashItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineEndCenterItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineEndItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineEndWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineJointItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineStartCenterItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineStartItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineStartWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineStyleItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineTransparenceItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XLineWidthItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XSecondaryFillColorItem, derived_type>, int>::type)
+include/svl/typedwhich.hxx:31
+     TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<const SfxStringItem, derived_type>, int>::type)
+include/svl/whichranges.hxx:52
+    void svl::Items_t::fill(struct std::pair<unsigned short, unsigned short> *)
+include/svtools/ctrlbox.hxx:407
+    void FontStyleBox::set_size_request(int,int)
+include/svtools/ctrlbox.hxx:478
+    void FontSizeBox::set_size_request(int,int)
 include/svtools/DocumentToGraphicRenderer.hxx:105
     _Bool DocumentToGraphicRenderer::isImpress() const
+include/svtools/scrolladaptor.hxx:60
+    _Bool ScrollAdaptor::IsHoriScroll() const
 include/svx/autoformathelper.hxx:145
-    _Bool AutoFormatBase::operator==(const class AutoFormatBase &) const
-include/svx/ClassificationDialog.hxx:86
-    void svx::ClassificationDialog::(anonymous)::__invoke()
-include/svx/ClassificationField.hxx:47
-    const class rtl::OUString & svx::ClassificationResult::getDisplayText() const
-include/svx/ClassificationField.hxx:52
-    _Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const
-include/svx/devtools/DevelopmentToolDockingWindow.hxx:40
-    void DevelopmentToolDockingWindow::inspectDocument()
-include/svx/DiagramDataInterface.hxx:33
-    class rtl::OUString DiagramDataInterface::getString() const
-include/svx/dlgctrl.hxx:265
-    void SvxLineEndLB::set_active_text(const class rtl::OUString &)
-include/svx/framelink.hxx:170
-    _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &)
-include/svx/gallery1.hxx:56
-    const class std::unique_ptr<class GalleryBinaryEngineEntry, struct std::default_delete<class GalleryBinaryEngineEntry> > & GalleryThemeEntry::getGalleryStorageEngineEntry() const
-include/svx/gallerybinaryengine.hxx:60
-    const class INetURLObject & GalleryBinaryEngine::GetStrURL() const
-include/svx/sidebar/InspectorTextPanel.hxx:50
-    class VclPtr<class vcl::Window> svx::sidebar::InspectorTextPanel::Create(class vcl::Window *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &)
+    _Bool AutoFormatBase::operator==(const AutoFormatBase &) const
+include/svx/ClassificationField.hxx:48
+    const rtl::OUString & svx::ClassificationResult::getDisplayText() const
+include/svx/ClassificationField.hxx:53
+    _Bool svx::ClassificationResult::operator==(const svx::ClassificationResult &) const
+include/svx/diagram/IDiagramHelper.hxx:48
+    void svx::diagram::DiagramFrameHdl::clicked(const struct svx::diagram::Point &)
+include/svx/diagram/IDiagramHelper.hxx:94
+    rtl::OUString svx::diagram::IDiagramHelper::getString() const
+include/svx/dlgctrl.hxx:263
+    void SvxLineEndLB::set_active_text(const rtl::OUString &)
+include/svx/framelink.hxx:169
+    _Bool svx::frame::operator>(const svx::frame::Style &,const svx::frame::Style &)
+include/svx/hlnkitem.hxx:103
+    void SvxHyperlinkItem::SetReplacementText(const rtl::OUString &)
+include/svx/langbox.hxx:95
+    void SvxLanguageBox::set_size_request(int,int)
+include/svx/sidebar/InspectorTextPanel.hxx:49
+    std::unique_ptr<PanelLayout> svx::sidebar::InspectorTextPanel::Create(weld::Widget *)
 include/svx/svdlayer.hxx:74
-    _Bool SdrLayer::operator==(const class SdrLayer &) const
-include/svx/svdpntv.hxx:448
+    _Bool SdrLayer::operator==(const SdrLayer &) const
+include/svx/svdpage.hxx:232
+    std::reverse_iterator<__gnu_debug::_Safe_iterator<struct std::__cxx1998::_Deque_iterator<rtl::Reference<SdrObject>, const rtl::Reference<SdrObject> &, const rtl::Reference<SdrObject> *>, std::deque<rtl::Reference<SdrObject> > > > SdrObjList::rbegin() const
+include/svx/svdpage.hxx:233
+    std::reverse_iterator<__gnu_debug::_Safe_iterator<struct std::__cxx1998::_Deque_iterator<rtl::Reference<SdrObject>, const rtl::Reference<SdrObject> &, const rtl::Reference<SdrObject> *>, std::deque<rtl::Reference<SdrObject> > > > SdrObjList::rend() const
+include/svx/svdpage.hxx:337
+    void SdrPageProperties::sendLOKitThemeChangedCallback()
+include/svx/svdpntv.hxx:524
     _Bool SdrPaintView::IsSwapAsynchron() const
-include/svx/txencbox.hxx:92
+include/svx/svdtrans.hxx:246
+    _Bool IsMetric(enum MapUnit)
+include/svx/txencbox.hxx:81
     void SvxTextEncodingBox::grab_focus()
-include/svx/txencbox.hxx:146
-    void SvxTextEncodingTreeView::connect_changed(const class Link<class weld::TreeView &, void> &)
+include/svx/txencbox.hxx:135
+    void SvxTextEncodingTreeView::connect_changed(const Link<weld::TreeView &, void> &)
 include/svx/xpoly.hxx:83
-    _Bool XPolygon::operator==(const class XPolygon &) const
-include/tools/bigint.hxx:76
-     BigInt::BigInt(unsigned int)
-include/tools/bigint.hxx:82
+    _Bool XPolygon::operator==(const XPolygon &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XActionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XAdjustmentListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XFocusListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XItemListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XKeyListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XMenuListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XMouseListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XMouseMotionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XPaintListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XSpinListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XTabListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XTextListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XTopWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XVclContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::XWindowListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::grid::XGridSelectionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::tab::XTabPageContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::tree::XTreeEditListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::awt::tree::XTreeExpansionListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::container::XContainerListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::lang::XEventListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/toolkit/helper/listenermultiplexer.hxx:115
+    void ListenerMultiplexerBase::notifyEach(void (com::sun::star::view::XSelectionChangeListener::*)(const type-parameter-?-? &),const type-parameter-?-? &) const
+include/tools/bigint.hxx:94
     unsigned short BigInt::operator unsigned short() const
-include/tools/bigint.hxx:84
+include/tools/bigint.hxx:96
     unsigned int BigInt::operator unsigned int() const
-include/tools/bigint.hxx:109
-    class BigInt operator-(const class BigInt &,const class BigInt &)
-include/tools/bigint.hxx:112
-    class BigInt operator%(const class BigInt &,const class BigInt &)
-include/tools/bigint.hxx:115
-    _Bool operator!=(const class BigInt &,const class BigInt &)
-include/tools/bigint.hxx:118
-    _Bool operator<=(const class BigInt &,const class BigInt &)
-include/tools/color.hxx:31
+include/tools/bigint.hxx:120
+    _Bool operator==(const BigInt &,const BigInt &)
+include/tools/bigint.hxx:210
+    BigInt operator-(const BigInt &,const BigInt &)
+include/tools/bigint.hxx:231
+    BigInt operator%(const BigInt &,const BigInt &)
+include/tools/color.hxx:32
     unsigned int color::extractRGB(unsigned int)
-include/tools/color.hxx:86
-     Color::Color(enum ColorAlphaTag,unsigned int)
-include/tools/color.hxx:241
-    _Bool Color::operator>(const class Color &) const
-include/tools/cpuid.hxx:61
+include/tools/cpuid.hxx:67
+    _Bool cpuid::hasSSE2()
+include/tools/cpuid.hxx:74
     _Bool cpuid::hasSSSE3()
-include/tools/cpuid.hxx:68
+include/tools/cpuid.hxx:81
+    _Bool cpuid::hasAVX()
+include/tools/cpuid.hxx:88
     _Bool cpuid::hasAVX2()
-include/tools/date.hxx:215
-    _Bool Date::operator>=(const class Date &) const
-include/tools/datetime.hxx:47
-     DateTime::DateTime(const class tools::Time &)
-include/tools/datetime.hxx:88
-    class DateTime operator-(const class DateTime &,int)
-include/tools/datetime.hxx:90
-    class DateTime operator-(const class DateTime &,double)
-include/tools/datetime.hxx:92
-    class DateTime operator+(const class DateTime &,const class tools::Time &)
-include/tools/datetime.hxx:93
-    class DateTime operator-(const class DateTime &,const class tools::Time &)
+include/tools/cpuid.hxx:95
+    _Bool cpuid::hasAVX512F()
+include/tools/date.hxx:218
+    _Bool Date::operator>=(const Date &) const
+include/tools/date.hxx:244
+    _Bool Date::IsValidDate(unsigned short,unsigned short,short)
+include/tools/datetime.hxx:52
+     DateTime::DateTime(const tools::Time &)
+include/tools/datetime.hxx:98
+    DateTime operator-(const DateTime &,int)
+include/tools/datetime.hxx:100
+    DateTime operator-(const DateTime &,double)
+include/tools/datetime.hxx:103
+    DateTime operator-(const DateTime &,const tools::Time &)
+include/tools/datetime.hxx:105
+    tools::Duration operator-(const DateTime &,const DateTime &)
+include/tools/fract.hxx:41
+     Fraction::Fraction(double,double)
+include/tools/fract.hxx:68
+    Fraction & Fraction::operator+=(double)
 include/tools/fract.hxx:69
-    class Fraction & Fraction::operator+=(double)
-include/tools/fract.hxx:70
-    class Fraction & Fraction::operator-=(double)
-include/tools/fract.hxx:86
-    _Bool operator>=(const class Fraction &,const class Fraction &)
-include/tools/fract.hxx:105
-    class Fraction operator+(const class Fraction &,double)
-include/tools/fract.hxx:106
-    class Fraction operator-(const class Fraction &,double)
+    Fraction & Fraction::operator-=(double)
+include/tools/fract.hxx:91
+    _Bool operator>=(const Fraction &,const Fraction &)
 include/tools/fract.hxx:108
-    class Fraction operator/(const class Fraction &,double)
-include/tools/gen.hxx:260
-    class Pair & Range::toPair()
-include/tools/gen.hxx:327
-    class Pair & Selection::toPair()
+    Fraction operator-(const Fraction &,double)
+include/tools/fract.hxx:110
+    Fraction operator/(const Fraction &,double)
+include/tools/gen.hxx:213
+    AbsoluteScreenPixelPoint operator*(const AbsoluteScreenPixelPoint &,const long)
+include/tools/gen.hxx:222
+    AbsoluteScreenPixelPoint operator/(const AbsoluteScreenPixelPoint &,const long)
+include/tools/gen.hxx:240
+    _Bool operator!=(const AbsoluteScreenPixelPoint &,const AbsoluteScreenPixelPoint &)
+include/tools/gen.hxx:308
+    type-parameter-?-? & SizeTemplate::operator+=(const type-parameter-?-? &)
+include/tools/gen.hxx:314
+    type-parameter-?-? & SizeTemplate::operator-=(const type-parameter-?-? &)
+include/tools/gen.hxx:374
+    _Bool operator!=(const AbsoluteScreenPixelSize &,const AbsoluteScreenPixelSize &)
+include/tools/gen.hxx:379
+    Size operator+(const Size &,const Size &)
+include/tools/gen.hxx:383
+    AbsoluteScreenPixelSize operator+(const AbsoluteScreenPixelSize &,const AbsoluteScreenPixelSize &)
+include/tools/gen.hxx:388
+    Size operator-(const Size &,const Size &)
+include/tools/gen.hxx:392
+    AbsoluteScreenPixelSize operator-(const AbsoluteScreenPixelSize &,const AbsoluteScreenPixelSize &)
+include/tools/gen.hxx:401
+    AbsoluteScreenPixelSize operator*(const AbsoluteScreenPixelSize &,const long)
+include/tools/gen.hxx:410
+    AbsoluteScreenPixelSize operator/(const AbsoluteScreenPixelSize &,const long)
+include/tools/gen.hxx:457
+    Pair & Range::toPair()
+include/tools/gen.hxx:520
+    Pair & Selection::toPair()
+include/tools/gen.hxx:750
+     RectangleTemplate::RectangleTemplate<RectangleT, PointT, SizeT>(long,long)
+include/tools/json_writer.hxx:60
+    void tools::JsonWriter::put(std::basic_string_view<char>,const char (&)[_ArrayExtent])
+include/tools/json_writer.hxx:88
+    void tools::JsonWriter::closeDocument()
 include/tools/link.hxx:134
     const char * Link::getSourceFilename() const
 include/tools/link.hxx:135
     int Link::getSourceLineNumber() const
 include/tools/link.hxx:136
     const char * Link::getTargetName() const
-include/tools/poly.hxx:160
-    _Bool tools::Polygon::operator!=(const class tools::Polygon &) const
-include/tools/poly.hxx:248
-    _Bool tools::PolyPolygon::operator!=(const class tools::PolyPolygon &) const
-include/tools/simd.hxx:21
-    type-parameter-?-? simd::roundDown(type-parameter-?-?,unsigned int)
+include/tools/poly.hxx:163
+    _Bool tools::Polygon::operator!=(const tools::Polygon &) const
+include/tools/poly.hxx:252
+    _Bool tools::PolyPolygon::operator!=(const tools::PolyPolygon &) const
 include/tools/stream.hxx:508
-    class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream &)
-include/tools/UnitConversion.hxx:32
-    double convertPointToTwip(double)
-include/tools/urlobj.hxx:448
-    _Bool INetURLObject::SetHost(const class rtl::OUString &)
-include/tools/urlobj.hxx:952
-    int INetURLObject::SubString::set(class rtl::OUString &,const class rtl::OUString &)
+    rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(SvStream &)
+include/tools/urlobj.hxx:444
+    _Bool INetURLObject::SetHost(std::basic_string_view<char16_t>)
+include/tools/urlobj.hxx:949
+    int INetURLObject::SubString::set(rtl::OUString &,std::basic_string_view<char16_t>)
+include/tools/weakbase.h:77
+     tools::WeakReference::WeakReference<reference_type>()
+include/tools/weakbase.h:80
+     tools::WeakReference::WeakReference<reference_type>(type-parameter-?-? *)
+include/tools/weakbase.h:92
+    _Bool tools::WeakReference::operator bool() const
+include/tools/weakbase.h:98
+    void tools::WeakReference::reset(type-parameter-?-? *)
+include/tools/weakbase.h:101
+    void tools::WeakReference::reset()
+include/tools/weakbase.h:104
+    type-parameter-?-? * tools::WeakReference::operator->() const
+include/tools/weakbase.h:107
+    type-parameter-?-? & tools::WeakReference::operator*() const
 include/tools/weakbase.h:110
     _Bool tools::WeakReference::operator==(const type-parameter-?-? *) const
+include/tools/weakbase.h:113
+    _Bool tools::WeakReference::operator==(const WeakReference<reference_type> &) const
+include/tools/weakbase.h:116
+    _Bool tools::WeakReference::operator!=(const WeakReference<reference_type> &) const
 include/tools/weakbase.h:119
     _Bool tools::WeakReference::operator<(const WeakReference<reference_type> &) const
 include/tools/weakbase.h:122
     _Bool tools::WeakReference::operator>(const WeakReference<reference_type> &) const
-include/tools/XmlWriter.hxx:61
-    void tools::XmlWriter::element(const class rtl::OString &)
+include/tools/weakbase.h:148
+    void tools::WeakBase::clearWeak()
+include/tools/weakbase.h:151
+    struct tools::WeakConnection * tools::WeakBase::getWeakConnection()
+include/tools/XmlWriter.hxx:63
+    void tools::XmlWriter::element(const char *)
 include/unotest/directories.hxx:46
-    class rtl::OUString test::Directories::getPathFromWorkdir(class std::basic_string_view<char16_t, struct std::char_traits<char16_t> >) const
-include/unotools/moduleoptions.hxx:166
+    rtl::OUString test::Directories::getPathFromWorkdir(std::basic_string_view<char16_t>) const
+include/unotools/charclass.hxx:101
+    _Bool CharClass::isAlphaNumericType(int)
+include/unotools/localedatawrapper.hxx:243
+    const rtl::OUString & LocaleDataWrapper::getLongDateYearSep() const
+include/unotools/moduleoptions.hxx:165
     _Bool SvtModuleOptions::IsDataBase() const
+include/unotools/resmgr.hxx:57
+     TranslateNId::TranslateNId()
+include/unotools/resmgr.hxx:62
+    _Bool TranslateNId::operator bool() const
+include/unotools/resmgr.hxx:65
+    _Bool TranslateNId::operator!=(const struct TranslateNId &) const
+include/unotools/securityoptions.hxx:63
+    _Bool SvtSecurityOptions::Certificate::operator==(const struct SvtSecurityOptions::Certificate &) const
 include/unotools/textsearch.hxx:121
     basic_ostream<type-parameter-?-?, type-parameter-?-?> & utl::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const enum utl::SearchParam::SearchType &)
-include/vcl/alpha.hxx:47
-    _Bool AlphaMask::operator==(const class AlphaMask &) const
-include/vcl/alpha.hxx:48
-    _Bool AlphaMask::operator!=(const class AlphaMask &) const
-include/vcl/animate/Animation.hxx:40
-    _Bool Animation::operator!=(const class Animation &) const
-include/vcl/animate/AnimationBitmap.hxx:68
-    _Bool AnimationBitmap::operator!=(const struct AnimationBitmap &) const
+include/unotools/weakref.hxx:72
+     unotools::WeakReference::WeakReference<interface_type>(type-parameter-?-? &)
+include/vcl/alpha.hxx:46
+    _Bool AlphaMask::operator!=(const AlphaMask &) const
+include/vcl/animate/Animation.hxx:42
+    _Bool Animation::operator!=(const Animation &) const
+include/vcl/animate/AnimationFrame.hxx:77
+    _Bool AnimationFrame::operator!=(const struct AnimationFrame &) const
+include/vcl/bitmap.hxx:590
+    const basegfx::SystemDependentDataHolder * Bitmap::accessSystemDependentDataHolder() const
 include/vcl/BitmapBasicMorphologyFilter.hxx:63
      BitmapDilateFilter::BitmapDilateFilter(int,unsigned char)
-include/vcl/builder.hxx:104
-    const class rtl::OString & VclBuilder::getUIFile() const
+include/vcl/BitmapInfoAccess.hxx:163
+     BitmapScopedInfoAccess::BitmapScopedInfoAccess(const AlphaMask &)
+include/vcl/BitmapInfoAccess.hxx:184
+    void BitmapScopedInfoAccess::reset()
+include/vcl/BitmapInfoAccess.hxx:186
+    BitmapInfoAccess * BitmapScopedInfoAccess::get()
+include/vcl/BitmapInfoAccess.hxx:187
+    const BitmapInfoAccess * BitmapScopedInfoAccess::get() const
+include/vcl/BitmapInfoAccess.hxx:192
+    BitmapInfoAccess & BitmapScopedInfoAccess::operator*()
+include/vcl/BitmapInfoAccess.hxx:193
+    const BitmapInfoAccess & BitmapScopedInfoAccess::operator*() const
+include/vcl/BitmapReadAccess.hxx:86
+    BitmapColor BitmapReadAccess::GetPixel(const Point &) const
+include/vcl/BitmapReadAccess.hxx:110
+    unsigned char BitmapReadAccess::GetPixelIndex(const Point &) const
+include/vcl/BitmapWriteAccess.hxx:66
+    void BitmapWriteAccess::SetFillColor()
+include/vcl/builder.hxx:107
+    const rtl::OUString & VclBuilder::getUIFile() const
 include/vcl/builder.hxx:333
-    void VclBuilder::connectNumericFormatterAdjustment(const class rtl::OString &,const class rtl::OUString &)
+    void VclBuilder::connectNumericFormatterAdjustment(const rtl::OUString &,const rtl::OUString &)
 include/vcl/builderpage.hxx:36
-    void BuilderPage::SetHelpId(const class rtl::OString &)
+    void BuilderPage::SetHelpId(const rtl::OUString &)
 include/vcl/ColorMask.hxx:110
-    void ColorMask::GetColorFor16BitMSB(class BitmapColor &,const unsigned char *) const
+    void ColorMask::GetColorFor16BitMSB(BitmapColor &,const unsigned char *) const
 include/vcl/ColorMask.hxx:111
-    void ColorMask::SetColorFor16BitMSB(const class BitmapColor &,unsigned char *) const
+    void ColorMask::SetColorFor16BitMSB(const BitmapColor &,unsigned char *) const
 include/vcl/ColorMask.hxx:113
-    void ColorMask::SetColorFor16BitLSB(const class BitmapColor &,unsigned char *) const
-include/vcl/commandevent.hxx:249
-     CommandMediaData::CommandMediaData(enum MediaCommand)
+    void ColorMask::SetColorFor16BitLSB(const BitmapColor &,unsigned char *) const
+include/vcl/commandevent.hxx:99
+    const CommandGestureRotateData * CommandEvent::GetGestureRotateData() const
 include/vcl/commandevent.hxx:256
+     CommandMediaData::CommandMediaData(enum MediaCommand)
+include/vcl/commandevent.hxx:263
     _Bool CommandMediaData::GetPassThroughToOS() const
-include/vcl/commandevent.hxx:276
-     CommandSwipeData::CommandSwipeData()
-include/vcl/commandevent.hxx:293
-     CommandLongPressData::CommandLongPressData()
+include/vcl/commandevent.hxx:283
+     CommandGestureSwipeData::CommandGestureSwipeData()
+include/vcl/commandevent.hxx:300
+     CommandGestureLongPressData::CommandGestureLongPressData()
 include/vcl/cursor.hxx:96
-    _Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const
+    _Bool vcl::Cursor::operator!=(const vcl::Cursor &) const
 include/vcl/customweld.hxx:45
-    class rtl::OUString weld::CustomWidgetController::GetHelpText() const
+    rtl::OUString weld::CustomWidgetController::GetHelpText() const
+include/vcl/customweld.hxx:88
+    Point weld::CustomWidgetController::GetPointerPosPixel() const
 include/vcl/customweld.hxx:168
     void weld::CustomWeld::queue_draw_area(int,int,int,int)
 include/vcl/customweld.hxx:183
     void weld::CustomWeld::set_visible(_Bool)
-include/vcl/errcode.hxx:86
-    _Bool ErrCode::operator<(const class ErrCode &) const
-include/vcl/errcode.hxx:87
-    _Bool ErrCode::operator<=(const class ErrCode &) const
-include/vcl/errcode.hxx:88
-    _Bool ErrCode::operator>(const class ErrCode &) const
-include/vcl/errcode.hxx:89
-    _Bool ErrCode::operator>=(const class ErrCode &) const
+include/vcl/customweld.hxx:187
+    void weld::CustomWeld::set_tooltip_text(const rtl::OUString &)
+include/vcl/fieldvalues.hxx:58
+    double vcl::ConvertDoubleValue(long,long,unsigned short,enum FieldUnit,enum FieldUnit)
 include/vcl/filter/pdfdocument.hxx:119
-    const class std::__debug::vector<class vcl::filter::PDFReferenceElement *, class std::allocator<class vcl::filter::PDFReferenceElement *> > & vcl::filter::PDFObjectElement::GetDictionaryReferences() const
+    const std::vector<vcl::filter::PDFReferenceElement *> & vcl::filter::PDFObjectElement::GetDictionaryReferences() const
 include/vcl/filter/pdfdocument.hxx:128
     unsigned long vcl::filter::PDFObjectElement::GetArrayLength() const
 include/vcl/filter/pdfdocument.hxx:188
-    class vcl::filter::PDFNumberElement & vcl::filter::PDFReferenceElement::GetObjectElement() const
-include/vcl/filter/pdfdocument.hxx:548
-    class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > vcl::filter::PDFDocument::DecodeHexString(const class vcl::filter::PDFHexStringElement *)
-include/vcl/filter/PDFiumLibrary.hxx:68
-    class rtl::OUString vcl::pdf::PDFium::getLastError() const
+    vcl::filter::PDFNumberElement & vcl::filter::PDFReferenceElement::GetObjectElement() const
 include/vcl/filter/PDFiumLibrary.hxx:102
-    class std::unique_ptr<class vcl::pdf::PDFiumPageObject, struct std::default_delete<class vcl::pdf::PDFiumPageObject> > vcl::pdf::PDFiumAnnotation::getObject(int)
-include/vcl/filter/PDFiumLibrary.hxx:108
-    class basegfx::B2DVector vcl::pdf::PDFiumAnnotation::getBorderCornerRadius()
-include/vcl/filter/PDFiumLibrary.hxx:137
-    struct fpdf_pageobject_t__ * vcl::pdf::PDFiumPageObject::getPointer()
-include/vcl/gdimtf.hxx:110
-    _Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const
-include/vcl/gdimtf.hxx:204
-    void GDIMetaFile::dumpAsXml(const char *) const
-include/vcl/gradient.hxx:84
-    _Bool Gradient::operator!=(const class Gradient &) const
+    basegfx::B2DSize vcl::pdf::PDFiumAnnotation::getBorderCornerRadius()
+include/vcl/font/Feature.hxx:50
+     vcl::font::FeatureParameter::FeatureParameter(unsigned int,struct TranslateId)
+include/vcl/font/Feature.hxx:77
+     vcl::font::FeatureDefinition::FeatureDefinition(unsigned int,struct TranslateId,std::vector<struct vcl::font::FeatureParameter>)
+include/vcl/gdimtf.hxx:111
+    _Bool GDIMetaFile::operator!=(const GDIMetaFile &) const
+include/vcl/GestureEventRotate.hxx:36
+     GestureEventRotate::GestureEventRotate(int,int,enum GestureEventRotateType,double)
+include/vcl/GestureEventZoom.hxx:36
+     GestureEventZoom::GestureEventZoom(int,int,enum GestureEventZoomType,double)
+include/vcl/gradient.hxx:87
+    _Bool Gradient::operator!=(const Gradient &) const
 include/vcl/hatch.hxx:57
-    _Bool Hatch::operator!=(const class Hatch &) const
-include/vcl/inputctx.hxx:62
-    _Bool InputContext::operator!=(const class InputContext &) const
-include/vcl/ITiledRenderable.hxx:214
+    _Bool Hatch::operator!=(const Hatch &) const
+include/vcl/inputctx.hxx:63
+    _Bool InputContext::operator!=(const InputContext &) const
+include/vcl/ITiledRenderable.hxx:244
     enum PointerStyle vcl::ITiledRenderable::getPointer()
-include/vcl/lok.hxx:22
+include/vcl/jsdialog/executor.hxx:57
+    void LOKTrigger::trigger_clicked(weld::Button &)
+include/vcl/kernarray.hxx:66
+    int KernArray::get_subunit(unsigned long) const
+include/vcl/kernarray.hxx:68
+    void KernArray::set_subunit(unsigned long,int)
+include/vcl/lazydelete.hxx:76
+     vcl::DeleteOnDeinit::DeleteOnDeinit(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<(anonymous namespace)::SdrHdlBitmapSet> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<(anonymous namespace)::VDevBuffer> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<BitmapEx> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<EditDLL> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<SalLayoutGlyphsCache> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<VclPtr<OutputDevice> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<Wallpaper> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<com::sun::star::uno::Reference<com::sun::star::i18n::XLocaleData4> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<drawinglayer::primitive2d::DiscreteShadow> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<o3tl::lru_map<rtl::OUString, std::shared_ptr<const vcl::text::TextLayoutCache>, struct vcl::text::FirstCharsStringHash, struct vcl::text::FastStringCompareEqual, struct vcl::text::(anonymous namespace)::TextLayoutCacheCost> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<std::shared_ptr<weld::Window> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<std::unordered_map<int, rtl::Reference<LOKClipboard> > > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lazydelete.hxx:92
+    std::optional<struct (anonymous namespace)::WavyLineCache> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...)
+include/vcl/lok.hxx:23
     void vcl::lok::unregisterPollCallbacks()
-include/vcl/menu.hxx:475
-    unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &)
-include/vcl/menu.hxx:479
-    void MenuBar::SetMenuBarButtonHighlightHdl(unsigned short,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &)
-include/vcl/menu.hxx:483
-    class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short)
-include/vcl/menu.hxx:484
-    void MenuBar::RemoveMenuBarButton(unsigned short)
-include/vcl/opengl/OpenGLHelper.hxx:51
-    class rtl::OString OpenGLHelper::GetDigest(const class rtl::OUString &,const class rtl::OUString &,class std::basic_string_view<char, struct std::char_traits<char> >)
-include/vcl/opengl/OpenGLHelper.hxx:68
-    void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &)
-include/vcl/opengl/OpenGLHelper.hxx:101
-    void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &)
-include/vcl/outdev.hxx:1738
-    class basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const class basegfx::B2DPolyPolygon &,const class MapMode &) const
-include/vcl/outdev.hxx:1758
-    class basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolyPolygon &,const class MapMode &) const
-include/vcl/salnativewidgets.hxx:408
-    _Bool TabitemValue::isBothAligned() const
+include/vcl/opengl/OpenGLHelper.hxx:70
+    void OpenGLHelper::renderToFile(long,long,const rtl::OUString &)
+include/vcl/opengl/OpenGLHelper.hxx:103
+    void OpenGLHelper::debugMsgStreamWarn(const std::basic_ostringstream<char> &)
+include/vcl/outdev.hxx:1519
+    void OutputDevice::DrawMask(const Point &,const Size &,const Point &,const Size &,const Bitmap &,const Color &)
+include/vcl/outdev.hxx:1609
+    basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const basegfx::B2DPolyPolygon &,const MapMode &) const
+include/vcl/outdev.hxx:1627
+    basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const basegfx::B2DPolyPolygon &,const MapMode &) const
+include/vcl/pdfextoutdevdata.hxx:117
+    _Bool vcl::PDFExtOutDevData::GetIsExportNotesInMargin() const
 include/vcl/salnativewidgets.hxx:409
+    _Bool TabitemValue::isBothAligned() const
+include/vcl/salnativewidgets.hxx:410
     _Bool TabitemValue::isNotAligned() const
-include/vcl/settings.hxx:430
+include/vcl/settings.hxx:432
+    const Color & StyleSettings::GetAlternatingRowColor() const
+include/vcl/settings.hxx:443
     void StyleSettings::SetUseFlatBorders(_Bool)
-include/vcl/settings.hxx:433
+include/vcl/settings.hxx:446
     void StyleSettings::SetUseFlatMenus(_Bool)
-include/vcl/settings.hxx:445
+include/vcl/settings.hxx:458
     void StyleSettings::SetHideDisabledMenuItems(_Bool)
-include/vcl/settings.hxx:510
-    void StyleSettings::SetSpinSize(long)
-include/vcl/settings.hxx:665
-    _Bool HelpSettings::operator!=(const class HelpSettings &) const
-include/vcl/settings.hxx:723
-    _Bool AllSettings::operator!=(const class AllSettings &) const
+include/vcl/settings.hxx:523
+    void StyleSettings::SetSpinSize(int)
+include/vcl/settings.hxx:556
+    Size StyleSettings::GetToolbarIconSizePixel() const
+include/vcl/settings.hxx:655
+    int MiscSettings::GetDarkMode()
+include/vcl/settings.hxx:680
+    _Bool HelpSettings::operator!=(const HelpSettings &) const
+include/vcl/settings.hxx:741
+    _Bool AllSettings::operator!=(const AllSettings &) const
 include/vcl/split.hxx:92
     void Splitter::SetHorizontal(_Bool)
-include/vcl/svapp.hxx:164
-     ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
-include/vcl/svapp.hxx:797
-    void Application::AppEvent(const class ApplicationEvent &)
-include/vcl/syswin.hxx:116
-    void SystemWindow::SetIdleDebugName(const char *)
-include/vcl/TaskStopwatch.hxx:97
+include/vcl/svapp.hxx:167
+     ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,std::vector<rtl::OUString> &&)
+include/vcl/svapp.hxx:809
+    void Application::AppEvent(const ApplicationEvent &)
+include/vcl/TaskStopwatch.hxx:91
     void TaskStopwatch::reset()
-include/vcl/TaskStopwatch.hxx:108
+include/vcl/TaskStopwatch.hxx:102
     void TaskStopwatch::setInputStop(enum VclInputFlags)
-include/vcl/TaskStopwatch.hxx:109
+include/vcl/TaskStopwatch.hxx:103
     enum VclInputFlags TaskStopwatch::inputStop() const
-include/vcl/TaskStopwatch.hxx:117
+include/vcl/TaskStopwatch.hxx:111
     unsigned int TaskStopwatch::timeSlice()
-include/vcl/TaskStopwatch.hxx:118
+include/vcl/TaskStopwatch.hxx:112
     void TaskStopwatch::setTimeSlice(unsigned int)
 include/vcl/textrectinfo.hxx:48
-    _Bool TextRectInfo::operator!=(const class TextRectInfo &) const
+    _Bool TextRectInfo::operator!=(const TextRectInfo &) const
 include/vcl/toolkit/longcurr.hxx:47
-    class BigInt LongCurrencyFormatter::GetValue() const
-include/vcl/toolkit/treelist.hxx:171
-    const class SvTreeListEntry * SvTreeList::GetParent(const class SvTreeListEntry *) const
-include/vcl/toolkit/treelist.hxx:231
-    _Bool SvListView::IsDirtyModel() const
-include/vcl/toolkit/treelist.hxx:233
-    void SvListView::SetDirtyModel(_Bool)
-include/vcl/toolkit/treelistbox.hxx:369
+    BigInt LongCurrencyFormatter::GetValue() const
+include/vcl/toolkit/treelist.hxx:170
+    const SvTreeListEntry * SvTreeList::GetParent(const SvTreeListEntry *) const
+include/vcl/toolkit/treelistbox.hxx:367
     void SvTreeListBox::RemoveSelection()
 include/vcl/txtattr.hxx:56
-    _Bool TextAttrib::operator!=(const class TextAttrib &) const
-include/vcl/uitest/uiobject.hxx:286
-     TabPageUIObject::TabPageUIObject(const class VclPtr<class TabPage> &)
-include/vcl/uitest/uiobject.hxx:294
-    class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > TabPageUIObject::create(class vcl::Window *)
-include/vcl/uitest/uiobject.hxx:357
-     SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &)
-include/vcl/uitest/uiobject.hxx:365
-    class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *)
-include/vcl/weld.hxx:179
+    _Bool TextAttrib::operator!=(const TextAttrib &) const
+include/vcl/uitest/uiobject.hxx:135
+    std::unique_ptr<UIObject> WindowUIObject::get_visible_child(const rtl::OUString &)
+include/vcl/uitest/uiobject.hxx:311
+     TabPageUIObject::TabPageUIObject(const VclPtr<TabPage> &)
+include/vcl/uitest/uiobject.hxx:319
+    std::unique_ptr<UIObject> TabPageUIObject::create(vcl::Window *)
+include/vcl/uitest/uiobject.hxx:382
+     SpinUIObject::SpinUIObject(const VclPtr<SpinButton> &)
+include/vcl/uitest/uiobject.hxx:390
+    std::unique_ptr<UIObject> SpinUIObject::create(vcl::Window *)
+include/vcl/weld.hxx:185
     _Bool weld::Widget::get_hexpand() const
-include/vcl/weld.hxx:181
+include/vcl/weld.hxx:187
     _Bool weld::Widget::get_vexpand() const
-include/vcl/weld.hxx:183
-    void weld::Widget::set_secondary(_Bool)
-include/vcl/weld.hxx:190
+include/vcl/weld.hxx:194
     int weld::Widget::get_margin_top() const
-include/vcl/weld.hxx:191
+include/vcl/weld.hxx:195
     int weld::Widget::get_margin_bottom() const
-include/vcl/weld.hxx:193
-    int weld::Widget::get_margin_end() const
-include/vcl/weld.hxx:373
+include/vcl/weld.hxx:423
+    void weld::ScrolledWindow::hadjustment_set_upper(int)
+include/vcl/weld.hxx:426
+    void weld::ScrolledWindow::hadjustment_set_page_increment(int)
+include/vcl/weld.hxx:427
     void weld::ScrolledWindow::hadjustment_set_step_increment(int)
-include/vcl/weld.hxx:375
-    enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const
-include/vcl/weld.hxx:380
-    int weld::ScrolledWindow::get_hscroll_height() const
-include/vcl/weld.hxx:507
+include/vcl/weld.hxx:568
     struct SystemEnvData weld::Window::get_system_data() const
-include/vcl/weld.hxx:591
-    class rtl::OString weld::Assistant::get_current_page_ident() const
-include/vcl/weld.hxx:597
-    class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const
+include/vcl/weld.hxx:653
+    rtl::OUString weld::Assistant::get_current_page_ident() const
+include/vcl/weld.hxx:659
+    rtl::OUString weld::Assistant::get_page_title(const rtl::OUString &) const
 include/vcl/weld.hxx:1079
-    void weld::TreeView::set_text_align(const class weld::TreeIter &,double,int)
-include/vcl/weld.hxx:1207
-    const class rtl::OUString & weld::TreeView::get_saved_value() const
-include/vcl/weld.hxx:1300
-    _Bool weld::IconView::get_cursor(class weld::TreeIter *) const
-include/vcl/weld.hxx:1310
+    _Bool weld::TreeView::get_sensitive(int,int) const
+include/vcl/weld.hxx:1182
+    void weld::TreeView::set_text_align(const weld::TreeIter &,double,int)
+include/vcl/weld.hxx:1352
+    const rtl::OUString & weld::TreeView::get_saved_value() const
+include/vcl/weld.hxx:1475
+    _Bool weld::IconView::get_cursor(weld::TreeIter *) const
+include/vcl/weld.hxx:1486
     void weld::IconView::select_all()
-include/vcl/weld.hxx:1316
+include/vcl/weld.hxx:1492
     void weld::IconView::save_value()
-include/vcl/weld.hxx:1317
-    const class rtl::OUString & weld::IconView::get_saved_value() const
-include/vcl/weld.hxx:1318
+include/vcl/weld.hxx:1493
+    const rtl::OUString & weld::IconView::get_saved_value() const
+include/vcl/weld.hxx:1494
     _Bool weld::IconView::get_value_changed_from_saved() const
-include/vcl/weld.hxx:1440
-    void weld::MenuButton::append_item_radio(const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:1448
-    void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
-include/vcl/weld.hxx:1453
-    void weld::MenuButton::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:1510
-    void weld::Scale::get_increments(int &,int &) const
-include/vcl/weld.hxx:1527
-    class rtl::OUString weld::ProgressBar::get_text() const
-include/vcl/weld.hxx:1561
-    int weld::Entry::get_position() const
-include/vcl/weld.hxx:1737
-    void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &)
-include/vcl/weld.hxx:1973
-    class Size weld::MetricSpinButton::get_size_request() const
-include/vcl/weld.hxx:1985
+include/vcl/weld.hxx:1623
+    void weld::MenuButton::append_item_radio(const rtl::OUString &,const rtl::OUString &)
+include/vcl/weld.hxx:1631
+    void weld::MenuButton::append_item(const rtl::OUString &,const rtl::OUString &,VirtualDevice &)
+include/vcl/weld.hxx:1713
+    rtl::OUString weld::ProgressBar::get_text() const
+include/vcl/weld.hxx:1935
+    void weld::EntryTreeView::EntryModifyHdl(const weld::Entry &)
+include/vcl/weld.hxx:2168
+    Size weld::MetricSpinButton::get_size_request() const
+include/vcl/weld.hxx:2180
     void weld::MetricSpinButton::set_position(int)
-include/vcl/weld.hxx:2085
+include/vcl/weld.hxx:2284
     int weld::TextView::vadjustment_get_lower() const
-include/vcl/weld.hxx:2276
-    class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const
-include/vcl/weld.hxx:2286
-    void weld::Toolbar::append_separator(const class rtl::OUString &)
-include/vcl/weldutils.hxx:192
-    const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> & weld::WidgetStatusListener::getFrame() const
-include/vcl/weldutils.hxx:344
-    void weld::DateFormatter::CursorChangedHdl(class weld::Entry &)
-include/vcl/weldutils.hxx:344
-    void weld::DateFormatter::LinkStubCursorChangedHdl(void *,class weld::Entry &)
-include/vcl/weldutils.hxx:372
-    void weld::PatternFormatter::connect_focus_out(const class Link<class weld::Widget &, void> &)
-include/vcl/weldutils.hxx:373
-    void weld::PatternFormatter::connect_focus_in(const class Link<class weld::Widget &, void> &)
-include/vcl/window.hxx:416
+include/vcl/weld.hxx:2513
+    rtl::OUString weld::Toolbar::get_item_label(const rtl::OUString &) const
+include/vcl/weld.hxx:2561
+    void weld::Scrollbar::adjustment_configure(int,int,int,int,int,int)
+include/vcl/weld.hxx:2577
+    int weld::Scrollbar::get_scroll_thickness() const
+include/vcl/weld.hxx:2606
+    std::unique_ptr<weld::MenuToggleButton> weld::Builder::weld_menu_toggle_button(const rtl::OUString &)
+include/vcl/weld.hxx:2719
+    rtl::OUString weld::MessageDialogController::get_secondary_text() const
+include/vcl/weldutils.hxx:198
+    const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> & weld::WidgetStatusListener::getFrame() const
+include/vcl/weldutils.hxx:350
+    void weld::DateFormatter::CursorChangedHdl(weld::Entry &)
+include/vcl/weldutils.hxx:350
+    void weld::DateFormatter::LinkStubCursorChangedHdl(void *,weld::Entry &)
+include/vcl/window.hxx:377
     const char * ImplDbgCheckWindow(const void *)
+include/vcl/windowstate.hxx:123
+    std::basic_ostream<char> & vcl::operator<<(std::basic_ostream<char> &,const vcl::WindowData &)
 include/xmloff/txtimp.hxx:115
-    class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP()
+    XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP()
 include/xmloff/txtimp.hxx:116
-    class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP()
-include/xmloff/xmluconv.hxx:183
-    _Bool SvXMLUnitConverter::convertEnum(type-parameter-?-? &,class std::basic_string_view<char, struct std::char_traits<char> >,const SvXMLEnumStringMapEntry<type-parameter-?-?> *)
-libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:72
-    void ::operator()(struct _GtkBuilder *) const
+    XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP()
+include/xmloff/txtimp.hxx:117
+    XMLPropertyBackpatcher<rtl::OUString> & XMLTextImportHelper::GetSequenceNameBP()
+include/xmloff/xmluconv.hxx:190
+    _Bool SvXMLUnitConverter::convertEnum(type-parameter-?-? &,std::basic_string_view<char>,const SvXMLEnumStringMapEntry<type-parameter-?-?> *)
+include/xmlreader/pad.hxx:38
+    void xmlreader::Pad::add(const char (&)[_ArrayExtent])
+include/xmlreader/span.hxx:43
+     xmlreader::Span::Span(const char (&)[_ArrayExtent])
+include/xmlreader/span.hxx:70
+    _Bool xmlreader::Span::operator!=(const char (&)[_ArrayExtent]) const
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31
     void * gtv_comments_sidebar_get_instance_private(struct GtvCommentsSidebar *)
-libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx:80
-    void ::operator()(struct _GtkTargetList *) const
-libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx:183
-    void ::operator()(struct _GList *) const
-libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35
+libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:37
     void openLokDialog(struct _GtkWidget *,void *)
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpAtomHolder>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpAtomHolder>::no & detail::has_clone::check_sig()
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpBackgroundStuff>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpBackgroundStuff>::no & detail::has_clone::check_sig()
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpBorderStuff>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpBorderStuff>::no & detail::has_clone::check_sig()
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpMargins>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpMargins>::no & detail::has_clone::check_sig()
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpShadow>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpShadow>::no & detail::has_clone::check_sig()
 lotuswordpro/source/filter/clone.hxx:28
-    detail::has_clone<class LwpSpacingCommonOverride>::no & detail::has_clone::check_sig()
+    detail::has_clone<LwpSpacingCommonOverride>::no & detail::has_clone::check_sig()
 o3tl/qa/cow_wrapper_clients.hxx:140
-    _Bool o3tltests::cow_wrapper_client4::operator==(const class o3tltests::cow_wrapper_client4 &) const
+    _Bool o3tltests::cow_wrapper_client4::operator==(const o3tltests::cow_wrapper_client4 &) const
 o3tl/qa/cow_wrapper_clients.hxx:141
-    _Bool o3tltests::cow_wrapper_client4::operator!=(const class o3tltests::cow_wrapper_client4 &) const
+    _Bool o3tltests::cow_wrapper_client4::operator!=(const o3tltests::cow_wrapper_client4 &) const
 o3tl/qa/cow_wrapper_clients.hxx:142
-    _Bool o3tltests::cow_wrapper_client4::operator<(const class o3tltests::cow_wrapper_client4 &) const
+    _Bool o3tltests::cow_wrapper_client4::operator<(const o3tltests::cow_wrapper_client4 &) const
 o3tl/qa/cow_wrapper_clients.hxx:193
-    _Bool o3tltests::cow_wrapper_client5::operator!=(const class o3tltests::cow_wrapper_client5 &) const
-oox/inc/drawingml/textliststyle.hxx:51
+    _Bool o3tltests::cow_wrapper_client5::operator!=(const o3tltests::cow_wrapper_client5 &) const
+oox/inc/drawingml/textfont.hxx:56
+    void oox::drawingml::TextFont::fillThemeFont(struct model::ThemeFont &) const
+oox/inc/drawingml/textliststyle.hxx:61
     void oox::drawingml::TextListStyle::dump() const
-oox/inc/drawingml/textparagraphproperties.hxx:100
-    void oox::drawingml::TextParagraphProperties::setLineSpacing(const class oox::drawingml::TextSpacing &)
-oox/source/drawingml/diagram/diagramlayoutatoms.hxx:301
-    const class std::__debug::vector<class std::shared_ptr<class oox::drawingml::Shape>, class std::allocator<class std::shared_ptr<class oox::drawingml::Shape> > > & oox::drawingml::LayoutNode::getNodeShapes() const
-oox/source/drawingml/diagram/diagramlayoutatoms.hxx:310
-    const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const
-sal/osl/unx/uunxapi.hxx:39
-    int mkdir_c(const class rtl::OString &,unsigned int)
-sal/osl/unx/uunxapi.hxx:74
-    int osl::lstat(const class rtl::OUString &,struct stat &)
-sc/inc/address.hxx:666
-    _Bool ScRange::operator<=(const class ScRange &) const
-sc/inc/bigrange.hxx:73
-    _Bool ScBigAddress::operator!=(const class ScBigAddress &) const
-sc/inc/columniterator.hxx:83
+oox/inc/drawingml/textparagraphproperties.hxx:98
+    void oox::drawingml::TextParagraphProperties::setLineSpacing(const oox::drawingml::TextSpacing &)
+oox/source/drawingml/diagram/diagramlayoutatoms.hxx:331
+    const std::vector<std::shared_ptr<oox::drawingml::Shape> > & oox::drawingml::LayoutNode::getNodeShapes() const
+oox/source/drawingml/diagram/diagramlayoutatoms.hxx:340
+    const oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const
+oox/source/shape/WordprocessingCanvasContext.hxx:30
+    const _Bool & oox::shape::WordprocessingCanvasContext::isFullWPGSupport() const
+oox/source/shape/WordprocessingCanvasContext.hxx:31
+    void oox::shape::WordprocessingCanvasContext::setFullWPGSupport(_Bool)
+sal/osl/unx/uunxapi.hxx:35
+    int mkdir_c(const rtl::OString &,unsigned int)
+sal/osl/unx/uunxapi.hxx:70
+    int osl::lstat(const rtl::OUString &,struct stat &)
+sal/rtl/strtmpl.hxx:57
+    null_terminated<C> rtl::str::<deduction guide for null_terminated>(null_terminated<C>)
+sal/rtl/strtmpl.hxx:60
+    null_terminated<C> rtl::str::<deduction guide for null_terminated>(type-parameter-?-? *)
+sal/rtl/strtmpl.hxx:68
+    _Bool rtl::str::operator==(struct rtl::str::null_terminated::EndDetector,type-parameter-?-? *)
+sal/rtl/strtmpl.hxx:70
+    _Bool rtl::str::operator!=(struct rtl::str::null_terminated::EndDetector,type-parameter-?-? *)
+sal/rtl/strtmpl.hxx:76
+    with_length<C> rtl::str::<deduction guide for with_length>(with_length<C>)
+sal/rtl/strtmpl.hxx:80
+    with_length<C> rtl::str::<deduction guide for with_length>(type-parameter-?-? *,int)
+sal/rtl/strtmpl.hxx:98
+    FromTo<C> rtl::str::<deduction guide for FromTo>(FromTo<C>)
+sal/rtl/strtmpl.hxx:102
+    FromTo<C> rtl::str::<deduction guide for FromTo>(type-parameter-?-?,type-parameter-?-?)
+sc/inc/address.hxx:663
+    _Bool ScRange::operator<=(const ScRange &) const
+sc/inc/appluno.hxx:37
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScSpreadsheetSettings_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+sc/inc/appluno.hxx:40
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScRecentFunctionsObj_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+sc/inc/appluno.hxx:43
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScFunctionListObj_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+sc/inc/arraysumfunctor.hxx:22
+    KahanSum sc::op::executeUnrolled(unsigned long &,unsigned long,const double *)
+sc/inc/bigrange.hxx:70
+    _Bool ScBigAddress::operator!=(const ScBigAddress &) const
+sc/inc/column.hxx:139
+    const type-parameter-?-? & ScColumnData::GetAttr(int,TypedWhichId<type-parameter-?-?>,int &,int &) const
+sc/inc/column.hxx:302
+    _Bool ScColumn::HasDataAt(struct sc::ColumnBlockPosition &,int,struct ScDataAreaExtras *)
+sc/inc/columniterator.hxx:81
     int sc::ColumnIterator::getType() const
-sc/inc/datamapper.hxx:76
+sc/inc/datamapper.hxx:75
     void sc::ExternalDataSource::setUpdateFrequency(double)
+sc/inc/datamapper.hxx:78
+    void sc::ExternalDataSource::setURL(const rtl::OUString &)
 sc/inc/datamapper.hxx:79
-    void sc::ExternalDataSource::setURL(const class rtl::OUString &)
-sc/inc/datamapper.hxx:80
-    void sc::ExternalDataSource::setProvider(const class rtl::OUString &)
-sc/inc/dpfilteredcache.hxx:149
+    void sc::ExternalDataSource::setProvider(const rtl::OUString &)
+sc/inc/document.hxx:908
+    rtl::OUString ScDocument::MaxRowAsString() const
+sc/inc/dpfilteredcache.hxx:148
     void ScDPFilteredCache::dump() const
-sc/inc/formulacell.hxx:489
+sc/inc/formulacell.hxx:513
     void ScFormulaCell::Dump() const
-sc/inc/mtvcellfunc.hxx:41
-    class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > sc::ProcessFormula(const class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > &,class mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent> &,int,int,class std::function<void (unsigned long, class ScFormulaCell *)>)
-sc/inc/mtvelements.hxx:73
-    struct mdds::mtv::base_element_block * sc::mdds_mtv_create_new_block(const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:73
-    void sc::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:77
-    struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:77
-    void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:78
-    struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:78
-    void mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/funcuno.hxx:35
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScFunctionAccess_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+sc/inc/kahan.hxx:222
+    _Bool KahanSum::operator<(const KahanSum &) const
+sc/inc/kahan.hxx:226
+    _Bool KahanSum::operator>(const KahanSum &) const
+sc/inc/kahan.hxx:228
+    _Bool KahanSum::operator>(double) const
+sc/inc/kahan.hxx:230
+    _Bool KahanSum::operator<=(const KahanSum &) const
+sc/inc/kahan.hxx:232
+    _Bool KahanSum::operator<=(double) const
+sc/inc/kahan.hxx:234
+    _Bool KahanSum::operator>=(const KahanSum &) const
+sc/inc/miscuno.hxx:170
+    void ScUnoHelpFunctions::SetOptionalPropertyValue(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &,const char *,const type-parameter-?-? &)
+sc/inc/mtvcellfunc.hxx:40
+    mdds::mtv::soa::detail::iterator_base<struct mdds::mtv::soa::multi_type_vector<struct sc::CellStoreTraits>::iterator_trait> sc::ProcessFormula(const mdds::mtv::soa::detail::iterator_base<struct mdds::mtv::soa::multi_type_vector<struct sc::CellStoreTraits>::iterator_trait> &,mdds::mtv::soa::multi_type_vector<struct sc::CellStoreTraits> &,int,int,std::function<void (unsigned long, ScFormulaCell *)>)
 sc/inc/mtvelements.hxx:78
-    void mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+    mdds::mtv::base_element_block * sc::mdds_mtv_create_new_block(const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &)
 sc/inc/mtvelements.hxx:78
-    void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:78
-    void mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:78
-    void mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:79
-    struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &)
+    void sc::mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &)
 sc/inc/mtvelements.hxx:79
-    void mdds_mtv_get_empty_value(class ScFormulaCell *&)
+    mdds::mtv::base_element_block * sc::mdds_mtv_create_new_block(const sc::SparklineCell *,const type-parameter-?-? &,const type-parameter-?-? &)
 sc/inc/mtvelements.hxx:79
-    void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class ScFormulaCell *&)
-sc/inc/mtvelements.hxx:79
-    void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:80
-    struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvelements.hxx:80
-    void mdds_mtv_get_empty_value(class EditTextObject *&)
-sc/inc/mtvelements.hxx:80
-    void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&)
-sc/inc/mtvelements.hxx:80
-    void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &)
+    void sc::mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const sc::SparklineCell *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:83
+    mdds::mtv::base_element_block * mdds_mtv_create_new_block(const ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:83
+    void mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:84
+    mdds::mtv::base_element_block * mdds_mtv_create_new_block(const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
 sc/inc/mtvelements.hxx:84
-    struct mdds::mtv::base_element_block * svl::mdds_mtv_create_new_block(const class svl::SharedString &,const type-parameter-?-? &,const type-parameter-?-? &)
+    void mdds_mtv_append_values(mdds::mtv::base_element_block &,const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
 sc/inc/mtvelements.hxx:84
-    void svl::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class svl::SharedString &,const type-parameter-?-? &,const type-parameter-?-? &)
-sc/inc/mtvfunctions.hxx:366
+    void mdds_mtv_assign_values(mdds::mtv::base_element_block &,const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:84
+    void mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:84
+    void mdds_mtv_prepend_values(mdds::mtv::base_element_block &,const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:84
+    void mdds_mtv_set_values(mdds::mtv::base_element_block &,unsigned long,const SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:85
+    mdds::mtv::base_element_block * mdds_mtv_create_new_block(const ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:85
+    void mdds_mtv_get_empty_value(ScFormulaCell *&)
+sc/inc/mtvelements.hxx:85
+    void mdds_mtv_get_value(const mdds::mtv::base_element_block &,unsigned long,ScFormulaCell *&)
+sc/inc/mtvelements.hxx:85
+    void mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:86
+    mdds::mtv::base_element_block * mdds_mtv_create_new_block(const EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:86
+    void mdds_mtv_get_empty_value(EditTextObject *&)
+sc/inc/mtvelements.hxx:86
+    void mdds_mtv_get_value(const mdds::mtv::base_element_block &,unsigned long,EditTextObject *&)
+sc/inc/mtvelements.hxx:86
+    void mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:89
+    mdds::mtv::base_element_block * svl::mdds_mtv_create_new_block(const svl::SharedString &,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvelements.hxx:89
+    void svl::mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const svl::SharedString &,const type-parameter-?-? &,const type-parameter-?-? &)
+sc/inc/mtvfunctions.hxx:376
     void sc::ProcessElements2(type-parameter-?-? &,type-parameter-?-? &,type-parameter-?-? &)
-sc/inc/postit.hxx:46
-     ScCaptionPtr::ScCaptionPtr(class SdrCaptionObj *)
-sc/inc/scdll.hxx:36
+sc/inc/patattr.hxx:100
+    _Bool CellAttributeHolder::operator!() const
+sc/inc/rangecache.hxx:52
+    _Bool ScSortedRangeCache::isValid() const
+sc/inc/rangecache.hxx:94
+    unsigned long ScSortedRangeCache::size() const
+sc/inc/scdll.hxx:35
      ScDLL::ScDLL()
-sc/inc/scopetools.hxx:81
+sc/inc/scopetools.hxx:80
     void sc::DelayFormulaGroupingSwitch::reset()
-sc/inc/segmenttree.hxx:144
-    void ScFlatUInt16RowSegments::setValueIf(int,int,unsigned short,const class std::function<_Bool (unsigned short)> &)
+sc/inc/segmenttree.hxx:149
+    void ScFlatUInt16RowSegments::setValueIf(int,int,unsigned short,const std::function<_Bool (unsigned short)> &)
+sc/inc/segmenttree.hxx:162
+    void ScFlatUInt16RowSegments::makeReady()
 sc/inc/sheetlimits.hxx:42
     _Bool ScSheetLimits::ValidColRow(short,int) const
 sc/inc/sheetlimits.hxx:46
@@ -1076,80 +2698,64 @@ sc/inc/sheetlimits.hxx:58
     short ScSheetLimits::SanitizeCol(short) const
 sc/inc/sheetlimits.hxx:59
     int ScSheetLimits::SanitizeRow(int) const
-sc/inc/stlalgorithm.hxx:47
+sc/inc/SparklineCell.hxx:35
+    void sc::SparklineCell::setInputRange(const ScRangeList &)
+sc/inc/SparklineCell.hxx:37
+    const ScRangeList & sc::SparklineCell::getInputRange()
+sc/inc/stlalgorithm.hxx:46
      sc::AlignedAllocator::AlignedAllocator(const AlignedAllocator<type-parameter-?-?, 256> &)
-sc/inc/stlalgorithm.hxx:47
+sc/inc/stlalgorithm.hxx:46
      sc::AlignedAllocator::AlignedAllocator<T, Alignment>(const AlignedAllocator<type-parameter-?-?, Alignment> &)
-sc/inc/stlalgorithm.hxx:61
+sc/inc/stlalgorithm.hxx:60
     _Bool sc::AlignedAllocator::operator==(const AlignedAllocator<T, Alignment> &) const
-sc/inc/stlalgorithm.hxx:62
+sc/inc/stlalgorithm.hxx:61
     _Bool sc::AlignedAllocator::operator!=(const AlignedAllocator<T, Alignment> &) const
-sc/inc/table.hxx:322
+sc/inc/table.hxx:343
     _Bool ScTable::IsColRowTabValid(const short,const int,const short) const
-sc/inc/userlist.hxx:90
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > >, struct std::random_access_iterator_tag> ScUserList::begin() const
-sc/qa/unit/helper/qahelper.hxx:156
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > print(const class ScAddress &)
-sc/qa/unit/screenshots/screenshots.cxx:325
-    int main()
-sc/qa/unit/ucalc.hxx:152
-    void Test::testFormulaHashAndTag()
-sc/qa/unit/ucalc.hxx:192
-    void Test::testSingleCellCopyColumnLabel()
-sc/qa/unit/ucalc.hxx:251
-    void Test::testExternalRefUnresolved()
-sc/qa/unit/ucalc.hxx:390
-    void Test::testCopyPasteSkipEmptyConditionalFormatting()
-sc/qa/unit/ucalc.hxx:417
-    void Test::testSharedFormulaMoveBlock()
-sc/qa/unit/ucalc.hxx:534
-    void Test::testCondFormatUpdateMoveTab()
-sc/qa/unit/ucalc.hxx:535
-    void Test::testCondFormatUpdateDeleteTab()
-sc/qa/unit/ucalc.hxx:536
-    void Test::testCondFormatUpdateInsertTab()
-sc/qa/unit/ucalc.hxx:537
-    void Test::testCondFormatUpdateReference()
-sc/qa/unit/ucalc.hxx:547
-    void Test::testCondFormatListenToOwnRange()
-sc/source/core/inc/interpre.hxx:72
+sc/inc/table.hxx:750
+    const type-parameter-?-? * ScTable::GetAttr(short,int,TypedWhichId<type-parameter-?-?>,int &,int &) const
+sc/qa/unit/helper/qahelper.hxx:77
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const enum OpCode &)
+sc/qa/unit/helper/qahelper.hxx:83
+    std::basic_string<char> print(const ScAddress &)
+sc/source/core/inc/interpre.hxx:71
     basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &)
-sc/source/core/opencl/formulagroupcl.cxx:1061
-    _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction() const
-sc/source/core/opencl/formulagroupcl.cxx:1069
-    void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &)
-sc/source/core/opencl/formulagroupcl.cxx:1352
-    void sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &)
-sc/source/core/opencl/formulagroupcl.cxx:1354
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool) const
-sc/source/core/opencl/formulagroupcl.cxx:1368
-    unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *)
-sc/source/core/opencl/formulagroupcl.cxx:1381
-    unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetArrayLength() const
-sc/source/core/opencl/formulagroupcl.cxx:1383
-    unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetWindowSize() const
-sc/source/core/opencl/formulagroupcl.cxx:1385
-    _Bool sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetStartFixed() const
-sc/source/core/opencl/formulagroupcl.cxx:1387
-    _Bool sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetEndFixed() const
-sc/source/core/opencl/op_statistical.hxx:206
-     sc::opencl::OpGeoMean::OpGeoMean()
-sc/source/core/tool/interpr1.cxx:4141
-    double ::operator()(double,unsigned long) const
-sc/source/core/tool/interpr1.cxx:6492
-    double ::operator()(const struct sc::ParamIfsResult &) const
-sc/source/core/tool/scmatrix.cxx:2310
+sc/source/core/opencl/opbase.hxx:151
+    std::basic_string<char> sc::opencl::DynamicKernelArgument::GenDoubleSlidingWindowDeclRef(_Bool) const
+sc/source/core/opencl/opbase.hxx:154
+    std::basic_string<char> sc::opencl::DynamicKernelArgument::GenStringSlidingWindowDeclRef(_Bool) const
+sc/source/core/opencl/opbase.hxx:391
+    void sc::opencl::SlidingFunctionBase::GenerateRangeArg(int,int,std::vector<std::shared_ptr<sc::opencl::DynamicKernelArgument> > &,sc::opencl::outputstream &,enum sc::opencl::SlidingFunctionBase::EmptyArgType,const char *,const char *)
+sc/source/core/opencl/opbase.hxx:446
+    _Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction() const
+sc/source/core/opencl/opbase.hxx:447
+    void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(sc::opencl::outputstream &)
+sc/source/core/opencl/opbase.hxx:480
+    void sc::opencl::ParallelReductionVectorRef::GenSlidingWindowFunction(sc::opencl::outputstream &)
+sc/source/core/opencl/opbase.hxx:481
+    std::basic_string<char> sc::opencl::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool) const
+sc/source/core/opencl/opbase.hxx:484
+    unsigned long sc::opencl::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *)
+sc/source/core/opencl/opbase.hxx:485
+    unsigned long sc::opencl::ParallelReductionVectorRef::GetArrayLength() const
+sc/source/core/opencl/opbase.hxx:486
+    unsigned long sc::opencl::ParallelReductionVectorRef::GetWindowSize() const
+sc/source/core/opencl/opbase.hxx:487
+    _Bool sc::opencl::ParallelReductionVectorRef::GetStartFixed() const
+sc/source/core/opencl/opbase.hxx:488
+    _Bool sc::opencl::ParallelReductionVectorRef::GetEndFixed() const
+sc/source/core/tool/scmatrix.cxx:2303
     type-parameter-?-? * (anonymous namespace)::wrapped_iterator::operator->() const
-sc/source/core/tool/scmatrix.cxx:3316
-    const class svl::SharedString & matop::(anonymous namespace)::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
-sc/source/filter/inc/htmlpars.hxx:61
-    void ScHTMLStyles::add(const char *,unsigned long,const char *,unsigned long,const class rtl::OUString &,const class rtl::OUString &)
-sc/source/filter/inc/orcusinterface.hxx:77
-     ScOrcusRefResolver::ScOrcusRefResolver(const class ScOrcusGlobalSettings &)
+sc/source/filter/inc/orcusinterface.hxx:749
+    const rtl::OUString * ScOrcusFactory::getString(unsigned long) const
+sc/source/filter/inc/richstring.hxx:244
+    _Bool oox::xls::RichString::isPreserveSpace() const
 sc/source/filter/inc/tokstack.hxx:213
     _Bool TokenPool::GrowTripel(unsigned short)
+sc/source/filter/inc/xcl97rec.hxx:71
+    unsigned long XclExpObjList::size() const
 sc/source/filter/inc/xeextlst.hxx:198
-    void XclExtLst::AddRecord(const class rtl::Reference<class XclExpExt> &)
+    void XclExtLst::AddRecord(const rtl::Reference<XclExpExt> &)
 sc/source/filter/inc/xerecord.hxx:343
     void XclExpRecordList::InsertRecord(type-parameter-?-? *,unsigned long)
 sc/source/filter/inc/xerecord.hxx:352
@@ -1158,14 +2764,14 @@ sc/source/filter/inc/xerecord.hxx:363
     void XclExpRecordList::AppendNewRecord(const Reference<type-parameter-?-?> &)
 sc/source/filter/inc/xerecord.hxx:365
     void XclExpRecordList::AppendNewRecord(Reference<type-parameter-?-?>)
-sc/source/filter/inc/xestream.hxx:107
-    class XclExpStream & XclExpStream::operator<<(float)
+sc/source/filter/inc/xestream.hxx:106
+    XclExpStream & XclExpStream::operator<<(float)
 sc/source/filter/inc/xiescher.hxx:154
-    class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const
-sc/source/filter/inc/xlformula.hxx:409
-    _Bool XclTokenArray::operator==(const class XclTokenArray &) const
-sc/source/filter/xml/xmltransformationi.hxx:160
-     ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &)
+    Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const
+sc/source/filter/inc/xlformula.hxx:408
+    _Bool XclTokenArray::operator==(const XclTokenArray &) const
+sc/source/filter/xml/xmltransformationi.hxx:159
+     ScXMLDateTimeContext::ScXMLDateTimeContext(ScXMLImport &,const rtl::Reference<sax_fastparser::FastAttributeList> &)
 sc/source/ui/inc/dataprovider.hxx:56
     _Bool sc::CSVFetchThread::IsRequestedTerminate()
 sc/source/ui/inc/dataprovider.hxx:57
@@ -1173,77 +2779,103 @@ sc/source/ui/inc/dataprovider.hxx:57
 sc/source/ui/inc/dataprovider.hxx:58
     void sc::CSVFetchThread::EndThread()
 sc/source/ui/inc/dataprovider.hxx:83
-    const class rtl::OUString & sc::DataProvider::GetURL() const
-sc/source/ui/inc/datatableview.hxx:111
+    const rtl::OUString & sc::DataProvider::GetURL() const
+sc/source/ui/inc/dataproviderdlg.hxx:57
+    void ScDataProviderDlg::LinkStubStartMenuHdl(void *,const rtl::OString &)
+sc/source/ui/inc/dataproviderdlg.hxx:57
+    void ScDataProviderDlg::StartMenuHdl(const rtl::OString &)
+sc/source/ui/inc/dataproviderdlg.hxx:58
+    void ScDataProviderDlg::ColumnMenuHdl(const weld::ComboBox &)
+sc/source/ui/inc/dataproviderdlg.hxx:58
+    void ScDataProviderDlg::LinkStubColumnMenuHdl(void *,const weld::ComboBox &)
+sc/source/ui/inc/dataproviderdlg.hxx:75
+    void ScDataProviderDlg::applyAndQuit()
+sc/source/ui/inc/dataproviderdlg.hxx:76
+    void ScDataProviderDlg::cancelAndQuit()
+sc/source/ui/inc/datatableview.hxx:108
     void ScDataTableView::getRowRange(int &,int &) const
-sc/source/ui/inc/docsh.hxx:319
-    void ScDocShell::PostPaintAll()
-sc/source/ui/inc/impex.hxx:93
-     ScImportExport::ScImportExport(class ScDocument &,const class rtl::OUString &)
-sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:66
-    void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class std::optional<signed char>)
-sc/source/ui/inc/TableFillingAndNavigationTools.hxx:122
+sc/source/ui/inc/datatransformation.hxx:197
+    short sc::FindReplaceTransformation::getColumn() const
+sc/source/ui/inc/datatransformation.hxx:198
+    const rtl::OUString & sc::FindReplaceTransformation::getFindString() const
+sc/source/ui/inc/datatransformation.hxx:199
+    const rtl::OUString & sc::FindReplaceTransformation::getReplaceString() const
+sc/source/ui/inc/datatransformation.hxx:211
+    short sc::DeleteRowTransformation::getColumn() const
+sc/source/ui/inc/datatransformation.hxx:212
+    const rtl::OUString & sc::DeleteRowTransformation::getFindString() const
+sc/source/ui/inc/datatransformation.hxx:223
+    int sc::SwapRowsTransformation::getFirstRow() const
+sc/source/ui/inc/datatransformation.hxx:224
+    int sc::SwapRowsTransformation::getSecondRow() const
+sc/source/ui/inc/hfedtdlg.hxx:85
+     ScHFEditFirstHeaderDlg::ScHFEditFirstHeaderDlg(weld::Window *,const SfxItemSet &,std::basic_string_view<char16_t>)
+sc/source/ui/inc/hfedtdlg.hxx:106
+     ScHFEditFirstFooterDlg::ScHFEditFirstFooterDlg(weld::Window *,const SfxItemSet &,std::basic_string_view<char16_t>)
+sc/source/ui/inc/impex.hxx:95
+     ScImportExport::ScImportExport(ScDocument &,const rtl::OUString &)
+sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:65
+    void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,struct TranslateId,const std::optional<signed char>)
+sc/source/ui/inc/SparklineDataRangeDialog.hxx:54
+    _Bool sc::SparklineDataRangeDialog::checkValidInputOutput()
+sc/source/ui/inc/TableFillingAndNavigationTools.hxx:120
     unsigned long DataRangeIterator::size()
-sc/source/ui/inc/viewdata.hxx:407
+sc/source/ui/inc/viewdata.hxx:410
     long ScViewData::GetLOKDocWidthPixel() const
-sc/source/ui/inc/viewdata.hxx:408
+sc/source/ui/inc/viewdata.hxx:411
     long ScViewData::GetLOKDocHeightPixel() const
-sc/source/ui/inc/viewdata.hxx:540
+sc/source/ui/inc/viewdata.hxx:560
     _Bool ScViewData::IsGridMode() const
-scaddins/source/analysis/analysishelper.hxx:801
-    _Bool sca::analysis::ScaDate::operator>=(const class sca::analysis::ScaDate &) const
-sccomp/source/solver/DifferentialEvolution.hxx:67
+scaddins/source/analysis/analysishelper.hxx:797
+    _Bool sca::analysis::ScaDate::operator>=(const sca::analysis::ScaDate &) const
+sccomp/source/solver/DifferentialEvolution.hxx:66
     int DifferentialEvolutionAlgorithm::getLastChange()
-sccomp/source/solver/ParticelSwarmOptimization.hxx:85
+sccomp/source/solver/ParticelSwarmOptimization.hxx:84
     int ParticleSwarmOptimizationAlgorithm::getLastChange()
-sd/inc/sddll.hxx:48
+sd/inc/sdabstdlg.hxx:172
+    VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory::CreateSdOutlineBulletTabDlg(weld::Window *,const SfxItemSet *,sd::View *)
+sd/inc/sddll.hxx:47
      SdDLL::SdDLL()
-sd/source/filter/ppt/pptinanimations.hxx:108
+sd/source/filter/eppt/epptooxml.hxx:92
+    void oox::core::PowerPointExport::WriteDefaultColorSchemes(const std::shared_ptr<sax_fastparser::FastSerializerHelper> &)
+sd/source/filter/ppt/pptinanimations.hxx:107
     void ppt::AnimationImporter::dump(const char *,long)
-sd/source/ui/inc/filedlg.hxx:55
+sd/source/ui/inc/filedlg.hxx:54
     _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const
-sd/source/ui/inc/GraphicViewShell.hxx:44
-    class SfxViewFactory * sd::GraphicViewShell::Factory()
-sd/source/ui/inc/GraphicViewShell.hxx:44
-    class SfxViewShell * sd::GraphicViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *)
-sd/source/ui/inc/GraphicViewShell.hxx:44
+sd/source/ui/inc/GraphicViewShell.hxx:43
+    SfxViewFactory * sd::GraphicViewShell::Factory()
+sd/source/ui/inc/GraphicViewShell.hxx:43
+    SfxViewShell * sd::GraphicViewShell::CreateInstance(SfxViewFrame &,SfxViewShell *)
+sd/source/ui/inc/GraphicViewShell.hxx:43
     void sd::GraphicViewShell::InitFactory()
-sd/source/ui/inc/GraphicViewShell.hxx:44
+sd/source/ui/inc/GraphicViewShell.hxx:43
     void sd::GraphicViewShell::RegisterFactory(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>)
-sd/source/ui/inc/optsitem.hxx:179
-    _Bool SdOptionsContents::operator==(const class SdOptionsContents &) const
-sd/source/ui/inc/OutlineViewShell.hxx:41
-    class SfxViewFactory * sd::OutlineViewShell::Factory()
-sd/source/ui/inc/OutlineViewShell.hxx:41
-    class SfxViewShell * sd::OutlineViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *)
-sd/source/ui/inc/OutlineViewShell.hxx:41
+sd/source/ui/inc/optsitem.hxx:178
+    _Bool SdOptionsContents::operator==(const SdOptionsContents &) const
+sd/source/ui/inc/OutlineViewShell.hxx:40
+    SfxViewFactory * sd::OutlineViewShell::Factory()
+sd/source/ui/inc/OutlineViewShell.hxx:40
+    SfxViewShell * sd::OutlineViewShell::CreateInstance(SfxViewFrame &,SfxViewShell *)
+sd/source/ui/inc/OutlineViewShell.hxx:40
     void sd::OutlineViewShell::InitFactory()
-sd/source/ui/inc/OutlineViewShell.hxx:41
+sd/source/ui/inc/OutlineViewShell.hxx:40
     void sd::OutlineViewShell::RegisterFactory(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>)
-sd/source/ui/inc/PaneShells.hxx:34
-    void sd::LeftImpressPaneShell::RegisterInterface(const class SfxModule *)
-sd/source/ui/inc/PaneShells.hxx:51
-    void sd::LeftDrawPaneShell::RegisterInterface(const class SfxModule *)
+sd/source/ui/inc/PaneShells.hxx:33
+    void sd::LeftImpressPaneShell::RegisterInterface(const SfxModule *)
+sd/source/ui/inc/PaneShells.hxx:50
+    void sd::LeftDrawPaneShell::RegisterInterface(const SfxModule *)
 sd/source/ui/inc/unomodel.hxx:137
-    _Bool SdXImpressDocument::operator==(const class SdXImpressDocument &) const
-sd/source/ui/remotecontrol/ZeroconfService.hxx:35
-     sd::ZeroconfService::ZeroconfService(const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,unsigned int)
-sd/source/ui/remotecontrol/ZeroconfService.hxx:39
-    const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > & sd::ZeroconfService::getName() const
-sd/source/ui/remotecontrol/ZeroconfService.hxx:40
-    void sd::ZeroconfService::setName(const char *)
-sd/source/ui/remotecontrol/ZeroconfService.hxx:45
-    void sd::ZeroconfService::setup()
-sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:200
-    _Bool sd::slidesorter::view::InsertPosition::operator!=(const class sd::slidesorter::view::InsertPosition &) const
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:111
-    long (anonymous namespace)::PDFGrammar<boost::spirit::classic::file_iterator<char, boost::spirit::classic::fileiter_impl::mmap_file_iterator<char> > >::pdf_string_parser::operator()(const type-parameter-?-? &,struct boost::spirit::classic::nil_t &) const
+    _Bool SdXImpressDocument::operator==(const SdXImpressDocument &) const
+sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:199
+    _Bool sd::slidesorter::view::InsertPosition::operator!=(const sd::slidesorter::view::InsertPosition &) const
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:114
+    long (anonymous namespace)::PDFGrammar<boost::spirit::classic::file_iterator<>>::pdf_string_parser::operator()(const type-parameter-?-? &,struct boost::spirit::classic::nil_t &) const
 sfx2/inc/autoredactdialog.hxx:74
     void TargetsTable::select(int)
 sfx2/source/appl/shutdownicon.hxx:79
-    class rtl::OUString ShutdownIcon::getShortcutName()
+    rtl::OUString ShutdownIcon::getShortcutName()
 sfx2/source/appl/shutdownicon.hxx:95
-    class ShutdownIcon * ShutdownIcon::createInstance()
+    ShutdownIcon * ShutdownIcon::createInstance()
 sfx2/source/appl/shutdownicon.hxx:97
     void ShutdownIcon::terminateDesktop()
 sfx2/source/appl/shutdownicon.hxx:100
@@ -1251,382 +2883,482 @@ sfx2/source/appl/shutdownicon.hxx:100
 sfx2/source/appl/shutdownicon.hxx:103
     void ShutdownIcon::FromTemplate()
 sfx2/source/appl/shutdownicon.hxx:112
-    class rtl::OUString ShutdownIcon::GetUrlDescription(const class rtl::OUString &)
+    rtl::OUString ShutdownIcon::GetUrlDescription(std::basic_string_view<char16_t>)
 sfx2/source/appl/shutdownicon.hxx:114
     void ShutdownIcon::SetVeto(_Bool)
+sfx2/source/inc/templdgi.hxx:127
+    void SfxCommonTemplateDialog_Impl::LinkStubUpdateStyleDependents_Hdl(void *,void *)
 shell/inc/xml_parser.hxx:43
      xml_parser::xml_parser()
 shell/inc/xml_parser.hxx:66
     void xml_parser::parse(const char *,unsigned long,_Bool)
 shell/inc/xml_parser.hxx:84
-    void xml_parser::set_document_handler(class i_xml_parser_event_handler *)
-slideshow/source/engine/activities/activitiesfactory.cxx:172
+    void xml_parser::set_document_handler(i_xml_parser_event_handler *)
+slideshow/source/engine/activities/activitiesfactory.cxx:173
     void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:241
+slideshow/source/engine/activities/activitiesfactory.cxx:242
     void slideshow::internal::(anonymous namespace)::FromToByActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:249
+slideshow/source/engine/activities/activitiesfactory.cxx:250
     void slideshow::internal::(anonymous namespace)::FromToByActivity::perform(double,unsigned int) const
-slideshow/source/engine/activities/activitiesfactory.cxx:313
+slideshow/source/engine/activities/activitiesfactory.cxx:314
     void slideshow::internal::(anonymous namespace)::FromToByActivity::perform(unsigned int,unsigned int) const
-slideshow/source/engine/activities/activitiesfactory.cxx:331
+slideshow/source/engine/activities/activitiesfactory.cxx:332
     void slideshow::internal::(anonymous namespace)::FromToByActivity::performEnd()
-slideshow/source/engine/activities/activitiesfactory.cxx:344
+slideshow/source/engine/activities/activitiesfactory.cxx:345
     void slideshow::internal::(anonymous namespace)::FromToByActivity::dispose()
-slideshow/source/engine/activities/activitiesfactory.cxx:525
+slideshow/source/engine/activities/activitiesfactory.cxx:526
     void slideshow::internal::(anonymous namespace)::ValuesActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:536
+slideshow/source/engine/activities/activitiesfactory.cxx:537
     void slideshow::internal::(anonymous namespace)::ValuesActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:544
+slideshow/source/engine/activities/activitiesfactory.cxx:545
     void slideshow::internal::(anonymous namespace)::ValuesActivity::perform(unsigned int,double,unsigned int) const
-slideshow/source/engine/activities/activitiesfactory.cxx:566
+slideshow/source/engine/activities/activitiesfactory.cxx:567
     void slideshow::internal::(anonymous namespace)::ValuesActivity::perform(unsigned int,unsigned int) const
-slideshow/source/engine/activities/activitiesfactory.cxx:581
+slideshow/source/engine/activities/activitiesfactory.cxx:582
     void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd()
-slideshow/source/engine/animationfactory.cxx:616
+slideshow/source/engine/animationfactory.cxx:617
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
-slideshow/source/engine/animationfactory.cxx:619
-    void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &)
-slideshow/source/engine/animationfactory.cxx:698
+slideshow/source/engine/animationfactory.cxx:620
+    void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const std::shared_ptr<slideshow::internal::AnimatableShape> &,const std::shared_ptr<slideshow::internal::ShapeAttributeLayer> &)
+slideshow/source/engine/animationfactory.cxx:699
     _Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(const typename type-parameter-?-?::ValueType &)
-slideshow/source/engine/animationfactory.cxx:715
+slideshow/source/engine/animationfactory.cxx:716
     _Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(typename type-parameter-?-?::ValueType)
-slideshow/source/engine/animationfactory.cxx:736
+slideshow/source/engine/animationfactory.cxx:737
     typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const
-slideshow/source/engine/opengl/TransitionImpl.hxx:184
+slideshow/source/engine/opengl/TransitionImpl.hxx:180
     void OGLTransitionImpl::cleanup()
+slideshow/source/engine/slideoverlaybutton.hxx:60
+    void slideshow::internal::SlideOverlayButton::show()
+slideshow/source/engine/slideoverlaybutton.hxx:64
+    void slideshow::internal::SlideOverlayButton::hide()
+slideshow/source/engine/slideoverlaybutton.hxx:66
+    struct com::sun::star::geometry::IntegerSize2D slideshow::internal::SlideOverlayButton::getSize() const
 slideshow/source/inc/box2dtools.hxx:159
-    void box2d::utils::box2DWorld::setShapeAngle(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape>,const double)
+    void box2d::utils::box2DWorld::setShapeAngle(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>,const double)
 slideshow/source/inc/box2dtools.hxx:261
     _Bool box2d::utils::box2DWorld::shapesInitialized()
 slideshow/source/inc/box2dtools.hxx:299
-    class std::shared_ptr<class box2d::utils::box2DBody> box2d::utils::box2DWorld::makeShapeStatic(const class std::shared_ptr<class slideshow::internal::Shape> &)
+    std::shared_ptr<box2d::utils::box2DBody> box2d::utils::box2DWorld::makeShapeStatic(const std::shared_ptr<slideshow::internal::Shape> &)
+slideshow/source/inc/eventmultiplexer.hxx:653
+    basegfx::B2DPoint slideshow::internal::EventMultiplexer::toMatrixPoint(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface> &,const basegfx::B2DPoint &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::AnimationEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::EventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::EventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::IntrinsicAnimationEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::IntrinsicAnimationEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::PauseEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::PauseEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ShapeListenerEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::ShapeListenerEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::UserPaintEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::UserPaintEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:44
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewUpdate> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::ViewUpdate> &)
 slideshow/source/inc/listenercontainer.hxx:54
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewEventHandler> &)
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::ViewEventHandler> &)
 slideshow/source/inc/listenercontainer.hxx:54
-    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewRepaintHandler> &)
-starmath/inc/format.hxx:138
-    _Bool SmFormat::operator!=(const class SmFormat &) const
-starmath/inc/token.hxx:166
-     SmColorTokenTableEntry::SmColorTokenTableEntry()
-starmath/inc/token.hxx:182
-     SmColorTokenTableEntry::SmColorTokenTableEntry(const class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> >)
-starmath/inc/token.hxx:207
-    _Bool SmColorTokenTableEntry::operator==(const class rtl::OUString &) const
-starmath/inc/token.hxx:212
-    _Bool SmColorTokenTableEntry::operator==(unsigned int) const
-starmath/inc/token.hxx:217
-    _Bool SmColorTokenTableEntry::operator==(class Color) const
-starmath/inc/token.hxx:226
-    _Bool SmColorTokenTableEntry::equals(class Color) const
-starmath/mathml/inc/mathmlMo.hxx:83
+    _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const std::shared_ptr<slideshow::internal::ViewRepaintHandler> &)
+starmath/inc/format.hxx:142
+    _Bool SmFormat::operator!=(const SmFormat &) const
+starmath/inc/mathml/attribute.hxx:80
+     SmMlAttribute::SmMlAttribute(const SmMlAttribute *)
+starmath/inc/mathml/attribute.hxx:116
+    _Bool SmMlAttribute::isMlAttributeValueType(enum SmMlAttributeValueType) const
+starmath/inc/mathml/attribute.hxx:132
+    void SmMlAttribute::setMlAttributeValue(const SmMlAttribute &)
+starmath/inc/mathml/element.hxx:103
+    _Bool SmMlElement::isMlElementType(enum SmMlElementType) const
+starmath/inc/mathml/element.hxx:113
+    const struct ESelection & SmMlElement::getESelection() const
+starmath/inc/mathml/element.hxx:125
+    void SmMlElement::setESelection(struct ESelection)
+starmath/inc/mathml/element.hxx:132
+    int SmMlElement::GetSourceCodeRow() const
+starmath/inc/mathml/element.hxx:139
+    int SmMlElement::GetSourceCodeColumn() const
+starmath/inc/mathml/export.hxx:55
+    void SmMLExportWrapper::setFlat(_Bool)
+starmath/inc/mathml/export.hxx:59
+    _Bool SmMLExportWrapper::getFlat() const
+starmath/inc/mathml/export.hxx:63
+    void SmMLExportWrapper::setUseHTMLMLEntities(_Bool)
+starmath/inc/mathml/export.hxx:70
+    _Bool SmMLExportWrapper::getUseHTMLMLEntities() const
+starmath/inc/mathml/export.hxx:74
+    _Bool SmMLExportWrapper::getUseExportTag() const
+starmath/inc/mathml/export.hxx:78
+    void SmMLExportWrapper::setUseExportTag(_Bool)
+starmath/inc/mathml/export.hxx:81
+     SmMLExportWrapper::SmMLExportWrapper(rtl::Reference<SmModel>)
+starmath/inc/mathml/export.hxx:92
+    _Bool SmMLExportWrapper::Export(SfxMedium &)
+starmath/inc/mathml/export.hxx:96
+    rtl::OUString SmMLExportWrapper::Export(SmMlElement *)
+starmath/inc/mathml/export.hxx:139
+    _Bool SmMLExport::getUseExportTag() const
+starmath/inc/mathml/import.hxx:39
+    SmMlElement * SmMLImportWrapper::getElementTree()
+starmath/inc/mathml/import.hxx:44
+     SmMLImportWrapper::SmMLImportWrapper(rtl::Reference<SmModel>)
+starmath/inc/mathml/import.hxx:53
+    ErrCode SmMLImportWrapper::Import(SfxMedium &)
+starmath/inc/mathml/import.hxx:57
+    ErrCode SmMLImportWrapper::Import(std::basic_string_view<char16_t>)
+starmath/inc/mathml/import.hxx:141
+    void SmMLImport::SetSmSyntaxVersion(short)
+starmath/inc/mathml/import.hxx:145
+    short SmMLImport::GetSmSyntaxVersion() const
+starmath/inc/mathml/iterator.hxx:22
+    void mathml::SmMlIteratorBottomToTop(SmMlElement *,type-parameter-?-?,void *)
+starmath/inc/mathml/iterator.hxx:121
+    SmMlElement * mathml::SmMlIteratorCopy(SmMlElement *)
+starmath/inc/mathml/mathmlexport.hxx:62
+    _Bool SmXMLExportWrapper::IsUseHTMLMLEntities() const
+starmath/inc/mathml/mathmlimport.hxx:109
+    short SmXMLImport::GetSmSyntaxVersion() const
+starmath/inc/mathml/mathmlMo.hxx:83
     enum moOpDF operator|(enum moOpDF,enum moOpDF)
-starmath/mathml/inc/mathmlMo.hxx:88
+starmath/inc/mathml/mathmlMo.hxx:88
     enum moOpDF operator&(enum moOpDF,enum moOpDF)
-starmath/mathml/inc/mathmlMo.hxx:98
+starmath/inc/mathml/mathmlMo.hxx:98
     enum moOpDP operator&(enum moOpDP,enum moOpDP)
-starmath/mathml/inc/starmathdatabase.hxx:273
-    class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> > starmathdatabase::Identify_Color_HTML(unsigned int)
-starmath/mathml/inc/starmathdatabase.hxx:293
-    class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> > starmathdatabase::Identify_Color_DVIPSNAMES(unsigned int)
-svgio/inc/svgstyleattributes.hxx:346
-    class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const
-svgio/inc/svgstyleattributes.hxx:370
+starmath/inc/mathml/starmathdatabase.hxx:288
+    struct SmColorTokenTableEntry starmathdatabase::Identify_Color_DVIPSNAMES(unsigned int)
+starmath/inc/node.hxx:508
+    SmNode * SmStructureNode::GetSubNodeBinMo(unsigned long) const
+starmath/inc/node.hxx:533
+    void SmStructureNode::SetSubNodes(SmNode *,SmNode *,SmNode *)
+starmath/inc/nodetype.hxx:59
+    _Bool starmathdatabase::isStructuralNode(enum SmNodeType)
+starmath/inc/nodetype.hxx:71
+    _Bool starmathdatabase::isBinOperatorNode(enum SmNodeType)
+starmath/inc/nodetype.hxx:77
+    _Bool starmathdatabase::isUnOperatorNode(enum SmNodeType)
+starmath/inc/nodetype.hxx:82
+    _Bool starmathdatabase::isOperatorNode(enum SmNodeType)
+starmath/inc/nodetype.hxx:89
+    _Bool starmathdatabase::isStandaloneNode(enum SmNodeType)
+starmath/inc/parse.hxx:31
+    AbstractSmParser * starmathdatabase::GetDefaultSmParser()
+starmath/inc/smmod.hxx:55
+    rtl::OUString SmLocalizedSymbolData::GetExportSymbolName(std::basic_string_view<char16_t>)
+starmath/inc/token.hxx:181
+     SmColorTokenTableEntry::SmColorTokenTableEntry(const std::unique_ptr<struct SmColorTokenTableEntry>)
+starmath/inc/token.hxx:202
+    _Bool SmColorTokenTableEntry::equals(std::basic_string_view<char16_t>) const
+starmath/inc/token.hxx:209
+    _Bool SmColorTokenTableEntry::equals(Color) const
+svgio/inc/svgstyleattributes.hxx:354
+    svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const
+svgio/inc/svgstyleattributes.hxx:378
     enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const
-svl/source/misc/gridprinter.cxx:47
-    struct mdds::mtv::base_element_block * rtl::mdds_mtv_create_new_block(const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_get_empty_value(class rtl::OUString &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class rtl::OUString &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
-svl/source/misc/gridprinter.cxx:47
-    void rtl::mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svgio/inc/svgtspannode.hxx:56
+    double svgio::svgreader::SvgTspanNode::getCurrentFontSize() const
+svl/source/misc/gridprinter.cxx:42
+    mdds::mtv::base_element_block * rtl::mdds_mtv_create_new_block(const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_append_values(mdds::mtv::base_element_block &,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_assign_values(mdds::mtv::base_element_block &,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_get_empty_value(rtl::OUString &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_get_value(const mdds::mtv::base_element_block &,unsigned long,rtl::OUString &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_insert_values(mdds::mtv::base_element_block &,unsigned long,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_prepend_values(mdds::mtv::base_element_block &,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
+svl/source/misc/gridprinter.cxx:42
+    void rtl::mdds_mtv_set_values(mdds::mtv::base_element_block &,unsigned long,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &)
 svx/inc/sdr/contact/viewcontactofgraphic.hxx:52
-    class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject()
-sw/inc/calbck.hxx:295
-    class sw::WriterListener * sw::ClientIteratorBase::GetLeftOfPos()
-sw/inc/dbgoutsw.hxx:54
+    SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject()
+sw/inc/calbck.hxx:304
+    sw::WriterListener * sw::ClientIteratorBase::GetLeftOfPos()
+sw/inc/contentindex.hxx:68
+    int SwContentIndex::operator--(int)
+sw/inc/contentindex.hxx:80
+    _Bool SwContentIndex::operator>(const int) const
+sw/inc/contentindex.hxx:83
+    _Bool SwContentIndex::operator!=(const int) const
+sw/inc/contentindex.hxx:113
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const SwContentIndex &)
+sw/inc/dbgoutsw.hxx:53
     const char * dbg_out(const void *)
+sw/inc/dbgoutsw.hxx:55
+    const char * dbg_out(const SwRect &)
 sw/inc/dbgoutsw.hxx:56
-    const char * dbg_out(const class SwRect &)
-sw/inc/dbgoutsw.hxx:57
-    const char * dbg_out(const class SwFrameFormat &)
+    const char * dbg_out(const SwFrameFormat &)
+sw/inc/dbgoutsw.hxx:59
+    const char * dbg_out(const SwContentNode *)
 sw/inc/dbgoutsw.hxx:60
-    const char * dbg_out(const class SwContentNode *)
+    const char * dbg_out(const SwTextNode *)
 sw/inc/dbgoutsw.hxx:61
-    const char * dbg_out(const class SwTextNode *)
+    const char * dbg_out(const SwTextAttr &)
 sw/inc/dbgoutsw.hxx:62
-    const char * dbg_out(const class SwTextAttr &)
+    const char * dbg_out(const SwpHints &)
 sw/inc/dbgoutsw.hxx:63
-    const char * dbg_out(const class SwpHints &)
+    const char * dbg_out(const SfxPoolItem &)
 sw/inc/dbgoutsw.hxx:64
-    const char * dbg_out(const class SfxPoolItem &)
+    const char * dbg_out(const SfxPoolItem *)
 sw/inc/dbgoutsw.hxx:65
-    const char * dbg_out(const class SfxPoolItem *)
+    const char * dbg_out(const SfxItemSet &)
 sw/inc/dbgoutsw.hxx:66
-    const char * dbg_out(const class SfxItemSet &)
-sw/inc/dbgoutsw.hxx:67
     const char * dbg_out(const struct SwPosition &)
+sw/inc/dbgoutsw.hxx:67
+    const char * dbg_out(const SwPaM &)
 sw/inc/dbgoutsw.hxx:68
-    const char * dbg_out(const class SwPaM &)
+    const char * dbg_out(const SwNodeNum &)
 sw/inc/dbgoutsw.hxx:69
-    const char * dbg_out(const class SwNodeNum &)
+    const char * dbg_out(const SwUndo &)
 sw/inc/dbgoutsw.hxx:70
-    const char * dbg_out(const class SwUndo &)
+    const char * dbg_out(const SwOutlineNodes &)
 sw/inc/dbgoutsw.hxx:71
-    const char * dbg_out(const class SwOutlineNodes &)
+    const char * dbg_out(const SwNumRule &)
 sw/inc/dbgoutsw.hxx:72
-    const char * dbg_out(const class SwNumRule &)
+    const char * dbg_out(const SwTextFormatColl &)
 sw/inc/dbgoutsw.hxx:73
-    const char * dbg_out(const class SwTextFormatColl &)
+    const char * dbg_out(const SwNumRuleTable &)
 sw/inc/dbgoutsw.hxx:74
-    const char * dbg_out(const class SwFrameFormats &)
+    const char * dbg_out(const SwNodeRange &)
 sw/inc/dbgoutsw.hxx:75
-    const char * dbg_out(const class SwNumRuleTable &)
-sw/inc/dbgoutsw.hxx:76
-    const char * dbg_out(const class SwNodeRange &)
-sw/inc/dbgoutsw.hxx:79
-    class rtl::OUString lcl_dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &)
-sw/inc/dbgoutsw.hxx:103
+    const char * dbg_out(const sw::FrameFormats<sw::SpzFrameFormat *> &)
+sw/inc/dbgoutsw.hxx:78
+    rtl::OUString lcl_dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &)
+sw/inc/dbgoutsw.hxx:102
     const char * dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &)
-sw/inc/dbgoutsw.hxx:107
+sw/inc/dbgoutsw.hxx:106
     const char * dbg_out(const struct SwFormToken &)
-sw/inc/dbgoutsw.hxx:108
-    const char * dbg_out(const class std::__debug::vector<struct SwFormToken, class std::allocator<struct SwFormToken> > &)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwCharFormat **, class std::__cxx1998::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> > >, class std::__debug::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwFrameFormat **, class std::__cxx1998::vector<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > >, class std::__debug::vector<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwGrfFormatColl **, class std::__cxx1998::vector<class SwGrfFormatColl *, class std::allocator<class SwGrfFormatColl *> > >, class std::__debug::vector<class SwGrfFormatColl *, class std::allocator<class SwGrfFormatColl *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwNumRule **, class std::__cxx1998::vector<class SwNumRule *, class std::allocator<class SwNumRule *> > >, class std::__debug::vector<class SwNumRule *, class std::allocator<class SwNumRule *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwSectionFormat **, class std::__cxx1998::vector<class SwSectionFormat *, class std::allocator<class SwSectionFormat *> > >, class std::__debug::vector<class SwSectionFormat *, class std::allocator<class SwSectionFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:94
-    void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwTextFormatColl **, class std::__cxx1998::vector<class SwTextFormatColl *, class std::allocator<class SwTextFormatColl *> > >, class std::__debug::vector<class SwTextFormatColl *, class std::allocator<class SwTextFormatColl *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?)
-sw/inc/docary.hxx:140
+sw/inc/dbgoutsw.hxx:107
+    const char * dbg_out(const std::vector<struct SwFormToken> &)
+sw/inc/docary.hxx:98
+    void SwVectorModifyBase::insert(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<SwFrameFormat **, std::__cxx1998::vector<SwFrameFormat *> >, std::vector<SwFrameFormat *> >,type-parameter-?-?,type-parameter-?-?)
+sw/inc/docary.hxx:98
+    void SwVectorModifyBase::insert(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<SwGrfFormatColl **, std::__cxx1998::vector<SwGrfFormatColl *> >, std::vector<SwGrfFormatColl *> >,type-parameter-?-?,type-parameter-?-?)
+sw/inc/docary.hxx:98
+    void SwVectorModifyBase::insert(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<SwNumRule **, std::__cxx1998::vector<SwNumRule *> >, std::vector<SwNumRule *> >,type-parameter-?-?,type-parameter-?-?)
+sw/inc/docary.hxx:98
+    void SwVectorModifyBase::insert(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<SwSectionFormat **, std::__cxx1998::vector<SwSectionFormat *> >, std::vector<SwSectionFormat *> >,type-parameter-?-?,type-parameter-?-?)
+sw/inc/docary.hxx:98
+    void SwVectorModifyBase::insert(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<SwTextFormatColl **, std::__cxx1998::vector<SwTextFormatColl *> >, std::vector<SwTextFormatColl *> >,type-parameter-?-?,type-parameter-?-?)
+sw/inc/docary.hxx:144
     void SwVectorModifyBase::dumpAsXml(struct _xmlTextWriter *)
-sw/inc/docufld.hxx:498
+sw/inc/docufld.hxx:518
     void SwPostItField::ToggleResolved()
-sw/inc/editsh.hxx:373
+sw/inc/editsh.hxx:376
     void SwEditShell::ValidateCurrentParagraphSignatures(_Bool)
 sw/inc/extinput.hxx:47
-    class SwExtTextInput * SwExtTextInput::GetPrev()
+    SwExtTextInput * SwExtTextInput::GetPrev()
 sw/inc/extinput.hxx:48
-    const class SwExtTextInput * SwExtTextInput::GetPrev() const
-sw/inc/frameformats.hxx:78
-    void SwFrameFormats::erase(unsigned long)
-sw/inc/frameformats.hxx:92
-    struct std::pair<class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > >, class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > > SwFrameFormats::rangeFind(class SwFrameFormat *const &) const
-sw/inc/frameformats.hxx:94
-    class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > SwFrameFormats::rangeEnd() const
-sw/inc/frameformats.hxx:95
-    class boost::multi_index::detail::rnd_node_iterator<struct boost::multi_index::detail::random_access_index_node<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > > SwFrameFormats::rangeProject(const class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > &)
-sw/inc/frameformats.hxx:102
-    class SwFrameFormat *const & SwFrameFormats::back() const
+    const SwExtTextInput * SwExtTextInput::GetPrev() const
+sw/inc/format.hxx:215
+    const SvxLeftMarginItem & SwFormat::GetLeftMargin(_Bool) const
+sw/inc/format.hxx:219
+    const SvxGutterLeftMarginItem & SwFormat::GetGutterLeftMargin(_Bool) const
+sw/inc/format.hxx:220
+    const SvxGutterRightMarginItem & SwFormat::GetGutterRightMargin(_Bool) const
+sw/inc/formatcontentcontrol.hxx:82
+    SwFormatContentControl * SwFormatContentControl::CreatePoolDefault(unsigned short)
+sw/inc/frameformats.hxx:84
+    typename multi_index_container<type-parameter-?-?, indexed_by<random_access<tag<struct ByPos, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na> >, ordered_unique<tag<struct ByTypeAndName, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na>, struct FrameFormatsKey, struct na>, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na>, allocator<type-parameter-?-?> >::template index<struct ByTypeAndName>::type & sw::FrameFormats::GetByTypeAndName()
+sw/inc/frameformats.hxx:122
+    void sw::FrameFormats::erase(typename multi_index_container<type-parameter-?-?, indexed_by<random_access<tag<struct ByPos, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na> >, ordered_unique<tag<struct ByTypeAndName, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na>, struct FrameFormatsKey, struct na>, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na, struct na>, allocator<type-parameter-?-?> >::size_type)
+sw/inc/frameformats.hxx:155
+    const type-parameter-?-? & sw::FrameFormats::back() const
+sw/inc/frmfmt.hxx:94
+     SwFrameFormat::change_name::change_name(const rtl::OUString &)
+sw/inc/frmfmt.hxx:95
+    void SwFrameFormat::change_name::operator()(SwFormat *)
 sw/inc/IDocumentLinksAdministration.hxx:53
-    _Bool IDocumentLinksAdministration::GetData(const class rtl::OUString &,const class rtl::OUString &,class com::sun::star::uno::Any &) const
+    _Bool IDocumentLinksAdministration::GetData(const rtl::OUString &,const rtl::OUString &,com::sun::star::uno::Any &) const
 sw/inc/IDocumentLinksAdministration.hxx:55
-    void IDocumentLinksAdministration::SetData(const class rtl::OUString &)
-sw/inc/IDocumentMarkAccess.hxx:92
-    class IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator++(int)
+    void IDocumentLinksAdministration::SetData(const rtl::OUString &)
+sw/inc/IDocumentMarkAccess.hxx:94
+    IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator--()
 sw/inc/IDocumentMarkAccess.hxx:95
-    class IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator--()
+    IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator--(int)
 sw/inc/IDocumentMarkAccess.hxx:96
-    class IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator--(int)
-sw/inc/IDocumentMarkAccess.hxx:97
-    class IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator+=(long)
-sw/inc/IDocumentMarkAccess.hxx:99
-    class IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator-=(long)
+    IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator+=(long)
+sw/inc/IDocumentMarkAccess.hxx:98
+    IDocumentMarkAccess::iterator & IDocumentMarkAccess::iterator::operator-=(long)
+sw/inc/IDocumentMarkAccess.hxx:102
+    _Bool IDocumentMarkAccess::iterator::operator<(const IDocumentMarkAccess::iterator &) const
 sw/inc/IDocumentMarkAccess.hxx:103
-    _Bool IDocumentMarkAccess::iterator::operator<(const class IDocumentMarkAccess::iterator &) const
-sw/inc/IDocumentMarkAccess.hxx:104
-    _Bool IDocumentMarkAccess::iterator::operator>(const class IDocumentMarkAccess::iterator &) const
+    _Bool IDocumentMarkAccess::iterator::operator>(const IDocumentMarkAccess::iterator &) const
 sw/inc/IDocumentMarkAccess.hxx:105
-    _Bool IDocumentMarkAccess::iterator::operator<=(const class IDocumentMarkAccess::iterator &) const
-sw/inc/IDocumentMarkAccess.hxx:106
-    _Bool IDocumentMarkAccess::iterator::operator>=(const class IDocumentMarkAccess::iterator &) const
-sw/inc/modcfg.hxx:344
+    _Bool IDocumentMarkAccess::iterator::operator>=(const IDocumentMarkAccess::iterator &) const
+sw/inc/modcfg.hxx:340
     _Bool SwModuleOptions::IsFileEncryptedFromColumn() const
-sw/inc/node.hxx:239
-    const class IDocumentStylePoolAccess & SwNode::getIDocumentStylePoolAccess() const
-sw/inc/node.hxx:243
-    const class IDocumentDrawModelAccess & SwNode::getIDocumentDrawModelAccess() const
-sw/inc/pagedesc.hxx:423
-    void SwPageDescs::erase(class SwPageDesc *const &)
-sw/inc/pagedesc.hxx:431
-    class SwPageDesc *const & SwPageDescs::front() const
-sw/inc/pagedesc.hxx:432
-    class SwPageDesc *const & SwPageDescs::back() const
+sw/inc/ndindex.hxx:63
+     SwNodeIndex::SwNodeIndex(SwNodes &,int)
+sw/inc/ndindex.hxx:114
+    SwNodeIndex & SwNodeIndex::Assign(const SwNodes &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>)
+sw/inc/node.hxx:261
+    const IDocumentStylePoolAccess & SwNode::getIDocumentStylePoolAccess() const
+sw/inc/node.hxx:265
+    const IDocumentDrawModelAccess & SwNode::getIDocumentDrawModelAccess() const
+sw/inc/pagedesc.hxx:445
+    void SwPageDescs::erase(SwPageDesc *const &)
+sw/inc/pagedesc.hxx:453
+    SwPageDesc *const & SwPageDescs::front() const
+sw/inc/pagedesc.hxx:454
+    SwPageDesc *const & SwPageDescs::back() const
+sw/inc/pam.hxx:50
+     SwPosition::SwPosition(const SwNodeIndex &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,const SwContentNode *,int)
+sw/inc/pam.hxx:51
+     SwPosition::SwPosition(const SwNode &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>,const SwContentNode *,int)
+sw/inc/pam.hxx:52
+     SwPosition::SwPosition(const SwContentIndex &,short)
+sw/inc/pam.hxx:328
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const SwPaM &)
 sw/inc/rdfhelper.hxx:76
-    void SwRDFHelper::cloneStatements(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::rdf::XResource> &,const class com::sun::star::uno::Reference<class com::sun::star::rdf::XResource> &)
+    void SwRDFHelper::cloneStatements(const com::sun::star::uno::Reference<com::sun::star::frame::XModel> &,const com::sun::star::uno::Reference<com::sun::star::frame::XModel> &,const rtl::OUString &,const com::sun::star::uno::Reference<com::sun::star::rdf::XResource> &,const com::sun::star::uno::Reference<com::sun::star::rdf::XResource> &)
 sw/inc/rdfhelper.hxx:94
-    void SwRDFHelper::removeTextNodeStatement(const class rtl::OUString &,class SwTextNode &,const class rtl::OUString &,const class rtl::OUString &)
+    void SwRDFHelper::removeTextNodeStatement(const rtl::OUString &,SwTextNode &,const rtl::OUString &,const rtl::OUString &)
 sw/inc/rdfhelper.hxx:97
-    void SwRDFHelper::updateTextNodeStatement(const class rtl::OUString &,const class rtl::OUString &,class SwTextNode &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    void SwRDFHelper::updateTextNodeStatement(const rtl::OUString &,const rtl::OUString &,SwTextNode &,const rtl::OUString &,const rtl::OUString &,const rtl::OUString &)
 sw/inc/ring.hxx:203
      sw::RingIterator::RingIterator<value_type>()
-sw/inc/swatrset.hxx:226
-    const class SvxNoHyphenItem & SwAttrSet::GetNoHyphenHere(_Bool) const
-sw/inc/swcrsr.hxx:221
-    class SwCursor * SwCursor::GetPrev()
-sw/inc/swcrsr.hxx:222
-    const class SwCursor * SwCursor::GetPrev() const
-sw/inc/swcrsr.hxx:307
-    class SwTableCursor * SwTableCursor::GetNext()
-sw/inc/swcrsr.hxx:308
-    const class SwTableCursor * SwTableCursor::GetNext() const
+sw/inc/shellio.hxx:89
+    void SwAsciiOptions::SetIncludeHidden(_Bool)
+sw/inc/swabstdlg.hxx:417
+    std::optional<SwLanguageListItem> AbstractSwTranslateLangSelectDlg::GetSelectedLanguage()
+sw/inc/swatrset.hxx:238
+    const SvxNoHyphenItem & SwAttrSet::GetNoHyphenHere(_Bool) const
 sw/inc/swcrsr.hxx:309
-    class SwTableCursor * SwTableCursor::GetPrev()
+    SwTableCursor * SwTableCursor::GetNext()
 sw/inc/swcrsr.hxx:310
-    const class SwTableCursor * SwTableCursor::GetPrev() const
-sw/inc/swrect.hxx:100
-    class SwRect & SwRect::operator-=(const class Point &)
-sw/inc/swrect.hxx:106
-    class SvStream & WriteSwRect(class SvStream &,const class SwRect &)
-sw/inc/swrect.hxx:150
+    const SwTableCursor * SwTableCursor::GetNext() const
+sw/inc/swcrsr.hxx:311
+    SwTableCursor * SwTableCursor::GetPrev()
+sw/inc/swcrsr.hxx:312
+    const SwTableCursor * SwTableCursor::GetPrev() const
+sw/inc/swrect.hxx:102
+    SwRect & SwRect::operator-=(const Point &)
+sw/inc/swrect.hxx:108
+    SvStream & WriteSwRect(SvStream &,const SwRect &)
+sw/inc/swrect.hxx:152
     _Bool SwRect::OverStepTop(long) const
-sw/inc/view.hxx:449
+sw/inc/textboxhelper.hxx:256
+    _Bool SwTextBoxNode::IsGroupTextBox() const
+sw/inc/view.hxx:479
     void SwView::LinkStubMoveNavigationHdl(void *,void *)
-sw/inc/viscrs.hxx:203
-    class SwShellTableCursor * SwShellTableCursor::GetNext()
-sw/inc/viscrs.hxx:204
-    const class SwShellTableCursor * SwShellTableCursor::GetNext() const
-sw/inc/viscrs.hxx:205
-    class SwShellTableCursor * SwShellTableCursor::GetPrev()
-sw/inc/viscrs.hxx:206
-    const class SwShellTableCursor * SwShellTableCursor::GetPrev() const
-sw/qa/inc/swmodeltestbase.hxx:320
-    class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const
-sw/source/core/access/accportions.cxx:57
+sw/inc/viewopt.hxx:316
+    const struct SwViewColors & SwViewOption::GetColorConfig() const
+sw/inc/viscrs.hxx:227
+    SwShellTableCursor * SwShellTableCursor::GetNext()
+sw/inc/viscrs.hxx:228
+    const SwShellTableCursor * SwShellTableCursor::GetNext() const
+sw/inc/viscrs.hxx:229
+    SwShellTableCursor * SwShellTableCursor::GetPrev()
+sw/inc/viscrs.hxx:230
+    const SwShellTableCursor * SwShellTableCursor::GetPrev() const
+sw/qa/extras/layout/layout3.cxx:2344
+    int main()
+sw/qa/inc/swmodeltestbase.hxx:111
+    void SwModelTestBase::executeImportTest(const char *,const char *)
+sw/qa/inc/swmodeltestbase.hxx:229
+    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const com::sun::star::uno::Reference<com::sun::star::text::XTextRange> &) const
+sw/source/core/access/accportions.cxx:55
     unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?)
-sw/source/core/access/accportions.cxx:61
+sw/source/core/access/accportions.cxx:59
     unsigned long FindLastBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?)
-sw/source/core/inc/AccessibilityIssue.hxx:52
-    const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > & sw::AccessibilityIssue::getAdditionalInfo() const
-sw/source/core/inc/AccessibilityIssue.hxx:54
-    void sw::AccessibilityIssue::setAdditionalInfo(const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
-sw/source/core/inc/frame.hxx:917
+sw/source/core/inc/AccessibilityIssue.hxx:80
+    SwTextFootnote * sw::AccessibilityIssue::getTextFootnote()
+sw/source/core/inc/frame.hxx:947
     void SwFrame::dumpTopMostAsXml(struct _xmlTextWriter *) const
-sw/source/core/inc/frame.hxx:1365
-    class Size SwRectFnSet::GetSize(const class SwRect &) const
-sw/source/core/inc/frame.hxx:1396
-    long SwRectFnSet::LeftDist(const class SwRect &,long) const
-sw/source/core/inc/frame.hxx:1397
-    long SwRectFnSet::RightDist(const class SwRect &,long) const
+sw/source/core/inc/frame.hxx:1394
+    Size SwRectFnSet::GetSize(const SwRect &) const
+sw/source/core/inc/frame.hxx:1425
+    long SwRectFnSet::LeftDist(const SwRect &,long) const
+sw/source/core/inc/frame.hxx:1426
+    long SwRectFnSet::RightDist(const SwRect &,long) const
 sw/source/core/inc/mvsave.hxx:171
-    _Bool ZSortFly::operator==(const class ZSortFly &) const
-sw/source/core/text/porlin.hxx:118
+    _Bool ZSortFly::operator==(const ZSortFly &) const
+sw/source/core/text/porlin.hxx:109
     _Bool SwLinePortion::IsTabRightPortion() const
 sw/source/core/text/txtpaint.hxx:72
-     DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool)
+     DbgBackColor::DbgBackColor(OutputDevice *,const _Bool)
 sw/source/core/text/txtpaint.hxx:79
-     DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color)
-sw/source/uibase/inc/swcont.hxx:86
-    _Bool SwContent::operator==(const class SwContent &) const
-sw/source/uibase/inc/swuiccoll.hxx:45
-    void SwCondCollPage::LinkStubOnOffHdl(void *,class weld::ToggleButton &)
-sw/source/uibase/inc/swuiccoll.hxx:45
-    void SwCondCollPage::OnOffHdl(class weld::ToggleButton &)
-test/source/sheet/xsubtotalfield.cxx:28
-    _Bool CppUnit::assertion_traits::equal(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &)
-test/source/sheet/xsubtotalfield.cxx:34
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CppUnit::assertion_traits::toString(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &)
-ucb/source/inc/regexpmap.hxx:286
+     DbgRect::DbgRect(OutputDevice *,const tools::Rectangle &,const _Bool,Color)
+sw/source/filter/ww8/ww8par.hxx:1043
+     WW8PostProcessAttrsInfo::WW8PostProcessAttrsInfo(int,int,SwPaM &)
+sw/source/uibase/inc/swcont.hxx:81
+    _Bool SwContent::operator==(const SwContent &) const
+sw/source/uibase/inc/unomod.hxx:36
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SwXModule_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+sw/source/uibase/sidebar/ThemePanel.hxx:47
+    _Bool sw::sidebar::ThemePanel::LinkStubDoubleClickHdl(void *,weld::TreeView &)
+toolkit/inc/awt/vclxbitmap.hxx:47
+     VCLXBitmap::VCLXBitmap(const BitmapEx &)
+ucb/source/inc/regexpmap.hxx:285
     RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::begin() const
-ucb/source/inc/regexpmap.hxx:290
+ucb/source/inc/regexpmap.hxx:289
     RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::end() const
-ucb/source/ucp/ftp/ftpurl.hxx:109
-    class rtl::OUString ftp::FTPURL::child() const
 ucb/source/ucp/gio/gio_mount.cxx:37
     void * ooo_mount_operation_get_instance_private(struct OOoMountOperation *)
-ucb/source/ucp/webdav-neon/NeonUri.hxx:68
-    _Bool webdav_ucp::NeonUri::operator!=(const class webdav_ucp::NeonUri &) const
-vcl/inc/bitmap/BitmapWriteAccess.hxx:73
-    void BitmapWriteAccess::SetFillColor()
+unoxml/inc/node.hxx:116
+    void DOM::CNode::checkNoParent(const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> &)
 vcl/inc/bitmap/ScanlineTools.hxx:23
     void vcl::bitmap::ScanlineTransformer::skipPixel(unsigned int)
 vcl/inc/ControlCacheKey.hxx:35
-     ControlCacheKey::ControlCacheKey(enum ControlType,enum ControlPart,enum ControlState,const class Size &)
+     ControlCacheKey::ControlCacheKey(enum ControlType,enum ControlPart,enum ControlState,const Size &)
 vcl/inc/ControlCacheKey.hxx:43
-    _Bool ControlCacheKey::operator==(const class ControlCacheKey &) const
+    _Bool ControlCacheKey::operator==(const ControlCacheKey &) const
 vcl/inc/ControlCacheKey.hxx:50
     _Bool ControlCacheKey::canCacheControl() const
-vcl/inc/ControlCacheKey.hxx:81
-    unsigned long ControlCacheHashFunction::operator()(const class ControlCacheKey &) const
+vcl/inc/ControlCacheKey.hxx:82
+    unsigned long ControlCacheHashFunction::operator()(const ControlCacheKey &) const
+vcl/inc/dndhelper.hxx:35
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> vcl::OleDnDHelper(const com::sun::star::uno::Reference<com::sun::star::lang::XInitialization> &,long,enum vcl::DragOrDrop)
 vcl/inc/driverblocklist.hxx:95
-     DriverBlocklist::DriverInfo::DriverInfo(enum DriverBlocklist::OperatingSystem,const class rtl::OUString &,enum DriverBlocklist::VersionComparisonOp,unsigned long,_Bool,const char *)
-vcl/inc/fontinstance.hxx:70
+     DriverBlocklist::DriverInfo::DriverInfo(enum DriverBlocklist::OperatingSystem,rtl::OUString,enum DriverBlocklist::VersionComparisonOp,unsigned long,_Bool,const char *)
+vcl/inc/font/FontSelectPattern.hxx:52
+    _Bool vcl::font::FontSelectPattern::operator!=(const vcl::font::FontSelectPattern &) const
+vcl/inc/font/LogicalFontInstance.hxx:95
     void LogicalFontInstance::SetAverageWidthFactor(double)
-vcl/inc/fontinstance.hxx:71
+vcl/inc/font/LogicalFontInstance.hxx:96
     double LogicalFontInstance::GetAverageWidthFactor() const
-vcl/inc/fontselect.hxx:49
-    _Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const
-vcl/inc/graphic/GraphicID.hxx:39
-    _Bool GraphicID::operator==(const class GraphicID &) const
-vcl/inc/jsdialog/jsdialogbuilder.hxx:132
+vcl/inc/graphic/GraphicID.hxx:38
+    _Bool GraphicID::operator==(const GraphicID &) const
+vcl/inc/headless/svpgdi.hxx:59
+    struct _cairo * SvpSalGraphics::createTmpCompatibleCairoContext() const
+vcl/inc/impfont.hxx:94
+    unsigned long ImplFont::GetHashValue() const
+vcl/inc/ImplLayoutArgs.hxx:75
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const vcl::text::ImplLayoutArgs &)
+vcl/inc/jsdialog/jsdialogbuilder.hxx:209
     void JSDropTarget::fire_dragEnter(const struct com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent &)
-vcl/inc/opengl/zone.hxx:26
+vcl/inc/jsdialog/jsdialogbuilder.hxx:668
+    void JSFormattedSpinButton::set_text_without_notify(const rtl::OUString &)
+vcl/inc/opengl/zone.hxx:25
     void OpenGLZone::relaxWatchdogTimings()
-vcl/inc/PhysicalFontFace.hxx:67
-    int PhysicalFontFace::GetWidth() const
-vcl/inc/PhysicalFontFace.hxx:78
-    void PhysicalFontFace::SetBitmapSize(int,int)
-vcl/inc/PhysicalFontFamily.hxx:60
-    const class rtl::OUString & PhysicalFontFamily::GetAliasNames() const
-vcl/inc/qt5/Qt5AccessibleWidget.hxx:77
-    class QAccessibleValueInterface * Qt5AccessibleWidget::valueInterface()
-vcl/inc/qt5/Qt5AccessibleWidget.hxx:78
-    class QAccessibleTextInterface * Qt5AccessibleWidget::textInterface()
-vcl/inc/qt5/Qt5DragAndDrop.hxx:49
-    void Qt5DragSource::deinitialize()
-vcl/inc/qt5/Qt5DragAndDrop.hxx:80
-    void Qt5DropTarget::deinitialize()
-vcl/inc/qt5/Qt5FilePicker.hxx:155
-    void Qt5FilePicker::setCustomControlWidgetLayout(class QGridLayout *)
-vcl/inc/qt5/Qt5FontFace.hxx:38
-    class Qt5FontFace * Qt5FontFace::fromQFont(const class QFont &)
-vcl/inc/qt5/Qt5FontFace.hxx:49
-    int Qt5FontFace::GetFontTable(const char *,unsigned char *) const
-vcl/inc/qt5/Qt5FontFace.hxx:53
-    _Bool Qt5FontFace::HasChar(unsigned int) const
-vcl/inc/qt5/Qt5Frame.hxx:161
-    void Qt5Frame::deregisterDragSource(const class Qt5DragSource *)
-vcl/inc/qt5/Qt5Frame.hxx:163
-    void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *)
-vcl/inc/qt5/Qt5Graphics_Controls.hxx:96
-    class QPoint Qt5Graphics_Controls::upscale(const class QPoint &,enum Qt5Graphics_Controls::Round)
-vcl/inc/qt5/Qt5Painter.hxx:60
-    void Qt5Painter::update()
-vcl/inc/qt5/Qt5Tools.hxx:57
-    class QRect toQRect(const class tools::Rectangle &,const double)
+vcl/inc/qt5/QtDragAndDrop.hxx:49
+    void QtDragSource::deinitialize()
+vcl/inc/qt5/QtDragAndDrop.hxx:80
+    void QtDropTarget::deinitialize()
+vcl/inc/qt5/QtFontFace.hxx:41
+    QtFontFace * QtFontFace::fromQFont(const QFont &)
+vcl/inc/qt5/QtFrame.hxx:161
+    void QtFrame::deregisterDragSource(const QtDragSource *)
+vcl/inc/qt5/QtFrame.hxx:163
+    void QtFrame::deregisterDropTarget(const QtDropTarget *)
+vcl/inc/qt5/QtGraphics.hxx:181
+    void QtGraphics::drawScaledImage(const struct SalTwoRect &,const QImage &)
+vcl/inc/qt5/QtGraphics_Controls.hxx:97
+    QPoint QtGraphics_Controls::upscale(const QPoint &,enum QtGraphics_Controls::Round)
+vcl/inc/qt5/QtObject.hxx:48
+    QWidget * QtObject::widget() const
+vcl/inc/qt5/QtPainter.hxx:61
+    void QtPainter::update()
 vcl/inc/regionband.hxx:27
     const char * ImplDbgTestRegionBand(const void *)
-vcl/inc/salgdi.hxx:643
-    void SalGraphics::FillFontSubsetInfo(const struct vcl::TTGlobalFontInfo_ &,const class rtl::OUString &,class FontSubsetInfo &)
-vcl/inc/salmenu.hxx:46
+vcl/inc/salframe.hxx:159
+    rtl::OUString SalFrame::DumpSetPosSize(long,long,long,long,unsigned short)
+vcl/inc/salgeom.hxx:69
+    std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const SalFrameGeometry &)
+vcl/inc/salmenu.hxx:47
      SalMenuButtonItem::SalMenuButtonItem()
 vcl/inc/salobj.hxx:73
     _Bool SalObject::IsEraseBackgroundEnabled() const
@@ -1638,115 +3370,133 @@ vcl/inc/saltimer.hxx:90
     _Bool VersionedEvent::ExistsValidEvent() const
 vcl/inc/saltimer.hxx:95
     _Bool VersionedEvent::IsValidEventVersion(const int) const
-vcl/inc/salwtype.hxx:129
+vcl/inc/salwtype.hxx:136
      SalMenuEvent::SalMenuEvent()
 vcl/inc/schedulerimpl.hxx:49
     const char * ImplSchedulerData::GetDebugName() const
-vcl/inc/skia/gdiimpl.hxx:52
-    const class vcl::Region & SkiaSalGraphicsImpl::getClipRegion() const
-vcl/inc/skia/gdiimpl.hxx:205
+vcl/inc/skia/gdiimpl.hxx:51
+    const vcl::Region & SkiaSalGraphicsImpl::getClipRegion() const
+vcl/inc/skia/gdiimpl.hxx:206
     void SkiaSalGraphicsImpl::dump(const char *) const
-vcl/inc/skia/salbmp.hxx:89
+vcl/inc/skia/gdiimpl.hxx:344
+    void SkiaSalGraphicsImpl::windowBackingPropertiesChanged()
+vcl/inc/skia/salbmp.hxx:107
     void SkiaSalBitmap::dump(const char *) const
-vcl/inc/skia/utils.hxx:49
-    class sk_sp<class SkSurface> SkiaHelper::createSkSurface(int,int,enum SkAlphaType)
-vcl/inc/skia/utils.hxx:75
-    void SkiaHelper::removeCachedImage(class sk_sp<class SkImage>)
-vcl/inc/skia/utils.hxx:81
+vcl/inc/skia/utils.hxx:67
+    sk_sp<SkSurface> SkiaHelper::createSkSurface(int,int,enum SkAlphaType)
+vcl/inc/skia/utils.hxx:130
+    void SkiaHelper::removeCachedImage(sk_sp<SkImage>)
+vcl/inc/skia/utils.hxx:140
     void SkiaHelper::setPixelGeometry(enum SkPixelGeometry)
-vcl/inc/skia/utils.hxx:85
-    void SkiaHelper::dump(const class SkBitmap &,const char *)
-vcl/inc/skia/zone.hxx:25
+vcl/inc/skia/utils.hxx:258
+    void SkiaHelper::dump(const SkBitmap &,const char *)
+vcl/inc/skia/zone.hxx:23
     void SkiaZone::relaxWatchdogTimings()
-vcl/inc/unx/gtk/gtkframe.hxx:216
-    void ensure_dbus_setup(struct _GdkWindow *,class GtkSalFrame *)
-vcl/inc/unx/gtk/gtkinst.hxx:243
-    const class std::shared_ptr<class vcl::unx::GtkPrintWrapper> & GtkInstance::getPrintWrapper() const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:32
-    _Bool vcl::unx::GtkPrintWrapper::supportsPrinting() const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:33
-    _Bool vcl::unx::GtkPrintWrapper::supportsPrintSelection() const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:36
-    struct _GtkPageSetup * vcl::unx::GtkPrintWrapper::page_setup_new() const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:38
-    struct _GtkPrintJob * vcl::unx::GtkPrintWrapper::print_job_new(const char *,struct _GtkPrinter *,struct _GtkPrintSettings *,struct _GtkPageSetup *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:39
-    void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void (*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void *)) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:40
-    int vcl::unx::GtkPrintWrapper::print_job_set_source_file(struct _GtkPrintJob *,const char *,struct _GError **) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:42
-    const char * vcl::unx::GtkPrintWrapper::print_settings_get(struct _GtkPrintSettings *,const char *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:43
-    int vcl::unx::GtkPrintWrapper::print_settings_get_collate(struct _GtkPrintSettings *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:44
-    void vcl::unx::GtkPrintWrapper::print_settings_set_collate(struct _GtkPrintSettings *,int) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:45
-    int vcl::unx::GtkPrintWrapper::print_settings_get_n_copies(struct _GtkPrintSettings *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:46
-    void vcl::unx::GtkPrintWrapper::print_settings_set_n_copies(struct _GtkPrintSettings *,int) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:47
-    struct _GtkPageRange * vcl::unx::GtkPrintWrapper::print_settings_get_page_ranges(struct _GtkPrintSettings *,int *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:48
-    void vcl::unx::GtkPrintWrapper::print_settings_set_print_pages(struct _GtkPrintSettings *,GtkPrintPages) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:50
-    struct _GtkWidget * vcl::unx::GtkPrintWrapper::print_unix_dialog_new() const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:51
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_add_custom_tab(struct _GtkPrintUnixDialog *,struct _GtkWidget *,struct _GtkWidget *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:52
-    struct _GtkPrinter * vcl::unx::GtkPrintWrapper::print_unix_dialog_get_selected_printer(struct _GtkPrintUnixDialog *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:53
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_manual_capabilities(struct _GtkPrintUnixDialog *,GtkPrintCapabilities) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:54
-    struct _GtkPrintSettings * vcl::unx::GtkPrintWrapper::print_unix_dialog_get_settings(struct _GtkPrintUnixDialog *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:55
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_settings(struct _GtkPrintUnixDialog *,struct _GtkPrintSettings *) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:58
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_support_selection(struct _GtkPrintUnixDialog *,int) const
-vcl/inc/unx/gtk/gtkprintwrapper.hxx:59
-    void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_has_selection(struct _GtkPrintUnixDialog *,int) const
-vcl/inc/unx/printergfx.hxx:94
-    _Bool psp::PrinterColor::operator!=(const class psp::PrinterColor &) const
-vcl/inc/unx/saldisp.hxx:376
-    class SalXLib * SalDisplay::GetXLib() const
-vcl/inc/unx/salframe.h:183
+vcl/inc/unx/gtk/gtkframe.hxx:300
+    void GtkSalFrame::DrawingAreaFocusInOut(enum SalEvent)
+vcl/inc/unx/gtk/gtksalmenu.hxx:80
+    const GtkSalFrame * GtkSalMenu::GetFrame() const
+vcl/inc/unx/salframe.h:185
     enum SalFrameStyleFlags X11SalFrame::GetStyle() const
-vcl/qa/cppunit/lifecycle.cxx:237
+vcl/inc/unx/saltype.h:21
+    _Bool SalX11Screen::operator==(const SalX11Screen &) const
+vcl/qa/cppunit/lifecycle.cxx:197
      (anonymous namespace)::LeakTestClass::LeakTestClass(_Bool &,type-parameter-?-? &&...)
-vcl/skia/salbmp.cxx:551
-    void ::operator()(void *,void *) const
 vcl/source/app/scheduler.cxx:83
-    basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &)
-vcl/source/bitmap/BitmapColorQuantizationFilter.cxx:111
-    int ::operator()(const void *,const void *) const
+    basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const Idle &)
 vcl/source/edit/textdat2.hxx:85
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > *, class std::__cxx1998::vector<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> >, class std::allocator<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > > > >, class std::__debug::vector<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> >, class std::allocator<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > > >, struct std::random_access_iterator_tag> TETextPortionList::begin() const
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const TETextPortion *, std::__cxx1998::vector<TETextPortion> >, std::vector<TETextPortion> > TETextPortionList::begin() const
 vcl/source/edit/textdat2.hxx:87
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > *, class std::__cxx1998::vector<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> >, class std::allocator<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > > > >, class std::__debug::vector<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> >, class std::allocator<class std::unique_ptr<class TETextPortion, struct std::default_delete<class TETextPortion> > > >, struct std::random_access_iterator_tag> TETextPortionList::end() const
-vcl/source/filter/FilterConfigCache.hxx:75
-    class rtl::OUString FilterConfigCache::GetImportFormatMediaType(unsigned short)
-vcl/source/fontsubset/xlat.hxx:31
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const TETextPortion *, std::__cxx1998::vector<TETextPortion> >, std::vector<TETextPortion> > TETextPortionList::end() const
+vcl/source/filter/FilterConfigCache.hxx:70
+    rtl::OUString FilterConfigCache::GetImportFormatMediaType(unsigned short)
+vcl/source/fontsubset/xlat.hxx:30
     unsigned short vcl::TranslateChar12(unsigned short)
-vcl/source/fontsubset/xlat.hxx:32
+vcl/source/fontsubset/xlat.hxx:31
     unsigned short vcl::TranslateChar13(unsigned short)
-vcl/source/fontsubset/xlat.hxx:33
+vcl/source/fontsubset/xlat.hxx:32
     unsigned short vcl::TranslateChar14(unsigned short)
-vcl/source/fontsubset/xlat.hxx:34
+vcl/source/fontsubset/xlat.hxx:33
     unsigned short vcl::TranslateChar15(unsigned short)
-vcl/source/fontsubset/xlat.hxx:35
+vcl/source/fontsubset/xlat.hxx:34
     unsigned short vcl::TranslateChar16(unsigned short)
-vcl/unx/gtk3/gtk3gloactiongroup.cxx:51
+vcl/source/window/menuitemlist.hxx:123
+    void MenuItemList::Clear()
+vcl/unx/generic/dtrans/X11_clipboard.hxx:106
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> x11::X11Clipboard_createInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+vcl/unx/generic/dtrans/X11_selection.hxx:487
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> x11::Xdnd_createInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+vcl/unx/generic/dtrans/X11_selection.hxx:491
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> x11::Xdnd_dropTarget_createInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx:76
+    void X11CairoSalGraphicsImpl::clipRegion(struct _cairo *)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    int CUSTOM_IS_CELL_RENDERER(void *)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    struct _CustomCellRenderer * CUSTOM_CELL_RENDERER(void *)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_autoptr_cleanup_CustomCellRenderer(struct _CustomCellRenderer **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_autoptr_cleanup_CustomCellRendererClass(CustomCellRendererClass **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_listautoptr_cleanup_CustomCellRenderer(struct _GList **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_listautoptr_cleanup_CustomCellRendererClass(struct _GList **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_queueautoptr_cleanup_CustomCellRenderer(struct _GQueue **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_queueautoptr_cleanup_CustomCellRendererClass(struct _GQueue **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_slistautoptr_cleanup_CustomCellRenderer(struct _GSList **)
+vcl/unx/gtk3/customcellrenderer.hxx:29
+    void glib_slistautoptr_cleanup_CustomCellRendererClass(struct _GSList **)
+vcl/unx/gtk3/gloactiongroup.cxx:51
     void * g_lo_action_get_instance_private(struct (anonymous namespace)::GLOAction *)
-vcl/unx/gtk3/gtk3glomenu.cxx:30
+vcl/unx/gtk3/glomenu.cxx:32
     void * g_lo_menu_get_instance_private(struct GLOMenu *)
-writerfilter/source/dmapper/SettingsTable.hxx:82
-    class rtl::OUString writerfilter::dmapper::SettingsTable::GetDecimalSymbol() const
-writerfilter/source/ooxml/OOXMLPropertySet.hxx:184
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::begin() const
+writerfilter/source/dmapper/CellColorHandler.hxx:74
+    model::ComplexColor writerfilter::dmapper::CellColorHandler::getComplexColor() const
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:764
+    _Bool writerfilter::dmapper::DomainMapper_Impl::GetSdt() const
+writerfilter/source/dmapper/DomainMapperTableManager.hxx:98
+    writerfilter::dmapper::TablePositionHandler * writerfilter::dmapper::DomainMapperTableManager::getCurrentTableRealPosition()
+writerfilter/source/dmapper/PropertyMap.hxx:364
+    _Bool writerfilter::dmapper::SectionPropertyMap::getFirstPageHeader()
+writerfilter/source/dmapper/PropertyMap.hxx:365
+    _Bool writerfilter::dmapper::SectionPropertyMap::getFirstPageFooter()
+writerfilter/source/dmapper/PropertyMap.hxx:392
+    int writerfilter::dmapper::SectionPropertyMap::GetBreakType() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:40
+    int writerfilter::dmapper::TablePositionHandler::getY() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:41
+    int writerfilter::dmapper::TablePositionHandler::getX() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:42
+    int writerfilter::dmapper::TablePositionHandler::getLeftFromText() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:43
+    int writerfilter::dmapper::TablePositionHandler::getRightFromText() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:44
+    int writerfilter::dmapper::TablePositionHandler::getTopFromText() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:45
+    int writerfilter::dmapper::TablePositionHandler::getBottomFromText() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:47
+    const rtl::OUString & writerfilter::dmapper::TablePositionHandler::getVertAnchor() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:48
+    const rtl::OUString & writerfilter::dmapper::TablePositionHandler::getYSpec() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:49
+    const rtl::OUString & writerfilter::dmapper::TablePositionHandler::getHorzAnchor() const
+writerfilter/source/dmapper/TablePositionHandler.hxx:50
+    const rtl::OUString & writerfilter::dmapper::TablePositionHandler::getXSpec() const
 writerfilter/source/ooxml/OOXMLPropertySet.hxx:185
-    class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::end() const
-writerfilter/source/ooxml/OOXMLPropertySet.hxx:188
-    class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString()
-xmlsecurity/source/gpg/XMLEncryption.hxx:25
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const tools::SvRef<writerfilter::ooxml::OOXMLProperty> *, std::__cxx1998::vector<tools::SvRef<writerfilter::ooxml::OOXMLProperty> > >, std::vector<tools::SvRef<writerfilter::ooxml::OOXMLProperty> > > writerfilter::ooxml::OOXMLPropertySet::begin() const
+writerfilter/source/ooxml/OOXMLPropertySet.hxx:186
+    __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const tools::SvRef<writerfilter::ooxml::OOXMLProperty> *, std::__cxx1998::vector<tools::SvRef<writerfilter::ooxml::OOXMLProperty> > >, std::vector<tools::SvRef<writerfilter::ooxml::OOXMLProperty> > > writerfilter::ooxml::OOXMLPropertySet::end() const
+writerfilter/source/ooxml/OOXMLPropertySet.hxx:189
+    std::basic_string<char> writerfilter::ooxml::OOXMLPropertySet::toString()
+xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx:92
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> XMLSignatureTemplateImpl::impl_createInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx:74
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> XMLSignature_GpgImpl::impl_createInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &)
+xmlsecurity/source/gpg/XMLEncryption.hxx:24
      XMLEncryptionGpg::XMLEncryptionGpg()
-xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:46
-     ONSSInitializer::ONSSInitializer(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
+xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:45
+     ONSSInitializer::ONSSInitializer(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>)
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results
index 1d2c96f5e657..7866efc445d7 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -1,113 +1,81 @@
-connectivity/source/inc/java/lang/Object.hxx:117
+connectivity/source/inc/java/lang/Object.hxx:109
     int connectivity::java_lang_Object::callIntMethodWithIntArg_ThrowRuntime(const char *,struct _jmethodID *&,int) const
-connectivity/source/inc/odbc/OConnection.hxx:76
-    short connectivity::odbc::OConnection::Construct(const class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &)
-connectivity/source/inc/odbc/OStatement.hxx:115
-    _Bool connectivity::odbc::OStatement_Base::lockIfNecessary(const class rtl::OUString &)
-cui/source/inc/iconcdlg.hxx:71
-    _Bool IconChoicePage::FillItemSet(class SfxItemSet *)
-extensions/source/scanner/sane.hxx:97
+connectivity/source/inc/odbc/OConnection.hxx:74
+    short connectivity::odbc::OConnection::Construct(const rtl::OUString &,const com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &)
+connectivity/source/inc/odbc/OStatement.hxx:113
+    _Bool connectivity::odbc::OStatement_Base::lockIfNecessary(const rtl::OUString &)
+cppuhelper/inc/interfacecontainer4.hxx:170
+    int cppuhelper::OInterfaceContainerHelper4::addInterface(std::unique_lock<std::mutex> &,const Reference<type-parameter-?-?> &)
+cppuhelper/inc/interfacecontainer4.hxx:181
+    int cppuhelper::OInterfaceContainerHelper4::removeInterface(std::unique_lock<std::mutex> &,const Reference<type-parameter-?-?> &)
+cui/source/inc/iconcdlg.hxx:56
+    _Bool IconChoicePage::FillItemSet(SfxItemSet *)
+dbaccess/source/ui/app/AppSwapWindow.hxx:84
+    _Bool dbaui::OApplicationSwapWindow::onContainerSelected(enum dbaui::ElementType)
+extensions/source/scanner/sane.hxx:105
     _Bool Sane::CheckConsistency(const char *,_Bool)
-extensions/source/scanner/sane.hxx:140
+extensions/source/scanner/sane.hxx:148
     _Bool Sane::GetOptionValue(int,double *)
-extensions/source/scanner/sane.hxx:147
+extensions/source/scanner/sane.hxx:155
     _Bool Sane::ActivateButtonOption(int)
-extensions/source/scanner/sane.hxx:153
+extensions/source/scanner/sane.hxx:161
     _Bool Sane::Open(int)
 extensions/source/scanner/sanedlg.hxx:87
     _Bool SaneDlg::LoadState()
 extensions/source/scanner/sanedlg.hxx:101
     _Bool SaneDlg::SetAdjustedNumericalValue(const char *,double,int)
-i18nlangtag/source/languagetag/languagetag.cxx:277
-    const class rtl::OUString & LanguageTagImpl::getBcp47() const
-idlc/inc/aststack.hxx:38
-    class AstStack * AstStack::push(class AstScope *)
-include/basegfx/range/b2dconnectedranges.hxx:217
+framework/source/fwe/classes/addonsoptions.cxx:281
+    _Bool framework::AddonsOptions_Impl::ReadToolBarItemSet(const rtl::OUString &,com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> > &)
+framework/source/fwe/classes/addonsoptions.cxx:283
+    _Bool framework::AddonsOptions_Impl::ReadNotebookBarItemSet(const rtl::OUString &,com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> > &)
+i18nlangtag/source/languagetag/languagetag.cxx:303
+    const rtl::OUString & LanguageTagImpl::getBcp47() const
+include/basegfx/range/b2dconnectedranges.hxx:214
     type-parameter-?-? basegfx::B2DConnectedRanges::forEachAggregate(type-parameter-?-?) const
-include/basegfx/vector/b2dvector.hxx:115
-    class basegfx::B2DVector & basegfx::B2DVector::setLength(double)
-include/basegfx/vector/b2ivector.hxx:100
-    class basegfx::B2IVector & basegfx::B2IVector::setLength(double)
-include/basegfx/vector/b3dvector.hxx:146
-    class basegfx::B3DVector & basegfx::B3DVector::setLength(double)
-include/basegfx/vector/b3dvector.hxx:171
-    class basegfx::B3DVector & basegfx::B3DVector::normalize()
-include/comphelper/backupfilehelper.hxx:204
-    _Bool comphelper::BackupFileHelper::tryPush_extensionInfo(const class rtl::OUString &)
-include/comphelper/interfacecontainer3.hxx:165
-    int comphelper::OInterfaceContainerHelper3::addInterface(const Reference<type-parameter-?-?> &)
-include/comphelper/interfacecontainer3.hxx:173
-    int comphelper::OInterfaceContainerHelper3::removeInterface(const Reference<type-parameter-?-?> &)
-include/editeng/editview.hxx:230
-    class ErrCode EditView::Read(class SvStream &,enum EETextFormat,class SvKeyValueIterator *)
-include/LibreOfficeKit/LibreOfficeKit.hxx:63
-    struct _LibreOfficeKitDocument * lok::Document::get()
-include/LibreOfficeKit/LibreOfficeKit.hxx:97
-    char * lok::Document::getPartPageRectangles()
-include/LibreOfficeKit/LibreOfficeKit.hxx:121
-    char * lok::Document::getPartHash(int)
-include/LibreOfficeKit/LibreOfficeKit.hxx:360
-    char * lok::Document::getTextSelection(const char *,char **)
-include/LibreOfficeKit/LibreOfficeKit.hxx:370
-    int lok::Document::getSelectionType()
-include/LibreOfficeKit/LibreOfficeKit.hxx:388
-    _Bool lok::Document::getClipboard(const char **,unsigned long *,char ***,unsigned long **,char ***)
-include/LibreOfficeKit/LibreOfficeKit.hxx:407
-    _Bool lok::Document::setClipboard(const unsigned long,const char **,const unsigned long *,const char **)
-include/LibreOfficeKit/LibreOfficeKit.hxx:422
-    _Bool lok::Document::paste(const char *,const char *,unsigned long)
-include/LibreOfficeKit/LibreOfficeKit.hxx:539
-    int lok::Document::getView()
-include/LibreOfficeKit/LibreOfficeKit.hxx:547
-    int lok::Document::getViewsCount()
-include/LibreOfficeKit/LibreOfficeKit.hxx:556
-    unsigned char * lok::Document::renderFont(const char *,const char *,int *,int *,int)
-include/LibreOfficeKit/LibreOfficeKit.hxx:599
-    _Bool lok::Document::getViewIds(int *,unsigned long)
-include/LibreOfficeKit/LibreOfficeKit.hxx:660
-    _Bool lok::Document::insertCertificate(const unsigned char *,const int,const unsigned char *,const int)
-include/LibreOfficeKit/LibreOfficeKit.hxx:674
-    _Bool lok::Document::addCertificate(const unsigned char *,const int)
-include/LibreOfficeKit/LibreOfficeKit.hxx:686
-    int lok::Document::getSignatureState()
-include/LibreOfficeKit/LibreOfficeKit.hxx:696
-    unsigned long lok::Document::renderShapeSelection(char **)
-include/LibreOfficeKit/LibreOfficeKit.hxx:849
-    char * lok::Office::getFilterTypes()
-include/LibreOfficeKit/LibreOfficeKit.hxx:903
-    char * lok::Office::getVersionInfo()
-include/LibreOfficeKit/LibreOfficeKit.hxx:917
-    _Bool lok::Office::runMacro(const char *)
-include/LibreOfficeKit/LibreOfficeKit.hxx:925
-    _Bool lok::Office::signDocument(const char *,const unsigned char *,const int,const unsigned char *,const int)
+include/basegfx/vector/b3dvector.hxx:144
+    basegfx::B3DVector & basegfx::B3DVector::setLength(double)
+include/basegfx/vector/b3dvector.hxx:169
+    basegfx::B3DVector & basegfx::B3DVector::normalize()
+include/basic/sbstar.hxx:63
+    _Bool StarBASIC::RTError(ErrCode,const rtl::OUString &,int,int,int)
+include/comphelper/backupfilehelper.hxx:205
+    _Bool comphelper::BackupFileHelper::tryPush_extensionInfo(std::basic_string_view<char16_t>)
+include/editeng/editview.hxx:278
+    ErrCode EditView::Read(SvStream &,enum EETextFormat,SvKeyValueIterator *)
+include/editeng/outliner.hxx:284
+    _Bool OutlinerView::Command(const CommandEvent &)
+include/editeng/svxacorr.hxx:244
+    _Bool SvxAutoCorrectLanguageLists::MakeCombinedChanges(std::vector<SvxAutocorrWord> &,std::vector<SvxAutocorrWord> &)
 include/oox/crypto/AgileEngine.hxx:121
-    _Bool oox::core::AgileEngine::decryptHmacKey()
+    _Bool oox::crypto::AgileEngine::decryptHmacKey()
 include/oox/crypto/AgileEngine.hxx:122
-    _Bool oox::core::AgileEngine::decryptHmacValue()
+    _Bool oox::crypto::AgileEngine::decryptHmacValue()
 include/oox/crypto/AgileEngine.hxx:137
-    _Bool oox::core::AgileEngine::encryptHmacValue()
+    _Bool oox::crypto::AgileEngine::encryptHmacValue()
+include/oox/crypto/CryptoEngine.hxx:46
+    _Bool oox::crypto::CryptoEngine::decrypt(oox::BinaryXInputStream &,oox::BinaryXOutputStream &)
 include/oox/crypto/CryptTools.hxx:112
-    _Bool oox::core::CryptoHash::update(class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,unsigned int)
+    _Bool oox::crypto::CryptoHash::update(std::vector<unsigned char> &,unsigned int)
 include/oox/dump/dumperbase.hxx:640
     long oox::dump::FlagsList::getIgnoreFlags() const
 include/oox/dump/dumperbase.hxx:1410
-    type-parameter-?-? oox::dump::InputObjectBase::dumpName(const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpName(const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1416
-    type-parameter-?-? oox::dump::InputObjectBase::dumpBin(const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpBin(const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1418
-    type-parameter-?-? oox::dump::InputObjectBase::dumpFix(const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpFix(const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1422
     type-parameter-?-? oox::dump::InputObjectBase::dumpValue(const struct oox::dump::ItemFormat &)
 include/oox/dump/dumperbase.hxx:1425
-    type-parameter-?-? oox::dump::InputObjectBase::dumpName(_Bool,const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpName(_Bool,const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1427
-    type-parameter-?-? oox::dump::InputObjectBase::dumpDec(_Bool,const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpDec(_Bool,const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1431
-    type-parameter-?-? oox::dump::InputObjectBase::dumpBin(_Bool,const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpBin(_Bool,const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1433
-    type-parameter-?-? oox::dump::InputObjectBase::dumpFix(_Bool,const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpFix(_Bool,const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1435
-    type-parameter-?-? oox::dump::InputObjectBase::dumpBool(_Bool,const class oox::dump::String &,const class oox::dump::NameListWrapper &)
+    type-parameter-?-? oox::dump::InputObjectBase::dumpBool(_Bool,const oox::dump::String &,const oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1437
     type-parameter-?-? oox::dump::InputObjectBase::dumpValue(_Bool,const struct oox::dump::ItemFormat &)
 include/oox/dump/oledumper.hxx:311
@@ -136,253 +104,349 @@ include/oox/dump/oledumper.hxx:326
     unsigned int oox::dump::AxPropertyObjectBase::dumpColorProperty(unsigned int)
 include/oox/dump/oledumper.hxx:327
     char16_t oox::dump::AxPropertyObjectBase::dumpUnicodeProperty()
-include/oox/export/shapes.hxx:134
-    class oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteNonVisualDrawingProperties(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const char *)
-include/oox/export/shapes.hxx:182
-    class oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteTextBox(const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,int)
+include/oox/export/shapes.hxx:137
+    oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteNonVisualDrawingProperties(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape> &,const char *)
+include/oox/export/shapes.hxx:185
+    oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteTextBox(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface> &,int,_Bool)
+include/oox/export/ThemeExport.hxx:48
+    _Bool oox::ThemeExport::writeColorSet(const model::Theme &)
+include/oox/export/ThemeExport.hxx:49
+    _Bool oox::ThemeExport::writeFontScheme(const model::FontScheme &)
+include/oox/export/ThemeExport.hxx:50
+    _Bool oox::ThemeExport::writeFormatScheme(const model::FormatScheme &)
 include/oox/helper/binaryoutputstream.hxx:78
-    class oox::BinaryOutputStream & oox::BinaryOutputStream::WriteInt16(short)
+    oox::BinaryOutputStream & oox::BinaryOutputStream::WriteInt16(short)
 include/oox/helper/binaryoutputstream.hxx:79
-    class oox::BinaryOutputStream & oox::BinaryOutputStream::WriteUInt16(unsigned short)
+    oox::BinaryOutputStream & oox::BinaryOutputStream::WriteUInt16(unsigned short)
 include/oox/helper/propertyset.hxx:110
-    _Bool oox::PropertySet::setProperty(int,class Color)
-include/oox/ole/axbinarywriter.hxx:116
-    _Bool oox::ole::AxBinaryPropertyWriter::ComplexProperty::writeProperty(class oox::ole::AxAlignedOutputStream &)
-include/oox/ole/olehelper.hxx:179
-    _Bool oox::ole::MSConvertOCXControls::importControlFromStream(class oox::BinaryInputStream &,class com::sun::star::uno::Reference<class com::sun::star::form::XFormComponent> &,const class rtl::OUString &)
-include/oox/ole/olehelper.hxx:190
-    _Bool oox::ole::MSConvertOCXControls::ReadOCXCtlsStream(const class tools::SvRef<class SotStorageStream> &,class com::sun::star::uno::Reference<class com::sun::star::form::XFormComponent> &,int,int)
+    _Bool oox::PropertySet::setProperty(int,Color)
+include/oox/ole/axbinarywriter.hxx:115
+    _Bool oox::ole::AxBinaryPropertyWriter::ComplexProperty::writeProperty(oox::ole::AxAlignedOutputStream &)
+include/oox/ole/olehelper.hxx:176
+    _Bool oox::ole::MSConvertOCXControls::importControlFromStream(oox::BinaryInputStream &,com::sun::star::uno::Reference<com::sun::star::form::XFormComponent> &,std::basic_string_view<char16_t>)
+include/oox/ole/olehelper.hxx:187
+    _Bool oox::ole::MSConvertOCXControls::ReadOCXCtlsStream(const tools::SvRef<SotStorageStream> &,com::sun::star::uno::Reference<com::sun::star::form::XFormComponent> &,int,int)
+include/sax/fshelper.hxx:134
+    sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(int)
+include/sax/fshelper.hxx:135
+    sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(long)
 include/sax/fshelper.hxx:136
-    class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(int)
-include/sax/fshelper.hxx:137
-    class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(long)
+    sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(double)
 include/sax/fshelper.hxx:138
-    class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(double)
-include/sax/fshelper.hxx:140
-    class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::writeEscaped(const char *)
-include/sfx2/linkmgr.hxx:63
-    _Bool sfx2::LinkManager::InsertLink(class sfx2::SvBaseLink *,unsigned short,enum SfxLinkUpdateMode,const class rtl::OUString *)
-include/sfx2/lnkbase.hxx:104
-    class sfx2::SvLinkSource * sfx2::SvBaseLink::GetRealObject()
-include/svl/listener.hxx:55
-    _Bool SvtListener::EndListening(class SvtBroadcaster &)
-include/svl/macitem.hxx:90
-    class SvStream & SvxMacroTableDtor::Write(class SvStream &) const
+    sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::writeEscaped(const char *)
+include/sfx2/linkmgr.hxx:65
+    _Bool sfx2::LinkManager::InsertLink(sfx2::SvBaseLink *,enum sfx2::SvBaseLinkObjectType,enum SfxLinkUpdateMode,const rtl::OUString *)
+include/sfx2/lnkbase.hxx:111
+    sfx2::SvLinkSource * sfx2::SvBaseLink::GetRealObject()
+include/svl/macitem.hxx:89
+    SvStream & SvxMacroTableDtor::Write(SvStream &) const
+include/svtools/ctrlbox.hxx:372
+    _Bool FontNameBox::get_entry_selection_bounds(int &,int &)
 include/svx/autoformathelper.hxx:212
-    _Bool AutoFormatBase::LoadBlockA(class SvStream &,const struct AutoFormatVersions &,unsigned short)
+    _Bool AutoFormatBase::LoadBlockA(SvStream &,const struct AutoFormatVersions &,unsigned short)
 include/svx/autoformathelper.hxx:213
-    _Bool AutoFormatBase::LoadBlockB(class SvStream &,const struct AutoFormatVersions &,unsigned short)
+    _Bool AutoFormatBase::LoadBlockB(SvStream &,const struct AutoFormatVersions &,unsigned short)
 include/svx/autoformathelper.hxx:215
-    _Bool AutoFormatBase::SaveBlockA(class SvStream &,unsigned short) const
+    _Bool AutoFormatBase::SaveBlockA(SvStream &,unsigned short) const
 include/svx/autoformathelper.hxx:216
-    _Bool AutoFormatBase::SaveBlockB(class SvStream &,unsigned short) const
-include/svx/dlgctrl.hxx:102
-    class Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint)
-include/svx/framelink.hxx:188
-    class svx::frame::Style & svx::frame::Style::MirrorSelf()
-include/svx/SvxColorValueSet.hxx:55
-    class Size ColorValueSet::layoutToGivenHeight(unsigned int,unsigned int)
-include/test/helper/form.hxx:37
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XControlShape> apitest::helper::form::createCommandButton(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-include/test/helper/shape.hxx:38
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> apitest::helper::shape::createEllipse(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-include/test/helper/shape.hxx:52
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> apitest::helper::shape::createLine(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-include/test/helper/shape.hxx:66
-    class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> apitest::helper::shape::createRectangle(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
-include/test/sheet/xcellrangedata.hxx:21
-    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XCellRangeData::init()
-include/test/sheet/xdocumentauditing.hxx:29
-    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XDocumentAuditing::getXMSF()
+    _Bool AutoFormatBase::SaveBlockB(SvStream &,unsigned short) const
+include/svx/dlgctrl.hxx:99
+    Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint)
+include/svx/framelink.hxx:159
+    svx::frame::Style & svx::frame::Style::MirrorSelf()
+include/svx/PaletteManager.hxx:87
+    _Bool PaletteManager::GetLumModOff(unsigned short,unsigned short,short &,short &)
+include/test/a11y/AccessibilityTools.hxx:119
+    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> AccessibilityTools::getAccessibleObjectForName(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> &,const short,std::basic_string_view<char16_t>,type-parameter-?-?...)
+include/test/a11y/AccessibilityTools.hxx:149
+    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> AccessibilityTools::getAccessibleObjectForName(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> &,const short,std::basic_string_view<char16_t>,type-parameter-?-?...)
+include/test/a11y/AccessibilityTools.hxx:173
+    _Bool AccessibilityTools::nameEquals(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> &,const std::basic_string_view<char16_t>)
+include/test/a11y/AccessibilityTools.hxx:261
+    rtl::OUString AccessibilityTools::debugName(com::sun::star::accessibility::XAccessibleAction *)
+include/test/a11y/AccessibilityTools.hxx:262
+    rtl::OUString AccessibilityTools::debugName(com::sun::star::accessibility::XAccessibleText *)
+include/test/a11y/eventposter.hxx:90
+    _Bool test::EventPosterHelper::operator!() const
+include/test/helper/shape.hxx:41
+    com::sun::star::uno::Reference<com::sun::star::drawing::XShape> apitest::helper::shape::createEllipse(const com::sun::star::uno::Reference<com::sun::star::lang::XComponent> &,const int,const int,const int,const int)
 include/test/sheet/xnamedrange.hxx:22
-    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XNamedRange::init()
-include/test/sheet/xsheetannotation.hxx:35
-    class com::sun::star::uno::Reference<class com::sun::star::sheet::XSheetAnnotation> apitest::XSheetAnnotation::getAnnotation(struct com::sun::star::table::CellAddress &)
-include/test/sheet/xspreadsheets2.hxx:40
-    class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> apitest::XSpreadsheets2::getComponent()
-include/test/sheet/xusedareacursor.hxx:22
-    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XUsedAreaCursor::init()
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> apitest::XNamedRange::init()
 include/tools/config.hxx:38
     _Bool Config::ImplUpdateConfig() const
 include/tools/multisel.hxx:93
     _Bool StringRangeEnumerator::insertRange(int,int,_Bool)
-include/vcl/bitmap.hxx:170
-    _Bool Bitmap::Dither()
-include/vcl/bitmapex.hxx:240
-    _Bool BitmapEx::Rotate(long,const class Color &)
-include/vcl/filter/PngImageReader.hxx:36
-    _Bool vcl::PngImageReader::read(class BitmapEx &)
-include/vcl/fontcharmap.hxx:49
-    class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool)
-include/vcl/gdimtf.hxx:185
-    class SvStream & GDIMetaFile::Read(class SvStream &)
-include/vcl/graphicfilter.hxx:268
-    class ErrCode GraphicFilter::ExportGraphic(const class Graphic &,const class INetURLObject &,unsigned short,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *)
-include/vcl/GraphicNativeTransform.hxx:32
-    _Bool GraphicNativeTransform::rotateBitmapOnly(unsigned short)
-include/vcl/menu.hxx:388
-    _Bool Menu::HandleMenuActivateEvent(class Menu *) const
-include/vcl/menu.hxx:389
-    _Bool Menu::HandleMenuDeActivateEvent(class Menu *) const
-include/vcl/texteng.hxx:276
-    _Bool TextEngine::Read(class SvStream &,const class TextSelection *)
-include/vcl/toolbox.hxx:505
-    _Bool ToolBox::ChangeHighlightUpDn(_Bool)
-include/vcl/weld.hxx:850
-    _Bool weld::TreeView::iter_nth_child(class weld::TreeIter &,int) const
-include/vcl/weld.hxx:1773
-    _Bool weld::TextView::get_selection_bounds(int &,int &)
-include/vcl/window.hxx:1502
-    _Bool vcl::Window::set_font_attribute(const class rtl::OString &,const class rtl::OUString &)
-include/vcl/wizardmachine.hxx:319
-    class BuilderPage * vcl::WizardMachine::GetOrCreatePage(const short)
-lotuswordpro/inc/lwpsvstream.hxx:76
-    class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &)
-lotuswordpro/inc/lwpsvstream.hxx:77
-    class LwpSvStream & LwpSvStream::ReadUInt16(unsigned short &)
-lotuswordpro/inc/lwpsvstream.hxx:78
-    class LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &)
-sc/inc/document.hxx:2156
-    const struct ScDocumentThreadSpecific & ScDocument::CalculateInColumnInThread(struct ScInterpreterContext &,const class ScRange &,unsigned int,unsigned int)
-sc/inc/orcusfilters.hxx:45
-    _Bool ScOrcusFilters::importODS_Styles(class ScDocument &,class rtl::OUString &) const
-sc/source/core/opencl/formulagroupcl.cxx:1084
-    unsigned long sc::opencl::DynamicKernelSlidingArgument::GenReductionLoopHeader(class std::__cxx11::basic_stringstream<char> &,_Bool &)
-sc/source/core/opencl/formulagroupcl.cxx:1529
-    unsigned long sc::opencl::ParallelReductionVectorRef::GenReductionLoopHeader(class std::__cxx11::basic_stringstream<char> &,int,_Bool &)
-sc/source/filter/inc/workbookhelper.hxx:259
-    _Bool oox::xls::WorkbookHelper::importOoxFragment(const class rtl::Reference<class oox::core::FragmentHandler> &,class oox::core::FastParser &)
-sc/source/filter/xml/XMLStylesExportHelper.hxx:178
-    _Bool ScFormatRangeStyles::AddStyleName(const class rtl::OUString &,int &,const _Bool)
-sc/source/ui/inc/anyrefdg.hxx:98
+include/tools/urlobj.hxx:428
+    _Bool INetURLObject::SetPass(std::basic_string_view<char16_t>)
+include/tools/urlobj.hxx:735
+    _Bool INetURLObject::SetParam(std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short)
+include/unotools/lingucfg.hxx:191
+    _Bool SvtLinguConfig::GetElementNamesFor(const rtl::OUString &,com::sun::star::uno::Sequence<rtl::OUString> &) const
+include/unotools/localedatawrapper.hxx:163
+    const com::sun::star::uno::Sequence<struct com::sun::star::lang::Locale> & LocaleDataWrapper::getAllInstalledLocaleNames() const
+include/vcl/abstdlg.hxx:117
+    _Bool AbstractSecurityOptionsDialog::SetSecurityOptions()
+include/vcl/alpha.hxx:87
+    _Bool AlphaMask::Scale(const double &,const double &,enum BmpScaleFlag)
+include/vcl/alpha.hxx:90
+    _Bool AlphaMask::Convert(enum BmpConversion)
+include/vcl/alpha.hxx:98
+    _Bool AlphaMask::Expand(int,int,const Color *)
+include/vcl/alpha.hxx:100
+    _Bool AlphaMask::CopyPixel(const tools::Rectangle &,const tools::Rectangle &,const AlphaMask &)
+include/vcl/BinaryDataContainer.hxx:59
+    unsigned long BinaryDataContainer::writeToStream(SvStream &) const
+include/vcl/bitmap.hxx:283
+    _Bool Bitmap::Blend(const AlphaMask &,const Color &)
+include/vcl/bitmap.hxx:451
+    _Bool Bitmap::Replace(const AlphaMask &,const Color &)
+include/vcl/bitmapex.hxx:225
+    _Bool BitmapEx::Rotate(struct o3tl::strong_int<short, struct FractionTag<10> >,const Color &)
+include/vcl/filter/SvmReader.hxx:36
+    SvStream & SvmReader::Read(GDIMetaFile &,struct ImplMetaReadData *)
+include/vcl/filter/SvmWriter.hxx:37
+    SvStream & SvmWriter::Write(const GDIMetaFile &)
+include/vcl/formatter.hxx:225
+    _Bool Formatter::SetFormat(const rtl::OUString &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>)
+include/vcl/graphicfilter.hxx:259
+    ErrCode GraphicFilter::ExportGraphic(const Graphic &,const INetURLObject &,unsigned short,const com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *)
+include/vcl/GraphicNativeMetadata.hxx:34
+    _Bool GraphicNativeMetadata::read(SvStream &)
+include/vcl/GraphicNativeTransform.hxx:33
+    _Bool GraphicNativeTransform::rotateBitmapOnly(struct o3tl::strong_int<short, struct FractionTag<10> >)
+include/vcl/GraphicNativeTransform.hxx:35
+    _Bool GraphicNativeTransform::rotateGeneric(struct o3tl::strong_int<short, struct FractionTag<10> >,std::basic_string_view<char16_t>)
+include/vcl/menu.hxx:393
+    _Bool Menu::HandleMenuActivateEvent(Menu *) const
+include/vcl/menu.hxx:394
+    _Bool Menu::HandleMenuDeActivateEvent(Menu *) const
+include/vcl/outdev.hxx:1170
+    _Bool OutputDevice::ForceFallbackFont(const vcl::Font &)
+include/vcl/texteng.hxx:271
+    _Bool TextEngine::Read(SvStream &,const TextSelection *)
+include/xmloff/unointerfacetouniqueidentifiermapper.hxx:65
+    _Bool comphelper::UnoInterfaceToUniqueIdentifierMapper::registerReservedReference(const rtl::OUString &,const com::sun::star::uno::Reference<com::sun::star::uno::XInterface> &)
+include/xmloff/xmluconv.hxx:279
+    _Bool SvXMLUnitConverter::convertNumFormat(short &,const rtl::OUString &,std::basic_string_view<char16_t>,_Bool) const
+linguistic/source/lngsvcmgr.hxx:116
+    _Bool LngSvcMgr::SaveCfgSvcs(std::basic_string_view<char16_t>)
+lotuswordpro/inc/lwpsvstream.hxx:80
+    LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &)
+lotuswordpro/inc/lwpsvstream.hxx:81
+    LwpSvStream & LwpSvStream::ReadUInt16(unsigned short &)
+lotuswordpro/inc/lwpsvstream.hxx:82
+    LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &)
+sc/inc/attarray.hxx:237
+    const ScPatternAttr * ScAttrArray::SetPatternAreaImpl(int,int,const CellAttributeHolder &,ScEditDataArray *)
+sc/inc/column.hxx:683
+    _Bool ScColumn::DeleteSparkline(int)
+sc/inc/orcusfilters.hxx:44
+    _Bool ScOrcusFilters::importODS_Styles(ScDocument &,rtl::OUString &) const
+sc/inc/scabstdlg.hxx:56
+    _Bool ScAsyncTabController::StartExecuteAsync(struct VclAbstractDialog::AsyncContext &)
+sc/source/core/opencl/opbase.hxx:451
+    unsigned long sc::opencl::DynamicKernelSlidingArgument::GenReductionLoopHeader(sc::opencl::outputstream &,_Bool &)
+sc/source/core/opencl/opbase.hxx:483
+    unsigned long sc::opencl::ParallelReductionVectorRef::GenReductionLoopHeader(sc::opencl::outputstream &,int,_Bool &)
+sc/source/filter/inc/workbookhelper.hxx:312
+    _Bool oox::xls::WorkbookHelper::importOoxFragment(const rtl::Reference<oox::core::FragmentHandler> &,oox::core::FastParser &)
+sc/source/filter/xml/XMLStylesExportHelper.hxx:174
+    _Bool ScFormatRangeStyles::AddStyleName(const rtl::OUString &,int &,const _Bool)
+sc/source/ui/inc/anyrefdg.hxx:95
     _Bool ScRefHandler::DoClose(unsigned short)
-sc/source/ui/inc/docfunc.hxx:111
-    _Bool ScDocFunc::SetFormulaCells(const class ScAddress &,class std::__debug::vector<class ScFormulaCell *, class std::allocator<class ScFormulaCell *> > &,_Bool)
-sc/source/ui/inc/drawview.hxx:161
-    _Bool ScDrawView::calculateGridOffsetForSdrObject(class SdrObject &,class basegfx::B2DVector &) const
-sc/source/ui/inc/drawview.hxx:164
-    _Bool ScDrawView::calculateGridOffsetForB2DRange(const class basegfx::B2DRange &,class basegfx::B2DVector &) const
-sc/source/ui/inc/select.hxx:72
+sc/source/ui/inc/docfunc.hxx:121
+    _Bool ScDocFunc::SetFormulaCells(const ScAddress &,std::vector<ScFormulaCell *> &,_Bool)
+sc/source/ui/inc/docfunc.hxx:171
+    _Bool ScDocFunc::Protect(short,const rtl::OUString &)
+sc/source/ui/inc/docfunc.hxx:252
+    _Bool ScDocFunc::ChangeSparklineGroupAttributes(const std::shared_ptr<sc::SparklineGroup> &,const sc::SparklineAttributes &)
+sc/source/ui/inc/drawview.hxx:159
+    _Bool ScDrawView::calculateGridOffsetForSdrObject(SdrObject &,basegfx::B2DVector &) const
+sc/source/ui/inc/drawview.hxx:162
+    _Bool ScDrawView::calculateGridOffsetForB2DRange(const basegfx::B2DRange &,basegfx::B2DVector &) const
+sc/source/ui/inc/select.hxx:71
     _Bool ScViewFunctionSet::SetCursorAtCell(short,int,_Bool)
-sc/source/ui/vba/vbaformat.hxx:70
-    class com::sun::star::uno::Any ScVbaFormat::getAddIndent()
-sc/source/ui/vba/vbaformat.hxx:74
-    class com::sun::star::uno::Any ScVbaFormat::Borders(const class com::sun::star::uno::Any &)
-sc/source/ui/vba/vbaformat.hxx:77
-    class com::sun::star::uno::Reference<class ooo::vba::excel::XFont> ScVbaFormat::Font()
-sc/source/ui/vba/vbaformat.hxx:80
-    class com::sun::star::uno::Reference<class ooo::vba::excel::XInterior> ScVbaFormat::Interior()
-sc/source/ui/vba/vbaformat.hxx:86
-    class com::sun::star::uno::Any ScVbaFormat::getNumberFormat()
-sc/source/ui/vba/vbaformat.hxx:92
-    class com::sun::star::uno::Any ScVbaFormat::getNumberFormatLocal()
-sc/source/ui/vba/vbaformat.hxx:98
-    class com::sun::star::uno::Any ScVbaFormat::getIndentLevel()
-sc/source/ui/vba/vbaformat.hxx:104
-    class com::sun::star::uno::Any ScVbaFormat::getHorizontalAlignment()
-sc/source/ui/vba/vbaformat.hxx:110
-    class com::sun::star::uno::Any ScVbaFormat::getVerticalAlignment()
-sc/source/ui/vba/vbaformat.hxx:116
-    class com::sun::star::uno::Any ScVbaFormat::getOrientation()
-sc/source/ui/vba/vbaformat.hxx:122
-    class com::sun::star::uno::Any ScVbaFormat::getShrinkToFit()
-sc/source/ui/vba/vbaformat.hxx:128
-    class com::sun::star::uno::Any ScVbaFormat::getWrapText()
-sc/source/ui/vba/vbaformat.hxx:134
-    class com::sun::star::uno::Any ScVbaFormat::getLocked()
-sc/source/ui/vba/vbaformat.hxx:140
-    class com::sun::star::uno::Any ScVbaFormat::getFormulaHidden()
-sc/source/ui/vba/vbaformat.hxx:146
-    class com::sun::star::uno::Any ScVbaFormat::getMergeCells()
-sc/source/ui/vba/vbaformat.hxx:152
-    class com::sun::star::uno::Any ScVbaFormat::getReadingOrder()
-sd/source/filter/eppt/pptx-epptooxml.cxx:112
-    class oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePageShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,enum PageType,_Bool)
-sd/source/ui/inc/DrawViewShell.hxx:254
+sc/source/ui/vba/vbaformat.hxx:69
+    com::sun::star::uno::Any ScVbaFormat::getAddIndent()
+sc/source/ui/vba/vbaformat.hxx:73
+    com::sun::star::uno::Any ScVbaFormat::Borders(const com::sun::star::uno::Any &)
+sc/source/ui/vba/vbaformat.hxx:76
+    com::sun::star::uno::Reference<ooo::vba::excel::XFont> ScVbaFormat::Font()
+sc/source/ui/vba/vbaformat.hxx:79
+    com::sun::star::uno::Reference<ooo::vba::excel::XInterior> ScVbaFormat::Interior()
+sc/source/ui/vba/vbaformat.hxx:85
+    com::sun::star::uno::Any ScVbaFormat::getNumberFormat()
+sc/source/ui/vba/vbaformat.hxx:91
+    com::sun::star::uno::Any ScVbaFormat::getNumberFormatLocal()
+sc/source/ui/vba/vbaformat.hxx:97
+    com::sun::star::uno::Any ScVbaFormat::getIndentLevel()
+sc/source/ui/vba/vbaformat.hxx:103
+    com::sun::star::uno::Any ScVbaFormat::getHorizontalAlignment()
+sc/source/ui/vba/vbaformat.hxx:109
+    com::sun::star::uno::Any ScVbaFormat::getVerticalAlignment()
+sc/source/ui/vba/vbaformat.hxx:115
+    com::sun::star::uno::Any ScVbaFormat::getOrientation()
+sc/source/ui/vba/vbaformat.hxx:121
+    com::sun::star::uno::Any ScVbaFormat::getShrinkToFit()
+sc/source/ui/vba/vbaformat.hxx:127
+    com::sun::star::uno::Any ScVbaFormat::getWrapText()
+sc/source/ui/vba/vbaformat.hxx:133
+    com::sun::star::uno::Any ScVbaFormat::getLocked()
+sc/source/ui/vba/vbaformat.hxx:139
+    com::sun::star::uno::Any ScVbaFormat::getFormulaHidden()
+sc/source/ui/vba/vbaformat.hxx:145
+    com::sun::star::uno::Any ScVbaFormat::getMergeCells()
+sc/source/ui/vba/vbaformat.hxx:151
+    com::sun::star::uno::Any ScVbaFormat::getReadingOrder()
+sd/source/filter/eppt/pptx-epptooxml.cxx:135
+    oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePlaceholderReferenceShape(enum oox::core::PlaceholderType,int,enum PageType,const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &)
+sd/source/filter/eppt/pptx-epptooxml.cxx:136
+    oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePageShape(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape> &,enum PageType,_Bool)
+sd/source/filter/html/htmlex.hxx:74
+    _Bool HtmlExport::WriteHtml(const rtl::OUString &,_Bool,std::basic_string_view<char16_t>)
+sd/source/ui/inc/DrawViewShell.hxx:253
     _Bool sd::DrawViewShell::SelectPage(unsigned short,unsigned short)
-sd/source/ui/inc/OutlineViewShell.hxx:115
-    class ErrCode sd::OutlineViewShell::ReadRtf(class SvStream &)
-sd/source/ui/remotecontrol/IBluetoothSocket.hxx:37
+sd/source/ui/inc/navigatr.hxx:120
+    _Bool SdNavigatorWin::InsertFile(const rtl::OUString &)
+sd/source/ui/inc/OutlineViewShell.hxx:114
+    ErrCode sd::OutlineViewShell::ReadRtf(SvStream &)
+sd/source/ui/inc/View.hxx:175
+    SdrMediaObj * sd::View::InsertMediaObj(const rtl::OUString &,signed char &,const Point &,const Size &)
+sd/source/ui/remotecontrol/IBluetoothSocket.hxx:36
     int sd::IBluetoothSocket::write(const void *,unsigned int)
-sfx2/inc/autoredactdialog.hxx:146
-    _Bool SfxAutoRedactDialog::getTargets(class std::__debug::vector<struct std::pair<struct RedactionTarget *, class rtl::OUString>, class std::allocator<struct std::pair<struct RedactionTarget *, class rtl::OUString> > > &)
-svgio/source/svguno/xsvgparser.cxx:52
-    _Bool svgio::svgreader::XSvgParser::parseSvgXML(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &)
-sw/inc/authfld.hxx:97
-    unsigned short SwAuthorityFieldType::AppendField(const class SwAuthEntry &)
-sw/inc/calc.hxx:114
-    class SwSbxValue & SwSbxValue::MakeDouble()
-sw/inc/crsrsh.hxx:551
-    _Bool SwCursorShell::GoNextPrevCursorSetSearchLabel(const _Bool)
-sw/inc/doc.hxx:1083
-    _Bool SwDoc::ReplaceNumRule(const struct SwPosition &,const class rtl::OUString &,const class rtl::OUString &)
-sw/inc/doc.hxx:1246
-    _Bool SwDoc::SetColRowWidthHeight(class SwTableBox &,enum TableChgWidthHeightType,long,long)
-sw/inc/doc.hxx:1271
-    _Bool SwDoc::SplitTable(const struct SwPosition &,enum SplitTable_HeadlineOption,_Bool)
-sw/inc/editsh.hxx:266
-    _Bool SwEditShell::GetPaMParAttr(class SwPaM *,class SfxItemSet &) const
-sw/inc/editsh.hxx:641
-    const class GraphicAttr * SwEditShell::GetGraphicAttr(class GraphicAttr &) const
-sw/inc/fesh.hxx:724
-    _Bool SwFEShell::SetTableStyle(const class rtl::OUString &)
-sw/inc/IDocumentUndoRedo.hxx:181
-    _Bool IDocumentUndoRedo::Repeat(class sw::RepeatContext &,const unsigned short)
-sw/inc/swcrsr.hxx:159
-    _Bool SwCursor::ExpandToSentenceBorders(const class SwRootFrame *)
-sw/inc/tblafmt.hxx:272
-    _Bool SwTableAutoFormatTable::Load(class SvStream &)
+sdext/source/pdfimport/tree/style.hxx:155
+    int pdfi::StyleContainer::getStandardStyleId(std::basic_string_view<char>)
+sfx2/inc/autoredactdialog.hxx:139
+    _Bool SfxAutoRedactDialog::getTargets(std::vector<struct std::pair<struct RedactionTarget, rtl::OUString> > &)
+slideshow/source/engine/animationnodes/animationbasenode.hxx:62
+    _Bool slideshow::internal::AnimationBaseNode::enqueueActivity() const
+svl/source/fsstor/fsstorage.hxx:56
+    ucbhelper::Content & FSStorage::GetContent()
+svx/inc/galleryfilestorage.hxx:101
+    SvStream & GalleryFileStorage::writeGalleryTheme(SvStream &,const GalleryTheme &,const GalleryThemeEntry *)
+svx/inc/galleryfilestorageentry.hxx:55
+    std::unique_ptr<GalleryTheme> & GalleryFileStorageEntry::getCachedTheme(std::unique_ptr<GalleryTheme> &)
+sw/inc/calc.hxx:124
+    SwSbxValue & SwSbxValue::MakeDouble()
+sw/inc/crsrsh.hxx:609
+    _Bool SwCursorShell::TrySelectOuterTable()
+sw/inc/docary.hxx:308
+    _Bool SwExtraRedlineTable::DeleteAllTableRedlines(SwDoc &,const SwTable &,_Bool,enum RedlineType)
+sw/inc/docary.hxx:309
+    _Bool SwExtraRedlineTable::DeleteTableRowRedline(SwDoc *,const SwTableLine &,_Bool,enum RedlineType)
+sw/inc/docary.hxx:310
+    _Bool SwExtraRedlineTable::DeleteTableCellRedline(SwDoc *,const SwTableBox &,_Bool,enum RedlineType)
+sw/inc/editsh.hxx:177
+    _Bool SwEditShell::ReplaceKeepComments(const rtl::OUString &)
+sw/inc/editsh.hxx:497
+    _Bool SwEditShell::OutlineUpDown(short)
+sw/inc/editsh.hxx:660
+    const GraphicAttr * SwEditShell::GetGraphicAttr(GraphicAttr &) const
+sw/inc/editsh.hxx:673
+    _Bool SwEditShell::GetGrfSize(Size &) const
+sw/inc/editsh.hxx:838
+    unsigned short SwEditShell::GetRefMarks(std::vector<rtl::OUString> *) const
+sw/inc/IDocumentUndoRedo.hxx:99
+    _Bool IDocumentUndoRedo::Undo()
+sw/inc/IDocumentUndoRedo.hxx:180
+    _Bool IDocumentUndoRedo::Repeat(sw::RepeatContext &,const unsigned short)
+sw/inc/node.hxx:438
+    _Bool SwContentNode::GoNext(struct SwPosition *,enum SwCursorSkipMode) const
+sw/inc/redline.hxx:267
+    _Bool SwRangeRedline::PopAllDataAfter(int)
+sw/inc/tblafmt.hxx:271
+    _Bool SwTableAutoFormatTable::Load(SvStream &)
 sw/source/core/inc/laycache.hxx:64
-    _Bool SwLayoutCache::CompareLayout(const class SwDoc &) const
-sw/source/core/inc/scriptinfo.hxx:226
+    _Bool SwLayoutCache::CompareLayout(const SwDoc &) const
+sw/source/core/inc/scriptinfo.hxx:239
     _Bool SwScriptInfo::GetBoundsOfHiddenRange(struct o3tl::strong_int<int, struct Tag_TextFrameIndex>,struct o3tl::strong_int<int, struct Tag_TextFrameIndex> &,struct o3tl::strong_int<int, struct Tag_TextFrameIndex> &) const
-sw/source/filter/ww8/ww8toolbar.hxx:339
-    _Bool Tcg::ImportCustomToolBar(class SfxObjectShell &)
+sw/source/filter/ww8/ww8toolbar.hxx:337
+    _Bool Tcg::ImportCustomToolBar(SfxObjectShell &)
 sw/source/uibase/inc/drawbase.hxx:54
-    _Bool SwDrawBase::MouseMove(const class MouseEvent &)
+    _Bool SwDrawBase::MouseMove(const MouseEvent &)
 sw/source/uibase/inc/fldmgr.hxx:117
-    const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const
-sw/source/uibase/inc/mailmergewizard.hxx:80
+    const com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const
+sw/source/uibase/inc/mailmergewizard.hxx:78
     _Bool SwMailMergeWizard::skipUntil(unsigned short)
-ucb/source/ucp/webdav-neon/ContentProperties.hxx:170
-    _Bool webdav_ucp::CachableContentProperties::containsAllNames(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) const
-ucb/source/ucp/webdav-neon/NeonSession.hxx:240
-    _Bool webdav_ucp::NeonSession::UNLOCK(struct ne_lock *)
-vcl/inc/font/FeatureCollector.hxx:47
+sw/source/uibase/inc/wrtsh.hxx:429
+    _Bool SwWrtShell::GotoFieldmark(const sw::mark::IFieldmark *const,_Bool)
+sw/source/uibase/inc/wrtsh.hxx:437
+    _Bool SwWrtShell::GotoContentControl(const SwFormatContentControl &,_Bool)
+ucb/source/ucp/webdav-curl/ContentProperties.hxx:160
+    _Bool http_dav_ucp::CachableContentProperties::containsAllNames(const com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,std::vector<rtl::OUString> &) const
+unotools/source/ucbhelper/ucblockbytes.hxx:108
+    _Bool utl::UcbLockBytes::setInputStream(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream> &,_Bool)
+vcl/inc/font/FeatureCollector.hxx:44
     _Bool vcl::font::FeatureCollector::collect()
-vcl/inc/opengl/salbmp.hxx:99
-    _Bool OpenGLSalBitmap::ImplScaleFilter(const class rtl::Reference<class OpenGLContext> &,const double &,const double &,unsigned int)
-vcl/inc/opengl/salbmp.hxx:101
-    _Bool OpenGLSalBitmap::ImplScaleConvolution(const class rtl::Reference<class OpenGLContext> &,const double &,const double &,const class vcl::Kernel &)
-vcl/inc/opengl/salbmp.hxx:102
-    _Bool OpenGLSalBitmap::ImplScaleArea(const class rtl::Reference<class OpenGLContext> &,double,double)
-vcl/inc/opengl/texture.hxx:112
-    _Bool OpenGLTexture::CopyData(int,int,int,int,const unsigned char *)
-vcl/inc/salframe.hxx:233
-    _Bool SalFrame::SetPluginParent(struct SystemParentData *)
-vcl/inc/salgdi.hxx:212
-    class basegfx::B2DPoint SalGraphics::mirror(const class basegfx::B2DPoint &,const class OutputDevice *) const
-vcl/inc/salgdi.hxx:388
-    _Bool SalGraphics::UpdateSettings(class AllSettings &)
-vcl/inc/salgdi.hxx:390
-    _Bool SalGraphics::BlendBitmap(const struct SalTwoRect &,const class SalBitmap &,const class OutputDevice *)
-vcl/inc/salinst.hxx:177
-    _Bool SalInstance::CallEventCallback(const void *,int)
-vcl/inc/unx/gtk/gtkdata.hxx:136
-    int GtkSalDisplay::CaptureMouse(class SalFrame *)
-vcl/inc/unx/saldisp.hxx:308
-    _Bool SalDisplay::Dispatch(union _XEvent *)
-vcl/inc/wizdlg.hxx:198
-    _Bool vcl::RoadmapWizard::onFinish()
-vcl/inc/wizdlg.hxx:201
-    _Bool vcl::RoadmapWizard::travelNext()
-vcl/inc/wizdlg.hxx:204
-    _Bool vcl::RoadmapWizard::travelPrevious()
-vcl/inc/wizdlg.hxx:291
-    class TabPage * vcl::RoadmapWizard::GetOrCreatePage(const short)
-vcl/source/gdi/pdfwriter_impl.hxx:1233
+vcl/inc/impgraph.hxx:187
+    _Bool ImpGraphic::swapOutGraphic(SvStream &)
+vcl/inc/pdf/pdfwriter_impl.hxx:1331
     _Bool vcl::PDFWriterImpl::setCurrentStructureElement(int)
-vcl/source/gdi/pdfwriter_impl.hxx:1234
+vcl/inc/pdf/pdfwriter_impl.hxx:1332
     _Bool vcl::PDFWriterImpl::setStructureAttribute(enum vcl::PDFWriter::StructAttribute,enum vcl::PDFWriter::StructAttributeValue)
-vcl/source/gdi/pdfwriter_impl.hxx:1235
+vcl/inc/pdf/pdfwriter_impl.hxx:1333
     _Bool vcl::PDFWriterImpl::setStructureAttributeNumerical(enum vcl::PDFWriter::StructAttribute,int)
+vcl/inc/ppdparser.hxx:199
+    _Bool psp::PPDParser::getMargins(std::basic_string_view<char16_t>,int &,int &,int &,int &) const
+vcl/inc/qt5/QtClipboard.hxx:36
+    QString QtClipboard::tr(const char *,const char *,int)
+vcl/inc/qt5/QtClipboard.hxx:36
+    QString QtClipboard::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtFilePicker.hxx:60
+    QString QtFilePicker::tr(const char *,const char *,int)
+vcl/inc/qt5/QtFilePicker.hxx:60
+    QString QtFilePicker::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtFrame.hxx:70
+    QString QtFrame::tr(const char *,const char *,int)
+vcl/inc/qt5/QtFrame.hxx:70
+    QString QtFrame::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtInstance.hxx:56
+    QString QtInstance::tr(const char *,const char *,int)
+vcl/inc/qt5/QtInstance.hxx:56
+    QString QtInstance::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtMainWindow.hxx:29
+    QString QtMainWindow::tr(const char *,const char *,int)
+vcl/inc/qt5/QtMainWindow.hxx:29
+    QString QtMainWindow::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtMenu.hxx:42
+    QString QtMenu::tr(const char *,const char *,int)
+vcl/inc/qt5/QtMenu.hxx:42
+    QString QtMenu::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtObject.hxx:35
+    QString QtObject::tr(const char *,const char *,int)
+vcl/inc/qt5/QtObject.hxx:35
+    QString QtObject::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtTimer.hxx:27
+    QString QtTimer::tr(const char *,const char *,int)
+vcl/inc/qt5/QtTimer.hxx:27
+    QString QtTimer::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtWidget.hxx:37
+    QString QtWidget::tr(const char *,const char *,int)
+vcl/inc/qt5/QtWidget.hxx:37
+    QString QtWidget::trUtf8(const char *,const char *,int)
+vcl/inc/qt5/QtXAccessible.hxx:27
+    QString QtXAccessible::tr(const char *,const char *,int)
+vcl/inc/qt5/QtXAccessible.hxx:27
+    QString QtXAccessible::trUtf8(const char *,const char *,int)
+vcl/inc/salgdi.hxx:361
+    _Bool SalGraphics::UpdateSettings(AllSettings &)
+vcl/inc/salgdi.hxx:363
+    _Bool SalGraphics::BlendBitmap(const struct SalTwoRect &,const SalBitmap &,const OutputDevice &)
+vcl/inc/salgdi.hxx:480
+    _Bool SalGraphics::implDrawGradient(const basegfx::B2DPolyPolygon &,const struct SalGradient &)
+vcl/inc/salinst.hxx:177
+    _Bool SalInstance::CallEventCallback(const void *,int)
+vcl/inc/salprn.hxx:119
+    _Bool SalPrinter::EndJob()
+vcl/inc/unx/gtk/gtkdata.hxx:336
+    int GtkSalDisplay::CaptureMouse(SalFrame *)
+vcl/inc/unx/salframe.h:166
+    _Bool X11SalFrame::Dispatch(union _XEvent *)
+vcl/source/fontsubset/ttcr.hxx:106
+    int vcl::TrueTypeTable::GetRawData(struct vcl::TableEntry *)
+vcl/unx/kf5/KFFilePicker.hxx:29
+    QString KFFilePicker::tr(const char *,const char *,int)
+vcl/unx/kf5/KFFilePicker.hxx:29
+    QString KFFilePicker::trUtf8(const char *,const char *,int)
+writerfilter/source/dmapper/TagLogger.hxx:59
+    typename enable_if<std::is_integral_v<T>, void>::type writerfilter::TagLogger::attribute(const std::basic_string<char> &,type-parameter-?-?)
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx
index 10354192d6f3..f155219942b6 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -16,6 +16,7 @@
 #include "compat.hxx"
 #include "check.hxx"
 #include "unusedvariablecheck.hxx"
+#include "plugin.hxx"
 
 namespace loplugin
 {
@@ -27,7 +28,7 @@ Check for unused classes where the compiler cannot decide (e.g. because of
 non-trivial or extern ctors) if a variable is unused if only its ctor/dtor
 are called and nothing else. For example std::vector is a class where
 the ctor may call further functions, but an unused std::string variable
-does nothing. On the other hand, std::lock_guard instances are used
+does nothing. On the other hand, std::scoped_lock instances are used
 for their dtors and so are not unused even if not otherwise accessed.
 
 Classes which are safe to be warned about need to be marked using
@@ -57,6 +58,10 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var )
     auto type = var->getType();
     bool check = loplugin::isExtraWarnUnusedType(type);
 
+    if (!check)
+        check = isUnusedSmartPointer(var);
+
+
     // this chunk of logic generates false+, which is why we don't leave it on
 /*
     if (!check && type->isRecordType())
@@ -75,9 +80,15 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var )
                     return true; // unnamed parameter -> unused
                 // If this declaration does not have a body, then the parameter is indeed not used,
                 // so ignore.
-                if( const FunctionDecl* func = dyn_cast_or_null< FunctionDecl >( param->getParentFunctionOrMethod()))
+                auto const parent = param->getParentFunctionOrMethod();
+                if( const FunctionDecl* func = dyn_cast_or_null< FunctionDecl >( parent))
                     if( !func->doesThisDeclarationHaveABody() || func->getBody() == nullptr)
                         return true;
+                if (auto const d = dyn_cast_or_null<ObjCMethodDecl>(parent)) {
+                    if (!d->hasBody()) {
+                        return true;
+                    }
+                }
                 report( DiagnosticsEngine::Warning, "unused parameter %0",
                     var->getLocation()) << var->getDeclName();
                 }
@@ -88,6 +99,23 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var )
     return true;
     }
 
+bool UnusedVariableCheck::isUnusedSmartPointer( const VarDecl* var )
+    {
+        // if we have a var of smart-pointer type, and that var is both uninitialised and
+        // not referenced, then we can remove it
+        if (!isSmartPointerType(var->getType()))
+            return false;
+
+        if (!var->hasInit())
+            return true;
+
+        auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(var->getInit());
+        if (!cxxConstructExpr)
+            return false;
+        return
+            cxxConstructExpr->getNumArgs() == 0 || cxxConstructExpr->getArg(0)->isDefaultArgument();
+    }
+
 static Plugin::Registration< UnusedVariableCheck > unusedvariablecheck( "unusedvariablecheck" );
 
 } // namespace
diff --git a/compilerplugins/clang/unusedvariablecheck.hxx b/compilerplugins/clang/unusedvariablecheck.hxx
index 5e8b59bdc6b0..5f5edbbbaf96 100644
--- a/compilerplugins/clang/unusedvariablecheck.hxx
+++ b/compilerplugins/clang/unusedvariablecheck.hxx
@@ -9,8 +9,7 @@
  *
  */
 
-#ifndef UNUSEDVARIABLECHECK_H
-#define UNUSEDVARIABLECHECK_H
+#pragma once
 
 #include "plugin.hxx"
 
@@ -24,10 +23,10 @@ class UnusedVariableCheck
         explicit UnusedVariableCheck( const InstantiationData& data );
         virtual void run() override;
         bool VisitVarDecl( const VarDecl* var );
+    private:
+        bool isUnusedSmartPointer( const VarDecl* var );
     };
 
 } // namespace
 
-#endif // UNUSEDVARIABLECHECK_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/unusedvariablemore.cxx b/compilerplugins/clang/unusedvariablemore.cxx
index b4394b31f8d6..908edf33a465 100644
--- a/compilerplugins/clang/unusedvariablemore.cxx
+++ b/compilerplugins/clang/unusedvariablemore.cxx
@@ -17,9 +17,7 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 namespace loplugin
 {
@@ -98,7 +96,7 @@ void UnusedVariableMore::run()
     if (fn == SRCDIR "/sc/source/ui/miscdlgs/simpref.cxx")
         return;
     // Using an SwPaM to do stuff
-    if (fn == SRCDIR "/sw/source/core/crsr/bookmrk.cxx")
+    if (fn == SRCDIR "/sw/source/core/crsr/bookmark.cxx")
         return;
     // index variable in for loop?
     if (fn == SRCDIR "/sw/source/uibase/docvw/edtwin.cxx")
diff --git a/compilerplugins/clang/unusedvariableplus.cxx b/compilerplugins/clang/unusedvariableplus.cxx
index 596dc7978f8a..e8a8385bb3cd 100644
--- a/compilerplugins/clang/unusedvariableplus.cxx
+++ b/compilerplugins/clang/unusedvariableplus.cxx
@@ -12,6 +12,7 @@
 #ifndef LO_CLANG_SHARED_PLUGINS
 
 #include "plugin.hxx"
+#include "config_clang.h"
 #include <unordered_set>
 
 /*
@@ -106,6 +107,8 @@ public:
             return true;
         if (var->isExceptionVariable()) // not interesting
             return true;
+        if (isa<DecompositionDecl>(var))
+            return true;
 
         auto type = var->getType().getCanonicalType().getUnqualifiedType();
         auto typeName = type.getAsString();
@@ -124,10 +127,10 @@ public:
             "BoolResetter",
             "boost::io::basic_ios_all_saver<char, struct std::char_traits<char> >",
             "BorderLinesGuard",
+            "BorderTest",
             "BroadcastRecalcOnRefMoveGuard",
             "CacheLockGuard",
             "cc_reset",
-            "ViewCallback",
             "chart::ControllerLockGuard",
             "chart::ControllerLockGuardUNO",
             "chart::HiddenUndoContext",
@@ -172,6 +175,7 @@ public:
             "dbaxml::(anonymous namespace)::FocusWindowWaitGuard",
             "DBG_Model",
             "DeactivateUpdateMode",
+            "DepthProtect",
             "desktop::Desktop",
             "desktop::(anonymous namespace)::ConditionSetGuard",
             "desktop::(anonymous namespace)::RefClearGuard<class "
@@ -183,6 +187,7 @@ public:
             "DisableCallbacks",
             "DisableGetPivotData",
             "DispatchMutexLock_Impl",
+            "DisplayLockGuard",
             "DocTemplLocker_Impl",
             "DocumentSettingsGuard",
             "DocxTableExportContext",
@@ -222,11 +227,13 @@ public:
             "HelpParser",
             "HtmlExport",
             "HTMLSaveData",
+            "http_dav_ucp::CurlUri",
             "IMapCompat",
             "jni_uno::JLocalAutoRef",
             "LoadMediumGuard",
             "LockGuard",
             "MacroInterpretIncrementer",
+            "MakeAllOutlineContentTemporarilyVisible",
             "MailMergeExecuteFinalizer",
             "ModifyBlocker_Impl",
             "MutexRelease",
@@ -254,8 +261,8 @@ public:
             "rptui::OXUndoEnvironment::OUndoEnvLock",
             "PaMIntoCursorShellRing",
             "ParserCleanup",
-            "BorderTest",
             "pcr::ComposedUIAutoFireGuard",
+            "PngDestructor",
             "writerperfect::(anonymous namespace)::PositionHolder",
             "pq_sdbc_driver::DisposeGuard",
             "PropertyChangeNotifier",
@@ -275,6 +282,7 @@ public:
             "SaveRunState",
             "SbiExpression",
             "sc::AutoCalcSwitch",
+            "sc::DelayDeletingBroadcasters",
             "sc::DelayFormulaGroupingSwitch",
             "sc::IdleSwitch",
             "sc::UndoSwitch",
@@ -316,7 +324,9 @@ public:
             "sd::ModifyGuard",
             "sd::OutlineViewModelChangeGuard",
             "setFastDocumentHandlerGuard",
+            "SmMathConfig::CommitLocker",
             "SfxErrorContext",
+            "SfxFilterListener",
             "SfxObjectShellLock",
             "SfxProgress",
             "SfxSaveGuard",
@@ -326,20 +336,18 @@ public:
             "SolarMutexGuard",
             "SolarMutexReleaser",
             "StackHack",
+            "std::lock_guard<class std::mutex>",
             "std::scoped_lock<class std::mutex>",
-            "std::unique_ptr<class com::sun::star::uno::ContextLayer, struct "
-            "std::default_delete<class com::sun::star::uno::ContextLayer> >",
-            "std::unique_ptr<class weld::WaitObject, struct std::default_delete<class "
-            "weld::WaitObject> >",
+            "std::unique_lock<class std::mutex>",
+            "std::unique_lock<class std::recursive_mutex>",
+            "std::unique_ptr<class com::sun::star::uno::ContextLayer>",
+            "std::unique_ptr<class weld::WaitObject>",
             "std::unique_ptr<class ClearableClipRegion, struct o3tl::default_delete<class "
-            "ClearableClipRegion> >",
-            "std::unique_ptr<class SwDocShell::LockAllViewsGuard, struct "
-            "std::default_delete<class "
-            "SwDocShell::LockAllViewsGuard> >",
-            "std::unique_ptr<class SwSaveFootnoteHeight, struct std::default_delete<class "
-            "SwSaveFootnoteHeight> >",
-            "std::unique_ptr<class SwModelTestBase::Resetter, struct std::default_delete<class "
-            "SwModelTestBase::Resetter> >",
+            "ClearableClipRegion>>",
+            "std::unique_ptr<class SfxObjectShell::LockAllViewsGuard>",
+            "std::unique_ptr<class SwDocShell::LockAllViewsGuard>",
+            "std::unique_ptr<class SwSaveFootnoteHeight>",
+            "std::unique_ptr<class SwModelTestBase::Resetter>",
             "StreamExceptionsEnabler",
             "SvAddressParser_Impl",
             "svl::undo::impl::LockGuard",
@@ -348,8 +356,9 @@ public:
             "SvXMLElementExport",
             "svxform::(anonymous namespace)::QuitGuard",
             "sw::DrawUndoGuard",
-            "sw::UndoGuard",
+            "sw::FlyCreationSuppressor",
             "sw::GroupUndoGuard",
+            "sw::UndoGuard",
             "sw::(anonymous namespace)::CursorGuard",
             "SwActContext",
             "SwAutoFormat",
@@ -370,8 +379,7 @@ public:
             "SwFootnoteSave",
             "SwFrameDeleteGuard",
             "SwModelTestBase::Resetter",
-            "std::unique_ptr<class ScTokenArray, struct std::default_delete<class "
-            "ScTokenArray> >", // ScCompiler::CompileString has nasty semantics
+            "std::unique_ptr<class ScTokenArray>", // ScCompiler::CompileString has nasty semantics
             "Resetter",
             "SwFrameSwapper",
             "SwFlyNotify",
@@ -414,6 +422,9 @@ public:
             "TimerTriggeredControllerLock",
             "ToggleSaveToModule",
             "toolkit::(anonymous namespace)::ResetFlagOnExit",
+            "tools::ScopedJsonWriterArray",
+            "tools::ScopedJsonWriterNode",
+            "tools::ScopedJsonWriterStruct",
             "TravelSuspension",
             "TreeUpdateSwitch",
             "rptui::UndoContext",
@@ -434,11 +445,8 @@ public:
             "VerbExecutionControllerGuard",
             "VersionCompatRead",
             "VersionCompatWrite",
+            "ViewCallback",
             "SlideShowImpl::WaitSymbolLock",
-            "webdav_ucp::NeonHeadRequest",
-            "webdav_ucp::NeonPropFindRequest",
-            "webdav_ucp::NeonUri",
-            "WaitObject",
             "weld::WaitObject",
             "writerfilter::ooxml::(anonymous namespace)::StatusIndicatorGuard",
             "WriterSpecificAutoFormatBlock",
diff --git a/compilerplugins/clang/unusedvarsglobal.cxx b/compilerplugins/clang/unusedvarsglobal.cxx
index 508da0cb451f..f74bfedb6c0d 100644
--- a/compilerplugins/clang/unusedvarsglobal.cxx
+++ b/compilerplugins/clang/unusedvarsglobal.cxx
@@ -25,9 +25,7 @@
 #include "compat.hxx"
 #include "check.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
 This performs two analyses:
@@ -167,7 +165,7 @@ private:
     bool checkForWriteWhenUsingCollectionType(const CXXMethodDecl* calleeMethodDecl);
     bool IsPassedByNonConst(const VarDecl* fieldDecl, const Stmt* child, CallerWrapper callExpr,
                             CalleeWrapper calleeFunctionDecl);
-    llvm::Optional<CalleeWrapper> getCallee(CallExpr const*);
+    compat::optional<CalleeWrapper> getCallee(CallExpr const*);
 
     // For reasons I do not understand, parentFunctionDecl() is not reliable, so
     // we store the parent function on the way down the AST.
@@ -177,6 +175,8 @@ private:
 
 void UnusedVarsGlobal::run()
 {
+    handler.enableTreeWideAnalysisMode();
+
     TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
     if (!isUnitTestMode())
@@ -199,9 +199,9 @@ void UnusedVarsGlobal::run()
     else
     {
         for (const MyVarInfo& s : readFromSet)
-            report(DiagnosticsEngine::Warning, "read", compat::getBeginLoc(s.varDecl));
+            report(DiagnosticsEngine::Warning, "read", s.varDecl->getBeginLoc());
         for (const MyVarInfo& s : writeToSet)
-            report(DiagnosticsEngine::Warning, "write", compat::getBeginLoc(s.varDecl));
+            report(DiagnosticsEngine::Warning, "write", s.varDecl->getBeginLoc());
     }
 }
 
@@ -334,8 +334,8 @@ bool UnusedVarsGlobal::isSomeKindOfZero(const Expr* arg)
     // Get the expression contents.
     // This helps us find params which are always initialised with something like "OUString()".
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = compat::getBeginLoc(arg);
-    SourceLocation endLoc = compat::getEndLoc(arg);
+    SourceLocation startLoc = arg->getBeginLoc();
+    SourceLocation endLoc = arg->getEndLoc();
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     if (!p1 || !p2 || (p2 - p1) < 0 || (p2 - p1) > 40)
@@ -352,12 +352,6 @@ bool UnusedVarsGlobal::isSomeKindOfZero(const Expr* arg)
         return true;
     else if (s == "OString()")
         return true;
-    else if (s == "aEmptyOUStr") //sw
-        return true;
-    else if (s == "EMPTY_OUSTRING") //sc
-        return true;
-    else if (s == "GetEmptyOUString()") //sc
-        return true;
     return false;
 }
 
@@ -610,10 +604,7 @@ void UnusedVarsGlobal::checkIfReadFrom(const VarDecl* varDecl, const DeclRefExpr
                  || isa<CXXTypeidExpr>(parent) || isa<DefaultStmt>(parent)
                  || isa<GCCAsmStmt>(parent) || isa<LambdaExpr>(parent) // TODO
                  || isa<CXXDefaultArgExpr>(parent) || isa<AtomicExpr>(parent)
-                 || isa<VAArgExpr>(parent) || isa<DeclRefExpr>(parent)
-#if CLANG_VERSION >= 80000
-                 || isa<ConstantExpr>(parent)
-#endif
+                 || isa<VAArgExpr>(parent) || isa<DeclRefExpr>(parent) || isa<ConstantExpr>(parent)
                  || isa<SubstNonTypeTemplateParmExpr>(parent))
         {
             break;
@@ -629,9 +620,9 @@ void UnusedVarsGlobal::checkIfReadFrom(const VarDecl* varDecl, const DeclRefExpr
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear, what can the matter be?",
-               compat::getBeginLoc(declRefExpr))
+               declRefExpr->getBeginLoc())
             << declRefExpr->getSourceRange();
-        report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+        report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
             << parent->getSourceRange();
         parent->dump();
         declRefExpr->dump();
@@ -819,10 +810,7 @@ void UnusedVarsGlobal::checkIfWrittenTo(const VarDecl* varDecl, const DeclRefExp
                  || isa<UnaryExprOrTypeTraitExpr>(parent) || isa<CXXUnresolvedConstructExpr>(parent)
                  || isa<CompoundStmt>(parent) || isa<LabelStmt>(parent)
                  || isa<CXXForRangeStmt>(parent) || isa<CXXTypeidExpr>(parent)
-                 || isa<DefaultStmt>(parent) || isa<GCCAsmStmt>(parent)
-#if CLANG_VERSION >= 80000
-                 || isa<ConstantExpr>(parent)
-#endif
+                 || isa<DefaultStmt>(parent) || isa<GCCAsmStmt>(parent) || isa<ConstantExpr>(parent)
                  || isa<AtomicExpr>(parent) || isa<CXXDefaultArgExpr>(parent)
                  || isa<VAArgExpr>(parent) || isa<DeclRefExpr>(parent)
                  || isa<SubstNonTypeTemplateParmExpr>(parent) || isa<LambdaExpr>(parent)) // TODO
@@ -840,11 +828,11 @@ void UnusedVarsGlobal::checkIfWrittenTo(const VarDecl* varDecl, const DeclRefExp
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear, what can the matter be? writtenTo=%0",
-               compat::getBeginLoc(declRefExpr))
+               declRefExpr->getBeginLoc())
             << bPotentiallyWrittenTo << declRefExpr->getSourceRange();
         if (parent)
         {
-            report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+            report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
                 << parent->getSourceRange();
             parent->dump();
         }
@@ -944,7 +932,7 @@ bool UnusedVarsGlobal::IsPassedByNonConst(const VarDecl* varDecl, const Stmt* ch
     return false;
 }
 
-llvm::Optional<CalleeWrapper> UnusedVarsGlobal::getCallee(CallExpr const* callExpr)
+compat::optional<CalleeWrapper> UnusedVarsGlobal::getCallee(CallExpr const* callExpr)
 {
     FunctionDecl const* functionDecl = callExpr->getDirectCallee();
     if (functionDecl)
@@ -962,7 +950,7 @@ llvm::Optional<CalleeWrapper> UnusedVarsGlobal::getCallee(CallExpr const* callEx
         }
     }
 
-    return llvm::Optional<CalleeWrapper>();
+    return compat::optional<CalleeWrapper>();
 }
 
 loplugin::Plugin::Registration<UnusedVarsGlobal> X("unusedvarsglobal", false);
diff --git a/compilerplugins/clang/unusedvarsglobal.py b/compilerplugins/clang/unusedvarsglobal.py
index db46b9fee1ca..ccb7305ccc23 100755
--- a/compilerplugins/clang/unusedvarsglobal.py
+++ b/compilerplugins/clang/unusedvarsglobal.py
@@ -1,6 +1,5 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -12,7 +11,7 @@ defToTypeMap = dict()
 def parseFieldInfo( tokens ):
     return (tokens[1].strip(), tokens[2].strip())
 
-with io.open("workdir/loplugin.unusedvarsglobal.log", "rb", buffering=1024*1024) as txt:
+with io.open("workdir/loplugin.unusedvarsglobal.log", "r", buffering=16*1024*1024) as txt:
     for line in txt:
         try:
             tokens = line.strip().split("\t")
@@ -46,7 +45,7 @@ with io.open("workdir/loplugin.unusedvarsglobal.log", "rb", buffering=1024*1024)
             else:
                 print( "unknown line: " + line)
         except IndexError:
-            print "problem with line " + line.strip()
+            print("problem with line " + line.strip())
             raise
 
 definitionSet2 = set()
@@ -127,7 +126,7 @@ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
 # sort by both the source-line and the datatype, so the output file ordering is stable
 # when we have multiple items on the same source line
 def v_sort_key(v):
-    return natural_sort_key(v[0]) + [v1]]
+    return natural_sort_key(v[0]) + [v[1]]
 
 # sort results by name and line number
 tmp1list = sorted(untouchedSet, key=lambda v: v_sort_key(v))
diff --git a/compilerplugins/clang/unusedvarsglobal.untouched.results b/compilerplugins/clang/unusedvarsglobal.untouched.results
index cdc7a6e89477..8f96ddf92ab3 100644
--- a/compilerplugins/clang/unusedvarsglobal.untouched.results
+++ b/compilerplugins/clang/unusedvarsglobal.untouched.results
@@ -1,38 +1,94 @@
-canvas/workben/canvasdemo.cxx:672
-    (anonymous namespace)::DemoApp aApp
-connectivity/source/drivers/evoab2/EApi.h:52
+canvas/workben/canvasdemo.cxx:666
+    DemoApp aApp
+connectivity/source/drivers/evoab2/EApi.h:51
     gconstpointer (*)(EContact *, EContactField) e_contact_get_const
-cppu/source/uno/check.cxx:315
-    (anonymous namespace)::BinaryCompatible_Impl aTest
-framework/source/services/ContextChangeEventMultiplexer.cxx:381
-    framework::(anonymous namespace)::Hook g_hook
-hwpfilter/source/nodes.h:92
+connectivity/source/drivers/evoab2/EApi.h:55
+    char *(*)(ESource *) e_source_peek_name
+connectivity/source/drivers/evoab2/EApi.h:64
+    GSList *(*)(ESourceList *) e_source_list_peek_groups
+connectivity/source/drivers/evoab2/EApi.h:70
+    GSList *(*)(ESourceGroup *) e_source_group_peek_sources
+connectivity/source/drivers/evoab2/EApi.h:71
+    char *(*)(ESourceGroup *) e_source_group_peek_base_uri
+connectivity/source/drivers/evoab2/EApi.h:90
+    char *(*)(EBook *) e_book_get_uri
+connectivity/source/drivers/evoab2/EApi.h:93
+    gboolean (*)(ESourceList **, GError **) e_book_get_addressbooks
+connectivity/source/drivers/evoab2/EApi.h:101
+    gboolean (*)(EBook *, const char *, const char *, const char *, GError **) e_book_authenticate_user
+cppu/source/uno/check.cxx:329
+    BinaryCompatible_Impl aTest
+desktop/source/lib/init.cxx:7376
+    SvtOptionsDialogOptions aDialogOptions
+desktop/source/lib/init.cxx:7377
+    SvtCTLOptions aSvtCTLOptions
+desktop/source/lib/init.cxx:7379
+    svtools::ColorConfig aColorConfig
+desktop/source/lib/init.cxx:7380
+    SvtMiscOptions aSvtMiscOptions
+desktop/source/lib/init.cxx:7382
+    SvtCommandOptions aSvtCommandOptions
+desktop/source/lib/init.cxx:7383
+    SvtCompatibilityOptions aSvtCompatibilityOptions
+desktop/source/lib/init.cxx:7384
+    SvtFilterOptions aSvtFilterOptions
+desktop/source/lib/init.cxx:7385
+    SvtLinguConfig aSvtLinguConfig
+desktop/source/lib/init.cxx:7386
+    SvtModuleOptions aSvtModuleOptions
+desktop/source/lib/init.cxx:7387
+    SvtPathOptions aSvtPathOptions
+desktop/source/lib/init.cxx:7388
+    SvtSearchOptions aSvtSearchOptions
+desktop/source/lib/init.cxx:7389
+    SvtSysLocaleOptions aSvtSysLocaleOptions
+desktop/source/lib/init.cxx:7390
+    SvtUserOptions aSvtUserOptions
+desktop/source/lib/init.cxx:7392
+    MouseSettings aMouseSettings
+desktop/source/lib/init.cxx:7393
+    StyleSettings aStyleSettings
+desktop/source/lib/init.cxx:7394
+    MiscSettings aMiscSettings
+desktop/source/lib/init.cxx:7395
+    HelpSettings aHelpSettings
+desktop/source/lib/init.cxx:7396
+    AllSettings aAllSettings
+framework/source/services/ContextChangeEventMultiplexer.cxx:353
+    Hook g_hook
+hwpfilter/source/nodes.h:89
     int count
-pyuno/source/loader/pyuno_loader.cxx:240
-    pyuno_loader::(anonymous namespace)::PythonInit s_Init
 pyuno/source/module/pyuno_gc.cxx:45
-    pyuno::(anonymous namespace)::StaticDestructorGuard guard
+    StaticDestructorGuard guard
 sal/osl/all/utility.cxx:45
-    osl::(anonymous namespace)::OGlobalTimer aGlobalTimer
-sal/qa/osl/file/osl_File.cxx:5199
-    (anonymous namespace)::GlobalObject theGlobalObject
+    OGlobalTimer aGlobalTimer
+sal/qa/osl/file/osl_File.cxx:4978
+    GlobalObject theGlobalObject
 sal/rtl/cmdargs.cxx:46
-    (anonymous namespace)::ArgHolder argHolder
-soltools/cpp/cpp.h:239
+    ArgHolder argHolder
+sal/rtl/strtmpl.hxx:772
+    rtl_tString data
+sfx2/source/bastyp/fltfnc.cxx:81
+    SfxFilterListener theSfxFilterListener
+soltools/cpp/cpp.h:238
     int Lflag
 soltools/mkdepend/parse.c:40
     symhash * maininclist
-soltools/mkdepend/pr.c:34
+soltools/mkdepend/pr.c:37
     int width
+starmath/source/smdll.cxx:81
+    SmDLL theDll
 svx/source/gengal/gengal.cxx:323
-    (anonymous namespace)::GalApp aGalApp
-vcl/backendtest/VisualBackendTest.cxx:745
-    (anonymous namespace)::VisualBackendTestApp aApplication
-vcl/source/uipreviewer/previewer.cxx:113
-    (anonymous namespace)::UIPreviewApp aApp
-vcl/workben/icontest.cxx:216
-    (anonymous namespace)::IconTestApp aApp
-vcl/workben/mtfdemo.cxx:162
-    (anonymous namespace)::DemoMtfApp aApp
-vcl/workben/vcldemo.cxx:2445
-    (anonymous namespace)::DemoApp aApp
+    GalApp aGalApp
+svx/source/items/svxerr.cxx:32
+    SvxErrorHandler SINGLETON
+vcl/backendtest/VisualBackendTest.cxx:883
+    VisualBackendTestApp aApplication
+vcl/workben/icontest.cxx:212
+    IconTestApp aApp
+vcl/workben/mtfdemo.cxx:243
+    DemoMtfApp aApp
+vcl/workben/vcldemo.cxx:2269
+    DemoApp aApp
+xmloff/inc/enummaps.hxx:22
+    SvXMLEnumMapEntry<sal_Int16>[] pXML_ThemeColor_Enum
diff --git a/compilerplugins/clang/unusedvarsglobal.writeonly.results b/compilerplugins/clang/unusedvarsglobal.writeonly.results
index 92413e328e2c..cf3e1e27bd0c 100644
--- a/compilerplugins/clang/unusedvarsglobal.writeonly.results
+++ b/compilerplugins/clang/unusedvarsglobal.writeonly.results
@@ -1,392 +1,204 @@
-basctl/source/basicide/localizationmgr.cxx:52
-    rtl::OUStringLiteral aSemi
-chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:149
-    sal_uInt16 [7] nAreaWhichPairs
-chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:157
-    sal_uInt16 [7] nTextWhichPairs
-chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:164
-    sal_uInt16 [7] nTextOrientWhichPairs
-chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:199
-    sal_uInt16 [5] nFillPropertyWhichPairs
-chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:214
-    sal_uInt16 [9] nChartStyleWhichPairs
-chart2/source/view/inc/ViewDefines.hxx:30
+basctl/source/basicide/localizationmgr.cxx:58
+    OUStringLiteral<2> aSemi
+chart2/source/view/inc/ViewDefines.hxx:29
     double ZDIRECTION
-chart2/source/view/main/ChartView.cxx:2437
-    char * envChartDummyFactory
-connectivity/source/drivers/hsqldb/HDriver.cxx:345
-    Reference<class com::sun::star::frame::XTerminateListener> s_xTerminateListener
-connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx:38
+connectivity/source/drivers/hsqldb/HDriver.cxx:377
+    Reference<XTerminateListener> s_xTerminateListener
+connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx:39
     std::string wild
-cppuhelper/source/servicemanager.cxx:1977
+cppuhelper/source/servicemanager.cxx:2008
     std::vector<css::uno::Mapping> maMaps
-cui/source/inc/cuitabarea.hxx:491
-    sal_uInt16 [] pBitmapRanges
-dbaccess/source/ui/browser/genericcontroller.cxx:465
-    sal_Int32 s_nRecursions
-dbaccess/source/ui/inc/TokenWriter.hxx:142
-    sal_Int16 [7] nDefaultFontSize
-dbaccess/source/ui/inc/TokenWriter.hxx:144
-    sal_Int16 [7] nFontSize
-desktop/source/app/langselect.cxx:50
-    rtl::OUString foundLocale
-hwpfilter/source/grammar.cxx:399
+forms/source/inc/frm_strings.hxx:216
+    OUStringLiteral<15> PROPERTY_HIGHLIGHT_COLOR
+forms/source/inc/frm_strings.hxx:217
+    OUStringLiteral<19> PROPERTY_HIGHLIGHT_TEXT_COLOR
+hwpfilter/source/grammar.cxx:307
     int yynerrs
 hwpfilter/source/hbox.h:67
     int boxCount
 hwpfilter/source/ksc5601.h:184
-    hchar [4888] ksc5601_2uni_page4a
-hwpfilter/source/nodes.h:98
+    hchar[4888] ksc5601_2uni_page4a
+hwpfilter/source/nodes.h:95
     std::vector<std::unique_ptr<Node> > nodelist
-i18npool/inc/calendar_hijri.hxx:46
-    double SynMonth
-i18npool/inc/calendar_hijri.hxx:56
-    double SA_TimeZone
-i18npool/inc/calendar_hijri.hxx:59
-    double EveningPeriod
-i18npool/inc/calendar_hijri.hxx:62
-    sal_Int32 [] LeapYear
-idlc/source/idlccompile.cxx:51
-    int yydebug
-include/svx/def3d.hxx:26
-    double EPSILON
-include/svx/xoutbmp.hxx:57
-    GraphicFilter * pGrfFilter
-include/vcl/animate/Animation.hxx:96
-    sal_uLong mnAnimCount
+include/vcl/animate/Animation.hxx:98
+    sal_uLong gAnimationRendererCount
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31
     gpointer gtv_comments_sidebar_parent_class
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:61
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:62
     gpointer gtv_lok_dialog_parent_class
-lotuswordpro/inc/lwptools.hxx:76
-    double INCHT_PER_CM
 sal/osl/unx/system.cxx:164
     void *[3] dummy
-sal/qa/osl/condition/osl_Condition_Const.h:41
-    rtl::OUString aTestCon
-sal/qa/osl/condition/osl_Condition_Const.h:43
-    char [17] pTestString
-sal/qa/osl/file/osl_File_Const.h:60
-    char [11] pBuffer_Number
-sal/qa/osl/file/osl_File_Const.h:61
-    char [1] pBuffer_Blank
-sal/qa/osl/file/osl_File_Const.h:126
-    rtl::OUString aCanURL2
-sal/qa/osl/file/osl_File_Const.h:128
-    rtl::OUString aCanURL3
-sal/qa/osl/file/osl_File_Const.h:141
-    rtl::OUString aRelURL1
-sal/qa/osl/file/osl_File_Const.h:142
-    rtl::OUString aRelURL2
-sal/qa/osl/file/osl_File_Const.h:143
-    rtl::OUString aRelURL3
-sal/qa/osl/file/osl_File_Const.h:157
-    rtl::OUString aSysPathLnk
-sal/qa/osl/file/osl_File_Const.h:158
-    rtl::OUString aFifoSys
-sal/qa/osl/file/osl_File_Const.h:165
-    rtl::OUString aTypeURL1
-sal/qa/osl/file/osl_File_Const.h:166
-    rtl::OUString aTypeURL2
-sal/qa/osl/file/osl_File_Const.h:167
-    rtl::OUString aTypeURL3
-sal/qa/osl/file/osl_File_Const.h:182
-    rtl::OUString aVolURL2
-sal/qa/osl/file/osl_File_Const.h:184
-    rtl::OUString aVolURL3
+sal/qa/osl/file/osl_File_Const.h:63
+    char[11] pBuffer_Number
+sal/qa/osl/file/osl_File_Const.h:64
+    char[1] pBuffer_Blank
+sal/qa/osl/file/osl_File_Const.h:119
+    OUString aRootURL
+sal/qa/osl/file/osl_File_Const.h:129
+    OUString aCanURL2
+sal/qa/osl/file/osl_File_Const.h:131
+    OUString aCanURL3
+sal/qa/osl/file/osl_File_Const.h:132
+    OUString aCanURL4
+sal/qa/osl/file/osl_File_Const.h:139
+    OUString aTmpName7
+sal/qa/osl/file/osl_File_Const.h:144
+    OUString aRelURL1
+sal/qa/osl/file/osl_File_Const.h:145
+    OUString aRelURL2
+sal/qa/osl/file/osl_File_Const.h:146
+    OUString aRelURL3
+sal/qa/osl/file/osl_File_Const.h:148
+    OUString aRelURL5
+sal/qa/osl/file/osl_File_Const.h:149
+    OUString aLnkURL1
+sal/qa/osl/file/osl_File_Const.h:160
+    OUString aSysPathLnk
+sal/qa/osl/file/osl_File_Const.h:161
+    OUString aFifoSys
+sal/qa/osl/file/osl_File_Const.h:168
+    OUString aTypeURL1
+sal/qa/osl/file/osl_File_Const.h:169
+    OUString aTypeURL2
+sal/qa/osl/file/osl_File_Const.h:170
+    OUString aTypeURL3
 sal/qa/osl/file/osl_File_Const.h:185
-    rtl::OUString aVolURL4
-sal/qa/osl/file/osl_File_Const.h:186
-    rtl::OUString aVolURL5
+    OUString aVolURL2
 sal/qa/osl/file/osl_File_Const.h:187
-    rtl::OUString aVolURL6
+    OUString aVolURL3
+sal/qa/osl/file/osl_File_Const.h:188
+    OUString aVolURL4
+sal/qa/osl/file/osl_File_Const.h:189
+    OUString aVolURL5
+sal/qa/osl/file/osl_File_Const.h:190
+    OUString aVolURL6
 sal/qa/osl/security/osl_Security_Const.h:48
-    char [17] pTestString
+    char[17] pTestString
 sal/qa/OStringBuffer/rtl_String_Const.h:275
-    sal_Unicode [3] uTestStr31
+    sal_Unicode[3] uTestStr31
 sal/qa/OStringBuffer/rtl_String_Const.h:276
-    sal_Unicode [4] uTestStr32
+    sal_Unicode[4] uTestStr32
 sal/qa/OStringBuffer/rtl_String_Const.h:297
-    sal_Int32 [5] kInt32MaxNums
+    sal_Int32[5] kInt32MaxNums
 sal/qa/OStringBuffer/rtl_String_Const.h:306
-    sal_Int64 [7] kInt64MaxNums
+    sal_Int64[7] kInt64MaxNums
 sal/qa/OStringBuffer/rtl_String_Const.h:335
-    double [24] expValDouble
+    double[24] expValDouble
 sal/qa/OStringBuffer/rtl_String_Const.h:345
-    float [22] expValFloat
+    float[22] expValFloat
 sal/qa/OStringBuffer/rtl_String_Const.h:355
-    sal_Unicode [15] expValChar
+    sal_Unicode[15] expValChar
 sal/qa/OStringBuffer/rtl_String_Const.h:364
-    sal_Unicode [6] input1Default
+    sal_Unicode[6] input1Default
 sal/qa/OStringBuffer/rtl_String_Const.h:368
-    sal_Int32 [6] input2Default
+    sal_Int32[6] input2Default
 sal/qa/OStringBuffer/rtl_String_Const.h:372
-    sal_Int32 [6] expValDefault
+    sal_Int32[6] expValDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:378
-    sal_Unicode [10] input1Normal
+    sal_Unicode[10] input1Normal
 sal/qa/OStringBuffer/rtl_String_Const.h:382
-    sal_Int32 [10] input2Normal
+    sal_Int32[10] input2Normal
 sal/qa/OStringBuffer/rtl_String_Const.h:386
-    sal_Int32 [10] expValNormal
+    sal_Int32[10] expValNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:392
-    sal_Unicode [5] input1lastDefault
+    sal_Unicode[5] input1lastDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:396
-    sal_Int32 [5] input2lastDefault
+    sal_Int32[5] input2lastDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:400
-    sal_Int32 [5] expVallastDefault
+    sal_Int32[5] expVallastDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:406
-    sal_Unicode [8] input1lastNormal
+    sal_Unicode[8] input1lastNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:410
-    sal_Int32 [8] input2lastNormal
+    sal_Int32[8] input2lastNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:414
-    sal_Int32 [8] expVallastNormal
+    sal_Int32[8] expVallastNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:420
-    sal_Int32 [6] input2StrDefault
+    sal_Int32[6] input2StrDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:424
-    sal_Int32 [6] expValStrDefault
+    sal_Int32[6] expValStrDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:430
-    sal_Int32 [9] input2StrNormal
+    sal_Int32[9] input2StrNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:434
-    sal_Int32 [9] expValStrNormal
+    sal_Int32[9] expValStrNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:440
-    sal_Int32 [6] input2StrLastDefault
+    sal_Int32[6] input2StrLastDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:444
-    sal_Int32 [6] expValStrLastDefault
+    sal_Int32[6] expValStrLastDefault
 sal/qa/OStringBuffer/rtl_String_Const.h:450
-    sal_Int32 [12] input2StrLastNormal
+    sal_Int32[12] input2StrLastNormal
 sal/qa/OStringBuffer/rtl_String_Const.h:454
-    sal_Int32 [12] expValStrLastNormal
-sal/qa/rtl/strings/test_oustring_stringliterals.cxx:47
-    rtlunittest::OUStringLiteral dummy
-sc/inc/global.hxx:514
-    std::unique_ptr<SvxBrushItem> xEmbeddedBrushItem
-sc/source/core/data/drwlayer.cxx:80
+    sal_Int32[12] expValStrLastNormal
+sc/source/core/data/drwlayer.cxx:102
     E3dObjFactory * pF3d
-sc/source/core/opencl/opinlinefun_finacial.cxx:43
-    std::string GetPMTDecl
-sc/source/core/opencl/opinlinefun_finacial.cxx:46
-    std::string GetPMT
-sc/source/core/opencl/opinlinefun_finacial.cxx:309
-    std::string ScaDate2Decl
-sc/source/core/opencl/opinlinefun_finacial.cxx:313
-    std::string ScaDate2
-sc/source/filter/inc/imp_op.hxx:88
-    double fExcToTwips
-sc/source/filter/inc/xlstream.hxx:33
-    ErrCode EXC_ENCR_ERROR_WRONG_PASS
-sc/source/ui/inc/content.hxx:63
-    _Bool bIsInDrag
-sc/source/ui/inc/viewfunc.hxx:376
-    _Bool bPasteIsDrop
-sd/source/ui/inc/framework/FrameworkHelper.hxx:64
-    rtl::OUString msSidebarPaneURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:83
-    rtl::OUString msAllMasterPagesTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:84
-    rtl::OUString msRecentMasterPagesTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:85
-    rtl::OUString msUsedMasterPagesTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:86
-    rtl::OUString msLayoutTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:87
-    rtl::OUString msTableDesignPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:88
-    rtl::OUString msCustomAnimationTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:89
-    rtl::OUString msSlideTransitionTaskPanelURL
-sd/source/ui/inc/framework/FrameworkHelper.hxx:101
-    rtl::OUStringLiteral msModuleControllerService
-sd/source/ui/inc/framework/FrameworkHelper.hxx:102
-    rtl::OUStringLiteral msConfigurationControllerService
-sd/source/ui/inc/unokywds.hxx:26
-    char [6] sUNO_PseudoSheet_Title
-sd/source/ui/inc/unokywds.hxx:27
-    char [9] sUNO_PseudoSheet_SubTitle
-sd/source/ui/inc/unokywds.hxx:29
-    char [18] sUNO_PseudoSheet_Background_Objects
-sd/source/ui/inc/unokywds.hxx:30
-    char [6] sUNO_PseudoSheet_Notes
-sd/source/ui/inc/unokywds.hxx:31
-    char [9] sUNO_PseudoSheet_Outline1
-sd/source/ui/inc/unokywds.hxx:32
-    char [9] sUNO_PseudoSheet_Outline2
-sd/source/ui/inc/unokywds.hxx:33
-    char [9] sUNO_PseudoSheet_Outline3
-sd/source/ui/inc/unokywds.hxx:34
-    char [9] sUNO_PseudoSheet_Outline4
-sd/source/ui/inc/unokywds.hxx:35
-    char [9] sUNO_PseudoSheet_Outline5
-sd/source/ui/inc/unokywds.hxx:36
-    char [9] sUNO_PseudoSheet_Outline6
-sd/source/ui/inc/unokywds.hxx:37
-    char [9] sUNO_PseudoSheet_Outline7
-sd/source/ui/inc/unokywds.hxx:38
-    char [9] sUNO_PseudoSheet_Outline8
-sd/source/ui/inc/unokywds.hxx:39
-    char [9] sUNO_PseudoSheet_Outline9
-sd/source/ui/inc/unokywds.hxx:49
-    char [6] sUNO_shape_style
-sd/source/ui/inc/unokywds.hxx:50
-    char [10] sUNO_shape_layername
-sd/source/ui/inc/unokywds.hxx:51
-    char [7] sUNO_shape_zorder
-sd/source/ui/inc/unokywds.hxx:54
-    char [31] sUNO_Service_StyleFamily
-sd/source/ui/inc/unokywds.hxx:55
-    char [33] sUNO_Service_StyleFamilies
-sd/source/ui/inc/unokywds.hxx:56
-    char [25] sUNO_Service_Style
-sd/source/ui/inc/unokywds.hxx:58
-    char [36] sUNO_Service_LineProperties
-sd/source/ui/inc/unokywds.hxx:59
-    char [39] sUNO_Service_ParagraphProperties
-sd/source/ui/inc/unokywds.hxx:60
-    char [39] sUNO_Service_CharacterProperties
-sd/source/ui/inc/unokywds.hxx:61
-    char [26] sUNO_Service_Text
-sd/source/ui/inc/unokywds.hxx:62
-    char [36] sUNO_Service_TextProperties
-sd/source/ui/inc/unokywds.hxx:63
-    char [38] sUNO_Service_ShadowProperties
-sd/source/ui/inc/unokywds.hxx:64
-    char [41] sUNO_Service_ConnectorProperties
-sd/source/ui/inc/unokywds.hxx:65
-    char [39] sUNO_Service_MeasureProperties
-sd/source/ui/inc/unokywds.hxx:67
-    char [40] sUNO_Service_GraphicObjectShape
-sd/source/ui/inc/unokywds.hxx:74
-    char [11] sUNO_Prop_Background
-sd/source/ui/inc/unokywds.hxx:78
-    char [7] sUNO_Prop_Aspect
-sd/source/ui/inc/unokywds.hxx:100
-    char [12] sUNO_View_IsQuickEdit
-sd/source/ui/inc/unokywds.hxx:103
-    char [15] sUNO_View_IsDragWithCopy
-sd/source/ui/inc/unokywds.hxx:105
-    char [9] sUNO_View_DrawMode
-sd/source/ui/inc/unokywds.hxx:106
-    char [16] sUNO_View_PreviewDrawMode
-sd/source/ui/inc/unokywds.hxx:107
-    char [24] sUNO_View_IsShowPreviewInPageMode
-sd/source/ui/inc/unokywds.hxx:108
-    char [30] sUNO_View_IsShowPreviewInMasterPageMode
-sd/source/ui/inc/unokywds.hxx:109
-    char [28] sUNO_View_SetShowPreviewInOutlineMode
-sd/source/ui/inc/unokywds.hxx:114
-    char [8] sUNO_View_VisArea
-sd/source/ui/inc/unokywds.hxx:123
-    char [19] sUNO_View_IsSnapLinesVisible
-sd/source/ui/inc/unokywds.hxx:124
-    char [14] sUNO_View_IsDragStripes
-sd/source/ui/inc/unokywds.hxx:127
-    char [23] sUNO_View_IsMarkedHitMovesAlways
-sd/source/ui/inc/unokywds.hxx:130
-    char [12] sUNO_View_IsLineDraft
-sd/source/ui/inc/unokywds.hxx:131
-    char [12] sUNO_View_IsFillDraft
-sd/source/ui/inc/unokywds.hxx:132
-    char [12] sUNO_View_IsTextDraft
-sd/source/ui/inc/unokywds.hxx:133
-    char [12] sUNO_View_IsGrafDraft
-sdext/source/presenter/PresenterHelper.hxx:34
-    rtl::OUString msCenterPaneURL
-sdext/source/presenter/PresenterHelper.hxx:38
-    rtl::OUString msPresenterScreenURL
-sdext/source/presenter/PresenterHelper.hxx:39
-    rtl::OUString msSlideSorterURL
-sdext/source/presenter/PresenterPaneFactory.hxx:57
-    rtl::OUStringLiteral msHelpPaneURL
-sdext/source/presenter/PresenterPaneFactory.hxx:58
-    rtl::OUStringLiteral msOverlayPaneURL
-sfx2/source/appl/appdata.cxx:48
+scripting/source/provider/ActiveMSPList.cxx:73
+    NonDocMSPCreator theCreator
+sd/inc/bitmaps.hlst:212
+    OUStringLiteral<31> BMP_PREV_SLIDE_MOUSE_OVER
+sd/inc/bitmaps.hlst:214
+    OUStringLiteral<31> BMP_NEXT_SLIDE_MOUSE_OVER
+sd/inc/bitmaps.hlst:216
+    OUStringLiteral<35> BMP_MENU_SLIDE_MOUSE_OVER
+sfx2/source/appl/appdata.cxx:44
     BasicDLL * pBasic
-sfx2/source/appl/shutdownicon.hxx:107
+sfx2/source/appl/shutdownicon.hxx:53
+    OUStringLiteral<24> WRITER_URL
+sfx2/source/appl/shutdownicon.hxx:54
+    OUStringLiteral<22> CALC_URL
+sfx2/source/appl/shutdownicon.hxx:55
+    OUStringLiteral<25> IMPRESS_URL
+sfx2/source/appl/shutdownicon.hxx:56
+    OUStringLiteral<35> IMPRESS_WIZARD_URL
+sfx2/source/appl/shutdownicon.hxx:57
+    OUStringLiteral<22> DRAW_URL
+sfx2/source/appl/shutdownicon.hxx:58
+    OUStringLiteral<22> MATH_URL
+sfx2/source/appl/shutdownicon.hxx:59
+    OUStringLiteral<38> BASE_URL
+sfx2/source/appl/shutdownicon.hxx:60
+    OUStringLiteral<21> STARTMODULE_URL
+sfx2/source/appl/shutdownicon.hxx:106
     _Bool bModalMode
-soltools/cpp/cpp.h:246
+soltools/cpp/cpp.h:245
     Nlist * kwdefined
-svl/source/items/style.cxx:61
-    (anonymous namespace)::DbgStyleSheetReferences aDbgStyleSheetReferences
-svtools/source/config/printoptions.cxx:60
-    SvtPrintOptions_Impl * pPrinterOptionsDataContainer
-svtools/source/config/printoptions.cxx:61
-    SvtPrintOptions_Impl * pPrintFileOptionsDataContainer
-sw/source/core/inc/swfont.hxx:989
+starmath/inc/mathml/attribute.hxx:192
+    SmMlAttributePos[1] MlAttributeListEmpty
+starmath/inc/mathml/attribute.hxx:193
+    SmMlAttributePos[1] MlAttributeListMath
+starmath/inc/mathml/mathmlMo.hxx:107
+    std::vector<moOperatorData> moOperatorDataDictionary
+starmath/inc/mathml/starmathdatabase.hxx:189
+    Color COL_SM_DIV_BLACK
+starmath/inc/mathml/starmathdatabase.hxx:190
+    Color COL_SM_DIV_BLUE
+svl/source/items/style.cxx:60
+    DbgStyleSheetReferences aDbgStyleSheetReferences
+sw/inc/doc.hxx:343
+    SwDoc * s_pLast
+sw/inc/unoprnms.hxx:211
+    OUStringLiteral<19> UNO_NAME_REGISTER_MODE_ACTIVE
+sw/inc/unoprnms.hxx:333
+    OUStringLiteral<16> UNO_NAME_STATISTIC_TYPE_ID
+sw/source/core/inc/rootfrm.hxx:111
+    SwRootFrame * s_pLast
+sw/source/core/inc/swfont.hxx:999
     SvStatistics g_SvStat
-sw/source/filter/html/css1kywd.hxx:27
-    char *const sCSS1_import
-sw/source/filter/html/css1kywd.hxx:31
-    char *const sCSS1_important
-sw/source/filter/html/css1kywd.hxx:42
-    char *const sCSS1_rgb
-sw/source/filter/html/css1kywd.hxx:50
-    char *const sCSS1_UNIT_em
-sw/source/filter/html/css1kywd.hxx:51
-    char *const sCSS1_UNIT_ex
-sw/source/filter/html/css1kywd.hxx:89
-    char *const sCSS1_PV_lighter
-sw/source/filter/html/css1kywd.hxx:90
-    char *const sCSS1_PV_bolder
-sw/source/filter/html/css1kywd.hxx:94
-    char *const sCSS1_PV_xx_small
-sw/source/filter/html/css1kywd.hxx:95
-    char *const sCSS1_PV_x_small
-sw/source/filter/html/css1kywd.hxx:96
-    char *const sCSS1_PV_small
-sw/source/filter/html/css1kywd.hxx:97
-    char *const sCSS1_PV_medium
-sw/source/filter/html/css1kywd.hxx:98
-    char *const sCSS1_PV_large
-sw/source/filter/html/css1kywd.hxx:99
-    char *const sCSS1_PV_x_large
-sw/source/filter/html/css1kywd.hxx:100
-    char *const sCSS1_PV_xx_large
-sw/source/filter/html/css1kywd.hxx:102
-    char *const sCSS1_PV_larger
-sw/source/filter/html/css1kywd.hxx:103
-    char *const sCSS1_PV_smaller
-sw/source/filter/html/css1kywd.hxx:117
-    char *const sCSS1_PV_repeat_x
-sw/source/filter/html/css1kywd.hxx:118
-    char *const sCSS1_PV_repeat_y
-sw/source/filter/html/css1kywd.hxx:181
-    char *const sCSS1_PV_thin
-sw/source/filter/html/css1kywd.hxx:183
-    char *const sCSS1_PV_thick
-sw/source/filter/html/css1kywd.hxx:209
-    char *const sCSS1_PV_relative
-sw/source/filter/html/css1kywd.hxx:210
-    char *const sCSS1_PV_static
-sw/source/filter/html/css1kywd.hxx:237
-    char *const sCSS1_class_abs_pos
-sw/source/filter/ww8/ww8par6.cxx:1069
-    sal_uInt16 [2] nLef
-sw/source/filter/ww8/ww8par6.cxx:1070
-    sal_uInt16 [2] nRig
-sw/source/filter/ww8/ww8par6.cxx:1121
-    sal_uInt16 [2] nTop
-sw/source/filter/ww8/ww8par6.cxx:1122
-    sal_uInt16 [2] nBot
-sw/source/filter/ww8/ww8scan.hxx:50
-    char [8] aTextBox
-vcl/inc/unx/gtk/gtkgdi.hxx:166
-    GtkStyleContext * mpSpinEntryStyle
+sw/source/filter/ww8/ww8par6.cxx:1091
+    sal_uInt16[2] nLef
+sw/source/filter/ww8/ww8par6.cxx:1092
+    sal_uInt16[2] nRig
+sw/source/filter/ww8/ww8par6.cxx:1144
+    sal_uInt16[2] nTop
+sw/source/filter/ww8/ww8par6.cxx:1145
+    sal_uInt16[2] nBot
+unotools/source/config/eventcfg.cxx:376
+    rtl::Reference<GlobalEventConfig> createImpl
+vcl/inc/qt5/QtX11Support.hxx:19
+    xcb_atom_t m_nWindowGroupAtom
 vcl/qa/cppunit/timer.cxx:54
-    (anonymous namespace)::WatchDog * aWatchDog
-vcl/unx/gtk3/a11y/gtk3atkutil.cxx:508
-    (anonymous namespace)::WindowList g_aWindowList
-xmloff/source/chart/XMLSymbolImageContext.cxx:46
-    SvXMLTokenMapEntry [5] aSymbolImageAttrTokenMap
-xmloff/source/draw/sdpropls.hxx:40
-    XMLPropertyMapEntry [] aXMLSDPresPageProps_onlyHeadersFooter
-xmloff/source/style/DashStyle.cxx:58
-    SvXMLTokenMapEntry [9] aDashStyleAttrTokenMap
-xmloff/source/style/XMLBackgroundImageContext.cxx:174
-    SvXMLTokenMap aTokenMap
-xmloff/source/style/xmlstyle.cxx:62
-    SvXMLTokenMapEntry [16] aStyleStylesElemTokenMap
-xmloff/source/style/xmltabi.cxx:84
-    SvXMLTokenMap aTokenMap
-xmloff/source/text/txtdropi.cxx:65
-    SvXMLTokenMap aTokenMap
-xmloff/source/text/txtimp.cxx:414
-    SvXMLTokenMapEntry [9] aTextMasterPageElemTokenMap
+    WatchDog * aWatchDog
+vcl/unx/gtk3/a11y/atkutil.cxx:435
+    WindowList g_aWindowList
+xmloff/inc/xmlprop.hxx:583
+    OUStringLiteral<14> PROP_SortByYValues
+xmloff/source/forms/strings.hxx:136
+    OUStringLiteral<11> PROPERTY_SCALE_IMAGE
diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx
index a25b016c6799..cf4853f03b2b 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <fstream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
 #include "check.hxx"
 
@@ -351,8 +352,7 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
     if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("IMapCompat").GlobalNamespace())
         return;
     // passing data to gtk API and I can't figure out the types
-    if (fn == SRCDIR "/vcl/unx/gtk3/gtk3gtkdata.cxx"
-        || fn == SRCDIR "/vcl/unx/gtk/gtkdata.cxx")
+    if (fn == SRCDIR "/vcl/unx/gtk3/gtkdata.cxx")
         return;
     // sometimes this stuff is held by tools::SvRef, sometimes by std::unique_ptr...
     if (fn == SRCDIR "/sot/source/unoolestorage/xolesimplestorage.cxx")
@@ -463,9 +463,6 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
     // complicated
     if (fn == SRCDIR "/svx/source/sdr/contact/objectcontact.cxx")
         return;
-    // memory management in this module is a mess
-    if (fn == SRCDIR "/idlc/source/aststack.cxx")
-        return;
     // complicated
     if (fn == SRCDIR "/cui/source/customize/cfg.cxx")
         return;
@@ -590,12 +587,12 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
     report(
          DiagnosticsEngine::Warning,
          "call to delete on a var, should be using std::unique_ptr",
-         compat::getBeginLoc(deleteExpr))
+         deleteExpr->getBeginLoc())
          << deleteExpr->getSourceRange();
     report(
          DiagnosticsEngine::Note,
          "var is here",
-         compat::getBeginLoc(varDecl))
+         varDecl->getBeginLoc())
          << varDecl->getSourceRange();
 }
 
@@ -663,16 +660,12 @@ void UseUniquePtr::CheckLoopDelete(const FunctionDecl* functionDecl, const CXXDe
                     auto init = iterVarDecl->getInit();
                     if (init)
                     {
-                        init = compat::IgnoreImplicit(init);
-                        if (!compat::CPlusPlus17(compiler.getLangOpts()))
-                            if (auto x = dyn_cast<CXXConstructExpr>(init))
-                                if (x->isElidable())
-                                    init = compat::IgnoreImplicit(x->getArg(0));
+                        init = init->IgnoreImplicit();
                         if (auto x = dyn_cast<CXXConstructExpr>(init))
                             if (x->getNumArgs() == 1
                                 || (x->getNumArgs() >= 2 && isa<CXXDefaultArgExpr>(x->getArg(1))))
                             {
-                                init = compat::IgnoreImplicit(x->getArg(0));
+                                init = x->getArg(0)->IgnoreImplicit();
                             }
                         if (auto x = dyn_cast<CXXMemberCallExpr>(init))
                             init = x->getImplicitObjectArgument()->IgnoreParenImpCasts();
@@ -732,9 +725,6 @@ void UseUniquePtr::CheckLoopDelete(const FunctionDecl* functionDecl, const CXXDe
         if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qa/"))
             return;
         // linked list
-        if (fn == SRCDIR "/registry/source/reflwrit.cxx")
-            return;
-        // linked list
         if (fn == SRCDIR "/tools/source/generic/config.cxx")
             return;
         // linked lists
@@ -821,12 +811,12 @@ void UseUniquePtr::CheckLoopDelete(const FunctionDecl* functionDecl, const CXXDe
         report(
             DiagnosticsEngine::Warning,
             "loopdelete: rather manage this var with std::some_container<std::unique_ptr<T>>",
-            compat::getBeginLoc(deleteExpr))
+            deleteExpr->getBeginLoc())
             << deleteExpr->getSourceRange();
         report(
             DiagnosticsEngine::Note,
             "var is here",
-            compat::getBeginLoc(varDecl))
+            varDecl->getBeginLoc())
             << varDecl->getSourceRange();
     }
 }
@@ -852,9 +842,6 @@ void UseUniquePtr::CheckCXXForRangeStmt(const FunctionDecl* functionDecl, const
         if (!fieldDecl)
             return;
 
-        // appears to just randomly leak stuff, and it involves some lex/yacc stuff
-        if (fn == SRCDIR "/idlc/source/aststack.cxx")
-            return;
         // complicated
         if (fn == SRCDIR "/vcl/source/gdi/print.cxx")
             return;
@@ -909,12 +896,12 @@ void UseUniquePtr::CheckCXXForRangeStmt(const FunctionDecl* functionDecl, const
         report(
             DiagnosticsEngine::Warning,
             "rather manage this var with std::some_container<std::unique_ptr<T>>",
-            compat::getBeginLoc(deleteExpr))
+            deleteExpr->getBeginLoc())
             << deleteExpr->getSourceRange();
         report(
             DiagnosticsEngine::Note,
             "var is here",
-            compat::getBeginLoc(varDecl))
+            varDecl->getBeginLoc())
             << varDecl->getSourceRange();
     }
 }
@@ -993,12 +980,12 @@ void UseUniquePtr::CheckMemberDeleteExpr(const FunctionDecl* functionDecl, const
     report(
         DiagnosticsEngine::Warning,
         message,
-        compat::getBeginLoc(deleteExpr))
+        deleteExpr->getBeginLoc())
         << deleteExpr->getSourceRange();
     report(
         DiagnosticsEngine::Note,
         "member is here",
-        compat::getBeginLoc(fieldDecl))
+        fieldDecl->getBeginLoc())
         << fieldDecl->getSourceRange();
 }
 
@@ -1096,9 +1083,6 @@ bool UseUniquePtr::TraverseConstructorInitializer(CXXCtorInitializer * ctorInit)
         return true;
 
     StringRef fn = getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(ctorInit->getSourceLocation()));
-    // don't feel like fiddling with the yacc parser
-    if (loplugin::hasPathnamePrefix(fn, SRCDIR "/idlc/"))
-        return true;
     // cannot change URE
     if (loplugin::hasPathnamePrefix(fn, SRCDIR "/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx"))
         return true;
@@ -1118,7 +1102,7 @@ bool UseUniquePtr::VisitCXXDeleteExpr(const CXXDeleteExpr* deleteExpr)
         return true;
     if (ignoreLocation(mpCurrentFunctionDecl))
         return true;
-    if (isInUnoIncludeFile(compat::getBeginLoc(mpCurrentFunctionDecl->getCanonicalDecl())))
+    if (isInUnoIncludeFile(mpCurrentFunctionDecl->getCanonicalDecl()->getBeginLoc()))
         return true;
     auto declRefExpr = dyn_cast<DeclRefExpr>(deleteExpr->getArgument()->IgnoreParenImpCasts()->IgnoreImplicit());
     if (!declRefExpr)
@@ -1299,7 +1283,7 @@ void UseUniquePtr::CheckDeleteParmVar(const CXXDeleteExpr* deleteExpr, const Par
     report(
         DiagnosticsEngine::Warning,
         "calling delete on a pointer param, should be either allowlisted or simplified",
-        compat::getBeginLoc(deleteExpr))
+        deleteExpr->getBeginLoc())
         << deleteExpr->getSourceRange();
 }
 
diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx
index 61805ff5ad03..422041688a78 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -13,6 +13,8 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
+#include "config_clang.h"
 #include "clang/AST/CXXInheritance.h"
 
 // Final goal: Checker for VCL widget references. Makes sure that VCL Window subclasses are properly referenced counted and dispose()'ed.
@@ -189,7 +191,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
         report(
             DiagnosticsEngine::Warning,
             BASE_REF_COUNTED_CLASS " subclass with VclPtr field must call disposeOnce() from its destructor",
-            compat::getBeginLoc(pCXXDestructorDecl))
+            pCXXDestructorDecl->getBeginLoc())
           << pCXXDestructorDecl->getSourceRange();
         return true;
     }
@@ -207,7 +209,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
             //  assert(true), ...;
             //
             auto skip = false;
-            for (auto loc = compat::getBeginLoc(*i);
+            for (auto loc = (*i)->getBeginLoc();
                  compiler.getSourceManager().isMacroBodyExpansion(loc);
                  loc = compiler.getSourceManager().getImmediateMacroCallerLoc(
                      loc))
@@ -238,7 +240,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
     }
     if (!bOk) {
         SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(
-                              compat::getBeginLoc(pCXXDestructorDecl));
+                              pCXXDestructorDecl->getBeginLoc());
         StringRef filename = getFilenameOfLocation(spellingLocation);
         if (   !(loplugin::isSamePathname(filename, SRCDIR "/vcl/source/window/window.cxx"))
             && !(loplugin::isSamePathname(filename, SRCDIR "/vcl/source/gdi/virdev.cxx"))
@@ -248,7 +250,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
             report(
                 DiagnosticsEngine::Warning,
                 BASE_REF_COUNTED_CLASS " subclass should have nothing in its destructor but a call to disposeOnce()",
-                compat::getBeginLoc(pCXXDestructorDecl))
+                pCXXDestructorDecl->getBeginLoc())
               << pCXXDestructorDecl->getSourceRange();
         }
     }
@@ -264,7 +266,7 @@ bool VCLWidgets::VisitBinaryOperator(const BinaryOperator * binaryOperator)
         return true;
     }
     SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(
-                          compat::getBeginLoc(binaryOperator));
+                          binaryOperator->getBeginLoc());
     checkAssignmentForVclPtrToRawConversion(spellingLocation, binaryOperator->getLHS()->getType().getTypePtr(), binaryOperator->getRHS());
     return true;
 }
@@ -357,7 +359,7 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
         return true;
     }
     SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(
-                          compat::getBeginLoc(pVarDecl));
+                          pVarDecl->getBeginLoc());
     if (pVarDecl->getInit()) {
         checkAssignmentForVclPtrToRawConversion(spellingLocation, pVarDecl->getType().getTypePtr(), pVarDecl->getInit());
     }
@@ -414,7 +416,7 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * fieldDecl) {
         return true;
     }
     StringRef aFileName = getFilenameOfLocation(
-        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(fieldDecl)));
+        compiler.getSourceManager().getSpellingLoc(fieldDecl->getBeginLoc()));
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/vcl/vclptr.hxx"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/rtl/ref.hxx"))
@@ -596,11 +598,13 @@ bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* functionDecl )
         // check the last thing that the dispose() method does, is to call into the superclass dispose method
         if (loplugin::DeclCheck(functionDecl).Function("dispose")) {
             if (!isDisposeCallingSuperclassDispose(pMethodDecl)) {
-                report(
-                    DiagnosticsEngine::Warning,
-                    BASE_REF_COUNTED_CLASS " subclass dispose() function MUST call dispose() of its superclass as the last thing it does",
-                    compat::getBeginLoc(functionDecl))
-                  << functionDecl->getSourceRange();
+                // We specifically have to clear a member variable AFTER calling super::dispose() here, unfortunately
+                if (!loplugin::DeclCheck(pMethodDecl->getParent()).Class("WindowOutputDevice"))
+                    report(
+                        DiagnosticsEngine::Warning,
+                        BASE_REF_COUNTED_CLASS " subclass dispose() function MUST call dispose() of its superclass as the last thing it does",
+                        functionDecl->getBeginLoc())
+                      << functionDecl->getSourceRange();
            }
         }
     }
@@ -653,7 +657,7 @@ bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* functionDecl )
                 report(
                     DiagnosticsEngine::Warning,
                     aMessage,
-                    compat::getBeginLoc(functionDecl))
+                    functionDecl->getBeginLoc())
                   << functionDecl->getSourceRange();
            }
        }
@@ -670,14 +674,14 @@ bool VCLWidgets::VisitCXXDeleteExpr(const CXXDeleteExpr *pCXXDeleteExpr)
     const CXXRecordDecl *pPointee = pCXXDeleteExpr->getArgument()->getType()->getPointeeCXXRecordDecl();
     if (pPointee && isDerivedFromVclReferenceBase(pPointee)) {
         SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(
-                              compat::getBeginLoc(pCXXDeleteExpr));
+                              pCXXDeleteExpr->getBeginLoc());
         StringRef filename = getFilenameOfLocation(spellingLocation);
         if ( !(loplugin::isSamePathname(filename, SRCDIR "/include/vcl/vclreferencebase.hxx")))
         {
             report(
                 DiagnosticsEngine::Warning,
                 "calling delete on instance of " BASE_REF_COUNTED_CLASS " subclass, must rather call disposeAndClear()",
-                compat::getBeginLoc(pCXXDeleteExpr))
+                pCXXDeleteExpr->getBeginLoc())
               << pCXXDeleteExpr->getSourceRange();
         }
     }
@@ -696,7 +700,7 @@ bool VCLWidgets::VisitCXXDeleteExpr(const CXXDeleteExpr *pCXXDeleteExpr)
     report(
         DiagnosticsEngine::Warning,
         "calling delete on instance of VclPtr, must rather call disposeAndClear()",
-        compat::getBeginLoc(pCXXDeleteExpr))
+        pCXXDeleteExpr->getBeginLoc())
      << pCXXDeleteExpr->getSourceRange();
     return true;
 }
@@ -846,14 +850,14 @@ bool VCLWidgets::VisitCXXConstructExpr( const CXXConstructExpr* constructExpr )
     if (ignoreLocation(constructExpr)) {
         return true;
     }
-    if (constructExpr->getConstructionKind() != CXXConstructExpr::CK_Complete) {
+    if (constructExpr->getConstructionKind() != compat::CXXConstructionKind::Complete) {
         return true;
     }
     const CXXConstructorDecl* pConstructorDecl = constructExpr->getConstructor();
     const CXXRecordDecl* recordDecl = pConstructorDecl->getParent();
     if (isDerivedFromVclReferenceBase(recordDecl)) {
         StringRef aFileName = getFilenameOfLocation(
-            compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(constructExpr)));
+            compiler.getSourceManager().getSpellingLoc(constructExpr->getBeginLoc()));
         if (!loplugin::isSamePathname(aFileName, SRCDIR "/include/vcl/vclptr.hxx")) {
             report(
                 DiagnosticsEngine::Warning,
@@ -868,4 +872,6 @@ loplugin::Plugin::Registration< VCLWidgets > vclwidgets("vclwidgets");
 
 }
 
+// Cannot be shared, uses TraverseStmt().
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/virtualdead.cxx b/compilerplugins/clang/virtualdead.cxx
index 330085b18781..e3cdf2b45018 100644
--- a/compilerplugins/clang/virtualdead.cxx
+++ b/compilerplugins/clang/virtualdead.cxx
@@ -9,6 +9,7 @@
 
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
 
 #include <cassert>
 #include <string>
@@ -23,9 +24,9 @@ Look for virtual methods where all of the overrides either
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='VirtualDead' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='VirtualDead' check
   $ ./compilerplugins/clang/VirtualDead.py
-  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done
+  $ for dir in *; do make FORCE_COMPILE=all UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done
 
 Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
 to get it to work :-)
@@ -67,6 +68,8 @@ public:
 
     virtual void run() override
     {
+        handler.enableTreeWideAnalysisMode();
+
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
@@ -116,8 +119,6 @@ std::string niceName(const CXXMethodDecl* cxxMethodDecl)
 
 bool VirtualDead::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
 {
-    if (ignoreLocation(methodDecl))
-        return true;
     if (!methodDecl->isVirtual() || methodDecl->isDeleted())
         return true;
     if (isa<CXXDestructorDecl>(methodDecl))
@@ -204,7 +205,7 @@ std::string VirtualDead::getCallValue(const Expr* arg)
     APSInt x1;
     if (compat::EvaluateAsInt(arg, x1, compiler.getASTContext()))
     {
-        return x1.toString(10);
+        return compat::toString(x1, 10);
     }
     if (isa<CXXNullPtrLiteralExpr>(arg))
     {
@@ -241,8 +242,8 @@ std::string VirtualDead::getCallValue(const Expr* arg)
     // Get the expression contents.
     // This helps us find params which are always initialised with something like "OUString()".
     SourceManager& SM = compiler.getSourceManager();
-    SourceLocation startLoc = compat::getBeginLoc(arg);
-    SourceLocation endLoc = compat::getEndLoc(arg);
+    SourceLocation startLoc = arg->getBeginLoc();
+    SourceLocation endLoc = arg->getEndLoc();
     const char* p1 = SM.getCharacterData(startLoc);
     const char* p2 = SM.getCharacterData(endLoc);
     if (!p1 || !p2 || (p2 - p1) < 0 || (p2 - p1) > 40)
@@ -261,12 +262,6 @@ std::string VirtualDead::getCallValue(const Expr* arg)
         s = "\"\"";
     else if (s == "OString()")
         s = "\"\"";
-    else if (s == "aEmptyOUStr") //sw
-        s = "\"\"";
-    else if (s == "EMPTY_OUSTRING") //sc
-        s = "\"\"";
-    else if (s == "GetEmptyOUString()") //sc
-        s = "\"\"";
 
     if (s[0] == '"' || s[0] == '\'')
         return s;
diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py
index e481127af75b..e653c7e23832 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -1,6 +1,5 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
-import sys
 import re
 import io
 
@@ -15,7 +14,7 @@ def normalizeTypeParams( line ):
     return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
 
 # reading as binary (since we known it is pure ascii) is much faster than reading as unicode
-with io.open("workdir/loplugin.virtualdead.log", "rb", buffering=1024*1024) as txt:
+with io.open("workdir/loplugin.virtualdead.log", "r", encoding="ascii", errors="ignore", buffering=1024*1024) as txt:
     for line in txt:
         try:
             tokens = line.strip().split("\t")
@@ -36,11 +35,11 @@ with io.open("workdir/loplugin.virtualdead.log", "rb", buffering=1024*1024) as t
             else:
                 print( "unknown line: " + line)
         except IndexError:
-            print "problem with line " + line.strip()
+            print("problem with line " + line.strip())
             raise
 
 tmp1list = list()
-for callInfo, callValues in callDict.iteritems():
+for callInfo, callValues in iter(callDict.items()):
     nameAndParams = callInfo[1]
     if len(callValues) != 1:
         continue
@@ -63,6 +62,7 @@ for callInfo, callValues in callDict.iteritems():
     if srcloc.startswith("Core/"): continue
     if srcloc.startswith("/Qt"): continue
     if srcloc.startswith("Qt"): continue
+    if srcloc.startswith("64-"): continue
     functionSig = callInfo[0]
     tmp1list.append((srcloc, functionSig, callValue))
 
@@ -88,7 +88,7 @@ for paramInfo in paramSet:
         tmp2dict[name] = bitfield
     else:
         tmp2dict[name] = merge_bitfield(tmp2dict[name], bitfield)
-for name, bitfield in tmp2dict.iteritems():
+for name, bitfield in iter(tmp2dict.items()):
     srcloc = definitionToSourceLocationMap[name]
     # ignore Qt stuff
     if srcloc.startswith("Gui/"): continue
@@ -96,10 +96,11 @@ for name, bitfield in tmp2dict.iteritems():
     if srcloc.startswith("Core/"): continue
     if srcloc.startswith("/Qt"): continue
     if srcloc.startswith("Qt"): continue
+    if srcloc.startswith("64-"): continue
     # ignore external stuff
     if srcloc.startswith("workdir/"): continue
     # referenced by generated code in workdir/
-    if srcloc.startswith("writerfilter/source/ooxml/OOXMLFactory.hxx"): continue
+    if srcloc.startswith("sw/source/writerfilter/ooxml/OOXMLFactory.hxx"): continue
     if "0" in bitfield:
         tmp2list.append((srcloc, name, bitfield))
 
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 8e2aa00ce120..0495b8dbc3ae 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -10,7 +10,7 @@ basic/source/comp/codegen.cxx:540
 canvas/inc/base/bitmapcanvasbase.hxx:79
     unsigned char canvas::BitmapCanvasBase::hasAlpha()
     1
-canvas/inc/base/bufferedgraphicdevicebase.hxx:107
+canvas/inc/base/bufferedgraphicdevicebase.hxx:105
     void canvas::BufferedGraphicDeviceBase::destroyBuffers()
     empty
 canvas/inc/base/graphicdevicebase.hxx:234
@@ -25,101 +25,98 @@ canvas/inc/base/graphicdevicebase.hxx:305
 canvas/inc/base/graphicdevicebase.hxx:318
     void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
     empty
-desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
-    class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
-    "http://openoffi
-include/basegfx/utils/unopolypolygon.hxx:94
+include/basegfx/utils/unopolypolygon.hxx:93
     void basegfx::unotools::UnoPolyPolygon::modifying()const
     empty
+include/comphelper/propmultiplex2.hxx:54
+    void comphelper::OPropertyChangeListener2::_disposing(const struct com::sun::star::lang::EventObject &,)
+    empty
 include/connectivity/sdbcx/IRefreshable.hxx:29
     void connectivity::sdbcx::IRefreshableGroups::refreshGroups()
     empty
-include/filter/msfilter/msdffimp.hxx:545
+include/filter/msfilter/msdffimp.hxx:547
     _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
     1
-include/svl/svdde.hxx:235
+include/svl/svdde.hxx:236
     class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
     0
-include/svl/svdde.hxx:236
+include/svl/svdde.hxx:237
     _Bool DdeTopic::Put(const class DdeData *,)
     0
-include/svl/svdde.hxx:237
+include/svl/svdde.hxx:238
     _Bool DdeTopic::Execute(const class rtl::OUString *,)
     0
-include/svl/svdde.hxx:239
+include/svl/svdde.hxx:240
     _Bool DdeTopic::MakeItem(const class rtl::OUString &,)
     0
-include/svl/svdde.hxx:242
+include/svl/svdde.hxx:243
     _Bool DdeTopic::StartAdviseLoop()
     0
-include/svtools/unoevent.hxx:199
+include/svtools/unoevent.hxx:198
     unsigned short SvEventDescriptor::getMacroItemWhich()const
-    108
+    114
+include/svx/GenericCheckDialog.hxx:32
+    _Bool svx::CheckData::canMarkObject()
+    1
+include/svx/GenericCheckDialog.hxx:37
+    _Bool svx::CheckData::hasProperties()
+    1
 include/ucbhelper/resultset.hxx:410
     void ucbhelper::ResultSetDataSupplier::close()
     empty
 include/unotools/desktopterminationobserver.hxx:36
     _Bool utl::ITerminationListener::queryTermination()const
     1
-include/vbahelper/vbahelperinterface.hxx:74
+include/vbahelper/vbahelperinterface.hxx:75
     int InheritedHelperInterfaceImpl::getCreator()
     1400204879
-include/vcl/toolkit/vclmedit.hxx:118
-    void VclMultiLineEdit::UpdateData()
-    empty
-sc/source/core/opencl/formulagroupcl.cxx:1069
-    void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
-    empty
-sc/source/core/opencl/opbase.hxx:203
+sc/source/core/opencl/opbase.hxx:333
     _Bool sc::opencl::OpBase::takeNumeric()const
     1
-sc/source/ui/vba/vbasheetobject.hxx:117
+sc/source/core/opencl/opbase.hxx:447
+    void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class sc::opencl::outputstream &,)
+    empty
+sc/source/ui/vba/vbasheetobject.hxx:116
     class rtl::OUString ScVbaSheetObjectBase::implGetBaseName()const
     "Button"
-sc/source/ui/vba/vbasheetobjects.cxx:142
+sc/source/ui/vba/vbasheetobjects.cxx:145
     class rtl::OUString ScVbaObjectContainer::implGetShapeServiceName()const
     "com.sun.star.drawing.ControlShape"
-slideshow/source/engine/animationfactory.cxx:593
+slideshow/source/engine/animationfactory.cxx:617
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
     empty
-vcl/inc/qt5/Qt5FilePicker.hxx:172
-    void Qt5FilePicker::updateAutomaticFileExtension()
+unoxml/inc/node.hxx:137
+    _Bool DOM::CNode::IsChildTypeAllowed(const enum com::sun::star::xml::dom::NodeType,const enum com::sun::star::xml::dom::NodeType *const,)
+    0
+vcl/inc/font/LogicalFontInstance.hxx:126
+    void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
+    empty
+vcl/inc/qt5/QtFilePicker.hxx:182
+    void QtFilePicker::updateAutomaticFileExtension()
     empty
+vcl/inc/salbmp.hxx:71
+    _Bool SalBitmap::Create(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmapCanvas> &,class Size &,_Bool,)
+    0
 vcl/inc/salframe.hxx:145
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
     empty
-vcl/inc/salframe.hxx:147
-    void SalFrame::DrawMenuBar()
-    empty
 vcl/inc/salframe.hxx:204
     _Bool SalFrame::MapUnicodeToKeyCode(char16_t,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::KeyCode &,)
     0
-vcl/inc/salgdiimpl.hxx:119
-    _Bool SalGraphicsImpl::drawPolyLineBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,)
-    0
-vcl/inc/salgdiimpl.hxx:124
-    _Bool SalGraphicsImpl::drawPolygonBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,)
-    0
-vcl/inc/salgdiimpl.hxx:129
-    _Bool SalGraphicsImpl::drawPolyPolygonBezier(unsigned int,const unsigned int *,const struct SalPoint *const *,const enum PolyFlags *const *,)
-    0
-vcl/inc/salgdiimpl.hxx:170
-    _Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,)
-    0
-vcl/inc/salinst.hxx:89
+vcl/inc/salgdiimpl.hxx:79
+    void SalGraphicsImpl::freeResources()
+    empty
+vcl/inc/salinst.hxx:95
     _Bool SalInstance::SVMainHook(int *,)
     0
-vcl/inc/salinst.hxx:199
+vcl/inc/salinst.hxx:204
     void SalInstance::releaseMainThread()
     empty
-vcl/inc/salmenu.hxx:77
-    void SalMenu::GetSystemMenuData(struct SystemMenuData *,)
+vcl/inc/salinst.hxx:213
+    void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
     empty
-vcl/inc/salmenu.hxx:80
-    _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,)
-    0
-vcl/inc/salmenu.hxx:81
-    void SalMenu::RemoveMenuBarButton(unsigned short,)
+vcl/inc/salmenu.hxx:76
+    void SalMenu::GetSystemMenuData(struct SystemMenuData *,)
     empty
 vcl/inc/salobj.hxx:49
     void SalObject::Enable(_Bool,)
@@ -130,15 +127,3 @@ vcl/inc/salprn.hxx:85
 vcl/inc/salprn.hxx:116
     enum SalPrinterError SalPrinter::GetErrorCode()
     0
-writerfilter/source/ooxml/OOXMLFactory.hxx:66
-    void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-    empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:67
-    void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
-    empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:68
-    void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
-    empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:69
-    void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
-    empty
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index fe2036720143..c0c1a6d95a17 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -1,22 +1,22 @@
-basctl/source/inc/doceventnotifier.hxx:42
+basctl/source/inc/doceventnotifier.hxx:41
     void basctl::DocumentEventListener::onDocumentCreated(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:43
+basctl/source/inc/doceventnotifier.hxx:42
     void basctl::DocumentEventListener::onDocumentOpened(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:44
+basctl/source/inc/doceventnotifier.hxx:43
     void basctl::DocumentEventListener::onDocumentSave(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:45
+basctl/source/inc/doceventnotifier.hxx:44
     void basctl::DocumentEventListener::onDocumentSaveDone(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:46
+basctl/source/inc/doceventnotifier.hxx:45
     void basctl::DocumentEventListener::onDocumentSaveAs(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:47
+basctl/source/inc/doceventnotifier.hxx:46
     void basctl::DocumentEventListener::onDocumentSaveAsDone(const class basctl::ScriptDocument &,)
     0
-basctl/source/inc/doceventnotifier.hxx:49
+basctl/source/inc/doceventnotifier.hxx:48
     void basctl::DocumentEventListener::onDocumentTitleChanged(const class basctl::ScriptDocument &,)
     0
 basic/source/comp/codegen.cxx:478
@@ -31,10 +31,10 @@ basic/source/comp/codegen.cxx:480
 basic/source/comp/codegen.cxx:481
     void (anonymous namespace)::OffSetAccumulator::processOpCode2(enum SbiOpcode,type-parameter-?-?,type-parameter-?-?,)
     000
-canvas/inc/base/bufferedgraphicdevicebase.hxx:229
+canvas/inc/base/bufferedgraphicdevicebase.hxx:227
     void canvas::BufferedGraphicDeviceBase::windowShown(const struct com::sun::star::lang::EventObject &,)
     0
-canvas/inc/base/bufferedgraphicdevicebase.hxx:236
+canvas/inc/base/bufferedgraphicdevicebase.hxx:234
     void canvas::BufferedGraphicDeviceBase::windowHidden(const struct com::sun::star::lang::EventObject &,)
     0
 canvas/inc/base/graphicdevicebase.hxx:239
@@ -46,108 +46,117 @@ canvas/inc/base/graphicdevicebase.hxx:305
 canvas/inc/base/graphicdevicebase.hxx:318
     void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
     00
-canvas/inc/base/integerbitmapbase.hxx:58
+canvas/inc/base/integerbitmapbase.hxx:57
     void canvas::IntegerBitmapBase::setData(const class com::sun::star::uno::Sequence<signed char> &,const struct com::sun::star::rendering::IntegerBitmapLayout &,const struct com::sun::star::geometry::IntegerRectangle2D &,)
     011
-canvas/inc/base/integerbitmapbase.hxx:72
+canvas/inc/base/integerbitmapbase.hxx:71
     void canvas::IntegerBitmapBase::setPixel(const class com::sun::star::uno::Sequence<signed char> &,const struct com::sun::star::rendering::IntegerBitmapLayout &,const struct com::sun::star::geometry::IntegerPoint2D &,)
     011
-desktop/source/deployment/registry/inc/dp_backend.h:79
+desktop/source/deployment/registry/inc/dp_backend.h:80
     void dp_registry::backend::Package::processPackage_(class osl::ResettableGuard<class osl::Mutex> &,_Bool,_Bool,const class rtl::Reference<class dp_misc::AbortChannel> &,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &,)
     01111
-extensions/source/bibliography/loadlisteneradapter.hxx:110
+extensions/source/bibliography/loadlisteneradapter.hxx:109
     void bib::OLoadListener::_unloading(const struct com::sun::star::lang::EventObject &,)
     0
-extensions/source/bibliography/loadlisteneradapter.hxx:111
+extensions/source/bibliography/loadlisteneradapter.hxx:110
     void bib::OLoadListener::_reloading(const struct com::sun::star::lang::EventObject &,)
     0
-include/cppuhelper/propshlp.hxx:326
+include/comphelper/propmultiplex2.hxx:54
+    void comphelper::OPropertyChangeListener2::_disposing(const struct com::sun::star::lang::EventObject &,)
+    0
+include/comphelper/propshlp.hxx:255
+    void comphelper::OPropertySetHelper::getFastPropertyValue(class std::unique_lock<class std::mutex> &,class com::sun::star::uno::Any &,int,)const
+    011
+include/cppuhelper/propshlp.hxx:330
     void cppu::IEventNotificationHook::fireEvents(int *,int,unsigned char,_Bool,)
     0111
 include/drawinglayer/primitive2d/textbreakuphelper.hxx:58
     _Bool drawinglayer::primitive2d::TextBreakupHelper::allowChange(unsigned int,class basegfx::B2DHomMatrix &,unsigned int,unsigned int,)
     0111
-include/editeng/editeng.hxx:483
-    void EditEngine::PaintingFirstLine(int,const class Point &,long,const class Point &,short,class OutputDevice *,)
-    110111
-include/editeng/editeng.hxx:486
+include/editeng/editeng.hxx:502
     void EditEngine::ParagraphConnected(int,int,)
     01
-include/filter/msfilter/msdffimp.hxx:545
+include/filter/msfilter/msdffimp.hxx:547
     _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
     00
-include/oox/dump/dumperbase.hxx:472
+include/oox/dump/dumperbase.hxx:473
     void oox::dump::ConfigItemBase::implProcessConfigItemInt(class oox::TextInputStream &,long,const class rtl::OUString &,)
     011
-include/oox/dump/dumperbase.hxx:563
+include/oox/dump/dumperbase.hxx:564
     class rtl::OUString oox::dump::NameListBase::implGetNameDbl(const class oox::dump::Config &,double,)const
     01
-include/oox/dump/oledumper.hxx:165
+include/oox/dump/oledumper.hxx:166
     void oox::dump::ComCtlObjectBase::implDumpCommonExtra(long,)
     0
-include/oox/export/shapes.hxx:136
+include/oox/export/shapes.hxx:139
     class oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteNonVisualProperties(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,)
     0
-include/sfx2/stbitem.hxx:100
+include/sfx2/stbitem.hxx:101
     _Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,)
     0
-include/svl/svdde.hxx:226
+include/svl/documentlockfile.hxx:50
+    void svt::GenDocumentLockFile::WriteEntryToStream(class std::unique_lock<class std::mutex> &,const class o3tl::enumarray<enum LockFileComponent, class rtl::OUString> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XOutputStream> &,)
+    011
+include/svl/svdde.hxx:227
     _Bool DdeGetPutItem::Put(const class DdeData *,)
     0
-include/svl/svdde.hxx:235
+include/svl/svdde.hxx:236
     class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
     0
-include/svl/svdde.hxx:236
+include/svl/svdde.hxx:237
     _Bool DdeTopic::Put(const class DdeData *,)
     0
-include/svl/svdde.hxx:237
+include/svl/svdde.hxx:238
     _Bool DdeTopic::Execute(const class rtl::OUString *,)
     0
-include/svl/svdde.hxx:239
+include/svl/svdde.hxx:240
     _Bool DdeTopic::MakeItem(const class rtl::OUString &,)
     0
 include/svtools/editbrowsebox.hxx:102
     void svt::CellController::ActivatingMouseEvent(const class BrowserMouseEvent &,_Bool,)
     10
-include/svx/IAccessibleParent.hxx:80
+include/svx/IAccessibleParent.hxx:81
     _Bool accessibility::IAccessibleParent::ReplaceChild(class accessibility::AccessibleShape *,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const long,const class accessibility::AccessibleShapeTreeInfo &,)
     1101
-include/svx/selectioncontroller.hxx:47
+include/svx/selectioncontroller.hxx:48
     _Bool sdr::SelectionController::onMouseButtonUp(const class MouseEvent &,class vcl::Window *,)
     10
-include/vcl/accessibletable.hxx:91
+include/vcl/accessibletable.hxx:90
     class tools::Rectangle vcl::table::IAccessibleTable::GetFieldCharacterBounds(int,int,int,)
     001
-include/vcl/accessibletable.hxx:92
+include/vcl/accessibletable.hxx:91
     int vcl::table::IAccessibleTable::GetFieldIndexAtPoint(int,int,const class Point &,)
     001
-include/vcl/accessibletable.hxx:93
-    void vcl::table::IAccessibleTable::FillAccessibleStateSetForCell(class utl::AccessibleStateSetHelper &,int,unsigned short,)const
+include/vcl/accessibletable.hxx:92
+    void vcl::table::IAccessibleTable::FillAccessibleStateSetForCell(long &,int,unsigned short,)const
     110
 include/vcl/dndhelp.hxx:62
     void vcl::unohelper::DragAndDropClient::dragExit(const struct com::sun::star::datatransfer::dnd::DropTargetEvent &,)
     0
-include/vcl/opengl/OpenGLContext.hxx:141
+include/vcl/opengl/OpenGLContext.hxx:101
     struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,)
     10
-include/vcl/toolkit/treelistbox.hxx:430
-    enum DragDropMode SvTreeListBox::NotifyStartDrag(class TransferDataContainer &,class SvTreeListEntry *,)
-    00
-include/vcl/toolkit/treelistbox.hxx:589
-    _Bool SvTreeListBox::EditingEntry(class SvTreeListEntry *,class Selection &,)
-    10
-sc/inc/filter.hxx:82
+include/xmloff/txtimp.hxx:108
+    class SvXMLImportContext * XMLTextImportHelper::CreateTableChildContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,)
+    101
+sc/inc/filter.hxx:81
     void ScFormatFilterPlugin::ScExportHTML(class SvStream &,const class rtl::OUString &,class ScDocument *,const class ScRange &,const unsigned short,_Bool,const class rtl::OUString &,class rtl::OUString &,const class rtl::OUString &,)
     111101111
-sc/inc/filter.hxx:84
+sc/inc/filter.hxx:83
     void ScFormatFilterPlugin::ScExportRTF(class SvStream &,class ScDocument *,const class ScRange &,const unsigned short,)
     1110
-sc/inc/formulagroup.hxx:145
+sc/inc/formulagroup.hxx:144
     class boost::intrusive_ptr<class ScMatrix> sc::FormulaGroupInterpreter::inverseMatrix(const class ScMatrix &,)
     0
-sc/source/core/opencl/formulagroupcl.cxx:1069
-    void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
+sc/source/core/opencl/opbase.hxx:447
+    void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class sc::opencl::outputstream &,)
     0
+sd/source/console/PresenterScrollBar.hxx:177
+    double sdext::presenter::PresenterScrollBar::GetDragDistance(const int,const int,)const
+    01
+sd/source/console/PresenterScrollBar.hxx:179
+    double sdext::presenter::PresenterScrollBar::GetMinor(const double,const double,)const
+    10
 sdext/source/pdfimport/inc/contentsink.hxx:151
     void pdfi::ContentSink::drawMask(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool,)
     10
@@ -158,53 +167,65 @@ sdext/source/pdfimport/inc/contentsink.hxx:165
     void pdfi::ContentSink::drawMaskedImage(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool,)
     110
 sdext/source/pdfimport/inc/treevisiting.hxx:46
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::HyperlinkElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::HyperlinkElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
 sdext/source/pdfimport/inc/treevisiting.hxx:47
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::TextElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::TextElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
 sdext/source/pdfimport/inc/treevisiting.hxx:49
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::FrameElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::FrameElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
 sdext/source/pdfimport/inc/treevisiting.hxx:51
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::ImageElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::ImageElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
 sdext/source/pdfimport/inc/treevisiting.hxx:52
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::PageElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::PageElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
 sdext/source/pdfimport/inc/treevisiting.hxx:53
-    void pdfi::ElementTreeVisitor::visit(struct pdfi::DocumentElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > >, class std::__debug::list<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> >, class std::allocator<class std::unique_ptr<struct pdfi::Element, struct std::default_delete<struct pdfi::Element> > > >, struct std::bidirectional_iterator_tag> &,)
-    10
-sdext/source/presenter/PresenterScrollBar.hxx:177
-    double sdext::presenter::PresenterScrollBar::GetDragDistance(const int,const int,)const
-    01
-sdext/source/presenter/PresenterScrollBar.hxx:179
-    double sdext::presenter::PresenterScrollBar::GetMinor(const double,const double,)const
+    void pdfi::ElementTreeVisitor::visit(struct pdfi::DocumentElement &,const class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class std::unique_ptr<struct pdfi::Element> >, class std::list<class std::unique_ptr<struct pdfi::Element> > > &,)
     10
-starmath/source/wordexportbase.hxx:38
+starmath/source/wordexportbase.hxx:28
     void SmWordExportBase::HandleText(const class SmNode *,int,)
     10
-sw/inc/calbck.hxx:144
-    void SwClient::Modify(const class SfxPoolItem *const,const class SfxPoolItem *const,)
-    10
-sw/inc/swcrsr.hxx:161
-    _Bool SwCursor::LeftRight(_Bool,unsigned short,unsigned short,_Bool,_Bool,_Bool,const class SwRootFrame *,)
-    1100000
-sw/source/core/access/acccontext.hxx:352
+sw/inc/swcrsr.hxx:163
+    _Bool SwCursor::LeftRight(_Bool,unsigned short,enum SwCursorSkipMode,_Bool,_Bool,_Bool,const class SwRootFrame *,_Bool,)
+    11000000
+sw/qa/inc/swmodeltestbase.hxx:158
+    void SwModelTestBase::postLoad(const char *,)
+    0
+sw/source/core/access/acccontext.hxx:349
     _Bool SwAccessibleContext::SetSelectedState(_Bool,)
     0
-sw/source/core/inc/txmsrt.hxx:145
-    void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwIndex &,unsigned short,const class SwRootFrame *const,)const
+sw/source/core/inc/txmsrt.hxx:148
+    void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwContentIndex &,unsigned short,const class SwRootFrame *const,)const
     1100
-sw/source/filter/ww8/wrtww8.hxx:793
+sw/source/filter/ww8/wrtww8.hxx:799
     void MSWordExportBase::WriteHyperlinkData(const class sw::mark::IFieldmark &,)
     0
-sw/source/filter/ww8/wrtww8.hxx:858
+sw/source/filter/ww8/wrtww8.hxx:871
     void MSWordExportBase::OutputGrfNode(const class SwGrfNode &,)
     0
-vcl/inc/outdev.h:122
-    _Bool ImplGlyphFallbackFontSubstitution::FindFontSubstitute(class FontSelectPattern &,class LogicalFontInstance *,class rtl::OUString &,)const
+unoxml/inc/node.hxx:137
+    _Bool DOM::CNode::IsChildTypeAllowed(const enum com::sun::star::xml::dom::NodeType,const enum com::sun::star::xml::dom::NodeType *const,)
+    00
+vcl/inc/font/fontsubstitution.hxx:53
+    _Bool vcl::font::GlyphFallbackFontSubstitution::FindFontSubstitute(class vcl::font::FontSelectPattern &,class LogicalFontInstance *,class rtl::OUString &,)const
     101
+vcl/inc/font/LogicalFontInstance.hxx:126
+    void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
+    0
+vcl/inc/font/PhysicalFontFace.hxx:198
+    const class std::vector<struct hb_variation_t> & vcl::font::PhysicalFontFace::GetVariations(const class LogicalFontInstance &,)const
+    0
+vcl/inc/salbmp.hxx:71
+    _Bool SalBitmap::Create(const class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmapCanvas> &,class Size &,_Bool,)
+    000
+vcl/inc/salbmp.hxx:80
+    _Bool SalBitmap::GetSystemData(struct BitmapSystemData &,)
+    0
+vcl/inc/salbmp.hxx:86
+    _Bool SalBitmap::Replace(const class Color &,const class Color &,unsigned char,)
+    000
 vcl/inc/salframe.hxx:145
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
     0
@@ -214,60 +235,36 @@ vcl/inc/salframe.hxx:194
 vcl/inc/salframe.hxx:204
     _Bool SalFrame::MapUnicodeToKeyCode(char16_t,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::KeyCode &,)
     000
-vcl/inc/salframe.hxx:247
+vcl/inc/salframe.hxx:251
     void SalFrame::BeginSetClipRegion(unsigned int,)
     0
-vcl/inc/salgdiimpl.hxx:81
-    void SalGraphicsImpl::SetXORMode(_Bool,_Bool,)
-    10
-vcl/inc/salgdiimpl.hxx:119
-    _Bool SalGraphicsImpl::drawPolyLineBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,)
-    000
-vcl/inc/salgdiimpl.hxx:124
-    _Bool SalGraphicsImpl::drawPolygonBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,)
-    000
-vcl/inc/salgdiimpl.hxx:129
-    _Bool SalGraphicsImpl::drawPolyPolygonBezier(unsigned int,const unsigned int *,const struct SalPoint *const *,const enum PolyFlags *const *,)
-    0000
-vcl/inc/salgdiimpl.hxx:136
+vcl/inc/salgdiimpl.hxx:150
     void SalGraphicsImpl::copyArea(long,long,long,long,long,long,_Bool,)
     1111110
-vcl/inc/salgdiimpl.hxx:170
-    _Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,)
-    000000
-vcl/inc/salinst.hxx:89
+vcl/inc/salinst.hxx:95
     _Bool SalInstance::SVMainHook(int *,)
     0
-vcl/inc/salinst.hxx:122
+vcl/inc/salinst.hxx:128
     void SalInstance::GetPrinterQueueState(struct SalPrinterQueueInfo *,)
     0
-vcl/inc/salinst.hxx:164
-    class weld::Builder * SalInstance::CreateInterimBuilder(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,unsigned long,)
-    1110
-vcl/inc/salinst.hxx:182
+vcl/inc/salinst.hxx:187
     void SalInstance::AddToRecentDocumentList(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,)
     100
-vcl/inc/salmenu.hxx:71
+vcl/inc/salinst.hxx:213
+    void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
+    00
+vcl/inc/salmenu.hxx:70
     void SalMenu::SetItemBits(unsigned int,enum MenuItemBits,)
     10
-vcl/inc/salmenu.hxx:75
+vcl/inc/salmenu.hxx:74
     void SalMenu::SetItemImage(unsigned int,class SalMenuItem *,const class Image &,)
     011
-vcl/inc/salmenu.hxx:76
+vcl/inc/salmenu.hxx:75
     void SalMenu::SetAccelerator(unsigned int,class SalMenuItem *,const class vcl::KeyCode &,const class rtl::OUString &,)
     0101
-vcl/inc/salmenu.hxx:77
+vcl/inc/salmenu.hxx:76
     void SalMenu::GetSystemMenuData(struct SystemMenuData *,)
     0
-vcl/inc/salmenu.hxx:80
-    _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,)
-    0
-vcl/inc/salmenu.hxx:81
-    void SalMenu::RemoveMenuBarButton(unsigned short,)
-    0
-vcl/inc/salmenu.hxx:93
-    class tools::Rectangle SalMenu::GetMenuBarButtonRectPixel(unsigned short,class SalFrame *,)
-    00
 vcl/inc/salobj.hxx:49
     void SalObject::Enable(_Bool,)
     0
@@ -280,9 +277,9 @@ vcl/inc/salprn.hxx:85
 vcl/inc/salprn.hxx:114
     class SalGraphics * SalPrinter::StartPage(class ImplJobSetup *,_Bool,)
     10
-vcl/inc/WidgetDrawInterface.hxx:63
-    _Bool vcl::WidgetDrawInterface::drawNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,)
-    111110
-vcl/inc/WidgetDrawInterface.hxx:87
+vcl/inc/WidgetDrawInterface.hxx:64
+    _Bool vcl::WidgetDrawInterface::drawNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,const class Color &,)
+    1111101
+vcl/inc/WidgetDrawInterface.hxx:88
     _Bool vcl::WidgetDrawInterface::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &,)
     11111011
diff --git a/compilerplugins/clang/virtualdown.cxx b/compilerplugins/clang/virtualdown.cxx
index ff5fc373a1dd..946d8bc953bc 100644
--- a/compilerplugins/clang/virtualdown.cxx
+++ b/compilerplugins/clang/virtualdown.cxx
@@ -11,6 +11,7 @@
 #include <string>
 #include <iostream>
 #include <set>
+#include "config_clang.h"
 #include "plugin.hxx"
 #include <fstream>
 
@@ -20,7 +21,7 @@ methods, which indicates a places where the virtual-ness is unwarranted, normall
 
 The process goes something like this:
   $ make check
-  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='VirtualDown' check
+  $ make FORCE_COMPILE=all COMPILER_PLUGIN_TOOL='VirtualDown' check
   $ ./compilerplugins/clang/VirtualDown.py
 
 @TODO for some reason, we get false+ for operator== methods
diff --git a/compilerplugins/clang/virtualdown.py b/compilerplugins/clang/virtualdown.py
index 35623b5581db..f71ec576adb4 100755
--- a/compilerplugins/clang/virtualdown.py
+++ b/compilerplugins/clang/virtualdown.py
@@ -2,7 +2,6 @@
 
 import io
 import re
-import sys
 
 definitionSet = set()
 definitionToSourceLocationMap = dict()
diff --git a/compilerplugins/clang/weakbase.cxx b/compilerplugins/clang/weakbase.cxx
index ffc0b931956c..f6f7c8db01be 100644
--- a/compilerplugins/clang/weakbase.cxx
+++ b/compilerplugins/clang/weakbase.cxx
@@ -15,6 +15,7 @@
 #include <set>
 
 #include "plugin.hxx"
+#include "check.hxx"
 #include "clang/AST/CXXInheritance.h"
 
 /**
@@ -50,7 +51,7 @@ bool WeakBase::VisitCXXRecordDecl(CXXRecordDecl const* recordDecl)
         return true;
     }
     //    StringRef aFileName = getFilenameOfLocation(
-    //        compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(fieldDecl)));
+    //        compiler.getSourceManager().getSpellingLoc(fieldDecl->getBeginLoc()));
 
     //    if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/chart2/source/"))
     //        return true;
@@ -69,7 +70,11 @@ bool WeakBase::VisitCXXRecordDecl(CXXRecordDecl const* recordDecl)
         return true;
 
     int noWeakBases = 0;
-    std::string basePaths;
+    int noWeakObjects = 0;
+    bool foundVirtualWeakBase = false;
+    bool foundVirtualOWeakObject = false;
+    std::string basePaths1;
+    std::string basePaths2;
     auto BaseMatchesCallback = [&](const CXXBaseSpecifier* cxxBaseSpecifier, CXXBasePath& Paths) {
         if (!cxxBaseSpecifier->getType().getTypePtr())
             return false;
@@ -78,9 +83,30 @@ bool WeakBase::VisitCXXRecordDecl(CXXRecordDecl const* recordDecl)
             return false;
         if (baseCXXRecordDecl->isInvalidDecl())
             return false;
-        if (baseCXXRecordDecl->getName() != "WeakBase")
+        bool isWeakBase(loplugin::DeclCheck(baseCXXRecordDecl)
+                            .Struct("WeakBase")
+                            .Namespace("tools")
+                            .GlobalNamespace());
+        bool isOWeakObject(loplugin::DeclCheck(baseCXXRecordDecl)
+                               .Class("OWeakObject")
+                               .Namespace("cppu")
+                               .GlobalNamespace());
+        if (isWeakBase)
+        {
+            if (cxxBaseSpecifier->isVirtual())
+                foundVirtualWeakBase = true;
+            else
+                ++noWeakBases;
+        }
+        else if (isOWeakObject)
+        {
+            if (cxxBaseSpecifier->isVirtual())
+                foundVirtualOWeakObject = true;
+            else
+                ++noWeakObjects;
+        }
+        else
             return false;
-        ++noWeakBases;
         std::string sPath;
         for (CXXBasePathElement const& pathElement : Paths)
         {
@@ -95,22 +121,48 @@ bool WeakBase::VisitCXXRecordDecl(CXXRecordDecl const* recordDecl)
         }
         sPath += "->";
         sPath += baseCXXRecordDecl->getNameAsString();
-        if (!basePaths.empty())
-            basePaths += ", ";
-        basePaths += sPath;
+        if (isWeakBase)
+        {
+            if (!basePaths1.empty())
+                basePaths1 += ", ";
+            basePaths1 += sPath;
+        }
+        else
+        {
+            if (!basePaths2.empty())
+                basePaths2 += ", ";
+            basePaths2 += sPath;
+        }
         return false;
     };
 
     CXXBasePaths aPaths;
     recordDecl->lookupInBases(BaseMatchesCallback, aPaths);
 
-    if (noWeakBases > 1)
-    {
+    if (foundVirtualWeakBase && noWeakBases > 0)
         report(DiagnosticsEngine::Warning,
-               "multiple copies of WeakBase, through inheritance paths %0",
-               compat::getBeginLoc(recordDecl))
-            << basePaths << recordDecl->getSourceRange();
-    }
+               "found one virtual base and one or more normal bases of tools::WeakBase, through "
+               "inheritance paths %0",
+               recordDecl->getBeginLoc())
+            << basePaths1;
+    else if (!foundVirtualWeakBase && noWeakBases > 1)
+        report(DiagnosticsEngine::Warning,
+               "found multiple copies of tools::WeakBase, through inheritance paths %0",
+               recordDecl->getBeginLoc())
+            << basePaths1;
+
+    if (foundVirtualOWeakObject && noWeakObjects > 0)
+        report(DiagnosticsEngine::Warning,
+               "found one virtual base and one or more normal bases of cppu::OWeakObject, through "
+               "inheritance paths %0",
+               recordDecl->getBeginLoc())
+            << basePaths2;
+    else if (!foundVirtualOWeakObject && noWeakObjects > 1)
+        report(DiagnosticsEngine::Warning,
+               "found multiple copies of cppu::OWeakObject, through inheritance paths %0",
+               recordDecl->getBeginLoc())
+            << basePaths2;
+
     return true;
 }
 
diff --git a/compilerplugins/clang/weakobject.cxx b/compilerplugins/clang/weakobject.cxx
deleted file mode 100644
index 055110ef9331..000000000000
--- a/compilerplugins/clang/weakobject.cxx
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- 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 LO_CLANG_SHARED_PLUGINS
-
-#include "check.hxx"
-#include "plugin.hxx"
-
-/* OWeakObject::release() disposes weak references.  If that isn't done
- * because a sub-class improperly overrides release() then
- * OWeakConnectionPoint::m_pObject continues to point to the deleted object
- * and that could result in use-after-free.
- */
-
-namespace {
-
-class WeakObject
-    : public loplugin::FilteringPlugin<WeakObject>
-{
-
-public:
-    explicit WeakObject(loplugin::InstantiationData const& rData): FilteringPlugin(rData)
-    {}
-
-    virtual bool preRun() override {
-        return compiler.getLangOpts().CPlusPlus; // no OWeakObject in C
-    }
-    void run() override {
-        if( preRun()) {
-            TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-        }
-    }
-
-    bool isDerivedFromOWeakObject(CXXMethodDecl const*const pMethodDecl)
-    {
-        QualType const pClass(pMethodDecl->getParent()->getTypeForDecl(), 0);
-        if (loplugin::TypeCheck(pClass).Class("OWeakObject").Namespace("cppu"))
-        {
-            return true;
-        }
-        // hopefully it's faster to recurse overridden methods than the
-        // thicket of WeakImplHelper32 but that is purely speculation
-        for (auto it = pMethodDecl->begin_overridden_methods();
-             it != pMethodDecl->end_overridden_methods(); ++it)
-        {
-            if (isDerivedFromOWeakObject(*it))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool VisitCXXMethodDecl(CXXMethodDecl const*const pMethodDecl)
-    {
-        if (ignoreLocation(pMethodDecl)) {
-            return true;
-        }
-        if (!pMethodDecl->isThisDeclarationADefinition()
-            || pMethodDecl->isLateTemplateParsed())
-        {
-            return true;
-        }
-        if (!pMethodDecl->isInstance()) {
-            return true;
-        }
-// this is too "simple", if a NamedDecl class has a getName() member expecting it to actually work would clearly be unreasonable    if (pMethodDecl->getName() != "release") {
-        if (auto const i = pMethodDecl->getIdentifier()) {
-            if (i != nullptr && !i->isStr("release")) {
-                return true;
-            }
-        }
-        if (pMethodDecl->getNumParams() != 0) {
-            return true;
-        }
-        if (loplugin::TypeCheck(QualType(pMethodDecl->getParent()->getTypeForDecl(), 0)).Class("OWeakObject").Namespace("cppu"))
-        {
-            return true;
-        }
-
-        CXXMethodDecl const* pOverridden(nullptr);
-        for (auto it = pMethodDecl->begin_overridden_methods();
-             it != pMethodDecl->end_overridden_methods(); ++it)
-        {
-            if (auto const i = (*it)->getIdentifier()) {
-                if (i != nullptr && i->isStr("release")) {
-                    pOverridden = *it;
-                    break;
-                }
-            }
-        }
-        if (pOverridden == nullptr)
-        {
-            return true;
-        }
-        if (!isDerivedFromOWeakObject(pOverridden))
-        {
-            return true;
-        }
-        CompoundStmt const*const pCompoundStatement(
-                dyn_cast<CompoundStmt>(pMethodDecl->getBody()));
-        for (auto i = pCompoundStatement->body_begin();
-             i != pCompoundStatement->body_end(); ++i)
-        {
-            // note: this is not a CXXMemberCallExpr
-            CallExpr const*const pCallExpr(dyn_cast<CallExpr>(*i));
-            if (pCallExpr)
-            {
-                // note: this is only sometimes a CXXMethodDecl
-                FunctionDecl const*const pCalled(pCallExpr->getDirectCallee());
-                if (pCalled->getName() == "release")
-                {
-//this never works  && pCalled == pOverridden
-                    if (pCalled->getParent() == pOverridden->getParent())
-                    {
-                        return true;
-                    }
-                    // Allow this convenient shortcut:
-                    auto td = dyn_cast<TypeDecl>(pCalled->getParent());
-                    if (td != nullptr
-                        && (loplugin::TypeCheck(td).Class("OWeakObject").Namespace("cppu").GlobalNamespace()
-                            || loplugin::TypeCheck(td).Class("OWeakAggObject").Namespace("cppu").GlobalNamespace()))
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        // allowlist
-        auto tc  = loplugin::TypeCheck(pMethodDecl->getParent());
-        if (   tc.Class("OWeakAggObject").Namespace("cppu").GlobalNamespace() // conditional call
-            || tc.Class("WeakComponentImplHelperBase").Namespace("cppu").GlobalNamespace() // extra magic
-            || tc.Class("WeakAggComponentImplHelperBase").Namespace("cppu").GlobalNamespace() // extra magic
-            || tc.Class("CDOMImplementation").Namespace("DOM").GlobalNamespace() // a static oddity
-            || tc.Class("SwXTextFrame").GlobalNamespace() // ambiguous, 3 parents
-            || tc.Class("SwXTextDocument").GlobalNamespace() // ambiguous, ~4 parents
-            || tc.Class("SdStyleSheet").GlobalNamespace() // same extra magic as WeakComponentImplHelperBase
-            || tc.Class("SdXImpressDocument").GlobalNamespace() // same extra magic as WeakComponentImplHelperBase
-           )
-        {
-            return true;
-        }
-
-        report(DiagnosticsEngine::Warning,
-                "override of OWeakObject::release() does not call superclass release()",
-                pMethodDecl->getLocation())
-            << pMethodDecl->getSourceRange();
-
-        return true;
-    }
-
-};
-
-loplugin::Plugin::Registration<WeakObject> weakobject("weakobject");
-
-} // namespace
-
-#endif // LO_CLANG_SHARED_PLUGINS
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/writeonlyvars.cxx b/compilerplugins/clang/writeonlyvars.cxx
index 51a967dac8a0..3fb3f769b72d 100644
--- a/compilerplugins/clang/writeonlyvars.cxx
+++ b/compilerplugins/clang/writeonlyvars.cxx
@@ -22,12 +22,10 @@
 #include "config_clang.h"
 
 #include "plugin.hxx"
-#include "compat.hxx"
 #include "check.hxx"
+#include "compat.hxx"
 
-#if CLANG_VERSION >= 110000
 #include "clang/AST/ParentMapContext.h"
-#endif
 
 /**
   Finds variables that are effectively write-only.
@@ -164,7 +162,7 @@ private:
     bool checkForWriteWhenUsingCollectionType(const CXXMethodDecl* calleeMethodDecl);
     bool IsPassedByNonConst(const VarDecl* varDecl, const Stmt* child, CallerWrapper callExpr,
                             CalleeWrapper calleeFunctionDecl);
-    llvm::Optional<CalleeWrapper> getCallee(CallExpr const*);
+    compat::optional<CalleeWrapper> getCallee(CallExpr const*);
 
     // For reasons I do not understand, parentFunctionDecl() is not reliable, so
     // we store the parent function on the way down the AST.
@@ -188,9 +186,6 @@ void WriteOnlyVars::run()
         // false+
         if (loplugin::isSamePathname(fn, SRCDIR "/store/source/storpage.cxx"))
             return;
-        // yydebug?
-        if (loplugin::isSamePathname(fn, SRCDIR "/idlc/source/idlccompile.cxx"))
-            return;
         if (fn.contains("/qa/"))
             return;
         if (fn.contains("/vcl/workben/"))
@@ -420,8 +415,6 @@ void WriteOnlyVars::run()
             return;
         if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/filter/xml/sdxmlwrp.cxx"))
             return;
-        if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/filter/html/pubdlg.cxx"))
-            return;
         if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/txtnode/thints.cxx"))
             return;
         if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/doc/docbm.cxx"))
@@ -484,18 +477,16 @@ void WriteOnlyVars::run()
             bool read = readFromSet.find(v) != readFromSet.end();
             bool write = writeToSet.find(v) != writeToSet.end();
             if (!read && write)
-                report(DiagnosticsEngine::Warning, "write-only %0", compat::getBeginLoc(v.varDecl))
+                report(DiagnosticsEngine::Warning, "write-only %0", v.varDecl->getBeginLoc())
                     << v.varName;
         }
     }
     else
     {
         for (const MyVarInfo& s : readFromSet)
-            report(DiagnosticsEngine::Warning, "read %0", compat::getBeginLoc(s.varDecl))
-                << s.varName;
+            report(DiagnosticsEngine::Warning, "read %0", s.varDecl->getBeginLoc()) << s.varName;
         for (const MyVarInfo& s : writeToSet)
-            report(DiagnosticsEngine::Warning, "write %0", compat::getBeginLoc(s.varDecl))
-                << s.varName;
+            report(DiagnosticsEngine::Warning, "write %0", s.varDecl->getBeginLoc()) << s.varName;
     }
 }
 
@@ -550,9 +541,9 @@ bool WriteOnlyVars::VisitVarDecl(const VarDecl* varDecl)
         return true;
     if (!compiler.getSourceManager().isInMainFile(varDecl->getLocation()))
         return true;
-    if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(varDecl)))
+    if (compiler.getSourceManager().isMacroBodyExpansion(varDecl->getBeginLoc()))
         return true;
-    if (compiler.getSourceManager().isMacroArgExpansion(compat::getBeginLoc(varDecl)))
+    if (compiler.getSourceManager().isMacroArgExpansion(varDecl->getBeginLoc()))
         return true;
     // ignore stuff that forms part of the stable URE interface
     if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(varDecl->getLocation())))
@@ -763,10 +754,7 @@ void WriteOnlyVars::checkIfReadFrom(const VarDecl* varDecl, const Expr* memberEx
                  || isa<CXXUnresolvedConstructExpr>(parent) || isa<CompoundStmt>(parent)
                  || isa<LabelStmt>(parent) || isa<CXXForRangeStmt>(parent)
                  || isa<CXXTypeidExpr>(parent) || isa<DefaultStmt>(parent)
-                 || isa<GCCAsmStmt>(parent) || isa<VAArgExpr>(parent)
-#if CLANG_VERSION >= 80000
-                 || isa<ConstantExpr>(parent)
-#endif
+                 || isa<GCCAsmStmt>(parent) || isa<VAArgExpr>(parent) || isa<ConstantExpr>(parent)
                  || isa<CXXDefaultArgExpr>(parent) || isa<LambdaExpr>(parent))
         {
             break;
@@ -782,9 +770,9 @@ void WriteOnlyVars::checkIfReadFrom(const VarDecl* varDecl, const Expr* memberEx
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear, what can the matter be?",
-               compat::getBeginLoc(memberExpr))
+               memberExpr->getBeginLoc())
             << memberExpr->getSourceRange();
-        report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+        report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
             << parent->getSourceRange();
         parent->dump();
         memberExpr->dump();
@@ -975,12 +963,9 @@ void WriteOnlyVars::checkIfWrittenTo(const VarDecl* varDecl, const Expr* memberE
                  || isa<UnaryExprOrTypeTraitExpr>(parent) || isa<CXXUnresolvedConstructExpr>(parent)
                  || isa<CompoundStmt>(parent) || isa<LabelStmt>(parent)
                  || isa<CXXForRangeStmt>(parent) || isa<CXXTypeidExpr>(parent)
-                 || isa<DefaultStmt>(parent)
-#if CLANG_VERSION >= 80000
-                 || isa<ConstantExpr>(parent)
-#endif
-                 || isa<GCCAsmStmt>(parent) || isa<VAArgExpr>(parent)
-                 || isa<CXXDefaultArgExpr>(parent) || isa<LambdaExpr>(parent))
+                 || isa<DefaultStmt>(parent) || isa<ConstantExpr>(parent) || isa<GCCAsmStmt>(parent)
+                 || isa<VAArgExpr>(parent) || isa<CXXDefaultArgExpr>(parent)
+                 || isa<LambdaExpr>(parent))
         {
             break;
         }
@@ -995,11 +980,11 @@ void WriteOnlyVars::checkIfWrittenTo(const VarDecl* varDecl, const Expr* memberE
     if (bDump)
     {
         report(DiagnosticsEngine::Warning, "oh dear2, what can the matter be? writtenTo=%0",
-               compat::getBeginLoc(memberExpr))
+               memberExpr->getBeginLoc())
             << bPotentiallyWrittenTo << memberExpr->getSourceRange();
         if (parent)
         {
-            report(DiagnosticsEngine::Note, "parent over here", compat::getBeginLoc(parent))
+            report(DiagnosticsEngine::Note, "parent over here", parent->getBeginLoc())
                 << parent->getSourceRange();
             parent->dump();
         }
@@ -1124,7 +1109,7 @@ bool WriteOnlyVars::VisitDeclRefExpr(const DeclRefExpr* declRefExpr)
     return true;
 }
 
-llvm::Optional<CalleeWrapper> WriteOnlyVars::getCallee(CallExpr const* callExpr)
+compat::optional<CalleeWrapper> WriteOnlyVars::getCallee(CallExpr const* callExpr)
 {
     FunctionDecl const* functionDecl = callExpr->getDirectCallee();
     if (functionDecl)
@@ -1142,7 +1127,7 @@ llvm::Optional<CalleeWrapper> WriteOnlyVars::getCallee(CallExpr const* callExpr)
         }
     }
 
-    return llvm::Optional<CalleeWrapper>();
+    return compat::optional<CalleeWrapper>();
 }
 
 loplugin::Plugin::Registration<WriteOnlyVars> X("writeonlyvars", false);
diff --git a/compilerplugins/clang/xmlimport.cxx b/compilerplugins/clang/xmlimport.cxx
index a15c3c63f057..1e883b60a918 100644
--- a/compilerplugins/clang/xmlimport.cxx
+++ b/compilerplugins/clang/xmlimport.cxx
@@ -10,9 +10,10 @@
  */
 #ifndef LO_CLANG_SHARED_PLUGINS
 
-#include "compat.hxx"
 #include "plugin.hxx"
 #include "check.hxx"
+#include "compat.hxx"
+#include "config_clang.h"
 #include <iostream>
 #include <unordered_map>
 #include "clang/AST/CXXInheritance.h"
@@ -93,7 +94,7 @@ private:
 
 bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
 {
-    auto beginLoc = compat::getBeginLoc(methodDecl);
+    auto beginLoc = methodDecl->getBeginLoc();
     if (!beginLoc.isValid() || ignoreLocation(beginLoc))
         return true;
 
@@ -140,11 +141,11 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
         {
             auto methodDecl1 = it1->second;
             report(DiagnosticsEngine::Warning, "cannot override both endFastElement and EndElement",
-                   compat::getBeginLoc(methodDecl1))
+                   methodDecl1->getBeginLoc())
                 << methodDecl1->getSourceRange();
             auto methodDecl2 = it2->second;
             report(DiagnosticsEngine::Warning, "cannot override both endFastElement and EndElement",
-                   compat::getBeginLoc(methodDecl2))
+                   methodDecl2->getBeginLoc())
                 << methodDecl2->getSourceRange();
         }
     }
@@ -157,12 +158,12 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
             auto methodDecl1 = it1->second;
             report(DiagnosticsEngine::Warning,
                    "cannot override both startFastElement and StartElement",
-                   compat::getBeginLoc(methodDecl1))
+                   methodDecl1->getBeginLoc())
                 << methodDecl1->getSourceRange();
             auto methodDecl2 = it2->second;
             report(DiagnosticsEngine::Warning,
                    "cannot override both startFastElement and StartElement",
-                   compat::getBeginLoc(methodDecl2))
+                   methodDecl2->getBeginLoc())
                 << methodDecl2->getSourceRange();
         }
     }
@@ -173,11 +174,11 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
         {
             auto methodDecl1 = it1->second;
             report(DiagnosticsEngine::Warning, "cannot override both characters and Characters",
-                   compat::getBeginLoc(methodDecl1))
+                   methodDecl1->getBeginLoc())
                 << methodDecl1->getSourceRange();
             auto methodDecl2 = it2->second;
             report(DiagnosticsEngine::Warning, "cannot override both characters and Characters",
-                   compat::getBeginLoc(methodDecl2))
+                   methodDecl2->getBeginLoc())
                 << methodDecl2->getSourceRange();
         }
     }
@@ -188,12 +189,11 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
         auto compoundStmt = dyn_cast_or_null<CompoundStmt>(methodDecl->getBody());
         if (compoundStmt == nullptr || compoundStmt->size() > 0)
             return;
-        report(DiagnosticsEngine::Warning, "empty, should be removed",
-               compat::getBeginLoc(methodDecl))
+        report(DiagnosticsEngine::Warning, "empty, should be removed", methodDecl->getBeginLoc())
             << methodDecl->getSourceRange();
         auto canonicalDecl = methodDecl->getCanonicalDecl();
         if (canonicalDecl != methodDecl)
-            report(DiagnosticsEngine::Note, "definition here", compat::getBeginLoc(canonicalDecl))
+            report(DiagnosticsEngine::Note, "definition here", canonicalDecl->getBeginLoc())
                 << canonicalDecl->getSourceRange();
     };
     auto checkOnlyReturn = [&]() {
@@ -213,12 +213,11 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
             return;
         if (!isa<CXXNullPtrLiteralExpr>(cxxConstructExpr->getArg(0)->IgnoreImplicit()))
             return;
-        report(DiagnosticsEngine::Warning, "empty, should be removed",
-               compat::getBeginLoc(methodDecl))
+        report(DiagnosticsEngine::Warning, "empty, should be removed", methodDecl->getBeginLoc())
             << methodDecl->getSourceRange();
         auto canonicalDecl = methodDecl->getCanonicalDecl();
         if (canonicalDecl != methodDecl)
-            report(DiagnosticsEngine::Note, "definition here", compat::getBeginLoc(canonicalDecl))
+            report(DiagnosticsEngine::Note, "definition here", canonicalDecl->getBeginLoc())
                 << canonicalDecl->getSourceRange();
     };
 
@@ -238,7 +237,7 @@ bool XmlImport::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
 
 bool XmlImport::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr)
 {
-    auto beginLoc = compat::getBeginLoc(callExpr);
+    auto beginLoc = callExpr->getBeginLoc();
     if (!beginLoc.isValid() || ignoreLocation(callExpr))
         return true;
 
@@ -263,7 +262,7 @@ bool XmlImport::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr)
          * Calling this superclass method from a subclass method will mess with the fallback logic in the superclass.
          */
         report(DiagnosticsEngine::Warning, "don't call this superclass method",
-               compat::getBeginLoc(callExpr))
+               callExpr->getBeginLoc())
             << callExpr->getSourceRange();
     }
     return true;
@@ -271,7 +270,7 @@ bool XmlImport::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr)
 
 bool XmlImport::VisitBinaryOperator(const BinaryOperator* binaryOp)
 {
-    auto beginLoc = compat::getBeginLoc(binaryOp);
+    auto beginLoc = binaryOp->getBeginLoc();
     if (!beginLoc.isValid() || ignoreLocation(binaryOp))
         return true;
     auto op = binaryOp->getOpcode();
@@ -281,7 +280,7 @@ bool XmlImport::VisitBinaryOperator(const BinaryOperator* binaryOp)
         if (!isUInt16(expr))
             report(DiagnosticsEngine::Warning,
                    "comparing XML_TOK enum to 'sal_uInt32', expected sal_uInt16",
-                   compat::getBeginLoc(binaryOp))
+                   binaryOp->getBeginLoc())
                 << binaryOp->getSourceRange();
     };
     if (isXmlTokEnum(binaryOp->getLHS()))
@@ -293,13 +292,14 @@ bool XmlImport::VisitBinaryOperator(const BinaryOperator* binaryOp)
 
 bool XmlImport::VisitSwitchStmt(const SwitchStmt* switchStmt)
 {
-    auto beginLoc = compat::getBeginLoc(switchStmt);
+    auto beginLoc = switchStmt->getBeginLoc();
     if (!beginLoc.isValid() || ignoreLocation(switchStmt))
         return true;
     if (isUInt16(switchStmt->getCond()))
         return true;
     // if the condition is an enum type, ignore this switch
-    auto condEnumType = compat::IgnoreImplicit(switchStmt->getCond())
+    auto condEnumType = switchStmt->getCond()
+                            ->IgnoreImplicit()
                             ->getType()
                             ->getUnqualifiedDesugaredType()
                             ->getAs<EnumType>();
@@ -315,7 +315,7 @@ bool XmlImport::VisitSwitchStmt(const SwitchStmt* switchStmt)
             continue;
         report(DiagnosticsEngine::Warning,
                "comparing XML_TOK enum to 'sal_uInt32', expected sal_uInt16",
-               compat::getBeginLoc(caseStmt))
+               caseStmt->getBeginLoc())
             << caseStmt->getSourceRange();
     }
     return true;
@@ -323,7 +323,7 @@ bool XmlImport::VisitSwitchStmt(const SwitchStmt* switchStmt)
 
 bool XmlImport::VisitCallExpr(const CallExpr* callExpr)
 {
-    auto beginLoc = compat::getBeginLoc(callExpr);
+    auto beginLoc = callExpr->getBeginLoc();
     if (!beginLoc.isValid() || ignoreLocation(callExpr))
         return true;
 
@@ -336,7 +336,7 @@ bool XmlImport::VisitCallExpr(const CallExpr* callExpr)
         return true;
     for (unsigned i = 0; i != callExpr->getNumArgs(); ++i)
     {
-        auto argExpr = compat::IgnoreImplicit(callExpr->getArg(i));
+        auto argExpr = callExpr->getArg(i)->IgnoreImplicit();
         if (!isXmlTokEnum(argExpr))
             continue;
         // if the condition is an enum type, ignore this switch
@@ -350,7 +350,7 @@ bool XmlImport::VisitCallExpr(const CallExpr* callExpr)
             return true;
         report(DiagnosticsEngine::Warning,
                "passing XML_TOK enum to 'sal_Int32', wrong param or XML token type",
-               compat::getBeginLoc(callExpr))
+               callExpr->getBeginLoc())
             << callExpr->getSourceRange();
     }
 
@@ -359,7 +359,7 @@ bool XmlImport::VisitCallExpr(const CallExpr* callExpr)
 
 bool XmlImport::isXmlTokEnum(const Expr* expr)
 {
-    expr = compat::IgnoreImplicit(expr);
+    expr = expr->IgnoreImplicit();
     // check that we have an unscoped enum type
     auto condEnumType = expr->getType()->getUnqualifiedDesugaredType()->getAs<EnumType>();
     if (!condEnumType || condEnumType->getDecl()->isScoped())
@@ -370,12 +370,13 @@ bool XmlImport::isXmlTokEnum(const Expr* expr)
     auto enumConstant = dyn_cast<EnumConstantDecl>(declRefExpr->getDecl());
     if (!enumConstant)
         return false;
-    return enumConstant->getIdentifier() && enumConstant->getName().startswith("XML_TOK_");
+    return enumConstant->getIdentifier()
+           && compat::starts_with(enumConstant->getName(), "XML_TOK_");
 }
 
 bool XmlImport::isUInt16(const Expr* expr)
 {
-    expr = compat::IgnoreImplicit(expr);
+    expr = expr->IgnoreImplicit();
     return isUInt16(expr->getType());
 }