loplugin:unusedfields

and filter out the weld fields, since we're not touching them yet Change-Id: I3cc23c46d2650f13cb29c7d381687939d23e2882 Reviewed-on: https://gerrit.libreoffice.org/80104 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2019-10-03 10:53:58 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2019-10-03 12:16:38 +0200
commit: 77e9216ca1073caa0dcec23ef89808cc7f80fc06 (patch)
tree: 71ea2c3841f1a1017123dec44552239d74fd7a4a
parent: 81903d443116c643a9ff92d92c092812abc7f57d (diff)
27 files changed, 330 insertions, 883 deletions
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 03b5e6a65a27..4b49911a92f9 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basegfx/source/polygon/b2dtrapezoid.cxx:202
@@ -130,22 +130,24 @@ cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
 cui/source/dialogs/colorpicker.cxx:710
     cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1374
+cui/source/factory/dlgfact.cxx:1369
     SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/cfgutil.hxx:237
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
-cui/source/inc/cuitabarea.hxx:227
+cui/source/inc/cuitabarea.hxx:225
     SvxAreaTabPage maFixed_ChangeType enum ChangeType
-cui/source/inc/cuitabarea.hxx:235
+cui/source/inc/cuitabarea.hxx:233
     SvxAreaTabPage m_aXFillAttr class XFillAttrSetItem
-cui/source/inc/tabstpge.hxx:88
+cui/source/inc/tabstpge.hxx:85
     SvxTabulatorTabPage m_aLeftWin class TabWin_Impl
-cui/source/inc/tabstpge.hxx:89
+cui/source/inc/tabstpge.hxx:86
     SvxTabulatorTabPage m_aRightWin class TabWin_Impl
-cui/source/inc/tabstpge.hxx:90
+cui/source/inc/tabstpge.hxx:87
     SvxTabulatorTabPage m_aCenterWin class TabWin_Impl
-cui/source/inc/tabstpge.hxx:91
+cui/source/inc/tabstpge.hxx:88
     SvxTabulatorTabPage m_aDezWin class TabWin_Impl
+cui/source/options/optcolor.cxx:237
+    ColorConfigWindow_Impl::Entry m_aDefaultColor class Color
 dbaccess/source/core/api/RowSet.hxx:111
     dbaccess::ORowSet m_aURL class rtl::OUString
 dbaccess/source/core/api/RowSet.hxx:125
@@ -350,13 +352,13 @@ include/vcl/commandevent.hxx:315
     CommandGestureData meOrientation const enum PanningOrientation
 include/vcl/font/Feature.hxx:102
     vcl::font::Feature m_eType const enum vcl::font::FeatureType
-include/vcl/NotebookBarAddonsMerger.hxx:36
+include/vcl/NotebookBarAddonsMerger.hxx:37
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:44
-    AddonsParams sControlType class rtl::OUString
+    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:45
+    AddonsParams sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:46
     AddonsParams nWidth sal_uInt16
 include/vcl/svimpbox.hxx:127
     SvImpLBox m_aFctSet class ImpLBSelEng
@@ -432,7 +434,7 @@ pyuno/source/module/pyuno_impl.hxx:223
     pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:323
     pyuno::stRuntimeImpl ob_base PyObject
-reportdesign/source/core/api/ReportDefinition.cxx:241
+reportdesign/source/core/api/ReportDefinition.cxx:242
     reportdesign::OStyle m_aSize awt::Size
 sal/osl/unx/thread.cxx:91
     osl_thread_priority_st m_Highest int
@@ -452,17 +454,17 @@ sal/qa/osl/condition/osl_Condition.cxx:198
     osl_Condition::wait bRes2 _Bool
 sal/qa/osl/condition/osl_Condition.cxx:269
     osl_Condition::check bRes2 _Bool
-sal/qa/osl/file/osl_File.cxx:1586
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1586
+sal/qa/osl/file/osl_File.cxx:1584
     osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1584
+    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:3419
+sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:67
     osl_Module::ctors bRes1 _Bool
@@ -512,9 +514,9 @@ sc/inc/token.hxx:400
     SingleDoubleRefModifier aDub struct ScComplexRefData
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1257
+sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1258
+sc/source/core/data/document.cxx:1243
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -568,6 +570,10 @@ 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/output.hxx:188
+    ScOutputData nTilePosX long
+sc/source/ui/inc/output.hxx:189
+    ScOutputData nTilePosY long
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
 sc/source/ui/inc/xmlsourcedlg.hxx:62
@@ -592,15 +598,15 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:34
     sd::ZeroconfService port const uint
 sd/source/ui/table/TableDesignPane.hxx:100
     sd::TableDesignPane aImpl const class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1343
+sd/source/ui/view/DocumentRenderer.cxx:1340
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1165
+sd/source/ui/view/viewshel.cxx:1159
     sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1166
+sd/source/ui/view/viewshel.cxx:1160
     sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1167
+sd/source/ui/view/viewshel.cxx:1161
     sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1168
+sd/source/ui/view/viewshel.cxx:1162
     sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
     PDFGrammar::definition comment rule<ScannerT>
@@ -623,11 +629,11 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     PDFGrammar::definition array rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    PDFGrammar::definition dict_end rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     PDFGrammar::definition dict_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     PDFGrammar::definition value rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+    PDFGrammar::definition dict_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     PDFGrammar::definition object_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
@@ -718,8 +724,8 @@ svx/source/dialog/framelinkarray.cxx:381
     svx::frame::MergedCellIterator mnFirstRow size_t
 svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/form/databaselocationinput.cxx:77
-    svx::DatabaseLocationInputController_Impl m_rBrowseButton weld::Button &
+svx/source/dialog/weldeditview.cxx:300
+    WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/gallery2/galbrws2.cxx:114
     (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
 svx/source/stbctrls/pszctrl.cxx:99
@@ -736,8 +742,8 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:139
     ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/layout/layout.cxx:2522
-      class SvtSysLocaleOptions &
+sw/qa/extras/uiwriter/uiwriter2.cxx:66
+      class SwUiWriterTest2 *
 sw/qa/extras/uiwriter/uiwriter.cxx:4065
     IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
@@ -758,7 +764,7 @@ sw/source/uibase/inc/olmenu.hxx:78
     SwSpellPopup m_aBuilder class VclBuilder
 sw/source/uibase/inc/olmenu.hxx:87
     SwSpellPopup m_nLangParaMenuId const sal_uInt16
-sw/source/uibase/inc/swuicnttab.hxx:243
+sw/source/uibase/inc/swuicnttab.hxx:239
     SwTokenWindow m_aAdjustPositionsIdle class Idle
 sw/source/uibase/inc/uivwimp.hxx:93
     SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
@@ -786,7 +792,7 @@ vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
 vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
-vcl/inc/opengl/zone.hxx:46
+vcl/inc/opengl/zone.hxx:58
     OpenGLVCLContextZone aZone const class OpenGLZone
 vcl/inc/qt5/Qt5FilePicker.hxx:84
     Qt5FilePicker m_pFilenameLabel class QLabel *
@@ -800,19 +806,21 @@ vcl/inc/salmenu.hxx:43
     SalMenuButtonItem maImage class Image
 vcl/inc/salmenu.hxx:44
     SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/unx/i18n_ic.hxx:41
+vcl/inc/unx/gtk/gtkframe.hxx:186
+    GtkSalFrame m_nWorkArea int
+vcl/inc/unx/i18n_ic.hxx:40
     SalI18N_InputContext maPreeditStartCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:42
+vcl/inc/unx/i18n_ic.hxx:41
     SalI18N_InputContext maPreeditDoneCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:43
+vcl/inc/unx/i18n_ic.hxx:42
     SalI18N_InputContext maPreeditDrawCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:44
+vcl/inc/unx/i18n_ic.hxx:43
     SalI18N_InputContext maPreeditCaretCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:45
+vcl/inc/unx/i18n_ic.hxx:44
     SalI18N_InputContext maCommitStringCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:46
+vcl/inc/unx/i18n_ic.hxx:45
     SalI18N_InputContext maSwitchIMCallback XIMCallback
-vcl/inc/unx/i18n_ic.hxx:47
+vcl/inc/unx/i18n_ic.hxx:46
     SalI18N_InputContext maDestroyCallback XIMCallback
 vcl/inc/WidgetThemeLibrary.hxx:87
     vcl::ControlDrawParameters nSize uint32_t
@@ -824,9 +832,9 @@ vcl/inc/WidgetThemeLibrary.hxx:90
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:106
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:2835
+vcl/source/app/salvtables.cxx:2870
     SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:5291
+vcl/source/app/salvtables.cxx:5358
     SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:35
     ImplOldJobSetupData cDeviceName char [32]
@@ -838,18 +846,18 @@ vcl/source/gdi/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
 vcl/source/gdi/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int [256]
-vcl/unx/gtk3/gtk3gtkinst.cxx:3890
-    CrippledViewport viewport GtkViewport
-vcl/unx/gtk/a11y/atkhypertext.cxx:29
-    HyperLink atk_hyper_link const AtkHyperlink
-vcl/unx/gtk/a11y/atkwrapper.hxx:49
+vcl/unx/gtk3/a11y/atkwrapper.hxx:47
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:80
-    AtkObjectWrapperClass aParentClass const AtkObjectClass
-vcl/unx/gtk/gloactiongroup.cxx:30
+vcl/unx/gtk3/a11y/atkwrapper.hxx:75
+    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:29
+    HyperLink atk_hyper_link const AtkHyperlink
+vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
-vcl/unx/gtk/glomenu.cxx:20
+vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
+vcl/unx/gtk3/gtk3gtkinst.cxx:4408
+    CrippledViewport viewport GtkViewport
 writerfilter/source/dmapper/PropertyMap.hxx:198
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 xmloff/source/text/XMLTextListBlockContext.hxx:35
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index dd7a4d65c8de..6bd155016392 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -89,6 +89,9 @@ 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
     untouchedSet.add((d[0] + " " + d[1] + " " + fieldType, srcLoc))
@@ -123,6 +126,9 @@ 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:
@@ -165,6 +171,9 @@ 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/")
@@ -199,6 +208,9 @@ 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:
+        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 bc81f81c554a..ec0da36339e5 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -158,7 +158,7 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/options/optcolor.cxx:253
+cui/source/options/optcolor.cxx:255
     ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
 cui/source/options/optpath.cxx:67
     OptPath_Impl m_aDefOpt class SvtDefaultOptions
@@ -174,41 +174,13 @@ dbaccess/source/filter/hsqldb/parseschema.hxx:36
     dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
 dbaccess/source/ui/control/tabletree.cxx:234
     dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
-dbaccess/source/ui/dlg/advancedsettings.hxx:39
-    dbaui::SpecialSettingsPage m_xIsSQL92Check std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:40
-    dbaui::SpecialSettingsPage m_xAppendTableAlias std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:41
-    dbaui::SpecialSettingsPage m_xAsBeforeCorrelationName std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:42
-    dbaui::SpecialSettingsPage m_xEnableOuterJoin std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:43
-    dbaui::SpecialSettingsPage m_xIgnoreDriverPrivileges std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:44
-    dbaui::SpecialSettingsPage m_xParameterSubstitution std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:45
-    dbaui::SpecialSettingsPage m_xSuppressVersionColumn std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:46
-    dbaui::SpecialSettingsPage m_xCatalog std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:47
-    dbaui::SpecialSettingsPage m_xSchema std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:48
-    dbaui::SpecialSettingsPage m_xIndexAppendix std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:49
-    dbaui::SpecialSettingsPage m_xDosLineEnds std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:50
-    dbaui::SpecialSettingsPage m_xCheckRequiredFields std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:51
-    dbaui::SpecialSettingsPage m_xIgnoreCurrency std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:52
-    dbaui::SpecialSettingsPage m_xEscapeDateTime std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:53
-    dbaui::SpecialSettingsPage m_xPrimaryKeySupport std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/advancedsettings.hxx:54
-    dbaui::SpecialSettingsPage m_xRespectDriverResultSetType std::unique_ptr<weld::CheckButton>
 dbaccess/source/ui/inc/charsetlistbox.hxx:44
     dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
-dbaccess/source/ui/inc/WCopyTable.hxx:269
+dbaccess/source/ui/inc/directsql.hxx:65
+    dbaui::DirectSQLDialog m_aColorConfig const svtools::ColorConfig
+dbaccess/source/ui/inc/indexdialog.hxx:43
+    dbaui::DbaIndexDialog m_bEditingActive _Bool
+dbaccess/source/ui/inc/WCopyTable.hxx:263
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
 drawinglayer/source/processor2d/vclprocessor2d.hxx:84
     drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
@@ -292,6 +264,8 @@ include/basic/sbstar.hxx:51
     StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags>
 include/comphelper/interfacecontainer3.hxx:232
     comphelper::OInterfaceContainerHelper3::NotifySingleListener m_pMethod const comphelper::OInterfaceContainerHelper3::NotifySingleListener::NotificationMethod
+include/comphelper/parallelsort.hxx:164
+    comphelper::(anonymous namespace)::Binner maLabels uint8_t [mnMaxStaticSize]
 include/connectivity/DriversConfig.hxx:75
     connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
 include/connectivity/sdbcx/VCatalog.hxx:69
@@ -352,8 +326,6 @@ include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:32
     MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
-include/svtools/genericunodialog.hxx:121
-    svt::OGenericUnoDialog m_bNeedInitialization _Bool
 include/svx/dialcontrol.hxx:112
     svx::DialControl::DialControl_Impl mnLinkedFieldValueMultiplyer sal_Int32
 include/svx/graphctl.hxx:52
@@ -379,7 +351,7 @@ include/test/sheet/xnamedranges.hxx:49
 include/test/sheet/xspreadsheets2.hxx:46
     apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo7/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo4/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -408,10 +380,20 @@ include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
 include/vcl/ppdparser.hxx:127
     psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
-io/source/stm/odata.cxx:585
-    io_stm::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
-io/source/stm/odata.cxx:585
+include/vcl/settings.hxx:149
+    DialogStyle content_area_spacing int
+include/vcl/settings.hxx:162
+    FrameStyle left int
+include/vcl/settings.hxx:163
+    FrameStyle right int
+include/vcl/settings.hxx:164
+    FrameStyle top int
+include/vcl/settings.hxx:165
+    FrameStyle bottom int
+io/source/stm/odata.cxx:571
     io_stm::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
+io/source/stm/odata.cxx:571
+    io_stm::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:51
     GtvLokDialogPrivate m_nChildKeyModifier guint32
 libreofficekit/source/gtk/lokdocview.cxx:84
@@ -461,7 +443,7 @@ sal/rtl/uuid.cxx:65
 sc/inc/compiler.hxx:126
     ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
 sc/inc/compiler.hxx:127
-    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo7/sc/inc/compiler.hxx:124:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo4/sc/inc/compiler.hxx:124:9)
 sc/inc/compiler.hxx:132
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
@@ -522,13 +504,13 @@ sc/source/ui/vba/vbaworksheet.hxx:50
     ScVbaWorksheet mxButtons ::rtl::Reference<ScVbaSheetObjectsBase> [2]
 sd/inc/Outliner.hxx:277
     SdOutliner mpFirstObj class SdrObject *
-sd/inc/sdmod.hxx:118
-    SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
 sd/inc/sdmod.hxx:119
+    SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
+sd/inc/sdmod.hxx:120
     SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
-sd/source/core/CustomAnimationCloner.cxx:71
+sd/source/core/CustomAnimationCloner.cxx:68
     sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
-sd/source/core/CustomAnimationCloner.cxx:72
+sd/source/core/CustomAnimationCloner.cxx:69
     sd::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> >
 sd/source/ui/inc/unopage.hxx:165
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
@@ -556,16 +538,22 @@ sdext/source/pdfimport/tree/style.hxx:43
     pdfi::StyleContainer::Style Contents const class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:96
     sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
-sfx2/source/inc/versdlg.hxx:83
-    SfxCmisVersionsDialog m_xVersionBox std::unique_ptr<weld::TreeView>
 slideshow/source/engine/slideshowimpl.cxx:156
     (anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:399
     UCBStorageStream_Impl m_aKey const class rtl::OString
-starmath/source/view.cxx:861
+starmath/source/view.cxx:862
     SmViewShell_Impl aOpts class SvtMiscOptions
 store/source/storbios.cxx:57
     OStoreSuperBlock m_aMarked OStoreSuperBlock::L
+svgio/inc/svgstyleattributes.hxx:185
+    svgio::svgreader::SvgStyleAttributes mpSvgGradientNodeFill const class svgio::svgreader::SvgGradientNode *
+svgio/inc/svgstyleattributes.hxx:186
+    svgio::svgreader::SvgStyleAttributes mpSvgGradientNodeStroke const class svgio::svgreader::SvgGradientNode *
+svgio/inc/svgstyleattributes.hxx:187
+    svgio::svgreader::SvgStyleAttributes mpSvgPatternNodeFill const class svgio::svgreader::SvgPatternNode *
+svgio/inc/svgstyleattributes.hxx:188
+    svgio::svgreader::SvgStyleAttributes mpSvgPatternNodeStroke const class svgio::svgreader::SvgPatternNode *
 svl/source/crypto/cryptosign.cxx:283
     (anonymous namespace)::PKIStatusInfo status SECItem
 svl/source/crypto/cryptosign.cxx:303
@@ -576,32 +564,30 @@ svl/source/misc/strmadpt.cxx:51
     SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1]
 svl/source/uno/pathservice.cxx:35
     PathService m_aOptions const class SvtPathOptions
-svtools/source/control/tabbar.cxx:202
+svtools/source/control/tabbar.cxx:200
     ImplTabBarItem maHelpId const class rtl::OString
-svtools/source/dialogs/insdlg.cxx:46
+svtools/source/dialogs/insdlg.cxx:45
     OleObjectDescriptor cbSize const sal_uInt32
-svtools/source/dialogs/insdlg.cxx:47
+svtools/source/dialogs/insdlg.cxx:46
     OleObjectDescriptor clsid const ClsId
-svtools/source/dialogs/insdlg.cxx:48
+svtools/source/dialogs/insdlg.cxx:47
     OleObjectDescriptor dwDrawAspect const sal_uInt32
-svtools/source/dialogs/insdlg.cxx:49
+svtools/source/dialogs/insdlg.cxx:48
     OleObjectDescriptor sizel const class Size
-svtools/source/dialogs/insdlg.cxx:50
+svtools/source/dialogs/insdlg.cxx:49
     OleObjectDescriptor pointl const class Point
-svtools/source/dialogs/insdlg.cxx:51
+svtools/source/dialogs/insdlg.cxx:50
     OleObjectDescriptor dwStatus const sal_uInt32
-svtools/source/dialogs/insdlg.cxx:52
+svtools/source/dialogs/insdlg.cxx:51
     OleObjectDescriptor dwFullUserTypeName sal_uInt32
-svtools/source/dialogs/insdlg.cxx:53
+svtools/source/dialogs/insdlg.cxx:52
     OleObjectDescriptor dwSrcOfCopy sal_uInt32
-svtools/source/table/gridtablerenderer.cxx:70
+svtools/source/table/gridtablerenderer.cxx:69
     svt::table::CachedSortIndicator m_sortAscending class BitmapEx
-svtools/source/table/gridtablerenderer.cxx:71
+svtools/source/table/gridtablerenderer.cxx:70
     svt::table::CachedSortIndicator m_sortDescending class BitmapEx
 svx/inc/sdr/overlay/overlayrectangle.hxx:44
     sdr::overlay::OverlayRectangle mbOverlayState _Bool
-svx/source/dialog/fntctrl.cxx:174
-    FontPrevWin_Impl mbUseResText _Bool
 svx/source/inc/datanavi.hxx:215
     svxform::XFormsPage m_aMethodString const class svxform::MethodString
 svx/source/inc/datanavi.hxx:216
@@ -616,8 +602,6 @@ svx/source/inc/gridcell.hxx:528
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/svdraw/svdpdf.hxx:174
     ImpSdrPdfImport maDash const class XDash
-svx/source/unodraw/recoveryui.cxx:68
-    (anonymous namespace)::RecoveryUI m_pParentWindow weld::Window *
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree const editeng::Trie
 sw/inc/calc.hxx:197
@@ -662,7 +646,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:113
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
 sw/source/uibase/inc/fldmgr.hxx:79
     SwInsertField_Data m_aDBDataSource const css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:439
+toolkit/source/awt/vclxtoolkit.cxx:430
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
@@ -674,7 +658,7 @@ ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
 ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:73
+ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:74
     hierarchy_ucp::DataSupplier_Impl m_aIterator const class HierarchyEntry::iterator
 ucbhelper/source/client/proxydecider.cxx:124
     ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const struct ucbhelper::InternetProxyServer
@@ -752,12 +736,16 @@ vcl/inc/salwtype.hxx:205
     SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong
 vcl/inc/salwtype.hxx:211
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:286
+vcl/inc/svdata.hxx:269
+    ImplSVNWFData mnMenuSeparatorBorderX int
+vcl/inc/svdata.hxx:272
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
+vcl/inc/svdata.hxx:276
+    ImplSVNWFData mbToolboxDropDownSeparate _Bool
+vcl/inc/svdata.hxx:279
+    ImplSVNWFData mbOpenMenuOnF10 _Bool
 vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
-vcl/inc/unx/i18n_status.hxx:54
-    vcl::I18NStatus m_aCurrentIM const class rtl::OUString
 vcl/inc/unx/saldisp.hxx:282
     SalDisplay m_aInvalidScreenData const struct SalDisplay::ScreenData
 vcl/inc/WidgetThemeLibrary.hxx:21
@@ -910,6 +898,8 @@ vcl/inc/WidgetThemeLibrary.hxx:135
     vcl::WidgetThemeLibrary_t drawListHeader _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
 vcl/inc/WidgetThemeLibrary.hxx:137
     vcl::WidgetThemeLibrary_t updateSettings _Bool (*)(struct vcl::WidgetDrawStyle &)
+vcl/source/control/roadmapwizard.cxx:62
+    vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
 vcl/source/control/tabctrl.cxx:79
     ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
 vcl/source/filter/jpeg/Exif.hxx:51
@@ -980,16 +970,16 @@ vcl/source/treelist/headbar.cxx:41
     ImplHeadItem maImage const class Image
 vcl/source/window/menuitemlist.hxx:56
     MenuItemData aAccessibleName const class rtl::OUString
-vcl/unx/gtk3/gtk3gtkinst.cxx:1168
-     out gpointer *
-vcl/unx/gtk/a11y/atkwrapper.hxx:49
+vcl/unx/gtk3/a11y/atkwrapper.hxx:47
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:80
-    AtkObjectWrapperClass aParentClass const AtkObjectClass
-vcl/unx/gtk/gloactiongroup.cxx:30
+vcl/unx/gtk3/a11y/atkwrapper.hxx:75
+    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
-vcl/unx/gtk/glomenu.cxx:20
+vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
+vcl/unx/gtk3/gtk3gtkinst.cxx:1566
+     out gpointer *
 writerfilter/inc/ooxml/QNameToString.hxx:41
     writerfilter::QNameToString mMap writerfilter::QNameToString::Map
 writerfilter/source/ooxml/OOXMLFactory.hxx:63
@@ -1000,19 +990,19 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:65
     writerfilter::ooxml::AttributeInfo m_nRef const Id
 xmloff/inc/MultiPropertySetHelper.hxx:78
     MultiPropertySetHelper aEmptyAny const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.cxx:449
+xmloff/source/chart/SchXMLChartContext.cxx:444
     (anonymous namespace)::NewDonutSeries msStyleName const class rtl::OUString
-xmloff/source/chart/SchXMLChartContext.hxx:54
+xmloff/source/chart/SchXMLChartContext.hxx:52
     SeriesDefaultsAndStyles maErrorIndicatorDefault const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:55
+xmloff/source/chart/SchXMLChartContext.hxx:53
     SeriesDefaultsAndStyles maErrorCategoryDefault const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:56
+xmloff/source/chart/SchXMLChartContext.hxx:54
     SeriesDefaultsAndStyles maConstantErrorLowDefault const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:57
+xmloff/source/chart/SchXMLChartContext.hxx:55
     SeriesDefaultsAndStyles maConstantErrorHighDefault const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:58
+xmloff/source/chart/SchXMLChartContext.hxx:56
     SeriesDefaultsAndStyles maPercentageErrorDefault const css::uno::Any
-xmloff/source/chart/SchXMLChartContext.hxx:59
+xmloff/source/chart/SchXMLChartContext.hxx:57
     SeriesDefaultsAndStyles maErrorMarginDefault const css::uno::Any
-xmloff/source/core/xmlexp.cxx:262
+xmloff/source/core/xmlexp.cxx:254
     SvXMLExport_Impl maSaveOptions const class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index a3c84a5897c4..e8845e4890c0 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -5,13 +5,11 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
-basctl/source/basicide/moduldlg.hxx:113
-    basctl::OrganizePage m_xContainer std::unique_ptr<weld::Container>
 basctl/source/inc/dlged.hxx:122
     basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
 basic/qa/cppunit/basictest.hxx:27
@@ -24,24 +22,6 @@ canvas/source/vcl/impltools.hxx:117
     vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
 canvas/workben/canvasdemo.cxx:83
     DemoRenderer maColorWhite uno::Sequence<double>
-chart2/source/controller/dialogs/res_DataLabel.hxx:86
-    chart::DataLabelResources m_xDC_Dial std::unique_ptr<weld::CustomWeld>
-chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx:60
-    chart::ThreeD_SceneAppearance_TabPage m_xContainer std::unique_ptr<weld::Container>
-chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx:74
-    chart::ThreeD_SceneGeometry_TabPage m_xContainer std::unique_ptr<weld::Container>
-chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:94
-    chart::ThreeD_SceneIllumination_TabPage m_xContainer std::unique_ptr<weld::Container>
-chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:111
-    chart::ThreeD_SceneIllumination_TabPage m_xPreviewWnd std::unique_ptr<weld::CustomWeld>
-chart2/source/controller/dialogs/tp_AxisLabel.hxx:60
-    chart::SchAxisLabelTabPage m_xFlOrient std::unique_ptr<weld::Label>
-chart2/source/controller/dialogs/tp_AxisPositions.hxx:62
-    chart::AxisPositionsTabPage m_xCB_AxisBetweenCategories std::unique_ptr<weld::CheckButton>
-chart2/source/controller/dialogs/tp_RangeChooser.hxx:84
-    chart::RangeChooserTabPage m_xFT_Range std::unique_ptr<weld::Label>
-chart2/source/controller/dialogs/tp_TitleRotation.hxx:44
-    chart::SchAlignmentTabPage m_xFtTextDirection std::unique_ptr<weld::Label>
 chart2/source/controller/inc/RangeSelectionListener.hxx:63
     chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
 comphelper/source/container/enumerablemap.cxx:290
@@ -58,124 +38,14 @@ cppu/source/threadpool/threadpool.cxx:354
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:57
     AlignSize_Impl nInt16 sal_Int16
-cui/source/dialogs/colorpicker.cxx:712
-    cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld>
-cui/source/dialogs/colorpicker.cxx:714
-    cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/align.hxx:102
-    svx::AlignmentTabPage m_xBoxDirection std::unique_ptr<weld::Widget>
-cui/source/inc/cfg.hxx:572
-    SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button>
-cui/source/inc/cfg.hxx:605
-    SvxIconSelectorDialog m_xTbSymbolWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigaldlg.hxx:241
-    TPGalleryThemeProperties m_xWndPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigrfflt.hxx:75
-    GraphicFilterDialog mxPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigrfflt.hxx:172
-    GraphicFilterEmboss mxCtlLight std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:711
-    SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:712
-    SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld>
-cui/source/inc/DiagramDialog.hxx:27
-    DiagramDialog mpBtnOk std::unique_ptr<weld::Button>
-cui/source/inc/DiagramDialog.hxx:28
-    DiagramDialog mpBtnCancel std::unique_ptr<weld::Button>
-cui/source/inc/FontFeaturesDialog.hxx:52
-    cui::FontFeaturesDialog m_xContentWindow std::unique_ptr<weld::ScrolledWindow>
-cui/source/inc/FontFeaturesDialog.hxx:54
-    cui::FontFeaturesDialog m_xPreviewWindow std::unique_ptr<weld::CustomWeld>
-cui/source/inc/hlmailtp.hxx:35
-    SvxHyperlinkMailTp m_xFtSubject std::unique_ptr<weld::Label>
-cui/source/inc/page.hxx:100
-    SvxPageDescPage m_xOrientationFT std::unique_ptr<weld::Label>
-cui/source/inc/page.hxx:130
-    SvxPageDescPage m_xBspWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:62
-    SvxStdParagraphTabPage m_xRightLabel std::unique_ptr<weld::Label>
-cui/source/inc/paragrph.hxx:86
-    SvxStdParagraphTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:152
-    SvxParaAlignTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:157
-    SvxParaAlignTabPage m_xPropertiesFL std::unique_ptr<weld::Widget>
-cui/source/inc/SpellDialog.hxx:149
-    svx::SpellDialog m_xIgnoreOnceFT std::unique_ptr<weld::Label>
-cui/source/inc/SpellDialog.hxx:171
-    svx::SpellDialog m_xSentenceEDWeld std::unique_ptr<weld::CustomWeld>
-cui/source/inc/swpossizetabpage.hxx:87
-    SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/textattr.hxx:64
-    SvxTextAttrPage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:101
-    SvxPositionSizeTabPage m_xCtlPos std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:187
-    SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:190
-    SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld>
-cui/source/options/optinet2.hxx:105
-    SvxSecurityTabPage m_xCertFrame std::unique_ptr<weld::Container>
-cui/source/options/optinet2.hxx:108
-    SvxSecurityTabPage m_xTSAURLsFrame std::unique_ptr<weld::Container>
-cui/source/options/optjava.hxx:84
-    SvxJavaOptionsPage m_xJavaFrame std::unique_ptr<weld::Widget>
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-dbaccess/source/ui/dlg/advancedsettings.hxx:97
-    dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/advancedsettings.hxx:99
-    dbaui::GeneratedValuesPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:59
-    dbaui::OCommonBehaviourTabPage m_xAutoRetrievingEnabled std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/detailpages.hxx:60
-    dbaui::OCommonBehaviourTabPage m_xAutoIncrementLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:61
-    dbaui::OCommonBehaviourTabPage m_xAutoIncrement std::unique_ptr<weld::Entry>
-dbaccess/source/ui/dlg/detailpages.hxx:62
-    dbaui::OCommonBehaviourTabPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:63
-    dbaui::OCommonBehaviourTabPage m_xAutoRetrieving std::unique_ptr<weld::Entry>
-dbaccess/source/ui/dlg/dsselect.hxx:40
-    dbaui::ODatasourceSelectDialog m_xOk std::unique_ptr<weld::Button>
-dbaccess/source/ui/dlg/dsselect.hxx:41
-    dbaui::ODatasourceSelectDialog m_xCancel std::unique_ptr<weld::Button>
-dbaccess/source/ui/dlg/dsselect.hxx:42
-    dbaui::ODatasourceSelectDialog m_xManageDatasources std::unique_ptr<weld::Button>
-dbaccess/source/ui/dlg/generalpage.hxx:137
-    dbaui::OGeneralPageWizard m_xFT_HelpText std::unique_ptr<weld::Label>
-desktop/source/deployment/gui/dp_gui_dialog2.hxx:120
-    dp_gui::ExtMgrDialog m_xExtensionBoxWnd std::unique_ptr<weld::CustomWeld>
-desktop/source/deployment/gui/dp_gui_dialog2.hxx:206
-    dp_gui::UpdateRequiredDialog m_xExtensionBoxWnd std::unique_ptr<weld::CustomWeld>
 emfio/source/emfuno/xemfparser.cxx:61
     emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
-extensions/source/scanner/grid.hxx:37
-    GridDialog m_xOKButton std::unique_ptr<weld::Button>
-extensions/source/scanner/grid.hxx:41
-    GridDialog m_xGridWindowWND std::unique_ptr<weld::CustomWeld>
-extensions/source/scanner/sanedlg.hxx:76
-    SaneDlg mxPreviewWnd std::unique_ptr<weld::CustomWeld>
 extensions/source/scanner/scanner.hxx:46
     ScannerManager maProtector osl::Mutex
-filter/source/pdf/impdialog.hxx:178
-    ImpPDFTabGeneralPage mxSelectedSheets std::unique_ptr<weld::Label>
-filter/source/xsltdialog/xmlfiltertabpagebasic.hxx:36
-    XMLFilterTabPageBasic m_xContainer std::unique_ptr<weld::Widget>
-filter/source/xsltdialog/xmlfiltertabpagexslt.hxx:48
-    XMLFilterTabPageXSLT m_xContainer std::unique_ptr<weld::Widget>
 helpcompiler/inc/HelpCompiler.hxx:197
     HelpCompiler lang const std::string
-include/cui/cuicharmap.hxx:103
-    SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld>
-include/cui/cuicharmap.hxx:104
-    SvxCharacterMap m_xRecentCharView std::unique_ptr<weld::CustomWeld> [16]
-include/cui/cuicharmap.hxx:105
-    SvxCharacterMap m_xFavCharView std::unique_ptr<weld::CustomWeld> [16]
-include/cui/cuicharmap.hxx:107
-    SvxCharacterMap m_xShowSetArea std::unique_ptr<weld::CustomWeld>
-include/cui/cuicharmap.hxx:109
-    SvxCharacterMap m_xSearchSetArea std::unique_ptr<weld::CustomWeld>
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:58
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
 include/editeng/unotext.hxx:604
@@ -188,170 +58,136 @@ include/oox/vml/vmlshapecontext.hxx:116
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
 include/registry/registry.hxx:35
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/dinfdlg.hxx:471
-    CmisValue m_xFrame std::unique_ptr<weld::Frame>
-include/sfx2/dinfdlg.hxx:480
-    CmisDateTime m_xFrame std::unique_ptr<weld::Frame>
-include/sfx2/dinfdlg.hxx:490
-    CmisYesNo m_xFrame std::unique_ptr<weld::Frame>
-include/sfx2/mgetempl.hxx:63
-    SfxManageStyleSheetPage m_xNameFt std::unique_ptr<weld::Label>
 include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc const std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs const sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 aAttrib struct SfxTypeAttrib [1]
-include/sfx2/msg.hxx:132
-    SfxType1 nAttribs sal_uInt16
+    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
+    SfxType1 nAttribs sal_uInt16
+include/sfx2/msg.hxx:132
+    SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:133
     SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
     SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
-    SfxType2 aAttrib struct SfxTypeAttrib [2]
-include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
-include/sfx2/msg.hxx:134
-    SfxType3 aAttrib struct SfxTypeAttrib [3]
+include/sfx2/msg.hxx:133
+    SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:134
     SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
     SfxType3 nAttribs sal_uInt16
-include/sfx2/msg.hxx:135
-    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:135
-    SfxType4 pType const std::type_info *
+include/sfx2/msg.hxx:134
+    SfxType3 aAttrib struct SfxTypeAttrib [3]
 include/sfx2/msg.hxx:135
     SfxType4 aAttrib struct SfxTypeAttrib [4]
 include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
+include/sfx2/msg.hxx:135
+    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:135
+    SfxType4 pType const std::type_info *
+include/sfx2/msg.hxx:136
+    SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
     SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
     SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:136
-    SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:137
     SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:137
     SfxType6 aAttrib struct SfxTypeAttrib [6]
-include/sfx2/msg.hxx:138
-    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
+include/sfx2/msg.hxx:137
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
+include/sfx2/msg.hxx:138
+    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:138
+    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
+    SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
     SfxType8 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 nAttribs sal_uInt16
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:139
+    SfxType8 aAttrib struct SfxTypeAttrib [8]
 include/sfx2/msg.hxx:140
     SfxType10 pType const std::type_info *
 include/sfx2/msg.hxx:140
-    SfxType10 nAttribs sal_uInt16
-include/sfx2/msg.hxx:140
     SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:140
     SfxType10 aAttrib struct SfxTypeAttrib [10]
+include/sfx2/msg.hxx:140
+    SfxType10 nAttribs sal_uInt16
+include/sfx2/msg.hxx:141
+    SfxType11 nAttribs sal_uInt16
 include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
     SfxType11 pType const std::type_info *
 include/sfx2/msg.hxx:141
-    SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:141
     SfxType11 aAttrib struct SfxTypeAttrib [11]
 include/sfx2/msg.hxx:143
     SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:143
-    SfxType13 nAttribs sal_uInt16
-include/sfx2/msg.hxx:143
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:143
     SfxType13 aAttrib struct SfxTypeAttrib [13]
+include/sfx2/msg.hxx:143
+    SfxType13 nAttribs sal_uInt16
+include/sfx2/msg.hxx:144
+    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
     SfxType14 aAttrib struct SfxTypeAttrib [14]
 include/sfx2/msg.hxx:144
     SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
-include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
+    SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 nAttribs sal_uInt16
-include/sfx2/msg.hxx:145
     SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:145
+    SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:146
     SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:146
+    SfxType17 aAttrib struct SfxTypeAttrib [17]
+include/sfx2/msg.hxx:146
     SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
-    SfxType17 aAttrib struct SfxTypeAttrib [17]
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
-    SfxType23 pType const std::type_info *
-include/sfx2/msg.hxx:147
     SfxType23 aAttrib struct SfxTypeAttrib [23]
 include/sfx2/msg.hxx:147
+    SfxType23 pType const std::type_info *
+include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/templatedlg.hxx:139
-    SfxTemplateManagerDlg mxSearchViewWeld std::unique_ptr<weld::CustomWeld>
-include/sfx2/templatedlg.hxx:140
-    SfxTemplateManagerDlg mxLocalViewWeld std::unique_ptr<weld::CustomWeld>
-include/svtools/ctrlbox.hxx:281
-    SvtLineListBox m_xLineSetWin std::unique_ptr<weld::CustomWeld>
-include/svtools/genericunodialog.hxx:216
+include/svtools/genericunodialog.hxx:156
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
-include/svtools/PlaceEditDialog.hxx:45
-    PlaceEditDialog m_xBTCancel std::unique_ptr<weld::Button>
 include/svtools/unoevent.hxx:163
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
-include/svx/ClassificationDialog.hxx:54
-    svx::ClassificationDialog m_xEditWindowWeld std::unique_ptr<weld::CustomWeld>
-include/svx/colorwindow.hxx:133
-    ColorWindow mxColorSetWin std::unique_ptr<weld::CustomWeld>
-include/svx/colorwindow.hxx:134
-    ColorWindow mxRecentColorSetWin std::unique_ptr<weld::CustomWeld>
-include/svx/hdft.hxx:84
-    SvxHFPage m_xBspWin std::unique_ptr<weld::CustomWeld>
 include/svx/imapdlg.hxx:94
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/svx/imapdlg.hxx:108
-    SvxIMapDlg m_xIMapWndWeld std::unique_ptr<weld::CustomWeld>
-include/svx/rubydialog.hxx:67
-    SvxRubyDialog m_xLeftFT std::unique_ptr<weld::Label>
-include/svx/rubydialog.hxx:68
-    SvxRubyDialog m_xRightFT std::unique_ptr<weld::Label>
-include/svx/rubydialog.hxx:95
-    SvxRubyDialog m_xPreview std::unique_ptr<weld::CustomWeld>
-include/svx/sidebar/PanelLayout.hxx:28
-    PanelLayout m_xContainer std::unique_ptr<weld::Container>
 include/vcl/commandevent.hxx:310
     CommandGestureData mfX const double
 include/vcl/commandevent.hxx:311
