compilerplugins/clang/unusedfields.only-used-in-constructor.results |  204 
+++++-----
 compilerplugins/clang/unusedfields.readonly.results                 |  116 
++---
 compilerplugins/clang/unusedfields.untouched.results                |  192 
+++++----
 compilerplugins/clang/unusedfields.writeonly.results                |  132 
+++---
 cui/source/options/optgdlg.hxx                                      |    1 
 cui/source/options/optsave.cxx                                      |    2 
 cui/source/options/optsave.hxx                                      |    2 
 desktop/qa/desktop_lib/test_desktop_lib.cxx                         |    1 
 sc/source/ui/condformat/condformateasydlg.cxx                       |   20 
 sc/source/ui/inc/condformateasydlg.hxx                              |    1 
 sw/source/ui/config/optpage.cxx                                     |    1 
 sw/source/uibase/inc/optpage.hxx                                    |    2 
 writerperfect/inc/WPXSvInputStream.hxx                              |    1 
 writerperfect/source/common/WPXSvInputStream.cxx                    |   13 
 14 files changed, 340 insertions(+), 348 deletions(-)

New commits:
commit 5e8bc7bda667e994cfbdf9bf4d981175dff71bae
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Nov 14 11:58:56 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Nov 14 15:40:52 2023 +0100

    loplugin:unusedfields
    
    Change-Id: I5869e9974c37b1b525d316367f1dc5051d8aa197
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159404
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 4169718d1529..a58b37ba0f00 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -140,7 +140,7 @@ cppu/source/uno/check.cxx:267
     (anonymous namespace)::Char4 chars Char3
 cui/source/dialogs/colorpicker.cxx:748
     cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious 
ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1244
+cui/source/factory/dlgfact.cxx:1246
     (anonymous namespace)::SvxMacroAssignDialog_Impl m_aItems SfxItemSet
 cui/source/inc/AdditionsDialog.hxx:47
     AdditionInfo sReleaseVersion OUString
@@ -186,6 +186,8 @@ dbaccess/source/core/inc/databasecontext.hxx:82
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:79
     dbaccess::OSingleSelectQueryComposer m_aNeutralContext 
::svxform::ONeutralParseContext
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2143
+    (anonymous namespace)::ViewCallback m_aCallbackWindowResult 
boost::property_tree::ptree
 drawinglayer/inc/texture/texture3d.hxx:54
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmapEx BitmapEx
 drawinglayer/inc/texture/texture3d.hxx:55
@@ -196,7 +198,7 @@ drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
     emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
-editeng/source/editeng/impedit.hxx:532
+editeng/source/editeng/impedit.hxx:528
     ImpEditEngine aSelFuncSet EditSelFunctionSet
 embeddedobj/source/msole/olecomponent.hxx:51
     OleComponent m_pInterfaceContainer 
comphelper::OMultiTypeInterfaceContainerHelper2 *
@@ -238,21 +240,21 @@ helpcompiler/inc/HelpCompiler.hxx:200
     HelpCompiler lang const std::string
 include/basic/basmgr.hxx:59
     BasicError nReason BasicErrorReason
-include/comphelper/seqstream.hxx:76
+include/comphelper/seqstream.hxx:75
     comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8>
-include/docmodel/theme/FormatScheme.hxx:374
+include/docmodel/theme/FormatScheme.hxx:373
     model::DashStop mnDashLength sal_Int32
-include/docmodel/theme/FormatScheme.hxx:375
+include/docmodel/theme/FormatScheme.hxx:374
     model::DashStop mnStopLength sal_Int32
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard SolarMutexGuard
-include/filter/msfilter/svdfppt.hxx:888
-    ImplPPTParaPropSet nDontKnow1 sal_uInt32
 include/filter/msfilter/svdfppt.hxx:889
-    ImplPPTParaPropSet nDontKnow2 sal_uInt32
+    ImplPPTParaPropSet nDontKnow1 sal_uInt32
 include/filter/msfilter/svdfppt.hxx:890
+    ImplPPTParaPropSet nDontKnow2 sal_uInt32
+include/filter/msfilter/svdfppt.hxx:891
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
-include/formula/formulahelper.hxx:40
+include/formula/formulahelper.hxx:39
     formula::FormulaHelper m_aSysLocale SvtSysLocale
 include/LibreOfficeKit/LibreOfficeKitGtk.h:40
     _LOKDocView aDrawingArea GtkDrawingArea
@@ -264,131 +266,131 @@ include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
 include/sfx2/classificationhelper.hxx:134
     sfx::ClassificationKeyCreator m_ePolicyType const 
SfxClassificationPolicyType
-include/sfx2/msg.hxx:117
+include/sfx2/msg.hxx:116
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:119
+include/sfx2/msg.hxx:118
     SfxType0 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 aAttrib SfxTypeAttrib[1]
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 pType const std::type_info *
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 aAttrib SfxTypeAttrib[2]
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 nAttribs sal_uInt16
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 pType const std::type_info *
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 aAttrib SfxTypeAttrib[3]
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 nAttribs sal_uInt16
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 pType const std::type_info *
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 aAttrib SfxTypeAttrib[4]
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 nAttribs sal_uInt16
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 pType const std::type_info *
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 aAttrib SfxTypeAttrib[5]
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 nAttribs sal_uInt16
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 pType const std::type_info *
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 aAttrib SfxTypeAttrib[6]
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 nAttribs sal_uInt16
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 pType const std::type_info *
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 aAttrib SfxTypeAttrib[7]
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 nAttribs sal_uInt16
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 pType const std::type_info *
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 aAttrib SfxTypeAttrib[8]
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 nAttribs sal_uInt16
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 pType const std::type_info *
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 aAttrib SfxTypeAttrib[10]
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 nAttribs sal_uInt16
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 pType const std::type_info *
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 aAttrib SfxTypeAttrib[11]
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 aAttrib SfxTypeAttrib[13]
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 nAttribs sal_uInt16
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 pType const std::type_info *
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 aAttrib SfxTypeAttrib[14]
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 nAttribs sal_uInt16
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 pType const std::type_info *
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 aAttrib SfxTypeAttrib[16]
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 nAttribs sal_uInt16
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 aAttrib SfxTypeAttrib[17]
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 nAttribs sal_uInt16
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 aAttrib SfxTypeAttrib[23]
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 nAttribs sal_uInt16
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 pType const std::type_info *
-include/svl/itemset.hxx:326
+include/svl/itemset.hxx:329
     SfxItemSetFixed m_aItems const SfxPoolItem *[NITEMS]
 include/svx/ClassificationDialog.hxx:35
     svx::ClassificationDialog maInternationalHelper SfxClassificationHelper
@@ -402,6 +404,10 @@ include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem SvxIMapDlgItem
 include/test/screenshot_test.hxx:36
     ScreenshotTest maParent weld::GenericDialogController
+include/unotools/lingucfg.hxx:88
+    SvtLinguOptions bIsSpellCapitalization _Bool
+include/unotools/lingucfg.hxx:94
+    SvtLinguOptions bROIsSpellCapitalization _Bool
 include/vcl/commandevent.hxx:317
     CommandGesturePanData mfX const double
 include/vcl/commandevent.hxx:318
@@ -436,6 +442,8 @@ include/vcl/GestureEventZoom.hxx:28
     GestureEventZoom meEventType GestureEventZoomType
 include/vcl/GestureEventZoom.hxx:32
     GestureEventZoom mfScaleDelta double
+include/vcl/idletask.hxx:31
+    IdleTask maIdle Idle
 include/vcl/pdf/PDFAnnotationMarker.hxx:67
     vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType PDFTextMarkerType
 include/xmloff/shapeimport.hxx:57
@@ -562,7 +570,7 @@ sal/qa/osl/security/osl_Security.cxx:152
     osl_Security::getUserName bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:186
     osl_Security::getConfigDir bRes1 _Bool
-sal/textenc/textenc.cxx:406
+sal/textenc/textenc.cxx:401
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
 sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pODFF const char *
@@ -588,9 +596,9 @@ sc/inc/token.hxx:402
     SingleDoubleRefModifier aDub ScComplexRefData
 sc/qa/unit/tiledrendering/tiledrendering.cxx:439
     (anonymous namespace)::ViewCallback m_callbackWrapper 
TestLokCallbackWrapper
-sc/source/core/data/document.cxx:1217
+sc/source/core/data/document.cxx:1229
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch 
sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1218
+sc/source/core/data/document.cxx:1230
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
 sc/source/core/data/table2.cxx:812
     (anonymous namespace)::TransClipHandler mnEndRow size_t
