loplugin:unusedfields

Change-Id: I7dd5fc3d53df63fd2ee2caa71586f0f5e13f187e
Reviewed-on: https://gerrit.libreoffice.org/81078
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 79 insertions, 106 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 63a578850f5c..3da7b2eaa0d8 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/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/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/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/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,9 +130,9 @@ 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:1369
+cui/source/factory/dlgfact.cxx:1392
     SvxMacroAssignDialog m_aItems class SfxItemSet
-cui/source/inc/cfgutil.hxx:237
+cui/source/inc/cfgutil.hxx:236
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
 cui/source/inc/cuitabarea.hxx:225
     SvxAreaTabPage maFixed_ChangeType enum ChangeType
@@ -388,6 +388,8 @@ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:28
     GtvLokDialog parent GtkDialog
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:33
     GtvLokDialogClass parentClass GtkDialogClass
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:265
+      const std::string &
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:28
     GtvMainToolbar parent GtkBox
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36
@@ -496,9 +498,9 @@ sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:155
+sal/qa/osl/security/osl_Security.cxx:154
     osl_Security::getUserName bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:189
+sal/qa/osl/security/osl_Security.cxx:188
     osl_Security::getConfigDir bRes1 _Bool
 sal/textenc/textenc.cxx:406
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
@@ -514,9 +516,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:1242
+sc/source/core/data/document.cxx:1239
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1243
+sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -546,7 +548,7 @@ sc/source/filter/xml/xmlexternaltabi.hxx:113
     ScXMLExternalRefCellContext mnCellType sal_Int16
 sc/source/filter/xml/xmltransformationi.hxx:155
     ScXMLDateTimeContext aType class rtl::OUString
-sc/source/ui/inc/acredlin.hxx:51
+sc/source/ui/inc/acredlin.hxx:50
     ScAcceptChgDlg aReOpenIdle class Idle
 sc/source/ui/inc/msgpool.hxx:35
     ScMessagePool aGlobalStringItem class SfxStringItem
@@ -738,8 +740,6 @@ 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/uiwriter/uiwriter2.cxx:66
-      class SwUiWriterTest2 *
 sw/qa/extras/uiwriter/uiwriter.cxx:4065
     IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
@@ -782,7 +782,7 @@ vcl/headless/svpgdi.cxx:314
     (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
 vcl/inc/canvasbitmap.hxx:42
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
-vcl/inc/graphic/Manager.hxx:40
+vcl/inc/graphic/Manager.hxx:41
     vcl::graphic::Manager maSwapOutTimer class Timer
 vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
@@ -826,9 +826,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:2890
+vcl/source/app/salvtables.cxx:3040
     SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:5378
+vcl/source/app/salvtables.cxx:5527
     SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:35
     ImplOldJobSetupData cDeviceName char [32]
@@ -850,7 +850,7 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4408
+vcl/unx/gtk3/gtk3gtkinst.cxx:4697
     CrippledViewport viewport GtkViewport
 writerfilter/source/dmapper/PropertyMap.hxx:198
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index cbdc4f340d19..e0befdf37851 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -184,34 +184,32 @@ drawinglayer/source/processor2d/vclprocessor2d.hxx:84
     drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
 editeng/source/editeng/impedit.hxx:454
     ImpEditEngine maColorConfig svtools::ColorConfig
-embeddedobj/source/inc/commonembobj.hxx:108
+embeddedobj/source/inc/commonembobj.hxx:103
     OCommonEmbeddedObject m_aClassName class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:128
+embeddedobj/source/inc/oleembobj.hxx:124
     OleEmbeddedObject m_pOleComponent class OleComponent *
-embeddedobj/source/inc/oleembobj.hxx:148
+embeddedobj/source/inc/oleembobj.hxx:144
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:170
+embeddedobj/source/inc/oleembobj.hxx:166
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:171
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:177
+embeddedobj/source/inc/oleembobj.hxx:173
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:178
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:179
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:187
+embeddedobj/source/inc/oleembobj.hxx:183
     OleEmbeddedObject m_aLinkURL class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:193
+embeddedobj/source/inc/oleembobj.hxx:189
     OleEmbeddedObject m_bFromClipboard _Bool
 extensions/source/propctrlr/eformshelper.hxx:61
     pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
 extensions/source/propctrlr/eformshelper.hxx:63
     pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet
-extensions/source/update/check/updatehdl.hxx:85
-    UpdateHandler mbStringsLoaded _Bool
 filter/source/graphicfilter/eps/eps.cxx:116
     PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
 filter/source/graphicfilter/icgm/cgm.hxx:60
@@ -349,7 +347,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/libo4/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo7/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -372,16 +370,12 @@ include/unoidl/unoidl.hxx:453
     unoidl::ConstantValue::(anonymous) doubleValue double
 include/unotest/bootstrapfixturebase.hxx:52
     test::BootstrapFixtureBase m_directories class test::Directories
-include/vcl/edit.hxx:88
-    Edit maUpdateDataHdl Link<class Edit &, void>
 include/vcl/opengl/OpenGLContext.hxx:48
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
 include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
 include/vcl/ppdparser.hxx:127
     psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
-include/vcl/vclmedit.hxx:85
-    VclMultiLineEdit aUpdateDataHdlLink Link<class Edit &, void>
 io/source/stm/odata.cxx:571
     io_stm::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
 io/source/stm/odata.cxx:571
@@ -410,8 +404,8 @@ registry/source/reflwrit.cxx:140
     writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
 registry/source/reflwrit.cxx:141
     writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b2 sal_uInt32
-registry/source/reflwrit.cxx:180
-    CPInfo::(anonymous) aUik struct RTUik *
+registry/source/reflwrit.cxx:181
+    (anonymous namespace)::CPInfo::(anonymous) aUik struct RTUik *
 reportdesign/source/ui/inc/ColorListener.hxx:35
     rptui::OColorListener m_aColorConfig const svtools::ColorConfig
 sal/osl/unx/process.cxx:825
@@ -435,7 +429,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/libo4/sc/inc/compiler.hxx:124:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo7/sc/inc/compiler.hxx:124:9)
 sc/inc/compiler.hxx:132
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
@@ -710,10 +704,6 @@ unotools/source/config/saveopt.cxx:76
     SvtSaveOptions_Impl bROUserAutoSave _Bool
 vcl/inc/BitmapFastScaleFilter.hxx:31
     BitmapFastScaleFilter maSize const class Size
-vcl/inc/openglgdiimpl.hxx:52
-    TextureCombo mpTexture std::unique_ptr<OpenGLTexture>
-vcl/inc/openglgdiimpl.hxx:53
-    TextureCombo mpMask std::unique_ptr<OpenGLTexture>
 vcl/inc/printerinfomanager.hxx:74
     psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
 vcl/inc/salwtype.hxx:157
@@ -730,6 +720,8 @@ vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
 vcl/inc/unx/saldisp.hxx:282
     SalDisplay m_aInvalidScreenData const struct SalDisplay::ScreenData
+vcl/inc/unx/salgdi.h:306
+    X11SalGraphics pFontGC_ GC
 vcl/inc/WidgetThemeLibrary.hxx:21
     vcl::WidgetDrawStyle maFaceColor uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:22
@@ -880,12 +872,12 @@ 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/inc/wizdlg.hxx:78
-    vcl::RoadmapWizard maActivateHdl Link<class vcl::RoadmapWizard *, void>
 vcl/source/app/settings.cxx:184
     ImplStyleData maDialogStyle struct DialogStyle
 vcl/source/control/roadmapwizard.cxx:62
     vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
+vcl/source/control/tabctrl.cxx:54
+    ImplTabItem maHelpId class rtl::OString
 vcl/source/control/tabctrl.cxx:79
     ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
 vcl/source/filter/jpeg/Exif.hxx:51