@@ -362,13 +198,13 @@ include/vcl/filter/PngImageReader.hxx:31
     vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
 include/vcl/font/Feature.hxx:102
     vcl::font::Feature m_eType const enum vcl::font::FeatureType
-include/vcl/NotebookBarAddonsMerger.hxx:36
+include/vcl/NotebookBarAddonsMerger.hxx:37
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:44
-    AddonsParams sControlType class rtl::OUString
+    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:45
+    AddonsParams sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:46
     AddonsParams nWidth sal_uInt16
 include/vcl/uitest/uiobject.hxx:272
     TabPageUIObject mxTabPage VclPtr<class TabPage>
@@ -412,10 +248,6 @@ pyuno/source/module/pyuno_impl.hxx:223
     pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:323
     pyuno::stRuntimeImpl ob_base PyObject
-reportdesign/source/ui/inc/PageNumber.hxx:38
-    rptui::OPageNumberDialog m_xPageN std::unique_ptr<weld::RadioButton>
-reportdesign/source/ui/inc/PageNumber.hxx:41
-    rptui::OPageNumberDialog m_xBottomPage std::unique_ptr<weld::RadioButton>
 reportdesign/source/ui/inc/ReportWindow.hxx:54
     rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
 sal/osl/unx/thread.cxx:91
@@ -436,17 +268,17 @@ sal/qa/osl/condition/osl_Condition.cxx:198
     osl_Condition::wait bRes2 _Bool
 sal/qa/osl/condition/osl_Condition.cxx:269
     osl_Condition::check bRes2 _Bool
-sal/qa/osl/file/osl_File.cxx:1586
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1586
+sal/qa/osl/file/osl_File.cxx:1584
     osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1584
+    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1585
     osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:3419
+sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:67
     osl_Module::ctors bRes1 _Bool
@@ -461,15 +293,15 @@ sal/qa/osl/module/osl_Module.cxx:339
 sal/qa/osl/pipe/osl_Pipe.cxx:359
     osl_Pipe::clear bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:524
-    osl_Pipe::getError bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:524
     osl_Pipe::getError bRes1 _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:524
+    osl_Pipe::getError bRes _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:562
     osl_Pipe::getHandle bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:846
-    osl_StreamPipe::recv bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:846
     osl_StreamPipe::recv bRes _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:846
+    osl_StreamPipe::recv bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes _Bool
 sal/qa/osl/security/osl_Security.cxx:59
@@ -482,9 +314,9 @@ sal/qa/osl/security/osl_Security.cxx:189
     osl_Security::getConfigDir bRes1 _Bool
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1257
+sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1258
+sc/source/core/data/document.cxx:1243
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -492,97 +324,31 @@ sc/source/filter/html/htmlpars.cxx:3005
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:62
     oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
-sc/source/ui/inc/colorformat.hxx:31
-    ScDataBarSettingsDlg mxBtnCancel std::unique_ptr<weld::Button>
-sc/source/ui/inc/consdlg.hxx:71
-    ScConsolidateDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/crdlg.hxx:32
-    ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton>
-sc/source/ui/inc/dbnamdlg.hxx:86
-    ScDbNameDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/delcodlg.hxx:39
-    ScDeleteContentsDlg m_xBtnOk std::unique_ptr<weld::Button>
 sc/source/ui/inc/docsh.hxx:455
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
-sc/source/ui/inc/instbdlg.hxx:66
-    ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton>
-sc/source/ui/inc/namedefdlg.hxx:57
-    ScNameDefDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/namedlg.hxx:73
-    ScNameDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/optsolver.hxx:145
-    ScOptSolverDlg m_xFtOperator std::unique_ptr<weld::Label>
-sc/source/ui/inc/PivotLayoutDialog.hxx:88
-    ScPivotLayoutDialog mxOptions std::unique_ptr<weld::Expander>
-sc/source/ui/inc/PivotLayoutDialog.hxx:89
-    ScPivotLayoutDialog mxMore std::unique_ptr<weld::Expander>
+sc/source/ui/inc/output.hxx:188
+    ScOutputData nTilePosX long
+sc/source/ui/inc/output.hxx:189
+    ScOutputData nTilePosY long
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
-sc/source/ui/inc/pvfundlg.hxx:83
-    ScDPFunctionDlg mxBtnOk std::unique_ptr<weld::Button>
-sc/source/ui/inc/pvfundlg.hxx:123
-    ScDPSubtotalDlg mxBtnOk std::unique_ptr<weld::Button>
-sc/source/ui/inc/RegressionDialog.hxx:27
-    ScRegressionDialog mxPowerRadioButton std::unique_ptr<weld::RadioButton>
-sc/source/ui/inc/retypepassdlg.hxx:32
-    PassFragment m_xSheetsBox std::unique_ptr<weld::Container>
-sc/source/ui/inc/scuiimoptdlg.hxx:63
-    ScImportOptionsDlg m_xBtnOk std::unique_ptr<weld::Button>
-sc/source/ui/inc/scuitphfedit.hxx:94
-    ScHFEditPage m_xWndCenterWnd std::unique_ptr<weld::CustomWeld>
-sd/source/ui/animations/CustomAnimationDialog.cxx:1738
-    sd::CustomAnimationEffectTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:1744
-    sd::CustomAnimationEffectTabPage mxFTSound std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:1747
-    sd::CustomAnimationEffectTabPage mxFTAfterEffect std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2268
-    sd::CustomAnimationDurationTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2269
-    sd::CustomAnimationDurationTabPage mxFTStart std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2271
-    sd::CustomAnimationDurationTabPage mxFTStartDelay std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2634
-    sd::CustomAnimationTextAnimTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2635
-    sd::CustomAnimationTextAnimTabPage mxFTGroupText std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.hxx:141
-    sd::SdPropertySubControl mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/dlg/headerfooterdlg.cxx:116
-    sd::HeaderFooterTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/dlg/headerfooterdlg.cxx:136
-    sd::HeaderFooterTabPage mxCTPreviewWin std::unique_ptr<weld::CustomWeld>
-sd/source/ui/dlg/PhotoAlbumDialog.hxx:53
-    sd::SdPhotoAlbumDialog m_xImg std::unique_ptr<weld::CustomWeld>
-sd/source/ui/inc/BulletAndPositionDlg.hxx:100
-    SvxBulletAndPositionDlg m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-sd/source/ui/inc/BulletAndPositionDlg.hxx:104
-    SvxBulletAndPositionDlg m_xIndentFT std::unique_ptr<weld::Label>
-sd/source/ui/inc/custsdlg.hxx:42
-    SdCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
-sd/source/ui/inc/custsdlg.hxx:44
-    SdCustomShowDlg m_xBtnOK std::unique_ptr<weld::Button>
-sd/source/ui/inc/custsdlg.hxx:74
-    SdDefineCustomShowDlg m_xBtnCancel std::unique_ptr<weld::Button>
-sd/source/ui/inc/custsdlg.hxx:75
-    SdDefineCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
 sd/source/ui/remotecontrol/ZeroconfService.hxx:34
     sd::ZeroconfService port const uint
 sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
 sd/source/ui/table/TableDesignPane.hxx:100
     sd::TableDesignPane aImpl const class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1343
+sd/source/ui/view/DocumentRenderer.cxx:1340
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1165
+sd/source/ui/view/viewshel.cxx:1159
     sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1166
+sd/source/ui/view/viewshel.cxx:1160
     sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1167
+sd/source/ui/view/viewshel.cxx:1161
     sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1168
+sd/source/ui/view/viewshel.cxx:1162
     sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sd/source/ui/view/ViewShellBase.cxx:196
+sd/source/ui/view/ViewShellBase.cxx:188
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     PDFGrammar::definition array rule<ScannerT>
@@ -590,44 +356,18 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     PDFGrammar::definition value rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:105
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/inc/autoredactdialog.hxx:111
-    SfxAutoRedactDialog m_xRedactionTargetsLabel std::unique_ptr<weld::Label>
 sfx2/source/dialog/basedlgs.cxx:55
     SfxModelessDialog_Impl aMoveIdle class Idle
 sfx2/source/doc/doctempl.cxx:117
     DocTempl::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
