compilerplugins/clang/badstatics.cxx | 3 +++ sfx2/source/appl/appserv.cxx | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-)
New commits: commit 1c055d4a7b154dd1de12d559f2ab71e299278e70 Author: Miklos Vajna <[email protected]> AuthorDate: Fri Feb 9 14:32:33 2024 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Feb 9 15:43:45 2024 +0100 sfx2: fix clang plugin errors Fixes: - sfx2/source/appl/appserv.cxx:285:23: error: public virtual function just calls public parent [loplugin:unnecessaryoverride] - sfx2/source/view/lokhelper.cxx:1137:60: error: bad static variable causes crash on shutdown [loplugin:badstatics] Change-Id: I826b2f2d9c2cb5842c29a9782a6bad48f0422d91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163191 Tested-by: Miklos Vajna <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 328218086453..adbdf08ed3d2 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -234,6 +234,9 @@ public: // AquaA11yFocusTracker::m_aDocumentWindowList elements symmetrically added and // removed in AquaA11yFocusTracker::window_got_focus and // AquaA11yFocusTracker::WindowEventHandler (TODO: is that guaranteed?) + || (loplugin::DeclCheck(pVarDecl).Var("maEditViewHistory") + .Class("LOKEditViewHistory").GlobalNamespace()) + // sfx2/lokhelper.hxx, only handling pointers, not owning ) // these variables appear unproblematic { return true; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4dfffbd20850..a2fb56be0066 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -281,12 +281,6 @@ namespace m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog, LicenseHdl) ); m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) ); } - - virtual short run() override - { - short nRet = GenericDialogController::run(); - return nRet; - } }; IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void)