@@ -622,6 +630,8 @@ sc/source/filter/xml/xmltransformationi.hxx:154
     ScXMLDateTimeContext aType OUString
 sc/source/ui/inc/acredlin.hxx:51
     ScAcceptChgDlg aReOpenIdle Idle
+sc/source/ui/inc/condformateasydlg.hxx:43
+    sc::ConditionalFormatEasyDialog mpTabViewShell ScTabViewShell *
 sc/source/ui/inc/msgpool.hxx:34
     ScMessagePool aGlobalStringItem SfxStringItem
 sc/source/ui/inc/msgpool.hxx:35
@@ -678,13 +688,13 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
 sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1185
+sd/source/ui/view/viewshel.cxx:1187
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1186
+sd/source/ui/view/viewshel.cxx:1188
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::class 
SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1187
+sd/source/ui/view/viewshel.cxx:1189
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1188
+sd/source/ui/view/viewshel.cxx:1190
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
@@ -772,19 +782,19 @@ starmath/inc/mathml/mathmlMo.hxx:68
     moOperatorData m_rspace sal_uInt16
 starmath/inc/mathml/mathmlMo.hxx:69
     moOperatorData m_properties moOpDP
-starmath/inc/view.hxx:249
+starmath/inc/view.hxx:252
     SmViewShell maGraphicController SmGraphicController
 svgio/inc/svgtextposition.hxx:36
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
-svl/source/crypto/cryptosign.cxx:111
+svl/source/crypto/cryptosign.cxx:115
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:112
+svl/source/crypto/cryptosign.cxx:116
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:113
+svl/source/crypto/cryptosign.cxx:117
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:271
+svl/source/crypto/cryptosign.cxx:275
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:272
+svl/source/crypto/cryptosign.cxx:276
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/inc/GalleryControl.hxx:43
     svx::sidebar::GalleryControl mpGallery Gallery *
@@ -812,7 +822,7 @@ 
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1098
     (anonymous namespace)::ExpressionGrammar::definition identifier 
::boost::spirit::classic::rule<ScannerT>
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem SvxContourDlgItem
-svx/source/dialog/framelinkarray.cxx:515
+svx/source/dialog/framelinkarray.cxx:517
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow sal_Int32
 svx/source/dialog/imapwnd.hxx:88
     IMapWindow maItemInfos SfxItemInfo[1]
@@ -834,10 +844,8 @@ sw/inc/unosett.hxx:143
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField 
mChapterFieldType SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter5.cxx:66
+sw/qa/extras/uiwriter/uiwriter5.cxx:67
     SwUiWriterTest5 m_aSavedSettings AllSettings
-sw/qa/extras/uiwriter/uiwriter7.cxx:2286
-    (anonymous namespace)::IdleTask maIdle Idle
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
 sw/source/core/inc/ftnboss.hxx:34
@@ -852,7 +860,7 @@ sw/source/core/text/inftxt.cxx:546
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev 
ScopedVclPtrInstance<VirtualDevice>
 sw/source/core/text/inftxt.hxx:681
     SwTextSlot aText OUString
-sw/source/core/text/porfld.cxx:143
+sw/source/core/text/porfld.cxx:145
     (anonymous namespace)::SwFieldSlot aText OUString
 sw/source/core/text/porrst.hxx:191
     SwBookmarkPortion m_bHasCustomColor _Bool
@@ -866,7 +874,7 @@ sw/source/uibase/docvw/romenu.hxx:51
     SwReadOnlyPopup m_nReadonlyBackgroundtogallery sal_uInt16
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:328
+sw/source/uibase/inc/conttree.hxx:331
     SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
 sw/source/uibase/inc/olmenu.hxx:78
     SwSpellPopup m_aBuilder VclBuilder
@@ -894,7 +902,7 @@ vcl/inc/graphic/Manager.hxx:41
     vcl::graphic::Manager maSwapOutTimer Timer
 vcl/inc/headless/BitmapHelper.hxx:32
     BitmapHelper aTmpBmp SvpSalBitmap
-vcl/inc/jsdialog/jsdialogbuilder.hxx:714
+vcl/inc/jsdialog/jsdialogbuilder.hxx:725
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
@@ -904,9 +912,9 @@ vcl/inc/pdf/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int[256]
 vcl/inc/salprn.hxx:48
     SalPrinterQueueInfo moPortName std::optional<OUString>
-vcl/inc/salvtables.hxx:617
+vcl/inc/salvtables.hxx:620
     SalInstanceEntry m_aTextFilter WeldTextFilter
-vcl/inc/salvtables.hxx:1008
+vcl/inc/salvtables.hxx:1011
     SalInstanceComboBoxWithEdit m_aTextFilter WeldTextFilter
 vcl/inc/sft.hxx:178
     vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
@@ -932,7 +940,7 @@ vcl/inc/unx/saldisp.hxx:102
     SalColormap m_aPalette std::vector<Color>
 vcl/inc/unx/saldisp.hxx:107
     SalColormap m_nUsed Pixel
-vcl/source/app/salvtables.cxx:247
+vcl/source/app/salvtables.cxx:246
     SalFlashAttention m_aOrigBackground Wallpaper
 vcl/source/fontsubset/ttcr.hxx:40
     vcl::longHorMetrics aw sal_uInt16
@@ -964,11 +972,11 @@ vcl/unx/gtk3/gtkinst.cxx:11036
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox *
 vcl/unx/gtk3/gtkinst.cxx:11038
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton 
GtkMenuButton *
-vcl/unx/gtk3/gtkinst.cxx:20964
+vcl/unx/gtk3/gtkinst.cxx:20989
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtkinst.cxx:20970
+vcl/unx/gtk3/gtkinst.cxx:20995
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer 
GtkCellRenderer *
-writerfilter/source/dmapper/PropertyMap.hxx:220
+writerfilter/source/dmapper/PropertyMap.hxx:227
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 xmloff/inc/XMLThemeContext.hxx:47
     XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color>
diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index 75c9c1c72497..223172a59354 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -230,7 +230,7 @@ dbaccess/source/ui/inc/sqledit.hxx:42
     dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig
 dbaccess/source/ui/inc/WCopyTable.hxx:258
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
-editeng/source/editeng/impedit.hxx:522
+editeng/source/editeng/impedit.hxx:518
     ImpEditEngine maColorConfig svtools::ColorConfig
 embeddedobj/source/inc/commonembobj.hxx:114
     OCommonEmbeddedObject m_aClassName OUString
@@ -284,17 +284,17 @@ i18npool/inc/textconversion.hxx:79
     i18npool::Hangul_Index address sal_Int16
 i18npool/inc/textconversion.hxx:80
     i18npool::Hangul_Index count sal_Int16
-include/basegfx/utils/gradienttools.hxx:47
-    (anonymous namespace)::ColorToBColorConverter::(anonymous union at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:46:9) mValue 
sal_uInt32
-include/basegfx/utils/gradienttools.hxx:55
-    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:48:13) B 
sal_uInt8
-include/basegfx/utils/gradienttools.hxx:56
-    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:48:13) G 
sal_uInt8
-include/basegfx/utils/gradienttools.hxx:57
-    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:48:13) R 
sal_uInt8
-include/basic/sbstar.hxx:50
-    StarBASIC aErrorHdl Link<StarBASIC *, _Bool>
+include/basegfx/utils/gradienttools.hxx:43
+    (anonymous namespace)::ColorToBColorConverter::(anonymous union at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:42:9) mValue 
sal_uInt32
+include/basegfx/utils/gradienttools.hxx:51
+    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) B 
sal_uInt8
+include/basegfx/utils/gradienttools.hxx:52
+    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) G 
sal_uInt8
+include/basegfx/utils/gradienttools.hxx:53
+    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) R 
sal_uInt8
 include/basic/sbstar.hxx:51
+    StarBASIC aErrorHdl Link<StarBASIC *, _Bool>
+include/basic/sbstar.hxx:52
     StarBASIC aBreakHdl Link<StarBASIC *, BasicDebugFlags>
 include/comphelper/parallelsort.hxx:164
     comphelper::(anonymous namespace)::Binner maLabels uint8_t[51200]
@@ -308,50 +308,54 @@ include/connectivity/sdbcx/VTable.hxx:78
     connectivity::sdbcx::OTable m_xIndexes std::unique_ptr<OCollection>
 include/connectivity/sqlparse.hxx:104
     connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
-include/docmodel/theme/FormatScheme.hxx:240
+include/docmodel/theme/FormatScheme.hxx:239
     model::BlipEffect mnRadius sal_Int32
-include/docmodel/theme/FormatScheme.hxx:241
+include/docmodel/theme/FormatScheme.hxx:240
     model::BlipEffect mbGrow _Bool
-include/docmodel/theme/FormatScheme.hxx:242
+include/docmodel/theme/FormatScheme.hxx:241
     model::BlipEffect mnAlpha sal_Int32
-include/docmodel/theme/FormatScheme.hxx:244
+include/docmodel/theme/FormatScheme.hxx:243
     model::BlipEffect mnHue sal_Int32
-include/docmodel/theme/FormatScheme.hxx:245
+include/docmodel/theme/FormatScheme.hxx:244
     model::BlipEffect mnSaturation sal_Int32
-include/docmodel/theme/FormatScheme.hxx:246
+include/docmodel/theme/FormatScheme.hxx:245
     model::BlipEffect mnLuminance sal_Int32
 include/editeng/lrspitem.hxx:254
     SvxGutterRightMarginItem m_nRightGutterMargin tools::Long
-include/filter/msfilter/svdfppt.hxx:717
+include/filter/msfilter/svdfppt.hxx:718
     PPTExtParaSheet aExtParaLevel PPTExtParaLevel[10]
-include/filter/msfilter/svdfppt.hxx:888
-    ImplPPTParaPropSet nDontKnow1 sal_uInt32
 include/filter/msfilter/svdfppt.hxx:889
-    ImplPPTParaPropSet nDontKnow2 sal_uInt32
+    ImplPPTParaPropSet nDontKnow1 sal_uInt32
 include/filter/msfilter/svdfppt.hxx:890
+    ImplPPTParaPropSet nDontKnow2 sal_uInt32
+include/filter/msfilter/svdfppt.hxx:891
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
-include/formula/formulahelper.hxx:40
+include/formula/formulahelper.hxx:39
     formula::FormulaHelper m_aSysLocale SvtSysLocale
 include/oox/core/contexthandler2.hxx:231
     oox::core::ContextHandler2Helper mnRootStackSize size_t
 include/oox/ole/axbinarywriter.hxx:153
     oox::ole::AxBinaryPropertyWriter maStreamProps ComplexPropVector
-include/sfx2/lokhelper.hxx:36
+include/sfx2/lokhelper.hxx:66
     LokMouseEventData maLogicPosition std::optional<Point>
-include/sfx2/msg.hxx:95
+include/sfx2/msg.hxx:94
     SfxTypeAttrib nAID sal_uInt16
-include/sfx2/msg.hxx:96
+include/sfx2/msg.hxx:95
     SfxTypeAttrib pName const char *
-include/sfx2/msg.hxx:105
+include/sfx2/msg.hxx:104
     SfxType createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:106
+include/sfx2/msg.hxx:105
     SfxType pType const std::type_info *
-include/sfx2/msg.hxx:107
+include/sfx2/msg.hxx:106
     SfxType nAttribs sal_uInt16
-include/sfx2/msg.hxx:108
+include/sfx2/msg.hxx:107
     SfxType aAttrib SfxTypeAttrib[1]
-include/sfx2/msg.hxx:118
+include/sfx2/msg.hxx:117
     SfxType0 pType const std::type_info *
+include/svl/itempool.hxx:182
+    SfxItemPool::Item2Range m_begin o3tl::sorted_vector<SfxPoolItem 
*>::const_iterator
+include/svl/itempool.hxx:183
+    SfxItemPool::Item2Range m_end o3tl::sorted_vector<SfxPoolItem 
*>::const_iterator
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale SvtSysLocale
 include/svx/diagram/IDiagramHelper.hxx:72
@@ -362,7 +366,7 @@ include/svx/graphctl.hxx:52
     GraphCtrl xVD ScopedVclPtrInstance<VirtualDevice>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49
     sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
-include/svx/svdetc.hxx:183
+include/svx/svdetc.hxx:182
     SdrGlobalData maSysLocale SvtSysLocale
 include/svx/svdmark.hxx:141
     SdrMarkList maPointName OUString
@@ -394,9 +398,9 @@ include/unoidl/unoidl.hxx:455
     unoidl::ConstantValue::(anonymous union at 
/home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) doubleValue double
 include/unotest/bootstrapfixturebase.hxx:52
     test::BootstrapFixtureBase m_directories Directories
-include/vcl/bitmap.hxx:101
+include/vcl/bitmap.hxx:106
     BitmapSystemData mnWidth int
-include/vcl/bitmap.hxx:102
+include/vcl/bitmap.hxx:107
     BitmapSystemData mnHeight int
 include/vcl/formatter.hxx:128
     Formatter m_aStaticFormatter StaticFormatter
@@ -444,13 +448,13 @@ oox/source/drawingml/chart/objectformatter.cxx:722
     oox::drawingml::chart::ObjectFormatterData maFromLocale Locale
 reportdesign/source/ui/inc/ColorListener.hxx:35
     rptui::OColorListener m_aColorConfig svtools::ColorConfig
-sal/osl/unx/process.cxx:832
+sal/osl/unx/process.cxx:836
     (anonymous namespace)::osl_procStat signal char[24]
-sal/osl/unx/process.cxx:833
+sal/osl/unx/process.cxx:837
     (anonymous namespace)::osl_procStat blocked char[24]
-sal/osl/unx/process.cxx:834
+sal/osl/unx/process.cxx:838
     (anonymous namespace)::osl_procStat sigignore char[24]
-sal/osl/unx/process.cxx:835
+sal/osl/unx/process.cxx:839
     (anonymous namespace)::osl_procStat sigcatch char[24]
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx:1674
     rtl_OStringBuffer::append_001 empty OString
@@ -542,13 +546,13 @@ sc/source/ui/inc/inputhdl.hxx:68
     ScInputHandler pFormulaDataPara std::unique_ptr<ScTypedCaseStrSet>
 sc/source/ui/inc/tabcont.hxx:37
     ScTabControl bErrorShown _Bool
-sc/source/ui/vba/vbaformatconditions.hxx:36
-    ScVbaFormatConditions mxSheetConditionalEntries 
css::uno::Reference<css::sheet::XSheetConditionalEntries>
-sc/source/ui/vba/vbaformatconditions.hxx:37
-    ScVbaFormatConditions mxStyles css::uno::Reference<ov::excel::XStyles>
 sc/source/ui/vba/vbaformatconditions.hxx:38
-    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+    ScVbaFormatConditions mxSheetConditionalEntries 
css::uno::Reference<css::sheet::XSheetConditionalEntries>
 sc/source/ui/vba/vbaformatconditions.hxx:39
+    ScVbaFormatConditions mxStyles rtl::Reference<ScVbaStyles>
+sc/source/ui/vba/vbaformatconditions.hxx:40
+    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+sc/source/ui/vba/vbaformatconditions.hxx:41
     ScVbaFormatConditions mxParentRangePropertySet 
css::uno::Reference<css::beans::XPropertySet>
 sc/source/ui/vba/vbaworksheet.hxx:49
     ScVbaWorksheet mxButtons ::rtl::Reference<ScVbaSheetObjectsBase>[2]
@@ -564,9 +568,9 @@ sd/source/core/CustomAnimationCloner.cxx:70
     sd::(anonymous namespace)::CustomAnimationClonerImpl maSourceNodeVector 
std::vector<Reference<XAnimationNode> >
 sd/source/core/CustomAnimationCloner.cxx:71
     sd::(anonymous namespace)::CustomAnimationClonerImpl maCloneNodeVector 
std::vector<Reference<XAnimationNode> >
-sd/source/ui/inc/unopage.hxx:161
+sd/source/ui/inc/unopage.hxx:162
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/inc/unopage.hxx:221
+sd/source/ui/inc/unopage.hxx:222
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
 sd/source/ui/sidebar/MasterPageContainer.cxx:141
     sd::sidebar::MasterPageContainer::Implementation 
maLargePreviewBeingCreated Image
@@ -598,11 +602,11 @@ starmath/inc/ElementsDockingWindow.hxx:42
     SmElementsControl maFormat SmFormat
 store/source/storbios.cxx:52
     (anonymous namespace)::OStoreSuperBlock m_aMarked L
-svl/source/crypto/cryptosign.cxx:270
+svl/source/crypto/cryptosign.cxx:274
     (anonymous namespace)::PKIStatusInfo status SECItem
-svl/source/crypto/cryptosign.cxx:290
+svl/source/crypto/cryptosign.cxx:294
     (anonymous namespace)::TimeStampResp status PKIStatusInfo
-svl/source/crypto/cryptosign.cxx:291
+svl/source/crypto/cryptosign.cxx:295
     (anonymous namespace)::TimeStampResp timeStampToken SECItem
 svl/source/misc/strmadpt.cxx:52
     SvDataPipe_Impl::Page m_aBuffer sal_Int8[1]
@@ -686,7 +690,7 @@ sw/source/core/text/inftxt.cxx:546
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev 
ScopedVclPtrInstance<VirtualDevice>
 sw/source/core/text/redlnitr.hxx:75
     SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
-sw/source/filter/html/htmltab.cxx:2851
+sw/source/filter/html/htmltab.cxx:2852
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:33
     RTFSurround::(unnamed union at 
/home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) nVal sal_uInt8
@@ -702,7 +706,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:117
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
 sw/source/uibase/inc/fldmgr.hxx:80
     SwInsertField_Data m_aDBDataSource css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:436
+toolkit/source/awt/vclxtoolkit.cxx:437
     (anonymous namespace)::VCLXToolkit mxSelection 
css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 toolkit/source/controls/table/gridtablerenderer.cxx:71
     svt::table::(anonymous namespace)::CachedSortIndicator m_sortAscending 
BitmapEx
@@ -720,8 +724,8 @@ ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 ucb/source/ucp/package/pkgprovider.hxx:48
     package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages>
-ucb/source/ucp/webdav-curl/CurlSession.cxx:130
-    (anonymous namespace)::CurlOption::(anonymous union at 
/home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:129:5) pValue 
const void *const
+ucb/source/ucp/webdav-curl/CurlSession.cxx:132
+    (anonymous namespace)::CurlOption::(anonymous union at 
/home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:131:5) pValue 
const void *const
 ucbhelper/source/client/proxydecider.cxx:133
     ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy 
const InternetProxyServer
 ucbhelper/source/provider/propertyvalueset.cxx:79
@@ -796,11 +800,11 @@ vcl/inc/salwtype.hxx:171
     SalWheelMouseEvent mbDeltaIsPixel _Bool
 vcl/inc/salwtype.hxx:224
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:273
+vcl/inc/svdata.hxx:276
     ImplSVWinData mbIsLiveResize _Bool
-vcl/inc/svdata.hxx:325
+vcl/inc/svdata.hxx:328
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:332
+vcl/inc/svdata.hxx:335
     ImplSVNWFData mbNoFrameJunctionForPopups _Bool
 vcl/inc/toolbox.h:110
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<ToolBoxItemId>
@@ -906,8 +910,8 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:60
     writerfilter::ooxml::AttributeInfo m_nResource ResourceType
 writerfilter/source/ooxml/OOXMLFactory.hxx:61
     writerfilter::ooxml::AttributeInfo m_nRef Id
-writerperfect/inc/WPXSvInputStream.hxx:71
-    writerperfect::WPXSvInputStream mpReadBuffer const unsigned char *
+writerperfect/inc/WPXSvInputStream.hxx:70
+    writerperfect::WPXSvInputStream mnReadBufferLength unsigned long
 xmloff/inc/MultiPropertySetHelper.hxx:85
     MultiPropertySetHelper aEmptyAny css::uno::Any
 xmloff/source/chart/SchXMLChartContext.cxx:447
diff --git a/compilerplugins/clang/unusedfields.untouched.results 
b/compilerplugins/clang/unusedfields.untouched.results
index e81c18f904c0..f4f43bab7470 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -42,10 +42,22 @@ cui/source/inc/fileextcheckdlg.hxx:29
     FileExtCheckDialog m_pPerformCheck std::unique_ptr<weld::CheckButton>
 cui/source/inc/fileextcheckdlg.hxx:30
     FileExtCheckDialog m_pOk std::unique_ptr<weld::Button>
+cui/source/options/optgdlg.hxx:201
+    OfaLanguagesTabPage m_xCurrentDocImg std::unique_ptr<weld::Widget>
+cui/source/options/optinet2.hxx:108
+    SvxSecurityTabPage m_xCertPathImg std::unique_ptr<weld::Widget>
+cui/source/options/optinet2.hxx:109
+    SvxSecurityTabPage m_xCertPathLabel std::unique_ptr<weld::Label>
+cui/source/options/optsave.hxx:72
+    SvxSaveTabPage m_xDocTypeImg std::unique_ptr<weld::Widget>
+cui/source/options/optsave.hxx:75
+    SvxSaveTabPage m_xSaveAsImg std::unique_ptr<weld::Widget>
 dbaccess/source/core/inc/databasecontext.hxx:82
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard 
::osl::MutexGuard
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2143
+    (anonymous namespace)::ViewCallback m_aCallbackWindowResult 
boost::property_tree::ptree
 embeddedobj/source/msole/olecomponent.hxx:50
     OleComponent m_aMutex ::osl::Mutex
 embeddedobj/source/msole/olecomponent.hxx:51
@@ -86,153 +98,151 @@ helpcompiler/inc/HelpCompiler.hxx:200
     HelpCompiler lang const std::string
 include/basegfx/DrawCommands.hxx:143
     gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo>
-include/comphelper/seqstream.hxx:76
+include/comphelper/seqstream.hxx:75
     comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8>
-include/docmodel/theme/FormatScheme.hxx:374
+include/docmodel/theme/FormatScheme.hxx:373
     model::DashStop mnDashLength sal_Int32
-include/docmodel/theme/FormatScheme.hxx:375
+include/docmodel/theme/FormatScheme.hxx:374
     model::DashStop mnStopLength sal_Int32
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard SolarMutexGuard
-include/editeng/unotext.hxx:619
+include/editeng/unotext.hxx:618
     SvxUnoTextRangeEnumeration mxParentText 
css::uno::Reference<css::text::XText>
-include/filter/msfilter/svdfppt.hxx:545
+include/filter/msfilter/svdfppt.hxx:546
     ProcessData aBackgroundColoredObjects 
::std::vector<rtl::Reference<SdrObject> >
 include/LibreOfficeKit/LibreOfficeKitGtk.h:40
     _LOKDocView aDrawingArea GtkDrawingArea
 include/LibreOfficeKit/LibreOfficeKitGtk.h:45
     _LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/vml/vmlshapecontext.hxx:115
+include/oox/vml/vmlshapecontext.hxx:116
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
 include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/msg.hxx:117
+include/sfx2/msg.hxx:116
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:119
+include/sfx2/msg.hxx:118
     SfxType0 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 aAttrib SfxTypeAttrib[1]
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
+include/sfx2/msg.hxx:131
     SfxType1 pType const std::type_info *
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 aAttrib SfxTypeAttrib[2]
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 nAttribs sal_uInt16
-include/sfx2/msg.hxx:133
+include/sfx2/msg.hxx:132
     SfxType2 pType const std::type_info *
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 aAttrib SfxTypeAttrib[3]
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 nAttribs sal_uInt16
-include/sfx2/msg.hxx:134
+include/sfx2/msg.hxx:133
     SfxType3 pType const std::type_info *
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 aAttrib SfxTypeAttrib[4]
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 nAttribs sal_uInt16
-include/sfx2/msg.hxx:135
+include/sfx2/msg.hxx:134
     SfxType4 pType const std::type_info *
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 aAttrib SfxTypeAttrib[5]
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 nAttribs sal_uInt16
-include/sfx2/msg.hxx:136
+include/sfx2/msg.hxx:135
     SfxType5 pType const std::type_info *
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 aAttrib SfxTypeAttrib[6]
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 nAttribs sal_uInt16
-include/sfx2/msg.hxx:137
+include/sfx2/msg.hxx:136
     SfxType6 pType const std::type_info *
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 aAttrib SfxTypeAttrib[7]
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 nAttribs sal_uInt16
-include/sfx2/msg.hxx:138
+include/sfx2/msg.hxx:137
     SfxType7 pType const std::type_info *
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 aAttrib SfxTypeAttrib[8]
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 nAttribs sal_uInt16
-include/sfx2/msg.hxx:139
+include/sfx2/msg.hxx:138
     SfxType8 pType const std::type_info *
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 aAttrib SfxTypeAttrib[10]
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 nAttribs sal_uInt16
-include/sfx2/msg.hxx:140
+include/sfx2/msg.hxx:139
     SfxType10 pType const std::type_info *
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 aAttrib SfxTypeAttrib[11]
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:141
+include/sfx2/msg.hxx:140
     SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 aAttrib SfxTypeAttrib[13]
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 nAttribs sal_uInt16
-include/sfx2/msg.hxx:143
+include/sfx2/msg.hxx:142
     SfxType13 pType const std::type_info *
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 aAttrib SfxTypeAttrib[14]
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 nAttribs sal_uInt16
-include/sfx2/msg.hxx:144
+include/sfx2/msg.hxx:143
     SfxType14 pType const std::type_info *
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 aAttrib SfxTypeAttrib[16]
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 nAttribs sal_uInt16
-include/sfx2/msg.hxx:145
+include/sfx2/msg.hxx:144
     SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 aAttrib SfxTypeAttrib[17]
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 nAttribs sal_uInt16
-include/sfx2/msg.hxx:146
+include/sfx2/msg.hxx:145
     SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 aAttrib SfxTypeAttrib[23]
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 nAttribs sal_uInt16
-include/sfx2/msg.hxx:147
+include/sfx2/msg.hxx:146
     SfxType23 pType const std::type_info *
