compilerplugins/clang/singlevalfields.could-be-bool.results | 2 compilerplugins/clang/singlevalfields.results | 85 ++++------ compilerplugins/clang/unusedfields.only-used-in-constructor.results | 50 ++--- compilerplugins/clang/unusedfields.readonly.results | 34 +--- compilerplugins/clang/unusedfields.untouched.results | 56 +++--- compilerplugins/clang/unusedfields.writeonly.results | 44 +---- desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 42 ---- desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3 include/svx/langbox.hxx | 1 include/xmloff/shapeexport.hxx | 1 sd/source/ui/dlg/sdtreelb.cxx | 17 -- sd/source/ui/inc/sdtreelb.hxx | 1 svx/source/dialog/langbox.cxx | 7 vcl/inc/toolbox.h | 1 vcl/source/window/toolbox.cxx | 27 --- vcl/source/window/toolbox2.cxx | 1 xmloff/source/draw/shapeexport.cxx | 2 17 files changed, 117 insertions(+), 257 deletions(-)
New commits: commit 7030a5860f99378ba951ecb8e2cc0425af63b741 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Mar 25 15:11:16 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Mar 26 07:30:13 2019 +0100 loplugin:unusedfields Change-Id: I31c953c8e4c1d4ec235ea318d0aa3b7cedaed1a3 Reviewed-on: https://gerrit.libreoffice.org/69683 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 6e89b56e1fa0..3e6dec99affc 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/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/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/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/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 @@ -32,10 +32,6 @@ 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 @@ -134,10 +130,8 @@ 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:1357 +cui/source/factory/dlgfact.cxx:1346 SvxMacroAssignDialog m_aItems class SfxItemSet -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 @@ -194,7 +188,7 @@ helpcompiler/inc/HelpCompiler.hxx:229 HelpCompiler lang const std::string include/basic/basmgr.hxx:56 BasicError nReason enum BasicErrorReason -include/drawinglayer/primitive2d/textlayoutdevice.hxx:61 +include/drawinglayer/primitive2d/textlayoutdevice.hxx:58 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard include/drawinglayer/texture/texture3d.hxx:62 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap @@ -317,13 +311,13 @@ include/sfx2/msg.hxx:147 include/sfx2/msg.hxx:147 SfxType14 aAttrib struct SfxTypeAttrib [14] include/sfx2/msg.hxx:148 + SfxType16 nAttribs sal_uInt16 +include/sfx2/msg.hxx:148 SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> 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:148 - SfxType16 nAttribs sal_uInt16 include/sfx2/msg.hxx:149 SfxType17 nAttribs sal_uInt16 include/sfx2/msg.hxx:149 @@ -504,8 +498,6 @@ 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 @@ -582,7 +574,7 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port const uint sd/source/ui/table/TableDesignPane.hxx:100 sd::TableDesignPane aImpl const class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1297 +sd/source/ui/view/DocumentRenderer.cxx:1317 sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef sd/source/ui/view/viewshel.cxx:1208 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock const sd::slidesorter::view::class SlideSorterView::DrawLock @@ -597,12 +589,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> @@ -613,10 +605,10 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition array rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 - PDFGrammar::definition dict_begin rule<ScannerT> -sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition dict_end rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 + PDFGrammar::definition dict_begin rule<ScannerT> +sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition value rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:264 PDFGrammar::definition object rule<ScannerT> @@ -718,32 +710,32 @@ sw/inc/unosett.hxx:145 SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl> sw/qa/core/test_ToxTextGenerator.cxx:141 ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType -sw/qa/extras/uiwriter/uiwriter.cxx:4017 +sw/qa/extras/layout/layout.cxx:2600 + class SvtSysLocaleOptions & +sw/qa/extras/uiwriter/uiwriter.cxx:4026 IdleTask maIdle class Idle sw/source/core/crsr/crbm.cxx:66 (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState sw/source/core/inc/swfont.hxx:985 SvStatistics nGetStretchTextSize sal_uInt16 -sw/source/core/layout/dbg_lay.cxx:170 +sw/source/core/layout/dbg_lay.cxx:171 SwImplEnterLeave nAction const enum DbgAction sw/source/core/text/inftxt.hxx:686 SwTextSlot aText class rtl::OUString -sw/source/core/text/porfld.cxx:141 +sw/source/core/text/porfld.cxx:142 SwFieldSlot aText class rtl::OUString sw/source/ui/dbui/mmaddressblockpage.hxx:208 SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter sw/source/uibase/docvw/romenu.hxx:35 SwReadOnlyPopup m_aBuilder class VclBuilder +sw/source/uibase/inc/condedit.hxx:44 + ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget sw/source/uibase/inc/glossary.hxx:93 SwGlossaryDlg m_aNoSpaceFilter class TextFilter 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/regionsw.hxx:254 - SwInsertSectionTabDialog m_nNotePageId sal_uInt16 -sw/source/uibase/inc/regionsw.hxx:274 - SwSectionPropertyTabDialog m_nNotePageId sal_uInt16 sw/source/uibase/inc/uivwimp.hxx:95 SwView_Impl xTmpSelDocSh const class SfxObjectShellLock sw/source/uibase/inc/unodispatch.hxx:46 @@ -804,15 +796,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:2041 +vcl/source/app/salvtables.cxx:2055 SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter -vcl/source/app/salvtables.cxx:4013 +vcl/source/app/salvtables.cxx:4098 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:2882 +vcl/unx/gtk3/gtk3gtkinst.cxx:3004 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 4c26af85692e..456dc1d45a21 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -302,7 +302,7 @@ include/connectivity/sdbcx/VUser.hxx:54 connectivity::sdbcx::OUser m_pGroups rtl::Reference<OGroups> include/connectivity/sqlparse.hxx:109 connectivity::OSQLParser_Data aErrors ::connectivity::SQLError -include/drawinglayer/processor3d/defaultprocessor3d.hxx:94 +include/drawinglayer/processor3d/defaultprocessor3d.hxx:90 drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer include/editeng/brushitem.hxx:53 SvxBrushItem maSecOptions class SvtSecurityOptions @@ -373,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/libo6/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -426,7 +426,7 @@ oox/qa/token/tokenmap-test.cxx:34 oox::TokenmapTest tokenMap const class oox::TokenMap oox/qa/unit/vba_compression.cxx:71 TestVbaCompression m_directories const test::Directories -oox/source/drawingml/chart/objectformatter.cxx:711 +oox/source/drawingml/chart/objectformatter.cxx:712 oox::drawingml::chart::ObjectFormatterData maFromLocale const struct com::sun::star::lang::Locale oox/source/drawingml/diagram/diagramlayoutatoms.hxx:234 oox::drawingml::ChooseAtom maEmptyChildren const std::vector<LayoutAtomPtr> @@ -438,13 +438,13 @@ registry/source/reflwrit.cxx:181 CPInfo::(anonymous) aUik struct RTUik * reportdesign/source/ui/inc/ColorListener.hxx:35 rptui::OColorListener m_aColorConfig const svtools::ColorConfig -sal/osl/unx/process.cxx:826 +sal/osl/unx/process.cxx:824 osl_procStat signal char [24] -sal/osl/unx/process.cxx:827 +sal/osl/unx/process.cxx:825 osl_procStat blocked char [24] -sal/osl/unx/process.cxx:828 +sal/osl/unx/process.cxx:826 osl_procStat sigignore char [24] -sal/osl/unx/process.cxx:829 +sal/osl/unx/process.cxx:827 osl_procStat sigcatch char [24] sal/rtl/alloc_arena.hxx:100 rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64] @@ -459,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/libo6/sc/inc/compiler.hxx:124:9) + ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:124:9) sc/inc/compiler.hxx:132 ScRawToken::(anonymous) pMat class ScMatrix *const sc/inc/formulagroup.hxx:39 @@ -628,19 +628,19 @@ sw/source/core/access/accfrmobjmap.hxx:100 SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare> sw/source/core/access/acchypertextdata.hxx:40 SwAccessibleHyperTextData maMap std::map<key_type, mapped_type, key_compare> -sw/source/core/access/accmap.cxx:100 +sw/source/core/access/accmap.cxx:101 SwAccessibleContextMap_Impl maMap std::map<key_type, mapped_type, key_compare> -sw/source/core/access/accmap.cxx:235 +sw/source/core/access/accmap.cxx:236 SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type, SwShapeFunc> -sw/source/core/access/accmap.cxx:588 +sw/source/core/access/accmap.cxx:589 SwAccessibleEventMap_Impl maMap std::map<key_type, mapped_type, key_compare> -sw/source/core/access/accmap.cxx:628 +sw/source/core/access/accmap.cxx:629 SwAccessibleSelectedParas_Impl maMap std::map<key_type, mapped_type, key_compare> sw/source/core/doc/swstylemanager.cxx:58 SwStyleManager aAutoCharPool class StylePool sw/source/core/doc/swstylemanager.cxx:59 SwStyleManager aAutoParaPool class StylePool -sw/source/core/doc/tblrwcl.cxx:83 +sw/source/core/doc/tblrwcl.cxx:84 CpyTabFrame::(anonymous) nSize SwTwips sw/source/core/inc/swblocks.hxx:68 SwImpBlocks m_bInPutMuchBlocks _Bool @@ -658,14 +658,8 @@ sw/source/uibase/dbui/mmconfigitem.cxx:110 SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString> sw/source/uibase/dbui/mmconfigitem.cxx:112 SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString> -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 @@ -946,7 +940,7 @@ vcl/source/treelist/headbar.cxx:42 ImplHeadItem maImage const class Image vcl/source/window/menuitemlist.hxx:58 MenuItemData aAccessibleName const class rtl::OUString -vcl/unx/gtk3/gtk3gtkinst.cxx:1165 +vcl/unx/gtk3/gtk3gtkinst.cxx:1167 out gpointer * vcl/unx/gtk/a11y/atkwrapper.hxx:49 AtkObjectWrapper aParent const AtkObject diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 1b714dc15d26..72a7d2c01ea9 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/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/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/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/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 @@ -28,8 +28,6 @@ chart2/source/controller/dialogs/tp_AxisLabel.hxx:60 chart::SchAxisLabelTabPage m_xFlOrient std::unique_ptr<weld::Label> chart2/source/controller/dialogs/tp_AxisPositions.hxx:62 chart::AxisPositionsTabPage m_xCB_AxisBetweenCategories std::unique_ptr<weld::CheckButton> -chart2/source/controller/dialogs/tp_AxisPositions.hxx:66 - chart::AxisPositionsTabPage m_xED_LabelDistance std::unique_ptr<weld::FormattedSpinButton> chart2/source/controller/dialogs/tp_RangeChooser.hxx:86 chart::RangeChooserTabPage m_xFT_Range std::unique_ptr<weld::Label> chart2/source/controller/dialogs/tp_TitleRotation.hxx:44 @@ -56,11 +54,9 @@ 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:335 - SvxMenuEntriesListBox m_bIsInternalDrag _Bool -cui/source/inc/cfg.hxx:584 +cui/source/inc/cfg.hxx:583 SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button> -cui/source/inc/cfg.hxx:617 +cui/source/inc/cfg.hxx:616 SvxIconSelectorDialog m_xTbSymbolWin std::unique_ptr<weld::CustomWeld> cui/source/inc/cuicharmap.hxx:100 SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld> @@ -78,9 +74,9 @@ cui/source/inc/cuigrfflt.hxx:78 GraphicFilterDialog mxPreview std::unique_ptr<weld::CustomWeld> cui/source/inc/cuigrfflt.hxx:175 GraphicFilterEmboss mxCtlLight std::unique_ptr<weld::CustomWeld> -cui/source/inc/cuitabarea.hxx:712 +cui/source/inc/cuitabarea.hxx:714 SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld> -cui/source/inc/cuitabarea.hxx:713 +cui/source/inc/cuitabarea.hxx:715 SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld> cui/source/inc/FontFeaturesDialog.hxx:51 cui::FontFeaturesDialog m_xContentWindow std::unique_ptr<weld::ScrolledWindow> @@ -144,7 +140,7 @@ filter/source/xsltdialog/xmlfiltertabpagexslt.hxx:48 XMLFilterTabPageXSLT m_xContainer std::unique_ptr<weld::Widget> helpcompiler/inc/HelpCompiler.hxx:229 HelpCompiler lang const std::string -include/drawinglayer/primitive2d/textlayoutdevice.hxx:61 +include/drawinglayer/primitive2d/textlayoutdevice.hxx:58 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard include/editeng/unotext.hxx:612 SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText> @@ -179,13 +175,13 @@ include/sfx2/msg.hxx:136 include/sfx2/msg.hxx:136 SfxType2 aAttrib struct SfxTypeAttrib [2] include/sfx2/msg.hxx:137 + SfxType3 aAttrib struct SfxTypeAttrib [3] +include/sfx2/msg.hxx:137 SfxType3 nAttribs sal_uInt16 include/sfx2/msg.hxx:137 SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:137 SfxType3 pType const std::type_info * -include/sfx2/msg.hxx:137 - SfxType3 aAttrib struct SfxTypeAttrib [3] include/sfx2/msg.hxx:138 SfxType4 aAttrib struct SfxTypeAttrib [4] include/sfx2/msg.hxx:138 @@ -235,13 +231,13 @@ include/sfx2/msg.hxx:143 include/sfx2/msg.hxx:143 SfxType10 pType const std::type_info * include/sfx2/msg.hxx:144 + SfxType11 pType const std::type_info * +include/sfx2/msg.hxx:144 SfxType11 aAttrib struct SfxTypeAttrib [11] include/sfx2/msg.hxx:144 SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:144 SfxType11 nAttribs sal_uInt16 -include/sfx2/msg.hxx:144 - SfxType11 pType const std::type_info * include/sfx2/msg.hxx:146 SfxType13 pType const std::type_info * include/sfx2/msg.hxx:146 @@ -253,18 +249,18 @@ include/sfx2/msg.hxx:146 include/sfx2/msg.hxx:147 SfxType14 pType const std::type_info * include/sfx2/msg.hxx:147 - SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> -include/sfx2/msg.hxx:147 SfxType14 aAttrib struct SfxTypeAttrib [14] include/sfx2/msg.hxx:147 + SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> +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,8 +410,6 @@ 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 @@ -478,7 +472,7 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:64 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> sd/source/ui/table/TableDesignPane.hxx:100 sd::TableDesignPane aImpl const class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1297 +sd/source/ui/view/DocumentRenderer.cxx:1317 sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef sd/source/ui/view/viewshel.cxx:1208 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock const sd::slidesorter::view::class SlideSorterView::DrawLock @@ -556,11 +550,13 @@ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:154 textconversiondlgs::ChineseDictionaryDialog m_xFT_Mapping std::unique_ptr<weld::Label> svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:157 textconversiondlgs::ChineseDictionaryDialog m_xFT_Property std::unique_ptr<weld::Label> +sw/qa/extras/layout/layout.cxx:2600 + class SvtSysLocaleOptions & sw/source/core/crsr/crbm.cxx:66 (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState sw/source/core/frmedt/fetab.cxx:78 TableWait m_pWait const std::unique_ptr<SwWait> -sw/source/core/layout/dbg_lay.cxx:170 +sw/source/core/layout/dbg_lay.cxx:171 SwImplEnterLeave nAction const enum DbgAction sw/source/ui/config/mailconfigpage.cxx:57 SwTestAccountSettingsDialog m_xEstablish std::unique_ptr<weld::Label> @@ -572,6 +568,12 @@ sw/source/ui/dbui/mmgreetingspage.hxx:114 SwMailBodyDialog m_xBodyFT std::unique_ptr<weld::Label> sw/source/ui/envelp/labfmt.hxx:75 SwLabFormatPage m_xPreview std::unique_ptr<weld::CustomWeld> +sw/source/ui/fldui/fldfunc.hxx:57 + SwFieldFuncPage m_xListItemFT std::unique_ptr<weld::Label> +sw/source/ui/fldui/fldfunc.hxx:60 + SwFieldFuncPage m_xListItemsFT std::unique_ptr<weld::Label> +sw/source/ui/fldui/fldfunc.hxx:65 + SwFieldFuncPage m_xListNameFT std::unique_ptr<weld::Label> sw/source/ui/inc/mmresultdialogs.hxx:70 SwMMResultPrintDialog m_xPrinterFT std::unique_ptr<weld::Label> sw/source/ui/inc/mmresultdialogs.hxx:100 @@ -582,6 +584,8 @@ sw/source/ui/inc/mmresultdialogs.hxx:105 SwMMResultEmailDialog m_xSendAsFT std::unique_ptr<weld::Label> sw/source/ui/misc/impfnote.hxx:44 SwEndNoteOptionPage m_xPosFT std::unique_ptr<weld::Label> +sw/source/uibase/inc/condedit.hxx:44 + ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget sw/source/uibase/inc/cption.hxx:56 SwCaptionDialog m_xPosText std::unique_ptr<weld::Label> sw/source/uibase/inc/cption.hxx:61 @@ -610,7 +614,7 @@ sw/source/uibase/inc/outline.hxx:85 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:231 +sw/source/uibase/inc/regionsw.hxx:228 SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld> sw/source/uibase/inc/splittbl.hxx:30 SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton> @@ -646,7 +650,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:796 +vcl/source/app/salvtables.cxx:818 SalInstanceContainer m_xContainer VclPtr<vcl::Window> vcl/source/gdi/jobset.cxx:36 ImplOldJobSetupData cDeviceName char [32] @@ -658,7 +662,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:2882 +vcl/unx/gtk3/gtk3gtkinst.cxx:3004 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 c7d64f814105..3386d6a19e7c 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -72,7 +72,7 @@ chart2/source/controller/dialogs/DialogModel.cxx:233 (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt (anonymous namespace)::lcl_RolesWithRangeAppend::tContainerType * chart2/source/controller/main/ElementSelector.hxx:38 chart::ListBoxEntryData nHierarchyDepth sal_Int32 -chart2/source/inc/MediaDescriptorHelper.hxx:77 +chart2/source/inc/MediaDescriptorHelper.hxx:71 apphelper::MediaDescriptorHelper ReadOnly _Bool chart2/source/view/charttypes/PieChart.hxx:128 chart::PieChart::PieLabelInfo fValue double @@ -428,24 +428,14 @@ include/vcl/vclenum.hxx:199 ItalicMatrix xy double include/vcl/vclenum.hxx:199 ItalicMatrix xx double -include/xmloff/AutoStyleEntry.hxx:25 - xmloff::AutoStyleEntry m_aParentName class rtl::OUString -include/xmloff/AutoStyleEntry.hxx:26 - xmloff::AutoStyleEntry m_aName class rtl::OUString -include/xmloff/shapeexport.hxx:161 - XMLShapeExport mxSdPropHdlFactory rtl::Reference<XMLPropertyHandlerFactory> -include/xmloff/shapeexport.hxx:168 - XMLShapeExport maCurrentInfo ImplXMLShapeExportInfoVector::iterator +include/xmloff/shapeexport.hxx:166 + XMLShapeExport maShapeInfos ImplXMLShapeExportInfoVector include/xmloff/shapeimport.hxx:180 SdXML3DSceneAttributesHelper mbVRPUsed _Bool include/xmloff/shapeimport.hxx:181 SdXML3DSceneAttributesHelper mbVPNUsed _Bool include/xmloff/shapeimport.hxx:182 SdXML3DSceneAttributesHelper mbVUPUsed _Bool -include/xmloff/xmlimp.hxx:211 - SvXMLImport msPackageProtocol class rtl::OUString -include/xmloff/xmlimp.hxx:216 - SvXMLImport mnErrorFlags enum SvXMLErrorFlags include/xmlreader/xmlreader.hxx:93 xmlreader::XmlReader::ElementData inheritedNamespaces const NamespaceList::size_type io/source/stm/odata.cxx:241 @@ -540,7 +530,7 @@ sc/source/core/data/cellvalues.cxx:23 sc::(anonymous namespace)::BlockPos mnEnd size_t sc/source/core/data/column2.cxx:3133 (anonymous namespace)::FindUsedRowsHandler miUsed UsedRowsType::const_iterator -sc/source/core/data/column4.cxx:1304 +sc/source/core/data/column4.cxx:1307 (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW sc/source/core/data/column.cxx:1381 (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType @@ -676,7 +666,7 @@ sd/source/filter/ppt/ppt97animations.hxx:50 Ppt97AnimationInfoAtom nUnknown1 sal_uInt8 sd/source/filter/ppt/ppt97animations.hxx:51 Ppt97AnimationInfoAtom nUnknown2 sal_uInt8 -sd/source/ui/inc/inspagob.hxx:32 +sd/source/ui/inc/inspagob.hxx:33 SdInsertPagesObjsDlg m_pDoc const class SdDrawDocument * sd/source/ui/inc/unopage.hxx:277 SdPageLinkTargets mxPage css::uno::Reference<css::drawing::XDrawPage> @@ -820,7 +810,7 @@ sw/inc/unoframe.hxx:313 SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel> sw/source/core/doc/tblafmt.cxx:186 SwAfVersions m_nVerticalAlignmentVersion sal_uInt16 -sw/source/core/inc/docsort.hxx:103 +sw/source/core/inc/docsort.hxx:102 SwSortTextElement nOrg const sal_uLong sw/source/core/inc/swfont.hxx:983 SvStatistics nGetTextSize sal_uInt16 @@ -834,9 +824,9 @@ sw/source/core/inc/swfont.hxx:987 SvStatistics nChangeFont sal_uInt16 sw/source/core/inc/unoflatpara.hxx:140 SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> > -sw/source/core/layout/dbg_lay.cxx:131 +sw/source/core/layout/dbg_lay.cxx:132 SwImplProtocol aVars std::vector<long> -sw/source/core/text/porfld.hxx:59 +sw/source/core/text/porfld.hxx:61 SwFieldPortion m_nAttrFieldType sal_uInt16 sw/source/filter/html/swhtml.hxx:369 SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> > @@ -847,7 +837,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/libo6/sw/source/filter/inc/rtf.hxx:27:9) + RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/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 @@ -1030,7 +1020,7 @@ 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/gtk3/gtk3gtkinst.cxx:1165 +vcl/unx/gtk3/gtk3gtkinst.cxx:1167 in char * vcl/unx/gtk/a11y/atkutil.cxx:142 DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> > @@ -1064,23 +1054,9 @@ xmlhelp/source/cxxhelp/provider/databases.hxx:282 chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable xmloff/inc/XMLElementPropertyContext.hxx:37 XMLElementPropertyContext aProp struct XMLPropertyState -xmloff/source/chart/SchXMLExport.cxx:262 - SchXMLExportHelper_Impl msTableNumberList class rtl::OUString -xmloff/source/draw/animationexport.cxx:459 - xmloff::AnimationsExporterImpl mxExport Reference<class com::sun::star::uno::XInterface> -xmloff/source/draw/animexp.cxx:229 - AnimExpImpl mxShapeExp rtl::Reference<XMLShapeExport> -xmloff/source/draw/ximpshap.hxx:77 - SdXMLShapeContext maShapeTitle class rtl::OUString -xmloff/source/draw/ximpshap.hxx:78 - SdXMLShapeContext maShapeDescription class rtl::OUString xmloff/source/draw/ximpstyl.hxx:221 SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> > -xmloff/source/forms/formattributes.hxx:279 - xmloff::OAttribute2Property::AttributeAssignment sAttributeName class rtl::OUString xmloff/source/text/txtimp.cxx:523 XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper> -xmloff/source/transform/TransformerBase.hxx:59 - XMLTransformerBase m_xLocator css::uno::Reference<css::xml::sax::XLocator> xmlsecurity/inc/certificatechooser.hxx:57 CertificateChooser mvUserData std::vector<std::shared_ptr<UserData> > diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index cec87720ca88..13e7bda71318 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -163,7 +163,6 @@ private: ShapesInfos maShapesInfos; ShapesInfos::iterator maCurrentShapesIter; bool mbExportLayer; - ImplXMLShapeExportInfoVector maShapeInfos; OUString msPresentationStylePrefix; // #88546# possibility to switch progress bar handling on/off diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 2562d125b966..58d2c2c811b5 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -547,8 +547,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap break; } - maShapeInfos.push_back( aShapeInfo ); - // check for shape collections (group shape or 3d scene) // and collect contained shapes style infos const uno::Reference< drawing::XShape >& xCollection = aShapeInfo.xCustomShapeReplacement.is() commit 9e23683b4c91c60e39839a03cfa6adc436a9afeb Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Mar 25 13:46:19 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Mar 26 07:30:07 2019 +0100 loplugin:singlevalfields Change-Id: I4a56a27ebce927b8e21cf37bb2c527caf1317bcc Reviewed-on: https://gerrit.libreoffice.org/69681 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results index 46cfc143d82e..1392169172b5 100644 --- a/compilerplugins/clang/singlevalfields.could-be-bool.results +++ b/compilerplugins/clang/singlevalfields.could-be-bool.results @@ -4,7 +4,7 @@ chart2/source/view/inc/PlottingPositionHelper.hxx:206 connectivity/source/inc/dbase/dindexnode.hxx:125 connectivity::dbase::ONDXPage bNoDelete unsigned int -cui/source/inc/cfg.hxx:249 +cui/source/inc/cfg.hxx:244 SvxConfigEntry nId sal_uInt16 desktop/source/app/main.c:29 diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results index 22b63aaa8a77..596df914cf76 100644 --- a/compilerplugins/clang/singlevalfields.results +++ b/compilerplugins/clang/singlevalfields.results @@ -112,13 +112,16 @@ connectivity/source/inc/writer/WTable.hxx:65 cui/source/inc/acccfg.hxx:120 SfxAcceleratorConfigPage m_aUpdateDataTimer UpdateDataTimer +cui/source/inc/cfg.hxx:375 + SvxConfigPage m_aUpdateDataTimer + UpdateDataTimer cui/source/inc/linkdlg.hxx:46 SvBaseLinksDlg aUpdateIdle cui SvBaseLinksDlg UpdateIdle cui/source/inc/thesdlg.hxx:38 LookUpComboBox m_aModifyIdle cui LookUpComboBox Modify -cui/source/options/optgdlg.cxx:1103 +cui/source/options/optgdlg.cxx:1086 LanguageConfig_Impl aLanguageOptions 0 cui/source/options/optjava.hxx:78 @@ -133,28 +136,31 @@ desktop/source/app/app.cxx:507 desktop/source/app/cmdlineargs.hxx:137 desktop::CommandLineArgs m_quickstart 0 -drawinglayer/source/primitive2d/sceneprimitive2d.cxx:368 +desktop/source/deployment/gui/dp_gui_updatedialog.hxx:155 + dp_gui::UpdateDialog m_bModified + 0 +drawinglayer/source/primitive2d/sceneprimitive2d.cxx:369 drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bMultithreadAllowed 1 -drawinglayer/source/primitive2d/sceneprimitive2d.cxx:472 +drawinglayer/source/primitive2d/sceneprimitive2d.cxx:473 drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bAddOutlineToCreated3DSceneRepresentation 0 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:332 drawinglayer::impBufferDevice::paint bDoSaveForVisualControl 0 -drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:925 +drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:926 drawinglayer::processor2d::VclMetafileProcessor2D::processGraphicPrimitive2D bSuppressPDFExtOutDevDataSupport 0 -drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1250 +drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1251 drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D bSuppressPDFExtOutDevDataSupport 0 -drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1998 +drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2007 drawinglayer::processor2d::VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D bForceToMetafile 0 -drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2092 +drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2101 drawinglayer::processor2d::VclMetafileProcessor2D::processTransparencePrimitive2D bForceToBigTransparentVDev 0 -drawinglayer/source/tools/converters.cxx:90 +drawinglayer/source/tools/converters.cxx:91 drawinglayer::convertToBitmapEx bDoSaveForVisualControl 0 editeng/source/editeng/impedit.hxx:474 @@ -172,7 +178,7 @@ extensions/source/propctrlr/browserline.hxx:60 extensions/source/propctrlr/browserline.hxx:61 pcr::OBrowserLine m_pAdditionalBrowseButton 0 -filter/source/msfilter/msdffimp.cxx:2622 +filter/source/msfilter/msdffimp.cxx:2635 DffPropertyReader::ApplyAttributes bCheckShadow 0 filter/source/msfilter/viscache.hxx:31 @@ -328,6 +334,9 @@ include/svx/fontwork.hxx:102 include/svx/graphctl.hxx:54 GraphCtrl aUpdateIdle svx GraphCtrl Update +include/svx/langbox.hxx:82 + SvxLanguageBoxBase m_bLangNoneIsLangAll + 0 include/svx/numvset.hxx:131 SvxBmpNumValueSet aFormatIdle SvxBmpNumValueSet FormatIdle @@ -346,10 +355,10 @@ include/svx/svdmark.hxx:145 include/svx/svdmrkv.hxx:110 SdrMarkView mnFrameHandlesLimit 50 -include/vcl/ITiledRenderable.hxx:89 +include/vcl/ITiledRenderable.hxx:40 vcl::ITiledRenderable mnTilePixelWidth 256 -include/vcl/ITiledRenderable.hxx:89 +include/vcl/ITiledRenderable.hxx:40 vcl::ITiledRenderable mnTilePixelHeight 256 include/vcl/opengl/OpenGLContext.hxx:51 @@ -541,7 +550,7 @@ sc/source/ui/inc/checklistmenu.hxx:157 sc/source/ui/inc/conflictsdlg.hxx:134 ScConflictsDlg maSelectionIdle ScConflictsDlg SelectionIdle -sc/source/ui/inc/retypepassdlg.hxx:91 +sc/source/ui/inc/retypepassdlg.hxx:86 ScRetypePassDlg mpDocItem 0 sc/source/ui/inc/viewdata.hxx:289 @@ -571,6 +580,9 @@ sd/source/ui/inc/DrawController.hxx:290 sd/source/ui/inc/pubdlg.hxx:151 SdPublishingDlg aAssistentFunc 6 +sd/source/ui/inc/sdtreelb.hxx:302 + SdPageObjsTLV m_pOwnMedium + 0 sd/source/ui/inc/View.hxx:240 sd::View maDropErrorIdle sd View DropError @@ -697,15 +709,6 @@ svx/source/dialog/contimp.hxx:52 svx/source/dialog/contimp.hxx:53 SvxSuperContourDlg aCreateIdle SvxSuperContourDlg CreateIdle -svx/source/inc/docrecovery.hxx:412 - svx::DocRecovery::RecoveryDialog m_aGreenCheckImg - svx/res/nu01.png -svx/source/inc/docrecovery.hxx:413 - svx::DocRecovery::RecoveryDialog m_aYellowCheckImg - svx/res/nu04.png -svx/source/inc/docrecovery.hxx:414 - svx::DocRecovery::RecoveryDialog m_aRedCrossImg - svx/res/nu02.png svx/source/sdr/contact/viewcontactofsdrpage.cxx:104 sdr::contact::ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence bUseOldPageShadow 0 @@ -760,10 +763,10 @@ sw/inc/view.hxx:189 sw/inc/view.hxx:190 SwView m_pVScrollbar 0 -sw/inc/view.hxx:698 +sw/inc/view.hxx:694 /media/noel/disk2/libo4/sw/source/uibase/uiview/view.cxx bDocSzUpdated 1 -sw/inc/view.hxx:698 +sw/inc/view.hxx:694 /media/noel/disk2/libo4/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated 0 sw/inc/viewopt.hxx:187 @@ -781,19 +784,19 @@ sw/source/core/docnode/threadmanager.hxx:125 sw/source/core/inc/blink.hxx:89 /media/noel/disk2/libo4/sw/source/core/text/blink.cxx pBlink 0 -sw/source/core/inc/DocumentTimerManager.hxx:77 +sw/source/core/inc/DocumentTimerManager.hxx:76 sw::DocumentTimerManager m_aFireIdleJobsTimer sw::DocumentTimerManager m_aFireIdleJobsTimer -sw/source/core/inc/fntcache.hxx:59 +sw/source/core/inc/fntcache.hxx:57 /media/noel/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pFntCache 0 -sw/source/core/inc/fntcache.hxx:60 +sw/source/core/inc/fntcache.hxx:58 /media/noel/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pLastFont 0 -sw/source/core/inc/frmtool.hxx:141 +sw/source/core/inc/frmtool.hxx:142 /media/noel/disk2/libo4/sw/source/core/layout/frmtool.cxx bDontCreateObjects 0 -sw/source/core/inc/frmtool.hxx:144 +sw/source/core/inc/frmtool.hxx:145 /media/noel/disk2/libo4/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate 0 sw/source/core/inc/noteurl.hxx:28 @@ -808,10 +811,7 @@ sw/source/core/inc/txtfly.hxx:45 sw/source/core/inc/UndoSort.hxx:38 SwSortUndoElement::(anonymous union)::(anonymous) nID 4294967295 -sw/source/core/inc/UndoTable.hxx:183 - SwUndoTableNdsChg m_nSetColType - 15 -sw/source/core/layout/flylay.cxx:304 +sw/source/core/layout/flylay.cxx:305 SwFlyFreeFrame::supportsAutoContour bOverrideHandleContourToAlwaysOff 1 sw/source/core/ole/ndole.cxx:1058 @@ -1255,9 +1255,6 @@ sw/source/filter/html/css1kywd.hxx:244 sw/source/filter/inc/rtf.hxx:30 RTFSurround::(anonymous union)::(anonymous) nJunk 0 -sw/source/filter/ww8/docxattributeoutput.hxx:915 - DocxAttributeOutput m_bBtLr - 0 sw/source/filter/ww8/ww8par3.cxx:335 WW8LST bSimpleList 1 @@ -1375,9 +1372,6 @@ sw/source/filter/ww8/ww8struc.hxx:893 sw/source/ui/envelp/labfmt.hxx:67 SwLabFormatPage aPreviewIdle SwLabFormatPage Preview -sw/source/uibase/inc/dbtree.hxx:69 - DBTreeList bShowColumns - 0 sw/source/uibase/inc/edtdd.hxx:15 /media/noel/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag 0 @@ -1426,12 +1420,15 @@ vcl/inc/salprn.hxx:44 vcl/inc/salwtype.hxx:154 SalWheelMouseEvent mbDeltaIsPixel 0 -vcl/inc/svdata.hxx:281 +vcl/inc/svdata.hxx:285 ImplSVNWFData mbMenuBarDockingAreaCommonBG 0 -vcl/inc/svdata.hxx:303 +vcl/inc/svdata.hxx:307 ImplSVNWFData mbRolloverMenubar 0 +vcl/inc/toolbox.h:150 + ImplToolBoxPrivateData mbPageScroll + 0 vcl/source/bitmap/BitmapTools.cxx:1056 vcl::bitmap::get_unpremultiply_table inited 1 @@ -1510,7 +1507,7 @@ vcl/source/window/layout.cxx:225 vcl/source/window/layout.cxx:226 VclContainer::Command bAddScreenshotButtonToMenu 1 -vcl/unx/gtk3/gtk3gtkinst.cxx:8303 +vcl/unx/gtk3/gtk3gtkinst.cxx:8741 (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone 1 vcl/unx/gtk/a11y/atkutil.cxx:746 @@ -1519,12 +1516,6 @@ vcl/unx/gtk/a11y/atkutil.cxx:746 workdir/LexTarget/l10ntools/source/xrmlex.cxx:715 /media/noel/disk2/libo4/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText 0 -writerfilter/source/dmapper/DomainMapperTableManager.hxx:65 - writerfilter::dmapper::DomainMapperTableManager m_bRowSizeTypeInserted - 0 -writerfilter/source/dmapper/DomainMapperTableManager.hxx:67 - writerfilter::dmapper::DomainMapperTableManager m_bHasBtlrCell - 0 writerfilter/source/dmapper/SettingsTable.cxx:255 writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps 3 diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index fe8517de628d..c4b3cebb3fe0 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -480,7 +480,6 @@ UpdateDialog::UpdateDialog( , m_ignoredUpdate(DpResId(RID_DLG_UPDATE_IGNORED_UPDATE)) , m_updateData(*updateData) , m_thread(new UpdateDialog::Thread(context, *this, vExtensionList)) - , m_bModified( false ) , m_xChecking(m_xBuilder->weld_label("UPDATE_CHECKING")) , m_xThrobber(m_xBuilder->weld_spinner("THROBBER")) , m_xUpdate(m_xBuilder->weld_label("UPDATE_LABEL")) @@ -533,7 +532,6 @@ UpdateDialog::UpdateDialog( UpdateDialog::~UpdateDialog() { - storeIgnoredUpdates(); } short UpdateDialog::run() { @@ -756,7 +754,6 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) } } - storeIgnoredUpdates(); createNotifyJob( bPrepareOnly, aItemList ); } @@ -858,45 +855,6 @@ void UpdateDialog::getIgnoredUpdates() } -void UpdateDialog::storeIgnoredUpdates() -{ - if ( m_bModified && ( !m_ignoredUpdates.empty() ) ) - { - uno::Reference< lang::XMultiServiceFactory > xConfig( - configuration::theDefaultProvider::get(m_context)); - beans::NamedValue aValue( "nodepath", uno::Any( IGNORED_UPDATES ) ); - uno::Sequence< uno::Any > args(1); - args[0] <<= aValue; - - uno::Reference< container::XNameContainer > xNameContainer( xConfig->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", args ), uno::UNO_QUERY_THROW ); - - for (auto const& ignoredUpdate : m_ignoredUpdates) - { - if ( xNameContainer->hasByName( ignoredUpdate->sExtensionID ) ) - { - if ( ignoredUpdate->bRemoved ) - xNameContainer->removeByName( ignoredUpdate->sExtensionID ); - else - uno::Reference< beans::XPropertySet >( xNameContainer->getByName( ignoredUpdate->sExtensionID ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( ignoredUpdate->sVersion ) ); - } - else if ( ! ignoredUpdate->bRemoved ) - { - uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( xNameContainer, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW ); - elem->setPropertyValue( PROPERTY_VERSION, uno::Any( ignoredUpdate->sVersion ) ); - xNameContainer->insertByName( ignoredUpdate->sExtensionID, uno::Any( elem ) ); - } - } - - uno::Reference< util::XChangesBatch > xChangesBatch( xNameContainer, uno::UNO_QUERY ); - if ( xChangesBatch.is() && xChangesBatch->hasPendingChanges() ) - xChangesBatch->commitChanges(); - } - - m_bModified = false; -} - - bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) { bool bIsIgnored = false; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 106abf3dafff..d5b4f841c48c 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -112,7 +112,6 @@ private: void enableOk(); void getIgnoredUpdates(); - void storeIgnoredUpdates(); void initDescription(); void clearDescription(); @@ -152,8 +151,6 @@ private: rtl::Reference< UpdateDialog::Thread > m_thread; css::uno::Reference< css::deployment::XExtensionManager > m_xExtensionManager; - bool m_bModified; - std::unique_ptr<weld::Label> m_xChecking; std::unique_ptr<weld::Spinner> m_xThrobber; std::unique_ptr<weld::Label> m_xUpdate; diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index e20c35a96adf..9c480eddc1d3 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -79,7 +79,6 @@ protected: std::unique_ptr<css::uno::Sequence< sal_Int16 >> m_pSpellUsedLang; bool m_bHasLangNone; - bool m_bLangNoneIsLangAll; bool m_bWithCheckmark; SVX_DLLPRIVATE void ImplLanguageBoxBaseInit(); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 32586303799f..cfac921eeda0 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1407,7 +1407,6 @@ SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeView) , m_pDoc(nullptr) , m_pBookmarkDoc(nullptr) , m_pMedium(nullptr) - , m_pOwnMedium(nullptr) , m_bLinkableSelected(false) , m_bShowAllPages(false) { @@ -1465,12 +1464,6 @@ SdDrawDocument* SdPageObjsTLV::GetBookmarkDoc() { if (!m_pBookmarkDoc) { - // create a new BookmarkDoc if now one exists or if a new Medium is provided - if (m_pOwnMedium != nullptr) - { - CloseBookmarkDoc(); - } - DBG_ASSERT( m_pMedium, "No SfxMedium provided!" ); if ( m_pMedium ) @@ -1585,13 +1578,9 @@ void SdPageObjsTLV::CloseBookmarkDoc() { m_xBookmarkDocShRef->DoClose(); m_xBookmarkDocShRef.clear(); - - // Medium is owned by document, so it's destroyed already - m_pOwnMedium = nullptr; } else if (m_pBookmarkDoc) { - DBG_ASSERT(!m_pOwnMedium, "SfxMedium confusion!"); if (m_pDoc) { // The document owns the Medium, so the Medium will be invalid after closing the document @@ -1599,12 +1588,6 @@ void SdPageObjsTLV::CloseBookmarkDoc() m_pMedium = nullptr; } } - else - { - // perhaps mpOwnMedium provided, but no successful creation of BookmarkDoc - delete m_pOwnMedium; - m_pOwnMedium = nullptr; - } m_pBookmarkDoc = nullptr; } diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index e08674568bd2..8d404ebf5b7c 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -299,7 +299,6 @@ private: const SdDrawDocument* m_pDoc; SdDrawDocument* m_pBookmarkDoc; SfxMedium* m_pMedium; - SfxMedium* m_pOwnMedium; bool m_bLinkableSelected; /** This flag controls whether to show all pages. */ diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index bd4d32e2ab9e..bf5e38251d89 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -133,7 +133,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window> SvxLanguageBoxBase::SvxLanguageBoxBase() : m_bHasLangNone(false) - , m_bLangNoneIsLangAll(false) , m_bWithCheckmark(false) { } @@ -144,7 +143,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED); m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL ); m_bHasLangNone = false; - m_bLangNoneIsLangAll = false; if ( m_bWithCheckmark ) { @@ -221,7 +219,6 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, ImplClear(); m_bHasLangNone = bHasLangNone; - m_bLangNoneIsLangAll = false; m_bWithCheckmark = bCheckSpellAvail; if ( SvxLanguageListFlags::EMPTY == nLangList ) @@ -326,8 +323,6 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType, } OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang ); - if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) - aStrEntry = m_aAllString; LanguageType nRealLang = nLang; if (nRealLang == LANGUAGE_SYSTEM) @@ -394,8 +389,6 @@ void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, } OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang ); - if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) - aStrEntry = m_aAllString; sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, LISTBOX_APPEND, bCheckEntry ); ImplSetEntryData( nAt, reinterpret_cast<void*>(static_cast<sal_uInt16>(nLang)) ); diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 17c5585ef490..4540cb0c109c 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -147,7 +147,6 @@ struct ImplToolBoxPrivateData mbKeyInputDisabled:1, // no KEY input if all items disabled, closing/docking will be allowed though mbIsPaintLocked:1, // don't allow paints mbMenubuttonSelected:1, // menu button is highlighted - mbPageScroll:1, // determines if we scroll a page at a time mbNativeButtons:1, // system supports native toolbar buttons mbWillUsePopupMode:1, // this toolbox will be opened in popup mode mbDropDownByKeyboard:1; // tells whether a dropdown was started by key input diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 671814e2c646..c7bc19f089c1 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2988,33 +2988,12 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) void ToolBox::ShowLine( bool bNext ) { - mbFormat = true; - if ( mpData->mbPageScroll ) - { - ImplToolItems::size_type delta = mnVisLines; - if ( bNext ) - { - mnCurLine = mnCurLine + delta; - if ( mnCurLine+mnVisLines-1 > mnCurLines ) - mnCurLine = mnCurLines - mnVisLines+1; - } - else - { - if( mnCurLine >= delta+1 ) - mnCurLine = mnCurLine - delta; - else - mnCurLine = 1; - } - } + if ( bNext ) + mnCurLine++; else - { - if ( bNext ) - mnCurLine++; - else - mnCurLine--; - } + mnCurLine--; ImplFormat(); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 2fab40a8f120..3d7b0de98ea9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -62,7 +62,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() mbAssumeFloating = false; mbKeyInputDisabled = false; mbMenubuttonSelected = false; - mbPageScroll = false; mbWillUsePopupMode = false; mbDropDownByKeyboard = false; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits