comphelper/source/misc/logging.cxx | 4 compilerplugins/clang/unusedfields.only-used-in-constructor.results | 56 +++++---- compilerplugins/clang/unusedfields.readonly.results | 34 +++-- compilerplugins/clang/unusedfields.untouched.results | 44 ++++--- compilerplugins/clang/unusedfields.writeonly.results | 60 ++++++---- include/sfx2/lokhelper.hxx | 1 include/tools/inetstrm.hxx | 2 sc/source/filter/inc/lotattr.hxx | 1 sc/source/filter/lotus/lotattr.cxx | 2 sfx2/source/view/lokhelper.cxx | 7 - sw/source/uibase/inc/mailmrge.hxx | 1 uui/source/iahndl.hxx | 9 - 12 files changed, 115 insertions(+), 106 deletions(-)
New commits: commit 6d91b6b7718704c0037cfbfdaa42ba259a0d791a Author: Noel Grandin <[email protected]> AuthorDate: Mon Jan 15 15:31:06 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jan 16 07:43:00 2024 +0100 loplugin:unusedfields Change-Id: Ic53aacfc76cb73902cf5e304153975fa02509da2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162110 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index ae150290bedd..a7785d46a747 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -38,7 +38,6 @@ namespace comphelper class EventLogger_Impl { private: - Reference< XComponentContext > m_aContext; Reference< XLogger > m_xLogger; public: @@ -70,8 +69,7 @@ namespace comphelper } EventLogger_Impl::EventLogger_Impl(const Reference< XComponentContext >& _rxContext, const OUString& rLoggerName) - : m_aContext(_rxContext) - , m_xLogger(createLogger(_rxContext, rLoggerName)) + : m_xLogger(createLogger(_rxContext, rLoggerName)) { } diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index fe92d48c4b9d..4ef9ab5fd47d 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -42,6 +42,8 @@ chart2/source/controller/inc/dlg_View3D.hxx:46 chart::View3DDialog m_aControllerLocker ControllerLockHelper chart2/source/controller/inc/RangeSelectionListener.hxx:65 chart::RangeSelectionListener m_aControllerLockGuard ControllerLockGuardUNO +chart2/source/view/charttypes/AreaChart.hxx:68 + chart::AreaChart m_aMainPosHelper PlottingPositionHelper connectivity/source/commontools/RowFunctionParser.cxx:373 connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT> connectivity/source/commontools/RowFunctionParser.cxx:374 @@ -160,9 +162,7 @@ cui/source/inc/tabstpge.hxx:86 SvxTabulatorTabPage m_aCenterWin TabWin_Impl cui/source/inc/tabstpge.hxx:87 SvxTabulatorTabPage m_aDezWin TabWin_Impl -cui/source/options/optaboutconfig.hxx:55 - CuiAboutConfigTabPage m_pParent weld::Window * -cui/source/options/optcolor.cxx:274 +cui/source/options/optcolor.cxx:282 (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor Color dbaccess/source/core/api/RowSet.hxx:108 dbaccess::ORowSet m_aURL OUString @@ -198,8 +198,8 @@ drawinglayer/source/tools/emfphelperdata.hxx:198 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32 drawinglayer/source/tools/emfphelperdata.hxx:199 emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32 -editeng/source/editeng/impedit.hxx:528 - ImpEditEngine aSelFuncSet EditSelFunctionSet +editeng/source/editeng/impedit.hxx:552 + ImpEditEngine maSelFuncSet EditSelFunctionSet embeddedobj/source/msole/olecomponent.hxx:51 OleComponent m_pInterfaceContainer comphelper::OMultiTypeInterfaceContainerHelper2 * embeddedobj/source/msole/olecomponent.hxx:53 @@ -238,8 +238,6 @@ filter/source/graphicfilter/icgm/chart.hxx:51 DataNode nBoxY2 sal_Int16 helpcompiler/inc/HelpCompiler.hxx:200 HelpCompiler lang const std::string -include/basic/basmgr.hxx:59 - BasicError nReason BasicErrorReason include/comphelper/seqstream.hxx:75 comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8> include/docmodel/theme/FormatScheme.hxx:373 @@ -266,6 +264,8 @@ include/registry/registry.hxx:34 Registry_Api acquire void (*)(RegHandle) include/sfx2/classificationhelper.hxx:134 sfx::ClassificationKeyCreator m_ePolicyType const SfxClassificationPolicyType +include/sfx2/lokhelper.hxx:258 + SfxLokLanguageGuard m_pNewShell const SfxViewShell * include/sfx2/msg.hxx:116 SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:118 @@ -390,8 +390,6 @@ include/sfx2/msg.hxx:146 SfxType23 nAttribs sal_uInt16 include/sfx2/msg.hxx:146 SfxType23 pType const std::type_info * -include/svl/itemset.hxx:346 - SfxItemSetFixed m_aItems const SfxPoolItem *[NITEMS] include/svx/ClassificationDialog.hxx:35 svx::ClassificationDialog maInternationalHelper SfxClassificationHelper include/svx/ClassificationDialog.hxx:37 @@ -578,6 +576,8 @@ sc/inc/editutil.hxx:113 ScEnginePoolHelper bDeleteEnginePool _Bool sc/inc/mtvelements.hxx:171 sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator +sc/inc/patattr.hxx:117 + ScPatternAttr m_nSerialNumber sal_uInt32 sc/inc/queryevaluator.hxx:61 ScQueryEvaluator mnEntryCount const SCSIZE sc/inc/queryevaluator.hxx:65 @@ -590,16 +590,18 @@ sc/inc/SolverSettings.hxx:168 sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString> sc/inc/token.hxx:402 SingleDoubleRefModifier aDub ScComplexRefData -sc/qa/unit/tiledrendering/tiledrendering.cxx:439 +sc/qa/unit/tiledrendering/tiledrendering.cxx:444 (anonymous namespace)::ViewCallback m_callbackWrapper TestLokCallbackWrapper -sc/source/core/data/document.cxx:1229 +sc/source/core/data/document.cxx:1234 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1230 +sc/source/core/data/document.cxx:1235 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast -sc/source/core/data/table2.cxx:812 +sc/source/core/data/table2.cxx:811 (anonymous namespace)::TransClipHandler mnEndRow size_t sc/source/filter/inc/htmlpars.hxx:627 ScHTMLQueryParser mnUnusedId ScHTMLTableId +sc/source/filter/inc/lotattr.hxx:92 + LotAttrCache pDocPool ScDocumentPool * sc/source/filter/inc/sheetdatacontext.hxx:50 oox::xls::SheetDataContext aReleaser SolarMutexReleaser sc/source/filter/inc/XclImpChangeTrack.hxx:55 @@ -666,7 +668,7 @@ scripting/source/stringresource/stringresource.cxx:1246 stringresource::(anonymous namespace)::BinaryInput m_aData Sequence<sal_Int8> sd/inc/anminfo.hxx:51 SdAnimationInfo maSecondSoundFile OUString -sd/source/filter/eppt/epptbase.hxx:347 +sd/source/filter/eppt/epptbase.hxx:348 PPTWriterBase maFraction Fraction sd/source/filter/ppt/pptin.hxx:81 SdPPTImport maParam PowerPointImportParam @@ -682,13 +684,13 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:33 sd::ZeroconfService port uint sd/source/ui/view/DocumentRenderer.cxx:1318 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef -sd/source/ui/view/viewshel.cxx:1187 +sd/source/ui/view/viewshel.cxx:1200 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock -sd/source/ui/view/viewshel.cxx:1188 +sd/source/ui/view/viewshel.cxx:1201 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock -sd/source/ui/view/viewshel.cxx:1189 +sd/source/ui/view/viewshel.cxx:1202 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock -sd/source/ui/view/viewshel.cxx:1190 +sd/source/ui/view/viewshel.cxx:1203 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context sdext/source/pdfimport/pdfparse/pdfparse.cxx:268 (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT> @@ -816,7 +818,7 @@ svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1098 (anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::classic::rule<ScannerT> svx/source/dialog/contimp.hxx:75 SvxSuperContourDlg aContourItem SvxContourDlgItem -svx/source/dialog/framelinkarray.cxx:565 +svx/source/dialog/framelinkarray.cxx:570 svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow sal_Int32 svx/source/dialog/imapwnd.hxx:88 IMapWindow maItemInfos SfxItemInfo[1] @@ -852,7 +854,7 @@ sw/source/core/layout/dbg_lay.cxx:181 SwImplEnterLeave m_nAction DbgAction sw/source/core/text/inftxt.cxx:546 (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<VirtualDevice> -sw/source/core/text/inftxt.hxx:683 +sw/source/core/text/inftxt.hxx:700 SwTextSlot aText OUString sw/source/core/text/porfld.cxx:145 (anonymous namespace)::SwFieldSlot aText OUString @@ -892,6 +894,8 @@ ucb/source/ucp/gio/gio_mount.hxx:78 OOoMountOperationClass _gtk_reserved3 void (*)(void) ucb/source/ucp/gio/gio_mount.hxx:79 OOoMountOperationClass _gtk_reserved4 void (*)(void) +uui/source/iahndl.hxx:64 + InteractionHandlerData ServiceName OUString vcl/inc/graphic/Manager.hxx:41 vcl::graphic::Manager maSwapOutTimer Timer vcl/inc/headless/BitmapHelper.hxx:32 @@ -912,6 +916,8 @@ vcl/inc/salvtables.hxx:1011 SalInstanceComboBoxWithEdit m_aTextFilter WeldTextFilter vcl/inc/sft.hxx:178 vcl::TTGlobalFontInfo_ fsSelection sal_uInt16 +vcl/inc/skia/zone.hxx:29 + SkiaZone g SolarMutexGuard vcl/inc/svimpbox.hxx:117 SvImpLBox m_aFctSet ImpLBSelEng vcl/inc/unx/genpspgraphics.h:52 @@ -960,15 +966,15 @@ vcl/unx/gtk3/gloactiongroup.cxx:27 (anonymous namespace)::GLOAction parent_instance GObject vcl/unx/gtk3/glomenu.cxx:16 GLOMenu parent_instance const GMenuModel -vcl/unx/gtk3/gtkinst.cxx:7380 +vcl/unx/gtk3/gtkinst.cxx:7381 (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox * -vcl/unx/gtk3/gtkinst.cxx:11036 +vcl/unx/gtk3/gtkinst.cxx:11037 (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox * -vcl/unx/gtk3/gtkinst.cxx:11038 +vcl/unx/gtk3/gtkinst.cxx:11039 (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton GtkMenuButton * -vcl/unx/gtk3/gtkinst.cxx:21015 +vcl/unx/gtk3/gtkinst.cxx:21038 (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay * -vcl/unx/gtk3/gtkinst.cxx:21021 +vcl/unx/gtk3/gtkinst.cxx:21044 (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer * writerfilter/source/dmapper/PropertyMap.hxx:246 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 4c17e8a4d1b3..94fc3425c6ac 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -1,3 +1,5 @@ +basctl/source/inc/BasicColorConfig.hxx:65 + basctl::BasicColorConfig aColorConfig const svtools::ColorConfig basegfx/source/polygon/b2dtrapezoid.cxx:208 basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock B2DPoint[32] basegfx/test/B2DPolyPolygonTest.cxx:66 @@ -178,7 +180,7 @@ cppu/source/uno/check.cxx:271 (anonymous namespace)::Char4 c char cppuhelper/inc/interfacecontainer4.hxx:266 cppuhelper::OInterfaceContainerHelper4::NotifySingleListener m_pMethod const NotificationMethod -cui/source/options/optcolor.cxx:293 +cui/source/options/optcolor.cxx:303 (anonymous namespace)::ColorConfigWindow_Impl aModuleOptions SvtModuleOptions dbaccess/source/core/api/RowSetBase.hxx:82 dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue @@ -230,7 +232,7 @@ dbaccess/source/ui/inc/sqledit.hxx:42 dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig dbaccess/source/ui/inc/WCopyTable.hxx:258 dbaui::OCopyTableWizard m_aLocale css::lang::Locale -editeng/source/editeng/impedit.hxx:518 +editeng/source/editeng/impedit.hxx:542 ImpEditEngine maColorConfig svtools::ColorConfig embeddedobj/source/inc/commonembobj.hxx:114 OCommonEmbeddedObject m_aClassName OUString @@ -352,10 +354,6 @@ include/sfx2/msg.hxx:107 SfxType aAttrib SfxTypeAttrib[1] include/sfx2/msg.hxx:117 SfxType0 pType const std::type_info * -include/svl/itempool.hxx:182 - SfxItemPool::Item2Range m_begin o3tl::sorted_vector<SfxPoolItem *>::const_iterator -include/svl/itempool.hxx:183 - SfxItemPool::Item2Range m_end o3tl::sorted_vector<SfxPoolItem *>::const_iterator include/svl/ondemand.hxx:55 OnDemandLocaleDataWrapper aSysLocale SvtSysLocale include/svx/diagram/IDiagramHelper.hxx:72 @@ -398,8 +396,6 @@ include/unoidl/unoidl.hxx:455 unoidl::ConstantValue::(anonymous union at /home/noel/libo-plugin/include/unoidl/unoidl.hxx:445:5) doubleValue double include/unotest/bootstrapfixturebase.hxx:52 test::BootstrapFixtureBase m_directories Directories -include/unotools/historyoptions.hxx:59 - SvtHistoryOptions::HistoryItem sPassword OUString include/vcl/bitmap.hxx:105 BitmapSystemData mnWidth int include/vcl/bitmap.hxx:106 @@ -446,7 +442,7 @@ oox/qa/token/tokenmap-test.cxx:35 oox::TokenmapTest tokenMap TokenMap oox/qa/unit/vba_compression.cxx:70 TestVbaCompression m_directories test::Directories -oox/source/drawingml/chart/objectformatter.cxx:722 +oox/source/drawingml/chart/objectformatter.cxx:723 oox::drawingml::chart::ObjectFormatterData maFromLocale Locale reportdesign/source/ui/inc/ColorListener.hxx:35 rptui::OColorListener m_aColorConfig svtools::ColorConfig @@ -488,7 +484,7 @@ sc/inc/formulagroup.hxx:38 sc::FormulaGroupEntry::(anonymous union at /home/noel/libo-plugin/sc/inc/formulagroup.hxx:35:5) mpCells ScFormulaCell ** sc/inc/reordermap.hxx:20 sc::ColRowReorderMapType maData DataType -sc/inc/scmod.hxx:98 +sc/inc/scmod.hxx:96 ScModule m_pCTLOptions std::unique_ptr<SvtCTLOptions> sc/inc/userlist.hxx:64 ScUserList maData DataType @@ -546,6 +542,14 @@ sc/source/ui/inc/inputhdl.hxx:68 ScInputHandler pFormulaDataPara std::unique_ptr<ScTypedCaseStrSet> sc/source/ui/inc/tabcont.hxx:37 ScTabControl bErrorShown _Bool +sc/source/ui/inc/undoblk.hxx:348 + ScUndoSelectionAttr aApplyPattern const CellAttributeHolder +sc/source/ui/inc/undocell.hxx:61 + ScUndoCursorAttr aOldPattern const CellAttributeHolder +sc/source/ui/inc/undocell.hxx:62 + ScUndoCursorAttr aNewPattern const CellAttributeHolder +sc/source/ui/inc/undocell.hxx:63 + ScUndoCursorAttr aApplyPattern const CellAttributeHolder sc/source/ui/vba/vbaformatconditions.hxx:38 ScVbaFormatConditions mxSheetConditionalEntries css::uno::Reference<css::sheet::XSheetConditionalEntries> sc/source/ui/vba/vbaformatconditions.hxx:39 @@ -590,7 +594,7 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:103 pdfi::GraphicsContext BlendMode sal_Int8 sdext/source/pdfimport/tree/style.hxx:44 pdfi::StyleContainer::Style Contents OUString -sfx2/source/appl/lnkbase2.cxx:81 +sfx2/source/appl/lnkbase2.cxx:82 sfx2::(anonymous namespace)::ImplDdeItem pLink SvBaseLink * sfx2/source/inc/appdata.hxx:68 SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *> @@ -660,7 +664,7 @@ sw/inc/shellio.hxx:149 SwReader mpStg tools::SvRef<SotStorage> sw/inc/swevent.hxx:71 SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat * -sw/inc/swmodule.hxx:92 +sw/inc/swmodule.hxx:90 SwModule m_pCTLOptions std::unique_ptr<SvtCTLOptions> sw/qa/api/SwXHeadFootText.cxx:76 (anonymous namespace)::SwXHeadFootText mxTextContent Reference<text::XTextContent> @@ -688,7 +692,7 @@ sw/source/core/text/inftxt.cxx:546 (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<VirtualDevice> sw/source/core/text/redlnitr.hxx:75 SwRedlineItr m_pSet std::unique_ptr<SfxItemSet> -sw/source/filter/html/htmltab.cxx:2852 +sw/source/filter/html/htmltab.cxx:2853 CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts> sw/source/filter/inc/rtf.hxx:33 RTFSurround::(unnamed union at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) nVal sal_uInt8 @@ -722,8 +726,8 @@ ucb/source/ucp/gio/gio_mount.hxx:79 OOoMountOperationClass _gtk_reserved4 void (*)(void) ucb/source/ucp/package/pkgprovider.hxx:48 package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages> -ucb/source/ucp/webdav-curl/CurlSession.cxx:132 - (anonymous namespace)::CurlOption::(anonymous union at /home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:131:5) pValue const void *const +ucb/source/ucp/webdav-curl/CurlSession.cxx:133 + (anonymous namespace)::CurlOption::(anonymous union at /home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:132:5) pValue const void *const ucbhelper/source/client/proxydecider.cxx:130 ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const InternetProxyServer ucbhelper/source/provider/propertyvalueset.cxx:79 diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 1ea96b28319a..e2e869b05b89 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -18,6 +18,8 @@ chart2/source/inc/ModifyListenerCallBack.hxx:52 chart::ModifyListenerCallBack m_xModifyListener css::uno::Reference<css::util::XModifyListener> comphelper/source/container/enumerablemap.cxx:297 comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<XInterface> +comphelper/source/misc/logging.cxx:41 + comphelper::EventLogger_Impl m_aContext Reference<XComponentContext> connectivity/source/drivers/evoab2/EApi.h:121 EContactAddress address_format char * connectivity/source/drivers/evoab2/EApi.h:125 @@ -40,14 +42,10 @@ cui/source/inc/fileextcheckdlg.hxx:29 FileExtCheckDialog m_pPerformCheck std::unique_ptr<weld::CheckButton> cui/source/inc/fileextcheckdlg.hxx:30 FileExtCheckDialog m_pOk std::unique_ptr<weld::Button> -cui/source/options/optaboutconfig.hxx:55 - CuiAboutConfigTabPage m_pParent weld::Window * cui/source/options/optinet2.hxx:108 SvxSecurityTabPage m_xCertPathImg std::unique_ptr<weld::Widget> cui/source/options/optinet2.hxx:109 SvxSecurityTabPage m_xCertPathLabel std::unique_ptr<weld::Label> -cui/source/options/optupdt.hxx:61 - SvxOnlineUpdateTabPage m_xEnableMar std::unique_ptr<weld::CheckButton> dbaccess/source/core/inc/databasecontext.hxx:82 dbaccess::ODatabaseContext m_aBasicDLL BasicDLL dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 @@ -92,8 +90,6 @@ helpcompiler/inc/HelpCompiler.hxx:200 HelpCompiler lang const std::string include/basegfx/DrawCommands.hxx:143 gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo> -include/basic/basmgr.hxx:59 - BasicError nReason BasicErrorReason include/comphelper/seqstream.hxx:75 comphelper::SequenceInputStream m_aData const css::uno::Sequence<sal_Int8> include/docmodel/theme/FormatScheme.hxx:373 @@ -238,7 +234,7 @@ include/sfx2/msg.hxx:146 SfxType23 nAttribs sal_uInt16 include/sfx2/msg.hxx:146 SfxType23 pType const std::type_info * -include/svtools/genericasyncunodialog.hxx:47 +include/svtools/genericasyncunodialog.hxx:54 svt::OGenericUnoAsyncDialog::UnoAsyncDialogEntryGuard m_aGuard ::osl::MutexGuard include/svtools/genericunodialog.hxx:154 svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard @@ -248,6 +244,8 @@ include/svx/dialog/ThemeColorEditDialog.hxx:23 svx::ThemeColorEditDialog maColorSet model::ColorSet include/svx/imapdlg.hxx:91 SvxIMapDlg aIMapItem SvxIMapDlgItem +include/tools/inetstrm.hxx:40 + INetMIMEMessageStream pMsgStrm std::unique_ptr<SvStream> include/unotest/macros_test.hxx:113 unotest::MacrosTest mpDll std::unique_ptr<BasicDLL> include/vcl/commandevent.hxx:317 @@ -268,7 +266,7 @@ include/vcl/commandevent.hxx:354 CommandGestureRotateData meEventType const GestureEventRotateType include/vcl/commandevent.hxx:355 CommandGestureRotateData mfAngleDelta const double -include/vcl/filter/PngImageReader.hxx:55 +include/vcl/filter/PngImageReader.hxx:52 vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator> include/vcl/filter/PngImageWriter.hxx:32 vcl::PngImageWriter mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator> @@ -396,11 +394,13 @@ sc/inc/editutil.hxx:113 ScEnginePoolHelper bDeleteEnginePool _Bool sc/inc/mtvelements.hxx:171 sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator +sc/inc/patattr.hxx:117 + ScPatternAttr m_nSerialNumber sal_uInt32 sc/inc/SolverSettings.hxx:168 sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString> -sc/source/core/data/document.cxx:1229 +sc/source/core/data/document.cxx:1234 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1230 +sc/source/core/data/document.cxx:1235 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast sc/source/filter/inc/sheetdatacontext.hxx:50 oox::xls::SheetDataContext aReleaser SolarMutexReleaser @@ -420,15 +420,15 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:63 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> sd/source/ui/view/DocumentRenderer.cxx:1318 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef -sd/source/ui/view/viewshel.cxx:1187 +sd/source/ui/view/viewshel.cxx:1200 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock -sd/source/ui/view/viewshel.cxx:1188 +sd/source/ui/view/viewshel.cxx:1201 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock -sd/source/ui/view/viewshel.cxx:1189 +sd/source/ui/view/viewshel.cxx:1202 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock -sd/source/ui/view/viewshel.cxx:1190 +sd/source/ui/view/viewshel.cxx:1203 sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context -sd/source/ui/view/ViewShellBase.cxx:189 +sd/source/ui/view/ViewShellBase.cxx:190 sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> sdext/source/pdfimport/pdfparse/pdfparse.cxx:269 (anonymous namespace)::PDFGrammar::definition array rule<ScannerT> @@ -484,9 +484,9 @@ svx/source/inc/datanavi.hxx:194 svxform::XFormsPage m_aDropHelper DataTreeDropTarget svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx:41 svx::sidebar::FontworkPropertyPanel m_xToolbar std::unique_ptr<ToolbarUnoDispatcher> -svx/source/svdraw/svdmodel.cxx:93 +svx/source/svdraw/svdmodel.cxx:92 SdrModelImpl mpThemeColorChanger std::shared_ptr<svx::IThemeColorChanger> -svx/source/tbxctrls/layctrl.cxx:432 +svx/source/tbxctrls/layctrl.cxx:431 (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl> sw/qa/extras/uiwriter/uiwriter5.cxx:67 SwUiWriterTest5 m_aSavedSettings AllSettings @@ -510,6 +510,8 @@ sw/source/uibase/inc/frmpage.hxx:94 SwFramePage m_xAnchorFrame std::unique_ptr<weld::Widget> sw/source/uibase/inc/insfnote.hxx:38 SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget> +sw/source/uibase/inc/mailmrge.hxx:72 + SwMailMergeDlg m_xSingleJobsCB std::unique_ptr<weld::CheckButton> sw/source/uibase/inc/num.hxx:47 SwNumPositionTabPage m_xPositionFrame std::unique_ptr<weld::Widget> sw/source/uibase/inc/pagenumberdlg.hxx:31 @@ -530,6 +532,8 @@ unoidl/source/unoidlprovider.cxx:675 unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider> unoidl/source/unoidlprovider.cxx:676 unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity> +uui/source/iahndl.hxx:64 + InteractionHandlerData ServiceName OUString uui/source/openlocked.hxx:36 vcl::OpenLockedQueryBox mxQuestionMarkImage std::unique_ptr<weld::Image> vcl/inc/jsdialog/jsdialogbuilder.hxx:728 @@ -544,6 +548,8 @@ vcl/inc/salprn.hxx:48 SalPrinterQueueInfo moPortName std::optional<OUString> vcl/inc/sft.hxx:178 vcl::TTGlobalFontInfo_ fsSelection sal_uInt16 +vcl/inc/skia/zone.hxx:29 + SkiaZone g SolarMutexGuard vcl/source/app/salvtables.cxx:246 SalFlashAttention m_aOrigBackground Wallpaper vcl/source/fontsubset/ttcr.hxx:40 @@ -554,9 +560,9 @@ vcl/source/gdi/jobset.cxx:39 (anonymous namespace)::ImplOldJobSetupData cDeviceName char[32] vcl/source/gdi/jobset.cxx:40 (anonymous namespace)::ImplOldJobSetupData cPortName char[32] -vcl/source/graphic/BinaryDataContainer.cxx:109 +vcl/source/graphic/BinaryDataContainer.cxx:111 (anonymous namespace)::ReferencedMemoryStream mpData std::shared_ptr<std::vector<sal_uInt8> > -vcl/source/graphic/BinaryDataContainer.cxx:121 +vcl/source/graphic/BinaryDataContainer.cxx:123 (anonymous namespace)::ReferencedXInputStream mpData std::shared_ptr<std::vector<sal_uInt8> > vcl/unx/generic/print/prtsetup.hxx:71 RTSPaperPage m_xContainer std::unique_ptr<weld::Widget> diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index c9f605fb862b..a2110d149d2c 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -1,9 +1,13 @@ basctl/source/basicide/moduldlg.hxx:134 basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget> -basctl/source/inc/basidesh.hxx:94 +basctl/source/inc/basidesh.hxx:98 basctl::Shell m_aNotifier DocumentEventNotifier basctl/source/inc/bastype2.hxx:182 basctl::SbTreeListBox m_aNotifier DocumentEventNotifier +basctl/source/inc/colorscheme.hxx:29 + basctl::ColorScheme m_sSchemeName OUString +basctl/source/inc/colorscheme.hxx:30 + basctl::ColorScheme m_bIsDefault _Bool basctl/source/inc/IDEComboBox.hxx:113 basctl::DocListenerBox maNotifier DocumentEventNotifier basegfx/source/polygon/b2dpolygontriangulator.cxx:113 @@ -86,7 +90,7 @@ chart2/inc/ChartModel.hxx:486 chart::ChartModel mnEnd sal_Int32 chart2/source/controller/dialogs/DialogModel.cxx:179 (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt tContainerType * -chart2/source/controller/inc/ChartController.hxx:413 +chart2/source/controller/inc/ChartController.hxx:414 chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper> chart2/source/controller/inc/dlg_ChartType_UNO.hxx:62 chart::ChartTypeUnoDlg m_xChartModel rtl::Reference< ::chart::ChartModel> @@ -96,7 +100,7 @@ chart2/source/controller/main/ElementSelector.hxx:37 chart::ListBoxEntryData nHierarchyDepth sal_Int32 chart2/source/inc/MediaDescriptorHelper.hxx:71 apphelper::MediaDescriptorHelper ReadOnly _Bool -chart2/source/view/charttypes/PieChart.hxx:129 +chart2/source/view/charttypes/PieChart.hxx:140 chart::PieChart::PieLabelInfo fValue double codemaker/source/cppumaker/dependencies.hxx:108 codemaker::cppumaker::Dependencies m_voidDependency _Bool @@ -280,11 +284,11 @@ dbaccess/source/ui/browser/dbloader.cxx:60 (anonymous namespace)::DBContentLoader m_xListener Reference<XLoadEventListener> dbaccess/source/ui/inc/RelationController.hxx:36 dbaui::ORelationController m_xWaitObject std::unique_ptr<weld::WaitObject> -desktop/qa/desktop_lib/test_desktop_lib.cxx:313 +desktop/qa/desktop_lib/test_desktop_lib.cxx:314 DesktopLOKTest m_bModified _Bool -desktop/source/app/app.cxx:1240 +desktop/source/app/app.cxx:1247 desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions std::unique_ptr<SvtCTLOptions> -desktop/source/app/app.cxx:1241 +desktop/source/app/app.cxx:1248 desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions> desktop/source/deployment/gui/dp_gui_extlistbox.hxx:138 dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl> @@ -466,7 +470,7 @@ include/sfx2/minfitem.hxx:38 SfxMacroInfoItem aCommentText OUString include/sfx2/viewsh.hxx:188 SfxViewShell m_xHelper std::shared_ptr<SfxStoringHelper> -include/svl/poolitem.hxx:144 +include/svl/poolitem.hxx:160 SfxPoolItem m_bDeleted _Bool include/svl/sigstruct.hxx:127 SignatureInformation hasInconsistentSigningTime _Bool @@ -564,7 +568,7 @@ include/svx/svdmrkv.hxx:99 SdrMarkView mpMarkingSubSelectionOverlay std::unique_ptr<MarkingSubSelectionOverlay> include/svx/tbcontrl.hxx:265 SvxCurrencyToolBoxControl::SvxCurrencyData m_onlyIsoCode _Bool -include/svx/theme/ThemeColorPaletteManager.hxx:43 +include/svx/theme/ThemeColorPaletteManager.hxx:44 svx::ThemePaletteColorData maBaseColor Color include/svx/viewpt3d.hxx:62 Viewport3D::(unnamed struct at /home/noel/libo-plugin/include/svx/viewpt3d.hxx:60:5) H double @@ -586,7 +590,7 @@ include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:46 AddonNotebookBarItem nWidth sal_uInt16 include/vcl/opengl/OpenGLContext.hxx:27 GLWindow bMultiSampleSupported _Bool -include/vcl/pdfextoutdevdata.hxx:86 +include/vcl/pdfextoutdevdata.hxx:87 vcl::PDFExtOutDevData mbSinglePageSheets _Bool include/vcl/salnativewidgets.hxx:493 PushButtonValue mbSingleLine _Bool @@ -706,13 +710,15 @@ sc/inc/fillinfo.hxx:287 ScTableInfo mDataBarInfos std::vector<std::unique_ptr<const ScDataBarInfo> > sc/inc/fillinfo.hxx:288 ScTableInfo mIconSetInfos std::vector<std::unique_ptr<const ScIconSetInfo> > +sc/inc/patattr.hxx:118 + ScPatternAttr m_bDeleted _Bool sc/inc/pivot.hxx:75 ScDPLabelData mnFlags sal_Int32 sc/inc/pivot.hxx:78 ScDPLabelData mbIsValue _Bool sc/inc/scmatrix.hxx:105 ScMatrix mbCloneIfConst _Bool -sc/inc/scmod.hxx:100 +sc/inc/scmod.hxx:98 ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler> sc/inc/tabopparams.hxx:37 ScInterpreterTableOpParams bValid _Bool @@ -722,13 +728,13 @@ sc/qa/unit/subsequent_export_test.cxx:2231 (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2228:18) mnStyle SvxBorderLineStyle sc/qa/unit/subsequent_export_test.cxx:2232 (unnamed struct at /home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2228:18) mnWidth tools::Long -sc/source/core/data/column4.cxx:1451 +sc/source/core/data/column4.cxx:1453 (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW -sc/source/core/data/column.cxx:1313 +sc/source/core/data/column.cxx:1244 (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType -sc/source/core/data/column.cxx:1314 +sc/source/core/data/column.cxx:1245 (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags ScCloneFlags -sc/source/core/data/table2.cxx:4056 +sc/source/core/data/table2.cxx:4020 (anonymous namespace)::OutlineArrayFinder mpArray ScOutlineArray * sc/source/filter/excel/xltoolbar.hxx:24 TBCCmd A _Bool @@ -748,6 +754,8 @@ sc/source/filter/inc/exp_op.hxx:47 ExportBiff5 pExcRoot RootData * sc/source/filter/inc/imp_op.hxx:83 ImportExcel::LastFormula mpCell ScFormulaCell * +sc/source/filter/inc/lotattr.hxx:92 + LotAttrCache pDocPool ScDocumentPool * sc/source/filter/inc/namebuff.hxx:37 StringHashEntry aString OUString sc/source/filter/inc/namebuff.hxx:38 @@ -1008,7 +1016,7 @@ svx/source/inc/datanavi.hxx:326 svxform::DataNavigator m_xDataWin std::unique_ptr<DataNavigatorWindow> svx/source/inc/docrecovery.hxx:132 svx::DocRecovery::TURLInfo Module OUString -svx/source/inc/StylesPreviewToolBoxControl.hxx:33 +svx/source/inc/StylesPreviewToolBoxControl.hxx:32 StylesPreviewToolBoxControl m_xWeldBox std::unique_ptr<StylesPreviewWindow_Base> svx/source/inc/StylesPreviewWindow.hxx:106 StylesPreviewWindow_Base m_pStylePoolChangeListener std::unique_ptr<StylePoolChangeListener> @@ -1098,9 +1106,9 @@ svx/source/tbxctrls/tbcontrl.cxx:338 (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList> sw/inc/accmap.hxx:95 SwAccessibleMap mvShapes SwShapeList_Impl -sw/inc/swmodule.hxx:95 +sw/inc/swmodule.hxx:93 SwModule m_pErrorHandler std::unique_ptr<SfxErrorHandler> -sw/inc/swmodule.hxx:108 +sw/inc/swmodule.hxx:106 SwModule m_xLinguServiceEventListener css::uno::Reference<css::linguistic2::XLinguServiceEventListener> sw/inc/swwait.hxx:45 SwWait mpLockedDispatchers o3tl::sorted_vector<SfxDispatcher *> @@ -1108,7 +1116,7 @@ sw/inc/textboxhelper.hxx:215 SwTextBoxNode m_bIsCloningInProgress _Bool sw/inc/unoframe.hxx:303 SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel> -sw/inc/view.hxx:198 +sw/inc/view.hxx:197 SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell> sw/inc/viewopt.hxx:46 ViewOptFlags1 bPagebreak _Bool @@ -1130,7 +1138,7 @@ sw/source/core/inc/swfont.hxx:992 SvStatistics nChangeFont sal_uInt16 sw/source/core/layout/dbg_lay.cxx:135 SwImplProtocol m_aVars std::vector<tools::Long> -sw/source/core/table/swtable.cxx:3050 +sw/source/core/table/swtable.cxx:3054 SwTableCellInfo::Impl m_HandledTableBoxes TableBoxes_t sw/source/filter/html/swhtml.hxx:390 SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> > @@ -1142,6 +1150,8 @@ sw/source/filter/inc/rtf.hxx:31 RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) nJunk sal_uInt8 sw/source/filter/inc/rtf.hxx:32 RTFSurround::(unnamed union at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) Flags struct (unnamed struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9) +sw/source/filter/writer/writer.cxx:48 + Writer_Impl aFontRemoveLst std::vector<SfxPoolItemHolder> sw/source/uibase/inc/glossary.hxx:65 SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> > sw/source/uibase/inc/glossary.hxx:81 @@ -1212,13 +1222,13 @@ vcl/inc/pdf/BitmapID.hxx:22 vcl::pdf::BitmapID m_nChecksum BitmapChecksum vcl/inc/pdf/BitmapID.hxx:23 vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum -vcl/inc/qt5/QtInstance.hxx:63 - QtInstance m_pQApplication std::unique_ptr<QApplication> vcl/inc/qt5/QtInstance.hxx:64 - QtInstance m_pFakeArgvFreeable std::vector<FreeableCStr> + QtInstance m_pQApplication std::unique_ptr<QApplication> vcl/inc/qt5/QtInstance.hxx:65 - QtInstance m_pFakeArgv std::unique_ptr<char *[]> + QtInstance m_pFakeArgvFreeable std::vector<FreeableCStr> vcl/inc/qt5/QtInstance.hxx:66 + QtInstance m_pFakeArgv std::unique_ptr<char *[]> +vcl/inc/qt5/QtInstance.hxx:67 QtInstance m_pFakeArgc std::unique_ptr<int> vcl/inc/salmenu.hxx:34 SalItemParams pMenu VclPtr<Menu> @@ -1294,7 +1304,7 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:82 AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass vcl/unx/gtk3/glomenu.cxx:16 GLOMenu parent_instance const GMenuModel -vcl/unx/gtk3/gtkinst.cxx:21026 +vcl/unx/gtk3/gtkinst.cxx:21049 (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper> vcl/unx/gtk3/hudawareness.cxx:18 (anonymous namespace)::HudAwarenessHandle connection gpointer @@ -1346,6 +1356,8 @@ xmlsecurity/inc/certificateviewer.hxx:51 CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP> xmlsecurity/inc/certificateviewer.hxx:52 CertificateViewer mxDetailsPage std::unique_ptr<CertificateViewerDetailsTP> +xmlsecurity/qa/unit/signing/signing2.cxx:48 + SigningTest2 mxSecurityContext uno::Reference<xml::crypto::XXMLSecurityContext> xmlsecurity/source/helper/pdfsignaturehelper.cxx:237 (anonymous namespace)::PageChecksum m_nPageContent BitmapChecksum xmlsecurity/source/helper/pdfsignaturehelper.cxx:238 diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 8ca9ce80da08..f87bbd70cd36 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -255,7 +255,6 @@ class SfxLokLanguageGuard { bool m_bSetLanguage; const SfxViewShell* m_pOldShell; - const SfxViewShell* m_pNewShell; public: SfxLokLanguageGuard(SfxViewShell* pNewShell); diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx index 50b0d25f4363..dfe226f8b9cb 100644 --- a/include/tools/inetstrm.hxx +++ b/include/tools/inetstrm.hxx @@ -36,8 +36,6 @@ class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) INetMIMEMessageStream char *pRead; char *pWrite; - std::unique_ptr<SvStream> - pMsgStrm; SvMemoryStream maMsgBuffer; char *pMsgRead; char *pMsgWrite; diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx index 475d46547e4a..372e7dadbf8c 100644 --- a/sc/source/filter/inc/lotattr.hxx +++ b/sc/source/filter/inc/lotattr.hxx @@ -89,7 +89,6 @@ private: const Color& GetColor( const sal_uInt8 nLotIndex ) const; - ScDocumentPool* pDocPool; std::unique_ptr<SvxColorItem> ppColorItems[6]; // 0 and 7 are missing! std::unique_ptr<SvxColorItem> pWhite; std::unique_ptr<Color[]> pColTab; diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 995e244f4c7b..933380ad7b96 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -49,8 +49,6 @@ LotAttrCache::ENTRY::~ENTRY () LotAttrCache::LotAttrCache (LotusContext& rContext) : mrContext(rContext) { - pDocPool = rContext.rDoc.GetPool(); - pColTab.reset( new Color [ 8 ] ); pColTab[ 0 ] = COL_WHITE; pColTab[ 1 ] = COL_LIGHTBLUE; diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 2106168f459e..2aa5792ebe1e 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -1108,18 +1108,17 @@ void SfxLokHelper::sendNetworkAccessError(std::string_view rAction) SfxLokLanguageGuard::SfxLokLanguageGuard(SfxViewShell* pNewShell) : m_bSetLanguage(false) , m_pOldShell(nullptr) - , m_pNewShell(pNewShell) { m_pOldShell = SfxViewShell::Current(); - if (!comphelper::LibreOfficeKit::isActive() || !m_pNewShell || m_pNewShell == m_pOldShell) + if (!comphelper::LibreOfficeKit::isActive() || !pNewShell || pNewShell == m_pOldShell) { return; } // The current view ID is not the one that belongs to this frame, update // language/locale. - comphelper::LibreOfficeKit::setLanguageTag(m_pNewShell->GetLOKLanguageTag()); - comphelper::LibreOfficeKit::setLocale(m_pNewShell->GetLOKLocale()); + comphelper::LibreOfficeKit::setLanguageTag(pNewShell->GetLOKLanguageTag()); + comphelper::LibreOfficeKit::setLocale(pNewShell->GetLOKLocale()); m_bSetLanguage = true; } diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 787561785301..5d5363222ccc 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -69,7 +69,6 @@ class SwMailMergeDlg final : public SfxDialogController std::unique_ptr<weld::RadioButton> m_xMailingRB; std::unique_ptr<weld::RadioButton> m_xFileRB; - std::unique_ptr<weld::CheckButton> m_xSingleJobsCB; std::unique_ptr<weld::CheckButton> m_xPasswordCB; std::unique_ptr<weld::Label> m_xSaveMergedDocumentFT; diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index a37f15e9a7b2..d9a31ec77723 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -57,15 +57,6 @@ namespace com::sun::star { } } -struct InteractionHandlerData -{ - /** The UNO service name to use to instantiate the content provider. - */ - OUString ServiceName; -}; - -typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; - typedef std::unordered_map< OUString, OUString > StringHashMap; class UUIInteractionHelper