-include/sfx2/templdlg.hxx:41
-    SfxTemplatePanelControl pImpl std::unique_ptr<SfxTemplateDialog_Impl>
-include/svtools/genericasyncunodialog.hxx:48
+include/svtools/genericasyncunodialog.hxx:47
     svt::OGenericUnoAsyncDialog::UnoAsyncDialogEntryGuard m_aGuard 
::osl::MutexGuard
 include/svtools/genericunodialog.hxx:154
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
@@ -244,6 +254,10 @@ include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem SvxIMapDlgItem
 include/unotest/macros_test.hxx:113
     unotest::MacrosTest mpDll std::unique_ptr<BasicDLL>
+include/unotools/lingucfg.hxx:88
+    SvtLinguOptions bIsSpellCapitalization _Bool
+include/unotools/lingucfg.hxx:94
+    SvtLinguOptions bROIsSpellCapitalization _Bool
 include/vcl/commandevent.hxx:317
     CommandGesturePanData mfX const double
 include/vcl/commandevent.hxx:318
@@ -392,9 +406,9 @@ sc/inc/mtvelements.hxx:171
     sc::ColumnBlockConstPosition miSparklinePos 
SparklineStoreType::const_iterator
 sc/inc/SolverSettings.hxx:168
     sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString>
-sc/source/core/data/document.cxx:1217
+sc/source/core/data/document.cxx:1229
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch 
sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1218
+sc/source/core/data/document.cxx:1230
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
 sc/source/filter/inc/sheetdatacontext.hxx:50
     oox::xls::SheetDataContext aReleaser SolarMutexReleaser
@@ -414,13 +428,13 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:63
     sd::slidesorter::view::Layouter::Implementation mpTheme 
std::shared_ptr<view::Theme>
 sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1185
+sd/source/ui/view/viewshel.cxx:1187
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1186
+sd/source/ui/view/viewshel.cxx:1188
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::class 
SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1187
+sd/source/ui/view/viewshel.cxx:1189
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1188
+sd/source/ui/view/viewshel.cxx:1190
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::class SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:189
     sd::ViewShellBase::Implementation mpPageCacheManager 
std::shared_ptr<slidesorter::cache::PageCacheManager>
@@ -456,17 +470,17 @@ starmath/inc/mathml/mathmlMo.hxx:68
     moOperatorData m_rspace sal_uInt16
 starmath/inc/mathml/mathmlMo.hxx:69
     moOperatorData m_properties moOpDP
-starmath/inc/view.hxx:249
+starmath/inc/view.hxx:252
     SmViewShell maGraphicController SmGraphicController
-svl/source/crypto/cryptosign.cxx:111
+svl/source/crypto/cryptosign.cxx:115
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:112
+svl/source/crypto/cryptosign.cxx:116
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:113
+svl/source/crypto/cryptosign.cxx:117
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:271
+svl/source/crypto/cryptosign.cxx:275
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:272
+svl/source/crypto/cryptosign.cxx:276
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svtools/source/filter/exportdialog.hxx:124
     ExportDialog mxEncoding std::unique_ptr<weld::Widget>
@@ -482,7 +496,7 @@ svx/source/svdraw/svdmodel.cxx:93
     SdrModelImpl mpThemeColorChanger std::shared_ptr<svx::IThemeColorChanger>
 svx/source/tbxctrls/layctrl.cxx:432
     (anonymous namespace)::ColumnsWindow mxControl 
rtl::Reference<SvxColumnsToolBoxControl>
-sw/qa/extras/uiwriter/uiwriter5.cxx:66
+sw/qa/extras/uiwriter/uiwriter5.cxx:67
     SwUiWriterTest5 m_aSavedSettings AllSettings
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
@@ -498,7 +512,7 @@ sw/source/ui/envelp/swuilabimp.hxx:32
     SwLabPage m_xAddressFrame std::unique_ptr<weld::Widget>
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:328
+sw/source/uibase/inc/conttree.hxx:331
     SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
 sw/source/uibase/inc/frmpage.hxx:94
     SwFramePage m_xAnchorFrame std::unique_ptr<weld::Widget>
@@ -506,6 +520,10 @@ 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/optpage.hxx:48
+    SwContentOptPage m_xVMetricImg std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/optpage.hxx:59
+    SwContentOptPage m_xPostItImg std::unique_ptr<weld::Widget>
 sw/source/uibase/inc/pagenumberdlg.hxx:31
     SwPageNumberDlg m_xCancel std::unique_ptr<weld::Button>
 sw/source/uibase/inc/swuicnttab.hxx:243
@@ -526,7 +544,7 @@ unoidl/source/unoidlprovider.cxx:676
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ 
rtl::Reference<UnoidlModuleEntity>
 uui/source/openlocked.hxx:36
     vcl::OpenLockedQueryBox mxQuestionMarkImage std::unique_ptr<weld::Image>
-vcl/inc/jsdialog/jsdialogbuilder.hxx:714
+vcl/inc/jsdialog/jsdialogbuilder.hxx:725
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
@@ -538,7 +556,7 @@ vcl/inc/salprn.hxx:48
     SalPrinterQueueInfo moPortName std::optional<OUString>
 vcl/inc/sft.hxx:178
     vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
-vcl/source/app/salvtables.cxx:247
+vcl/source/app/salvtables.cxx:246
     SalFlashAttention m_aOrigBackground Wallpaper
 vcl/source/fontsubset/ttcr.hxx:40
     vcl::longHorMetrics aw sal_uInt16
diff --git a/compilerplugins/clang/unusedfields.writeonly.results 
b/compilerplugins/clang/unusedfields.writeonly.results
index 9c1de80b278d..24de99cfa230 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -280,7 +280,7 @@ dbaccess/source/ui/browser/dbloader.cxx:60
     (anonymous namespace)::DBContentLoader m_xListener 
Reference<XLoadEventListener>
 dbaccess/source/ui/inc/RelationController.hxx:36
     dbaui::ORelationController m_xWaitObject std::unique_ptr<weld::WaitObject>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:317
+desktop/qa/desktop_lib/test_desktop_lib.cxx:313
     DesktopLOKTest m_bModified _Bool
 desktop/source/app/app.cxx:1239
     desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions 
std::unique_ptr<SvtCTLOptions>
@@ -370,8 +370,8 @@ i18nutil/source/utility/paper.cxx:318
     paperword string char *
 include/basegfx/DrawCommands.hxx:82
     gfx::LinearGradientInfo maMatrix basegfx::B2DHomMatrix
-include/basegfx/utils/gradienttools.hxx:58
-    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:48:13) T 
sal_uInt8
+include/basegfx/utils/gradienttools.hxx:54
+    (anonymous namespace)::ColorToBColorConverter::(anonymous 
union)::(anonymous struct at 
/home/noel/libo-plugin/include/basegfx/utils/gradienttools.hxx:44:13) T 
sal_uInt8
 include/basic/basmgr.hxx:59
     BasicError nReason BasicErrorReason
 include/basic/sbxvar.hxx:75
@@ -384,41 +384,41 @@ include/comphelper/parallelsort.hxx:88
     comphelper::(anonymous namespace)::ProfileZone mbDummy _Bool
 include/comphelper/unique_disposing_ptr.hxx:31
     comphelper::unique_disposing_ptr m_xTerminateListener 
css::uno::Reference<css::frame::XTerminateListener>
-include/docmodel/theme/FormatScheme.hxx:93
+include/docmodel/theme/FormatScheme.hxx:92
     model::GradientFill mbRotateWithShape _Bool
-include/docmodel/theme/FormatScheme.hxx:367
+include/docmodel/theme/FormatScheme.hxx:366
     model::LineEnd meType LineEndType
-include/docmodel/theme/FormatScheme.hxx:368
+include/docmodel/theme/FormatScheme.hxx:367
     model::LineEnd meWidth LineEndWidth
-include/docmodel/theme/FormatScheme.hxx:369
+include/docmodel/theme/FormatScheme.hxx:368
     model::LineEnd meLength LineEndLength
-include/docmodel/theme/FormatScheme.hxx:381
+include/docmodel/theme/FormatScheme.hxx:380
     model::LineDash maCustomList std::vector<DashStop>
-include/docmodel/theme/FormatScheme.hxx:393
+include/docmodel/theme/FormatScheme.hxx:392
     model::LineStyle maHeadEnd LineEnd
-include/docmodel/theme/FormatScheme.hxx:394
+include/docmodel/theme/FormatScheme.hxx:393
     model::LineStyle maTailEnd LineEnd
-include/docmodel/theme/FormatScheme.hxx:415
+include/docmodel/theme/FormatScheme.hxx:414
     model::Effect mnRadius sal_Int32
-include/docmodel/theme/FormatScheme.hxx:418
+include/docmodel/theme/FormatScheme.hxx:417
     model::Effect mnScaleX sal_Int32
-include/docmodel/theme/FormatScheme.hxx:419
+include/docmodel/theme/FormatScheme.hxx:418
     model::Effect mnScaley sal_Int32
-include/docmodel/theme/FormatScheme.hxx:420
+include/docmodel/theme/FormatScheme.hxx:419
     model::Effect mnScewX sal_Int32
-include/docmodel/theme/FormatScheme.hxx:421
+include/docmodel/theme/FormatScheme.hxx:420
     model::Effect mnScewY sal_Int32
-include/docmodel/theme/FormatScheme.hxx:425
+include/docmodel/theme/FormatScheme.hxx:424
     model::Effect mnEndAlpha double
-include/docmodel/theme/FormatScheme.hxx:426
+include/docmodel/theme/FormatScheme.hxx:425
     model::Effect mnEndPosition double
-include/docmodel/theme/FormatScheme.hxx:427
+include/docmodel/theme/FormatScheme.hxx:426
     model::Effect mnStartAlpha double
-include/docmodel/theme/FormatScheme.hxx:428
+include/docmodel/theme/FormatScheme.hxx:427
     model::Effect mnStartPosition double
-include/docmodel/theme/FormatScheme.hxx:429
+include/docmodel/theme/FormatScheme.hxx:428
     model::Effect mnFadeDirection sal_Int32
-include/docmodel/theme/FormatScheme.hxx:430
+include/docmodel/theme/FormatScheme.hxx:429
     model::Effect mbGrow _Bool
 include/drawinglayer/attribute/sdrallattribute3d.hxx:42
     drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const 
SdrLineStartEndAttribute
@@ -430,9 +430,9 @@ include/editeng/outlobj.hxx:44
     OutlinerParaObjData mbIsEditDoc _Bool
 include/editeng/splwrap.hxx:52
     SvxSpellWrapper xWait std::unique_ptr<weld::WaitObject>
-include/editeng/unotext.hxx:431
+include/editeng/unotext.hxx:430
     SvxUnoTextBase xParentText css::uno::Reference<css::text::XText>
-include/editeng/unotext.hxx:600
+include/editeng/unotext.hxx:599
     SvxUnoTextContentEnumeration mxParentText 
css::uno::Reference<css::text::XText>
 include/framework/addonsoptions.hxx:75
     framework::MergeNotebookBarInstruction aMergePoint OUString
@@ -462,13 +462,13 @@ include/opencl/platforminfo.hxx:30
     OpenCLDeviceInfo mnComputeUnits size_t
 include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
-include/sfx2/AccessibilityIssue.hxx:63
+include/sfx2/AccessibilityIssue.hxx:64
     sfx::AccessibilityIssue m_pParent weld::Window *
 include/sfx2/minfitem.hxx:38
     SfxMacroInfoItem aCommentText OUString
 include/sfx2/viewsh.hxx:188
     SfxViewShell m_xHelper std::shared_ptr<SfxStoringHelper>
-include/svl/poolitem.hxx:126
+include/svl/poolitem.hxx:145
     SfxPoolItem m_bDeleted _Bool
 include/svl/sigstruct.hxx:127
     SignatureInformation hasInconsistentSigningTime _Bool
@@ -556,6 +556,8 @@ include/svx/gridctrl.hxx:258
     DbGridControl m_pCursorDisposeListener 
std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaXColorListItem mxRef rtl::Reference<XColorList>
+include/svx/sdasitm.hxx:55
+    SdrCustomShapeGeometryItem m_aHash size_t
 include/svx/srchdlg.hxx:166
     SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
 include/svx/srchdlg.hxx:167
@@ -588,7 +590,7 @@ include/vcl/opengl/OpenGLContext.hxx:27
     GLWindow bMultiSampleSupported _Bool
 include/vcl/pdfextoutdevdata.hxx:86
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
-include/vcl/salnativewidgets.hxx:492
+include/vcl/salnativewidgets.hxx:493
     PushButtonValue mbSingleLine _Bool
 include/vcl/sysdata.hxx:69
     SystemEnvData pSalFrame SalFrame *
@@ -706,6 +708,8 @@ sc/inc/fillinfo.hxx:287
     ScTableInfo mDataBarInfos std::vector<std::unique_ptr<const ScDataBarInfo> 
>
 sc/inc/fillinfo.hxx:288
     ScTableInfo mIconSetInfos std::vector<std::unique_ptr<const ScIconSetInfo> 
>
+sc/inc/patattr.hxx:56
+    ScPatternAttr mxHashCode std::optional<sal_uInt32>
 sc/inc/pivot.hxx:75
     ScDPLabelData mnFlags sal_Int32
 sc/inc/pivot.hxx:78
@@ -716,17 +720,17 @@ sc/inc/scmod.hxx:100
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
 sc/inc/tabopparams.hxx:37
     ScInterpreterTableOpParams bValid _Bool
-sc/qa/unit/subsequent_export_test.cxx:2187
-    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2185:18) mnRow 
SCROW
-sc/qa/unit/subsequent_export_test.cxx:2188
-    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2185:18) mnStyle 
SvxBorderLineStyle
-sc/qa/unit/subsequent_export_test.cxx:2189
-    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2185:18) mnWidth 
tools::Long
-sc/source/core/data/column4.cxx:1449
+sc/qa/unit/subsequent_export_test.cxx:2218
+    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2216:18) mnRow 
SCROW
+sc/qa/unit/subsequent_export_test.cxx:2219
+    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2216:18) mnStyle 
SvxBorderLineStyle
+sc/qa/unit/subsequent_export_test.cxx:2220
+    (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2216:18) mnWidth 
tools::Long
+sc/source/core/data/column4.cxx:1451
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
-sc/source/core/data/column.cxx:1312
-    (anonymous namespace)::CopyByCloneHandler meListenType 
sc::StartListeningType
 sc/source/core/data/column.cxx:1313
+    (anonymous namespace)::CopyByCloneHandler meListenType 
sc::StartListeningType
+sc/source/core/data/column.cxx:1314
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags 
ScCloneFlags
 sc/source/core/data/table2.cxx:4041
     (anonymous namespace)::OutlineArrayFinder mpArray ScOutlineArray *
@@ -776,8 +780,6 @@ sc/source/filter/xml/xmlexternaltabi.hxx:110
     ScXMLExternalRefCellContext mnCellType sal_Int16
 sc/source/ui/inc/AccessibleText.hxx:197
     ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
-sc/source/ui/inc/datastream.hxx:104
-    sc::DataStream mnSettings sal_uInt32
 sc/source/ui/inc/drawview.hxx:41
     ScDrawView pDropMarker std::unique_ptr<SdrDropMarkerOverlay>
 sc/source/ui/inc/drwtrans.hxx:44
@@ -852,7 +854,7 @@ sd/source/ui/inc/navigatr.hxx:144
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:72
     sd::tools::TimerBasedTaskExecution mpSelf 
std::shared_ptr<TimerBasedTaskExecution>
-sd/source/ui/inc/unopage.hxx:274
+sd/source/ui/inc/unopage.hxx:275
     SdPageLinkTargets mxPage css::uno::Reference<css::drawing::XDrawPage>
 sd/source/ui/inc/ViewShellImplementation.hxx:78
     sd::ViewShell::Implementation::ToolBarManagerLock mpLock 
::std::unique_ptr<ToolBarManager::UpdateLock, 
o3tl::default_delete<ToolBarManager::UpdateLock> >
@@ -878,7 +880,7 @@ sfx2/inc/notebookbar/NotebookbarTabControl.hxx:42
     NotebookbarTabControl m_pListener 
css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/doc/sfxbasemodel.cxx:472
+sfx2/source/doc/sfxbasemodel.cxx:482
     (anonymous namespace)::SfxSaveGuard m_pFramesLock 
std::unique_ptr<SfxOwnFramesLocker>
 sfx2/source/inc/appdata.hxx:68
     SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *>
@@ -904,7 +906,7 @@ sfx2/source/inc/templdgi.hxx:207
     SfxTemplateDialog_Impl m_xToolbarDropTargetHelper 
