diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-13 14:21:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-14 08:48:04 +0100 |
commit | 527977d5cac51a9edd522d675f0ccf575d2f2dc0 (patch) | |
tree | 3bcdc4dd578315c31e377ce90c149b5984d49811 | |
parent | 5f40c324b5578b23735d2d7fe30b0b7731867fba (diff) |
loplugin:unusedfields
Change-Id: Id6792f0955a25533d33f6da6ed8c3e993f578c3f
Reviewed-on: https://gerrit.libreoffice.org/69170
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | chart2/source/inc/MediaDescriptorHelper.hxx | 6 | ||||
-rw-r--r-- | chart2/source/tools/MediaDescriptorHelper.cxx | 20 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.only-used-in-constructor.results | 46 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.readonly.results | 28 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.untouched.results | 52 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.writeonly.results | 20 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 1 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/numfmtlb.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/utlui/numfmtlb.cxx | 12 |
10 files changed, 78 insertions, 111 deletions
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index cd78408c92b9..d91b36652883 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -52,12 +52,6 @@ public: //all properties given in the constructor are stored in the following three sequences - css::uno::Sequence< css::beans::PropertyValue > - m_aRegularProperties; //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated - - css::uno::Sequence< css::beans::PropertyValue > - m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated - //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!) css::uno::Sequence< css::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 8307bc38a31c..ab5de9574667 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -31,18 +31,20 @@ namespace apphelper MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< beans::PropertyValue > & rMediaDescriptor ) - : m_aRegularProperties(rMediaDescriptor.getLength()) - , m_aDeprecatedProperties(rMediaDescriptor.getLength()) - , m_aModelProperties(rMediaDescriptor.getLength()) + : m_aModelProperties(rMediaDescriptor.getLength()) { + css::uno::Sequence< css::beans::PropertyValue > + aRegularProperties(rMediaDescriptor.getLength()); //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated + css::uno::Sequence< css::beans::PropertyValue > + aDeprecatedProperties(rMediaDescriptor.getLength()); //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated impl_init(); sal_Int32 nRegularCount = 0; sal_Int32 nDeprecatedCount = 0; sal_Int32 nModelCount = 0; - auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp) + auto addRegularProp = [&aRegularProperties, &nRegularCount](const beans::PropertyValue& rRegularProp) { - m_aRegularProperties[nRegularCount] = rRegularProp; + aRegularProperties[nRegularCount] = rRegularProp; ++nRegularCount; }; auto addModelProp = [this, &nModelCount, &addRegularProp](const beans::PropertyValue& rModelProp) @@ -51,9 +53,9 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< m_aModelProperties[nModelCount] = rModelProp; ++nModelCount; }; - auto addDepreciatedProp = [this, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp) + auto addDepreciatedProp = [&aDeprecatedProperties, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp) { - m_aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp; + aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp; ++nDeprecatedCount; }; @@ -236,8 +238,8 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } } - m_aRegularProperties.realloc(nRegularCount); - m_aDeprecatedProperties.realloc(nDeprecatedCount); + aRegularProperties.realloc(nRegularCount); + aDeprecatedProperties.realloc(nDeprecatedCount); m_aModelProperties.realloc(nModelCount); } diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 86d82428863a..6e89b56e1fa0 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) + 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:202 @@ -28,12 +28,14 @@ canvas/workben/canvasdemo.cxx:82 DemoRenderer maColorWhite uno::Sequence<double> chart2/source/controller/accessibility/AccessibleChartShape.hxx:79 chart::AccessibleChartShape m_aShapeTreeInfo ::accessibility::AccessibleShapeTreeInfo -chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:392 - (anonymous namespace)::WrappedLineStyleProperty m_aDefaultValue class com::sun::star::uno::Any chart2/source/controller/inc/dlg_View3D.hxx:53 chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper chart2/source/controller/inc/RangeSelectionListener.hxx:63 chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO +chart2/source/inc/MediaDescriptorHelper.hxx:56 + apphelper::MediaDescriptorHelper m_aRegularProperties css::uno::Sequence<css::beans::PropertyValue> +chart2/source/inc/MediaDescriptorHelper.hxx:59 + apphelper::MediaDescriptorHelper m_aDeprecatedProperties css::uno::Sequence<css::beans::PropertyValue> connectivity/source/commontools/RowFunctionParser.cxx:374 connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT> connectivity/source/commontools/RowFunctionParser.cxx:375 @@ -132,9 +134,11 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/dialogs/colorpicker.cxx:719 cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl -cui/source/factory/dlgfact.cxx:1386 +cui/source/factory/dlgfact.cxx:1357 SvxMacroAssignDialog m_aItems class SfxItemSet -cui/source/inc/cfgutil.hxx:227 +cui/source/inc/cfg.hxx:335 + SvxMenuEntriesListBox m_bIsInternalDrag _Bool +cui/source/inc/cfgutil.hxx:242 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl cui/source/inc/cuitabarea.hxx:230 SvxAreaTabPage maFixed_ChangeType enum ChangeType @@ -148,8 +152,6 @@ cui/source/inc/tabstpge.hxx:90 SvxTabulatorTabPage m_aCenterWin class TabWin_Impl cui/source/inc/tabstpge.hxx:91 SvxTabulatorTabPage m_aDezWin class TabWin_Impl -cui/source/inc/treeopt.hxx:84 - OptionsNode m_sPageURL class rtl::OUString dbaccess/source/core/api/RowSet.hxx:111 dbaccess::ORowSet m_aURL class rtl::OUString dbaccess/source/core/api/RowSet.hxx:125 @@ -168,7 +170,7 @@ dbaccess/source/core/api/RowSet.hxx:460 dbaccess::ORowSetClone m_nFetchSize sal_Int32 dbaccess/source/core/api/RowSet.hxx:461 dbaccess::ORowSetClone m_bIsBookmarkable _Bool -dbaccess/source/core/dataaccess/connection.hxx:101 +dbaccess/source/core/dataaccess/connection.hxx:102 dbaccess::OConnection m_nInAppend std::atomic<std::size_t> drawinglayer/source/tools/emfphelperdata.hxx:153 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32 @@ -502,6 +504,8 @@ sc/inc/token.hxx:400 SingleDoubleRefModifier aDub struct ScComplexRefData sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * +sc/qa/unit/ucalc_formula.cxx:3011 + class Test * sc/source/core/data/document.cxx:1239 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch sc/source/core/data/document.cxx:1240 @@ -532,14 +536,6 @@ sc/source/filter/xml/xmldrani.hxx:72 ScXMLDatabaseRangeContext bIsSelection _Bool sc/source/filter/xml/xmlexternaltabi.hxx:113 ScXMLExternalRefCellContext mnCellType sal_Int16 -sc/source/filter/xml/xmlfilti.hxx:157 - ScXMLDPFilterContext aOutputPosition class ScAddress -sc/source/filter/xml/xmlfilti.hxx:158 - ScXMLDPFilterContext aConditionSourceRangeAddress class ScRange -sc/source/filter/xml/xmlfilti.hxx:162 - ScXMLDPFilterContext bCopyOutputData _Bool -sc/source/filter/xml/xmlfilti.hxx:166 - ScXMLDPFilterContext bConditionSourceRange _Bool sc/source/filter/xml/xmltransformationi.hxx:155 ScXMLDateTimeContext aType class rtl::OUString sc/source/ui/inc/acredlin.hxx:51 @@ -601,12 +597,12 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition simple_type rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 - PDFGrammar::definition null_object rule<ScannerT> -sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition stringtype rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition boolean rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 + PDFGrammar::definition null_object rule<ScannerT> +sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition name rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition stream rule<ScannerT> @@ -636,8 +632,6 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:265 PDFGrammar::definition trailer rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:265 PDFGrammar::definition xref rule<ScannerT> -sfx2/source/bastyp/progress.cxx:53 - SfxProgress_Impl aStateText class rtl::OUString sfx2/source/doc/doctempl.cxx:117 DocTempl::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock slideshow/source/engine/animationnodes/animationbasenode.hxx:89 @@ -734,10 +728,8 @@ sw/source/core/layout/dbg_lay.cxx:170 SwImplEnterLeave nAction const enum DbgAction sw/source/core/text/inftxt.hxx:686 SwTextSlot aText class rtl::OUString -sw/source/core/text/porfld.cxx:140 +sw/source/core/text/porfld.cxx:141 SwFieldSlot aText class rtl::OUString -sw/source/filter/xml/xmltbli.cxx:382 - SwXMLTableCellContext_Impl mXmlId class rtl::OUString sw/source/ui/dbui/mmaddressblockpage.hxx:208 SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter sw/source/uibase/docvw/romenu.hxx:35 @@ -812,15 +804,15 @@ vcl/inc/WidgetThemeLibrary.hxx:90 vcl::ControlDrawParameters eState enum ControlState vcl/inc/WidgetThemeLibrary.hxx:106 vcl::WidgetThemeLibrary_t nSize uint32_t -vcl/source/app/salvtables.cxx:2018 +vcl/source/app/salvtables.cxx:2041 SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter -vcl/source/app/salvtables.cxx:3924 +vcl/source/app/salvtables.cxx:4013 SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter vcl/source/gdi/jobset.cxx:36 ImplOldJobSetupData cDeviceName char [32] vcl/source/gdi/jobset.cxx:37 ImplOldJobSetupData cPortName char [32] -vcl/unx/gtk3/gtk3gtkinst.cxx:2853 +vcl/unx/gtk3/gtk3gtkinst.cxx:2882 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 HyperLink atk_hyper_link const AtkHyperlink diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 1b27983bc34c..4c26af85692e 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -158,8 +158,6 @@ cppu/source/uno/check.cxx:134 (anonymous namespace)::Char3 c3 char cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 -cui/source/inc/cfgutil.hxx:109 - SfxConfigFunctionListBox aArr SfxGroupInfoArr_Impl cui/source/options/optcolor.cxx:255 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions cui/source/options/optpath.cxx:80 @@ -172,7 +170,7 @@ dbaccess/source/core/api/RowSetBase.hxx:96 dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError dbaccess/source/core/dataaccess/documentcontainer.cxx:64 dbaccess::LocalNameApproval m_aErrors ::connectivity::SQLError -dbaccess/source/core/inc/ContentHelper.hxx:108 +dbaccess/source/core/inc/ContentHelper.hxx:109 dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError dbaccess/source/filter/hsqldb/parseschema.hxx:36 dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> > @@ -292,17 +290,17 @@ include/basic/sbstar.hxx:50 StarBASIC aErrorHdl Link<class StarBASIC *, _Bool> include/basic/sbstar.hxx:51 StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags> -include/connectivity/DriversConfig.hxx:76 +include/connectivity/DriversConfig.hxx:75 connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode -include/connectivity/sdbcx/VCatalog.hxx:67 +include/connectivity/sdbcx/VCatalog.hxx:69 connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection> -include/connectivity/sdbcx/VDescriptor.hxx:56 +include/connectivity/sdbcx/VDescriptor.hxx:53 connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual -include/connectivity/sdbcx/VGroup.hxx:58 +include/connectivity/sdbcx/VGroup.hxx:54 connectivity::sdbcx::OGroup m_pUsers rtl::Reference<OUsers> -include/connectivity/sdbcx/VUser.hxx:56 +include/connectivity/sdbcx/VUser.hxx:54 connectivity::sdbcx::OUser m_pGroups rtl::Reference<OGroups> -include/connectivity/sqlparse.hxx:115 +include/connectivity/sqlparse.hxx:109 connectivity::OSQLParser_Data aErrors ::connectivity::SQLError include/drawinglayer/processor3d/defaultprocessor3d.hxx:94 drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer @@ -375,7 +373,7 @@ include/test/sheet/xnamedranges.hxx:49 include/test/sheet/xspreadsheets2.hxx:46 apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument> include/unoidl/unoidl.hxx:443 - unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo6/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -461,7 +459,7 @@ sal/rtl/uuid.cxx:65 sc/inc/compiler.hxx:126 ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item sc/inc/compiler.hxx:127 - ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:124:9) + ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo6/sc/inc/compiler.hxx:124:9) sc/inc/compiler.hxx:132 ScRawToken::(anonymous) pMat class ScMatrix *const sc/inc/formulagroup.hxx:39 @@ -664,6 +662,10 @@ sw/source/uibase/inc/dbtree.hxx:69 DBTreeList bShowColumns _Bool sw/source/uibase/inc/fldmgr.hxx:79 SwInsertField_Data m_aDBDataSource const css::uno::Any +sw/source/uibase/inc/numfmtlb.hxx:74 + SwNumFormatListBox bOneArea _Bool +sw/source/uibase/inc/numfmtlb.hxx:77 + SwNumFormatListBox bShowLanguageControl _Bool toolkit/source/awt/vclxtoolkit.cxx:435 (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard> ucb/source/ucp/gio/gio_mount.hxx:46 @@ -722,9 +724,9 @@ vcl/inc/salwtype.hxx:202 SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong vcl/inc/salwtype.hxx:208 SalQueryCharPositionEvent mnCharPos sal_uLong -vcl/inc/svdata.hxx:281 +vcl/inc/svdata.hxx:285 ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool -vcl/inc/svdata.hxx:303 +vcl/inc/svdata.hxx:307 ImplSVNWFData mbRolloverMenubar _Bool vcl/inc/toolbox.h:108 vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16> diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 890daa44f22b..1b714dc15d26 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) + 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 * basctl/source/inc/dlged.hxx:122 @@ -22,8 +22,6 @@ canvas/source/vcl/impltools.hxx:117 vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard canvas/workben/canvasdemo.cxx:82 DemoRenderer maColorWhite uno::Sequence<double> -chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:392 - (anonymous namespace)::WrappedLineStyleProperty m_aDefaultValue class com::sun::star::uno::Any chart2/source/controller/dialogs/res_DataLabel.hxx:86 chart::DataLabelResources m_xDC_Dial std::unique_ptr<weld::CustomWeld> chart2/source/controller/dialogs/tp_AxisLabel.hxx:60 @@ -38,7 +36,7 @@ chart2/source/controller/dialogs/tp_TitleRotation.hxx:44 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 +comphelper/source/container/enumerablemap.cxx:293 comphelper::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface> connectivity/source/drivers/evoab2/EApi.h:122 (anonymous) address_format char * @@ -58,9 +56,11 @@ cui/source/dialogs/colorpicker.cxx:723 cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld> cui/source/inc/align.hxx:92 svx::AlignmentTabPage m_xBoxDirection std::unique_ptr<weld::Widget> -cui/source/inc/cfg.hxx:574 +cui/source/inc/cfg.hxx:335 + SvxMenuEntriesListBox m_bIsInternalDrag _Bool +cui/source/inc/cfg.hxx:584 SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button> -cui/source/inc/cfg.hxx:607 +cui/source/inc/cfg.hxx:617 SvxIconSelectorDialog m_xTbSymbolWin std::unique_ptr<weld::CustomWeld> cui/source/inc/cuicharmap.hxx:100 SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld> @@ -108,13 +108,13 @@ cui/source/inc/transfrm.hxx:187 SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld> cui/source/inc/transfrm.hxx:190 SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld> -cui/source/inc/treeopt.hxx:84 - OptionsNode m_sPageURL class rtl::OUString +cui/source/options/optgdlg.hxx:48 + OfaMiscTabPage m_xPrintDlgFrame std::unique_ptr<weld::Widget> dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard -dbaccess/source/ui/dlg/advancedsettings.hxx:95 - dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label> dbaccess/source/ui/dlg/advancedsettings.hxx:97 + dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label> +dbaccess/source/ui/dlg/advancedsettings.hxx:99 dbaui::GeneratedValuesPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label> dbaccess/source/ui/dlg/detailpages.hxx:63 dbaui::OCommonBehaviourTabPage m_xAutoRetrievingEnabled std::unique_ptr<weld::CheckButton> @@ -175,9 +175,9 @@ include/sfx2/msg.hxx:136 include/sfx2/msg.hxx:136 SfxType2 pType const std::type_info * include/sfx2/msg.hxx:136 - SfxType2 aAttrib struct SfxTypeAttrib [2] -include/sfx2/msg.hxx:136 SfxType2 nAttribs sal_uInt16 +include/sfx2/msg.hxx:136 + SfxType2 aAttrib struct SfxTypeAttrib [2] include/sfx2/msg.hxx:137 SfxType3 nAttribs sal_uInt16 include/sfx2/msg.hxx:137 @@ -205,10 +205,10 @@ include/sfx2/msg.hxx:139 include/sfx2/msg.hxx:140 SfxType6 pType const std::type_info * include/sfx2/msg.hxx:140 - SfxType6 aAttrib struct SfxTypeAttrib [6] -include/sfx2/msg.hxx:140 SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:140 + SfxType6 aAttrib struct SfxTypeAttrib [6] +include/sfx2/msg.hxx:140 SfxType6 nAttribs sal_uInt16 include/sfx2/msg.hxx:141 SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> @@ -247,9 +247,9 @@ include/sfx2/msg.hxx:146 include/sfx2/msg.hxx:146 SfxType13 aAttrib struct SfxTypeAttrib [13] include/sfx2/msg.hxx:146 - SfxType13 nAttribs sal_uInt16 -include/sfx2/msg.hxx:146 SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> +include/sfx2/msg.hxx:146 + SfxType13 nAttribs sal_uInt16 include/sfx2/msg.hxx:147 SfxType14 pType const std::type_info * include/sfx2/msg.hxx:147 @@ -259,12 +259,12 @@ include/sfx2/msg.hxx:147 include/sfx2/msg.hxx:147 SfxType14 nAttribs sal_uInt16 include/sfx2/msg.hxx:148 + SfxType16 aAttrib struct SfxTypeAttrib [16] +include/sfx2/msg.hxx:148 SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:148 SfxType16 nAttribs sal_uInt16 include/sfx2/msg.hxx:148 - SfxType16 aAttrib struct SfxTypeAttrib [16] -include/sfx2/msg.hxx:148 SfxType16 pType const std::type_info * include/sfx2/msg.hxx:149 SfxType17 aAttrib struct SfxTypeAttrib [17] @@ -414,6 +414,8 @@ sal/qa/osl/security/osl_Security.cxx:191 osl_Security::getConfigDir bRes1 _Bool sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * +sc/qa/unit/ucalc_formula.cxx:3011 + class Test * sc/source/core/data/document.cxx:1239 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch sc/source/core/data/document.cxx:1240 @@ -438,6 +440,8 @@ sc/source/ui/inc/pvfundlg.hxx:83 ScDPFunctionDlg mxBtnOk std::unique_ptr<weld::Button> sc/source/ui/inc/pvfundlg.hxx:123 ScDPSubtotalDlg mxBtnOk std::unique_ptr<weld::Button> +sc/source/ui/inc/retypepassdlg.hxx:32 + PassFragment m_xSheetsBox std::unique_ptr<weld::Container> sc/source/ui/inc/scuiimoptdlg.hxx:63 ScImportOptionsDlg m_xBtnOk std::unique_ptr<weld::Button> sd/source/ui/animations/CustomAnimationDialog.cxx:1736 @@ -490,8 +494,6 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition array rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition value rule<ScannerT> -sfx2/source/bastyp/progress.cxx:53 - SfxProgress_Impl aStateText class rtl::OUString sfx2/source/doc/doctempl.cxx:117 DocTempl::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock sfx2/source/inc/sfxpicklist.hxx:33 @@ -511,9 +513,9 @@ sfx2/source/view/viewfrm.cxx:165 slideshow/source/engine/opengl/TransitionImpl.cxx:1990 (anonymous namespace)::ThreeFloats z GLfloat slideshow/source/engine/opengl/TransitionImpl.cxx:1990 - (anonymous namespace)::ThreeFloats x GLfloat -slideshow/source/engine/opengl/TransitionImpl.cxx:1990 (anonymous namespace)::ThreeFloats y GLfloat +slideshow/source/engine/opengl/TransitionImpl.cxx:1990 + (anonymous namespace)::ThreeFloats x GLfloat starmath/inc/dialog.hxx:90 SmFontDialog m_xShowFont std::unique_ptr<weld::CustomWeld> starmath/inc/dialog.hxx:330 @@ -644,7 +646,7 @@ vcl/inc/WidgetThemeLibrary.hxx:90 vcl::ControlDrawParameters eState enum ControlState vcl/inc/WidgetThemeLibrary.hxx:106 vcl::WidgetThemeLibrary_t nSize uint32_t -vcl/source/app/salvtables.cxx:779 +vcl/source/app/salvtables.cxx:796 SalInstanceContainer m_xContainer VclPtr<vcl::Window> vcl/source/gdi/jobset.cxx:36 ImplOldJobSetupData cDeviceName char [32] @@ -656,7 +658,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:2853 +vcl/unx/gtk3/gtk3gtkinst.cxx:2882 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 HyperLink atk_hyper_link const AtkHyperlink diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 560915e7a789..c7d64f814105 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -238,7 +238,7 @@ dbaccess/source/ui/browser/dbloader.cxx:69 DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener> desktop/qa/desktop_lib/test_desktop_lib.cxx:199 DesktopLOKTest m_bModified _Bool -desktop/source/deployment/gui/dp_gui_updatedialog.hxx:154 +desktop/source/deployment/gui/dp_gui_updatedialog.hxx:153 dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager> desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:117 dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread> @@ -638,12 +638,6 @@ sc/source/filter/xml/xmldrani.hxx:72 ScXMLDatabaseRangeContext bIsSelection _Bool sc/source/filter/xml/xmlexternaltabi.hxx:113 ScXMLExternalRefCellContext mnCellType sal_Int16 -sc/source/filter/xml/xmlfilti.hxx:157 - ScXMLDPFilterContext aOutputPosition class ScAddress -sc/source/filter/xml/xmlfilti.hxx:162 - ScXMLDPFilterContext bCopyOutputData _Bool -sc/source/filter/xml/xmlfilti.hxx:166 - ScXMLDPFilterContext bConditionSourceRange _Bool sc/source/ui/docshell/externalrefmgr.cxx:163 (anonymous namespace)::RemoveFormulaCell mpCell class ScFormulaCell *const sc/source/ui/inc/AccessibleText.hxx:194 @@ -692,8 +686,6 @@ sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136 sd::sidebar::TemplatePreviewProvider msURL const class rtl::OUString sd/source/ui/sidebar/SlideBackground.hxx:93 sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox> -sd/source/ui/slideshow/slideshowviewimpl.hxx:219 - sd::SlideShowView maPresentationArea ::tools::Rectangle sfx2/source/appl/fileobj.hxx:37 SvFileObject mxDelMed tools::SvRef<SfxMedium> sfx2/source/dialog/filtergrouping.cxx:339 @@ -768,8 +760,6 @@ svl/source/misc/inethist.cxx:48 INetURLHistory_Impl::head_entry m_nMagic sal_uInt32 svl/source/undo/undo.cxx:312 svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> > -svtools/source/dialogs/addresstemplate.cxx:437 - svt::AddressBookSourceDialogData nLastVisibleListIndex sal_Int32 svx/inc/sdr/overlay/overlaytools.hxx:41 drawinglayer::primitive2d::OverlayStaticRectanglePrimitive mfRotation const double svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:46 @@ -848,8 +838,6 @@ sw/source/core/layout/dbg_lay.cxx:131 SwImplProtocol aVars std::vector<long> sw/source/core/text/porfld.hxx:59 SwFieldPortion m_nAttrFieldType sal_uInt16 -sw/source/core/unocore/unoidx.cxx:1536 - SwXDocumentIndexMark::Impl m_sCitaitonText class rtl::OUString sw/source/filter/html/swhtml.hxx:369 SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> > sw/source/filter/inc/rtf.hxx:28 @@ -859,9 +847,7 @@ sw/source/filter/inc/rtf.hxx:29 sw/source/filter/inc/rtf.hxx:30 RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8 sw/source/filter/inc/rtf.hxx:31 - RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9) -sw/source/filter/xml/xmltbli.cxx:382 - SwXMLTableCellContext_Impl mXmlId class rtl::OUString + RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo6/sw/source/filter/inc/rtf.hxx:27:9) sw/source/ui/frmdlg/frmpage.cxx:716 (anonymous namespace)::FrameMaps pMap const struct FrameMap * sw/source/ui/frmdlg/frmpage.cxx:775 @@ -988,7 +974,7 @@ vcl/inc/salwtype.hxx:247 SalSwipeEvent mnVelocityY double vcl/inc/sft.hxx:462 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) -vcl/inc/svdata.hxx:411 +vcl/inc/svdata.hxx:415 ImplSVEvent mpInstanceRef VclPtr<vcl::Window> vcl/inc/unx/gtk/gtkframe.hxx:88 GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow * diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index dd9219cd0b07..62288ab3a756 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -925,7 +925,6 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xCo : m_xControl(std::move(xControl)) , m_xDropDown(m_xControl->create_virtual_device()) , pPage(pPg) - , m_bIsInternalDrag( false ) { CreateDropDown(); m_xControl->connect_key_press(LINK(this, SvxMenuEntriesListBox, KeyInputHdl)); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3ac0d4904384..8ae11c40271d 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -332,7 +332,6 @@ protected: std::unique_ptr<weld::TreeView> m_xControl; ScopedVclPtr<VirtualDevice> m_xDropDown; VclPtr<SvxConfigPage> pPage; - bool m_bIsInternalDrag; public: SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xControl, SvxConfigPage* pPage); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 358cf2babc3f..15749c65ec84 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -71,11 +71,8 @@ class SW_DLLPUBLIC SwNumFormatListBox SvNumFormatType nCurrFormatType; bool mbCurrFormatTypeNeedsInit; sal_Int32 nStdEntry; - bool bOneArea; sal_uInt32 nDefFormat; LanguageType eCurLanguage; - bool bShowLanguageControl; //determine whether the language control has - //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned std::unique_ptr<weld::ComboBox> mxControl; diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index d1748e953da9..a7766a505a1b 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -458,9 +458,7 @@ SwNumFormatListBox::SwNumFormatListBox(std::unique_ptr<weld::ComboBox> xControl) : nCurrFormatType(SvNumFormatType::ALL) , mbCurrFormatTypeNeedsInit(true) , nStdEntry(0) - , bOneArea(false) , nDefFormat(0) - , bShowLanguageControl(false) , bUseAutomaticLanguage(true) , mxControl(std::move(xControl)) { @@ -716,9 +714,9 @@ void SwNumFormatListBox::CallSelectHdl() SID_ATTR_NUMBERFORMAT_INFO ) ); if( (SvNumFormatType::DATE | SvNumFormatType::TIME) & nCurrFormatType ) - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, bOneArea)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false)); - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, !bShowLanguageControl)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, true)); aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, bUseAutomaticLanguage)); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -747,11 +745,7 @@ void SwNumFormatListBox::CallSelectHdl() // SetDefFormat uses eCurLanguage to look for if this format already in the list SetDefFormat(nNumberFormat); } - if( bShowLanguageControl && SfxItemState::SET == pOutSet->GetItemState( - SID_ATTR_NUMBERFORMAT_ADD_AUTO, false, &pItem )) - { - bUseAutomaticLanguage = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - } + } else SetDefFormat(nFormat); |