[Libreoffice-commits] core.git: compilerplugins/clang cui/source include/svtools include/svx svtools/source svx/source sw/inc sw/source vcl/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Jun 11 19:32:13 UTC 2018


 compilerplugins/clang/unusedfields.readonly.results  |  156 ++++++++----------
 compilerplugins/clang/unusedfields.untouched.results |  164 +++++++++++++------
 compilerplugins/clang/unusedfields.writeonly.results |  126 +++++++-------
 cui/source/customize/cfg.cxx                         |    3 
 cui/source/inc/cfg.hxx                               |    1 
 include/svtools/valueset.hxx                         |    2 
 include/svx/svdmodel.hxx                             |    1 
 svtools/source/control/valueacc.cxx                  |    1 
 svtools/source/control/valueimp.hxx                  |    2 
 svtools/source/control/valueset.cxx                  |   17 -
 svx/source/svdraw/svdmodel.cxx                       |    1 
 sw/inc/swbaslnk.hxx                                  |    3 
 sw/source/core/docnode/swbaslnk.cxx                  |    3 
 sw/source/core/inc/wrong.hxx                         |    1 
 sw/source/core/text/wrong.cxx                        |   14 -
 vcl/source/gdi/pdfwriter_impl.cxx                    |    9 -
 vcl/source/gdi/pdfwriter_impl.hxx                    |    1 
 17 files changed, 253 insertions(+), 252 deletions(-)

New commits:
commit a75cc6348ce578f619c7429f5157fae53eb08e01
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Jun 11 11:23:05 2018 +0200

    loplugin:unusedfields
    
    Change-Id: I42a55562747e6097c1193e285da67235f5364bea
    Reviewed-on: https://gerrit.libreoffice.org/55610
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index a0f0f9327f87..3991d81d2035 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -154,23 +154,25 @@ cui/source/options/optcolor.cxx:254
     ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
 cui/source/options/optpath.cxx:78
     OptPath_Impl m_aDefOpt class SvtDefaultOptions
-cui/source/options/personalization.hxx:34
+cui/source/options/personalization.hxx:35
     SvxPersonalizationTabPage m_vDefaultPersonaImages VclPtr<class PushButton> [3]
-cui/source/options/personalization.hxx:85
-    SelectPersonaDialog m_vResultList VclPtr<class PushButton> [9]
 cui/source/options/personalization.hxx:86
+    SelectPersonaDialog m_vResultList VclPtr<class PushButton> [9]
+cui/source/options/personalization.hxx:87
     SelectPersonaDialog m_vSearchSuggestions VclPtr<class PushButton> [6]
 cui/source/options/treeopt.cxx:468
     OptionsGroupInfo m_bLoadError _Bool
-dbaccess/source/core/api/RowSetBase.hxx:87
+dbaccess/source/core/api/RowSetBase.hxx:85
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
-dbaccess/source/core/api/RowSetBase.hxx:98
+dbaccess/source/core/api/RowSetBase.hxx:96
     dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
 dbaccess/source/core/dataaccess/documentcontainer.cxx:64
     dbaccess::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:109
+dbaccess/source/core/inc/ContentHelper.hxx:108
     dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
-dbaccess/source/ui/control/tabletree.cxx:184
+dbaccess/source/filter/hsqldb/parseschema.hxx:36
+    dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
+dbaccess/source/ui/control/tabletree.cxx:183
     dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
 dbaccess/source/ui/inc/charsetlistbox.hxx:42
     dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
@@ -180,31 +182,31 @@ drawinglayer/source/processor2d/vclprocessor2d.hxx:83
     drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
 editeng/source/editeng/impedit.hxx:449
     ImpEditEngine maColorConfig svtools::ColorConfig
-embeddedobj/source/inc/commonembobj.hxx:104
+embeddedobj/source/inc/commonembobj.hxx:108
     OCommonEmbeddedObject m_aClassName class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:121
+embeddedobj/source/inc/oleembobj.hxx:126
     OleEmbeddedObject m_pOleComponent class OleComponent *
-embeddedobj/source/inc/oleembobj.hxx:141
+embeddedobj/source/inc/oleembobj.hxx:146
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:163
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:164
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:165
-    OleEmbeddedObject m_nAspectToSet sal_Int64
 embeddedobj/source/inc/oleembobj.hxx:170
+    OleEmbeddedObject m_nAspectToSet sal_Int64
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:171
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:177
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:180
+embeddedobj/source/inc/oleembobj.hxx:185
     OleEmbeddedObject m_aLinkURL class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:186
+embeddedobj/source/inc/oleembobj.hxx:191
     OleEmbeddedObject m_bFromClipboard _Bool
-extensions/source/propctrlr/eformshelper.hxx:62
+extensions/source/propctrlr/eformshelper.hxx:61
     pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
-extensions/source/propctrlr/eformshelper.hxx:64
+extensions/source/propctrlr/eformshelper.hxx:63
     pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet
 extensions/source/update/check/updatehdl.hxx:85
     UpdateHandler mbStringsLoaded _Bool
@@ -264,11 +266,11 @@ include/editeng/charsetcoloritem.hxx:35
     SvxCharSetColorItem eFrom rtl_TextEncoding
 include/filter/msfilter/svdfppt.hxx:710
     PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [5]
-include/filter/msfilter/svdfppt.hxx:884
+include/filter/msfilter/svdfppt.hxx:883
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:885
+include/filter/msfilter/svdfppt.hxx:884
     ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:886
+include/filter/msfilter/svdfppt.hxx:885
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/oox/core/contexthandler2.hxx:220
     oox::core::ContextHandler2Helper mnRootStackSize size_t
@@ -308,27 +310,19 @@ include/svl/ondemand.hxx:58
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:33
     MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
-include/svtools/inettbc.hxx:100
-    URLBox aBaseURL class rtl::OUString
-include/svtools/inettbc.hxx:101
-    URLBox aPlaceHolder class rtl::OUString
-include/svtools/inettbc.hxx:104
-    URLBox eSmartProtocol enum INetProtocol
-include/svtools/inettbc.hxx:105
-    URLBox bOnlyDirectories _Bool
-include/svtools/inettbc.hxx:106
-    URLBox bHistoryDisabled _Bool
+include/svtools/valueset.hxx:442
+    SvtValueSet maHighlightHdl Link<class SvtValueSet *, void>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
     sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
 include/svx/sdr/overlay/overlaymanager.hxx:73
     sdr::overlay::OverlayManager maDrawinglayerOpt class SvtOptionsDrawinglayer
-include/svx/svdmark.hxx:140
-    SdrMarkList maPointName class rtl::OUString
 include/svx/svdmark.hxx:141
+    SdrMarkList maPointName class rtl::OUString
+include/svx/svdmark.hxx:142
     SdrMarkList maGluePointName class rtl::OUString
 include/svx/svdoedge.hxx:161
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
-include/svx/svdpntv.hxx:169
+include/svx/svdpntv.hxx:170
     SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
 include/test/sheet/xdatapilottable.hxx:31
     apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell>
@@ -339,7 +333,7 @@ include/test/sheet/xnamedranges.hxx:38
 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 /home/noel/libo3/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -360,13 +354,7 @@ include/unoidl/unoidl.hxx:452
     unoidl::ConstantValue::(anonymous) floatValue float
 include/unoidl/unoidl.hxx:453
     unoidl::ConstantValue::(anonymous) doubleValue double
-include/vcl/bitmap.hxx:176
-    BmpFilterParam::(anonymous) mnSepiaPercent sal_uInt16
-include/vcl/bitmap.hxx:177
-    BmpFilterParam::(anonymous) mcSolarGreyThreshold sal_uInt8
-include/vcl/bitmap.hxx:178
-    BmpFilterParam::(anonymous) mnRadius double
-include/vcl/filter/pdfdocument.hxx:174
+include/vcl/filter/pdfdocument.hxx:188
     vcl::filter::PDFNameElement m_nLength sal_uInt64
 include/vcl/opengl/OpenGLContext.hxx:57
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
@@ -424,15 +412,13 @@ sal/rtl/uuid.cxx:64
     UUID clock_seq_low sal_uInt8
 sal/rtl/uuid.cxx:65
     UUID node sal_uInt8 [6]
-sc/inc/chartlis.hxx:72
-    ScChartListener bSeriesRangesScheduled _Bool
-sc/inc/compiler.hxx:126
+sc/inc/compiler.hxx:129
     ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
-sc/inc/compiler.hxx:127
-    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo3/sc/inc/compiler.hxx:124:9)
-sc/inc/compiler.hxx:132
+sc/inc/compiler.hxx:130
+    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:127:9)
+sc/inc/compiler.hxx:135
     ScRawToken::(anonymous) pMat class ScMatrix *
-sc/inc/formulagroup.hxx:42
+sc/inc/formulagroup.hxx:39
     sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
 sc/inc/reordermap.hxx:21
     sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
@@ -440,8 +426,6 @@ sc/source/core/inc/adiasync.hxx:41
     ScAddInAsync::(anonymous) pStr class rtl::OUString *
 sc/source/core/inc/interpre.hxx:105
     ScTokenStack pPointer const formula::FormulaToken *[512]
-sc/source/core/opencl/formulagroupcl.cxx:1239
-    sc::opencl::ParallelReductionVectorRef mpClmem2 cl_mem
 sc/source/filter/inc/autofilterbuffer.hxx:178
     oox::xls::FilterColumn mxSettings std::shared_ptr<FilterSettingsBase>
 sc/source/filter/inc/commentsbuffer.hxx:42
@@ -480,11 +464,11 @@ sc/source/ui/vba/vbaformatconditions.hxx:37
     ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
 sc/source/ui/vba/vbaformatconditions.hxx:38
     ScVbaFormatConditions mxParentRangePropertySet css::uno::Reference<css::beans::XPropertySet>
-sd/inc/Outliner.hxx:282
+sd/inc/Outliner.hxx:280
     SdOutliner mpFirstObj class SdrObject *
-sd/inc/sdmod.hxx:118
+sd/inc/sdmod.hxx:116
     SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
-sd/inc/sdmod.hxx:119
+sd/inc/sdmod.hxx:117
     SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
 sd/source/core/CustomAnimationCloner.cxx:69
     sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
@@ -502,7 +486,7 @@ sd/source/ui/slideshow/showwindow.hxx:103
     sd::ShowWindow mbMouseCursorHidden _Bool
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:97
     sd::slidesorter::controller::Animator maElapsedTime ::canvas::tools::ElapsedTime
-sd/source/ui/table/TableDesignPane.hxx:99
+sd/source/ui/table/TableDesignPane.hxx:96
     sd::TableDesignWidget m_aCheckBoxes VclPtr<class CheckBox> [6]
 sdext/source/pdfimport/inc/pdfihelper.hxx:101
     pdfi::GraphicsContext BlendMode sal_Int8
@@ -510,7 +494,7 @@ sdext/source/pdfimport/tree/style.hxx:42
     pdfi::StyleContainer::Style Contents class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:96
     sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
-slideshow/source/engine/slideshowimpl.cxx:154
+slideshow/source/engine/slideshowimpl.cxx:152
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:414
     UCBStorageStream_Impl m_aKey class rtl::OString
@@ -526,14 +510,14 @@ svl/source/misc/strmadpt.cxx:55
     SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1]
 svl/source/uno/pathservice.cxx:36
     PathService m_aOptions class SvtPathOptions
-svtools/source/contnr/fileview.cxx:331
-    SvtFileView_Impl mpNameTrans class NameTranslator_Impl *
 svtools/source/control/headbar.cxx:38
     ImplHeadItem maHelpId class rtl::OString
 svtools/source/control/headbar.cxx:39
     ImplHeadItem maImage class Image
 svtools/source/control/tabbar.cxx:207
     ImplTabBarItem maHelpId class rtl::OString
+svtools/source/control/valueimp.hxx:78
+    SvtValueSetItem maImage class Image
 svtools/source/dialogs/insdlg.cxx:46
     OleObjectDescriptor cbSize sal_uInt32
 svtools/source/dialogs/insdlg.cxx:47
@@ -556,28 +540,30 @@ svtools/source/table/gridtablerenderer.cxx:70
     svt::table::CachedSortIndicator m_sortDescending class BitmapEx
 svx/inc/sdr/overlay/overlayrectangle.hxx:44
     sdr::overlay::OverlayRectangle mbOverlayState _Bool
-svx/source/inc/datanavi.hxx:225
+svx/source/inc/datanavi.hxx:224
     svxform::XFormsPage m_aMethodString class svxform::MethodString
-svx/source/inc/datanavi.hxx:226
+svx/source/inc/datanavi.hxx:225
     svxform::XFormsPage m_aReplaceString class svxform::ReplaceString
-svx/source/inc/datanavi.hxx:549
+svx/source/inc/datanavi.hxx:546
     svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString
-svx/source/inc/datanavi.hxx:550
+svx/source/inc/datanavi.hxx:547
     svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString
-svx/source/inc/gridcell.hxx:525
-    DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/gridcell.hxx:526
+    DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
+svx/source/inc/gridcell.hxx:527
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-sw/inc/acmplwrd.hxx:43
+svx/source/svdraw/svdpdf.hxx:168
+    ImpSdrPdfImport maLineJoin basegfx::B2DLineJoin
+svx/source/svdraw/svdpdf.hxx:169
+    ImpSdrPdfImport maLineCap css::drawing::LineCap
+svx/source/svdraw/svdpdf.hxx:170
+    ImpSdrPdfImport maDash class XDash
+sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
 sw/inc/calc.hxx:194
     SwCalc m_aSysLocale class SvtSysLocale
-sw/inc/hints.hxx:188
+sw/inc/hints.hxx:199
     SwAttrSetChg m_bDelSet _Bool
-sw/inc/htmltbl.hxx:177
-    SwHTMLTableLayout m_pLeftFillerBox class SwTableBox *
-sw/inc/htmltbl.hxx:178
-    SwHTMLTableLayout m_pRightFillerBox class SwTableBox *
 sw/inc/shellio.hxx:140
     SwReader pStg tools::SvRef<SotStorage>
 sw/inc/swevent.hxx:71
@@ -593,7 +579,7 @@ sw/source/core/doc/tblrwcl.cxx:83
 sw/source/core/inc/swblocks.hxx:68
     SwImpBlocks m_bInPutMuchBlocks _Bool
 sw/source/core/text/atrhndl.hxx:48
-    SwAttrHandler::SwAttrStack pInitialArray class SwTextAttr *[3]
+    SwAttrHandler::SwAttrStack m_pInitialArray class SwTextAttr *[3]
 sw/source/filter/html/swhtml.hxx:497
     SwHTMLParser m_bBodySeen _Bool
 sw/source/filter/inc/rtf.hxx:32
@@ -660,29 +646,29 @@ unotools/source/config/pathoptions.cxx:90
     SvtPathOptions_Impl m_aEmptyString class rtl::OUString
 unotools/source/config/saveopt.cxx:77
     SvtSaveOptions_Impl bROUserAutoSave _Bool
+vcl/inc/BitmapFastScaleFilter.hxx:31
+    BitmapFastScaleFilter maSize class Size
 vcl/inc/printerinfomanager.hxx:73
     psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
-vcl/inc/salwtype.hxx:153
+vcl/inc/salwtype.hxx:154
     SalWheelMouseEvent mbDeltaIsPixel _Bool
-vcl/inc/salwtype.hxx:189
-    SalInputContextChangeEvent meLanguage LanguageType
 vcl/inc/salwtype.hxx:201
     SalSurroundingTextSelectionChangeEvent mnStart sal_uLong
 vcl/inc/salwtype.hxx:202
     SalSurroundingTextSelectionChangeEvent mnEnd sal_uLong
 vcl/inc/salwtype.hxx:208
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:268
+vcl/inc/svdata.hxx:267
     ImplSVNWFData mnStatusBarLowerRightOffset int
-vcl/inc/svdata.hxx:274
+vcl/inc/svdata.hxx:273
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:284
+vcl/inc/svdata.hxx:283
     ImplSVNWFData mbCenteredTabs _Bool
-vcl/inc/svdata.hxx:285
+vcl/inc/svdata.hxx:284
     ImplSVNWFData mbNoActiveTabTextRaise _Bool
-vcl/inc/svdata.hxx:287
+vcl/inc/svdata.hxx:286
     ImplSVNWFData mbProgressNeedsErase _Bool
-vcl/inc/svdata.hxx:296
+vcl/inc/svdata.hxx:295
     ImplSVNWFData mbRolloverMenubar _Bool
 vcl/inc/unx/i18n_status.hxx:56
     vcl::I18NStatus m_aCurrentIM class rtl::OUString