@@ -908,11 +900,11 @@ vcl/source/filter/jpeg/transupp.h:148
     (anonymous) crop_xoffset_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:150
     (anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1061
+vcl/source/fontsubset/sft.cxx:1038
     vcl::subHeader2 firstCode const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1062
+vcl/source/fontsubset/sft.cxx:1039
     vcl::subHeader2 entryCount const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1063
+vcl/source/fontsubset/sft.cxx:1040
     vcl::subHeader2 idDelta const sal_uInt16
 vcl/source/gdi/dibtools.cxx:52
     (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
@@ -964,7 +956,7 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1566
+vcl/unx/gtk3/gtk3gtkinst.cxx:1588
      out gpointer *
 writerfilter/inc/ooxml/QNameToString.hxx:41
     writerfilter::QNameToString mMap writerfilter::QNameToString::Map
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 53061e4385a8..9c7428ae6063 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -5,9 +5,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/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/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/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basctl/source/inc/dlged.hxx:122
@@ -234,6 +234,8 @@ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:28
     GtvLokDialog parent GtkDialog
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:33
     GtvLokDialogClass parentClass GtkDialogClass
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:265
+      const std::string &
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:28
     GtvMainToolbar parent GtkBox
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36
@@ -308,15 +310,15 @@ sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:155
+sal/qa/osl/security/osl_Security.cxx:154
     osl_Security::getUserName bRes1 _Bool
-sal/qa/osl/security/osl_Security.cxx:189
+sal/qa/osl/security/osl_Security.cxx:188
     osl_Security::getConfigDir bRes1 _Bool
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1242
+sc/source/core/data/document.cxx:1239
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1243
+sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -384,8 +386,6 @@ svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
 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
@@ -408,6 +408,10 @@ unoidl/source/unoidlprovider.cxx:673
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
 vcl/inc/opengl/zone.hxx:58
     OpenGLVCLContextZone aZone const class OpenGLZone
+vcl/inc/openglgdiimpl.hxx:52
+    TextureCombo mpTexture std::unique_ptr<OpenGLTexture>
+vcl/inc/openglgdiimpl.hxx:53
+    TextureCombo mpMask std::unique_ptr<OpenGLTexture>
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
 vcl/inc/qt5/Qt5FilePicker.hxx:84
@@ -446,7 +450,7 @@ vcl/source/uitest/uno/uitest_uno.cxx:35
     UITestUnoObj mpUITest std::unique_ptr<UITest>
 vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:29
     HyperLink atk_hyper_link const AtkHyperlink
-vcl/unx/gtk3/gtk3gtkinst.cxx:4408
+vcl/unx/gtk3/gtk3gtkinst.cxx:4697
     CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 37e5d8dac37c..dc2f458c06c8 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -230,15 +230,13 @@ dbaccess/source/filter/xml/dbloader2.cxx:227
     dbaxml::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader>
 dbaccess/source/ui/browser/dbloader.cxx:69
     DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
-dbaccess/source/ui/inc/FieldDescControl.hxx:112
-    dbaui::OFieldDescControl m_bRightAligned _Bool
 dbaccess/source/ui/inc/RelationController.hxx:33
     dbaui::ORelationController m_pWaitObject std::unique_ptr<WaitObject>
 desktop/qa/desktop_lib/test_desktop_lib.cxx:223
     DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1209
+desktop/source/app/app.cxx:1211
     desktop::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1210
+desktop/source/app/app.cxx:1212
     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>
@@ -270,23 +268,23 @@ drawinglayer/source/attribute/sdrsceneattribute3d.cxx:32
     drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double
 drawinglayer/source/tools/emfpcustomlinecap.hxx:34
     emfplushelper::EMFPCustomLineCap mbIsFilled _Bool
-embeddedobj/source/inc/oleembobj.hxx:136
+embeddedobj/source/inc/oleembobj.hxx:132
     OleEmbeddedObject m_nTargetState sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:148
+embeddedobj/source/inc/oleembobj.hxx:144
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:170
+embeddedobj/source/inc/oleembobj.hxx:166
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:171
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:177
+embeddedobj/source/inc/oleembobj.hxx:173
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:178
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:179
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:193
+embeddedobj/source/inc/oleembobj.hxx:189
     OleEmbeddedObject m_bFromClipboard _Bool
 emfio/inc/mtftools.hxx:512
     emfio::MtfTools mrclBounds tools::Rectangle
@@ -352,8 +350,6 @@ include/editeng/adjustitem.hxx:37
     SvxAdjustItem bLeft _Bool
 include/editeng/outlobj.hxx:43
     OutlinerParaObjData mbIsEditDoc _Bool
-include/editeng/splwrap.hxx:59
-    SvxSpellWrapper bHyphen _Bool
 include/editeng/unotext.hxx:415
     SvxUnoTextBase xParentText css::uno::Reference<css::text::XText>
 include/editeng/unotext.hxx:584
@@ -420,6 +416,8 @@ 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/menu.hxx:455
+    MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:54
     AddonNotebookBarItem sTarget class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:55
@@ -436,7 +434,7 @@ include/vcl/salnativewidgets.hxx:534
     PushButtonValue mbBevelButton _Bool
 include/vcl/salnativewidgets.hxx:535
     PushButtonValue mbSingleLine _Bool
-include/vcl/sysdata.hxx:67
+include/vcl/sysdata.hxx:69
     SystemEnvData pSalFrame void *
 include/vcl/textrectinfo.hxx:32
     TextRectInfo mnLineCount sal_uInt16
@@ -482,6 +480,8 @@ 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>
+reportdesign/source/ui/inc/CondFormat.hxx:69
+    rptui::ConditionalFormattingDialog m_bDeletingCondition _Bool
 sal/qa/osl/file/osl_File.cxx:4154
     osl_Directory::isOpen nError1 osl::class FileBase::RC
 sal/qa/osl/file/osl_File.cxx:4154
@@ -516,7 +516,7 @@ sc/inc/compiler.hxx:257
     ScCompiler::AddInMap pEnglish const char *
 sc/inc/compiler.hxx:259
     ScCompiler::AddInMap pUpper const char *
-sc/inc/document.hxx:2588
+sc/inc/document.hxx:2592
     ScMutationDisable mpDocument class ScDocument *
 sc/inc/pivot.hxx:75
     ScDPLabelData mnFlags sal_Int32
@@ -813,7 +813,7 @@ 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/libo4/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo7/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
@@ -946,7 +946,7 @@ vcl/inc/salwtype.hxx:243
     SalInputContext mpFont rtl::Reference<LogicalFontInstance>
 vcl/inc/salwtype.hxx:250
     SalSwipeEvent mnVelocityY double
-vcl/inc/sft.hxx:478
+vcl/inc/sft.hxx:742
     vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
 vcl/inc/svdata.hxx:403
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
@@ -956,6 +956,10 @@ vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
 vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
+vcl/inc/unx/salgdi.h:307
+    X11SalGraphics nTextPixel_ Pixel
+vcl/inc/unx/salgdi.h:313
+    X11SalGraphics bFontGC_ _Bool
 vcl/inc/WidgetThemeLibrary.hxx:20
     vcl::WidgetDrawStyle nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:91
@@ -976,7 +980,7 @@ vcl/source/filter/wmf/wmfwr.hxx:95
     WMFWriter aDstClipRegion vcl::Region
 vcl/source/fontsubset/sft.cxx:88
     vcl::TTGlyphMetrics lsb sal_Int16
-vcl/source/fontsubset/ttcr.cxx:356
+vcl/source/fontsubset/ttcr.cxx:341
     vcl::tdata_post ptr void *
 vcl/source/gdi/pdfwriter_impl.hxx:180
     vcl::PDFWriterImpl::BitmapID m_nChecksum BitmapChecksum
@@ -1008,7 +1012,7 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:28
     GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:17
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1566
+vcl/unx/gtk3/gtk3gtkinst.cxx:1588
      in char *
 vcl/unx/gtk3/gtk3hudawareness.cxx:17
     HudAwarenessHandle connection GDBusConnection *
@@ -1018,6 +1022,8 @@ vcl/workben/vcldemo.cxx:1744
     DemoWin mxThread rtl::Reference<RenderThread>
 writerfilter/source/dmapper/PropertyMap.hxx:198
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
+writerfilter/source/dmapper/SettingsTable.cxx:253
+    writerfilter::dmapper::SettingsTable_Impl m_sRedlineProtectionKey class rtl::OUString
 xmlhelp/source/cxxhelp/provider/databases.hxx:251
     chelp::Databases m_aDatabases chelp::Databases::DatabasesTable
 xmlhelp/source/cxxhelp/provider/databases.hxx:257
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index bb5df9b50c73..9af13bc81b01 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -86,7 +86,6 @@ namespace rptui
         : GenericDialogController(_pParent, "modules/dbreport/ui/condformatdialog.ui", "CondFormat")
         , m_rController(_rController)
         , m_xFormatConditions(_rxFormatConditions)
-        , m_bDeletingCondition(false)
         , m_bConstructed(false)
         , m_xScrollWindow(m_xBuilder->weld_scrolled_window("scrolledwindow"))
         , m_xConditionPlayground(m_xBuilder->weld_box("condPlaygroundDrawingarea"))
@@ -201,13 +200,10 @@ namespace rptui
             else
             {
                 bSetNewFocus = (*pos)->has_focus();
-                m_bDeletingCondition = true;
 
                 auto xMovedCondition = std::move(*pos);
                 m_aConditions.erase(pos);
                 m_xConditionPlayground->move(xMovedCondition->get_widget(), nullptr);
-
-                m_bDeletingCondition = false;
             }
 
             if ( bSetNewFocus )
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index a3260c134ecb..6e87acb9857d 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -66,7 +66,6 @@ namespace rptui
         css::uno::Reference< css::report::XReportControlModel >
                                                             m_xCopy;
 
-        bool    m_bDeletingCondition;
         bool    m_bConstructed;
 
         std::unique_ptr<weld::ScrolledWindow> m_xScrollWindow;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index a6cb1dddbe02..d2bbeeb128af 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -303,14 +303,12 @@ protected:
     Color                           mnFillColor;
 #endif // ENABLE_CAIRO_CANVAS
 
-    GC                              pFontGC_;       // Font attributes
     Pixel                           nTextPixel_;
 
     Pixmap                          hBrush_;        // Dither
 
     bool                            bWindow_ : 1;       // is Window
     bool                            bVirDev_ : 1;       // is VirDev
-    bool                            bFontGC_ : 1;       // is Font GC valid
     bool const                      m_bOpenGL : 1;
 
 private:
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index a3de38da26a7..1f32f7de8c1a 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -51,7 +51,6 @@ public:
     OUString            maText;
     OUString            maFormatText;
     OUString            maHelpText;
-    OString             maHelpId;
     OString             maTabName;
     tools::Rectangle    maRect;
     sal_uInt16          mnLine;
@@ -1461,7 +1460,7 @@ void TabControl::Command( const CommandEvent& rCEvt )
                 aMenu->InsertItem(item.id(), item.maText, MenuItemBits::CHECKABLE | MenuItemBits::RADIOCHECK);
                 if (item.id() == mnCurPageId)
                     aMenu->CheckItem(item.id());
-                aMenu->SetHelpId(item.id(), item.maHelpId);
+                aMenu->SetHelpId(item.id(), OString());
             }
 
             sal_uInt16 nId = aMenu->Execute( this, aMenuPos );
@@ -1969,15 +1968,7 @@ void TabControl::SetHelpText( sal_uInt16 nPageId, const OUString& rText )
 const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const
 {
     ImplTabItem* pItem = ImplGetItem( nPageId );
-
     assert( pItem );
-
-    if ( pItem->maHelpText.isEmpty() && !pItem->maHelpId.isEmpty() )
-    {
-        Help* pHelp = Application::GetHelp();
-        if ( pHelp )
-            pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
-    }
     return pItem->maHelpText;
 }
 
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index a9bfa743923e..ede4d953c48e 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -50,7 +50,6 @@ X11SalGraphics::SetTextColor( Color nColor )
 {
     mxTextRenderImpl->SetTextColor(nColor);
     nTextPixel_     = GetPixel( nColor );
-    bFontGC_        = false;
 }
 
 bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 39154e85ee91..b0b088d8432d 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -922,7 +922,6 @@ void X11SalGraphicsImpl::ResetClipRegion()
     if( mrParent.mpClipRegion )
     {
         mbPenGC         = false;
-        mrParent.bFontGC_ = false;
         mbBrushGC       = false;
         mbCopyGC        = false;
         mbInvertGC      = false;
@@ -985,7 +984,6 @@ bool X11SalGraphicsImpl::setClipRegion( const vcl::Region& i_rClip )
 
     // done, invalidate GCs
     mbPenGC         = false;
-    mrParent.bFontGC_ = false;
     mbBrushGC       = false;
     mbCopyGC        = false;
     mbInvertGC      = false;
@@ -1103,7 +1101,6 @@ void X11SalGraphicsImpl::SetXORMode( bool bSet, bool )
     {
         mbXORMode   = bSet;
         mbPenGC     = false;
-        mrParent.bFontGC_ = false;
         mbBrushGC   = false;
         mbCopyGC        = false;
         mbInvertGC  = false;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 083447474d11..fc5f3c394a30 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -68,12 +68,10 @@ X11SalGraphics::X11SalGraphics():
     mnPenColor(SALCOLOR_NONE),
     mnFillColor(SALCOLOR_NONE),
 #endif // ENABLE_CAIRO_CANVAS
-    pFontGC_(nullptr),
     nTextPixel_(0),
     hBrush_(None),
     bWindow_(false),
     bVirDev_(false),
-    bFontGC_(false),
     m_bOpenGL(OpenGLHelper::isVCLOpenGLEnabled())
 {
     if (m_bOpenGL)
@@ -113,11 +111,6 @@ void X11SalGraphics::freeResources()
         XFreePixmap( pDisplay, hBrush_ );
         hBrush_ = None;
     }
-    if( pFontGC_ )
-    {
-        XFreeGC( pDisplay, pFontGC_ );
-        pFontGC_ = None;
-    }
     if( m_pDeleteColormap )
     {
         m_pDeleteColormap.reset();
@@ -128,8 +121,6 @@ void X11SalGraphics::freeResources()
         XRenderPeer::GetInstance().FreePicture( m_aXRenderPicture );
         m_aXRenderPicture = 0;
     }
-
-    bFontGC_ = false;
 }
 
 SalGraphicsImpl* X11SalGraphics::GetImpl() const