std::unique_ptr<ToolbarDropTarget>
 sfx2/source/view/classificationcontroller.cxx:73
     sfx2::(anonymous namespace)::ClassificationCategoriesController 
m_aPropertyListener ClassificationPropertyListener
-sfx2/source/view/viewsh.cxx:555
+sfx2/source/view/viewsh.cxx:747
     LOKDocumentFocusListener m_aRefList 
std::unordered_set<uno::Reference<uno::XInterface> >
 slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex normal glm::vec3
@@ -918,15 +920,15 @@ slideshow/source/engine/slideshowimpl.cxx:446
     (anonymous namespace)::SlideShowImpl mpNavigationNext 
std::shared_ptr<SlideOverlayButton>
 slideshow/source/engine/slideshowimpl.cxx:1059
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc 
mpSlideShowImpl SlideShowImpl *const
-slideshow/test/testview.cxx:50
+slideshow/test/testview.cxx:51
     (anonymous namespace)::ImplTestView maCreatedSprites 
std::vector<std::pair<basegfx::B2DVector, double> >
-slideshow/test/testview.cxx:53
+slideshow/test/testview.cxx:54
     (anonymous namespace)::ImplTestView maPriority basegfx::B1DRange
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
 starmath/inc/mathml/mathmlimport.hxx:47
     SmXMLImportWrapper m_bUseHTMLMLEntities _Bool
-starmath/inc/view.hxx:189
+starmath/inc/view.hxx:192
     SmCmdBoxWindow aController SmEditController
 stoc/source/servicemanager/servicemanager.cxx:389
     (anonymous namespace)::OServiceManager m_SetLoadedFactories HashSet_Ref
@@ -966,31 +968,31 @@ svl/qa/unit/test_URIHelper.cxx:291
     Data begin sal_Int32
 svl/qa/unit/test_URIHelper.cxx:292
     Data end sal_Int32
-svl/source/crypto/cryptosign.cxx:100
+svl/source/crypto/cryptosign.cxx:104
     (anonymous namespace)::MessageImprint hashedMessage SECItem
-svl/source/crypto/cryptosign.cxx:135
+svl/source/crypto/cryptosign.cxx:139
     (anonymous namespace)::TimeStampReq version SECItem
-svl/source/crypto/cryptosign.cxx:137
+svl/source/crypto/cryptosign.cxx:141
     (anonymous namespace)::TimeStampReq reqPolicy SECItem
-svl/source/crypto/cryptosign.cxx:138
+svl/source/crypto/cryptosign.cxx:142
     (anonymous namespace)::TimeStampReq nonce SECItem
-svl/source/crypto/cryptosign.cxx:139
+svl/source/crypto/cryptosign.cxx:143
     (anonymous namespace)::TimeStampReq certReq SECItem
-svl/source/crypto/cryptosign.cxx:140
+svl/source/crypto/cryptosign.cxx:144
     (anonymous namespace)::TimeStampReq extensions Extension *
-svl/source/crypto/cryptosign.cxx:148
+svl/source/crypto/cryptosign.cxx:152
     (anonymous namespace)::GeneralName name CERTName
-svl/source/crypto/cryptosign.cxx:156
+svl/source/crypto/cryptosign.cxx:160
     (anonymous namespace)::GeneralNames names GeneralName
-svl/source/crypto/cryptosign.cxx:164
+svl/source/crypto/cryptosign.cxx:168
     (anonymous namespace)::IssuerSerial issuer GeneralNames
-svl/source/crypto/cryptosign.cxx:165
+svl/source/crypto/cryptosign.cxx:169
     (anonymous namespace)::IssuerSerial serialNumber SECItem
-svl/source/crypto/cryptosign.cxx:175
+svl/source/crypto/cryptosign.cxx:179
     (anonymous namespace)::ESSCertIDv2 certHash SECItem
-svl/source/crypto/cryptosign.cxx:176
+svl/source/crypto/cryptosign.cxx:180
     (anonymous namespace)::ESSCertIDv2 issuerSerial IssuerSerial
-svl/source/crypto/cryptosign.cxx:184
+svl/source/crypto/cryptosign.cxx:188
     (anonymous namespace)::SigningCertificateV2 certs ESSCertIDv2 **
 svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
@@ -1096,7 +1098,7 @@ 
svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:40
     svx::sidebar::TextColumnsPropertyPanel maColumnsNumberController 
sfx2::sidebar::ControllerItem
 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:41
     svx::sidebar::TextColumnsPropertyPanel maColumnsSpacingController 
sfx2::sidebar::ControllerItem
-svx/source/tbxctrls/tbcontrl.cxx:337
+svx/source/tbxctrls/tbcontrl.cxx:338
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList 
::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:95
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -1110,7 +1112,7 @@ sw/inc/textboxhelper.hxx:215
     SwTextBoxNode m_bIsCloningInProgress _Bool
 sw/inc/unoframe.hxx:303
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
-sw/inc/view.hxx:195
+sw/inc/view.hxx:198
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
 sw/inc/viewopt.hxx:46
     ViewOptFlags1 bPagebreak _Bool
@@ -1118,7 +1120,7 @@ sw/inc/viewopt.hxx:47
     ViewOptFlags1 bColumnbreak _Bool
 sw/inc/viewopt.hxx:50
     ViewOptFlags1 bRef _Bool
-sw/qa/core/doc/doc.cxx:403
+sw/qa/core/doc/doc.cxx:404
     (anonymous namespace)::SelectionChangeListener m_aAnchors 
std::vector<uno::Reference<text::XTextRange> >
 sw/source/core/inc/swfont.hxx:988
     SvStatistics nGetTextSize sal_uInt16
@@ -1132,10 +1134,8 @@ sw/source/core/inc/swfont.hxx:992
     SvStatistics nChangeFont sal_uInt16
 sw/source/core/layout/dbg_lay.cxx:135
     SwImplProtocol m_aVars std::vector<tools::Long>
-sw/source/core/table/swtable.cxx:3048
+sw/source/core/table/swtable.cxx:3050
     SwTableCellInfo::Impl m_HandledTableBoxes TableBoxes_t
-sw/source/core/text/porfld.hxx:66
-    SwFieldPortion m_nAttrFieldType sal_uInt16
 sw/source/filter/html/swhtml.hxx:390
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> 
>
 sw/source/filter/inc/rtf.hxx:29
@@ -1248,7 +1248,7 @@ vcl/inc/sft.hxx:168
     vcl::TTGlobalFontInfo_ linegap int
 vcl/inc/sft.hxx:172
     vcl::TTGlobalFontInfo_ typoLineGap int
-vcl/inc/svdata.hxx:469
+vcl/inc/svdata.hxx:472
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/toolbarvalue.hxx:47
     ToolbarValue mbIsTopDockingArea _Bool
@@ -1298,7 +1298,7 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtkinst.cxx:20975
+vcl/unx/gtk3/gtkinst.cxx:21000
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper 
std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection gpointer
@@ -1308,11 +1308,9 @@ vcl/workben/vcldemo.cxx:1741
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
 writerfilter/source/dmapper/DocumentProtection.hxx:50
     writerfilter::dmapper::DocumentProtection m_sRedlineProtectionKey OUString
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:1107
-    writerfilter::dmapper::DomainMapper_Impl m_nLastTableCellParagraphDepth 
sal_Int32
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx:244
     writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
-writerfilter/source/dmapper/PropertyMap.hxx:220
+writerfilter/source/dmapper/PropertyMap.hxx:227
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 writerfilter/source/dmapper/WriteProtection.hxx:36
     writerfilter::dmapper::WriteProtection m_nCryptProviderType sal_Int32
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 0e09597ae268..2c62e569ea75 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -198,7 +198,6 @@ class OfaLanguagesTabPage : public SfxTabPage
     std::unique_ptr<SvxLanguageBox> m_xAsianLanguageLB;
     std::unique_ptr<SvxLanguageBox> m_xComplexLanguageLB;
     std::unique_ptr<weld::CheckButton> m_xCurrentDocCB;
-    std::unique_ptr<weld::Widget> m_xCurrentDocImg;
     std::unique_ptr<weld::CheckButton> m_xAsianSupportCB;
     std::unique_ptr<weld::Widget> m_xAsianSupportImg;
     std::unique_ptr<weld::CheckButton> m_xCTLSupportCB;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 434a9823cffd..4c292a75ac3a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -108,10 +108,8 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, 
weld::DialogController* p
     , m_xWarnAlienFormatCB(m_xBuilder->weld_check_button("warnalienformat"))
     , m_xWarnAlienFormatImg(m_xBuilder->weld_widget("lockwarnalienformat"))
     , m_xDocTypeLB(m_xBuilder->weld_combo_box("doctype"))
-    , m_xDocTypeImg(m_xBuilder->weld_widget("lockdoctype"))
     , m_xSaveAsFT(m_xBuilder->weld_label("saveas_label"))
     , m_xSaveAsLB(m_xBuilder->weld_combo_box("saveas"))
-    , m_xSaveAsImg(m_xBuilder->weld_widget("locksaveas"))
     , m_xODFWarningFI(m_xBuilder->weld_widget("odfwarning_image"))
     , m_xODFWarningFT(m_xBuilder->weld_label("odfwarning_label"))
 {
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index b905c98e1d98..cb6d63a7e87e 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -69,10 +69,8 @@ private:
     std::unique_ptr<weld::CheckButton> m_xWarnAlienFormatCB;
     std::unique_ptr<weld::Widget> m_xWarnAlienFormatImg;
     std::unique_ptr<weld::ComboBox> m_xDocTypeLB;
-    std::unique_ptr<weld::Widget> m_xDocTypeImg;
     std::unique_ptr<weld::Label> m_xSaveAsFT;
     std::unique_ptr<weld::ComboBox> m_xSaveAsLB;
-    std::unique_ptr<weld::Widget> m_xSaveAsImg;
     std::unique_ptr<weld::Widget> m_xODFWarningFI;
     std::unique_ptr<weld::Label> m_xODFWarningFT;
 
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index dd89ebf1eed0..c245d6b50c94 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2140,7 +2140,6 @@ public:
     bool m_bZeroCursor;
     tools::Rectangle m_aOwnCursor;
     boost::property_tree::ptree m_aCommentCallbackResult;
-    boost::property_tree::ptree m_aCallbackWindowResult;
     boost::property_tree::ptree m_aColorPaletteCallbackResult;
 
     ViewCallback(LibLODocument_Impl* pDocument)
diff --git a/sc/source/ui/condformat/condformateasydlg.cxx 
b/sc/source/ui/condformat/condformateasydlg.cxx
index 6ecf98e87e21..a368ec310c7d 100644
--- a/sc/source/ui/condformat/condformateasydlg.cxx
+++ b/sc/source/ui/condformat/condformateasydlg.cxx
@@ -31,22 +31,6 @@ void UpdateStyleList(const ScDocument* pDocument, 
weld::ComboBox& rCombo)
     FillStyleListBox(pDocument, rCombo);
     rCombo.set_active_text(sSelectedStyle);
 }
-
-ScTabViewShell* GetTabViewShell(const SfxBindings* pBindings)
-{
-    if (!pBindings)
-        return nullptr;
-    SfxDispatcher* pDispacher = pBindings->GetDispatcher();
-    if (!pDispacher)
-        return nullptr;
-    SfxViewFrame* pFrame = pDispacher->GetFrame();
-    if (!pFrame)
-        return nullptr;
-    SfxViewShell* pViewShell = pFrame->GetViewShell();
-    if (!pViewShell)
-        return nullptr;
-    return dynamic_cast<ScTabViewShell*>(pViewShell);
-}
 }
 
 namespace sc
@@ -74,10 +58,6 @@ 
ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
     , mxButtonCancel(m_xBuilder->weld_button("cancel"))
 {
     mxButtonRangeEdit->SetReferences(this, mxRangeEntry.get());
-    mpTabViewShell = GetTabViewShell(pBindings);
-    if (!mpTabViewShell)
-        mpTabViewShell = 
dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
-    OSL_ENSURE(mpTabViewShell, "Missing view shell!");
     const ScConditionMode* pCurrentMode
         = pViewData->GetDocument().GetEasyConditionalFormatDialogData();
     if (!pCurrentMode)
diff --git a/sc/source/ui/inc/condformateasydlg.hxx 
b/sc/source/ui/inc/condformateasydlg.hxx
index 6d6af1041b49..4ecf720decfc 100644
--- a/sc/source/ui/inc/condformateasydlg.hxx
+++ b/sc/source/ui/inc/condformateasydlg.hxx
@@ -40,7 +40,6 @@ private:
     ScDocument* mpDocument;
     ScConditionMode meMode;
     ScAddress maPosition;
-    ScTabViewShell* mpTabViewShell;
 
     std::unique_ptr<weld::Entry> mxNumberEntry;
     std::unique_ptr<weld::Entry> mxNumberEntry2;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8506d8773d55..6688ae783581 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -104,7 +104,6 @@ SwContentOptPage::SwContentOptPage(weld::Container* pPage, 
weld::DialogControlle
     , m_xDrwCB(m_xBuilder->weld_check_button("drawings"))
     , m_xDrwImg(m_xBuilder->weld_widget("lockdrawings"))
     , m_xPostItCB(m_xBuilder->weld_check_button("comments"))
-    , m_xPostItImg(m_xBuilder->weld_widget("lockcomments"))
     , m_xSettingsFrame(m_xBuilder->weld_frame("settingsframe"))
     , m_xSettingsLabel(m_xBuilder->weld_label("settingslabel"))
     , m_xMetricLabel(m_xBuilder->weld_label("measureunitlabel"))
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 74b5e34697bc..dd8bd93c269b 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -45,7 +45,6 @@ class SwContentOptPage final : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xVRulerRightCBox;
     std::unique_ptr<weld::Widget> m_xVRulerRightImg;
     std::unique_ptr<weld::ComboBox> m_xVMetric;
-    std::unique_ptr<weld::Widget> m_xVMetricImg;
     std::unique_ptr<weld::CheckButton> m_xSmoothCBox;
     std::unique_ptr<weld::Widget> m_xSmoothImg;
 
@@ -56,7 +55,6 @@ class SwContentOptPage final : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xDrwCB;
     std::unique_ptr<weld::Widget> m_xDrwImg;
     std::unique_ptr<weld::CheckButton> m_xPostItCB;
-    std::unique_ptr<weld::Widget> m_xPostItImg;
 
     std::unique_ptr<weld::Frame> m_xSettingsFrame;
     std::unique_ptr<weld::Label> m_xSettingsLabel;
diff --git a/writerperfect/inc/WPXSvInputStream.hxx 
b/writerperfect/inc/WPXSvInputStream.hxx
index f49fc11976d3..66ed90a958b4 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -67,7 +67,6 @@ private:
     std::unique_ptr<OLEStorageImpl> mpOLEStorage;
     std::unique_ptr<ZipStorageImpl> mpZipStorage;
     sal_Int64 mnLength;
-    unsigned long mnReadBufferLength;
     unsigned long mnReadBufferPos;
     bool mbCheckedOLE;
     bool mbCheckedZip;
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx 
b/writerperfect/source/common/WPXSvInputStream.cxx
index 9ad72fcc9887..dee82500dea3 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -391,7 +391,6 @@ WPXSvInputStream::WPXSvInputStream(Reference<XInputStream> 
const& xStream)
     , mxSeekable(xStream, UNO_QUERY)
     , maData(0)
     , mnLength(0)
-    , mnReadBufferLength(0)
     , mnReadBufferPos(0)
     , mbCheckedOLE(false)
     , mbCheckedZip(false)
@@ -739,8 +738,7 @@ WPXSvInputStream::~WPXSvInputStream() {}
 long WPXSvInputStream::tell()
 {
     tools::Long retVal = tellImpl();
-    return retVal - static_cast<tools::Long>(mnReadBufferLength)
-           + static_cast<tools::Long>(mnReadBufferPos);
+    return retVal + static_cast<tools::Long>(mnReadBufferPos);
 }
 
 int WPXSvInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
@@ -763,12 +761,9 @@ int WPXSvInputStream::seek(long offset, 
librevenge::RVNG_SEEK_TYPE seekType)
         retVal = -1;
     }
 
-    if (tmpOffset < tellImpl()
-        && o3tl::make_unsigned(tmpOffset)
-               >= static_cast<unsigned long>(tellImpl()) - mnReadBufferLength)
+    if (tmpOffset < tellImpl() && o3tl::make_unsigned(tmpOffset) >= 
o3tl::make_unsigned(tellImpl()))
     {
-        mnReadBufferPos = static_cast<unsigned long>(
-            tmpOffset + static_cast<tools::Long>(mnReadBufferLength) - 
tellImpl());
+        mnReadBufferPos = static_cast<unsigned long>(tmpOffset - tellImpl());
         return retVal;
     }
 
@@ -779,7 +774,7 @@ int WPXSvInputStream::seek(long offset, 
librevenge::RVNG_SEEK_TYPE seekType)
 
 bool WPXSvInputStream::isEnd()
 {
-    if (mnReadBufferPos != mnReadBufferLength)
+    if (mnReadBufferPos != 0)
         return false;
     if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
         return true;

Reply via email to