@@ -740,15 +726,17 @@ vcl/source/gdi/dibtools.cxx:116
     (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
 vcl/source/gdi/dibtools.cxx:117
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
+vcl/source/gdi/pdfwriter_impl.hxx:149
+    vcl::PDFWriterImpl::PDFPage m_nDuration sal_uInt32
 vcl/source/gdi/pdfwriter_impl.hxx:302
     vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
 vcl/source/window/menuitemlist.hxx:55
     MenuItemData aAccessibleName class rtl::OUString
 vcl/unx/generic/print/bitmap_gfx.cxx:67
     psp::HexEncoder mpFileBuffer sal_Char [16400]
-vcl/unx/gtk/a11y/atkwrapper.hxx:45
+vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:72
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
     AtkObjectWrapperClass aParentClass AtkObjectClass
 vcl/unx/gtk/gloactiongroup.cxx:28
     GLOAction parent_instance GObject
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index e2cb089eb3a9..8327a541b2d5 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 /home/noel/libo3/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /home/noel/libo3/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo/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
@@ -32,7 +32,7 @@ chart2/source/view/inc/GL3DRenderer.hxx:65
     chart::opengl3D::LightSource pad2 float
 chart2/source/view/inc/GL3DRenderer.hxx:66
     chart::opengl3D::LightSource pad3 float
-comphelper/source/container/enumerablemap.cxx:299
+comphelper/source/container/enumerablemap.cxx:298
     comphelper::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface>
 connectivity/source/drivers/evoab2/EApi.h:122
     (anonymous) address_format char *
@@ -46,17 +46,47 @@ cppu/source/threadpool/threadpool.cxx:355
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:62
     AlignSize_Impl nInt16 sal_Int16
+cui/source/dialogs/colorpicker.cxx:721
+    cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld>
+cui/source/dialogs/colorpicker.cxx:723
+    cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cfg.hxx:577
+    SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button>
+cui/source/inc/cuicharmap.hxx:104
+    SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuicharmap.hxx:105
+    SvxCharacterMap m_xRecentCharView std::unique_ptr<weld::CustomWeld> [16]
+cui/source/inc/cuicharmap.hxx:106
+    SvxCharacterMap m_xFavCharView std::unique_ptr<weld::CustomWeld> [16]
+cui/source/inc/cuicharmap.hxx:108
+    SvxCharacterMap m_xShowSetArea std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuicharmap.hxx:110
+    SvxCharacterMap m_xSearchSetArea std::unique_ptr<weld::CustomWeld>
 cui/source/inc/insrc.hxx:31
     SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton>
+cui/source/inc/swpossizetabpage.hxx:88
+    SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
+cui/source/inc/textattr.hxx:69
+    SvxTextAttrPage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
+cui/source/inc/transfrm.hxx:102
+    SvxPositionSizeTabPage m_xCtlPos std::unique_ptr<weld::CustomWeld>
+cui/source/inc/transfrm.hxx:189
+    SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld>
+cui/source/inc/transfrm.hxx:192
+    SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld>
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
 emfio/source/emfuno/xemfparser.cxx:60
     emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:44
     ScannerManager maProtector osl::Mutex
+filter/source/xsltdialog/xmlfiltertabpagebasic.hxx:36
+    XMLFilterTabPageBasic m_xContainer std::unique_ptr<weld::Widget>
+filter/source/xsltdialog/xmlfiltertabpagexslt.hxx:48
+    XMLFilterTabPageXSLT m_xContainer std::unique_ptr<weld::Widget>
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:61
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
-include/editeng/unotext.hxx:613
+include/editeng/unotext.hxx:612
     SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
 include/LibreOfficeKit/LibreOfficeKitGtk.h:33
     _LOKDocView aDrawingArea GtkDrawingArea
@@ -70,31 +100,17 @@ include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs sal_uInt16
-include/svtools/genericunodialog.hxx:219
+include/sfx2/tabdlg.hxx:238
+    SfxTabDialogController m_xApplyBtn std::unique_ptr<weld::Button>
+include/svtools/genericunodialog.hxx:218
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
+include/svtools/PlaceEditDialog.hxx:48
+    PlaceEditDialog m_xBTCancel std::unique_ptr<weld::Button>
 include/svtools/unoevent.hxx:162
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
 include/svx/ClassificationDialog.hxx:63
     svx::ClassificationDialog m_nInsertMarkings sal_Int16
-include/vcl/pdfwriter.hxx:548
-    vcl::PDFWriter::PDFSignContext m_pDerEncoded sal_Int8 *
-include/vcl/pdfwriter.hxx:550
-    vcl::PDFWriter::PDFSignContext m_nDerEncoded sal_Int32
-include/vcl/pdfwriter.hxx:552
-    vcl::PDFWriter::PDFSignContext m_pByteRange1 void *
-include/vcl/pdfwriter.hxx:554
-    vcl::PDFWriter::PDFSignContext m_nByteRange1 sal_Int32
-include/vcl/pdfwriter.hxx:556
-    vcl::PDFWriter::PDFSignContext m_pByteRange2 void *
-include/vcl/pdfwriter.hxx:558
-    vcl::PDFWriter::PDFSignContext m_nByteRange2 sal_Int32
-include/vcl/pdfwriter.hxx:559
-    vcl::PDFWriter::PDFSignContext m_aSignTSA class rtl::OUString
-include/vcl/pdfwriter.hxx:560
-    vcl::PDFWriter::PDFSignContext m_aSignPassword class rtl::OUString
-include/vcl/pdfwriter.hxx:562
-    vcl::PDFWriter::PDFSignContext m_rCMSHexBuffer class rtl::OStringBuffer &
-include/vcl/uitest/uiobject.hxx:262
+include/vcl/uitest/uiobject.hxx:268
     TabPageUIObject mxTabPage VclPtr<class TabPage>
 include/xmloff/formlayerexport.hxx:173
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
@@ -128,7 +144,7 @@ libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36
     GtvMainToolbarClass parentClass GtkBoxClass
 lotuswordpro/source/filter/clone.hxx:23
     detail::has_clone::(anonymous) a char [2]
-opencl/source/openclwrapper.cxx:306
+opencl/source/openclwrapper.cxx:305
     openclwrapper::(anonymous namespace)::OpenCLEnv mpOclCmdQueue cl_command_queue [1]
 pyuno/source/module/pyuno_impl.hxx:224
     pyuno::(anonymous) ob_base PyObject
@@ -152,27 +168,41 @@ sc/inc/formulalogger.hxx:42
     sc::FormulaLogger maMessages std::vector<OUString>
 sc/inc/interpretercontext.hxx:23
     ScInterpreterContext mrDoc const class ScDocument &
-sc/qa/unit/ucalc_column.cxx:103
+sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1262
+sc/source/core/data/document.cxx:1248
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1263
+sc/source/core/data/document.cxx:1249
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
-sc/source/core/data/formulacell.cxx:1741
+sc/source/core/data/formulacell.cxx:1756
     (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
-sc/source/filter/inc/orcusinterface.hxx:559
-    ScOrcusFactory maRefResolver class ScOrcusRefResolver
 sc/source/filter/inc/sheetdatacontext.hxx:61
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:445
+sc/source/ui/inc/crdlg.hxx:33
+    ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton>
+sc/source/ui/inc/delcodlg.hxx:39
+    ScDeleteContentsDlg m_xBtnOk std::unique_ptr<weld::Button>
+sc/source/ui/inc/docsh.hxx:460
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
+sc/source/ui/inc/instbdlg.hxx:66
+    ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton>
+sd/source/ui/dlg/PhotoAlbumDialog.hxx:60
+    sd::SdPhotoAlbumDialog m_xImg std::unique_ptr<weld::CustomWeld>
+sd/source/ui/inc/custsdlg.hxx:43
+    SdCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
+sd/source/ui/inc/custsdlg.hxx:45
+    SdCustomShowDlg m_xBtnOK std::unique_ptr<weld::Button>
+sd/source/ui/inc/custsdlg.hxx:75
+    SdDefineCustomShowDlg m_xBtnCancel std::unique_ptr<weld::Button>
+sd/source/ui/inc/custsdlg.hxx:76
+    SdDefineCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
 sd/source/ui/remotecontrol/ZeroconfService.hxx:36
     sd::ZeroconfService port uint
 sd/source/ui/slidesorter/view/SlsLayouter.cxx:61
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
-sd/source/ui/table/TableDesignPane.hxx:113
+sd/source/ui/table/TableDesignPane.hxx:106
     sd::TableDesignPane aImpl class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1319
+sd/source/ui/view/DocumentRenderer.cxx:1321
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1215
     sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -182,14 +212,24 @@ sd/source/ui/view/viewshel.cxx:1217
     sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1218
     sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sd/source/ui/view/ViewShellBase.cxx:191
+sd/source/ui/view/ViewShellBase.cxx:192
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sfx2/source/doc/doctempl.cxx:115
+sfx2/source/doc/doctempl.cxx:114
     DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
-sfx2/source/view/viewfrm.cxx:159
+sfx2/source/view/viewfrm.cxx:158
     (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button>
-sfx2/source/view/viewfrm.cxx:160
+sfx2/source/view/viewfrm.cxx:159
     (anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button>
+starmath/inc/dialog.hxx:347
+    SmSymbolDialog m_xSymbolSetDisplayArea std::unique_ptr<weld::CustomWeld>
+starmath/inc/dialog.hxx:349
+    SmSymbolDialog m_xSymbolDisplay std::unique_ptr<weld::CustomWeld>
+starmath/inc/dialog.hxx:426
+    SmSymDefineDialog m_xOldSymbolDisplay std::unique_ptr<weld::CustomWeld>
+starmath/inc/dialog.hxx:427
+    SmSymDefineDialog m_xSymbolDisplay std::unique_ptr<weld::CustomWeld>
+starmath/inc/dialog.hxx:429
+    SmSymDefineDialog m_xCharsetDisplayArea std::unique_ptr<weld::CustomWeld>
 starmath/inc/smmod.hxx:69
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
 starmath/inc/view.hxx:218
@@ -206,18 +246,40 @@ svl/source/crypto/cryptosign.cxx:280
     (anonymous namespace)::(anonymous) statusString SECItem
 svl/source/crypto/cryptosign.cxx:281
     (anonymous namespace)::(anonymous) failInfo SECItem
+svtools/source/control/valueimp.hxx:81
+    SvtValueSetItem mpData void *
 svtools/source/svhtml/htmlkywd.cxx:558
-    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo3/svtools/source/svhtml/htmlkywd.cxx:558:5)
+    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
 svtools/source/svhtml/htmlkywd.cxx:560
     HTML_OptionEntry::(anonymous) sToken const sal_Char *
 svtools/source/svhtml/htmlkywd.cxx:561
     HTML_OptionEntry::(anonymous) pUToken const class rtl::OUString *
+svx/source/inc/datanavi.hxx:610
+    svxform::AddInstanceDialog m_xURLFT std::unique_ptr<weld::Label>
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
-sw/source/core/frmedt/fetab.cxx:77
+sw/source/core/frmedt/fetab.cxx:79
     TableWait m_pWait const std::unique_ptr<SwWait>
-sw/source/core/layout/dbg_lay.cxx:164
+sw/source/core/layout/dbg_lay.cxx:169
     SwImplEnterLeave nAction enum DbgAction
+sw/source/ui/envelp/labfmt.hxx:75
+    SwLabFormatPage m_xPreview std::unique_ptr<weld::CustomWeld>
+sw/source/ui/inc/mmresultdialogs.hxx:72
+    SwMMResultPrintDialog m_xPrinterFT std::unique_ptr<weld::Label>
+sw/source/ui/misc/impfnote.hxx:44
+    SwEndNoteOptionPage m_xPosFT std::unique_ptr<weld::Label>
+sw/source/uibase/inc/dbui.hxx:31
+    PrintMonitor m_xDocName std::unique_ptr<weld::Label>
+sw/source/uibase/inc/insfnote.hxx:38
+    SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/num.hxx:55
+    SwNumPositionTabPage m_xPositionFrame std::unique_ptr<weld::Widget>
+sw/source/uibase/inc/num.hxx:82
+    SwNumPositionTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/outline.hxx:98
+    SwOutlineSettingsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/regionsw.hxx:234
+    SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/splittbl.hxx:30
     SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton>
 sw/source/uibase/inc/splittbl.hxx:31
@@ -236,21 +298,23 @@ uui/source/unknownauthdlg.hxx:36
     UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton>
 vcl/inc/opengl/zone.hxx:46
     OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/unx/cpdmgr.hxx:60
-    psp::CPDPrinterOption name class rtl::OUString
-vcl/inc/unx/cpdmgr.hxx:61
-    psp::CPDPrinterOption default_value class rtl::OUString
-vcl/inc/unx/cpdmgr.hxx:62
-    psp::CPDPrinterOption num_supported_values int
-vcl/inc/unx/cpdmgr.hxx:63
-    psp::CPDPrinterOption supported_values std::vector<OUString>
+vcl/inc/salprn.hxx:44
+    SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
+vcl/source/app/salvtables.cxx:463
+    SalInstanceContainer m_xContainer VclPtr<vcl::Window>
 vcl/source/gdi/jobset.cxx:34
     ImplOldJobSetupData cDeviceName char [32]
 vcl/source/gdi/jobset.cxx:35
     ImplOldJobSetupData cPortName char [32]
 vcl/source/uitest/uno/uitest_uno.cxx:35
     UITestUnoObj mpUITest std::unique_ptr<UITest>
-vcl/unx/gtk3/gtk3gtkinst.cxx:1937
+vcl/unx/generic/print/prtsetup.hxx:73
+    RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
+vcl/unx/generic/print/prtsetup.hxx:108
+    RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
+vcl/unx/gtk3/gtk3gtkinst.cxx:2166
     CrippledViewport viewport GtkViewport
 vcl/unx/gtk/a11y/atkhypertext.cxx:29
     (anonymous) atk_hyper_link AtkHyperlink
+writerperfect/inc/WPFTEncodingDialog.hxx:37
+    writerperfect::WPFTEncodingDialog m_xBtnOk std::unique_ptr<weld::Button>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index bde0bf943e7a..4f82504c4f67 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1,6 +1,6 @@
 basctl/source/basicide/basicbox.hxx:69
     basctl::DocListenerBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/basidesh.hxx:85
+basctl/source/inc/basidesh.hxx:88
     basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
 basctl/source/inc/bastype2.hxx:180
     basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier
@@ -56,13 +56,13 @@ canvas/source/cairo/cairo_spritehelper.hxx:103
     cairocanvas::SpriteHelper mbTextureDirty _Bool
 canvas/source/opengl/ogl_spritedevicehelper.hxx:124
     oglcanvas::SpriteDeviceHelper mpDevice css::rendering::XGraphicDevice *
-chart2/inc/ChartModel.hxx:484
+chart2/inc/ChartModel.hxx:483
     chart::ChartModel mnStart sal_Int32
-chart2/inc/ChartModel.hxx:485
+chart2/inc/ChartModel.hxx:484
     chart::ChartModel mnEnd sal_Int32
 chart2/source/controller/main/ElementSelector.hxx:37
     chart::ListBoxEntryData nHierarchyDepth sal_Int32
-chart2/source/inc/MediaDescriptorHelper.hxx:82
+chart2/source/inc/MediaDescriptorHelper.hxx:75
     apphelper::MediaDescriptorHelper ReadOnly _Bool
 chart2/source/view/charttypes/PieChart.hxx:128
     chart::PieChart::PieLabelInfo fValue double
@@ -82,7 +82,7 @@ codemaker/source/cppumaker/dependencies.hxx:114
     codemaker::cppumaker::Dependencies m_floatDependency _Bool
 codemaker/source/cppumaker/dependencies.hxx:115
     codemaker::cppumaker::Dependencies m_doubleDependency _Bool
-configmgr/source/components.cxx:162
+configmgr/source/components.cxx:164
     configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> *
 connectivity/source/drivers/mork/MorkParser.hxx:133
     MorkParser error_ enum MorkErrors
@@ -154,11 +154,13 @@ cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:81
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
+cui/source/inc/cfg.hxx:497
+    SvxMainMenuOrganizerDialog bModified _Bool
 cui/source/inc/cuihyperdlg.hxx:57
     SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
 cui/source/inc/cuihyperdlg.hxx:77
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-dbaccess/source/core/dataaccess/documentdefinition.cxx:290
+dbaccess/source/core/dataaccess/documentdefinition.cxx:287
     dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
 desktop/qa/desktop_lib/test_desktop_lib.cxx:178
     DesktopLOKTest m_bModified _Bool
@@ -180,23 +182,23 @@ drawinglayer/source/tools/emfppen.hxx:58
     emfplushelper::EMFPPen dashOffset float
 drawinglayer/source/tools/emfppen.hxx:60
     emfplushelper::EMFPPen alignment sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:129
+embeddedobj/source/inc/oleembobj.hxx:134
     OleEmbeddedObject m_nTargetState sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:141
+embeddedobj/source/inc/oleembobj.hxx:146
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:163
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:164
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:165
-    OleEmbeddedObject m_nAspectToSet sal_Int64
 embeddedobj/source/inc/oleembobj.hxx:170
+    OleEmbeddedObject m_nAspectToSet sal_Int64
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:171
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:177
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:186
+embeddedobj/source/inc/oleembobj.hxx:191
     OleEmbeddedObject m_bFromClipboard _Bool
 emfio/inc/mtftools.hxx:121
     emfio::LOGFONTW lfOrientation sal_Int32
@@ -216,7 +218,7 @@ framework/inc/services/layoutmanager.hxx:258
     framework::LayoutManager m_bGlobalSettings _Bool
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:285
     framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-framework/source/services/frame.cxx:421
+framework/source/services/frame.cxx:420
     (anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch *
 include/basic/basmgr.hxx:52
     BasicError nReason enum BasicErrorReason
@@ -248,16 +250,16 @@ include/opencl/platforminfo.hxx:30
     OpenCLDeviceInfo mnComputeUnits size_t
 include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
-include/svx/bmpmask.hxx:129
+include/svtools/valueset.hxx:429
+    SvtValueSet mnHighItemId sal_uInt16
+include/svx/bmpmask.hxx:130
     SvxBmpMask aSelItem class SvxBmpMaskSelectItem
 include/svx/float3d.hxx:177
     Svx3DWin pControllerItem class Svx3DCtrlItem *
 include/svx/imapdlg.hxx:118
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/svx/srchdlg.hxx:234
-    SvxSearchDialog pSearchController class SvxSearchController *
-include/svx/srchdlg.hxx:235
-    SvxSearchDialog pOptionsController class SvxSearchController *
+include/svx/svdmodel.hxx:187
+    SdrModel bExtColorTable _Bool
 include/vcl/opengl/OpenGLContext.hxx:41
     GLWindow bMultiSampleSupported _Bool
 include/vcl/salnativewidgets.hxx:415
@@ -286,11 +288,11 @@ registry/source/reflread.cxx:488
     ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32
 registry/source/reflread.cxx:489
     ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b2 sal_uInt32
-registry/source/reflread.cxx:557
+registry/source/reflread.cxx:556
     FieldList m_pCP class ConstantPool *
-registry/source/reflread.cxx:743
+registry/source/reflread.cxx:740
     ReferenceList m_pCP class ConstantPool *
-registry/source/reflread.cxx:846
+registry/source/reflread.cxx:841
     MethodList m_pCP class ConstantPool *
 sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
@@ -320,17 +322,17 @@ sal/textenc/tcvtutf7.cxx:396
     ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
 sal/textenc/tcvtutf7.cxx:397
     ImplUTF7FromUCContextData mnBufferBits sal_uInt32
-sc/inc/compiler.hxx:258
+sc/inc/compiler.hxx:261
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:259
+sc/inc/compiler.hxx:262
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:261
+sc/inc/compiler.hxx:264
     ScCompiler::AddInMap pUpper const char *
-sc/inc/document.hxx:2513
+sc/inc/document.hxx:2514
     ScMutationDisable mpDocument class ScDocument *
-sc/inc/pivot.hxx:74
+sc/inc/pivot.hxx:75
     ScDPLabelData mnFlags sal_Int32
-sc/inc/pivot.hxx:77
+sc/inc/pivot.hxx:78
     ScDPLabelData mbIsValue _Bool
 sc/source/core/data/cellvalues.cxx:25
     sc::(anonymous namespace)::BlockPos mnEnd size_t
@@ -362,7 +364,7 @@ sc/source/filter/excel/xltoolbar.hxx:76
     CTBS reserved3 sal_uInt16
 sc/source/filter/excel/xltoolbar.hxx:79
     CTBS ictbView sal_uInt16
-sc/source/filter/excel/xltools.cxx:102
+sc/source/filter/excel/xltools.cxx:103
      smD union sal_math_Double
 sc/source/filter/inc/exp_op.hxx:52
     ExportBiff5 pExcRoot struct RootData *
@@ -380,11 +382,11 @@ sc/source/filter/inc/tokstack.hxx:144
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
 sc/source/filter/oox/biffhelper.cxx:41
     oox::xls::(anonymous namespace)::DecodedDouble maStruct union sal_math_Double
-sc/source/filter/xml/xmldpimp.hxx:262
+sc/source/filter/xml/xmldpimp.hxx:254
     ScXMLDataPilotFieldContext mbHasHiddenMember _Bool
 sc/source/filter/xml/xmldrani.hxx:75
     ScXMLDatabaseRangeContext bIsSelection _Bool
-sc/source/filter/xml/xmlexternaltabi.hxx:113
+sc/source/filter/xml/xmlexternaltabi.hxx:112
     ScXMLExternalRefCellContext mnCellType sal_Int16
 sc/source/ui/inc/AccessibleText.hxx:194
     ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
@@ -394,19 +396,21 @@ sc/source/ui/inc/filtdlg.hxx:198
     ScSpecialFilterDlg pOptionsMgr class ScFilterOptionsMgr *
 sc/source/ui/inc/preview.hxx:47
     ScPreview nTabPage long
+sc/source/ui/inc/sortkeydlg.hxx:46
+    ScSortKeyWindow m_nItemHeight sal_Int32
 sc/source/ui/inc/tabvwsh.hxx:129
     ScTabViewShell pPivotSource class ScArea *
-sd/source/filter/eppt/eppt.hxx:176
+sd/source/filter/eppt/eppt.hxx:142
     PPTWriter mnTxId sal_uInt32
-sd/source/filter/ppt/ppt97animations.hxx:42
+sd/source/filter/ppt/ppt97animations.hxx:41
     Ppt97AnimationInfoAtom nSlideCount sal_uInt16
-sd/source/filter/ppt/ppt97animations.hxx:48
+sd/source/filter/ppt/ppt97animations.hxx:47
     Ppt97AnimationInfoAtom nOLEVerb sal_uInt8
-sd/source/filter/ppt/ppt97animations.hxx:51
+sd/source/filter/ppt/ppt97animations.hxx:50
     Ppt97AnimationInfoAtom nUnknown1 sal_uInt8
-sd/source/filter/ppt/ppt97animations.hxx:52
+sd/source/filter/ppt/ppt97animations.hxx:51
     Ppt97AnimationInfoAtom nUnknown2 sal_uInt8
-sd/source/ui/inc/animobjs.hxx:128
+sd/source/ui/inc/animobjs.hxx:123
     sd::AnimationWindow pControllerItem class sd::AnimationControllerItem *
 sd/source/ui/inc/navigatr.hxx:123
     SdNavigatorWin mpNavigatorCtrlItem class SdNavigatorControllerItem *
@@ -418,19 +422,13 @@ sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
     sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
 sd/source/ui/sidebar/SlideBackground.hxx:99
     sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox>
-sfx2/source/inc/appdata.hxx:74
-    SfxAppData_Impl pDocTopics SfxDdeDocTopics_Impl *
-sfx2/source/inc/appdata.hxx:75
-    SfxAppData_Impl pTriggerTopic class SfxDdeTriggerTopic_Impl *
-sfx2/source/inc/appdata.hxx:76
-    SfxAppData_Impl pDdeService2 class DdeService *
 sfx2/source/view/classificationcontroller.cxx:59
     sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener
 slideshow/source/engine/opengl/TransitionImpl.hxx:296
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex texcoord glm::vec2
-slideshow/source/engine/slideshowimpl.cxx:1044
+slideshow/source/engine/slideshowimpl.cxx:1042
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
@@ -452,9 +450,9 @@ svl/source/crypto/cryptosign.cxx:193
     (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
 svl/source/misc/inethist.cxx:48
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
-svx/source/dialog/contimp.hxx:57
+svx/source/dialog/contimp.hxx:56
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/form/dataaccessdescriptor.cxx:45
+svx/source/form/dataaccessdescriptor.cxx:44
     svx::ODADescriptorImpl m_bSetOutOfDate _Bool
 svx/source/sidebar/line/LinePropertyPanel.hxx:97
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
@@ -474,16 +472,22 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:105
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
 svx/source/sidebar/line/LinePropertyPanel.hxx:106
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
+svx/source/svdraw/svdpdf.hxx:195
+    ImpSdrPdfImport mdPageWidthPts double
 svx/source/table/tablertfimporter.cxx:53
     sdr::table::RTFCellDefault maItemSet class SfxItemSet
 sw/inc/shellio.hxx:145
     SwReader aFileName class rtl::OUString
-sw/source/core/doc/tblafmt.cxx:186
+sw/inc/swbaslnk.hxx:30
+    SwBaseLink m_bInSwapIn _Bool
+sw/source/core/doc/tblafmt.cxx:185
     SwAfVersions m_nVerticalAlignmentVersion sal_uInt16
-sw/source/core/inc/swfont.hxx:978
+sw/source/core/inc/swfont.hxx:977
     SvStatistics nGetStretchTextSize sal_uInt16
+sw/source/core/inc/wrong.hxx:349
+    sw::WrongListIterator m_CurrentNodeIndex TextFrameIndex
 sw/source/core/text/xmldump.cxx:34
-    XmlPortionDumper ofs sal_Int32
+    XmlPortionDumper ofs TextFrameIndex
 sw/source/filter/html/htmlcss1.cxx:77
     SwCSS1ItemIds nFormatBreak sal_uInt16
 sw/source/filter/html/htmlcss1.cxx:78
@@ -497,7 +501,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 /home/noel/libo3/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
 ucb/source/ucp/gio/gio_mount.hxx:46
     OOoMountOperationClass parent_class GMountOperationClass
 ucb/source/ucp/gio/gio_mount.hxx:49
@@ -526,8 +530,6 @@ vcl/inc/salmenu.hxx:43
     SalMenuButtonItem maImage class Image
 vcl/inc/salmenu.hxx:44
     SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/salprn.hxx:43
-    SalPrinterQueueInfo mpSysData class rtl::OUString *
 vcl/inc/salwtype.hxx:195
     SalSurroundingTextRequestEvent mnStart sal_uLong
 vcl/inc/salwtype.hxx:196
@@ -544,27 +546,25 @@ vcl/inc/salwtype.hxx:212
     SalQueryCharPositionEvent mnCursorBoundWidth long
 vcl/inc/salwtype.hxx:213
     SalQueryCharPositionEvent mnCursorBoundHeight long
-vcl/inc/salwtype.hxx:242
-    SalInputContext mpFont class FontSelectPattern *
 vcl/inc/salwtype.hxx:250
     SalSwipeEvent mnVelocityY double
-vcl/inc/sft.hxx:463
+vcl/inc/sft.hxx:462
     vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
-vcl/opengl/salbmp.cxx:426
+vcl/opengl/salbmp.cxx:435
     (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/source/filter/graphicfilter.cxx:1010
+vcl/source/filter/graphicfilter.cxx:1008
     ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry *
 vcl/source/filter/jpeg/Exif.hxx:56
     Exif::ExifIFD type sal_uInt16
 vcl/source/filter/jpeg/Exif.hxx:57
     Exif::ExifIFD count sal_uInt32
-vcl/unx/generic/app/wmadaptor.cxx:1271
+vcl/unx/generic/app/wmadaptor.cxx:1269
     _mwmhints input_mode long
-vcl/unx/generic/app/wmadaptor.cxx:1272
+vcl/unx/generic/app/wmadaptor.cxx:1270
     _mwmhints status unsigned long
-vcl/unx/gtk/a11y/atkwrapper.hxx:45
+vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:72
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
     AtkObjectWrapperClass aParentClass AtkObjectClass
 vcl/unx/gtk/gloactiongroup.cxx:28
     GLOAction parent_instance GObject
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 250c2a3f0e90..63d19ebdd808 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1888,7 +1888,6 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
     SvxConfigEntry const * selection, bool bCreateMenu )
     : GenericDialogController(pParent, "cui/ui/movemenu.ui", "MoveMenuDialog")
     , mpEntries(nullptr)
-    , bModified(false)
     , m_xMenuBox(m_xBuilder->weld_widget("namebox"))
     , m_xMenuNameEdit(m_xBuilder->weld_entry("menuname"))
     , m_xMenuListBox(m_xBuilder->weld_tree_view("menulist"))
@@ -2011,8 +2010,6 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, weld::Button&, rButton, void )
     m_xMenuListBox->insert(nTargetEntry, sId, sEntry, "");
     m_xMenuListBox->select(nTargetEntry);
 
-    bModified = true;
-
     UpdateButtonStates();
 }
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 2b566bcfdfda..5d85a87408b3 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -494,7 +494,6 @@ class SvxMainMenuOrganizerDialog : public weld::GenericDialogController
 {
     std::unique_ptr<SvxEntries> mpEntries;
     OUString m_sNewMenuEntryId;
-    bool            bModified;
 
     std::unique_ptr<weld::Widget> m_xMenuBox;
     std::unique_ptr<weld::Entry> m_xMenuNameEdit;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index bbf6648dfae1..de06b3702da6 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -426,7 +426,6 @@ private:
     long            mnUserItemWidth;
     long            mnUserItemHeight;
     sal_uInt16      mnSelItemId;
-    sal_uInt16      mnHighItemId;
     sal_uInt16      mnCols;
     sal_uInt16      mnCurCol;
     sal_uInt16      mnUserCols;
@@ -439,7 +438,6 @@ private:
     WinBits         mnStyle;
     Link<SvtValueSet*,void>  maDoubleClickHdl;
     Link<SvtValueSet*,void>  maSelectHdl;
-    Link<SvtValueSet*,void>  maHighlightHdl;
 
     bool            mbFormat : 1;
     bool            mbNoSelection : 1;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index c0907cb233c4..ccc1323abe56 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -184,7 +184,6 @@ protected:
     sal_uInt16          nUndoLevel;                   // undo nesting
     bool                bMyPool:1;        // to clean up pMyPool from 303a
     bool                mbUndoEnabled:1;  // If false no undo is recorded or we are during the execution of an undo action
-    bool                bExtColorTable:1; // For no own ColorTable
     bool                mbChanged:1;
     bool                bPagNumsDirty:1;
     bool                bMPgNumsDirty:1;
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 73826ddfbc96..1d7f1ce40018 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -66,7 +66,6 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent )
     , mnId(0)
     , meType(VALUESETITEM_NONE)
     , mbVisible(true)
-    , mpData(nullptr)
     , mxAcc()
 {
 }
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index cc45bcd27475..7be6ca57b85a 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -75,10 +75,8 @@ struct SvtValueSetItem
     sal_uInt16          mnId;
     sal_uInt8           meType;
     bool                mbVisible;
-    Image               maImage;
     Color               maColor;
     OUString            maText;
-    void*               mpData;
     css::uno::Reference< css::accessibility::XAccessible > mxAcc;
 
     explicit SvtValueSetItem( SvtValueSet& rParent );
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c51a032e58f1..7835a7a575ca 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2294,7 +2294,6 @@ SvtValueSet::SvtValueSet()
     mnUserItemHeight    = 0;
     mnFirstLine         = 0;
     mnSelItemId         = 0;
-    mnHighItemId        = 0;
     mnCols              = 0;
     mnCurCol            = 0;
     mnUserCols          = 0;
@@ -2849,7 +2848,6 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
         Any aNewAny;
         ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny);
     }
-    maHighlightHdl.Call(this);
 }
 
 void SvtValueSet::SetNoSelection()
