compilerplugins/clang/unusedfields.cxx | 21 +++-- compilerplugins/clang/unusedfields.readonly.results | 56 ++++++++------- compilerplugins/clang/unusedfields.untouched.results | 52 ++++++++------ compilerplugins/clang/unusedfields.writeonly.results | 70 +++++++++---------- vcl/inc/svdata.hxx | 1 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 7 files changed, 110 insertions(+), 94 deletions(-)
New commits: commit 4887f9fe2d5bdbf8d760d88a984439efbdf37d5a Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Wed Nov 8 14:56:41 2017 +0200 loplugin:unusedfields Change-Id: Ie8a2c6462ddc708140e725847199c8234ab6b592 Reviewed-on: https://gerrit.libreoffice.org/44528 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index 22d13f37eddc..7f11d2fb84ab 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -159,11 +159,11 @@ private: CalleeWrapper calleeFunctionDecl); llvm::Optional<CalleeWrapper> getCallee(CallExpr const *); - RecordDecl * insideMoveOrCopyDeclParent; - RecordDecl * insideStreamOutputOperator; + RecordDecl * insideMoveOrCopyDeclParent = nullptr; + RecordDecl * insideStreamOutputOperator = nullptr; // For reasons I do not understand, parentFunctionDecl() is not reliable, so // we store the parent function on the way down the AST. - FunctionDecl * insideFunctionDecl; + FunctionDecl * insideFunctionDecl = nullptr; }; void UnusedFields::run() @@ -361,18 +361,21 @@ bool startswith(const std::string& rStr, const char* pSubStr) bool UnusedFields::TraverseCXXConstructorDecl(CXXConstructorDecl* cxxConstructorDecl) { + auto copy = insideMoveOrCopyDeclParent; if (!ignoreLocation(cxxConstructorDecl) && cxxConstructorDecl->isThisDeclarationADefinition()) { if (cxxConstructorDecl->isCopyOrMoveConstructor()) insideMoveOrCopyDeclParent = cxxConstructorDecl->getParent(); } bool ret = RecursiveASTVisitor::TraverseCXXConstructorDecl(cxxConstructorDecl); - insideMoveOrCopyDeclParent = nullptr; + insideMoveOrCopyDeclParent = copy; return ret; } bool UnusedFields::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl) { + auto copy1 = insideMoveOrCopyDeclParent; + auto copy2 = insideFunctionDecl; if (!ignoreLocation(cxxMethodDecl) && cxxMethodDecl->isThisDeclarationADefinition()) { if (cxxMethodDecl->isCopyAssignmentOperator() || cxxMethodDecl->isMoveAssignmentOperator()) @@ -380,13 +383,15 @@ bool UnusedFields::TraverseCXXMethodDecl(CXXMethodDecl* cxxMethodDecl) } insideFunctionDecl = cxxMethodDecl; bool ret = RecursiveASTVisitor::TraverseCXXMethodDecl(cxxMethodDecl); - insideMoveOrCopyDeclParent = nullptr; - insideFunctionDecl = nullptr; + insideMoveOrCopyDeclParent = copy1; + insideFunctionDecl = copy2; return ret; } bool UnusedFields::TraverseFunctionDecl(FunctionDecl* functionDecl) { + auto copy1 = insideStreamOutputOperator; + auto copy2 = insideFunctionDecl; if (functionDecl->getLocation().isValid() && !ignoreLocation(functionDecl) && functionDecl->isThisDeclarationADefinition()) { if (functionDecl->getOverloadedOperator() == OO_LessLess @@ -398,8 +403,8 @@ bool UnusedFields::TraverseFunctionDecl(FunctionDecl* functionDecl) } insideFunctionDecl = functionDecl; bool ret = RecursiveASTVisitor::TraverseFunctionDecl(functionDecl); - insideStreamOutputOperator = nullptr; - insideFunctionDecl = nullptr; + insideStreamOutputOperator = copy1; + insideFunctionDecl = copy2; return ret; } diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index f819f56a312b..de6aa98570ca 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -64,6 +64,10 @@ connectivity/source/drivers/evoab2/EApi.h:130 (anonymous) code char * connectivity/source/drivers/evoab2/EApi.h:131 (anonymous) country char * +connectivity/source/drivers/firebird/Driver.hxx:52 + connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory ::utl::TempFile +connectivity/source/drivers/firebird/Driver.hxx:53 + connectivity::firebird::FirebirdDriver m_firebirdLockDirectory ::utl::TempFile connectivity/source/inc/dbase/DIndexIter.hxx:36 connectivity::dbase::OIndexIterator m_pOperator file::OBoolOperator * connectivity/source/inc/dbase/DIndexIter.hxx:37 @@ -207,11 +211,11 @@ filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:143 framework/inc/dispatch/dispatchprovider.hxx:81 framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache i18npool/inc/textconversion.hxx:80 - com::sun::star::i18n::(anonymous) code sal_Unicode + i18npool::(anonymous) code sal_Unicode i18npool/inc/textconversion.hxx:81 - com::sun::star::i18n::(anonymous) address sal_Int16 + i18npool::(anonymous) address sal_Int16 i18npool/inc/textconversion.hxx:82 - com::sun::star::i18n::(anonymous) count sal_Int16 + i18npool::(anonymous) count sal_Int16 include/basic/codecompletecache.hxx:49 CodeCompleteOptions aMiscOptions class SvtMiscOptions include/basic/sbstar.hxx:56 @@ -222,7 +226,7 @@ include/connectivity/DriversConfig.hxx:76 connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode include/connectivity/sdbcx/VDescriptor.hxx:56 connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual -include/editeng/brushitem.hxx:52 +include/editeng/brushitem.hxx:53 SvxBrushItem maSecOptions class SvtSecurityOptions include/editeng/charsetcoloritem.hxx:35 SvxCharSetColorItem eFrom rtl_TextEncoding @@ -246,7 +250,7 @@ include/registry/refltype.hxx:68 RTUik m_Data4 sal_uInt32 include/registry/refltype.hxx:69 RTUik m_Data5 sal_uInt32 -include/sfx2/charmapcontrol.hxx:43 +include/sfx2/charmapcontrol.hxx:44 SfxCharmapCtrl m_pFavCharView VclPtr<class SvxCharView> [16] include/sfx2/msg.hxx:95 SfxTypeAttrib nAID sal_uInt16 @@ -262,15 +266,15 @@ 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:103 +include/sfx2/sidebar/ResourceManager.hxx:107 sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions include/svl/ondemand.hxx:59 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale include/svtools/editsyntaxhighlighter.hxx:33 MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig -include/svx/svdmark.hxx:142 +include/svx/svdmark.hxx:140 SdrMarkList maPointName class rtl::OUString -include/svx/svdmark.hxx:143 +include/svx/svdmark.hxx:141 SdrMarkList maGluePointName class rtl::OUString include/test/sheet/xdatapilottable.hxx:31 apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell> @@ -278,8 +282,10 @@ include/test/sheet/xdatapilottable.hxx:32 apitest::XDataPilotTable xCellForCheck css::uno::Reference<css::table::XCell> include/test/sheet/xnamedranges.hxx:38 apitest::XNamedRanges xSheet css::uno::Reference<css::sheet::XSpreadsheet> +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 /home/noel/libo3/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -300,11 +306,11 @@ include/unoidl/unoidl.hxx:452 unoidl::ConstantValue::(anonymous) floatValue float include/unoidl/unoidl.hxx:453 unoidl::ConstantValue::(anonymous) doubleValue double -include/vcl/bitmap.hxx:175 - BmpFilterParam::(anonymous) mnSepiaPercent sal_uInt16 include/vcl/bitmap.hxx:176 - BmpFilterParam::(anonymous) mcSolarGreyThreshold sal_uInt8 + BmpFilterParam::(anonymous) mnSepiaPercent sal_uInt16 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 vcl::filter::PDFNameElement m_nLength sal_uInt64 @@ -312,6 +318,8 @@ include/vcl/opengl/OpenGLContext.hxx:57 OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool include/xmloff/nmspmap.hxx:70 SvXMLNamespaceMap sEmpty const class rtl::OUString +libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:46 + GtvLokDialogPrivate m_nChildKeyModifier guint32 libreofficekit/source/gtk/lokdocview.cxx:84 LOKDocViewPrivateImpl m_bIsLoading gboolean lingucomponent/source/languageguessing/simpleguesser.cxx:76 @@ -360,11 +368,11 @@ sc/inc/attrib.hxx:175 ScRangeItem aRange class ScRange sc/inc/attrib.hxx:214 ScTableListItem nCount sal_uInt16 -sc/inc/compiler.hxx:127 +sc/inc/compiler.hxx:126 ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item -sc/inc/compiler.hxx:128 - ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo3/sc/inc/compiler.hxx:125:9) -sc/inc/compiler.hxx:133 +sc/inc/compiler.hxx:127 + ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:124:9) +sc/inc/compiler.hxx:132 ScRawToken::(anonymous) pMat class ScMatrix * sc/inc/formulagroup.hxx:42 sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell ** @@ -432,9 +440,9 @@ starmath/source/view.cxx:856 SmViewShell_Impl aOpts class SvtMiscOptions store/source/storbios.cxx:59 OStoreSuperBlock m_aMarked OStoreSuperBlock::L -svl/source/crypto/cryptosign.cxx:279 +svl/source/crypto/cryptosign.cxx:280 (anonymous namespace)::(anonymous) status SECItem -svl/source/crypto/cryptosign.cxx:300 +svl/source/crypto/cryptosign.cxx:301 (anonymous namespace)::(anonymous) timeStampToken SECItem svl/source/misc/strmadpt.cxx:55 SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1] @@ -474,9 +482,9 @@ svx/source/inc/datanavi.hxx:551 svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString svx/source/inc/datanavi.hxx:552 svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString -svx/source/inc/gridcell.hxx:528 +svx/source/inc/gridcell.hxx:525 DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> -svx/source/inc/gridcell.hxx:529 +svx/source/inc/gridcell.hxx:526 DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> sw/inc/acmplwrd.hxx:43 SwAutoCompleteWord m_LookupTree editeng::Trie @@ -490,9 +498,9 @@ sw/inc/swevent.hxx:73 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> -sw/source/core/doc/swstylemanager.cxx:59 +sw/source/core/doc/swstylemanager.cxx:58 SwStyleManager aAutoCharPool class StylePool -sw/source/core/doc/swstylemanager.cxx:60 +sw/source/core/doc/swstylemanager.cxx:59 SwStyleManager aAutoParaPool class StylePool sw/source/core/doc/tblrwcl.cxx:83 CpyTabFrame::(anonymous) nSize SwTwips @@ -634,7 +642,7 @@ vcl/source/gdi/dibtools.cxx:114 (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32 vcl/source/gdi/dibtools.cxx:115 (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32 -vcl/source/window/menuitemlist.hxx:53 +vcl/source/window/menuitemlist.hxx:54 MenuItemData aAccessibleName class rtl::OUString vcl/unx/generic/print/bitmap_gfx.cxx:67 psp::HexEncoder mpFileBuffer sal_Char [16400] @@ -654,7 +662,7 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:63 writerfilter::ooxml::AttributeInfo m_nRef Id xmloff/inc/MultiPropertySetHelper.hxx:78 MultiPropertySetHelper aEmptyAny css::uno::Any -xmloff/source/chart/SchXMLChartContext.cxx:449 +xmloff/source/chart/SchXMLChartContext.cxx:447 (anonymous namespace)::NewDonutSeries msStyleName class rtl::OUString xmloff/source/chart/SchXMLChartContext.hxx:53 SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 98135dbf8b09..894a4521605a 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -24,14 +24,6 @@ connectivity/source/drivers/evoab2/EApi.h:126 (anonymous) ext char * connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29 connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper> -connectivity/source/inc/OTypeInfo.hxx:31 - connectivity::OTypeInfo aTypeName class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:32 - connectivity::OTypeInfo aLocalTypeName class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:34 - connectivity::OTypeInfo nPrecision sal_Int32 -connectivity/source/inc/OTypeInfo.hxx:36 - connectivity::OTypeInfo nMaximumScale sal_Int16 cppu/source/threadpool/threadpool.cxx:377 _uno_ThreadPool dummy sal_Int32 cppu/source/typelib/typelib.cxx:61 @@ -40,7 +32,7 @@ dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard emfio/source/emfuno/xemfparser.cxx:59 emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext> -extensions/source/scanner/scanner.hxx:46 +extensions/source/scanner/scanner.hxx:44 ScannerManager maProtector osl::Mutex include/comphelper/MasterPropertySet.hxx:38 comphelper::SlaveData mxSlave css::uno::Reference<css::beans::XPropertySet> @@ -84,6 +76,8 @@ include/vcl/uitest/uiobject.hxx:241 TabPageUIObject mxTabPage VclPtr<class TabPage> include/xmloff/formlayerexport.hxx:173 xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport> +libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:34 + GtvApplicationWindowPrivate lokDialog GtkWidget * libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:50 GtvApplicationWindow parent_instance GtkApplicationWindow libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:54 @@ -102,6 +96,10 @@ libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.hxx:26 GtvCommentsSidebar parent GtkBox libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.hxx:35 GtvCommentsSidebarClass parentClass GtkBoxClass +libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:28 + GtvLokDialog parent GtkDialog +libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx:33 + GtvLokDialogClass parentClass GtkDialogClass libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:28 GtvMainToolbar parent GtkBox libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx:36 @@ -110,9 +108,9 @@ lotuswordpro/source/filter/clone.hxx:23 detail::has_clone::(anonymous) a char [2] opencl/source/openclwrapper.cxx:306 openclwrapper::(anonymous namespace)::OpenCLEnv mpOclCmdQueue cl_command_queue [1] -pyuno/source/module/pyuno_impl.hxx:226 +pyuno/source/module/pyuno_impl.hxx:224 pyuno::(anonymous) ob_base PyObject -pyuno/source/module/pyuno_impl.hxx:326 +pyuno/source/module/pyuno_impl.hxx:324 pyuno::stRuntimeImpl ob_base PyObject reportdesign/source/ui/inc/ReportWindow.hxx:54 rptui::OReportWindow m_pObjFac ::std::unique_ptr<DlgEdFactory> @@ -134,9 +132,7 @@ sc/qa/unit/ucalc_column.cxx:103 aInputs aName const char * sc/source/filter/inc/sheetdatacontext.hxx:61 oox::xls::SheetDataContext aReleaser class SolarMutexReleaser -sc/source/ui/inc/dataproviderdlg.hxx:50 - sc::DataProviderDlg mpDataSource std::shared_ptr<ExternalDataSource> -sc/source/ui/inc/docsh.hxx:438 +sc/source/ui/inc/docsh.hxx:439 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port uint @@ -154,24 +150,30 @@ sd/source/ui/view/viewshel.cxx:1260 sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context sd/source/ui/view/ViewShellBase.cxx:194 sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> -sfx2/source/doc/doctempl.cxx:116 +sfx2/source/doc/doctempl.cxx:115 DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock +sfx2/source/inc/shellimpl.hxx:33 + SfxObjectShellArr_Impl maData SfxObjectShellArr_Impl::DataType +sfx2/source/inc/shellimpl.hxx:54 + SfxViewFrameArr_Impl maData SfxViewFrameArr_Impl::DataType +sfx2/source/inc/shellimpl.hxx:75 + SfxViewShellArr_Impl maData SfxViewShellArr_Impl::DataType starmath/inc/smmod.hxx:69 SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData> -starmath/inc/view.hxx:224 +starmath/inc/view.hxx:218 SmViewShell maGraphicController class SmGraphicController -svl/source/crypto/cryptosign.cxx:120 - (anonymous namespace)::(anonymous) extnID SECItem svl/source/crypto/cryptosign.cxx:121 - (anonymous namespace)::(anonymous) critical SECItem + (anonymous namespace)::(anonymous) extnID SECItem svl/source/crypto/cryptosign.cxx:122 + (anonymous namespace)::(anonymous) critical SECItem +svl/source/crypto/cryptosign.cxx:123 (anonymous namespace)::(anonymous) extnValue SECItem -svl/source/crypto/cryptosign.cxx:280 - (anonymous namespace)::(anonymous) statusString SECItem svl/source/crypto/cryptosign.cxx:281 + (anonymous namespace)::(anonymous) statusString SECItem +svl/source/crypto/cryptosign.cxx:282 (anonymous namespace)::(anonymous) failInfo SECItem svtools/source/svhtml/htmlkywd.cxx:558 - HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo3/svtools/source/svhtml/htmlkywd.cxx:558:5) + HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5) svtools/source/svhtml/htmlkywd.cxx:560 HTML_OptionEntry::(anonymous) sToken const sal_Char * svtools/source/svhtml/htmlkywd.cxx:561 @@ -194,6 +196,8 @@ unoidl/source/unoidlprovider.cxx:673 unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity> vcl/inc/opengl/zone.hxx:46 OpenGLVCLContextZone aZone class OpenGLZone +vcl/inc/svdata.hxx:149 + ImplSVAppData mbShutdownDelayed _Bool vcl/inc/unx/cpdmgr.hxx:60 psp::CPDPrinterOption name class rtl::OUString vcl/inc/unx/cpdmgr.hxx:61 @@ -210,3 +214,7 @@ vcl/source/uitest/uno/uitest_uno.cxx:35 UITestUnoObj mpUITest std::unique_ptr<UITest> vcl/unx/gtk/a11y/atkhypertext.cxx:29 (anonymous) atk_hyper_link AtkHyperlink +writerfilter/source/rtftok/rtfdocumentimpl.hxx:663 + writerfilter::rtftok::RTFDocumentImpl m_hasLHeader _Bool +writerfilter/source/rtftok/rtfdocumentimpl.hxx:666 + writerfilter::rtftok::RTFDocumentImpl m_hasLFooter _Bool diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 44ff2d1d7a85..942a5357c753 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -100,6 +100,10 @@ connectivity/source/inc/dbase/DTable.hxx:62 connectivity::dbase::ODbaseTable::DBFHeader dateElems sal_uInt8 [3] connectivity/source/inc/dbase/DTable.hxx:86 connectivity::dbase::ODbaseTable::DBFColumn db_adr sal_uInt32 +connectivity/source/inc/OTypeInfo.hxx:34 + connectivity::OTypeInfo nPrecision sal_Int32 +connectivity/source/inc/OTypeInfo.hxx:36 + connectivity::OTypeInfo nMaximumScale sal_Int16 cppcanvas/source/mtfrenderer/emfpbrush.hxx:102 cppcanvas::internal::EMFPBrush wrapMode sal_Int32 cppcanvas/source/mtfrenderer/emfppen.hxx:42 @@ -166,7 +170,7 @@ cui/source/inc/cuihyperdlg.hxx:76 SvxHpLinkDlg maCtrl class SvxHlinkCtrl 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:175 +desktop/qa/desktop_lib/test_desktop_lib.cxx:176 DesktopLOKTest m_bModified _Bool desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:119 dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread> @@ -216,15 +220,15 @@ emfio/inc/mtftools.hxx:128 emfio::LOGFONTW lfClipPrecision sal_uInt8 emfio/inc/mtftools.hxx:129 emfio::LOGFONTW lfQuality sal_uInt8 -emfio/source/reader/emfreader.cxx:323 +emfio/source/reader/emfreader.cxx:310 (anonymous namespace)::BLENDFUNCTION aBlendOperation unsigned char -emfio/source/reader/emfreader.cxx:324 +emfio/source/reader/emfreader.cxx:311 (anonymous namespace)::BLENDFUNCTION aBlendFlags unsigned char -extensions/source/scanner/scanner.hxx:47 +extensions/source/scanner/scanner.hxx:45 ScannerManager mpData void * -framework/inc/services/layoutmanager.hxx:262 +framework/inc/services/layoutmanager.hxx:258 framework::LayoutManager m_bGlobalSettings _Bool -framework/inc/services/layoutmanager.hxx:276 +framework/inc/services/layoutmanager.hxx:272 framework::LayoutManager m_pGlobalSettings class framework::GlobalSettings * framework/source/layoutmanager/toolbarlayoutmanager.hxx:281 framework::ToolbarLayoutManager m_pGlobalSettings class framework::GlobalSettings * @@ -254,8 +258,6 @@ include/opencl/platforminfo.hxx:31 OpenCLDeviceInfo mnFrequency size_t include/svx/bmpmask.hxx:129 SvxBmpMask aSelItem class SvxBmpMaskSelectItem -include/svx/ClassificationField.hxx:60 - svx::ClassificationResult mnParagraph sal_Int32 include/svx/float3d.hxx:177 Svx3DWin pControllerItem class Svx3DCtrlItem * include/svx/imapdlg.hxx:118 @@ -264,8 +266,6 @@ include/svx/srchdlg.hxx:231 SvxSearchDialog pSearchController class SvxSearchController * include/svx/srchdlg.hxx:232 SvxSearchDialog pOptionsController class SvxSearchController * -include/vcl/menu.hxx:454 - MenuBar::MenuBarButtonCallbackArg bHighlight _Bool include/vcl/salnativewidgets.hxx:415 ToolbarValue mbIsTopDockingArea _Bool include/vcl/salnativewidgets.hxx:463 @@ -284,14 +284,12 @@ l10ntools/inc/common.hxx:31 common::HandledArgs m_bUTF8BOM _Bool libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:61 GtvApplicationWindow statusbar GtkWidget * -libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:36 +libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:37 GtvMainToolbarPrivateImpl m_pPartModeSelector GtkWidget * lingucomponent/source/languageguessing/simpleguesser.cxx:79 textcat_t maxsize uint4 lingucomponent/source/languageguessing/simpleguesser.cxx:81 textcat_t output char [1024] -package/source/zipapi/MemoryByteGrabber.hxx:29 - MemoryByteGrabber maBuffer const css::uno::Sequence<sal_Int8> registry/source/reflread.cxx:509 ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32 registry/source/reflread.cxx:510 @@ -312,7 +310,7 @@ sal/rtl/alloc_cache.hxx:36 rtl_cache_stat_type m_mem_alloc sal_Size sal/rtl/alloc_cache.hxx:151 rtl_cache_st m_cpu_stats struct rtl_cache_stat_type -sal/rtl/math.cxx:948 +sal/rtl/math.cxx:996 md union sal_math_Double sal/textenc/tcvtutf7.cxx:96 ImplUTF7ToUCContextData mbShifted _Bool @@ -330,11 +328,11 @@ sal/textenc/tcvtutf7.cxx:396 ImplUTF7FromUCContextData mnBitBuffer sal_uInt32 sal/textenc/tcvtutf7.cxx:397 ImplUTF7FromUCContextData mnBufferBits sal_uInt32 -sc/inc/compiler.hxx:259 +sc/inc/compiler.hxx:258 ScCompiler::AddInMap pODFF const char * -sc/inc/compiler.hxx:260 +sc/inc/compiler.hxx:259 ScCompiler::AddInMap pEnglish const char * -sc/inc/compiler.hxx:262 +sc/inc/compiler.hxx:261 ScCompiler::AddInMap pUpper const char * sc/inc/pivot.hxx:74 ScDPLabelData mnFlags sal_Int32 @@ -348,7 +346,7 @@ sc/source/core/data/document.cxx:1257 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch sc/source/core/data/document.cxx:1258 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast -sc/source/core/data/formulacell.cxx:1755 +sc/source/core/data/formulacell.cxx:1756 StackCleaner pInt class ScInterpreter * sc/source/filter/excel/xltoolbar.hxx:23 TBCCmd cmdID sal_uInt16 @@ -400,11 +398,13 @@ sc/source/filter/xml/xmldrani.hxx:75 ScXMLDatabaseRangeContext bIsSelection _Bool sc/source/filter/xml/xmlexternaltabi.hxx:113 ScXMLExternalRefCellContext mnCellType sal_Int16 +sc/source/ui/inc/datastream.hxx:108 + sc::DataStream mnSettings sal_uInt32 sc/source/ui/inc/filtdlg.hxx:198 ScSpecialFilterDlg pOptionsMgr class ScFilterOptionsMgr * sc/source/ui/inc/preview.hxx:47 ScPreview nTabPage long -sc/source/ui/inc/tabvwsh.hxx:128 +sc/source/ui/inc/tabvwsh.hxx:129 ScTabViewShell pPivotSource class ScArea * sd/source/filter/eppt/eppt.hxx:176 PPTWriter mnTxId sal_uInt32 @@ -426,17 +426,17 @@ sd/source/ui/remotecontrol/Receiver.hxx:36 sd::Receiver pTransmitter class sd::Transmitter * sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136 sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString -sd/source/ui/sidebar/SlideBackground.hxx:102 +sd/source/ui/sidebar/SlideBackground.hxx:99 sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox> sd/source/ui/slidesorter/view/SlsLayouter.cxx:61 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> -sfx2/source/inc/appdata.hxx:75 +sfx2/source/inc/appdata.hxx:74 SfxAppData_Impl pDocTopics SfxDdeDocTopics_Impl * -sfx2/source/inc/appdata.hxx:76 +sfx2/source/inc/appdata.hxx:75 SfxAppData_Impl pTriggerTopic class SfxDdeTriggerTopic_Impl * -sfx2/source/inc/appdata.hxx:77 +sfx2/source/inc/appdata.hxx:76 SfxAppData_Impl pDdeService2 class DdeService * -sfx2/source/view/classificationcontroller.cxx:61 +sfx2/source/view/classificationcontroller.cxx:59 sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener slideshow/source/engine/opengl/TransitionImpl.hxx:296 Vertex normal glm::vec3 @@ -444,23 +444,21 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:297 Vertex texcoord glm::vec2 slideshow/source/engine/slideshowimpl.cxx:1044 (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const -soltools/cpp/cpp.h:143 - macroValidator pMacro Nlist * -starmath/inc/view.hxx:163 +starmath/inc/view.hxx:158 SmCmdBoxWindow aController class SmEditController store/source/storbase.hxx:248 store::PageData m_aMarked store::PageData::L -svl/source/crypto/cryptosign.cxx:144 +svl/source/crypto/cryptosign.cxx:145 (anonymous namespace)::(anonymous) version SECItem -svl/source/crypto/cryptosign.cxx:146 - (anonymous namespace)::(anonymous) reqPolicy SECItem svl/source/crypto/cryptosign.cxx:147 - (anonymous namespace)::(anonymous) nonce SECItem + (anonymous namespace)::(anonymous) reqPolicy SECItem svl/source/crypto/cryptosign.cxx:148 - (anonymous namespace)::(anonymous) certReq SECItem + (anonymous namespace)::(anonymous) nonce SECItem svl/source/crypto/cryptosign.cxx:149 + (anonymous namespace)::(anonymous) certReq SECItem +svl/source/crypto/cryptosign.cxx:150 (anonymous namespace)::(anonymous) extensions (anonymous namespace)::Extension * -svl/source/crypto/cryptosign.cxx:193 +svl/source/crypto/cryptosign.cxx:194 (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 ** svl/source/misc/inethist.cxx:48 INetURLHistory_Impl::head_entry m_nMagic sal_uInt32 @@ -490,6 +488,8 @@ svx/source/table/tablertfimporter.cxx:53 sdr::table::RTFCellDefault maItemSet class SfxItemSet sw/inc/shellio.hxx:147 SwReader aFileName class rtl::OUString +sw/source/core/doc/tblafmt.cxx:183 + SwAfVersions m_nVerticalAlignmentVersion sal_uInt16 sw/source/core/inc/swfont.hxx:980 SvStatistics nGetStretchTextSize sal_uInt16 sw/source/core/text/xmldump.cxx:33 @@ -507,7 +507,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 /home/noel/libo3/sw/source/filter/inc/rtf.hxx:27:9) + RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) ucb/source/ucp/gio/gio_mount.hxx:46 OOoMountOperationClass parent_class GMountOperationClass ucb/source/ucp/gio/gio_mount.hxx:49 @@ -562,7 +562,7 @@ vcl/inc/sft.hxx:486 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) vcl/opengl/salbmp.cxx:426 (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 * -vcl/source/filter/graphicfilter.cxx:1034 +vcl/source/filter/graphicfilter.cxx:1010 ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry * vcl/source/filter/jpeg/Exif.hxx:56 Exif::ExifIFD type sal_uInt16 diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index cf5433483c7a..f8bed79fb105 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -146,7 +146,6 @@ struct ImplSVAppData bool mbInAppMain = false; // is Application::Main() on stack bool mbInAppExecute = false; // is Application::Execute() on stack bool mbAppQuit = false; // is Application::Quit() called - bool mbShutdownDelayed = false; bool mbSettingsInit = false; // true: Settings are initialized Application::DialogCancelMode meDialogCancel = Application::DialogCancelMode::Off; // true: All Dialog::Execute() calls will be terminated immediately with return false diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 6f7ee8062fee..7a44e3607043 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -284,10 +284,8 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_nListPictureId(0), m_bIsNewDoc(!rMediaDescriptor.getUnpackedValueOrDefault("InsertMode", false)), m_rMediaDescriptor(rMediaDescriptor), - m_hasLHeader(false), m_hasRHeader(false), m_hasFHeader(false), - m_hasLFooter(false), m_hasRFooter(false), m_hasFFooter(false), m_bAfterCellBeforeRow(false) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index bb1c86de1b78..25f031c59e12 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -660,10 +660,8 @@ private: const utl::MediaDescriptor& m_rMediaDescriptor; /// Flags for ensuring that only one header and footer is added per section - bool m_hasLHeader; bool m_hasRHeader; bool m_hasFHeader; - bool m_hasLFooter; bool m_hasRFooter; bool m_hasFFooter; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits