diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-31 13:28:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-31 20:21:42 +0200 |
commit | d9e6d51c7a49d612fbc0b5a44d1c2b85e1aac899 (patch) | |
tree | 9a6789a1af344bc081659762660b11ceaf00d3c9 | |
parent | 5c7ba324eb1b66b367c3f00164044a80778b8871 (diff) |
loplugin:unusedfields
Change-Id: Id2dea1d3a56d5d3be03c5a2a4f2ef530a05f9b19
Reviewed-on: https://gerrit.libreoffice.org/52185
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | compilerplugins/clang/unusedfields.readonly.results | 78 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.untouched.results | 56 | ||||
-rw-r--r-- | compilerplugins/clang/unusedfields.writeonly.results | 50 | ||||
-rw-r--r-- | include/svx/langbox.hxx | 4 | ||||
-rw-r--r-- | include/svx/xmlgrhlp.hxx | 9 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 5 | ||||
-rw-r--r-- | svx/source/dialog/langbox.cxx | 4 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 10 | ||||
-rw-r--r-- | sw/inc/ddefld.hxx | 5 | ||||
-rw-r--r-- | sw/source/core/fields/ddefld.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/xml/swxml.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/srtdlg.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/tautofmt.hxx | 1 |
16 files changed, 114 insertions, 119 deletions
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 2dd5a304dbe0..ea8c740e10a0 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -152,7 +152,7 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/inc/cuicharmap.hxx:86 SvxCharacterMap m_pFavCharView VclPtr<class SvxCharView> [16] -cui/source/options/optcolor.cxx:250 +cui/source/options/optcolor.cxx:254 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions cui/source/options/optpath.cxx:77 OptPath_Impl m_aDefOpt class SvtDefaultOptions @@ -182,31 +182,31 @@ editeng/source/editeng/impedit.hxx:449 ImpEditEngine maColorConfig svtools::ColorConfig embeddedobj/source/inc/commonembobj.hxx:104 OCommonEmbeddedObject m_aClassName class rtl::OUString -embeddedobj/source/inc/oleembobj.hxx:119 +embeddedobj/source/inc/oleembobj.hxx:121 OleEmbeddedObject m_pOleComponent class OleComponent * -embeddedobj/source/inc/oleembobj.hxx:139 +embeddedobj/source/inc/oleembobj.hxx:141 OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener> -embeddedobj/source/inc/oleembobj.hxx:161 +embeddedobj/source/inc/oleembobj.hxx:163 OleEmbeddedObject m_bHasSizeToSet _Bool -embeddedobj/source/inc/oleembobj.hxx:162 +embeddedobj/source/inc/oleembobj.hxx:164 OleEmbeddedObject m_aSizeToSet css::awt::Size -embeddedobj/source/inc/oleembobj.hxx:163 +embeddedobj/source/inc/oleembobj.hxx:165 OleEmbeddedObject m_nAspectToSet sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:168 +embeddedobj/source/inc/oleembobj.hxx:170 OleEmbeddedObject m_bGotStatus _Bool -embeddedobj/source/inc/oleembobj.hxx:169 +embeddedobj/source/inc/oleembobj.hxx:171 OleEmbeddedObject m_nStatus sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:170 +embeddedobj/source/inc/oleembobj.hxx:172 OleEmbeddedObject m_nStatusAspect sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:178 +embeddedobj/source/inc/oleembobj.hxx:180 OleEmbeddedObject m_aLinkURL class rtl::OUString -embeddedobj/source/inc/oleembobj.hxx:184 +embeddedobj/source/inc/oleembobj.hxx:186 OleEmbeddedObject m_bFromClipboard _Bool extensions/source/propctrlr/eformshelper.hxx:62 pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet extensions/source/propctrlr/eformshelper.hxx:64 pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet -filter/source/graphicfilter/eps/eps.cxx:114 +filter/source/graphicfilter/eps/eps.cxx:113 PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice> filter/source/graphicfilter/icgm/chart.hxx:44 DataNode nBoxX1 sal_Int16 @@ -286,7 +286,7 @@ include/sfx2/msg.hxx:108 SfxType aAttrib struct SfxTypeAttrib [1] include/sfx2/msg.hxx:118 SfxType0 pType const std::type_info * -include/sfx2/sidebar/ResourceManager.hxx:107 +include/sfx2/sidebar/ResourceManager.hxx:108 sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions include/svl/ondemand.hxx:59 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale @@ -336,7 +336,7 @@ include/vcl/bitmap.hxx:177 BmpFilterParam::(anonymous) mcSolarGreyThreshold sal_uInt8 include/vcl/bitmap.hxx:178 BmpFilterParam::(anonymous) mnRadius double -include/vcl/filter/pdfdocument.hxx:173 +include/vcl/filter/pdfdocument.hxx:174 vcl::filter::PDFNameElement m_nLength sal_uInt64 include/vcl/opengl/OpenGLContext.hxx:57 OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool @@ -516,13 +516,13 @@ svx/source/inc/gridcell.hxx:526 DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> sw/inc/acmplwrd.hxx:43 SwAutoCompleteWord m_LookupTree editeng::Trie -sw/inc/calc.hxx:162 +sw/inc/calc.hxx:194 SwCalc m_aSysLocale class SvtSysLocale sw/inc/hints.hxx:188 SwAttrSetChg m_bDelSet _Bool sw/inc/shellio.hxx:140 SwReader pStg tools::SvRef<SotStorage> -sw/inc/swevent.hxx:74 +sw/inc/swevent.hxx:71 SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat * sw/source/core/access/accfrmobjmap.hxx:100 SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare> @@ -536,9 +536,9 @@ sw/source/core/text/atrhndl.hxx:48 SwAttrHandler::SwAttrStack pInitialArray class SwTextAttr *[3] sw/source/filter/inc/rtf.hxx:32 RTFSurround::(anonymous) nVal sal_uInt8 -sw/source/ui/dbui/dbinsdlg.cxx:116 +sw/source/ui/dbui/dbinsdlg.cxx:115 DB_Column::(anonymous) pText class rtl::OUString * -sw/source/ui/dbui/dbinsdlg.cxx:118 +sw/source/ui/dbui/dbinsdlg.cxx:117 DB_Column::(anonymous) nFormat sal_uInt32 sw/source/uibase/dbui/mmconfigitem.cxx:106 SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString> @@ -644,39 +644,39 @@ vcl/source/fontsubset/sft.cxx:1055 vcl::_subHeader2 entryCount sal_uInt16 vcl/source/fontsubset/sft.cxx:1056 vcl::_subHeader2 idDelta sal_uInt16 -vcl/source/gdi/dibtools.cxx:49 - (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30 vcl/source/gdi/dibtools.cxx:50 - (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30 + (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30 vcl/source/gdi/dibtools.cxx:51 + (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30 +vcl/source/gdi/dibtools.cxx:52 (anonymous namespace)::CIEXYZ aXyzZ FXPT2DOT30 -vcl/source/gdi/dibtools.cxx:62 - (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ vcl/source/gdi/dibtools.cxx:63 - (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ + (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ vcl/source/gdi/dibtools.cxx:64 + (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ +vcl/source/gdi/dibtools.cxx:65 (anonymous namespace)::CIEXYZTriple aXyzBlue struct (anonymous namespace)::CIEXYZ -vcl/source/gdi/dibtools.cxx:104 - (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32 vcl/source/gdi/dibtools.cxx:105 - (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32 + (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32 vcl/source/gdi/dibtools.cxx:106 - (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32 + (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32 vcl/source/gdi/dibtools.cxx:107 + (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32 +vcl/source/gdi/dibtools.cxx:108 (anonymous namespace)::DIBV5Header nV5AlphaMask sal_uInt32 -vcl/source/gdi/dibtools.cxx:109 - (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple vcl/source/gdi/dibtools.cxx:110 - (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32 + (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple vcl/source/gdi/dibtools.cxx:111 - (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32 + (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32 vcl/source/gdi/dibtools.cxx:112 + (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32 +vcl/source/gdi/dibtools.cxx:113 (anonymous namespace)::DIBV5Header nV5GammaBlue sal_uInt32 -vcl/source/gdi/dibtools.cxx:114 - (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32 vcl/source/gdi/dibtools.cxx:115 - (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32 + (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32 vcl/source/gdi/dibtools.cxx:116 + (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32 +vcl/source/gdi/dibtools.cxx:117 (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32 vcl/source/gdi/pdfwriter_impl.hxx:302 vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream> @@ -694,11 +694,11 @@ vcl/unx/gtk/glomenu.cxx:20 GLOMenu parent_instance GMenuModel writerfilter/source/dmapper/DomainMapper_Impl.hxx:410 writerfilter::dmapper::DomainMapper_Impl m_aSaveOpt class SvtSaveOptions -writerfilter/source/ooxml/OOXMLFactory.hxx:61 - writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t writerfilter/source/ooxml/OOXMLFactory.hxx:62 - writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType + writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t writerfilter/source/ooxml/OOXMLFactory.hxx:63 + writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType +writerfilter/source/ooxml/OOXMLFactory.hxx:64 writerfilter::ooxml::AttributeInfo m_nRef Id xmloff/inc/MultiPropertySetHelper.hxx:78 MultiPropertySetHelper aEmptyAny css::uno::Any @@ -716,5 +716,5 @@ xmloff/source/chart/SchXMLChartContext.hxx:58 SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any xmloff/source/chart/SchXMLChartContext.hxx:59 SeriesDefaultsAndStyles maErrorMarginDefault css::uno::Any -xmloff/source/core/xmlexp.cxx:254 +xmloff/source/core/xmlexp.cxx:257 SvXMLExport_Impl maSaveOptions class SvtSaveOptions diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index b67782ab8b59..bd61aa8e9a08 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -46,7 +46,7 @@ cppu/source/threadpool/threadpool.cxx:355 _uno_ThreadPool dummy sal_Int32 cppu/source/typelib/typelib.cxx:62 AlignSize_Impl nInt16 sal_Int16 -cui/source/inc/insrc.hxx:33 +cui/source/inc/insrc.hxx:31 SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton> dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard @@ -70,31 +70,35 @@ include/sfx2/msg.hxx:117 SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:119 SfxType0 nAttribs sal_uInt16 -include/svtools/genericunodialog.hxx:170 +include/svtools/genericunodialog.hxx:219 svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard include/svtools/unoevent.hxx:162 SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface> include/svx/ClassificationDialog.hxx:63 svx::ClassificationDialog m_nInsertMarkings sal_Int16 -include/svx/unoshape.hxx:676 - SvxGraphicObject referer_ class rtl::OUString -include/vcl/pdfwriter.hxx:549 +include/svx/xmlgrhlp.hxx:60 + SvXMLGraphicHelper maGrfURLs SvXMLGraphicHelper::URLPairVector +include/svx/xmlgrhlp.hxx:61 + SvXMLGraphicHelper maGrfObjs SvXMLGraphicHelper::GraphicObjectVector +include/svx/xmlgrhlp.hxx:63 + SvXMLGraphicHelper maURLSet ::std::set<OUString> +include/vcl/pdfwriter.hxx:548 vcl::PDFWriter::PDFSignContext m_pDerEncoded sal_Int8 * -include/vcl/pdfwriter.hxx:551 +include/vcl/pdfwriter.hxx:550 vcl::PDFWriter::PDFSignContext m_nDerEncoded sal_Int32 -include/vcl/pdfwriter.hxx:553 +include/vcl/pdfwriter.hxx:552 vcl::PDFWriter::PDFSignContext m_pByteRange1 void * -include/vcl/pdfwriter.hxx:555 +include/vcl/pdfwriter.hxx:554 vcl::PDFWriter::PDFSignContext m_nByteRange1 sal_Int32 -include/vcl/pdfwriter.hxx:557 +include/vcl/pdfwriter.hxx:556 vcl::PDFWriter::PDFSignContext m_pByteRange2 void * -include/vcl/pdfwriter.hxx:559 +include/vcl/pdfwriter.hxx:558 vcl::PDFWriter::PDFSignContext m_nByteRange2 sal_Int32 -include/vcl/pdfwriter.hxx:560 +include/vcl/pdfwriter.hxx:559 vcl::PDFWriter::PDFSignContext m_aSignTSA class rtl::OUString -include/vcl/pdfwriter.hxx:561 +include/vcl/pdfwriter.hxx:560 vcl::PDFWriter::PDFSignContext m_aSignPassword class rtl::OUString -include/vcl/pdfwriter.hxx:563 +include/vcl/pdfwriter.hxx:562 vcl::PDFWriter::PDFSignContext m_rCMSHexBuffer class rtl::OStringBuffer & include/vcl/uitest/uiobject.hxx:262 TabPageUIObject mxTabPage VclPtr<class TabPage> @@ -156,9 +160,9 @@ sc/inc/interpretercontext.hxx:23 ScInterpreterContext mrDoc const class ScDocument & sc/qa/unit/ucalc_column.cxx:103 aInputs aName const char * -sc/source/core/data/document.cxx:1263 +sc/source/core/data/document.cxx:1262 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1264 +sc/source/core/data/document.cxx:1263 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast sc/source/core/data/formulacell.cxx:1741 (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter> @@ -166,7 +170,7 @@ sc/source/filter/inc/orcusinterface.hxx:559 ScOrcusFactory maRefResolver class ScOrcusRefResolver sc/source/filter/inc/sheetdatacontext.hxx:61 oox::xls::SheetDataContext aReleaser class SolarMutexReleaser -sc/source/ui/inc/docsh.hxx:441 +sc/source/ui/inc/docsh.hxx:445 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port uint @@ -174,7 +178,7 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:61 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> sd/source/ui/table/TableDesignPane.hxx:113 sd::TableDesignPane aImpl class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1320 +sd/source/ui/view/DocumentRenderer.cxx:1319 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef sd/source/ui/view/viewshel.cxx:1217 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock @@ -184,13 +188,13 @@ sd/source/ui/view/viewshel.cxx:1219 sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock sd/source/ui/view/viewshel.cxx:1220 sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context -sd/source/ui/view/ViewShellBase.cxx:194 +sd/source/ui/view/ViewShellBase.cxx:193 sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> sfx2/source/doc/doctempl.cxx:115 DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock -sfx2/source/view/viewfrm.cxx:162 +sfx2/source/view/viewfrm.cxx:159 (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button> -sfx2/source/view/viewfrm.cxx:163 +sfx2/source/view/viewfrm.cxx:160 (anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button> starmath/inc/smmod.hxx:69 SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData> @@ -214,17 +218,21 @@ svtools/source/svhtml/htmlkywd.cxx:560 HTML_OptionEntry::(anonymous) sToken const sal_Char * svtools/source/svhtml/htmlkywd.cxx:561 HTML_OptionEntry::(anonymous) pUToken const class rtl::OUString * +sw/inc/ddefld.hxx:42 + sw::InRangeSearchHint m_rNodes class SwNodes & sw/source/core/crsr/crbm.cxx:64 (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState sw/source/core/frmedt/fetab.cxx:77 TableWait m_pWait const std::unique_ptr<SwWait> sw/source/core/layout/dbg_lay.cxx:164 SwImplEnterLeave nAction enum DbgAction -sw/source/uibase/inc/splittbl.hxx:32 +sw/source/uibase/inc/splittbl.hxx:30 SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton> -sw/source/uibase/inc/splittbl.hxx:33 +sw/source/uibase/inc/splittbl.hxx:31 SwSplitTableDlg m_xContentCopyRB std::unique_ptr<weld::RadioButton> -sw/source/uibase/inc/tautofmt.hxx:43 +sw/source/uibase/inc/srtdlg.hxx:32 + SwSortDlg m_xTypLbl std::unique_ptr<weld::Label> +sw/source/uibase/inc/tautofmt.hxx:41 SwAutoFormatDlg m_xFormatting std::unique_ptr<weld::Container> sw/source/uibase/inc/uivwimp.hxx:95 SwView_Impl xTmpSelDocSh class SfxObjectShellLock @@ -236,7 +244,7 @@ unoidl/source/unoidlprovider.cxx:672 unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider> unoidl/source/unoidlprovider.cxx:673 unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity> -uui/source/unknownauthdlg.hxx:38 +uui/source/unknownauthdlg.hxx:36 UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton> vcl/inc/opengl/zone.hxx:46 OpenGLVCLContextZone aZone class OpenGLZone diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 21577563ae4b..9fbc90d76dfb 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -54,7 +54,7 @@ canvas/source/cairo/cairo_spritedevicehelper.hxx:77 cairocanvas::SpriteDeviceHelper mbFullScreen _Bool canvas/source/cairo/cairo_spritehelper.hxx:103 cairocanvas::SpriteHelper mbTextureDirty _Bool -canvas/source/opengl/ogl_spritedevicehelper.hxx:126 +canvas/source/opengl/ogl_spritedevicehelper.hxx:124 oglcanvas::SpriteDeviceHelper mpDevice css::rendering::XGraphicDevice * chart2/inc/ChartModel.hxx:484 chart::ChartModel mnStart sal_Int32 @@ -162,7 +162,7 @@ dbaccess/source/core/dataaccess/documentdefinition.cxx:290 dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface> desktop/qa/desktop_lib/test_desktop_lib.cxx:178 DesktopLOKTest m_bModified _Bool -desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:118 +desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:117 dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread> desktop/unx/source/splashx.c:371 input_mode long @@ -180,23 +180,23 @@ drawinglayer/source/tools/emfppen.hxx:58 emfplushelper::EMFPPen dashOffset float drawinglayer/source/tools/emfppen.hxx:60 emfplushelper::EMFPPen alignment sal_Int32 -embeddedobj/source/inc/oleembobj.hxx:127 +embeddedobj/source/inc/oleembobj.hxx:129 OleEmbeddedObject m_nTargetState sal_Int32 -embeddedobj/source/inc/oleembobj.hxx:139 +embeddedobj/source/inc/oleembobj.hxx:141 OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener> -embeddedobj/source/inc/oleembobj.hxx:161 +embeddedobj/source/inc/oleembobj.hxx:163 OleEmbeddedObject m_bHasSizeToSet _Bool -embeddedobj/source/inc/oleembobj.hxx:162 +embeddedobj/source/inc/oleembobj.hxx:164 OleEmbeddedObject m_aSizeToSet css::awt::Size -embeddedobj/source/inc/oleembobj.hxx:163 +embeddedobj/source/inc/oleembobj.hxx:165 OleEmbeddedObject m_nAspectToSet sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:168 +embeddedobj/source/inc/oleembobj.hxx:170 OleEmbeddedObject m_bGotStatus _Bool -embeddedobj/source/inc/oleembobj.hxx:169 +embeddedobj/source/inc/oleembobj.hxx:171 OleEmbeddedObject m_nStatus sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:170 +embeddedobj/source/inc/oleembobj.hxx:172 OleEmbeddedObject m_nStatusAspect sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:184 +embeddedobj/source/inc/oleembobj.hxx:186 OleEmbeddedObject m_bFromClipboard _Bool emfio/inc/mtftools.hxx:121 emfio::LOGFONTW lfOrientation sal_Int32 @@ -222,6 +222,16 @@ include/basic/basmgr.hxx:52 BasicError nReason enum BasicErrorReason include/basic/sbxvar.hxx:70 SbxValues::(anonymous) pData void * +include/canvas/base/canvascustomspritehelper.hxx:207 + canvas::CanvasCustomSpriteHelper mbAlphaDirty _Bool +include/canvas/base/canvascustomspritehelper.hxx:210 + canvas::CanvasCustomSpriteHelper mbPositionDirty _Bool +include/canvas/base/canvascustomspritehelper.hxx:216 + canvas::CanvasCustomSpriteHelper mbClipDirty _Bool +include/canvas/base/canvascustomspritehelper.hxx:219 + canvas::CanvasCustomSpriteHelper mbPrioDirty _Bool +include/canvas/base/canvascustomspritehelper.hxx:222 + canvas::CanvasCustomSpriteHelper mbVisibilityDirty _Bool include/editeng/adjustitem.hxx:39 SvxAdjustItem bLeft _Bool include/LibreOfficeKit/LibreOfficeKit.h:108 @@ -242,10 +252,14 @@ include/svx/float3d.hxx:177 Svx3DWin pControllerItem class Svx3DCtrlItem * include/svx/imapdlg.hxx:118 SvxIMapDlg aIMapItem class SvxIMapDlgItem -include/svx/srchdlg.hxx:231 - SvxSearchDialog pSearchController class SvxSearchController * +include/svx/langbox.hxx:158 + LanguageBox m_bWithCheckmark _Bool include/svx/srchdlg.hxx:232 + SvxSearchDialog pSearchController class SvxSearchController * +include/svx/srchdlg.hxx:233 SvxSearchDialog pOptionsController class SvxSearchController * +include/svx/xmlgrhlp.hxx:70 + SvXMLGraphicHelper mbDirect _Bool include/vcl/opengl/OpenGLContext.hxx:41 GLWindow bMultiSampleSupported _Bool include/vcl/salnativewidgets.hxx:415 @@ -260,8 +274,6 @@ include/xmloff/shapeimport.hxx:181 SdXML3DSceneAttributesHelper mbVPNUsed _Bool include/xmloff/shapeimport.hxx:182 SdXML3DSceneAttributesHelper mbVUPUsed _Bool -include/xmloff/xmlimp.hxx:241 - SvXMLImport mbIsGraphicLoadOnDemandSupported _Bool l10ntools/inc/common.hxx:31 common::HandledArgs m_bUTF8BOM _Bool libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:61 @@ -316,7 +328,7 @@ sc/inc/compiler.hxx:259 ScCompiler::AddInMap pEnglish const char * sc/inc/compiler.hxx:261 ScCompiler::AddInMap pUpper const char * -sc/inc/document.hxx:2512 +sc/inc/document.hxx:2513 ScMutationDisable mpDocument class ScDocument * sc/inc/pivot.hxx:74 ScDPLabelData mnFlags sal_Int32 @@ -356,7 +368,7 @@ sc/source/filter/excel/xltools.cxx:102 smD union sal_math_Double sc/source/filter/inc/exp_op.hxx:52 ExportBiff5 pExcRoot struct RootData * -sc/source/filter/inc/imp_op.hxx:88 +sc/source/filter/inc/imp_op.hxx:86 ImportExcel::LastFormula mpCell class ScFormulaCell * sc/source/filter/inc/orcusinterface.hxx:387 ScOrcusStyles::xf mnStyleXf size_t @@ -468,7 +480,7 @@ svx/source/table/tablertfimporter.cxx:53 sdr::table::RTFCellDefault maItemSet class SfxItemSet sw/inc/shellio.hxx:145 SwReader aFileName class rtl::OUString -sw/source/core/doc/tblafmt.cxx:184 +sw/source/core/doc/tblafmt.cxx:186 SwAfVersions m_nVerticalAlignmentVersion sal_uInt16 sw/source/core/inc/swfont.hxx:978 SvStatistics nGetStretchTextSize sal_uInt16 @@ -564,5 +576,5 @@ vcl/unx/gtk/hudawareness.cxx:20 (anonymous) connection GDBusConnection * vcl/unx/gtk/hudawareness.cxx:23 (anonymous) notify GDestroyNotify -writerfilter/source/dmapper/PropertyMap.hxx:186 +writerfilter/source/dmapper/PropertyMap.hxx:199 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 0e5bcd0f6234..00aaaa58a904 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -155,7 +155,6 @@ private: OUString m_aAllString; bool m_bHasLangNone; bool m_bLangNoneIsLangAll; - bool m_bWithCheckmark; SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const; SVX_DLLPRIVATE void InsertLanguage(const LanguageType nLangType); @@ -164,8 +163,7 @@ private: public: LanguageBox(weld::ComboBoxText* pControl); void SetLanguageList( SvxLanguageListFlags nLangList, - bool bHasLangNone, bool bLangNoneIsLangAll = false, - bool bCheckSpellAvail = false ); + bool bHasLangNone, bool bLangNoneIsLangAll = false ); void AddLanguages( const std::vector< LanguageType >& rLanguageTypes, SvxLanguageListFlags nLangList ); void SelectLanguage( const LanguageType eLangType ); LanguageType GetSelectedLanguage() const; diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 498b0154e774..7cea0279bab0 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -49,25 +49,18 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHel css::document::XBinaryStreamResolver> { private: - typedef ::std::pair< OUString, OUString > URLPair; - typedef ::std::vector< URLPair > URLPairVector; - typedef ::std::vector< GraphicObject > GraphicObjectVector; typedef ::std::vector< css::uno::Reference< css::io::XOutputStream > > GraphicOutputStreamVector; ::osl::Mutex maMutex; css::uno::Reference < css::embed::XStorage > mxRootStorage; OUString maCurStorageName; - URLPairVector maGrfURLs; - GraphicObjectVector maGrfObjs; GraphicOutputStreamVector maGrfStms; - ::std::set< OUString > maURLSet; std::unordered_map<OUString, css::uno::Reference<css::graphic::XGraphic>> maGraphicObjects; std::unordered_map<Graphic, std::pair<OUString, OUString>> maExportGraphics; SvXMLGraphicHelperMode meCreateMode; OUString maOutputMimeType; - bool mbDirect; SVX_DLLPRIVATE static bool ImplGetStreamNames( const OUString& rURLStr, OUString& rPictureStorageName, @@ -85,7 +78,6 @@ private: virtual ~SvXMLGraphicHelper() override; void Init( const css::uno::Reference < css::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect, const OUString& rGraphicMimeType = OUString() ); virtual void SAL_CALL disposing() override; @@ -98,7 +90,6 @@ public: static rtl::Reference<SvXMLGraphicHelper> Create( const css::uno::Reference < css::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect = true, const OUString& rGraphicMimeType = OUString() ); static rtl::Reference<SvXMLGraphicHelper> Create( SvXMLGraphicHelperMode eCreateMode, const OUString& rMimeType = OUString() ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index d24c2ba1f3bd..0734511f3f96 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -872,7 +872,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) if( xStorage.is() ) { - xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false ); + xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write ); xGrfContainer = xGraphicHelper.get(); } diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 3f8ad2f5f623..3ed608f6695a 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -566,8 +566,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) if( ERRCODE_NONE == nRet ) { xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, - SvXMLGraphicHelperMode::Read, - false ); + SvXMLGraphicHelperMode::Read ); xGraphicResolver = xGraphicHelper.get(); xObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pDoc->GetPersist(), @@ -888,7 +887,7 @@ bool SdXMLFilter::Export() xObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write ); xObjectResolver = xObjectHelper.get(); - xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false ); + xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write ); xGrfResolver = xGraphicHelper.get(); } diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 6778ccc7fab3..9ccee3b41728 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -578,13 +578,12 @@ void LanguageBox::ImplClear() } void LanguageBox::SetLanguageList( SvxLanguageListFlags nLangList, - bool bHasLangNone, bool bLangNoneIsLangAll, bool bCheckSpellAvail ) + bool bHasLangNone, bool bLangNoneIsLangAll ) { ImplClear(); m_bHasLangNone = bHasLangNone; m_bLangNoneIsLangAll = bLangNoneIsLangAll; - m_bWithCheckmark = bCheckSpellAvail; if ( SvxLanguageListFlags::EMPTY == nLangList ) return; @@ -755,7 +754,6 @@ LanguageBox::LanguageBox(weld::ComboBoxText* pControl) , m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL)) , m_bHasLangNone(false) , m_bLangNoneIsLangAll(false) - , m_bWithCheckmark(false) { m_xControl->make_sorted(); m_xControl->connect_changed(LINK(this, LanguageBox, ChangeHdl)); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 8861ce4db830..bac4ea26914d 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -374,7 +374,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode) document::XGraphicStorageHandler, document::XBinaryStreamResolver>(maMutex) { - Init( nullptr, eCreateMode, false ); + Init( nullptr, eCreateMode ); } SvXMLGraphicHelper::SvXMLGraphicHelper() @@ -382,7 +382,6 @@ SvXMLGraphicHelper::SvXMLGraphicHelper() document::XGraphicStorageHandler, document::XBinaryStreamResolver>(maMutex) , meCreateMode(SvXMLGraphicHelperMode::Read) - , mbDirect(false) { } @@ -507,22 +506,19 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect, const OUString& rGraphicMimeType ) { mxRootStorage = rXMLStorage; meCreateMode = eCreateMode; maOutputMimeType = rGraphicMimeType; - mbDirect = meCreateMode != SvXMLGraphicHelperMode::Read || bDirect; } rtl::Reference<SvXMLGraphicHelper> SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect, const OUString& rGraphicMimeType ) { rtl::Reference<SvXMLGraphicHelper> pThis = new SvXMLGraphicHelper; - pThis->Init( rXMLStorage, eCreateMode, bDirect, rGraphicMimeType ); + pThis->Init( rXMLStorage, eCreateMode, rGraphicMimeType ); return pThis; } @@ -532,7 +528,7 @@ rtl::Reference<SvXMLGraphicHelper> SvXMLGraphicHelper::Create( SvXMLGraphicHelpe { rtl::Reference<SvXMLGraphicHelper> pThis = new SvXMLGraphicHelper; - pThis->Init( nullptr, eCreateMode, false, rGraphicMimeType ); + pThis->Init( nullptr, eCreateMode, rGraphicMimeType ); return pThis; } diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 547cf9810a1d..0bd96a8cbccb 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -39,12 +39,11 @@ namespace sw }; struct InRangeSearchHint final : public SfxHint { - SwNodes& m_rNodes; const sal_uLong m_nSttNd, m_nEndNd; const sal_Int32 m_nStt, m_nEnd; bool& m_rIsInRange; - InRangeSearchHint(SwNodes& rNodes, const sal_uLong nSttNd, const sal_uLong nEndNd, const sal_Int32 nStt, const sal_Int32 nEnd, bool& rIsInRange) - : m_rNodes(rNodes), m_nSttNd(nSttNd), m_nEndNd(nEndNd), m_nStt(nStt), m_nEnd(nEnd), m_rIsInRange(rIsInRange) {} + InRangeSearchHint(const sal_uLong nSttNd, const sal_uLong nEndNd, const sal_Int32 nStt, const sal_Int32 nEnd, bool& rIsInRange) + : m_nSttNd(nSttNd), m_nEndNd(nEndNd), m_nStt(nStt), m_nEnd(nEnd), m_rIsInRange(rIsInRange) {} }; } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index f25b012953d5..0c2bfbbb342c 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -183,7 +183,6 @@ bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, { bool bInRange = false; rFieldType.CallSwClientNotify(sw::InRangeSearchHint( - rFieldType.GetDoc()->GetNodes(), nSttNd, nEndNd, nStt, nEnd, bInRange)); return bInRange; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index cb5b122f5373..d64f3c2ccd18 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -496,8 +496,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con return ERR_SWG_READ_ERROR; xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, - SvXMLGraphicHelperMode::Read, - false ); + SvXMLGraphicHelperMode::Read ); xGraphicResolver = xGraphicHelper.get(); SfxObjectShell *pPersist = rDoc.GetPersist(); if( pPersist ) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 269b2cc22e6f..436e5392d81d 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -88,8 +88,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS OSL_ENSURE( xStg.is(), "Where is my storage?" ); xGraphicHelper = SvXMLGraphicHelper::Create( xStg, - SvXMLGraphicHelperMode::Write, - false ); + SvXMLGraphicHelperMode::Write ); xGraphicResolver = xGraphicHelper.get(); SfxObjectShell *pPersist = pDoc->GetPersist(); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index cfade1d4a9a2..8424d9310dc1 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -101,7 +101,6 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) : weld::GenericDialogController(pParent, "modules/swriter/ui/sortdialog.ui", "SortDialog") , m_pParent(pParent) , m_xColLbl(m_xBuilder->weld_label("column")) - , m_xTypLbl(m_xBuilder->weld_label("keytype")) , m_xKeyCB1(m_xBuilder->weld_check_button("key1")) , m_xColEdt1(m_xBuilder->weld_spin_button("colsb1")) , m_xTypDLB1(m_xBuilder->weld_combo_box_text("typelb1")) diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 6fd8932da096..ed7b877ee226 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -29,7 +29,6 @@ class SwSortDlg : public weld::GenericDialogController { weld::Window* m_pParent; std::unique_ptr<weld::Label> m_xColLbl; - std::unique_ptr<weld::Label> m_xTypLbl; std::unique_ptr<weld::CheckButton> m_xKeyCB1; std::unique_ptr<weld::SpinButton> m_xColEdt1; diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index b403565236b0..137d08d0c1dc 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -38,7 +38,6 @@ enum AutoFormatLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SwAutoFormatDlg : public weld::GenericDialogController { std::unique_ptr<weld::TreeView> m_xLbFormat; - std::unique_ptr<weld::Container> m_xFormatting; std::unique_ptr<weld::CheckButton> m_xBtnNumFormat; std::unique_ptr<weld::CheckButton> m_xBtnBorder; std::unique_ptr<weld::CheckButton> m_xBtnFont; |