[Libreoffice-commits] core.git: 2 commits - bin/gla11y compilerplugins/clang solenv/sanitizers vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 1 18:08:47 UTC 2019
bin/gla11y | 9 ++++
compilerplugins/clang/badstatics.cxx | 2 -
solenv/sanitizers/ui/cui.suppr | 44 -----------------------
solenv/sanitizers/ui/dbaccess.suppr | 1
solenv/sanitizers/ui/desktop.suppr | 1
solenv/sanitizers/ui/modules/sbibliography.suppr | 3 -
solenv/sanitizers/ui/modules/scalc.suppr | 16 --------
solenv/sanitizers/ui/modules/scanner.suppr | 4 --
solenv/sanitizers/ui/modules/schart.suppr | 8 ----
solenv/sanitizers/ui/modules/simpress.suppr | 6 ---
solenv/sanitizers/ui/modules/swriter.suppr | 22 -----------
solenv/sanitizers/ui/sfx.suppr | 13 ------
solenv/sanitizers/ui/svx.suppr | 15 -------
solenv/sanitizers/ui/vcl.suppr | 8 ----
solenv/sanitizers/ui/xmlsec.suppr | 22 -----------
vcl/source/graphic/Manager.cxx | 4 +-
vcl/source/window/window.cxx | 4 +-
17 files changed, 13 insertions(+), 169 deletions(-)
New commits:
commit 555729bc497b2507407ecd2f0ae29a4e9fe36f70
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Aug 1 16:00:41 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 1 20:08:08 2019 +0200
remove some resolved ui suppressions
and enhance the script to make finding the unused ones easier
Change-Id: I937246e98d93fb999a23f2283b6794eaaa6dfa99
Reviewed-on: https://gerrit.libreoffice.org/76806
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/bin/gla11y b/bin/gla11y
index f93121484648..0120326d29a2 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -249,6 +249,7 @@ widgets_labels = [
progname = os.path.basename(sys.argv[0])
suppressions = {}
+suppressions_to_line = {}
false_positives = {}
ids = {}
ids_dup = {}
@@ -1297,9 +1298,12 @@ def main():
if suppr is not None:
try:
supprfile = open(suppr, 'r')
+ line_no = 1;
for line in supprfile.readlines():
prefix = line.rstrip()
suppressions[prefix] = True
+ suppressions_to_line[prefix] = line_no
+ line_no = line_no + 1;
supprfile.close()
except IOError:
pass
@@ -1370,7 +1374,10 @@ def main():
n += 1
if n > 0:
- print("%s suppression%s unused" % (n, 's' if n > 1 else ''))
+ print("%s suppression%s unused:" % (n, 's' if n > 1 else ''))
+ for (suppr,unused) in suppressions.items():
+ if unused:
+ print(" %s:%s" % (suppressions_to_line[suppr], suppr))
if gen_supprfile is not None:
gen_supprfile.close()
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index a114d5131cea..c40300cd77b3 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -8,10 +8,6 @@ cui/uiconfig/ui/acorexceptpage.ui://GtkEntry[@id='abbrev'] no-labelled-by
cui/uiconfig/ui/acorexceptpage.ui://GtkEntry[@id='double'] no-labelled-by
cui/uiconfig/ui/applyautofmtpage.ui://GtkLabel[@id='label1'] orphan-label
cui/uiconfig/ui/applyautofmtpage.ui://GtkLabel[@id='label2'] orphan-label
-cui/uiconfig/ui/applyautofmtpage.ui://GtkLabel[@id='m'] orphan-label
-cui/uiconfig/ui/applyautofmtpage.ui://GtkLabel[@id='t'] orphan-label
-cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='m'] orphan-label
-cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='t'] orphan-label
cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singlestartex'] orphan-label
cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singleendex'] orphan-label
cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='doublestartex'] orphan-label
@@ -22,10 +18,6 @@ cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='fileft'] orphan-label
cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='unlinkedft'] orphan-label
cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='findgraphicsft'] orphan-label
cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='blank'] orphan-label
-cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='FILES'] orphan-label
-cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='LINKS'] orphan-label
-cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='TYPE'] orphan-label
-cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='STATUS'] orphan-label
cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='SOURCE2'] orphan-label
cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='TYPE2'] orphan-label
cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='UPDATE'] orphan-label
@@ -56,8 +48,6 @@ cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_TOPLOCK'] orphan-label
cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_CELLLOCK'] orphan-label
cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelABCD'] orphan-label
cui/uiconfig/ui/certdialog.ui://GtkLabel[@id='manual'] orphan-label
-cui/uiconfig/ui/certdialog.ui://GtkLabel[@id='profile'] orphan-label
-cui/uiconfig/ui/certdialog.ui://GtkLabel[@id='dir'] orphan-label
cui/uiconfig/ui/certdialog.ui://GtkLabel[@id='certdir'] orphan-label
cui/uiconfig/ui/charnamepage.ui://GtkLabel[@id='westfontinfo-nocjk'] orphan-label
cui/uiconfig/ui/charnamepage.ui://GtkLabel[@id='westfontinfo-cjk'] orphan-label
@@ -179,14 +169,11 @@ cui/uiconfig/ui/connpooloptions.ui://GtkLabel[@id='driverlabel'] orphan-label
cui/uiconfig/ui/connpooloptions.ui://GtkLabel[@id='driver'] orphan-label
cui/uiconfig/ui/databaselinkdialog.ui://GtkLabel[@id='alttitle'] orphan-label
cui/uiconfig/ui/dimensionlinestabpage.ui://GtkLabel[@id='FT_POSITION'] orphan-label
-cui/uiconfig/ui/dimensionlinestabpage.ui://GtkComboBox[@id='LB_UNIT'] no-labelled-by
cui/uiconfig/ui/dimensionlinestabpage.ui://GtkLabel[@id='STR_MEASURE_AUTOMATIC'] orphan-label
-cui/uiconfig/ui/fmsearchdialog.ui://GtkComboBox[@id='lbField'] no-labelled-by
cui/uiconfig/ui/fmsearchdialog.ui://GtkLabel[@id='replacedesc'] orphan-label
cui/uiconfig/ui/fmsearchdialog.ui://GtkLabel[@id='ftRecordLabel'] orphan-label
cui/uiconfig/ui/fmsearchdialog.ui://GtkLabel[@id='ftRecord'] orphan-label
cui/uiconfig/ui/fmsearchdialog.ui://GtkLabel[@id='ftHint'] orphan-label
-cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='incrementslider'] no-labelled-by
cui/uiconfig/ui/gradientpage.ui://GtkLabel[@id='centerft'] orphan-label
cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='angleslider'] no-labelled-by
cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='borderslider'] no-labelled-by
@@ -208,13 +195,8 @@ cui/uiconfig/ui/gallerysearchprogress.ui://GtkLabel[@id='dir'] orphan-label
cui/uiconfig/ui/galleryupdateprogress.ui://GtkLabel[@id='file'] orphan-label
cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkLabel[@id='originalword'] orphan-label
cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkLabel[@id='label4'] orphan-label
-cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkDrawingArea[@id='suggestions'] no-labelled-by
cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkLabel[@id='label5'] orphan-label
cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkLabel[@id='label6'] orphan-label
-cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkRadioButton[@id='hanja_above'] button-no-label
-cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkRadioButton[@id='hanja_below'] button-no-label
-cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkRadioButton[@id='hangul_above'] button-no-label
-cui/uiconfig/ui/hangulhanjaconversiondialog.ui://GtkRadioButton[@id='hangul_below'] button-no-label
cui/uiconfig/ui/hangulhanjaeditdictdialog.ui://GtkEntry[@id='edit1'] no-labelled-by
cui/uiconfig/ui/hangulhanjaeditdictdialog.ui://GtkEntry[@id='edit2'] no-labelled-by
cui/uiconfig/ui/hangulhanjaeditdictdialog.ui://GtkEntry[@id='edit3'] no-labelled-by
@@ -222,8 +204,6 @@ cui/uiconfig/ui/hangulhanjaeditdictdialog.ui://GtkEntry[@id='edit4'] no-labelled
cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='angleft'] orphan-label
cui/uiconfig/ui/hatchpage.ui://GtkScale[@id='angleslider'] no-labelled-by
cui/uiconfig/ui/hatchpage.ui://GtkSpinButton[@id='anglemtr'] no-labelled-by
-cui/uiconfig/ui/hatchpage.ui://GtkMenuButton[@id='linecolorlb'] button-no-label
-cui/uiconfig/ui/hatchpage.ui://GtkMenuButton[@id='backgroundcolorlb'] button-no-label
cui/uiconfig/ui/hyperlinkdocpage.ui://GtkLabel[@id='url_label'] orphan-label
cui/uiconfig/ui/hyperlinkdocpage.ui://GtkLabel[@id='url'] orphan-label
cui/uiconfig/ui/hyphenate.ui://GtkButton[@id='left'] button-no-label
@@ -246,7 +226,6 @@ cui/uiconfig/ui/javastartparametersdialog.ui://GtkLabel[@id='label6'] orphan-lab
cui/uiconfig/ui/lineendstabpage.ui://GtkLabel[@id='FT_LINE_END_STYLE'] orphan-label
cui/uiconfig/ui/lineendstabpage.ui://GtkComboBox[@id='LB_LINEENDS'] no-labelled-by
cui/uiconfig/ui/lineendstabpage.ui://GtkLabel[@id='FI_TIP'] orphan-label
-cui/uiconfig/ui/linestyletabpage.ui://GtkComboBox[@id='LB_TYPE_2'] no-labelled-by
cui/uiconfig/ui/linestyletabpage.ui://GtkSpinButton[@id='NUM_FLD_2'] no-labelled-by
cui/uiconfig/ui/linestyletabpage.ui://GtkSpinButton[@id='MTR_FLD_LENGTH_2'] no-labelled-by
cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='helpmacro'] orphan-label
@@ -256,7 +235,6 @@ cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='categoryft'] orphan-label
cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='macronameft'] orphan-label
cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='commandsft'] orphan-label
cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='searchlabel'] orphan-label
-cui/uiconfig/ui/menuassignpage.ui://GtkTextView[@id='desc:border'] labelled-by-and-mnemonic
cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='leftfunctionlabel'] orphan-label
cui/uiconfig/ui/menuassignpage.ui://GtkComboBoxText[@id='savein'] no-labelled-by
cui/uiconfig/ui/menuassignpage.ui://GtkComboBoxText[@id='toplevellist'] no-labelled-by
@@ -266,7 +244,6 @@ cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='rightfunctionlabel'] orphan-la
cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='customizelabel'] orphan-label
cui/uiconfig/ui/movemenu.ui://GtkLabel[@id='label1'] orphan-label
cui/uiconfig/ui/movemenu.ui://GtkTreeView[@id='menulist'] no-labelled-by
-cui/uiconfig/ui/multipathdialog.ui://GtkLabel[@id='pathlist'] orphan-label
cui/uiconfig/ui/newlibdialog.ui://GtkEntry[@id='entry'] duplicate-mnemonic
cui/uiconfig/ui/newlibdialog.ui://GtkLabel[@id='altmacrotitle'] orphan-label
cui/uiconfig/ui/newlibdialog.ui://GtkLabel[@id='altrenametitle'] orphan-label
@@ -274,9 +251,6 @@ cui/uiconfig/ui/numberingformatpage.ui://GtkLabel[@id='commentft'] orphan-label
cui/uiconfig/ui/numberingoptionspage.ui://GtkLabel[@id='separator'] orphan-label
cui/uiconfig/ui/objecttitledescdialog.ui://GtkLabel[@id='desc_label'] orphan-label
cui/uiconfig/ui/objecttitledescdialog.ui://GtkTextView[@id='desc_entry'] no-labelled-by
-cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='vendor'] orphan-label
-cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='version'] orphan-label
-cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='features'] orphan-label
cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='a11y'] orphan-label
cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='selectruntime'] orphan-label
cui/uiconfig/ui/optadvancedpage.ui://GtkLabel[@id='javapath'] orphan-label
@@ -294,10 +268,6 @@ cui/uiconfig/ui/optemailpage.ui://GtkImage[@id='lockSuppressHidden'] no-labelled
cui/uiconfig/ui/optfltrembedpage.ui://GtkLabel[@id='label2'] orphan-label
cui/uiconfig/ui/optfltrembedpage.ui://GtkLabel[@id='label3'] orphan-label
cui/uiconfig/ui/optfltrembedpage.ui://GtkLabel[@id='label5'] orphan-label
-cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='always'] orphan-label
-cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='screenonly'] orphan-label
-cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='font'] orphan-label
-cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='replacewith'] orphan-label
cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='apply'] button-no-label
cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='delete'] button-no-label
cui/uiconfig/ui/optgeneralpage.ui://GtkLabel[@id='toyear'] orphan-label
@@ -310,11 +280,6 @@ cui/uiconfig/ui/optonlineupdatepage.ui://GtkLabel[@id='useragent'] orphan-label
cui/uiconfig/ui/optonlineupdatepage.ui://GtkLabel[@id='neverchecked'] orphan-label
cui/uiconfig/ui/optopenclpage.ui://GtkLabel[@id='openclused'] orphan-label
cui/uiconfig/ui/optopenclpage.ui://GtkLabel[@id='openclnotused'] orphan-label
-cui/uiconfig/ui/optpathspage.ui://GtkLabel[@id='type'] orphan-label
-cui/uiconfig/ui/optpathspage.ui://GtkLabel[@id='user_paths'] orphan-label
-cui/uiconfig/ui/optpathspage.ui://GtkLabel[@id='internal_paths'] orphan-label
-cui/uiconfig/ui/optpathspage.ui://GtkLabel[@id='editpaths'] orphan-label
-cui/uiconfig/ui/optpathspage.ui://GtkImage[@id='lock'] no-labelled-by
cui/uiconfig/ui/optproxypage.ui://GtkLabel[@id='noproxydesc'] orphan-label
cui/uiconfig/ui/optsavepage.ui://GtkSpinButton[@id='autosave_spin'] no-labelled-by
cui/uiconfig/ui/optsavepage.ui://GtkLabel[@id='autosave_mins'] orphan-label
@@ -348,8 +313,6 @@ cui/uiconfig/ui/pastespecial.ui://GtkLabel[@id='source'] orphan-label
cui/uiconfig/ui/paratabspage.ui://GtkSpinButton[@id='SP_TABPOS'] no-labelled-by
cui/uiconfig/ui/paratabspage.ui://GtkEntry[@id='ED_TABPOS'] no-labelled-by
cui/uiconfig/ui/patterntabpage.ui://GtkLabel[@id='label4'] orphan-label
-cui/uiconfig/ui/patterntabpage.ui://GtkMenuButton[@id='LB_COLOR'] button-no-label
-cui/uiconfig/ui/patterntabpage.ui://GtkMenuButton[@id='LB_BACKGROUND_COLOR'] button-no-label
cui/uiconfig/ui/percentdialog.ui://GtkSpinButton[@id='margin'] no-labelled-by
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default0'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default1'] button-no-label
@@ -360,10 +323,6 @@ cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default5'] button-no-lab
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default6'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default7'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default8'] button-no-label
-cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='applied_theme'] orphan-label
-cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='extensions_label'] orphan-label
-cui/uiconfig/ui/personalization_tab.ui://GtkTreeView[@id='installed_personas:border'] no-labelled-by
-cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='persona_preview'] button-no-label
cui/uiconfig/ui/pickgraphicpage.ui://GtkLabel[@id='errorft'] orphan-label
cui/uiconfig/ui/positionpage.ui://GtkLabel[@id='rotateandscale'] orphan-label
cui/uiconfig/ui/positionpage.ui://GtkLabel[@id='scale'] orphan-label
@@ -413,8 +372,6 @@ cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='resumeft'] orphan-label
cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='nosuggestionsft'] orphan-label
cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='alttitleft'] orphan-label
cui/uiconfig/ui/storedwebconnectiondialog.ui://GtkLabel[@id='label1'] orphan-label
-cui/uiconfig/ui/storedwebconnectiondialog.ui://GtkLabel[@id='website'] orphan-label
-cui/uiconfig/ui/storedwebconnectiondialog.ui://GtkLabel[@id='username'] orphan-label
cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_COUNT'] orphan-label
cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_AMOUNT'] orphan-label
cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_DELAY'] orphan-label
@@ -423,7 +380,6 @@ cui/uiconfig/ui/textflowpage.ui://GtkLabel[@id='labelWidow'] orphan-label
cui/uiconfig/ui/thesaurus.ui://GtkButton[@id='left'] button-no-label
cui/uiconfig/ui/thesaurus.ui://GtkLabel[@id='notfound'] orphan-label
cui/uiconfig/ui/tsaurldialog.ui://GtkLabel[@id='label2'] orphan-label
-cui/uiconfig/ui/tsaurldialog.ui://GtkTreeView[@id='urls:border'] no-labelled-by
cui/uiconfig/ui/tsaurldialog.ui://GtkLabel[@id='enteraurl'] orphan-label
cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label29'] orphan-label
cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label30'] orphan-label
diff --git a/solenv/sanitizers/ui/dbaccess.suppr b/solenv/sanitizers/ui/dbaccess.suppr
index 4ba208a3b1d5..8071959d92b6 100644
--- a/solenv/sanitizers/ui/dbaccess.suppr
+++ b/solenv/sanitizers/ui/dbaccess.suppr
@@ -88,7 +88,6 @@ dbaccess/uiconfig/ui/queryfilterdialog.ui://GtkEntry[@id='value2'] no-labelled-b
dbaccess/uiconfig/ui/queryfilterdialog.ui://GtkEntry[@id='value3'] no-labelled-by
dbaccess/uiconfig/ui/queryfilterdialog.ui://GtkComboBoxText[@id='op2'] no-labelled-by
dbaccess/uiconfig/ui/queryfilterdialog.ui://GtkComboBoxText[@id='op3'] no-labelled-by
-dbaccess/uiconfig/ui/querypropertiesdialog.ui://dbulo-LimitBox[@id='limitbox'] no-labelled-by
dbaccess/uiconfig/ui/querypropertiesdialog.ui://GtkLabel[@id='limit-label'] orphan-label
dbaccess/uiconfig/ui/querypropertiesdialog.ui://GtkLabel[@id='distinctvalues'] orphan-label
dbaccess/uiconfig/ui/savedialog.ui://GtkLabel[@id='descriptionft'] orphan-label
diff --git a/solenv/sanitizers/ui/desktop.suppr b/solenv/sanitizers/ui/desktop.suppr
index 8914020f21de..c981eccf13a4 100644
--- a/solenv/sanitizers/ui/desktop.suppr
+++ b/solenv/sanitizers/ui/desktop.suppr
@@ -14,7 +14,6 @@ desktop/uiconfig/ui/updatedialog.ui://GtkLabel[@id='UPDATE_LABEL'] orphan-label
desktop/uiconfig/ui/updatedialog.ui://GtkLabel[@id='UPDATE_CHECKING'] orphan-label
desktop/uiconfig/ui/updatedialog.ui://GtkSpinner[@id='THROBBER'] no-labelled-by
desktop/uiconfig/ui/updatedialog.ui://GtkLabel[@id='DESCRIPTION_LABEL'] orphan-label
-desktop/uiconfig/ui/updatedialog.ui://GtkTextView[@id='DESCRIPTIONS:border'] no-labelled-by
desktop/uiconfig/ui/updateinstalldialog.ui://GtkLabel[@id='EXTENSION_NAME'] orphan-label
desktop/uiconfig/ui/updaterequireddialog.ui://GtkLabel[@id='updatelabel'] orphan-label
desktop/uiconfig/ui/updaterequireddialog.ui://GtkDrawingArea[@id='extensions'] no-labelled-by
diff --git a/solenv/sanitizers/ui/modules/sbibliography.suppr b/solenv/sanitizers/ui/modules/sbibliography.suppr
index f8c69bba56cd..2e3eddf95dc5 100644
--- a/solenv/sanitizers/ui/modules/sbibliography.suppr
+++ b/solenv/sanitizers/ui/modules/sbibliography.suppr
@@ -30,8 +30,5 @@ extensions/uiconfig/sbibliography/ui/generalpage.ui://GtkLabel[@id='custom2'] or
extensions/uiconfig/sbibliography/ui/generalpage.ui://GtkLabel[@id='custom5'] orphan-label
extensions/uiconfig/sbibliography/ui/generalpage.ui://GtkLabel[@id='custom3'] orphan-label
extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkLabel[@id='label6'] orphan-label
-extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkComboBox[@id='editorCombobox'] no-labelled-by
extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkLabel[@id='label15'] orphan-label
-extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkComboBox[@id='volumeCombobox'] no-labelled-by
extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkLabel[@id='label27'] orphan-label
-extensions/uiconfig/sbibliography/ui/mappingdialog.ui://GtkComboBox[@id='URLCombobox'] no-labelled-by
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index ef20914e00da..898274138c94 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -11,12 +11,7 @@ sc/uiconfig/scalc/ui/conditionalentry.ui://GtkLabel[@id='valueft'] orphan-label
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='edcolscalemin'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='edcolscalemiddle'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='edcolscalemax'] no-labelled-by
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkMenuButton[@id='lbcolmin'] button-no-label
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkMenuButton[@id='lbcolmiddle'] button-no-label
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkMenuButton[@id='lbcolmax'] button-no-label
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='colscalemin'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='colscalemiddle'] no-labelled-by
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='colscalemax'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='typeis'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='datetype'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='colorformat'] no-labelled-by
@@ -24,7 +19,6 @@ sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='val1'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='val2'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='iconsettype'] no-labelled-by
sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='formula'] no-labelled-by
-sc/uiconfig/scalc/ui/conditionalentry.ui://GtkEntry[@id='formula1'] no-labelled-by
sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkLabel[@id='label'] orphan-label
sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkEntry[@id='entry'] no-labelled-by
sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkComboBoxText[@id='listbox'] no-labelled-by
@@ -75,8 +69,6 @@ sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message'] or
sc/uiconfig/scalc/ui/functionpanel.ui://GtkComboBoxText[@id='category'] no-labelled-by
sc/uiconfig/scalc/ui/functionpanel.ui://GtkTreeView[@id='funclist:border'] no-labelled-by
sc/uiconfig/scalc/ui/functionpanel.ui://GtkLabel[@id='funcdesc:border'] orphan-label
-sc/uiconfig/scalc/ui/groupbydate.ui://GtkMenuButton[@id='start_date'] button-no-label
-sc/uiconfig/scalc/ui/groupbydate.ui://GtkMenuButton[@id='end_date'] button-no-label
sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM'] orphan-label
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_F_CUSTOM'] orphan-label
@@ -89,8 +81,6 @@ sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelSTR_HF_CREATED_
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelSTR_HF_CUSTOMIZED'] orphan-label
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelSTR_HF_OF'] orphan-label
sc/uiconfig/scalc/ui/imoptdialog.ui://GtkLabel[@id='charsetft'] orphan-label
-sc/uiconfig/scalc/ui/imoptdialog.ui://svxlo-SvxTextEncodingBox[@id='charsetdropdown'] no-labelled-by
-sc/uiconfig/scalc/ui/imoptdialog.ui://svxlo-SvxTextEncodingBox[@id='charsetlist:border'] no-labelled-by
sc/uiconfig/scalc/ui/insertsheet.ui://GtkLabel[@id='path'] orphan-label
sc/uiconfig/scalc/ui/integerdialog.ui://GtkSpinButton[@id='value'] no-labelled-by
sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkEntry[@id='edassign'] no-labelled-by
@@ -184,11 +174,6 @@ sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='onft'] orphan-label
sc/uiconfig/scalc/ui/scgeneralpage.ui://GtkLabel[@id='label6'] orphan-label
sc/uiconfig/scalc/ui/searchresults.ui://GtkLabel[@id='lbSearchResults'] orphan-label
sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='warning'] orphan-label
-sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='name'] orphan-label
-sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='accessed'] orphan-label
-sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='nouserdata'] orphan-label
-sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='unknownuser'] orphan-label
-sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='exclusive'] orphan-label
sc/uiconfig/scalc/ui/showchangesdialog.ui://GtkEntry[@id='range'] no-labelled-by
sc/uiconfig/scalc/ui/sidebaralignment.ui://GtkSpinButton[@id='leftindent:0pt'] missing-label-for
sc/uiconfig/scalc/ui/sidebaralignment.ui://GtkSpinButton[@id='leftindent:0pt'] labelled-by-and-mnemonic
@@ -223,7 +208,6 @@ sc/uiconfig/scalc/ui/textimportcsv.ui://sclo-ScCsvTableBox[@id='scrolledwindowco
sc/uiconfig/scalc/ui/textimportcsv.ui://GtkLabel[@id='textalttitle'] orphan-label
sc/uiconfig/scalc/ui/texttransformationentry.ui:GtkGrid[@id='grid']/GtkBox/GtkLabel orphan-label
sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkEntry[@id='min'] no-labelled-by
-sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkButton[@id='validref'] no-labelled-by
sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkTextView[@id='minlist'] no-labelled-by
sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkLabel[@id='hintft'] orphan-label
sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='sourcefile'] orphan-label
diff --git a/solenv/sanitizers/ui/modules/scanner.suppr b/solenv/sanitizers/ui/modules/scanner.suppr
index d9b5f6185365..19944a25cd7f 100644
--- a/solenv/sanitizers/ui/modules/scanner.suppr
+++ b/solenv/sanitizers/ui/modules/scanner.suppr
@@ -1,9 +1,5 @@
extensions/uiconfig/scanner/ui/sanedialog.ui://GtkLabel[@id='optionTitleLabel'] orphan-label
extensions/uiconfig/scanner/ui/sanedialog.ui://GtkLabel[@id='optionsDescLabel'] orphan-label
-extensions/uiconfig/scanner/ui/sanedialog.ui://GtkComboBox[@id='quantumRangeCombobox'] no-labelled-by
-extensions/uiconfig/scanner/ui/sanedialog.ui://GtkComboBox[@id='stringRangeCombobox'] no-labelled-by
extensions/uiconfig/scanner/ui/sanedialog.ui://GtkCheckButton[@id='boolCheckbutton'] button-no-label
extensions/uiconfig/scanner/ui/sanedialog.ui://GtkEntry[@id='stringEntry'] no-labelled-by
extensions/uiconfig/scanner/ui/sanedialog.ui://GtkEntry[@id='numericEntry'] no-labelled-by
-extensions/uiconfig/scanner/ui/sanedialog.ui://GtkImage[@id='plus'] no-labelled-by
-extensions/uiconfig/scanner/ui/sanedialog.ui://GtkImage[@id='minus'] no-labelled-by
diff --git a/solenv/sanitizers/ui/modules/schart.suppr b/solenv/sanitizers/ui/modules/schart.suppr
index d607e22a0bc3..2f2f10fa0536 100644
--- a/solenv/sanitizers/ui/modules/schart.suppr
+++ b/solenv/sanitizers/ui/modules/schart.suppr
@@ -25,7 +25,6 @@ chart2/uiconfig/ui/titlerotationtabpage.ui://GtkSpinButton[@id='OrientDegree'] n
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='degreeL'] orphan-label
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='labelABCD'] orphan-label
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='textdirL'] orphan-label
-chart2/uiconfig/ui/tp_3D_SceneIllumination.ui://GtkMenuButton[@id='LB_LIGHTSOURCE'] button-no-label
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui://GtkButton[@id='corner'] button-no-label
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui://GtkScale[@id='hori'] no-labelled-by
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui://GtkScale[@id='vert'] no-labelled-by
@@ -35,7 +34,6 @@ chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='labelABCD'] orphan-label
chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='textdirL'] orphan-label
chart2/uiconfig/ui/tp_AxisPositions.ui://GtkSpinButton[@id='EDT_CROSSES_OTHER_AXIS_AT'] no-labelled-by
chart2/uiconfig/ui/tp_ChartType.ui://GtkLabel[@id='FT_CAPTION_FOR_WIZARD'] orphan-label
-chart2/uiconfig/ui/tp_ChartType.ui://GtkTreeView[@id='charttype:border'] no-labelled-by
chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='CT_LABEL_DIAL'] orphan-label
chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE'] orphan-label
chart2/uiconfig/ui/tp_DataLabel.ui://GtkSpinButton[@id='NF_LABEL_DEGREES'] no-labelled-by
@@ -56,18 +54,12 @@ chart2/uiconfig/ui/tp_RangeChooser.ui://GtkLabel[@id='STR_PAGE_DATA_RANGE'] orph
chart2/uiconfig/ui/tp_SeriesToAxis.ui://GtkLabel[@id='FT_MISSING_VALUES'] orphan-label
chart2/uiconfig/ui/tp_Scale.ui://GtkLabel[@id='TXT_STEP_MAIN'] orphan-label
chart2/uiconfig/ui/tp_Scale.ui://GtkSpinButton[@id='MT_MAIN_DATE_STEP'] no-labelled-by
-chart2/uiconfig/ui/tp_Scale.ui://GtkComboBox[@id='LB_MAIN_TIME_UNIT'] no-labelled-by
chart2/uiconfig/ui/tp_Scale.ui://GtkSpinButton[@id='EDT_STEP_MAIN'] no-labelled-by
chart2/uiconfig/ui/tp_Scale.ui://GtkLabel[@id='TXT_STEP_HELP'] orphan-label
chart2/uiconfig/ui/tp_Scale.ui://GtkLabel[@id='TXT_STEP_HELP_COUNT'] orphan-label
chart2/uiconfig/ui/tp_Scale.ui://GtkSpinButton[@id='MT_STEPHELP'] no-labelled-by
-chart2/uiconfig/ui/tp_Scale.ui://GtkComboBox[@id='LB_HELP_TIME_UNIT'] no-labelled-by
chart2/uiconfig/ui/tp_Scale.ui://GtkLabel[@id='TXT_ORIGIN'] orphan-label
chart2/uiconfig/ui/tp_Scale.ui://GtkSpinButton[@id='EDT_ORIGIN'] no-labelled-by
-chart2/uiconfig/ui/tp_Trendline.ui://GtkLabel[@id='label3'] orphan-label
-chart2/uiconfig/ui/tp_Trendline.ui://GtkSpinButton[@id='degree'] no-labelled-by
-chart2/uiconfig/ui/tp_Trendline.ui://GtkLabel[@id='label4'] orphan-label
-chart2/uiconfig/ui/tp_Trendline.ui://GtkSpinButton[@id='period'] no-labelled-by
chart2/uiconfig/ui/tp_Trendline.ui://GtkImage[@id='imageLinear'] no-labelled-by
chart2/uiconfig/ui/tp_Trendline.ui://GtkImage[@id='imageLogarithmic'] no-labelled-by
chart2/uiconfig/ui/tp_Trendline.ui://GtkImage[@id='imageExponential'] no-labelled-by
diff --git a/solenv/sanitizers/ui/modules/simpress.suppr b/solenv/sanitizers/ui/modules/simpress.suppr
index 6607386092e7..e47dea17ed70 100644
--- a/solenv/sanitizers/ui/modules/simpress.suppr
+++ b/solenv/sanitizers/ui/modules/simpress.suppr
@@ -1,15 +1,9 @@
sd/uiconfig/simpress/ui/customanimationspanel.ui://sdlo-PropertyControl[@id='effect_property_list'] no-labelled-by
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='color'] button-no-label
sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkSpinButton[@id='fontsize'] no-labelled-by
sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkSpinButton[@id='rotate'] no-labelled-by
sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkSpinButton[@id='transparent'] no-labelled-by
sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkSpinButton[@id='scale'] no-labelled-by
sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkEntry[@id='entry'] no-labelled-by
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='fontsizemenu'] button-no-label
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='transparentmenu'] button-no-label
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='rotatemenu'] button-no-label
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='scalemenu'] button-no-label
-sd/uiconfig/simpress/ui/customanimationfragment.ui://GtkMenuButton[@id='entrymenu'] button-no-label
sd/uiconfig/simpress/ui/customanimationeffecttab.ui://GtkButton[@id='sound_preview'] button-no-label
sd/uiconfig/simpress/ui/customanimationeffecttab.ui://GtkLabel[@id='prop_label1'] orphan-label
sd/uiconfig/simpress/ui/customanimationtexttab.ui://GtkSpinButton[@id='auto_after_value'] no-labelled-by
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index 819fdebd7a15..369da76a8c4a 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -4,7 +4,6 @@ sw/uiconfig/swriter/ui/addressblockdialog.ui://GtkButton[@id='toaddr'] button-no
sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkEntry[@id='edit1'] no-labelled-by
sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkLabel[@id='label2'] orphan-label
sw/uiconfig/swriter/ui/asciifilterdialog.ui://GtkLabel[@id='label5'] orphan-label
-sw/uiconfig/swriter/ui/assignstylesdialog.ui://GtkLabel[@id='notapplied'] orphan-label
sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkEntry[@id='edit1'] no-labelled-by
sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkLabel[@id='label2'] orphan-label
sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui://GtkLabel[@id='label1'] orphan-label
@@ -26,10 +25,6 @@ sw/uiconfig/swriter/ui/ccdialog.ui://GtkLabel[@id='label4'] orphan-label
sw/uiconfig/swriter/ui/columnpage.ui://GtkSpinButton[@id='width3mf'] labelled-by-and-mnemonic
sw/uiconfig/swriter/ui/columnpage.ui://GtkSpinButton[@id='width2mf'] labelled-by-and-mnemonic
sw/uiconfig/swriter/ui/columnpage.ui://GtkSpinButton[@id='width1mf'] labelled-by-and-mnemonic
-sw/uiconfig/swriter/ui/conditionpage.ui://GtkLabel[@id='contextft'] orphan-label
-sw/uiconfig/swriter/ui/conditionpage.ui://GtkLabel[@id='usedft'] orphan-label
-sw/uiconfig/swriter/ui/conditionpage.ui://GtkLabel[@id='styleft'] orphan-label
-sw/uiconfig/swriter/ui/conditionpage.ui://GtkTreeView[@id='styles:border'] no-labelled-by
sw/uiconfig/swriter/ui/conditionpage.ui://GtkComboBoxText[@id='filter'] no-labelled-by
sw/uiconfig/swriter/ui/converttexttable.ui://GtkLabel[@id='label4'] orphan-label
sw/uiconfig/swriter/ui/createaddresslist.ui://GtkEntry[@id='SETNO-nospin'] no-labelled-by
@@ -68,10 +63,6 @@ sw/uiconfig/swriter/ui/exchangedatabases.ui://GtkLabel[@id='label2'] orphan-labe
sw/uiconfig/swriter/ui/exchangedatabases.ui://GtkLabel[@id='dbnameft'] orphan-label
sw/uiconfig/swriter/ui/flddocumentpage.ui://GtkSpinButton[@id='offset'] duplicate-mnemonic
sw/uiconfig/swriter/ui/fldrefpage.ui://GtkLabel[@id='label4'] orphan-label
-sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='nameft'] orphan-label
-sw/uiconfig/swriter/ui/fldvarpage.ui://GtkEntry[@id='name'] no-labelled-by
-sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='valueft'] orphan-label
-sw/uiconfig/swriter/ui/fldvarpage.ui://GtkEntry[@id='value'] no-labelled-by
sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='label5'] orphan-label
sw/uiconfig/swriter/ui/fldvarpage.ui://GtkComboBoxText[@id='level'] no-labelled-by
sw/uiconfig/swriter/ui/floatingnavigation.ui://GtkLabel[@id='label'] orphan-label
@@ -99,10 +90,7 @@ sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label18'] orphan-label
sw/uiconfig/swriter/ui/footnotepage.ui://GtkEntry[@id='contfromed'] no-labelled-by
sw/uiconfig/swriter/ui/footnotepage.ui://GtkEntry[@id='conted'] no-labelled-by
sw/uiconfig/swriter/ui/frmaddpage.ui://GtkLabel[@id='label2'] orphan-label
-sw/uiconfig/swriter/ui/frmaddpage.ui://GtkComboBox[@id='vertalign'] no-labelled-by
-sw/uiconfig/swriter/ui/frmtypepage.ui://GtkSpinButton[@id='width:0.00cm'] duplicate-mnemonic
sw/uiconfig/swriter/ui/frmtypepage.ui://GtkCheckButton[@id='relwidth'] missing-labelled-by
-sw/uiconfig/swriter/ui/frmtypepage.ui://GtkSpinButton[@id='height:0.00cm'] duplicate-mnemonic
sw/uiconfig/swriter/ui/frmtypepage.ui://GtkCheckButton[@id='relheight'] missing-labelled-by
sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkLabel[@id='page_count'] orphan-label
sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkEntry[@id='page'] no-labelled-by
@@ -141,10 +129,6 @@ sw/uiconfig/swriter/ui/mergeconnectdialog.ui://GtkLabel[@id='label2'] orphan-lab
sw/uiconfig/swriter/ui/numparapage.ui://GtkCheckButton[@id='checkCB_NUMBER_NEW_START'] missing-labelled-by
sw/uiconfig/swriter/ui/numberingnamedialog.ui://GtkEntry[@id='entry'] no-labelled-by
sw/uiconfig/swriter/ui/optcomparison.ui://GtkSpinButton[@id='ignorelen'] no-labelled-by
-sw/uiconfig/swriter/ui/optfonttabpage.ui://svtlo-FontSizeBox[@id='titleheight'] no-labelled-by
-sw/uiconfig/swriter/ui/optfonttabpage.ui://svtlo-FontSizeBox[@id='listheight'] no-labelled-by
-sw/uiconfig/swriter/ui/optfonttabpage.ui://svtlo-FontSizeBox[@id='labelheight'] no-labelled-by
-sw/uiconfig/swriter/ui/optfonttabpage.ui://svtlo-FontSizeBox[@id='indexheight'] no-labelled-by
sw/uiconfig/swriter/ui/optfonttabpage.ui://GtkLabel[@id='font_label'] orphan-label
sw/uiconfig/swriter/ui/optformataidspage.ui:GtkBox[@id='OptFormatAidsPage']/GtkGrid[@id='grid1']/GtkBox[@id='box2']/GtkFrame[@id='frame1']/GtkAlignment[@id='alignment1']/GtkGrid[@id='grid2']/GtkLabel orphan-label
sw/uiconfig/swriter/ui/optformataidspage.ui:GtkBox[@id='OptFormatAidsPage']/GtkGrid[@id='grid1']/GtkBox[@id='box2']/GtkFrame[@id='frame1']/GtkAlignment[@id='alignment1']/GtkGrid[@id='grid2']/GtkLabel orphan-label
@@ -162,9 +146,7 @@ sw/uiconfig/swriter/ui/outlinenumberingpage.ui://GtkLabel[@id='label7'] orphan-l
sw/uiconfig/swriter/ui/outlinenumberingpage.ui://GtkDrawingArea[@id='preview'] no-labelled-by
sw/uiconfig/swriter/ui/mailmerge.ui://GtkSpinButton[@id='from'] no-labelled-by
sw/uiconfig/swriter/ui/mailmerge.ui://GtkLabel[@id='fieldlabel'] orphan-label
-sw/uiconfig/swriter/ui/mailmerge.ui://GtkComboBox[@id='field'] no-labelled-by
sw/uiconfig/swriter/ui/mailmerge.ui://GtkLabel[@id='mailformatlabel'] orphan-label
-sw/uiconfig/swriter/ui/mailmerge.ui://GtkComboBox[@id='address'] no-labelled-by
sw/uiconfig/swriter/ui/mmaddressblockpage.ui://GtkLabel[@id='currentaddress'] orphan-label
sw/uiconfig/swriter/ui/mmaddressblockpage.ui://GtkLabel[@id='label2'] orphan-label
sw/uiconfig/swriter/ui/mmaddressblockpage.ui://GtkLabel[@id='label3'] orphan-label
@@ -233,8 +215,6 @@ sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='filename'] duplicate-mnemo
sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='sectionnames-entry'] no-labelled-by
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='desc'] orphan-label
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='label2'] orphan-label
-sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='name'] orphan-label
-sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='table'] orphan-label
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='connecting'] orphan-label
sw/uiconfig/swriter/ui/selecttabledialog.ui://GtkLabel[@id='select'] orphan-label
sw/uiconfig/swriter/ui/sidebarwrap.ui://GtkLabel[@id='label1'] orphan-label
@@ -259,7 +239,6 @@ sw/uiconfig/swriter/ui/testmailsettings.ui://GtkLabel[@id='establish'] orphan-la
sw/uiconfig/swriter/ui/testmailsettings.ui://GtkLabel[@id='find'] orphan-label
sw/uiconfig/swriter/ui/testmailsettings.ui://GtkLabel[@id='result1'] orphan-label
sw/uiconfig/swriter/ui/testmailsettings.ui://GtkLabel[@id='result2'] orphan-label
-sw/uiconfig/swriter/ui/tocentriespage.ui://GtkTreeView[@id='level:border'] no-labelled-by
sw/uiconfig/swriter/ui/tocentriespage.ui://GtkLabel[@id='levelft'] orphan-label
sw/uiconfig/swriter/ui/tocentriespage.ui://GtkLabel[@id='typeft'] orphan-label
sw/uiconfig/swriter/ui/tocentriespage.ui://GtkLabel[@id='label15'] orphan-label
@@ -283,7 +262,6 @@ sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='left'] button-no-label
sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='right'] button-no-label
sw/uiconfig/swriter/ui/toxbuttonwidget.ui://GtkToggleButton[@id='button'] button-no-label
sw/uiconfig/swriter/ui/toxentrywidget.ui://GtkEntry[@id='entry'] no-labelled-by
-sw/uiconfig/swriter/ui/viewoptionspage.ui://GtkComboBox[@id='measureunit'] no-labelled-by
sw/uiconfig/swriter/ui/viewoptionspage.ui://GtkLabel[@id='measureunitlabel'] orphan-label
sw/uiconfig/swriter/ui/watermarkdialog.ui://GtkLabel[@id='TextLabel'] orphan-label
sw/uiconfig/swriter/ui/watermarkdialog.ui://GtkEntry[@id='TextInput'] no-labelled-by
diff --git a/solenv/sanitizers/ui/sfx.suppr b/solenv/sanitizers/ui/sfx.suppr
index b049b23291ae..6d6d9511a493 100644
--- a/solenv/sanitizers/ui/sfx.suppr
+++ b/solenv/sanitizers/ui/sfx.suppr
@@ -35,15 +35,10 @@ sfx2/uiconfig/ui/charmapcontrol.ui://sfxlo-SvxCharViewControl[@id='viewchar8'] n
sfx2/uiconfig/ui/charmapcontrol.ui://sfxlo-SvxCharViewControl[@id='viewchar7'] no-labelled-by
sfx2/uiconfig/ui/checkin.ui://GtkLabel[@id='label2'] orphan-label
sfx2/uiconfig/ui/checkin.ui://GtkTextView[@id='VersionComment'] no-labelled-by
-sfx2/uiconfig/ui/cmisinfopage.ui://GtkLabel[@id='name'] orphan-label
-sfx2/uiconfig/ui/cmisinfopage.ui://GtkLabel[@id='type'] orphan-label
-sfx2/uiconfig/ui/cmisinfopage.ui://GtkLabel[@id='value'] orphan-label
sfx2/uiconfig/ui/cmisline.ui://GtkLabel[@id='name'] orphan-label
sfx2/uiconfig/ui/cmisline.ui://GtkLabel[@id='type'] orphan-label
sfx2/uiconfig/ui/cmisline.ui://GtkEntry[@id='value'] no-labelled-by
-sfx2/uiconfig/ui/cmisline.ui://GtkMenuButton[@id='date'] button-no-label
sfx2/uiconfig/ui/cmisline.ui://GtkSpinButton[@id='time'] no-labelled-by
-sfx2/uiconfig/ui/custominfopage.ui://GtkTreeView[@id='properties'] no-labelled-by
sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='name'] orphan-label
sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='type'] orphan-label
sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='value'] orphan-label
@@ -63,23 +58,15 @@ sfx2/uiconfig/ui/licensedialog.ui://GtkLabel[@id='label'] orphan-label
sfx2/uiconfig/ui/loadtemplatedialog.ui://GtkLabel[@id='alttitle'] orphan-label
sfx2/uiconfig/ui/loadtemplatedialog.ui://GtkDrawingArea[@id='image'] no-labelled-by
sfx2/uiconfig/ui/managestylepage.ui://GtkLabel[@id='desc'] orphan-label
-sfx2/uiconfig/ui/newstyle.ui://GtkEntry[@id='entry'] no-labelled-by
sfx2/uiconfig/ui/optprintpage.ui://GtkSpinButton[@id='reducegradstep'] no-labelled-by
sfx2/uiconfig/ui/password.ui://GtkLabel[@id='minlenft'] orphan-label
sfx2/uiconfig/ui/startcenter.ui://GtkLabel[@id='create_label'] orphan-label
sfx2/uiconfig/ui/startcenter.ui://GtkImage[@id='motif'] no-labelled-by
sfx2/uiconfig/ui/startcenter.ui://GtkLabel[@id='althelplabel'] orphan-label
sfx2/uiconfig/ui/templatedlg.ui://GtkLabel[@id='label1'] orphan-label
-sfx2/uiconfig/ui/versionsofdialog.ui://GtkLabel[@id='datetime'] orphan-label
-sfx2/uiconfig/ui/versionsofdialog.ui://GtkLabel[@id='savedby'] orphan-label
-sfx2/uiconfig/ui/versionsofdialog.ui://GtkLabel[@id='comments'] orphan-label
sfx2/uiconfig/ui/versioncommentdialog.ui://GtkLabel[@id='timestamp'] orphan-label
sfx2/uiconfig/ui/versioncommentdialog.ui://GtkLabel[@id='author'] orphan-label
sfx2/uiconfig/ui/versioncommentdialog.ui://GtkTextView[@id='textview'] no-labelled-by
-sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='datetime'] orphan-label
-sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='savedby'] orphan-label
-sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='comments'] orphan-label
sfx2/uiconfig/ui/linefragment.ui://GtkEntry[@id='duration'] no-labelled-by
sfx2/uiconfig/ui/linefragment.ui://GtkEntry[@id='valueedit'] no-labelled-by
-sfx2/uiconfig/ui/linefragment.ui://GtkMenuButton[@id='date'] button-no-label
sfx2/uiconfig/ui/linefragment.ui://GtkSpinButton[@id='time'] no-labelled-by
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 91bf57803542..623ec15448ac 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -18,19 +18,11 @@ svx/uiconfig/ui/dockingcolorreplace.ui://GtkLabel[@id='label4'] orphan-label
svx/uiconfig/ui/dockingcolorreplace.ui://svxcorelo-SvxColorListBox[@id='color5'] no-labelled-by
svx/uiconfig/ui/docrecoverybrokendialog.ui://GtkLabel[@id='label1'] orphan-label
svx/uiconfig/ui/docrecoveryprogressdialog.ui://GtkLabel[@id='label2'] orphan-label
-svx/uiconfig/ui/docrecoveryprogressdialog.ui://GtkDrawingArea[@id='progress'] no-labelled-by
svx/uiconfig/ui/docrecoveryrecoverdialog.ui://GtkLabel[@id='desc'] orphan-label
-svx/uiconfig/ui/docrecoveryrecoverdialog.ui://GtkLabel[@id='nameft'] orphan-label
-svx/uiconfig/ui/docrecoveryrecoverdialog.ui://GtkLabel[@id='statusft'] orphan-label
svx/uiconfig/ui/docrecoverysavedialog.ui://GtkLabel[@id='label1'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkComboBox[@id='searchterm'] no-labelled-by
-svx/uiconfig/ui/findreplacedialog.ui://GtkComboBox[@id='searchlist'] no-labelled-by
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label4'] orphan-label
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdesc'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchlabel'] orphan-label
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='entirecells'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkComboBox[@id='replaceterm'] no-labelled-by
-svx/uiconfig/ui/findreplacedialog.ui://GtkComboBox[@id='replacelist'] no-labelled-by
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label5'] orphan-label
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='replacedesc'] orphan-label
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label7'] orphan-label
@@ -51,8 +43,6 @@ svx/uiconfig/ui/mediaplayback.ui://GtkLabel[@id='label3'] orphan-label
svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='timeslider'] no-labelled-by
svx/uiconfig/ui/mediaplayback.ui://GtkEntry[@id='timeedit:border'] no-labelled-by
svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='volumeslider'] no-labelled-by
-svx/uiconfig/ui/namespacedialog.ui://GtkLabel[@id='prefix'] orphan-label
-svx/uiconfig/ui/namespacedialog.ui://GtkLabel[@id='url'] orphan-label
svx/uiconfig/ui/oldcolorwindow.ui://GtkButton[@id='auto_color_button'] button-no-label
svx/uiconfig/ui/oldcolorwindow.ui://GtkComboBox[@id='palette_listbox'] no-labelled-by
svx/uiconfig/ui/oldcolorwindow.ui://GtkLabel[@id='label1'] orphan-label
@@ -67,11 +57,6 @@ svx/uiconfig/ui/redlinefilterpage.ui://GtkComboBoxText[@id='authorlist'] missing
svx/uiconfig/ui/redlinefilterpage.ui://GtkEntry[@id='rangeedit'] missing-label-for
svx/uiconfig/ui/redlinefilterpage.ui://GtkComboBoxText[@id='datecond'] missing-label-for
svx/uiconfig/ui/redlinefilterpage.ui://GtkLabel[@id='and'] orphan-label
-svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='action'] orphan-label
-svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='position'] orphan-label
-svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='author'] orphan-label
-svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='date'] orphan-label
-svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='comment'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label1'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label3'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label4'] orphan-label
diff --git a/solenv/sanitizers/ui/vcl.suppr b/solenv/sanitizers/ui/vcl.suppr
index f3a4c670cc97..32ada0b6a32f 100644
--- a/solenv/sanitizers/ui/vcl.suppr
+++ b/solenv/sanitizers/ui/vcl.suppr
@@ -1,20 +1,12 @@
vcl/uiconfig/ui/aboutbox.ui://GtkImage[@id='logo'] no-labelled-by
vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='logoreplacement'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='buildid'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='locale'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='uilocale'] orphan-label
vcl/uiconfig/ui/aboutbox.ui://GtkTextView[@id='version'] no-labelled-by
vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='description'] orphan-label
vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='copyright'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='libreoffice'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='derived'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='vendor'] orphan-label
-vcl/uiconfig/ui/aboutbox.ui://GtkLabel[@id='link'] orphan-label
vcl/uiconfig/ui/cupspassworddialog.ui://GtkLabel[@id='text'] orphan-label
vcl/uiconfig/ui/printdialog.ui://GtkSpinButton[@id='pageedit-nospin'] no-labelled-by
vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='totalnumpages'] orphan-label
vcl/uiconfig/ui/printdialog.ui://GtkImage[@id='collateimage'] no-labelled-by
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='fromwhich'] orphan-label
vcl/uiconfig/ui/printdialog.ui://vcllo-ShowNupOrderWindow[@id='orderpreview'] no-labelled-by
vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='pagemargintxt2'] orphan-label
vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='sheetmargintxt2'] orphan-label
diff --git a/solenv/sanitizers/ui/xmlsec.suppr b/solenv/sanitizers/ui/xmlsec.suppr
index e5722d379c73..49a1996dd748 100644
--- a/solenv/sanitizers/ui/xmlsec.suppr
+++ b/solenv/sanitizers/ui/xmlsec.suppr
@@ -1,7 +1,5 @@
xmlsecurity/uiconfig/ui/certpage.ui://GtkLabel[@id='certok'] orphan-label
xmlsecurity/uiconfig/ui/certpage.ui://GtkLabel[@id='certnotok'] orphan-label
-xmlsecurity/uiconfig/ui/certpage.ui://GtkImage[@id='imgok'] no-labelled-by
-xmlsecurity/uiconfig/ui/certpage.ui://GtkImage[@id='imgnotok'] no-labelled-by
xmlsecurity/uiconfig/ui/certgeneral.ui://GtkImage[@id='certimage'] no-labelled-by
xmlsecurity/uiconfig/ui/certgeneral.ui://GtkLabel[@id='label1'] orphan-label
xmlsecurity/uiconfig/ui/certgeneral.ui://GtkLabel[@id='hintnotrust'] orphan-label
@@ -31,29 +29,9 @@ xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui://GtkLabel[@id='notvalidatedf
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui://GtkImage[@id='invalidimg'] no-labelled-by
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui://GtkImage[@id='oldsignatureimg'] no-labelled-by
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui://GtkImage[@id='notvalidatedimg'] no-labelled-by
-xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkLabel[@id='to'] orphan-label
-xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkLabel[@id='by'] orphan-label
-xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkLabel[@id='date'] orphan-label
xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkImage[@id='lockcertimg'] no-labelled-by
xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkLabel[@id='label8'] orphan-label
-xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkTreeView[@id='locations:border'] no-labelled-by
xmlsecurity/uiconfig/ui/securitytrustpage.ui://GtkImage[@id='lockfileimg'] no-labelled-by
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='issuedto'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='issuedby'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='usage'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='expiration'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='type'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_DIGITAL_SIGNATURE'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_NON_REPUDIATION'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_KEY_ENCIPHERMENT'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_DATA_ENCIPHERMENT'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_KEY_AGREEMENT'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_KEY_CERT_SIGN'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_CRL_SIGN'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='STR_ENCIPHER_ONLY'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='str_sign'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='str_selectsign'] orphan-label
-xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='str_encrypt'] orphan-label
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='sign'] orphan-label
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='encrypt'] orphan-label
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui://GtkLabel[@id='description-label'] orphan-label
commit 9496e3d2ac42ae6e5a0ab4299eb388c47a92effd
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Aug 1 15:15:28 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 1 20:07:55 2019 +0200
skip some indirection
these don't need to use std::unique_ptr
Change-Id: I03140c7957fd59443db932c37890a6742c6d3bec
Reviewed-on: https://gerrit.libreoffice.org/76800
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 87c31acd996e..1c099a14236a 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -205,7 +205,7 @@ public:
.Class("ScAddInListener").GlobalNamespace()) // not owning
|| (loplugin::DeclCheck(pVarDecl).Var("maThreadSpecific")
.Class("ScDocument").GlobalNamespace()) // not owning
- || name == "s_pLOKWindowsMap" // LOK only, guarded by assert, and LOK never tries to perform a VCL cleanup
+ || name == "s_aLOKWindowsMap" // LOK only, guarded by assert, and LOK never tries to perform a VCL cleanup
|| name == "gStaticManager" // vcl/source/graphic/Manager.cxx - stores non-owning pointers
|| name == "aThreadedInterpreterPool" // ScInterpreterContext(Pool), not owning
|| name == "aNonThreadedInterpreterPool" // ScInterpreterContext(Pool), not owning
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 1370b15c0811..ec2bdca9be0b 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -54,8 +54,8 @@ void setupConfigurationValuesIfPossible(sal_Int64& rMemoryLimit,
Manager& Manager::get()
{
- static std::unique_ptr<Manager> gStaticManager(new Manager);
- return *gStaticManager;
+ static Manager gStaticManager;
+ return gStaticManager;
}
Manager::Manager()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index daf5674ce5d7..88ea0087a1f8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3161,9 +3161,9 @@ LOKWindowsMap& GetLOKWindowsMap()
assert(comphelper::LibreOfficeKit::isActive());
// Map to remember the LOKWindowId <-> Window binding.
- static std::unique_ptr<LOKWindowsMap> s_pLOKWindowsMap(new LOKWindowsMap);
+ static LOKWindowsMap s_aLOKWindowsMap;
- return *s_pLOKWindowsMap;
+ return s_aLOKWindowsMap;
}
}
More information about the Libreoffice-commits
mailing list