-sfx2/source/inc/versdlg.hxx:79
-    SfxCmisVersionsDialog m_xOpenButton std::unique_ptr<weld::Button>
-sfx2/source/inc/versdlg.hxx:80
-    SfxCmisVersionsDialog m_xViewButton std::unique_ptr<weld::Button>
-sfx2/source/inc/versdlg.hxx:81
-    SfxCmisVersionsDialog m_xDeleteButton std::unique_ptr<weld::Button>
-sfx2/source/inc/versdlg.hxx:82
-    SfxCmisVersionsDialog m_xCompareButton std::unique_ptr<weld::Button>
-sfx2/source/view/viewfrm.cxx:166
-    (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button>
-sfx2/source/view/viewfrm.cxx:167
-    (anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button>
 slideshow/source/engine/opengl/TransitionImpl.cxx:1990
     (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1990
     (anonymous namespace)::ThreeFloats y GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1990
     (anonymous namespace)::ThreeFloats x GLfloat
-starmath/inc/dialog.hxx:90
-    SmFontDialog m_xShowFont std::unique_ptr<weld::CustomWeld>
-starmath/inc/dialog.hxx:334
-    SmSymbolDialog m_xSymbolSetDisplayArea std::unique_ptr<weld::CustomWeld>
-starmath/inc/dialog.hxx:336
-    SmSymbolDialog m_xSymbolDisplay std::unique_ptr<weld::CustomWeld>
-starmath/inc/dialog.hxx:413
-    SmSymDefineDialog m_xOldSymbolDisplay std::unique_ptr<weld::CustomWeld>
-starmath/inc/dialog.hxx:414
-    SmSymDefineDialog m_xSymbolDisplay std::unique_ptr<weld::CustomWeld>
-starmath/inc/dialog.hxx:416
-    SmSymDefineDialog m_xCharsetDisplayArea std::unique_ptr<weld::CustomWeld>
 starmath/inc/smmod.hxx:69
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
 starmath/inc/view.hxx:216
@@ -644,102 +384,22 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (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/contimp.hxx:89
-    SvxSuperContourDlg m_xStbStatusColorWeld std::unique_ptr<weld::CustomWeld>
-svx/source/dialog/contimp.hxx:90
-    SvxSuperContourDlg m_xContourWndWeld std::unique_ptr<weld::CustomWeld>
-svx/source/inc/datanavi.hxx:405
-    svxform::AddDataItemDialog m_xDataTypeFT std::unique_ptr<weld::Label>
-svx/source/inc/datanavi.hxx:588
-    svxform::AddInstanceDialog m_xURLFT std::unique_ptr<weld::Label>
-svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:151
-    textconversiondlgs::ChineseDictionaryDialog m_xFT_Term std::unique_ptr<weld::Label>
-svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:154
-    textconversiondlgs::ChineseDictionaryDialog m_xFT_Mapping std::unique_ptr<weld::Label>
-svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:157
-    textconversiondlgs::ChineseDictionaryDialog m_xFT_Property std::unique_ptr<weld::Label>
-sw/qa/extras/layout/layout.cxx:2522
-      class SvtSysLocaleOptions &
+svx/source/dialog/weldeditview.cxx:300
+    WeldEditSource m_rEditAcc class WeldEditAccessible &
+sw/qa/extras/uiwriter/uiwriter2.cxx:66
+      class SwUiWriterTest2 *
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:78
     TableWait m_pWait const std::unique_ptr<SwWait>
 sw/source/core/layout/dbg_lay.cxx:172
     SwImplEnterLeave nAction const enum DbgAction
-sw/source/ui/config/mailconfigpage.cxx:54
-    SwTestAccountSettingsDialog m_xEstablish std::unique_ptr<weld::Label>
-sw/source/ui/config/mailconfigpage.cxx:55
-    SwTestAccountSettingsDialog m_xFind std::unique_ptr<weld::Label>
-sw/source/ui/dbui/mmaddressblockpage.hxx:267
-    SwAssignFieldsDialog m_xLabelGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmaddressblockpage.hxx:268
-    SwAssignFieldsDialog m_xComboGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmaddressblockpage.hxx:269
-    SwAssignFieldsDialog m_xPreviewGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmgreetingspage.hxx:116
-    SwMailBodyDialog m_xBodyFT std::unique_ptr<weld::Label>
-sw/source/ui/envelp/labfmt.hxx:77
-    SwLabFormatPage m_xPreview std::unique_ptr<weld::CustomWeld>
-sw/source/ui/fldui/fldfunc.hxx:52
-    SwFieldFuncPage m_xListItemFT std::unique_ptr<weld::Label>
-sw/source/ui/fldui/fldfunc.hxx:55
-    SwFieldFuncPage m_xListItemsFT std::unique_ptr<weld::Label>
-sw/source/ui/fldui/fldfunc.hxx:60
-    SwFieldFuncPage m_xListNameFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:67
-    SwMMResultPrintDialog m_xPrinterFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:97
-    SwMMResultEmailDialog m_xMailToFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:100
-    SwMMResultEmailDialog m_xSubjectFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:102
-    SwMMResultEmailDialog m_xSendAsFT std::unique_ptr<weld::Label>
-sw/source/ui/misc/impfnote.hxx:44
-    SwEndNoteOptionPage m_xPosFT std::unique_ptr<weld::Label>
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/cption.hxx:55
-    SwCaptionDialog m_xPosText std::unique_ptr<weld::Label>
-sw/source/uibase/inc/cption.hxx:60
-    SwCaptionDialog m_xPreview std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/dbui.hxx:29
-    PrintMonitor m_xDocName std::unique_ptr<weld::Label>
-sw/source/uibase/inc/drpcps.hxx:133
-    SwDropCapsPage m_xPict std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/frmpage.hxx:121
-    SwFramePage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/frmpage.hxx:222
-    SwGrfExtPage m_xFlAngle std::unique_ptr<weld::Frame>
-sw/source/uibase/inc/frmpage.hxx:290
-    SwFrameAddPage m_xDescriptionFT std::unique_ptr<weld::Label>
-sw/source/uibase/inc/frmpage.hxx:292
-    SwFrameAddPage m_xPrevFT std::unique_ptr<weld::Label>
-sw/source/uibase/inc/frmpage.hxx:294
-    SwFrameAddPage m_xNextFT std::unique_ptr<weld::Label>
-sw/source/uibase/inc/insfnote.hxx:38
-    SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
-sw/source/uibase/inc/num.hxx:47
-    SwNumPositionTabPage m_xPositionFrame std::unique_ptr<weld::Widget>
-sw/source/uibase/inc/num.hxx:74
-    SwNumPositionTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/outline.hxx:85
-    SwOutlineSettingsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/pggrid.hxx:44
-    SwTextGridPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/regionsw.hxx:214
-    SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/splittbl.hxx:30
-    SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton>
-sw/source/uibase/inc/splittbl.hxx:31
-    SwSplitTableDlg m_xContentCopyRB std::unique_ptr<weld::RadioButton>
-sw/source/uibase/inc/swuicnttab.hxx:243
+sw/source/uibase/inc/swuicnttab.hxx:239
     SwTokenWindow m_aAdjustPositionsIdle class Idle
-sw/source/uibase/inc/swuicnttab.hxx:248
-    SwTokenWindow m_xContainer std::unique_ptr<weld::Container>
 sw/source/uibase/inc/uivwimp.hxx:93
     SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
 sw/source/uibase/inc/unodispatch.hxx:45
@@ -750,9 +410,7 @@ unoidl/source/unoidlprovider.cxx:672
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider>
 unoidl/source/unoidlprovider.cxx:673
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
-uui/source/unknownauthdlg.hxx:36
-    UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton>
-vcl/inc/opengl/zone.hxx:46
+vcl/inc/opengl/zone.hxx:58
     OpenGLVCLContextZone aZone const class OpenGLZone
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
@@ -768,6 +426,8 @@ vcl/inc/qt5/Qt5Graphics.hxx:58
     Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salprn.hxx:45
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
+vcl/inc/unx/gtk/gtkframe.hxx:186
+    GtkSalFrame m_nWorkArea int
 vcl/inc/WidgetThemeLibrary.hxx:87
     vcl::ControlDrawParameters nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:88
@@ -790,19 +450,9 @@ vcl/source/gdi/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int [256]
 vcl/source/uitest/uno/uitest_uno.cxx:35
     UITestUnoObj mpUITest std::unique_ptr<UITest>
-vcl/unx/generic/print/prtsetup.hxx:73
-    RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/generic/print/prtsetup.hxx:108
-    RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/gtk3/gtk3gtkinst.cxx:3890
-    CrippledViewport viewport GtkViewport
-vcl/unx/gtk/a11y/atkhypertext.cxx:29
+vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:29
     HyperLink atk_hyper_link const AtkHyperlink
+vcl/unx/gtk3/gtk3gtkinst.cxx:4408
+    CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
-writerperfect/inc/WPFTEncodingDialog.hxx:37
-    writerperfect::WPFTEncodingDialog m_xBtnOk std::unique_ptr<weld::Button>
-xmlsecurity/inc/certificateviewer.hxx:70
-    CertificateViewerTP mxContainer std::unique_ptr<weld::Container>
-xmlsecurity/inc/macrosecurity.hxx:67
-    MacroSecurityTP m_xContainer std::unique_ptr<weld::Container>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 241d6dce5c89..4681a68a201b 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -92,6 +92,8 @@ codemaker/source/javamaker/classfile.cxx:540
      doubleBytes double
 comphelper/qa/container/comphelper_ifcontainer.cxx:42
     ContainerListener m_pStats struct ContainerStats *const
+comphelper/qa/unit/parallelsorttest.cxx:44
+    ParallelSortTest mnThreads size_t
 comphelper/source/misc/asyncnotification.cxx:80
     comphelper::EventNotifierImpl pKeepThisAlive std::shared_ptr<AsyncEventNotifierAutoJoin>
 configmgr/source/components.cxx:162
@@ -134,7 +136,7 @@ connectivity/source/drivers/postgresql/pq_statics.hxx:216
     pq_sdbc_driver::Statics HELP_TEXT class rtl::OUString
 connectivity/source/inc/calc/CConnection.hxx:54
     connectivity::calc::OCalcConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
-connectivity/source/inc/odbc/OConnection.hxx:57
+connectivity/source/inc/odbc/OConnection.hxx:55
     connectivity::odbc::OConnection m_sUser class rtl::OUString
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx:72
     connectivity::odbc::ODatabaseMetaDataResultSet m_aStatement css::uno::WeakReferenceHelper
@@ -198,70 +200,22 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
+cppu/source/uno/copy.hxx:39
+    cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32
+cppu/source/uno/copy.hxx:40
+    cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32
 cppuhelper/source/access_control.cxx:79
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
 cppuhelper/source/typemanager.cxx:825
     (anonymous namespace)::BaseOffset set_ std::set<OUString>
-cui/source/inc/backgrnd.hxx:132
-    SvxBackgroundTabPage m_xBackgroundColorSetWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/backgrnd.hxx:133
-    SvxBackgroundTabPage m_xPreviewWin1 std::unique_ptr<weld::CustomWeld>
-cui/source/inc/border.hxx:131
-    SvxBorderTabPage m_xWndPresetsWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/border.hxx:152
-    SvxBorderTabPage m_xWndShadowsWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/chardlg.hxx:39
-    SvxCharBasePage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/connect.hxx:52
-    SvxConnectionPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
 cui/source/inc/cuihyperdlg.hxx:46
     SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
 cui/source/inc/cuihyperdlg.hxx:77
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-cui/source/inc/cuitabarea.hxx:325
-    SvxShadowTabPage m_xCtlXRectPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:391
-    SvxGradientTabPage m_xGradientLBWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:611
-    SvxPatternTabPage m_xCtlPixelWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:613
-    SvxPatternTabPage m_xPatternLBWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:713
-    SvxColorTabPage m_xValSetColorListWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:714
-    SvxColorTabPage m_xValSetRecentListWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:156
-    SvxLineTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:277
-    SvxLineDefTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:353
-    SvxLineEndDefTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/grfpage.hxx:87
-    SvxGrfCropPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/measure.hxx:56
-    SvxMeasurePage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
-cui/source/inc/measure.hxx:57
-    SvxMeasurePage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numfmt.hxx:120
-    SvxNumberFormatTabPage m_xWndPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:73
-    SvxSingleNumPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:107
-    SvxBulletPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:148
-    SvxNumPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:190
-    SvxBitmapPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:272
-    SvxNumOptionsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:368
-    SvxNumPositionTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
 cui/source/inc/screenshotannotationdlg.hxx:30
     ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
-cui/source/options/optchart.hxx:50
-    SvxDefaultColorOptPage m_xValSetColorBoxWin std::unique_ptr<weld::CustomWeld>
 dbaccess/source/core/dataaccess/databasedocument.hxx:176
     dbaccess::ODatabaseDocument m_pEventExecutor ::rtl::Reference<DocumentEventExecutor>
 dbaccess/source/core/dataaccess/documentdefinition.cxx:287
@@ -278,11 +232,13 @@ dbaccess/source/ui/browser/dbloader.cxx:69
     DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
 dbaccess/source/ui/inc/RelationController.hxx:33
     dbaui::ORelationController m_pWaitObject std::unique_ptr<WaitObject>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:218
+dbaccess/source/ui/inc/WTypeSelect.hxx:74
+    dbaui::OWizTypeSelectList m_pParentTabPage class dbaui::OWizTypeSelect *
+desktop/qa/desktop_lib/test_desktop_lib.cxx:223
     DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1228
+desktop/source/app/app.cxx:1209
     desktop::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1229
+desktop/source/app/app.cxx:1210
     desktop::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx:136
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
@@ -300,13 +256,13 @@ desktop/source/deployment/manager/dp_managerfac.cxx:47
     dp_manager::factory::PackageManagerFactoryImpl m_xTmpMgr Reference<deployment::XPackageManager>
 desktop/source/deployment/manager/dp_managerfac.cxx:48
     dp_manager::factory::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
-desktop/unx/source/splashx.c:370
-     functions unsigned long
-desktop/unx/source/splashx.c:370
-     flags unsigned long
-desktop/unx/source/splashx.c:370
+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/source/attribute/sdrfillgraphicattribute.cxx:47
     drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool
@@ -378,6 +334,8 @@ include/canvas/rendering/irendermodule.hxx:38
     canvas::Vertex y float
 include/canvas/rendering/irendermodule.hxx:38
     canvas::Vertex z float
+include/comphelper/parallelsort.hxx:89
+    comphelper::(anonymous namespace)::ProfileZone mbDummy _Bool
 include/comphelper/unique_disposing_ptr.hxx:30
     comphelper::unique_disposing_ptr m_xTerminateListener css::uno::Reference<css::frame::XTerminateListener>
 include/drawinglayer/attribute/sdrallattribute3d.hxx:44
@@ -460,15 +418,13 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:158
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/button.hxx:284
-    RadioButton mbSaveValue _Bool
-include/vcl/NotebookBarAddonsMerger.hxx:53
-    AddonNotebookBarItem sTarget class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:54
-    AddonNotebookBarItem sContext class rtl::OUString
+    AddonNotebookBarItem sTarget class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:55
-    AddonNotebookBarItem sControlType class rtl::OUString
+    AddonNotebookBarItem sContext class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:56
+    AddonNotebookBarItem sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:57
     AddonNotebookBarItem nWidth sal_uInt16
 include/vcl/opengl/OpenGLContext.hxx:32
     GLWindow bMultiSampleSupported _Bool
@@ -478,6 +434,8 @@ include/vcl/salnativewidgets.hxx:534
     PushButtonValue mbBevelButton _Bool
 include/vcl/salnativewidgets.hxx:535
     PushButtonValue mbSingleLine _Bool
+include/vcl/sysdata.hxx:67
+    SystemEnvData pSalFrame void *
 include/vcl/textrectinfo.hxx:32
     TextRectInfo mnLineCount sal_uInt16
 include/vcl/vclenum.hxx:199
@@ -522,11 +480,11 @@ registry/source/reflread.cxx:466
     ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b2 sal_uInt32
 reportdesign/inc/RptObject.hxx:72
     rptui::OObjectBase m_xKeepShapeAlive css::uno::Reference<css::uno::XInterface>
-sal/qa/osl/file/osl_File.cxx:4156
+sal/qa/osl/file/osl_File.cxx:4154
     osl_Directory::isOpen nError1 osl::class FileBase::RC
-sal/qa/osl/file/osl_File.cxx:4156
+sal/qa/osl/file/osl_File.cxx:4154
     osl_Directory::isOpen nError2 osl::class FileBase::RC
-sal/qa/osl/file/osl_File.cxx:4214
+sal/qa/osl/file/osl_File.cxx:4212
     osl_Directory::close nError2 osl::class FileBase::RC
 sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
@@ -544,11 +502,11 @@ sal/textenc/tcvtutf7.cxx:99
     ImplUTF7ToUCContextData mnBitBuffer sal_uInt32
 sal/textenc/tcvtutf7.cxx:100
     ImplUTF7ToUCContextData mnBufferBits sal_uInt32
-sal/textenc/tcvtutf7.cxx:395
+sal/textenc/tcvtutf7.cxx:415
     ImplUTF7FromUCContextData mbShifted _Bool
-sal/textenc/tcvtutf7.cxx:396
+sal/textenc/tcvtutf7.cxx:416
     ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
-sal/textenc/tcvtutf7.cxx:397
+sal/textenc/tcvtutf7.cxx:417
     ImplUTF7FromUCContextData mnBufferBits sal_uInt32
 sc/inc/compiler.hxx:256
     ScCompiler::AddInMap pODFF const char *
@@ -574,7 +532,7 @@ sc/source/core/data/column.cxx:1397
     (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
 sc/source/core/data/column.cxx:1398
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags const enum ScCloneFlags
-sc/source/core/data/table2.cxx:3647
+sc/source/core/data/table2.cxx:3664
     (anonymous namespace)::OutlineArrayFinder mpArray class ScOutlineArray *
 sc/source/filter/excel/xltoolbar.hxx:25
     TBCCmd A _Bool
@@ -646,7 +604,7 @@ sc/source/ui/inc/PivotLayoutTreeListData.hxx:38
     ScPivotLayoutTreeListData maDataItemValues std::vector<std::unique_ptr<ScItemValue> >
 sc/source/ui/inc/preview.hxx:47
     ScPreview nTabPage long
-sc/source/ui/inc/tabvwsh.hxx:121
+sc/source/ui/inc/tabvwsh.hxx:123
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
 sc/source/ui/inc/transobj.hxx:47
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
@@ -656,9 +614,9 @@ sc/source/ui/inc/uiitems.hxx:48
     ScInputStatusItem aEndPos const class ScAddress
 sc/source/ui/vba/vbachartobject.hxx:44
     ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
-sd/inc/sdmod.hxx:132
+sd/inc/sdmod.hxx:133
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
-sd/source/ui/dlg/RemoteDialogClientBox.hxx:68
+sd/source/ui/dlg/RemoteDialogClientBox.hxx:67
     sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
 sd/source/ui/framework/module/ToolBarModule.hxx:75
     sd::framework::ToolBarModule mpToolBarManagerLock std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
@@ -672,10 +630,6 @@ sd/source/ui/inc/navigatr.hxx:124
     SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
 sd/source/ui/inc/navigatr.hxx:125
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
-sd/source/ui/inc/pubdlg.hxx:126
-    SdPublishingDlg m_xPage5_ButtonsWnd std::unique_ptr<weld::CustomWeld>
-sd/source/ui/inc/pubdlg.hxx:140
-    SdPublishingDlg m_xPage6_PreviewWnd std::unique_ptr<weld::CustomWeld>
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
 sd/source/ui/inc/unopage.hxx:279
@@ -698,7 +652,7 @@ sd/source/ui/slidesorter/controller/SlsListener.hxx:147
     sd::slidesorter::controller::Listener mpModelChangeLock std::shared_ptr<SlideSorterController::ModelChangeLock>
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:119
     sd::slidesorter::controller::Clipboard mxUndoContext std::unique_ptr<UndoContext>
-sd/source/ui/view/ToolBarManager.cxx:320
+sd/source/ui/view/ToolBarManager.cxx:315
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
 sdext/source/presenter/PresenterTimer.cxx:106
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
@@ -706,13 +660,13 @@ sfx2/source/appl/fileobj.hxx:37
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
 sfx2/source/doc/sfxbasemodel.cxx:449
     SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
-sfx2/source/inc/appdata.hxx:76
+sfx2/source/inc/appdata.hxx:75
     SfxAppData_Impl pDocTopics std::unique_ptr<SfxDdeDocTopics_Impl>
-sfx2/source/inc/appdata.hxx:77
+sfx2/source/inc/appdata.hxx:76
     SfxAppData_Impl pTriggerTopic std::unique_ptr<SfxDdeTriggerTopic_Impl>
-sfx2/source/inc/appdata.hxx:78
+sfx2/source/inc/appdata.hxx:77
     SfxAppData_Impl pDdeService2 std::unique_ptr<DdeService>
-sfx2/source/inc/appdata.hxx:92
+sfx2/source/inc/appdata.hxx:91
     SfxAppData_Impl mxAppPickList std::unique_ptr<SfxPickList>
 sfx2/source/inc/splitwin.hxx:51
     SfxSplitWindow pActive VclPtr<class SfxDockingWindow>
@@ -826,10 +780,14 @@ sw/inc/swmodule.hxx:109
     SwModule m_xLinguServiceEventListener css::uno::Reference<css::linguistic2::XLinguServiceEventListener>
 sw/inc/swwait.hxx:45
     SwWait mpLockedDispatchers std::unordered_set<SfxDispatcher *>
-sw/inc/unoframe.hxx:314
+sw/inc/unoframe.hxx:313
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
 sw/inc/view.hxx:184
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
+sw/qa/api/SwXTextFrame.cxx:46
+    (anonymous namespace)::SwXTextFrame mxTextRange uno::Reference<text::XTextRange>
+sw/qa/api/SwXTextFrame.cxx:47
+    (anonymous namespace)::SwXTextFrame mxTextContent uno::Reference<text::XTextContent>
 sw/source/core/inc/swfont.hxx:986
     SvStatistics nGetTextSize sal_uInt16
 sw/source/core/inc/swfont.hxx:987
@@ -848,7 +806,7 @@ sw/source/core/table/swtable.cxx:2599
     SwTableCellInfo::Impl m_HandledTableBoxes SwTableCellInfo::Impl::TableBoxes_t
 sw/source/core/text/porfld.hxx:59
     SwFieldPortion m_nAttrFieldType sal_uInt16
-sw/source/filter/html/swhtml.hxx:368
+sw/source/filter/html/swhtml.hxx:367
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> >
 sw/source/filter/inc/rtf.hxx:28
     RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
@@ -857,31 +815,15 @@ sw/source/filter/inc/rtf.hxx:29
 sw/source/filter/inc/rtf.hxx:30
     RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo7/sw/source/filter/inc/rtf.hxx:27:9)
-sw/source/uibase/inc/column.hxx:131
-    SwColumnPage m_xDefaultVS std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/frmpage.hxx:224
-    SwGrfExtPage m_xCtlAngle std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/frmpage.hxx:225
-    SwGrfExtPage m_xBmpWin std::unique_ptr<weld::CustomWeld>
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/glossary.hxx:63
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
 sw/source/uibase/inc/maildispatcher.hxx:146
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
 sw/source/uibase/inc/maildispatcher.hxx:152
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
-sw/source/uibase/inc/optpage.hxx:297
-    SwRedlineOptionsTabPage m_xInsertedPreview std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/optpage.hxx:302
-    SwRedlineOptionsTabPage m_xDeletedPreview std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/optpage.hxx:307
-    SwRedlineOptionsTabPage m_xChangedPreview std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/optpage.hxx:312
-    SwRedlineOptionsTabPage m_xMarkPreview std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
-sw/source/uibase/inc/swuicnttab.hxx:80
-    SwMultiTOXTabDialog m_xExampleFrameWin std::unique_ptr<weld::CustomWeld>
 testtools/source/bridgetest/cppobj.cxx:148
     bridge_object::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
 ucb/source/ucp/gio/gio_mount.hxx:74
@@ -1008,14 +950,20 @@ vcl/inc/salwtype.hxx:250
     SalSwipeEvent mnVelocityY double
 vcl/inc/sft.hxx:478
     vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
-vcl/inc/svdata.hxx:423
+vcl/inc/svdata.hxx:408
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
-vcl/inc/unx/gtk/gtkframe.hxx:88
+vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
-vcl/inc/unx/gtk/gtkframe.hxx:89
+vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
-vcl/inc/unx/gtk/gtkframe.hxx:90
+vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
+vcl/inc/unx/gtk/gtkframe.hxx:191
+    GtkSalFrame m_bWindowIsGtkPlug _Bool
+vcl/inc/unx/gtk/gtkframe.hxx:192
+    GtkSalFrame m_aTitle class rtl::OUString
+vcl/inc/unx/salframe.h:99
+    X11SalFrame mbInShow _Bool
 vcl/inc/WidgetThemeLibrary.hxx:20
     vcl::WidgetDrawStyle nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:91
@@ -1024,7 +972,7 @@ vcl/inc/WidgetThemeLibrary.hxx:92
     vcl::ControlDrawParameters bIsAction _Bool
 vcl/inc/WidgetThemeLibrary.hxx:93
     vcl::ControlDrawParameters nValue int64_t
-vcl/opengl/salbmp.cxx:445
+vcl/opengl/salbmp.cxx:440
     (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
 vcl/source/filter/graphicfilter.cxx:653
     ImpFilterLibCacheEntry maFiltername const class rtl::OUString
@@ -1042,61 +990,59 @@ vcl/source/gdi/pdfwriter_impl.hxx:180
     vcl::PDFWriterImpl::BitmapID m_nChecksum BitmapChecksum
 vcl/source/gdi/pdfwriter_impl.hxx:181
     vcl::PDFWriterImpl::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/unx/generic/app/wmadaptor.cxx:1264
-    _mwmhints flags unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1264
+vcl/unx/generic/app/wmadaptor.cxx:1259
     _mwmhints func unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1264
+vcl/unx/generic/app/wmadaptor.cxx:1259
+    _mwmhints flags unsigned long
+vcl/unx/generic/app/wmadaptor.cxx:1259
     _mwmhints deco unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1265
+vcl/unx/generic/app/wmadaptor.cxx:1260
     _mwmhints input_mode long
-vcl/unx/generic/app/wmadaptor.cxx:1266
+vcl/unx/generic/app/wmadaptor.cxx:1261
     _mwmhints status unsigned long
-vcl/unx/generic/gdi/cairotextrender.cxx:53
+vcl/unx/generic/gdi/cairotextrender.cxx:50
     (anonymous namespace)::CairoFontsCache::CacheId maFace (anonymous namespace)::FT_Face
-vcl/unx/generic/gdi/cairotextrender.cxx:55
+vcl/unx/generic/gdi/cairotextrender.cxx:52
     (anonymous namespace)::CairoFontsCache::CacheId mbEmbolden _Bool
-vcl/unx/generic/gdi/cairotextrender.cxx:56
+vcl/unx/generic/gdi/cairotextrender.cxx:53
     (anonymous namespace)::CairoFontsCache::CacheId mbVerticalMetrics _Bool
-vcl/unx/gtk3/gtk3gtkinst.cxx:1168
-     in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:3156
-    GtkInstanceDialog m_xDialogController std::shared_ptr<weld::DialogController>
-vcl/unx/gtk/a11y/atkutil.cxx:142
-    DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
-vcl/unx/gtk/a11y/atkwrapper.hxx:49
+vcl/unx/gtk3/a11y/atkwrapper.hxx:47
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:80
-    AtkObjectWrapperClass aParentClass const AtkObjectClass
-vcl/unx/gtk/gloactiongroup.cxx:30
+vcl/unx/gtk3/a11y/atkwrapper.hxx:75
+    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk3/a11y/gtk3atkutil.cxx:142
+    DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
+vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
-vcl/unx/gtk/glomenu.cxx:20
+vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk/hudawareness.cxx:20
+vcl/unx/gtk3/gtk3gtkinst.cxx:1566
+     in char *
+vcl/unx/gtk3/gtk3hudawareness.cxx:17
     HudAwarenessHandle connection GDBusConnection *
-vcl/unx/gtk/hudawareness.cxx:23
+vcl/unx/gtk3/gtk3hudawareness.cxx:20
     HudAwarenessHandle notify GDestroyNotify
-vcl/workben/vcldemo.cxx:1740
+vcl/workben/vcldemo.cxx:1744
     DemoWin mxThread rtl::Reference<RenderThread>
 writerfilter/source/dmapper/PropertyMap.hxx:198
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-xmlhelp/source/cxxhelp/provider/databases.hxx:254
+xmlhelp/source/cxxhelp/provider/databases.hxx:251
     chelp::Databases m_aDatabases chelp::Databases::DatabasesTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:260
+xmlhelp/source/cxxhelp/provider/databases.hxx:257
     chelp::Databases m_aModInfo chelp::Databases::ModInfoTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:263
+xmlhelp/source/cxxhelp/provider/databases.hxx:260
     chelp::Databases m_aKeywordInfo chelp::Databases::KeywordInfoTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:269
+xmlhelp/source/cxxhelp/provider/databases.hxx:266
     chelp::Databases m_aZipFileTable chelp::Databases::ZipFileTable
-xmlhelp/source/cxxhelp/provider/databases.hxx:275
+xmlhelp/source/cxxhelp/provider/databases.hxx:272
     chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable
-xmloff/source/draw/ximpstyl.hxx:221
+xmloff/source/draw/ximpstyl.hxx:224
     SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> >
 xmloff/source/forms/elementexport.hxx:47
     xmloff::OElementExport m_pXMLElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/forms/elementexport.hxx:104
     xmloff::OControlExport m_pOuterElement std::unique_ptr<SvXMLElementExport>
-xmloff/source/forms/officeforms.hxx:65
+xmloff/source/forms/officeforms.hxx:67
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/text/txtimp.cxx:524
     XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index c0bbcae30eda..4bf1dc2c1f75 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -72,7 +72,6 @@ namespace dbaui
                                    const Reference< XComponentContext >& _rxContext)
         : GenericDialogController(pParent, "dbaccess/ui/indexdesigndialog.ui", "IndexDesignDialog")
         , m_xConnection(_rxConnection)
-        , m_bEditingActive(false)
         , m_bEditAgain(false)
         , m_bNoHandlerCall(false)
         , m_xContext(_rxContext)
@@ -146,7 +145,7 @@ namespace dbaui
 
     void DbaIndexDialog::updateToolbox()
     {
-        m_xActions->set_item_sensitive("ID_INDEX_NEW", !m_bEditingActive);
+        m_xActions->set_item_sensitive("ID_INDEX_NEW", true);
 
         int nSelected = m_xIndexList->get_selected_index();
         bool bSelectedAnything = nSelected != -1;
@@ -427,17 +426,6 @@ namespace dbaui
 
     IMPL_LINK_NOARG(DbaIndexDialog, OnCloseDialog, weld::Button&, void)
     {
-        if (m_bEditingActive)
-        {
-            OSL_ENSURE(!m_bEditAgain, "DbaIndexDialog::OnCloseDialog: somebody was faster than hell!");
-                // this means somebody entered a new name, which was invalid, which cause us to posted us an event,
-                // and before the event arrived the user clicked onto "close". VERY fast, this user...
-            m_xIndexList->end_editing();
-            if (m_bEditAgain)
-                // could not commit the new name (started a new - asynchronous - edit trial)
-                return;
-        }
-
         // the currently selected entry
         std::unique_ptr<weld::TreeIter> xSelected(m_xIndexList->make_iterator());
         // the selected index
@@ -661,9 +649,6 @@ namespace dbaui
     {
 //TODO        m_xIndexList->EndSelection();
 
-        if (m_bEditingActive)
-            m_xIndexList->end_editing();
-
         std::unique_ptr<weld::TreeIter> xSelected(m_xIndexList->make_iterator());
         if (!m_xIndexList->get_selected(xSelected.get()))
             xSelected.reset();
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index b431f4e17250..4a0f240a788f 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -66,14 +66,11 @@ namespace dbaui
 
         DECL_LINK(CommandHdl, const CommandEvent&, bool);
 
-        OWizTypeSelect* m_pParentTabPage;
-
         Link<weld::TreeView&, void> m_aChangeHdl;
 
     public:
         OWizTypeSelectList(std::unique_ptr<weld::TreeView> xControl);
         void SetPKey(bool bPKey) { m_bPKey = bPKey; }
-        void SetParentTabPage(OWizTypeSelect* pParentTabPage) { m_pParentTabPage = pParentTabPage; }
         weld::TreeView* GetWidget() { return m_xControl.get(); }
         OUString get_selected_id() const { return m_xControl->get_selected_id(); }
         void show() { m_xControl->show(); }
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 15598d99c04b..eda10e99c695 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -40,7 +40,6 @@ namespace dbaui
 
         std::unique_ptr<OIndexCollection> m_xIndexes;
         std::unique_ptr<weld::TreeIter> m_xPreviousSelection;
-        bool                            m_bEditingActive;
         bool                            m_bEditAgain;
         bool                            m_bNoHandlerCall;
 
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 59c115f9334c..390a6a5a7a0f 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -221,8 +221,6 @@ OWizTypeSelect::OWizTypeSelect(weld::Container* pPage, OCopyTableWizard* pWizard
     , m_bAutoIncrementEnabled(false)
     , m_bDuplicateName(false)
 {
-    m_xColumnNames->SetParentTabPage(this);
-
     m_xColumnNames->connect_changed(LINK(this,OWizTypeSelect,ColumnSelectHdl));
 
     m_xTypeControl->Show();
@@ -334,7 +332,6 @@ IMPL_LINK_NOARG(OWizTypeSelect, ButtonClickHdl, weld::Button&, void)
 OWizTypeSelectList::OWizTypeSelectList(std::unique_ptr<weld::TreeView> xControl)
     : m_xControl(std::move(xControl))
     , m_bPKey(false)
-    , m_pParentTabPage(nullptr)
 {
     m_xControl->connect_popup_menu(LINK(this, OWizTypeSelectList, CommandHdl));
 }
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index f7be71ae5092..d2a2812ce8f8 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -146,32 +146,15 @@ public:
 struct DialogStyle
 {
     int content_area_border;
-    int content_area_spacing;
     int button_spacing;
     int action_area_border;
     DialogStyle()
         : content_area_border(2)
-        , content_area_spacing(0)
         , button_spacing(6)
         , action_area_border(5)
     {}
 };
 
-struct FrameStyle
-{
-    int left;
-    int right;
-    int top;
-    int bottom;
-    FrameStyle()
-        : left(0)
-        , right(0)
-        , top(0)
-        , bottom(0)
-    {}
-};
-
-
 enum class StyleSettingsOptions
 {
     NONE           = 0x0000,
@@ -557,9 +540,6 @@ public:
     const DialogStyle&              GetDialogStyle() const;
     void                            SetDialogStyle( const DialogStyle& rStyle );
 
-    const FrameStyle&               GetFrameStyle() const;
-    void                            SetFrameStyle( const FrameStyle& rStyle );
-
     BitmapEx const &                GetPersonaHeader() const;
 
     BitmapEx const &                GetPersonaFooter() const;
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index dac11f924ac3..68b138c627de 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -185,8 +185,6 @@ private:
     long nScrW;                 // Output size (Pixel)
     long nScrH;
     long nMirrorW;              // Visible output width for mirroring (default: nScrW)
-    long nTilePosX;             // Current tile X offset (twips)
-    long nTilePosY;             // Current tile Y offset (twips)
     SCCOL const nX1;            // Start-/End coordinates
     SCROW const nY1;            //  ( incl. hidden )
     SCCOL const nX2;
@@ -306,8 +304,7 @@ public:
                                     SCCOL nNewX1, SCROW nNewY1, SCCOL nNewX2, SCROW nNewY2,
                                     double nPixelPerTwipsX, double nPixelPerTwipsY,
                                     const Fraction* pZoomX = nullptr,
-                                    const Fraction* pZoomY = nullptr,
-                                    long nNewTilePosX = 0, long nNewTilePosY = 0 );
+                                    const Fraction* pZoomY = nullptr );
 
                     ~ScOutputData();
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 947961218438..61664d813b54 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1230,8 +1230,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
                              -nTopLeftTileRowOffset,
                              nTopLeftTileCol, nTopLeftTileRow,
                              nBottomRightTileCol, nBottomRightTileRow,
-                             fPPTX, fPPTY, nullptr, nullptr,
-                             nTilePosX, nTilePosY);
+                             fPPTX, fPPTY, nullptr, nullptr);
 
     // setup the SdrPage so that drawinglayer works correctly
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9697bd8dc9de..2903ad0d172e 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -136,8 +136,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
                             SCTAB nNewTab, long nNewScrX, long nNewScrY,
                             SCCOL nNewX1, SCROW nNewY1, SCCOL nNewX2, SCROW nNewY2,
                             double nPixelPerTwipsX, double nPixelPerTwipsY,
-                            const Fraction* pZoomX, const Fraction* pZoomY,
-                            long nNewTilePosX, long nNewTilePosY ) :
+                            const Fraction* pZoomX, const Fraction* pZoomY ) :
     mpDev( pNewDev ),
     mpRefDevice( pNewDev ),      // default is output device
     pFmtDevice( pNewDev ),      // default is output device
@@ -148,8 +147,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
     nTab( nNewTab ),
     nScrX( nNewScrX ),
     nScrY( nNewScrY ),
-    nTilePosX( nNewTilePosX ),
-    nTilePosY( nNewTilePosY ),
     nX1( nNewX1 ),
     nY1( nNewY1 ),
     nX2( nNewX2 ),
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 5c89295dec0a..3a3ac670b962 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -182,10 +182,6 @@ namespace svgio
             SvgPaint                    maStopColor;
             SvgNumber                   maStrokeWidth;
             SvgNumber                   maStopOpacity;
-            const SvgGradientNode*      mpSvgGradientNodeFill;
-            const SvgGradientNode*      mpSvgGradientNodeStroke;
-            const SvgPatternNode*       mpSvgPatternNodeFill;
-            const SvgPatternNode*       mpSvgPatternNodeStroke;
             SvgNumber                   maFillOpacity;
             SvgNumberVector             maStrokeDasharray;
             SvgNumber                   maStrokeDashOffset;
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 232202927a76..502fe6991dd3 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1256,10 +1256,6 @@ namespace svgio
             maStopColor(basegfx::BColor(0.0, 0.0, 0.0), true),
             maStrokeWidth(),
             maStopOpacity(),
-            mpSvgGradientNodeFill(nullptr),
-            mpSvgGradientNodeStroke(nullptr),
-            mpSvgPatternNodeFill(nullptr),
-            mpSvgPatternNodeStroke(nullptr),
             maFillOpacity(),
             maStrokeDasharray(),
             maStrokeDashOffset(),
@@ -2095,11 +2091,7 @@ namespace svgio
 
         const SvgGradientNode* SvgStyleAttributes::getSvgGradientNodeFill() const
         {
-            if(mpSvgGradientNodeFill)
-            {
-                return mpSvgGradientNodeFill;
-            }
-            else if (!maFill.isSet() && !mpSvgPatternNodeFill)
+            if (!maFill.isSet())
             {
                 if (!maNodeFillURL.isEmpty())
                 {
@@ -2129,11 +2121,7 @@ namespace svgio
 
         const SvgGradientNode* SvgStyleAttributes::getSvgGradientNodeStroke() const
         {
-            if(mpSvgGradientNodeStroke)
-            {
-                return mpSvgGradientNodeStroke;
-            }
-            else if (!maStroke.isSet() && !mpSvgPatternNodeStroke)
+            if (!maStroke.isSet())
             {
                 if(!maNodeStrokeURL.isEmpty())
                 {
@@ -2164,11 +2152,7 @@ namespace svgio
 
         const SvgPatternNode* SvgStyleAttributes::getSvgPatternNodeFill() const
         {
-            if(mpSvgPatternNodeFill)
-            {
-                return mpSvgPatternNodeFill;
-            }
-            else if (!maFill.isSet() && !mpSvgGradientNodeFill)
+            if (!maFill.isSet())
             {
                 if (!maNodeFillURL.isEmpty())
                 {
@@ -2199,11 +2183,7 @@ namespace svgio
 
         const SvgPatternNode* SvgStyleAttributes::getSvgPatternNodeStroke() const
         {
-            if(mpSvgPatternNodeStroke)
-            {
-                return mpSvgPatternNodeStroke;
-            }
-            else if (!maStroke.isSet() && !mpSvgGradientNodeStroke)
+            if (!maStroke.isSet())
             {
                 if(!maNodeStrokeURL.isEmpty())
                 {
diff --git a/sw/qa/api/SwXTextFrame.cxx b/sw/qa/api/SwXTextFrame.cxx
index 4e29f31604a9..19fe73f808b7 100644
--- a/sw/qa/api/SwXTextFrame.cxx
+++ b/sw/qa/api/SwXTextFrame.cxx
@@ -43,8 +43,6 @@ class SwXTextFrame final : public test::BootstrapFixture,
 {
     uno::Reference<uno::XComponentContext> mxComponentContext;
     uno::Reference<text::XTextDocument> mxTextDocument;
-    uno::Reference<text::XTextRange> mxTextRange;
-    uno::Reference<text::XTextContent> mxTextContent;
 
 public:
     virtual void setUp() override;
@@ -95,9 +93,6 @@ uno::Reference<uno::XInterface> SwXTextFrame::init()
     CPPUNIT_ASSERT(xTextCursor.is());
     xText->insertTextContent(xTextCursor, xTextFrame, false);
     xTextCursor->gotoEnd(false);
-    mxTextRange = uno::Reference<text::XTextRange>(xTextCursor, uno::UNO_QUERY_THROW);
-    mxTextContent = uno::Reference<text::XTextContent>(
-        xMSF->createInstance("com.sun.star.text.TextFrame"), uno::UNO_QUERY_THROW);
     return xTextFrame;
 }
 
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 0e6fde80a6f4..33e5778f7f42 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -266,17 +266,13 @@ struct ImplSVNWFData
     int                     mnStatusBarLowerRightOffset = 0; // amount in pixel to avoid in the lower righthand corner
     int                     mnMenuFormatBorderX = 0;        // horizontal inner popup menu border
     int                     mnMenuFormatBorderY = 0;        // vertical inner popup menu border
-    int                     mnMenuSeparatorBorderX = 0;     // gap at each side of separator
     ::Color                 maMenuBarHighlightTextColor = COL_TRANSPARENT; // override highlight text color
                                                             // in menubar if not transparent
     bool                    mbMenuBarDockingAreaCommonBG = false; // e.g. WinXP default theme
     bool                    mbDockingAreaSeparateTB = false; // individual toolbar backgrounds
                                                             // instead of one for docking area
     bool                    mbDockingAreaAvoidTBFrames = false; ///< don't draw frames around the individual toolbars if mbDockingAreaSeparateTB is false
-    bool                    mbToolboxDropDownSeparate = false; // two adjacent buttons for
-                                                            // toolbox dropdown buttons
     bool                    mbFlatMenu = false;             // no popup 3D border
-    bool                    mbOpenMenuOnF10 = false;        // on gnome the first menu opens on F10
     bool                    mbNoFocusRects = false;         // on Aqua/Gtk3 use native focus rendering, except for flat buttons
     bool                    mbNoFocusRectsForFlatButtons = false; // on Gtk3 native focusing is also preferred for flat buttons
     bool                    mbCenteredTabs = false;         // on Aqua, tabs are centered
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index fc4831a23092..a8aa8a443e2a 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -183,13 +183,10 @@ class GtkSalFrame : public SalFrame
     GdkCursor                      *m_pCurrentCursor;
     PointerStyle                    m_ePointerStyle;
     ScreenSaverInhibitor            m_ScreenSaverInhibitor;
-    int                             m_nWorkArea;
     bool                            m_bFullscreen;
     bool                            m_bSpanMonitorsWhenFullscreen;
     bool                            m_bDefaultPos;
     bool                            m_bDefaultSize;
-    bool                            m_bWindowIsGtkPlug;
-    OUString                        m_aTitle;
     OUString                        m_sWMClass;
 
     std::unique_ptr<IMHandler>      m_pIMHandler;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index a913fc6165b0..c511097d0c57 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -96,7 +96,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame final : public SalFrame, public NativeWindo
     bool            bAlwaysOnTop_;
     bool            bViewable_;
     bool            bMapped_;
-    bool            mbInShow;
     bool            bDefaultPosition_;  // client is centered initially
     bool            m_bXEmbed;
     int             nVisibility_;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 74bb8fcd5219..fdd524e06f20 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -182,7 +182,6 @@ struct ImplStyleData
     //primary means scroll by single page. Secondary button takes the alternative behaviour
     bool                            mbPrimaryButtonWarpsSlider;
     DialogStyle                     maDialogStyle;
-    FrameStyle                      maFrameStyle;
 
     sal_uInt16                      mnEdgeBlending;
     Color                           maEdgeBlendingTopLeftColor;
@@ -575,7 +574,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     meContextMenuShortcuts(rData.meContextMenuShortcuts),
     mbPrimaryButtonWarpsSlider(rData.mbPrimaryButtonWarpsSlider),
     maDialogStyle( rData.maDialogStyle ),
-    maFrameStyle( rData.maFrameStyle ),
     mnEdgeBlending(rData.mnEdgeBlending),
     maEdgeBlendingTopLeftColor(rData.maEdgeBlendingTopLeftColor),
     maEdgeBlendingBottomRightColor(rData.maEdgeBlendingBottomRightColor),
@@ -1883,19 +1881,6 @@ StyleSettings::SetDialogStyle( const DialogStyle& rStyle )
     mxData->maDialogStyle = rStyle;
 }
 
-const FrameStyle&
-StyleSettings::GetFrameStyle() const
-{
-    return mxData->maFrameStyle;
-}
-
-void
-StyleSettings::SetFrameStyle( const FrameStyle& rStyle )
-{
-    CopyData();
-    mxData->maFrameStyle = rStyle;
-}
-
 void
 StyleSettings::SetEdgeBlending(sal_uInt16 nCount)
 {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 080b64416e01..5acc2bb8e757 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -610,8 +610,6 @@ void Dialog::settingOptimalLayoutSize(Window *pBox)
         GetSettings().GetStyleSettings().GetDialogStyle();
     VclBox * pBox2 = static_cast<VclBox*>(pBox);
     pBox2->set_border_width(rDialogStyle.content_area_border);
-    pBox2->set_spacing(pBox2->get_spacing() +
-        rDialogStyle.content_area_spacing);
 }
 
 Dialog::~Dialog()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d0c155d1a4d4..2599b4278664 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1528,11 +1528,6 @@ Size VclFrame::calculateRequisition() const
         aRet.setWidth( std::max(aLabelSize.Width(), aRet.Width()) );
     }
 
-    const FrameStyle &rFrameStyle =
-        GetSettings().GetStyleSettings().GetFrameStyle();
-    aRet.AdjustWidth(rFrameStyle.left + rFrameStyle.right );
-    aRet.AdjustHeight(rFrameStyle.top + rFrameStyle.bottom );
-
     return aRet;
 }
 
@@ -1540,11 +1535,8 @@ void VclFrame::setAllocation(const Size &rAllocation)
 {
     //SetBackground( Color(0xFF, 0x00, 0xFF) );
 
-    const FrameStyle &rFrameStyle =
-        GetSettings().GetStyleSettings().GetFrameStyle();
-    Size aAllocation(rAllocation.Width() - rFrameStyle.left - rFrameStyle.right,
-        rAllocation.Height() - rFrameStyle.top - rFrameStyle.bottom);
-    Point aChildPos(rFrameStyle.left, rFrameStyle.top);
+    Size aAllocation(rAllocation);
+    Point aChildPos;
 
     vcl::Window *pChild = get_child();
     vcl::Window *pLabel = get_label_widget();
@@ -1732,21 +1724,13 @@ Size VclExpander::calculateRequisition() const
     aRet.AdjustHeight(aExpanderSize.Height() );
     aRet.setWidth( std::max(aExpanderSize.Width(), aRet.Width()) );
 
-    const FrameStyle &rFrameStyle =
-        GetSettings().GetStyleSettings().GetFrameStyle();
-    aRet.AdjustWidth(rFrameStyle.left + rFrameStyle.right );
-    aRet.AdjustHeight(rFrameStyle.top + rFrameStyle.bottom );
-
     return aRet;
 }
 
 void VclExpander::setAllocation(const Size &rAllocation)
 {
-    const FrameStyle &rFrameStyle =
-        GetSettings().GetStyleSettings().GetFrameStyle();
-    Size aAllocation(rAllocation.Width() - rFrameStyle.left - rFrameStyle.right,
-        rAllocation.Height() - rFrameStyle.top - rFrameStyle.bottom);
-    Point aChildPos(rFrameStyle.left, rFrameStyle.top);
+    Size aAllocation(rAllocation);
+    Point aChildPos;
 
     WindowImpl* pWindowImpl = ImplGetWindowImpl();
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 71465b16bf26..c1502e891a84 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1812,12 +1812,9 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize,
                             nState |= ControlState::ENABLED;
                         if (bHighlighted)
                             nState |= ControlState::SELECTED;
-                        int nSepPad = ImplGetSVData()->maNWFData.mnMenuSeparatorBorderX;
-                        Point aMpos (aPos);
-                        aMpos.AdjustX(nSepPad );
                         Size aSz(pData->aSz);
-                        aSz.setWidth( aOutSz.Width() - 2*nOuterSpaceX - 2 * nSepPad );
-                        tools::Rectangle aItemRect(aMpos, aSz);
+                        aSz.setWidth( aOutSz.Width() - 2*nOuterSpaceX );
+                        tools::Rectangle aItemRect(aPos, aSz);
                         MenupopupValue aVal(nTextPos - GUTTERBORDER, aItemRect);
                         bNativeOk = rRenderContext.DrawNativeControl(ControlType::MenuPopup, ControlPart::Separator,
                                                                      aItemRect, nState, aVal, OUString());
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 040385d5cf9b..106c949fc0df 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -750,7 +750,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
 
     if ( nCode == KEY_MENU && !rKEvent.GetKeyCode().IsShift() ) // only F10, not Shift-F10
     {
-        mbAutoPopup = ImplGetSVData()->maNWFData.mbOpenMenuOnF10;
+        mbAutoPopup = false;
         if ( m_nHighlightedItem == ITEMPOS_INVALID )
         {
             ChangeHighlightItem( 0, false );
@@ -777,17 +777,6 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
                     n = m_pMenu->GetItemCount()-1;
             }
 
-            // handling gtk like (aka mbOpenMenuOnF10)
-            // do not highlight an item when opening a sub menu
-            // unless there already was a highlighted sub menu item
-            bool bWasHighlight = false;
-            if( m_pActivePopup )
-            {
-                MenuFloatingWindow* pSubWindow = dynamic_cast<MenuFloatingWindow*>(m_pActivePopup->ImplGetWindow());
-                if( pSubWindow )
-                    bWasHighlight = (pSubWindow->GetHighlightedItem() != ITEMPOS_INVALID);
-            }
-
             sal_uInt16 nLoop = n;
 
             if( nCode == KEY_HOME )
@@ -816,10 +805,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
                     m_pMenu->ImplIsVisible(n) &&
                     !m_pMenu->ImplCurrentlyHiddenOnGUI(n))
                 {
-                    bool bDoSelect = true;
-                    if( ImplGetSVData()->maNWFData.mbOpenMenuOnF10 )
-                        bDoSelect = bWasHighlight;
-                    ChangeHighlightItem( n, bDoSelect );
+                    ChangeHighlightItem( n, true );
                     break;
                 }
             } while ( n != nLoop );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 267d2389e18a..82640c566927 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2578,22 +2578,6 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::si
 
     // Compute buttons area.
     Size    aBtnSize    = pItem->maRect.GetSize();
-    if( ImplGetSVData()->maNWFData.mbToolboxDropDownSeparate )
-    {
-        // separate button not for dropdown only where the whole button is painted
-        // exception: when text position is set to bottom then we want to calculate rect for dropdown only button
-        if ( ( pItem->mnBits & ToolBoxItemBits::DROPDOWN &&
-            ((pItem->mnBits & ToolBoxItemBits::DROPDOWNONLY) != ToolBoxItemBits::DROPDOWNONLY) )
-            || ( ( pItem->mnBits & ToolBoxItemBits::DROPDOWN) && ( meTextPosition == ToolBoxTextPosition::Bottom ) ) )
-        {
-            tools::Rectangle aArrowRect = pItem->GetDropDownRect( mbHorz );
-            if( aArrowRect.Top() == pItem->maRect.Top() ) // dropdown arrow on right side
-                aBtnSize.AdjustWidth( -(aArrowRect.GetWidth()) );
-            else if ( !( (meTextPosition == ToolBoxTextPosition::Bottom)
-                        && ((pItem->mnBits & ToolBoxItemBits::DROPDOWNONLY) == ToolBoxItemBits::DROPDOWNONLY) ) )
-                aBtnSize.AdjustHeight( -(aArrowRect.GetHeight()) ); // dropdown arrow on bottom side
-        }
-    }
 
     /* Compute the button/separator rectangle here, we'll need it for
      * both the buttons and the separators. */
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f5a3d872f7a5..ed2a3bb2c3bb 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -849,7 +849,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle,
     bDefaultPosition_           = true;
     nVisibility_                = VisibilityFullyObscured;
     m_nWorkArea                 = 0;
-    mbInShow                    = false;
     m_bXEmbed                   = false;
 
 
@@ -1171,7 +1170,6 @@ void X11SalFrame::Show( bool bVisible, bool bNoActivate )
     setXEmbedInfo();
     if( bVisible )
     {
-        mbInShow = true;
         if( ! (nStyle_ & SalFrameStyleFlags::INTRO) )
         {
             // hide all INTRO frames
@@ -3937,7 +3935,6 @@ bool X11SalFrame::Dispatch( XEvent *pEvent )
                     }
 
                     RestackChildren();
-                    mbInShow = false;
                     m_bSetFocusOnMap = false;
                 }
                 break;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index e18ea40cd789..25badaec34d3 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -473,7 +473,6 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
     getDisplay()->registerFrame( this );
     m_bDefaultPos       = true;
     m_bDefaultSize      = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent );
-    m_bWindowIsGtkPlug  = false;
     Init( pParent, nStyle );
 }
 
@@ -1176,7 +1175,6 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
     if( pSysData->nSize > sizeof(pSysData->nSize)+sizeof(pSysData->aWindow) && pSysData->bXEmbedSupport )
     {
         m_pWindow = gtk_plug_new_for_display( getGdkDisplay(), pSysData->aWindow );
-        m_bWindowIsGtkPlug  = true;
         widget_set_can_default( m_pWindow, true );
         widget_set_can_focus( m_pWindow, true );
         gtk_widget_set_sensitive( m_pWindow, true );
@@ -1184,7 +1182,6 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
     else
     {
         m_pWindow = gtk_window_new( GTK_WINDOW_POPUP );
-        m_bWindowIsGtkPlug  = false;
     }
     m_nStyle = SalFrameStyleFlags::PLUG;
     InitCommon();
@@ -1233,7 +1230,6 @@ bool GtkSalFrame::PostEvent(std::unique_ptr<ImplSVEvent> pData)
 
 void GtkSalFrame::SetTitle( const OUString& rTitle )
 {
-    m_aTitle = rTitle;
     if( m_pWindow && ! isChild() )
     {
         OString sTitle(OUStringToOString(rTitle, RTL_TEXTENCODING_UTF8));
author	Noel Grandin <noel.grandin@collabora.co.uk>	2019-10-03 10:53:58 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2019-10-03 12:16:38 +0200
commit	77e9216ca1073caa0dcec23ef89808cc7f80fc06 (patch)
tree	71ea2c3841f1a1017123dec44552239d74fd7a4a
parent	81903d443116c643a9ff92d92c092812abc7f57d (diff)