[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang i18npool/source include/svtools jvmfwk/plugins linguistic/source scripting/source sd/source sfx2/source svtools/source sw/inc sw/source testtools/source toolkit/source tools/source ucb/source unotools/source writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 22 10:48:02 UTC 2018
compilerplugins/clang/staticvar.cxx | 7
compilerplugins/clang/unusedfields.cxx | 17
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 38 --
compilerplugins/clang/unusedfields.readonly.results | 68 +--
compilerplugins/clang/unusedfields.untouched.results | 68 ++-
compilerplugins/clang/unusedfields.writeonly.results | 122 ++++++
i18npool/source/inputchecker/inputsequencechecker.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 2
include/svtools/ctrlbox.hxx | 2
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 4
linguistic/source/dlistimp.cxx | 2
scripting/source/basprov/basprov.cxx | 2
scripting/source/dlgprov/dlgprov.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 64 +--
sd/source/ui/animations/CustomAnimationDialog.hxx | 4
sfx2/source/appl/appdata.cxx | 1
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/dispatch.cxx | 4
sfx2/source/inc/appdata.hxx | 1
svtools/source/control/ctrlbox.cxx | 5
sw/inc/cellatr.hxx | 5
sw/source/core/attr/cellatr.cxx | 8
sw/source/uibase/envelp/labimg.cxx | 2
sw/source/uibase/inc/labimg.hxx | 1
testtools/source/bridgetest/constructors.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 178 ++++------
toolkit/source/helper/vclunohelper.cxx | 8
tools/source/stream/strmunx.cxx | 4
ucb/source/ucp/ext/ucpext_services.cxx | 2
unotools/source/config/lingucfg.cxx | 4
unotools/source/misc/fontcvt.cxx | 4
writerfilter/source/rtftok/rtfcharsets.cxx | 2
writerfilter/source/rtftok/rtfcharsets.hxx | 2
writerfilter/source/rtftok/rtfcontrolwords.cxx | 4
writerfilter/source/rtftok/rtfcontrolwords.hxx | 4
35 files changed, 367 insertions(+), 280 deletions(-)
New commits:
commit fd56d5fd409c832886bf42a020322e69b6a35d9e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 22 10:08:13 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 22 12:47:48 2018 +0200
loplugin:unusedfields improvemements
treat fields touched in operator== as not being important, which
finds some more stuff (but also adds some false+)
Change-Id: I3f5d504d7dec7945a917afbcd58c92df74f03645
Reviewed-on: https://gerrit.libreoffice.org/62020
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index d11cfa7914cb..1e63ac19a3dd 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -393,6 +393,11 @@ bool UnusedFields::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl)
|| cxxMethodDecl->isMoveAssignmentOperator()
|| (cxxMethodDecl->getIdentifier() && (cxxMethodDecl->getName().startswith("Clone") || cxxMethodDecl->getName().startswith("clone"))))
insideMoveOrCopyOrCloneDeclParent = cxxMethodDecl->getParent();
+ // these are similar in that they tend to simply enumerate all the fields of an object without putting
+ // them to some useful purpose
+ auto op = cxxMethodDecl->getOverloadedOperator();
+ if (op == OO_EqualEqual || op == OO_ExclaimEqual)
+ insideMoveOrCopyOrCloneDeclParent = cxxMethodDecl->getParent();
}
insideFunctionDecl = cxxMethodDecl;
bool ret = RecursiveASTVisitor::TraverseCXXMethodDecl(cxxMethodDecl);
@@ -405,19 +410,29 @@ bool UnusedFields::TraverseFunctionDecl(FunctionDecl* functionDecl)
{
auto copy1 = insideStreamOutputOperator;
auto copy2 = insideFunctionDecl;
+ auto copy3 = insideMoveOrCopyOrCloneDeclParent;
if (functionDecl->getLocation().isValid() && !ignoreLocation(functionDecl) && functionDecl->isThisDeclarationADefinition())
{
- if (functionDecl->getOverloadedOperator() == OO_LessLess
+ auto op = functionDecl->getOverloadedOperator();
+ if (op == OO_LessLess
&& functionDecl->getNumParams() == 2)
{
QualType qt = functionDecl->getParamDecl(1)->getType();
insideStreamOutputOperator = qt.getNonReferenceType().getUnqualifiedType()->getAsCXXRecordDecl();
}
+ // these are similar in that they tend to simply enumerate all the fields of an object without putting
+ // them to some useful purpose
+ if (op == OO_EqualEqual || op == OO_ExclaimEqual)
+ {
+ QualType qt = functionDecl->getParamDecl(1)->getType();
+ insideMoveOrCopyOrCloneDeclParent = qt.getNonReferenceType().getUnqualifiedType()->getAsCXXRecordDecl();
+ }
}
insideFunctionDecl = functionDecl;
bool ret = RecursiveASTVisitor::TraverseFunctionDecl(functionDecl);
insideStreamOutputOperator = copy1;
insideFunctionDecl = copy2;
+ insideMoveOrCopyOrCloneDeclParent = copy3;
return ret;
}
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index cb5ff6936455..9cc6362b5c5b 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -14,7 +14,7 @@ avmedia/source/vlc/wrapper/Types.hxx:47
libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5)
avmedia/source/vlc/wrapper/Types.hxx:53
libvlc_track_description_t psz_name char *
-basegfx/source/polygon/b2dtrapezoid.cxx:201
+basegfx/source/polygon/b2dtrapezoid.cxx:202
basegfx::trapezoidhelper::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
basic/qa/cppunit/basictest.hxx:27
MacroSnippet maDll class BasicDLL
@@ -208,8 +208,6 @@ include/svl/ondemand.hxx:58
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
include/svx/ClassificationDialog.hxx:59
svx::ClassificationDialog m_bPerParagraph const _Bool
-include/svx/ClassificationDialog.hxx:63
- svx::ClassificationDialog m_nInsertMarkings const sal_Int16
include/svx/itemwin.hxx:34
SvxLineBox aDelayTimer class Timer
include/vcl/font/Feature.hxx:102
@@ -303,7 +301,7 @@ sal/qa/osl/process/osl_process.cxx:157
sal/textenc/textenc.cxx:406
(anonymous namespace)::FullTextEncodingData module_ osl::Module
sc/inc/column.hxx:128
- ScColumn maCellsEvent sc::CellStoreEvent
+ ScColumn maCellsEvent const sc::CellStoreEvent
sc/inc/compiler.hxx:256
ScCompiler::AddInMap pODFF const char *
sc/inc/compiler.hxx:257
@@ -311,7 +309,7 @@ sc/inc/compiler.hxx:257
sc/inc/compiler.hxx:259
ScCompiler::AddInMap pUpper const char *
sc/inc/formulalogger.hxx:42
- sc::FormulaLogger maMessages std::vector<OUString>
+ sc::FormulaLogger maMessages const std::vector<OUString>
sc/inc/interpretercontext.hxx:32
ScInterpreterContext mrDoc const class ScDocument &
sc/inc/token.hxx:406
@@ -319,9 +317,9 @@ sc/inc/token.hxx:406
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
sc/source/core/data/document.cxx:1244
- (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
+ (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
sc/source/core/data/document.cxx:1245
- (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
+ (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
sc/source/filter/html/htmlpars.cxx:3029
(anonymous namespace)::CSSHandler::MemStr mp const char *
sc/source/filter/html/htmlpars.cxx:3030
@@ -329,7 +327,7 @@ sc/source/filter/html/htmlpars.cxx:3030
sc/source/filter/inc/htmlpars.hxx:614
ScHTMLQueryParser mnUnusedId ScHTMLTableId
sc/source/filter/inc/sheetdatacontext.hxx:62
- oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
+ oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
sc/source/filter/inc/xetable.hxx:1002
XclExpCellTable maArrayBfr class XclExpArrayBuffer
sc/source/filter/inc/xetable.hxx:1003
@@ -352,9 +350,9 @@ sc/source/filter/xml/xmltransformationi.hxx:121
ScXMLColumnNumberContext aType class rtl::OUString
sc/source/filter/xml/xmltransformationi.hxx:155
ScXMLDateTimeContext aType class rtl::OUString
-sc/source/ui/inc/acredlin.hxx:58
+sc/source/ui/inc/acredlin.hxx:51
ScAcceptChgDlg aReOpenIdle class Idle
-sc/source/ui/inc/anyrefdg.hxx:119
+sc/source/ui/inc/anyrefdg.hxx:112
ScRefHandler m_aIdle class Idle
sc/source/ui/inc/msgpool.hxx:37
ScMessagePool aGlobalStringItem class SfxStringItem
@@ -390,6 +388,8 @@ sd/source/filter/eppt/epptbase.hxx:347
PPTWriterBase maFraction const class Fraction
sd/source/filter/ppt/pptin.hxx:82
SdPPTImport maParam struct PowerPointImportParam
+sd/source/ui/animations/CustomAnimationDialog.hxx:149
+ sd::SdPropertySubControl mnType sal_Int32
sd/source/ui/inc/AccessibleDocumentViewBase.hxx:262
accessibility::AccessibleDocumentViewBase maViewForwarder class accessibility::AccessibleViewForwarder
sd/source/ui/remotecontrol/Receiver.hxx:36
@@ -508,17 +508,11 @@ sw/source/core/text/inftxt.hxx:686
SwTextSlot aText class rtl::OUString
sw/source/core/text/porfld.cxx:141
SwFieldSlot aText class rtl::OUString
-sw/source/filter/html/htmlcss1.cxx:77
- SwCSS1ItemIds nFormatBreak const sal_uInt16
-sw/source/filter/html/htmlcss1.cxx:78
- SwCSS1ItemIds nFormatPageDesc const sal_uInt16
-sw/source/filter/html/htmlcss1.cxx:79
- SwCSS1ItemIds nFormatKeep const sal_uInt16
sw/source/ui/dbui/mmaddressblockpage.hxx:212
SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter
sw/source/uibase/docvw/romenu.hxx:35
SwReadOnlyPopup m_aBuilder class VclBuilder
-sw/source/uibase/inc/cption.hxx:44
+sw/source/uibase/inc/cption.hxx:43
SwCaptionDialog m_aTextFilter class TextFilterAutoConvert
sw/source/uibase/inc/glossary.hxx:95
SwGlossaryDlg m_aNoSpaceFilter class TextFilter
@@ -526,11 +520,11 @@ sw/source/uibase/inc/olmenu.hxx:77
SwSpellPopup m_aBuilder class VclBuilder
sw/source/uibase/inc/olmenu.hxx:86
SwSpellPopup m_nLangParaMenuId const sal_uInt16
-sw/source/uibase/inc/optload.hxx:186
+sw/source/uibase/inc/optload.hxx:185
SwCaptionOptPage m_aTextFilter class TextFilterAutoConvert
-sw/source/uibase/inc/regionsw.hxx:256
+sw/source/uibase/inc/regionsw.hxx:255
SwInsertSectionTabDialog m_nNotePageId sal_uInt16
-sw/source/uibase/inc/regionsw.hxx:276
+sw/source/uibase/inc/regionsw.hxx:275
SwSectionPropertyTabDialog m_nNotePageId sal_uInt16
sw/source/uibase/inc/uivwimp.hxx:95
SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
@@ -582,13 +576,13 @@ vcl/inc/unx/i18n_ic.hxx:46
SalI18N_InputContext maSwitchIMCallback XIMCallback
vcl/inc/unx/i18n_ic.hxx:47
SalI18N_InputContext maDestroyCallback XIMCallback
-vcl/source/app/salvtables.cxx:1542
+vcl/source/app/salvtables.cxx:1552
SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter
vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
vcl/source/gdi/jobset.cxx:36
ImplOldJobSetupData cPortName char [32]
-vcl/unx/gtk3/gtk3gtkinst.cxx:2398
+vcl/unx/gtk3/gtk3gtkinst.cxx:2403
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link const AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 06283c5ca7e5..18489350ef6a 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -4,7 +4,7 @@ avmedia/source/vlc/wrapper/Types.hxx:52
libvlc_track_description_t i_id int
avmedia/source/vlc/wrapper/Types.hxx:54
libvlc_track_description_t p_next struct libvlc_track_description_t *
-basegfx/source/polygon/b2dtrapezoid.cxx:201
+basegfx/source/polygon/b2dtrapezoid.cxx:202
basegfx::trapezoidhelper::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
basic/source/inc/expr.hxx:93
SbiExprNode::(anonymous) nTypeStrId sal_uInt16
@@ -52,8 +52,6 @@ bridges/source/jni_uno/jni_java2uno.cxx:151
jni_uno::largest p void *
bridges/source/jni_uno/jni_java2uno.cxx:152
jni_uno::largest a uno_Any
-chart2/source/controller/inc/res_LegendPosition.hxx:93
- chart::SchLegendPositionResources m_aChangeLink Link<class LinkParamNone *, void>
chart2/source/model/main/DataPoint.hxx:108
chart::DataPoint m_bNoParentPropAllowed _Bool
connectivity/source/drivers/evoab2/EApi.h:125
@@ -218,7 +216,7 @@ extensions/source/update/check/updatehdl.hxx:85
UpdateHandler mbStringsLoaded _Bool
filter/source/graphicfilter/eps/eps.cxx:113
PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
-filter/source/graphicfilter/icgm/cgm.hxx:62
+filter/source/graphicfilter/icgm/cgm.hxx:60
CGM mbPicture _Bool
filter/source/graphicfilter/icgm/chart.hxx:44
DataNode nBoxX1 sal_Int16
@@ -285,19 +283,19 @@ include/filter/msfilter/svdfppt.hxx:882
include/filter/msfilter/svdfppt.hxx:883
ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
include/oox/core/contexthandler2.hxx:220
- oox::core::ContextHandler2Helper mnRootStackSize size_t
+ oox::core::ContextHandler2Helper mnRootStackSize const size_t
include/oox/ole/axbinarywriter.hxx:151
oox::ole::AxBinaryPropertyWriter maStreamProps oox::ole::AxBinaryPropertyWriter::ComplexPropVector
include/registry/refltype.hxx:65
- RTUik m_Data1 sal_uInt32
+ RTUik m_Data1 const sal_uInt32
include/registry/refltype.hxx:66
- RTUik m_Data2 sal_uInt16
+ RTUik m_Data2 const sal_uInt16
include/registry/refltype.hxx:67
- RTUik m_Data3 sal_uInt16
+ RTUik m_Data3 const sal_uInt16
include/registry/refltype.hxx:68
- RTUik m_Data4 sal_uInt32
+ RTUik m_Data4 const sal_uInt32
include/registry/refltype.hxx:69
- RTUik m_Data5 sal_uInt32
+ RTUik m_Data5 const sal_uInt32
include/sfx2/charmapcontrol.hxx:44
SfxCharmapCtrl m_pFavCharView VclPtr<class SvxCharViewControl> [16]
include/sfx2/msg.hxx:95
@@ -320,18 +318,6 @@ include/svl/adrparse.hxx:52
SvAddressParser m_bHasFirst _Bool
include/svl/ondemand.hxx:58
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
-include/svtools/ctrlbox.hxx:449
- FontSizeBox nRelMin sal_uInt16
-include/svtools/ctrlbox.hxx:450
- FontSizeBox nRelMax sal_uInt16
-include/svtools/ctrlbox.hxx:451
- FontSizeBox nRelStep sal_uInt16
-include/svtools/ctrlbox.hxx:452
- FontSizeBox nPtRelMin short
-include/svtools/ctrlbox.hxx:453
- FontSizeBox nPtRelMax short
-include/svtools/ctrlbox.hxx:454
- FontSizeBox nPtRelStep short
include/svtools/editsyntaxhighlighter.hxx:32
MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
@@ -378,8 +364,6 @@ include/unoidl/unoidl.hxx:454
unoidl::ConstantValue::(anonymous) doubleValue double
include/unotest/bootstrapfixturebase.hxx:37
test::BootstrapFixtureBase m_directories class test::Directories
-include/vcl/filter/pdfdocument.hxx:200
- vcl::filter::PDFNameElement m_nLength const sal_uInt64
include/vcl/opengl/OpenGLContext.hxx:57
OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
include/vcl/opengl/OpenGLContext.hxx:176
@@ -400,14 +384,16 @@ lingucomponent/source/languageguessing/simpleguesser.cxx:79
textcat_t maxsize uint4
lingucomponent/source/languageguessing/simpleguesser.cxx:81
textcat_t output char [1024]
+linguistic/source/dlistimp.cxx:73
+ DicEvtListenerHelper aCollectDicEvt std::vector<DictionaryEvent>
linguistic/source/dlistimp.hxx:56
DicList aOpt class LinguOptions
oox/qa/token/tokenmap-test.cxx:34
- oox::TokenmapTest tokenMap class oox::TokenMap
+ oox::TokenmapTest tokenMap const class oox::TokenMap
oox/qa/unit/vba_compression.cxx:71
- TestVbaCompression m_directories test::Directories
+ TestVbaCompression m_directories const test::Directories
oox/source/drawingml/chart/objectformatter.cxx:708
- oox::drawingml::chart::ObjectFormatterData maFromLocale struct com::sun::star::lang::Locale
+ oox::drawingml::chart::ObjectFormatterData maFromLocale const struct com::sun::star::lang::Locale
oox/source/drawingml/diagram/diagramlayoutatoms.hxx:208
oox::drawingml::ChooseAtom maEmptyChildren const std::vector<LayoutAtomPtr>
registry/source/reflwrit.cxx:141
@@ -437,13 +423,13 @@ sal/rtl/uuid.cxx:64
sal/rtl/uuid.cxx:65
UUID node sal_uInt8 [6]
sc/inc/compiler.hxx:127
- ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
+ ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
sc/inc/compiler.hxx:128
- ScRawToken::(anonymous) table struct (anonymous struct at /media/noel/disk2/libo6/sc/inc/compiler.hxx:125:9)
+ ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo6/sc/inc/compiler.hxx:125:9)
sc/inc/compiler.hxx:133
- ScRawToken::(anonymous) pMat class ScMatrix *
+ ScRawToken::(anonymous) pMat class ScMatrix *const
sc/inc/formulagroup.hxx:39
- sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
+ sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **const
sc/inc/reordermap.hxx:21
sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
sc/source/core/inc/adiasync.hxx:42
@@ -457,13 +443,13 @@ sc/source/filter/excel/xltoolbar.cxx:35
sc/source/filter/inc/autofilterbuffer.hxx:181
oox::xls::FilterColumn mxSettings std::shared_ptr<FilterSettingsBase>
sc/source/filter/inc/commentsbuffer.hxx:42
- oox::xls::CommentModel maAnchor css::awt::Rectangle
+ oox::xls::CommentModel maAnchor const css::awt::Rectangle
sc/source/filter/inc/htmlpars.hxx:56
ScHTMLStyles maEmpty const class rtl::OUString
sc/source/filter/inc/namebuff.hxx:80
RangeNameBufferWK3::Entry nAbsInd sal_uInt16
sc/source/filter/inc/qproform.hxx:55
- QProToSc mnAddToken struct TokenId
+ QProToSc mnAddToken const struct TokenId
sc/source/filter/inc/stylesbuffer.hxx:676
oox::xls::Dxf mxAlignment std::shared_ptr<Alignment>
sc/source/filter/inc/stylesbuffer.hxx:678
@@ -530,11 +516,13 @@ sdext/source/pdfimport/tree/style.hxx:42
pdfi::StyleContainer::Style Contents const class rtl::OUString
sfx2/source/appl/lnkbase2.cxx:95
sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
+sfx2/source/inc/appdata.hxx:103
+ SfxAppData_Impl nInReschedule sal_uInt16
slideshow/source/engine/slideshowimpl.cxx:153
(anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
-sot/source/sdstor/ucbstorage.cxx:408
+sot/source/sdstor/ucbstorage.cxx:403
UCBStorageStream_Impl m_aKey const class rtl::OString
-starmath/source/view.cxx:856
+starmath/source/view.cxx:861
SmViewShell_Impl aOpts const class SvtMiscOptions
store/source/storbios.cxx:59
OStoreSuperBlock m_aMarked OStoreSuperBlock::L
@@ -586,8 +574,6 @@ 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>
-svx/source/svdraw/svdpdf.hxx:173
- ImpSdrPdfImport maLineCap const css::drawing::LineCap
svx/source/svdraw/svdpdf.hxx:174
ImpSdrPdfImport maDash const class XDash
sw/inc/acmplwrd.hxx:42
@@ -638,7 +624,7 @@ sw/source/uibase/inc/fldmgr.hxx:78
SwInsertField_Data m_aDBDataSource const css::uno::Any
sw/source/uibase/inc/labimg.hxx:50
SwLabItem m_aBin class rtl::OUString
-sw/source/uibase/inc/optload.hxx:107
+sw/source/uibase/inc/optload.hxx:106
CaptionComboBox aDefault const class rtl::OUString
toolkit/source/awt/vclxtoolkit.cxx:434
(anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
@@ -730,11 +716,11 @@ vcl/source/filter/jpeg/transupp.h:148
(anonymous) crop_xoffset_set JCROP_CODE
vcl/source/filter/jpeg/transupp.h:150
(anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1049
+vcl/source/fontsubset/sft.cxx:1048
vcl::_subHeader2 firstCode const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1050
+vcl/source/fontsubset/sft.cxx:1049
vcl::_subHeader2 entryCount const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1051
+vcl/source/fontsubset/sft.cxx:1050
vcl::_subHeader2 idDelta const sal_uInt16
vcl/source/gdi/dibtools.cxx:51
(anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 73fd588bd617..5ddb45c81a14 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -20,6 +20,14 @@ canvas/source/vcl/canvasbitmap.hxx:117
vclcanvas::CanvasBitmap mxDevice css::uno::Reference<css::rendering::XGraphicDevice>
canvas/source/vcl/impltools.hxx:117
vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
+chart2/source/controller/dialogs/res_DataLabel.hxx:87
+ chart::DataLabelResources m_xDC_Dial std::unique_ptr<weld::CustomWeld>
+chart2/source/controller/dialogs/tp_AxisLabel.hxx:53
+ chart::SchAxisLabelTabPage m_xFlOrient std::unique_ptr<weld::Label>
+chart2/source/controller/dialogs/tp_RangeChooser.hxx:88
+ chart::RangeChooserTabPage m_xFT_Range std::unique_ptr<weld::Label>
+chart2/source/controller/dialogs/tp_TitleRotation.hxx:38
+ chart::SchAlignmentTabPage m_xFtTextDirection std::unique_ptr<weld::Label>
chart2/source/controller/inc/RangeSelectionListener.hxx:63
chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
comphelper/source/container/enumerablemap.cxx:298
@@ -40,9 +48,9 @@ cui/source/dialogs/colorpicker.cxx:714
cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld>
cui/source/dialogs/colorpicker.cxx:716
cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/align.hxx:98
+cui/source/inc/align.hxx:97
svx::AlignmentTabPage m_xBoxDirection std::unique_ptr<weld::Widget>
-cui/source/inc/cfg.hxx:575
+cui/source/inc/cfg.hxx:574
SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button>
cui/source/inc/cuicharmap.hxx:104
SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld>
@@ -64,9 +72,9 @@ cui/source/inc/cuitabarea.hxx:710
SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld>
cui/source/inc/FontFeaturesDialog.hxx:53
cui::FontFeaturesDialog m_xPreviewWindow std::unique_ptr<weld::CustomWeld>
-cui/source/inc/page.hxx:105
+cui/source/inc/page.hxx:104
SvxPageDescPage m_xOrientationFT std::unique_ptr<weld::Label>
-cui/source/inc/page.hxx:135
+cui/source/inc/page.hxx:134
SvxPageDescPage m_xBspWin std::unique_ptr<weld::CustomWeld>
cui/source/inc/paragrph.hxx:67
SvxStdParagraphTabPage m_xRightLabel std::unique_ptr<weld::Label>
@@ -78,7 +86,7 @@ cui/source/inc/paragrph.hxx:159
SvxParaAlignTabPage m_xPropertiesFL std::unique_ptr<weld::Widget>
cui/source/inc/swpossizetabpage.hxx:88
SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/textattr.hxx:69
+cui/source/inc/textattr.hxx:66
SvxTextAttrPage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
cui/source/inc/transfrm.hxx:104
SvxPositionSizeTabPage m_xCtlPos std::unique_ptr<weld::CustomWeld>
@@ -124,13 +132,13 @@ 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 const sal_Int16
+include/svtools/wizardmachine.hxx:119
+ svt::OWizardPage m_xContainer std::unique_ptr<weld::Container>
include/svx/colorwindow.hxx:132
ColorWindow mxColorSetWin std::unique_ptr<weld::CustomWeld>
include/svx/colorwindow.hxx:133
ColorWindow mxRecentColorSetWin std::unique_ptr<weld::CustomWeld>
-include/svx/hdft.hxx:87
+include/svx/hdft.hxx:86
SvxHFPage m_xBspWin std::unique_ptr<weld::CustomWeld>
include/vcl/font/Feature.hxx:102
vcl::font::Feature m_eType const enum vcl::font::FeatureType
@@ -193,47 +201,49 @@ sal/osl/unx/thread.cxx:94
sal/osl/unx/thread.cxx:112
osl_thread_global_st m_priority const struct osl_thread_priority_st
sc/inc/formulalogger.hxx:42
- sc::FormulaLogger maMessages std::vector<OUString>
+ sc::FormulaLogger maMessages const std::vector<OUString>
sc/inc/interpretercontext.hxx:32
ScInterpreterContext mrDoc const class ScDocument &
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
sc/source/core/data/document.cxx:1244
- (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
+ (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
sc/source/core/data/document.cxx:1245
- (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
+ (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
sc/source/filter/html/htmlpars.cxx:3029
(anonymous namespace)::CSSHandler::MemStr mp const char *
sc/source/filter/html/htmlpars.cxx:3030
(anonymous namespace)::CSSHandler::MemStr mn size_t
sc/source/filter/inc/sheetdatacontext.hxx:62
- oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/ui/inc/crdlg.hxx:33
+ oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
+sc/source/ui/inc/crdlg.hxx:32
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:462
+sc/source/ui/inc/docsh.hxx:456
ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
sc/source/ui/inc/instbdlg.hxx:66
ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton>
-sd/source/ui/animations/CustomAnimationDialog.cxx:1743
+sd/source/ui/animations/CustomAnimationDialog.cxx:1746
sd::CustomAnimationEffectTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:1749
- sd::CustomAnimationEffectTabPage mxFTSound std::unique_ptr<weld::Label>
sd/source/ui/animations/CustomAnimationDialog.cxx:1752
+ sd::CustomAnimationEffectTabPage mxFTSound std::unique_ptr<weld::Label>
+sd/source/ui/animations/CustomAnimationDialog.cxx:1755
sd::CustomAnimationEffectTabPage mxFTAfterEffect std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2273
+sd/source/ui/animations/CustomAnimationDialog.cxx:2276
sd::CustomAnimationDurationTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2274
+sd/source/ui/animations/CustomAnimationDialog.cxx:2277
sd::CustomAnimationDurationTabPage mxFTStart std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2276
+sd/source/ui/animations/CustomAnimationDialog.cxx:2279
sd::CustomAnimationDurationTabPage mxFTStartDelay std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2639
+sd/source/ui/animations/CustomAnimationDialog.cxx:2642
sd::CustomAnimationTextAnimTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/animations/CustomAnimationDialog.cxx:2640
+sd/source/ui/animations/CustomAnimationDialog.cxx:2643
sd::CustomAnimationTextAnimTabPage mxFTGroupText std::unique_ptr<weld::Label>
-sd/source/ui/animations/CustomAnimationDialog.hxx:150
+sd/source/ui/animations/CustomAnimationDialog.hxx:148
sd::SdPropertySubControl mxContainer std::unique_ptr<weld::Container>
+sd/source/ui/animations/CustomAnimationDialog.hxx:149
+ sd::SdPropertySubControl mnType sal_Int32
sd/source/ui/dlg/PhotoAlbumDialog.hxx:60
sd::SdPhotoAlbumDialog m_xImg std::unique_ptr<weld::CustomWeld>
sd/source/ui/inc/custsdlg.hxx:43
@@ -328,6 +338,14 @@ sw/source/uibase/inc/dbui.hxx:31
PrintMonitor m_xDocName std::unique_ptr<weld::Label>
sw/source/uibase/inc/drpcps.hxx:141
SwDropCapsPage m_xPict std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/frmpage.hxx:227
+ SwGrfExtPage m_xFlAngle std::unique_ptr<weld::Frame>
+sw/source/uibase/inc/frmpage.hxx:296
+ SwFrameAddPage m_xDescriptionFT std::unique_ptr<weld::Label>
+sw/source/uibase/inc/frmpage.hxx:298
+ SwFrameAddPage m_xPrevFT std::unique_ptr<weld::Label>
+sw/source/uibase/inc/frmpage.hxx:300
+ SwFrameAddPage m_xNextFT std::unique_ptr<weld::Label>
sw/source/uibase/inc/insfnote.hxx:38
SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
sw/source/uibase/inc/num.hxx:55
@@ -338,7 +356,7 @@ sw/source/uibase/inc/outline.hxx:98
SwOutlineSettingsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
sw/source/uibase/inc/pggrid.hxx:44
SwTextGridPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/regionsw.hxx:233
+sw/source/uibase/inc/regionsw.hxx:232
SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
sw/source/uibase/inc/splittbl.hxx:30
SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton>
@@ -372,7 +390,7 @@ 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:2398
+vcl/unx/gtk3/gtk3gtkinst.cxx:2403
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link const AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 1b988be5ec71..4c7ec8c29cb7 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -82,6 +82,8 @@ connectivity/source/inc/OTypeInfo.hxx:34
connectivity::OTypeInfo nPrecision sal_Int32
connectivity/source/inc/OTypeInfo.hxx:36
connectivity::OTypeInfo nMaximumScale sal_Int16
+connectivity/source/inc/OTypeInfo.hxx:38
+ connectivity::OTypeInfo nType sal_Int16
cppcanvas/source/mtfrenderer/emfpbrush.hxx:102
cppcanvas::internal::EMFPBrush wrapMode sal_Int32
cppcanvas/source/mtfrenderer/emfppen.hxx:42
@@ -148,12 +150,18 @@ cui/source/inc/cuihyperdlg.hxx:77
SvxHpLinkDlg maCtrl class SvxHlinkCtrl
dbaccess/source/core/dataaccess/documentdefinition.cxx:288
dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
+dbaccess/source/ui/inc/propertysetitem.hxx:34
+ dbaui::OPropertySetItem m_xSet css::uno::Reference<css::beans::XPropertySet>
desktop/qa/desktop_lib/test_desktop_lib.cxx:178
DesktopLOKTest m_bModified _Bool
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:117
dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
desktop/unx/source/splashx.c:371
input_mode long
+drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:44
+ drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool
+drawinglayer/source/attribute/sdrsceneattribute3d.cxx:32
+ drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double
drawinglayer/source/tools/emfpbrush.hxx:104
emfplushelper::EMFPBrush wrapMode sal_Int32
drawinglayer/source/tools/emfpcustomlinecap.hxx:33
@@ -218,8 +226,20 @@ include/canvas/base/canvascustomspritehelper.hxx:219
canvas::CanvasCustomSpriteHelper mbPrioDirty _Bool
include/canvas/base/canvascustomspritehelper.hxx:222
canvas::CanvasCustomSpriteHelper mbVisibilityDirty _Bool
+include/drawinglayer/attribute/sdrallattribute3d.hxx:44
+ drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const class drawinglayer::attribute::SdrLineStartEndAttribute
+include/drawinglayer/primitive2d/mediaprimitive2d.hxx:51
+ drawinglayer::primitive2d::MediaPrimitive2D maURL class rtl::OUString
+include/drawinglayer/texture/texture.hxx:77
+ drawinglayer::texture::GeoTexSvxGradient maDefinitionRange basegfx::B2DRange
+include/drawinglayer/texture/texture.hxx:80
+ drawinglayer::texture::GeoTexSvxGradient mfBorder double
+include/drawinglayer/texture/texture.hxx:278
+ drawinglayer::texture::GeoTexSvxHatch mfAngle double
include/editeng/adjustitem.hxx:39
SvxAdjustItem bLeft _Bool
+include/editeng/outlobj.hxx:42
+ OutlinerParaObjData mbIsEditDoc _Bool
include/LibreOfficeKit/LibreOfficeKit.h:108
_LibreOfficeKitDocumentClass nSize size_t
include/LibreOfficeKit/LibreOfficeKit.h:310
@@ -234,10 +254,26 @@ include/opencl/platforminfo.hxx:30
OpenCLDeviceInfo mnComputeUnits size_t
include/opencl/platforminfo.hxx:31
OpenCLDeviceInfo mnFrequency size_t
+include/sfx2/minfitem.hxx:35
+ SfxMacroInfoItem aCommentText const class rtl::OUString
+include/svtools/brwbox.hxx:252
+ BrowseBox::CursorMoveAttempt m_nCol const long
+include/svtools/brwbox.hxx:253
+ BrowseBox::CursorMoveAttempt m_nRow const long
+include/svtools/brwbox.hxx:254
+ BrowseBox::CursorMoveAttempt m_bScrolledToReachCell const _Bool
+include/svtools/ctrlbox.hxx:448
+ FontSizeBox pFontList const class FontList *
+include/svtools/ctrlbox.hxx:450
+ FontSizeBox bPtRelative _Bool
include/svx/bmpmask.hxx:130
SvxBmpMask aSelItem class SvxBmpMaskSelectItem
include/svx/imapdlg.hxx:118
SvxIMapDlg aIMapItem class SvxIMapDlgItem
+include/svx/ofaitem.hxx:44
+ OfaRefItem mxRef rtl::Reference<reference_type>
+include/svx/svdlayer.hxx:70
+ SdrLayer nType sal_uInt16
include/vcl/opengl/OpenGLContext.hxx:41
GLWindow bMultiSampleSupported _Bool
include/vcl/salnativewidgets.hxx:446
@@ -246,6 +282,8 @@ include/vcl/salnativewidgets.hxx:507
PushButtonValue mbBevelButton _Bool
include/vcl/salnativewidgets.hxx:508
PushButtonValue mbSingleLine _Bool
+include/vcl/textrectinfo.hxx:31
+ TextRectInfo mnLineCount sal_uInt16
include/xmloff/shapeimport.hxx:180
SdXML3DSceneAttributesHelper mbVRPUsed _Bool
include/xmloff/shapeimport.hxx:181
@@ -262,16 +300,18 @@ lingucomponent/source/languageguessing/simpleguesser.cxx:79
textcat_t maxsize uint4
lingucomponent/source/languageguessing/simpleguesser.cxx:81
textcat_t output char [1024]
+linguistic/source/dlistimp.cxx:73
+ DicEvtListenerHelper aCollectDicEvt std::vector<DictionaryEvent>
registry/source/reflread.cxx:466
ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32
registry/source/reflread.cxx:467
ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b2 sal_uInt32
registry/source/reflread.cxx:534
- FieldList m_pCP class ConstantPool *
+ FieldList m_pCP class ConstantPool *const
registry/source/reflread.cxx:718
- ReferenceList m_pCP class ConstantPool *
+ ReferenceList m_pCP class ConstantPool *const
registry/source/reflread.cxx:819
- MethodList m_pCP class ConstantPool *
+ MethodList m_pCP class ConstantPool *const
sal/rtl/alloc_arena.hxx:35
rtl_arena_stat_type m_mem_total sal_Size
sal/rtl/alloc_arena.hxx:36
@@ -294,6 +334,8 @@ sal/textenc/tcvtutf7.cxx:396
ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
sal/textenc/tcvtutf7.cxx:397
ImplUTF7FromUCContextData mnBufferBits sal_uInt32
+sc/inc/attrib.hxx:229
+ ScDoubleItem nValue double
sc/inc/compiler.hxx:256
ScCompiler::AddInMap pODFF const char *
sc/inc/compiler.hxx:257
@@ -302,14 +344,24 @@ sc/inc/compiler.hxx:259
ScCompiler::AddInMap pUpper const char *
sc/inc/document.hxx:2528
ScMutationDisable mpDocument class ScDocument *
+sc/inc/lookupcache.hxx:61
+ ScLookupCache::QueryCriteria union ScLookupCache::QueryCriteria::(anonymous at /media/noel/disk2/libo6/sc/inc/lookupcache.hxx:61:9)
sc/inc/pivot.hxx:75
ScDPLabelData mnFlags sal_Int32
sc/inc/pivot.hxx:78
ScDPLabelData mbIsValue _Bool
+sc/inc/scmatrix.hxx:120
+ ScMatrix mbCloneIfConst _Bool
+sc/inc/tabopparams.hxx:38
+ ScInterpreterTableOpParams bValid _Bool
sc/source/core/data/cellvalues.cxx:25
sc::(anonymous namespace)::BlockPos mnEnd size_t
sc/source/core/data/column4.cxx:1316
(anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
+sc/source/core/data/column.cxx:1389
+ (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
+sc/source/core/data/column.cxx:1390
+ (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags const enum ScCloneFlags
sc/source/filter/excel/xltoolbar.hxx:23
TBCCmd cmdID sal_uInt16
sc/source/filter/excel/xltoolbar.hxx:24
@@ -342,6 +394,10 @@ sc/source/filter/inc/exp_op.hxx:47
ExportBiff5 pExcRoot struct RootData *
sc/source/filter/inc/imp_op.hxx:84
ImportExcel::LastFormula mpCell class ScFormulaCell *
+sc/source/filter/inc/namebuff.hxx:36
+ StringHashEntry aString const class rtl::OUString
+sc/source/filter/inc/namebuff.hxx:37
+ StringHashEntry nHash const sal_uInt32
sc/source/filter/inc/orcusinterface.hxx:446
ScOrcusStyles::xf mnStyleXf size_t
sc/source/filter/inc/orcusinterface.hxx:466
@@ -361,11 +417,15 @@ sc/source/filter/xml/xmldrani.hxx:75
sc/source/filter/xml/xmlexternaltabi.hxx:112
ScXMLExternalRefCellContext mnCellType sal_Int16
sc/source/ui/inc/AccessibleText.hxx:194
- ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
-sc/source/ui/inc/datastream.hxx:108
+ ScAccessiblePreviewHeaderCellTextData mbRowHeader const _Bool
+sc/source/ui/inc/datastream.hxx:105
sc::DataStream mnSettings sal_uInt32
sc/source/ui/inc/preview.hxx:47
ScPreview nTabPage long
+sc/source/ui/inc/uiitems.hxx:48
+ ScInputStatusItem aStartPos const class ScAddress
+sc/source/ui/inc/uiitems.hxx:49
+ ScInputStatusItem aEndPos const class ScAddress
sd/source/filter/eppt/eppt.hxx:142
PPTWriter mnTxId sal_uInt32
sd/source/filter/ppt/ppt97animations.hxx:41
@@ -382,6 +442,8 @@ sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
sd::sidebar::TemplatePreviewProvider msURL const class rtl::OUString
sd/source/ui/sidebar/SlideBackground.hxx:100
sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox>
+sfx2/source/control/dispatch.cxx:100
+ SfxObjectBars_Impl pIFace class SfxInterface *
sfx2/source/view/classificationcontroller.cxx:59
sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener
slideshow/source/engine/opengl/TransitionImpl.hxx:296
@@ -396,6 +458,10 @@ starmath/inc/view.hxx:158
SmCmdBoxWindow aController class SmEditController
store/source/storbase.hxx:248
store::PageData m_aMarked store::PageData::L
+store/source/storbios.cxx:58
+ OStoreSuperBlock m_nMarked sal_uInt32
+store/source/storbios.cxx:59
+ OStoreSuperBlock m_aMarked OStoreSuperBlock::L
svl/source/crypto/cryptosign.cxx:145
(anonymous namespace)::(anonymous) version SECItem
svl/source/crypto/cryptosign.cxx:147
@@ -410,12 +476,24 @@ svl/source/crypto/cryptosign.cxx:194
(anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
svl/source/misc/inethist.cxx:48
INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
+svx/inc/sdr/overlay/overlaytools.hxx:41
+ drawinglayer::primitive2d::OverlayStaticRectanglePrimitive mfRotation const double
+svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:46
+ drawinglayer::primitive2d::SdrOleContentPrimitive2D mnGraphicVersion const sal_uInt32
svx/source/dialog/contimp.hxx:56
SvxSuperContourDlg aContourItem class SvxContourDlgItem
svx/source/form/dataaccessdescriptor.cxx:44
svx::ODADescriptorImpl m_bSetOutOfDate _Bool
svx/source/form/formcontroller.cxx:211
svxform::ColumnInfo nNullable sal_Int32
+svx/source/inc/fmitems.hxx:28
+ FmInterfaceItem xInterface css::uno::Reference<css::uno::XInterface>
+svx/source/sdr/attribute/sdrformtextattribute.cxx:155
+ drawinglayer::attribute::ImpSdrFormTextAttribute mnFormTextShdwTransp const sal_uInt16
+svx/source/sdr/attribute/sdrtextattribute.cxx:53
+ drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32
+svx/source/sdr/attribute/sdrtextattribute.cxx:67
+ drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell const _Bool
svx/source/sidebar/line/LinePropertyPanel.hxx:97
svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
svx/source/sidebar/line/LinePropertyPanel.hxx:98
@@ -434,10 +512,14 @@ 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/svdibrow.cxx:89
+ ImpItemListRow pType const std::type_info *
svx/source/svdraw/svdpdf.hxx:196
ImpSdrPdfImport mdPageWidthPts double
svx/source/table/tablertfimporter.cxx:54
sdr::table::RTFCellDefault maItemSet class SfxItemSet
+sw/inc/cellatr.hxx:37
+ SwTableBoxNumFormat m_bAuto _Bool
sw/inc/shellio.hxx:147
SwReader aFileName const class rtl::OUString
sw/source/core/doc/tblafmt.cxx:186
@@ -452,12 +534,6 @@ sw/source/core/inc/swfont.hxx:976
SvStatistics nDrawStretchText sal_uInt16
sw/source/core/inc/swfont.hxx:977
SvStatistics nChangeFont sal_uInt16
-sw/source/filter/html/htmlcss1.cxx:77
- SwCSS1ItemIds nFormatBreak const sal_uInt16
-sw/source/filter/html/htmlcss1.cxx:78
- SwCSS1ItemIds nFormatPageDesc const sal_uInt16
-sw/source/filter/html/htmlcss1.cxx:79
- SwCSS1ItemIds nFormatKeep const sal_uInt16
sw/source/filter/inc/rtf.hxx:28
RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
sw/source/filter/inc/rtf.hxx:29
@@ -466,6 +542,8 @@ sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
sw/source/filter/inc/rtf.hxx:31
RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo6/sw/source/filter/inc/rtf.hxx:27:9)
+sw/source/uibase/inc/labimg.hxx:50
+ SwLabItem m_aBin class rtl::OUString
ucb/source/ucp/gio/gio_mount.hxx:46
OOoMountOperationClass parent_class GMountOperationClass
ucb/source/ucp/gio/gio_mount.hxx:49
@@ -482,6 +560,8 @@ vbahelper/source/vbahelper/vbafillformat.hxx:36
ScVbaFillFormat m_nForeColor sal_Int32
vcl/inc/accel.h:33
ImplAccelEntry mpAutoAccel class Accelerator *
+vcl/inc/fontselect.hxx:62
+ FontSelectPattern mfExactHeight float
vcl/inc/opengl/RenderList.hxx:29
Vertex color glm::vec4
vcl/inc/opengl/RenderList.hxx:30
@@ -514,20 +594,38 @@ vcl/inc/salwtype.hxx:248
SalSwipeEvent mnVelocityY double
vcl/inc/sft.hxx:462
vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
+vcl/inc/unx/gtk/gtkframe.hxx:88
+ GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
+vcl/inc/unx/gtk/gtkframe.hxx:89
+ GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
+vcl/inc/unx/gtk/gtkframe.hxx:90
+ GtkSalFrame::IMHandler::PreviousKeyPress time guint32
vcl/inc/unx/gtk/gtkframe.hxx:215
GtkSalFrame m_nFloatFlags enum FloatWinPopupFlags
vcl/opengl/salbmp.cxx:440
(anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/source/filter/graphicfilter.cxx:1010
+vcl/source/filter/graphicfilter.cxx:906
+ ImpFilterLibCacheEntry maFiltername const class rtl::OUString
+vcl/source/filter/graphicfilter.cxx:1005
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/source/gdi/pdfwriter_impl.hxx:200
+ vcl::PDFWriterImpl::BitmapID m_nChecksum BitmapChecksum
+vcl/source/gdi/pdfwriter_impl.hxx:201
+ vcl::PDFWriterImpl::BitmapID m_nMaskChecksum BitmapChecksum
vcl/unx/generic/app/wmadaptor.cxx:1269
_mwmhints input_mode long
vcl/unx/generic/app/wmadaptor.cxx:1270
_mwmhints status unsigned long
+vcl/unx/generic/gdi/cairotextrender.cxx:53
+ (anonymous namespace)::CairoFontsCache::CacheId maFace (anonymous namespace)::FT_Face
+vcl/unx/generic/gdi/cairotextrender.cxx:55
+ (anonymous namespace)::CairoFontsCache::CacheId mbEmbolden _Bool
+vcl/unx/generic/gdi/cairotextrender.cxx:56
+ (anonymous namespace)::CairoFontsCache::CacheId mbVerticalMetrics _Bool
vcl/unx/gtk/a11y/atkwrapper.hxx:49
AtkObjectWrapper aParent const AtkObject
vcl/unx/gtk/a11y/atkwrapper.hxx:80
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index b0fa04302f36..b6016faabfbb 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -445,9 +445,7 @@ private:
class SVT_DLLPUBLIC FontSizeBox : public MetricBox
{
FontMetric aFontMetric;
- const FontList* pFontList;
bool bRelative:1,
- bPtRelative:1,
bStdSize:1;
using Window::ImplInit;
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 579f37625225..830b0e47b4a7 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -70,7 +70,6 @@ class DicEvtListenerHelper :
>
{
comphelper::OInterfaceContainerHelper2 aDicListEvtListeners;
- std::vector< DictionaryEvent > aCollectDicEvt;
uno::Reference< XDictionaryList > xMyDicList;
sal_Int16 nCondensedEvt;
@@ -242,7 +241,6 @@ sal_Int16 DicEvtListenerHelper::FlushEvents()
// clear "list" of events
nCondensedEvt = 0;
- aCollectDicEvt.clear();
}
return nNumCollectEvtListeners;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 2423a19e1497..86fca90c822d 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -182,7 +182,7 @@ SdPropertySubControl::~SdPropertySubControl()
class SdPresetPropertyBox : public SdPropertySubControl
{
public:
- SdPresetPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdPresetPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& rPresetId ) override;
@@ -195,8 +195,8 @@ private:
DECL_LINK(OnSelect, weld::ComboBox&, void);
};
-SdPresetPropertyBox::SdPresetPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdPresetPropertyBox::SdPresetPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyLink(rModifyHdl)
, mxControl(mxBuilder->weld_combo_box("combo"))
{
@@ -322,7 +322,7 @@ Control* ColorPropertyBox::getControl()
class SdColorPropertyBox : public SdPropertySubControl
{
public:
- SdColorPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdColorPropertyBox(weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& rPresetId ) override;
@@ -334,8 +334,8 @@ private:
DECL_LINK(OnSelect, ColorListBox&, void);
};
-SdColorPropertyBox::SdColorPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdColorPropertyBox::SdColorPropertyBox(weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyLink(rModifyHdl)
, mxControl(new ColorListBox(mxBuilder->weld_menu_button("color"), pTopLevel))
{
@@ -454,7 +454,7 @@ Control* FontPropertyBox::getControl()
class SdFontPropertyBox : public SdPropertySubControl
{
public:
- SdFontPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdFontPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue(const Any& rValue, const OUString& rPresetId) override;
@@ -466,8 +466,8 @@ private:
DECL_LINK(ControlSelectHdl, weld::ComboBox&, void);
};
-SdFontPropertyBox::SdFontPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdFontPropertyBox::SdFontPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyHdl(rModifyHdl)
, mxControl(mxBuilder->weld_combo_box("fontname"))
{
@@ -693,7 +693,7 @@ Control* CharHeightPropertyBox::getControl()
class SdCharHeightPropertyBox : public SdPropertySubControl
{
public:
- SdCharHeightPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdCharHeightPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& ) override;
@@ -708,8 +708,8 @@ private:
DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void);
};
-SdCharHeightPropertyBox::SdCharHeightPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdCharHeightPropertyBox::SdCharHeightPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyHdl(rModifyHdl)
, mxMetric(mxBuilder->weld_metric_spin_button("fontsize", FUNIT_PERCENT))
, mxControl(mxBuilder->weld_menu_button("fontsizemenu"))
@@ -855,7 +855,7 @@ Control* TransparencyPropertyBox::getControl()
class SdTransparencyPropertyBox : public SdPropertySubControl
{
public:
- SdTransparencyPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdTransparencyPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& rPresetId ) override;
@@ -872,8 +872,8 @@ private:
std::unique_ptr<weld::MenuButton> mxControl;
};
-SdTransparencyPropertyBox::SdTransparencyPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdTransparencyPropertyBox::SdTransparencyPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyHdl(rModifyHdl)
, mxMetric(mxBuilder->weld_metric_spin_button("transparent", FUNIT_PERCENT))
, mxControl(mxBuilder->weld_menu_button("transparentmenu"))
@@ -1059,7 +1059,7 @@ Control* RotationPropertyBox::getControl()
class SdRotationPropertyBox : public SdPropertySubControl
{
public:
- SdRotationPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdRotationPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& ) override;
@@ -1076,8 +1076,8 @@ private:
std::unique_ptr<weld::MenuButton> mxControl;
};
-SdRotationPropertyBox::SdRotationPropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdRotationPropertyBox::SdRotationPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyHdl(rModifyHdl)
, mxMetric(mxBuilder->weld_metric_spin_button("rotate", FUNIT_DEGREE))
, mxControl(mxBuilder->weld_menu_button("rotatemenu"))
@@ -1336,7 +1336,7 @@ Control* ScalePropertyBox::getControl()
class SdScalePropertyBox : public SdPropertySubControl
{
public:
- SdScalePropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdScalePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& ) override;
@@ -1354,8 +1354,8 @@ private:
std::unique_ptr<weld::MenuButton> mxControl;
};
-SdScalePropertyBox::SdScalePropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
- : SdPropertySubControl(pParent, nControlType)
+SdScalePropertyBox::SdScalePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
+ : SdPropertySubControl(pParent)
, maModifyHdl( rModifyHdl )
, mxMetric(mxBuilder->weld_metric_spin_button("scale", FUNIT_PERCENT))
, mxControl(mxBuilder->weld_menu_button("scalemenu"))
@@ -1615,7 +1615,7 @@ Control* FontStylePropertyBox::getControl()
class SdFontStylePropertyBox : public SdPropertySubControl
{
public:
- SdFontStylePropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
+ SdFontStylePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl);
virtual Any getValue() override;
virtual void setValue( const Any& rValue, const OUString& ) override;
@@ -1634,8 +1634,8 @@ private:
std::unique_ptr<weld::MenuButton> mxControl;
};
-SdFontStylePropertyBox::SdFontStylePropertyBox(sal_Int32 nControlType, weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
- : SdPropertySubControl(pParent, nControlType)
+SdFontStylePropertyBox::SdFontStylePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
+ : SdPropertySubControl(pParent)
, maModifyHdl( rModifyHdl )
, mxEdit(mxBuilder->weld_entry("entry"))
, mxControl(mxBuilder->weld_menu_button("entrymenu"))
@@ -2998,7 +2998,7 @@ std::unique_ptr<SdPropertySubControl> SdPropertySubControl::create(sal_Int32 nTy
case nPropertyTypeDirection:
case nPropertyTypeSpokes:
case nPropertyTypeZoom:
- pSubControl.reset( new SdPresetPropertyBox( nType, pLabel, pParent, rValue, rPresetId, rModifyHdl ) );
+ pSubControl.reset( new SdPresetPropertyBox( pLabel, pParent, rValue, rPresetId, rModifyHdl ) );
break;
case nPropertyTypeColor:
@@ -3006,31 +3006,31 @@ std::unique_ptr<SdPropertySubControl> SdPropertySubControl::create(sal_Int32 nTy
case nPropertyTypeFirstColor:
case nPropertyTypeCharColor:
case nPropertyTypeLineColor:
- pSubControl.reset( new SdColorPropertyBox( nType, pLabel, pParent, pTopLevel, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdColorPropertyBox( pLabel, pParent, pTopLevel, rValue, rModifyHdl ) );
break;
case nPropertyTypeFont:
- pSubControl.reset( new SdFontPropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdFontPropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
case nPropertyTypeCharHeight:
- pSubControl.reset( new SdCharHeightPropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdCharHeightPropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
case nPropertyTypeRotate:
- pSubControl.reset( new SdRotationPropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdRotationPropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
case nPropertyTypeTransparency:
- pSubControl.reset( new SdTransparencyPropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdTransparencyPropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
case nPropertyTypeScale:
- pSubControl.reset( new SdScalePropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdScalePropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
case nPropertyTypeCharDecoration:
- pSubControl.reset( new SdFontStylePropertyBox( nType, pLabel, pParent, rValue, rModifyHdl ) );
+ pSubControl.reset( new SdFontStylePropertyBox( pLabel, pParent, rValue, rModifyHdl ) );
break;
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 5e7ca996e08c..d8a0f29384e6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -122,10 +122,9 @@ protected:
class SdPropertySubControl
{
public:
- explicit SdPropertySubControl(weld::Container* pParent, sal_Int32 nType)
+ explicit SdPropertySubControl(weld::Container* pParent)
: mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationfragment.ui"))
, mxContainer(mxBuilder->weld_container("EffectFragment"))
- , mnType( nType )
{
}
@@ -146,7 +145,6 @@ public:
protected:
std::unique_ptr<weld::Builder> mxBuilder;
std::unique_ptr<weld::Container> mxContainer;
- sal_Int32 mnType;
};
class PropertyControl : public ListBox
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index db15fb0e9562..d122a2082e49 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -93,7 +93,6 @@ SfxAppData_Impl::SfxAppData_Impl()
, pProgress(nullptr)
, nDocModalMode(0)
, nRescheduleLocks(0)
- , nInReschedule(0)
, m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessComponentContext()))
, pTbxCtrlFac(nullptr)
, pStbCtrlFac(nullptr)
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 55372be656a6..3e225cd367c6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1269,7 +1269,7 @@ bool SfxBindings::NextJob_Impl(Timer const * pTimer)
pImpl->aAutoTimer.SetTimeout(TIMEOUT_UPDATING);
// at least 10 loops and further if more jobs are available but no input
- bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+ bool bPreEmptive = pTimer;
sal_uInt16 nLoops = 10;
pImpl->bInNextJob = true;
const std::size_t nCount = pImpl->pCaches.size();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f000d3896f45..55d38c2dc3bf 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -97,9 +97,8 @@ struct SfxObjectBars_Impl
ToolbarId eId; // ConfigId of the Toolbox
sal_uInt16 nPos;
SfxVisibilityFlags nFlags; // special visibility flags
- SfxInterface* pIFace;
- SfxObjectBars_Impl() : eId(ToolbarId::None), nPos(0), nFlags(SfxVisibilityFlags::Invisible), pIFace(nullptr) {}
+ SfxObjectBars_Impl() : eId(ToolbarId::None), nPos(0), nFlags(SfxVisibilityFlags::Invisible) {}
};
struct SfxDispatcher_Impl
@@ -1294,7 +1293,6 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
rBar.nPos = nPos;
rBar.nFlags = nFlags;
rBar.eId = pIFace->GetObjectBarId(nNo);
- rBar.pIFace = pIFace;
if ( bUIActive || bIsActive )
{
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index aa3bed3e121d..5f892442bc4a 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -100,7 +100,6 @@ public:
sal_uInt16 nDocModalMode; // counts documents in modal mode
sal_uInt16 nRescheduleLocks;
- sal_uInt16 nInReschedule;
rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index bad8ecee665d..4a8c98c046a1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1262,10 +1262,8 @@ void FontSizeBox::ImplInit()
{
EnableAutocomplete( false );
- bPtRelative = false;
bRelative = false;
bStdSize = false;
- pFontList = nullptr;
SetShowTrailingZeros( false );
SetDecimalDigits( 1 );
@@ -1289,9 +1287,6 @@ void FontSizeBox::Reformat()
void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
{
- // remember for relative mode
- pFontList = pList;
-
// no font sizes need to be set for relative mode
if ( bRelative )
return;
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index c340ebb7783a..62a5716c3af0 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -34,10 +34,8 @@ constexpr sal_uInt32 getSwDefaultTextFormat() { return NF_STANDARD_FORMAT_TEXT;
class SW_DLLPUBLIC SwTableBoxNumFormat : public SfxUInt32Item
{
- bool m_bAuto; ///< automatically given flag
public:
- SwTableBoxNumFormat( sal_uInt32 nFormat = getSwDefaultTextFormat(),
- bool bAuto = false );
+ SwTableBoxNumFormat( sal_uInt32 nFormat = getSwDefaultTextFormat() );
// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -46,7 +44,6 @@ public:
SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
{
SetValue( rAttr.GetValue() );
- m_bAuto = rAttr.m_bAuto;
return *this;
}
};
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 26958ececdde..0f76a1808990 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -37,24 +37,22 @@
// The advantage is that this is the pool's default item value and some places
// benefit from this special treatment in that they don't have to handle/store
// attribute specifics, especially when writing a document.
-SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
+SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat )
: SfxUInt32Item( RES_BOXATR_FORMAT,
(((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == getSwDefaultTextFormat()) ?
getSwDefaultTextFormat() : nFormat))
- , m_bAuto( bFlag )
{
}
bool SwTableBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
- return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue() &&
- m_bAuto == static_cast<const SwTableBoxNumFormat&>(rAttr).m_bAuto;
+ return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue();
}
SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const
{
- return new SwTableBoxNumFormat( GetValue(), m_bAuto );
+ return new SwTableBoxNumFormat( GetValue() );
}
SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula )
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index a89ea3dbdd46..7227172e9726 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -67,7 +67,6 @@ SwLabItem& SwLabItem::operator =(const SwLabItem& rItem)
m_aType = rItem.m_aType;
m_bPage = rItem.m_bPage;
m_bSynchron = rItem.m_bSynchron;
- m_aBin = rItem.m_aBin;
m_nCol = rItem.m_nCol;
m_nRow = rItem.m_nRow;
m_lHDist = rItem.m_lHDist;
@@ -125,7 +124,6 @@ bool SwLabItem::operator ==(const SfxPoolItem& rItem) const
m_bCont == rLab.m_bCont &&
m_bPage == rLab.m_bPage &&
m_bSynchron == rLab.m_bSynchron &&
- m_aBin == rLab.m_aBin &&
m_nCol == rLab.m_nCol &&
m_nRow == rLab.m_nRow &&
m_lHDist == rLab.m_lHDist &&
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 941cb4e35847..a1c211dbcb5e 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -47,7 +47,6 @@ public:
OUString m_aWriting; // label
OUString m_aMake; // label mark
OUString m_aType; // label type
- OUString m_aBin; // printer shaft
sal_Int32 m_lHDist; // horizontal distance (user)
sal_Int32 m_lVDist; // vertical distance (user)
sal_Int32 m_lWidth; // width (user)
commit 76dd28afc9c0eb632a5dd20eb51704ee0bbc4b58
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 9 16:27:11 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 22 12:47:37 2018 +0200
loplugin:staticvar in various
looks for variables that can be declared const and static i.e. they can
be stored in the read-only linker segment and shared between different
processes
Change-Id: I8ddc6e5fa0f6b10d80c75d5952df8ddd311cf892
Reviewed-on: https://gerrit.libreoffice.org/61591
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/staticvar.cxx b/compilerplugins/clang/staticvar.cxx
index a9db2f4dda04..37156a283c33 100644
--- a/compilerplugins/clang/staticvar.cxx
+++ b/compilerplugins/clang/staticvar.cxx
@@ -76,7 +76,10 @@ public:
// aHTMLOptionTab is ordered by useful grouping, so let it sort at runtime
|| fn == SRCDIR "/svtools/source/svhtml/htmlkywd.cxx"
// TODO sorting some of these tables will be a lot of work...
- || fn == SRCDIR "/sw/source/filter/ww8/ww8par6.cxx")
+ || fn == SRCDIR "/sw/source/filter/ww8/ww8par6.cxx"
+ // this only triggers on older versions of clang, not sure why
+ // in any case, it is actually about the array in vcl/inc/units.hrc, which we can't change
+ || fn == SRCDIR "/vcl/source/app/svdata.cxx")
return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
@@ -198,7 +201,7 @@ bool StaticVar::VisitVarDecl(VarDecl const* varDecl)
return true;
}
-loplugin::Plugin::Registration<StaticVar> X("staticvar", false);
+loplugin::Plugin::Registration<StaticVar> X("staticvar", true);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 15426db1bc57..17ee82810af3 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -74,7 +74,7 @@ InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartP
return nStartPos;
}
-static ScriptTypeList typeList[] = {
+static ScriptTypeList const typeList[] = {
//{ UnicodeScript_kHebrew, UnicodeScript_kHebrew }, // 10,
//{ UnicodeScript_kArabic, UnicodeScript_kArabic }, // 11,
{ UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, sal_Int16(UnicodeScript_kDevanagari) }, // 14,
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 900160f2971c..16bcfd3f96b2 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -54,7 +54,7 @@ static struct TMlist {
TransliterationModules tm;
TransliterationModulesNew tmn;
const sal_Char *implName;
-} TMlist[] = { // Modules ModulesNew
+} const TMlist[] = { // Modules ModulesNew
TmItem1 (IGNORE_CASE), // 0. (1<<8 256) (7)
TmItem1 (IGNORE_WIDTH), // 1. (1<<9 512) (8)
TmItem1 (IGNORE_KANA), // 2. (1<<10 1024) (9)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index b7a12685d9c4..b6b1f3113545 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -35,10 +35,10 @@ struct VendorSupportMapEntry
createInstance_func createFunc;
};
-extern VendorSupportMapEntry gVendorMap[];
+extern VendorSupportMapEntry const gVendorMap[];
#define BEGIN_VENDOR_MAP() \
-VendorSupportMapEntry gVendorMap[] ={
+VendorSupportMapEntry const gVendorMap[] ={
#define VENDOR_MAP_ENTRY(x,y) \
{x, & y::getJavaExePaths, & y::createInstance},
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 31fa993fcecc..f1805c36a16e 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -481,7 +481,7 @@ namespace basprov
}
- static struct ::cppu::ImplementationEntry s_component_entries [] =
+ static struct ::cppu::ImplementationEntry const s_component_entries [] =
{
{
create_BasicProviderImpl, getImplementationName_BasicProviderImpl,
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index c7ae4c93277e..884ba6966d4f 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -736,7 +736,7 @@ namespace dlgprov
}
- static struct ::cppu::ImplementationEntry s_component_entries [] =
+ static struct ::cppu::ImplementationEntry const s_component_entries [] =
{
{create_DialogProviderImpl, getImplementationName_DialogProviderImpl,getSupportedServiceNames_DialogProviderImpl, ::cppu::createSingleComponentFactory,nullptr, 0},
{ &comp_DialogModelProvider::_create,&comp_DialogModelProvider::_getImplementationName,&comp_DialogModelProvider::_getSupportedServiceNames,&::cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index d1e9c6d5a0da..03b633a54665 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -439,7 +439,7 @@ css::uno::Sequence< OUString > getSupportedServiceNames2() {
return s;
}
-::cppu::ImplementationEntry entries[] = {
+::cppu::ImplementationEntry const entries[] = {
{ &create, &getImplementationName, &getSupportedServiceNames,
&::cppu::createSingleComponentFactory, nullptr, 0 },
{ &create2, &getImplementationName2, &getSupportedServiceNames2,
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 7632a50005c2..622a2981e73a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -687,87 +687,89 @@ std::pair<WinBits,MessBoxStyle> ImplGetWinBits( sal_uInt32 nComponentAttribs, Wi
struct ComponentInfo
{
- const char* pName;
+ OUStringLiteral sName;
WindowType nWinType;
};
-static ComponentInfo aComponentInfos [] =
-{
- { "buttondialog", WindowType::BUTTONDIALOG },
- { "cancelbutton", WindowType::CANCELBUTTON },
- { "checkbox", WindowType::CHECKBOX },
- { "combobox", WindowType::COMBOBOX },
- { "control", WindowType::CONTROL },
- { "currencybox", WindowType::CURRENCYBOX },
- { "currencyfield", WindowType::CURRENCYFIELD },
- { "datebox", WindowType::DATEBOX },
- { "datefield", WindowType::DATEFIELD },
- { "dialog", WindowType::DIALOG },
- { "dockingarea", WindowType::DOCKINGAREA },
- { "dockingwindow", WindowType::DOCKINGWINDOW },
- { "edit", WindowType::EDIT },
- { "errorbox", WindowType::ERRORBOX },
- { "fixedbitmap", WindowType::FIXEDBITMAP },
- { "fixedimage", WindowType::FIXEDIMAGE },
- { "fixedline", WindowType::FIXEDLINE },
- { "fixedtext", WindowType::FIXEDTEXT },
- { "floatingwindow", WindowType::FLOATINGWINDOW },
- { "framewindow", WindowType::TOOLKIT_FRAMEWINDOW },
- { "groupbox", WindowType::GROUPBOX },
- { "frame", WindowType::GROUPBOX },
- { "helpbutton", WindowType::HELPBUTTON },
- { "imagebutton", WindowType::IMAGEBUTTON },
- { "infobox", WindowType::INFOBOX },
- { "listbox", WindowType::LISTBOX },
- { "longcurrencybox", WindowType::LONGCURRENCYBOX },
- { "longcurrencyfield", WindowType::LONGCURRENCYFIELD },
- { "menubutton", WindowType::MENUBUTTON },
- { "messbox", WindowType::MESSBOX },
- { "metricbox", WindowType::METRICBOX },
- { "metricfield", WindowType::METRICFIELD },
- { "modaldialog", WindowType::MODALDIALOG },
- { "modelessdialog", WindowType::MODELESSDIALOG },
- { "morebutton", WindowType::MOREBUTTON },
- { "multilineedit", WindowType::MULTILINEEDIT },
- { "multilistbox", WindowType::MULTILISTBOX },
- { "numericbox", WindowType::NUMERICBOX },
- { "numericfield", WindowType::NUMERICFIELD },
- { "okbutton", WindowType::OKBUTTON },
- { "patternbox", WindowType::PATTERNBOX },
- { "patternfield", WindowType::PATTERNFIELD },
- { "pushbutton", WindowType::PUSHBUTTON },
- { "querybox", WindowType::QUERYBOX },
- { "radiobutton", WindowType::RADIOBUTTON },
- { "scrollbar", WindowType::SCROLLBAR },
- { "scrollbarbox", WindowType::SCROLLBARBOX },
- { "animatedimages", WindowType::CONTROL },
- { "spinbutton", WindowType::SPINBUTTON },
- { "spinfield", WindowType::SPINFIELD },
- { "splitter", WindowType::SPLITTER },
- { "splitwindow", WindowType::SPLITWINDOW },
- { "statusbar", WindowType::STATUSBAR },
- { "systemchildwindow", WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
- { "tabcontrol", WindowType::TABCONTROL },
- { "tabdialog", WindowType::TABDIALOG },
- { "tabpage", WindowType::TABPAGE },
- { "timebox", WindowType::TIMEBOX },
- { "timefield", WindowType::TIMEFIELD },
- { "toolbox", WindowType::TOOLBOX },
- { "tristatebox", WindowType::TRISTATEBOX },
- { "warningbox", WindowType::WARNINGBOX },
- { "window", WindowType::WINDOW },
- { "workwindow", WindowType::WORKWINDOW },
- { "tabpagecontainer", WindowType::CONTROL },
- { "tabpagemodel", WindowType::TABPAGE }
+static ComponentInfo const aComponentInfos [] =
+{
+ { OUStringLiteral("animatedimages"), WindowType::CONTROL },
+ { OUStringLiteral("buttondialog"), WindowType::BUTTONDIALOG },
+ { OUStringLiteral("cancelbutton"), WindowType::CANCELBUTTON },
+ { OUStringLiteral("checkbox"), WindowType::CHECKBOX },
+ { OUStringLiteral("combobox"), WindowType::COMBOBOX },
+ { OUStringLiteral("control"), WindowType::CONTROL },
+ { OUStringLiteral("currencybox"), WindowType::CURRENCYBOX },
+ { OUStringLiteral("currencyfield"), WindowType::CURRENCYFIELD },
+ { OUStringLiteral("datebox"), WindowType::DATEBOX },
+ { OUStringLiteral("datefield"), WindowType::DATEFIELD },
+ { OUStringLiteral("dialog"), WindowType::DIALOG },
+ { OUStringLiteral("dockingarea"), WindowType::DOCKINGAREA },
+ { OUStringLiteral("dockingwindow"), WindowType::DOCKINGWINDOW },
+ { OUStringLiteral("edit"), WindowType::EDIT },
+ { OUStringLiteral("errorbox"), WindowType::ERRORBOX },
+ { OUStringLiteral("fixedbitmap"), WindowType::FIXEDBITMAP },
+ { OUStringLiteral("fixedimage"), WindowType::FIXEDIMAGE },
+ { OUStringLiteral("fixedline"), WindowType::FIXEDLINE },
+ { OUStringLiteral("fixedtext"), WindowType::FIXEDTEXT },
+ { OUStringLiteral("floatingwindow"), WindowType::FLOATINGWINDOW },
+ { OUStringLiteral("frame"), WindowType::GROUPBOX },
+ { OUStringLiteral("framewindow"), WindowType::TOOLKIT_FRAMEWINDOW },
+ { OUStringLiteral("groupbox"), WindowType::GROUPBOX },
+ { OUStringLiteral("helpbutton"), WindowType::HELPBUTTON },
+ { OUStringLiteral("imagebutton"), WindowType::IMAGEBUTTON },
+ { OUStringLiteral("infobox"), WindowType::INFOBOX },
+ { OUStringLiteral("listbox"), WindowType::LISTBOX },
+ { OUStringLiteral("longcurrencybox"), WindowType::LONGCURRENCYBOX },
+ { OUStringLiteral("longcurrencyfield"), WindowType::LONGCURRENCYFIELD },
+ { OUStringLiteral("menubutton"), WindowType::MENUBUTTON },
+ { OUStringLiteral("messbox"), WindowType::MESSBOX },
+ { OUStringLiteral("metricbox"), WindowType::METRICBOX },
+ { OUStringLiteral("metricfield"), WindowType::METRICFIELD },
+ { OUStringLiteral("modaldialog"), WindowType::MODALDIALOG },
+ { OUStringLiteral("modelessdialog"), WindowType::MODELESSDIALOG },
+ { OUStringLiteral("morebutton"), WindowType::MOREBUTTON },
+ { OUStringLiteral("multilineedit"), WindowType::MULTILINEEDIT },
+ { OUStringLiteral("multilistbox"), WindowType::MULTILISTBOX },
+ { OUStringLiteral("numericbox"), WindowType::NUMERICBOX },
+ { OUStringLiteral("numericfield"), WindowType::NUMERICFIELD },
+ { OUStringLiteral("okbutton"), WindowType::OKBUTTON },
+ { OUStringLiteral("patternbox"), WindowType::PATTERNBOX },
+ { OUStringLiteral("patternfield"), WindowType::PATTERNFIELD },
+ { OUStringLiteral("pushbutton"), WindowType::PUSHBUTTON },
+ { OUStringLiteral("querybox"), WindowType::QUERYBOX },
+ { OUStringLiteral("radiobutton"), WindowType::RADIOBUTTON },
+ { OUStringLiteral("scrollbar"), WindowType::SCROLLBAR },
+ { OUStringLiteral("scrollbarbox"), WindowType::SCROLLBARBOX },
+ { OUStringLiteral("spinbutton"), WindowType::SPINBUTTON },
+ { OUStringLiteral("spinfield"), WindowType::SPINFIELD },
+ { OUStringLiteral("splitter"), WindowType::SPLITTER },
+ { OUStringLiteral("splitwindow"), WindowType::SPLITWINDOW },
+ { OUStringLiteral("statusbar"), WindowType::STATUSBAR },
+ { OUStringLiteral("systemchildwindow"), WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
+ { OUStringLiteral("tabcontrol"), WindowType::TABCONTROL },
+ { OUStringLiteral("tabdialog"), WindowType::TABDIALOG },
+ { OUStringLiteral("tabpage"), WindowType::TABPAGE },
+ { OUStringLiteral("tabpagecontainer"), WindowType::CONTROL },
+ { OUStringLiteral("tabpagemodel"), WindowType::TABPAGE },
+ { OUStringLiteral("timebox"), WindowType::TIMEBOX },
+ { OUStringLiteral("timefield"), WindowType::TIMEFIELD },
+ { OUStringLiteral("toolbox"), WindowType::TOOLBOX },
+ { OUStringLiteral("tristatebox"), WindowType::TRISTATEBOX },
+ { OUStringLiteral("warningbox"), WindowType::WARNINGBOX },
+ { OUStringLiteral("window"), WindowType::WINDOW },
+ { OUStringLiteral("workwindow"), WindowType::WORKWINDOW }
};
-extern "C"
-{
-static int ComponentInfoCompare( const void* pFirst, const void* pSecond)
+bool ComponentInfoCompare( const ComponentInfo & lhs, const ComponentInfo & rhs)
{
- return strcmp( static_cast<ComponentInfo const *>(pFirst)->pName,
- static_cast<ComponentInfo const *>(pSecond)->pName );
+ return rtl_str_compare_WithLength(lhs.sName.data, lhs.sName.size, rhs.sName.data, rhs.sName.size) < 0;
}
+
+bool ComponentInfoFindCompare( const ComponentInfo & lhs, const OUString & s)
+{
+ return rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(s.pData->buffer, s.pData->length,
+ lhs.sName.data, lhs.sName.size) > 0;
}
WindowType ImplGetComponentType( const OUString& rServiceName )
@@ -775,28 +777,22 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
static bool bSorted = false;
if( !bSorted )
{
- qsort( static_cast<void*>(aComponentInfos),
- SAL_N_ELEMENTS( aComponentInfos ),
- sizeof( ComponentInfo ),
- ComponentInfoCompare );
+ assert( std::is_sorted( std::begin(aComponentInfos), std::end(aComponentInfos),
+ ComponentInfoCompare ) );
bSorted = true;
}
-
- ComponentInfo aSearch;
- OString aServiceName(OUStringToOString(rServiceName, osl_getThreadTextEncoding()).toAsciiLowerCase());
- if ( !aServiceName.isEmpty() )
- aSearch.pName = aServiceName.getStr();
+ OUString sSearch;
+ if ( !rServiceName.isEmpty() )
+ sSearch = rServiceName;
else
- aSearch.pName = "window";
-
- ComponentInfo* pInf = static_cast<ComponentInfo*>(bsearch( &aSearch,
- static_cast<void*>(aComponentInfos),
- SAL_N_ELEMENTS( aComponentInfos ),
- sizeof( ComponentInfo ),
- ComponentInfoCompare ));
+ sSearch = "window";
- return pInf ? pInf->nWinType : WindowType::NONE;
+ auto it = std::lower_bound( std::begin(aComponentInfos), std::end(aComponentInfos), sSearch,
+ ComponentInfoFindCompare );
+ if (it != std::end(aComponentInfos) && !ComponentInfoFindCompare(*it, sSearch) )
+ return it->nWinType;
+ return WindowType::NONE;
}
struct MessageBoxTypeInfo
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index d7dfe76e162e..6e466468e2f1 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -360,10 +360,10 @@ namespace
{
static struct _unit_table
{
- FieldUnit const eFieldUnit;
- sal_Int16 const nMeasurementUnit;
- sal_Int16 const nFieldToMeasureFactor;
- } aUnits[] = {
+ FieldUnit eFieldUnit;
+ sal_Int16 nMeasurementUnit;
+ sal_Int16 nFieldToMeasureFactor;
+ } const aUnits[] = {
{ FUNIT_NONE, -1 , -1},
{ FUNIT_MM, MeasureUnit::MM, 1 }, // must precede MM_10TH
{ FUNIT_MM, MeasureUnit::MM_10TH, 10 },
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 057ac61f121f..77c30850a1ba 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -179,7 +179,7 @@ public:
static ErrCode GetSvError( int nErrno )
{
- static struct { int nErr; ErrCode sv; } errArr[] =
+ static struct { int nErr; ErrCode sv; } const errArr[] =
{
{ 0, ERRCODE_NONE },
{ EACCES, SVSTREAM_ACCESS_DENIED },
@@ -231,7 +231,7 @@ static ErrCode GetSvError( int nErrno )
static ErrCode GetSvError( oslFileError nErrno )
{
- static struct { oslFileError nErr; ErrCode sv; } errArr[] =
+ static struct { oslFileError nErr; ErrCode sv; } const errArr[] =
{
{ osl_File_E_None, ERRCODE_NONE },
{ osl_File_E_ACCES, SVSTREAM_ACCESS_DENIED },
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 6f52d6d542b9..a326d9533a43 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -30,7 +30,7 @@ namespace ucb { namespace ucp { namespace ext
//= descriptors for the services implemented in this component
- static struct ::cppu::ImplementationEntry s_aServiceEntries[] =
+ static struct ::cppu::ImplementationEntry const s_aServiceEntries[] =
{
{
ContentProvider::Create,
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 3dfacf08a875..17749604a675 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -213,7 +213,7 @@ static struct NamesToHdl
const char *pFullPropName; // full qualified name as used in configuration
const char *pPropName; // property name only (atom) of above
sal_Int32 const nHdl; // numeric handle representing the property
-}aNamesToHdl[] =
+} const aNamesToHdl[] =
{
{/* 0 */ "General/DefaultLocale", UPN_DEFAULT_LOCALE, UPH_DEFAULT_LOCALE},
{/* 1 */ "General/DictionaryList/ActiveDictionaries", UPN_ACTIVE_DICTIONARIES, UPH_ACTIVE_DICTIONARIES},
@@ -281,7 +281,7 @@ bool SvtLinguConfigItem::GetHdlByName(
const OUString &rPropertyName,
bool bFullPropName )
{
- NamesToHdl *pEntry = &aNamesToHdl[0];
+ NamesToHdl const *pEntry = &aNamesToHdl[0];
if (bFullPropName)
{
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 608a424f0f01..ea49af1d0f29 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1135,7 +1135,7 @@ StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
};
//In order of preference
- const ConvertTable aConservativeTable[] =
+ static const ConvertTable aConservativeTable[] =
{
{Symbol, aAdobeSymbolTab},
{Wingdings, aWingDingsTab},
@@ -1173,7 +1173,7 @@ StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
}
//In order of preference
- const ExtendedConvertTable aAgressiveTable[] =
+ static const ExtendedConvertTable aAgressiveTable[] =
{
ExtendedConvertTable(Symbol, aSymbolExtraTab2,
sizeof(aSymbolExtraTab2)),
diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/writerfilter/source/rtftok/rtfcharsets.cxx
index 5168a3627d2f..4309351d9f70 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/writerfilter/source/rtftok/rtfcharsets.cxx
@@ -15,7 +15,7 @@ namespace writerfilter
namespace rtftok
{
// See RTF spec v1.9.1, page 19
-RTFEncoding aRTFEncodings[] = {
+RTFEncoding const aRTFEncodings[] = {
// charset codepage Windows / Mac name
{ 0, 1252 }, // ANSI
{ 1, 0 }, // Default
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/writerfilter/source/rtftok/rtfcharsets.hxx
index d2d21aaa8ac5..c0a024def83c 100644
--- a/writerfilter/source/rtftok/rtfcharsets.hxx
+++ b/writerfilter/source/rtftok/rtfcharsets.hxx
@@ -20,7 +20,7 @@ struct RTFEncoding
int const charset;
int const codepage;
};
-extern RTFEncoding aRTFEncodings[];
+extern RTFEncoding const aRTFEncodings[];
extern int nRTFEncodings;
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index b49f356d4b0f..684cedeb5637 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -15,7 +15,7 @@ namespace writerfilter
{
namespace rtftok
{
-RTFSymbol aRTFControlWords[] = {
+RTFSymbol const aRTFControlWords[] = {
// sKeyword nControlType nIndex
{ "'", CONTROL_SYMBOL, RTF_HEXCHAR, 0 },
{ "-", CONTROL_SYMBOL, RTF_OPTHYPH, 0 },
@@ -1848,7 +1848,7 @@ bool RTFSymbol::operator<(const RTFSymbol& rOther) const
return std::strcmp(sKeyword, rOther.sKeyword) < 0;
}
-RTFMathSymbol aRTFMathControlWords[] = {
+RTFMathSymbol const aRTFMathControlWords[] = {
// eKeyword nToken eDestination
{ RTF_MOMATH, M_TOKEN(oMath), Destination::MOMATH },
{ RTF_MF, M_TOKEN(f), Destination::MF },
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index ddaf123b4a77..e638d9a9a359 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -2001,7 +2001,7 @@ struct RTFSymbol
bool operator<(const RTFSymbol& rOther) const;
};
-extern RTFSymbol aRTFControlWords[];
+extern RTFSymbol const aRTFControlWords[];
extern int nRTFControlWords;
/// Represents an RTF Math Control Word
@@ -2013,7 +2013,7 @@ struct RTFMathSymbol
bool operator<(const RTFMathSymbol& rOther) const;
};
-extern RTFMathSymbol aRTFMathControlWords[];
+extern RTFMathSymbol const aRTFMathControlWords[];
extern int nRTFMathControlWords;
} // namespace rtftok
More information about the Libreoffice-commits
mailing list