@@ -3365,28 +3363,17 @@ void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtV
         }
         else
         {
-            Size aImageSize = pItem->maImage.GetSizePixel();
             Size  aRectSize = aRect.GetSize();
             Point aPos(aRect.Left(), aRect.Top());
-            aPos.AdjustX((aRectSize.Width() - aImageSize.Width()) / 2 );
+            aPos.AdjustX(aRectSize.Width() / 2 );
 
             if (pItem->meType != VALUESETITEM_IMAGE_AND_TEXT)
-                aPos.AdjustY((aRectSize.Height() - aImageSize.Height()) / 2 );
+                aPos.AdjustY(aRectSize.Height() / 2 );
 
             DrawImageFlags  nImageStyle  = DrawImageFlags::NONE;
             if (!IsEnabled())
                 nImageStyle  |= DrawImageFlags::Disable;
 
-            if (aImageSize.Width()  > aRectSize.Width() ||
-                aImageSize.Height() > aRectSize.Height())
-            {
-                maVirDev->SetClipRegion(vcl::Region(aRect));
-                maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
-                maVirDev->SetClipRegion();
-            }
-            else
-                maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
-
             if (pItem->meType == VALUESETITEM_IMAGE_AND_TEXT)
             {
                 maVirDev->SetFont(rRenderContext.GetFont());
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 986b412a9c61..2761af39bea4 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -129,7 +129,6 @@ void SdrModel::ImpCtor(
     pCurrentUndoGroup=nullptr;
     nUndoLevel=0;
     mbUndoEnabled=true;
-    bExtColorTable=false;
     mbChanged = false;
     bPagNumsDirty=false;
     bMPgNumsDirty=false;
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 4f922e698f95..d42d6f30877e 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -27,7 +27,6 @@ class SwContentNode;
 class SwBaseLink : public ::sfx2::SvBaseLink
 {
     SwContentNode* m_pContentNode;
-    bool m_bInSwapIn : 1;   ///< Prevent recursion and notifications during SwapIn
     bool m_bNoDataFlag : 1;
     bool m_bIgnoreDataChanged : 1;
 
@@ -35,7 +34,7 @@ public:
 
     SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr )
         : ::sfx2::SvBaseLink( nMode, nFormat ), m_pContentNode( pNode ),
-        m_bInSwapIn( false ), m_bNoDataFlag( false ), m_bIgnoreDataChanged( false )
+        m_bNoDataFlag( false ), m_bIgnoreDataChanged( false )
     {}
     virtual ~SwBaseLink() override;
 
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 744eb2720cea..55f569df95ba 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -266,8 +266,6 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
 
 bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
 {
-    m_bInSwapIn = true;
-
     if( !GetObj() && ( bNativFormat || ( !IsSynchron() && bWaitForData ) ))
     {
         AddNextRef();
@@ -308,7 +306,6 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
     else
         bRes = Update();
 
-    m_bInSwapIn = false;
     return bRes;
 }
 
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 831c5bb7f99a..0003d54266ba 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -346,7 +346,6 @@ private:
     sw::MergedPara const*const m_pMergedPara;
     size_t m_CurrentExtent;
     TextFrameIndex m_CurrentIndex;
-    TextFrameIndex m_CurrentNodeIndex;
     SwWrongList const*const m_pWrongList;
 
 public:
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index bdad843a43f8..d85cf9a99bdf 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -670,7 +670,6 @@ WrongListIterator::WrongListIterator(SwTextFrame const& rFrame,
     , m_pMergedPara(rFrame.GetMergedPara())
     , m_CurrentExtent(0)
     , m_CurrentIndex(0)
-    , m_CurrentNodeIndex(0)
     , m_pWrongList(m_pMergedPara
                     ? nullptr
                     : (rFrame.GetTextNodeFirst()->*pGetWrongList)())
@@ -682,7 +681,6 @@ WrongListIterator::WrongListIterator(SwWrongList const& rWrongList)
     , m_pMergedPara(nullptr)
     , m_CurrentExtent(0)
     , m_CurrentIndex(0)
-    , m_CurrentNodeIndex(0)
     , m_pWrongList(&rWrongList)
 {
 }
@@ -695,7 +693,6 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen)
         {   // rewind
             m_CurrentExtent = 0;
             m_CurrentIndex = TextFrameIndex(0);
-            m_CurrentNodeIndex = TextFrameIndex(0);
         }
         while (m_CurrentExtent < m_pMergedPara->extents.size())
         {
@@ -787,11 +784,6 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen)
             }
             m_CurrentIndex += TextFrameIndex(rExtent.nEnd - rExtent.nStart);
             ++m_CurrentExtent;
-            if (m_CurrentExtent < m_pMergedPara->extents.size() &&
-                rExtent.pNode != m_pMergedPara->extents[m_CurrentExtent].pNode)
-            {
-                m_CurrentNodeIndex = m_CurrentIndex; // reset
-            }
         }
         return false;
     }
@@ -816,7 +808,6 @@ WrongListIterator::GetWrongElement(TextFrameIndex const nStart)
         {   // rewind
             m_CurrentExtent = 0;
             m_CurrentIndex = TextFrameIndex(0);
-            m_CurrentNodeIndex = TextFrameIndex(0);
         }
         while (m_CurrentExtent < m_pMergedPara->extents.size())
         {
@@ -836,11 +827,6 @@ WrongListIterator::GetWrongElement(TextFrameIndex const nStart)
             }
             m_CurrentIndex += TextFrameIndex(rExtent.nEnd - rExtent.nStart);
             ++m_CurrentExtent;
-            if (m_CurrentExtent < m_pMergedPara->extents.size() &&
-                rExtent.pNode != m_pMergedPara->extents[m_CurrentExtent].pNode)
-            {
-                m_CurrentNodeIndex = m_CurrentIndex; // reset
-            }
         }
         return nullptr;
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 29ee93f50c95..c06b7acdf853 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1126,8 +1126,7 @@ PDFWriterImpl::PDFPage::PDFPage( PDFWriterImpl* pWriter, double nPageWidth, doub
         m_nStreamLengthObject( 0 ),
         m_nBeginStreamPos( 0 ),
         m_eTransition( PDFWriter::PageTransition::Regular ),
-        m_nTransTime( 0 ),
-        m_nDuration( 0 )
+        m_nTransTime( 0 )
 {
     // object ref must be only ever updated in emit()
     m_nPageObject = m_pWriter->createObject();
@@ -1252,12 +1251,6 @@ bool PDFWriterImpl::PDFPage::emit(sal_Int32 nParentObject )
         aLine.append( sal_Int32(m_pWriter->m_aStructParentTree.size()-1) );
         aLine.append( "\n" );
     }
-    if( m_nDuration > 0 )
-    {
-        aLine.append( "/Dur " );
-        aLine.append( static_cast<sal_Int32>(m_nDuration) );
-        aLine.append( "\n" );
-    }
     if( m_eTransition != PDFWriter::PageTransition::Regular && m_nTransTime > 0 )
     {
         // transition duration
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index e663ef6ab875..15603515a44c 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -146,7 +146,6 @@ public:
         std::vector<sal_Int32>      m_aMCIDParents;
         PDFWriter::PageTransition   m_eTransition;
         sal_uInt32                  m_nTransTime;
-        sal_uInt32                  m_nDuration;
 
         PDFPage( PDFWriterImpl* pWriter, double nPageWidth, double nPageHeight, PDFWriter::Orientation eOrientation );
         ~PDFPage();


More information about the Libreoffice-commits mailing list