include/vcl/builderpage.hxx | 2 +- include/vcl/dndhelp.hxx | 2 +- include/vcl/weld.hxx | 4 ++-- sd/source/filter/pdf/sdpdffilter.cxx | 4 ++-- vcl/inc/WidgetDrawInterface.hxx | 2 +- vcl/inc/jsdialog/jsdialogsender.hxx | 2 +- vcl/inc/salgdi.hxx | 2 +- vcl/inc/textlayout.hxx | 2 +- vcl/jsdialog/jsdialogsender.cxx | 2 +- vcl/source/app/dndhelp.cxx | 2 +- vcl/source/app/weldutils.cxx | 6 +++--- vcl/source/gdi/salgdilayout.cxx | 2 +- vcl/source/text/textlayout.cxx | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit cbbe75ec33be0e14540f72533dbaa1ab5f7b875d Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 10 08:54:42 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 12 18:17:31 2025 +0200 drop some more COVERITY stuff Change-Id: I105b60711209c436f543c86c409f7c53d6b5ff8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192242 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/builderpage.hxx b/include/vcl/builderpage.hxx index eddbd4787cc2..5b1c3deae2e9 100644 --- a/include/vcl/builderpage.hxx +++ b/include/vcl/builderpage.hxx @@ -17,7 +17,7 @@ class VCL_DLLPUBLIC BuilderPage public: BuilderPage(weld::Widget* pParent, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, bool bIsMobile = false); - virtual ~BuilderPage() COVERITY_NOEXCEPT_FALSE; + virtual ~BuilderPage(); /* The title of the page, in an Assistant the dialog may append this page title to the dialog title. diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 35d8f73240b0..4008873e6330 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -41,7 +41,7 @@ namespace vcl::unohelper class VCL_DLLPUBLIC DragAndDropClient { public: - virtual ~DragAndDropClient() COVERITY_NOEXCEPT_FALSE; + virtual ~DragAndDropClient(); // css::datatransfer::dnd::XDragGestureListener /// @throws css::uno::RuntimeException diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 12ec8384e1aa..2055dab56df7 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -2881,7 +2881,7 @@ public: void set_help_id(const OUString& rHelpId) { getDialog()->set_help_id(rHelpId); } OUString get_help_id() const { return getConstDialog()->get_help_id(); } void response(int nResponse) { getDialog()->response(nResponse); } - virtual ~DialogController() COVERITY_NOEXCEPT_FALSE; + virtual ~DialogController(); }; class VCL_DLLPUBLIC GenericDialogController : public DialogController @@ -2894,7 +2894,7 @@ public: GenericDialogController(weld::Widget* pParent, const OUString& rUIFile, const OUString& rDialogId, bool bMobile = false); virtual Dialog* getDialog() override; - virtual ~GenericDialogController() COVERITY_NOEXCEPT_FALSE override; + virtual ~GenericDialogController() override; }; class VCL_DLLPUBLIC MessageDialogController : public DialogController diff --git a/vcl/inc/WidgetDrawInterface.hxx b/vcl/inc/WidgetDrawInterface.hxx index 8e51f13819bb..bd0879786ad1 100644 --- a/vcl/inc/WidgetDrawInterface.hxx +++ b/vcl/inc/WidgetDrawInterface.hxx @@ -19,7 +19,7 @@ namespace vcl class VCL_PLUGIN_PUBLIC WidgetDrawInterface { public: - virtual ~WidgetDrawInterface() COVERITY_NOEXCEPT_FALSE {} + virtual ~WidgetDrawInterface() {} /** * Query the platform layer for native control support. diff --git a/vcl/inc/jsdialog/jsdialogsender.hxx b/vcl/inc/jsdialog/jsdialogsender.hxx index 0be88599bd1e..5bc95f4df049 100644 --- a/vcl/inc/jsdialog/jsdialogsender.hxx +++ b/vcl/inc/jsdialog/jsdialogsender.hxx @@ -50,7 +50,7 @@ public: initializeSender(aNotifierWindow, aContentWindow, sTypeOfJSON); } - virtual ~JSDialogSender() COVERITY_NOEXCEPT_FALSE; + virtual ~JSDialogSender(); void sendFullUpdate(bool bForce = false); void sendClose(); diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index bbbc17a0658b..aeabdda4e455 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -68,7 +68,7 @@ class VCL_PLUGIN_PUBLIC SalGraphics : protected vcl::WidgetDrawInterface { public: SalGraphics(); - ~SalGraphics() COVERITY_NOEXCEPT_FALSE override; + ~SalGraphics() override; virtual SalGraphicsImpl* GetImpl() const = 0; diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 9e64f48b8466..da02a2a9ffae 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -61,7 +61,7 @@ namespace vcl DrawTextFlags nStyle); protected: - SAL_DLLPRIVATE ~TextLayoutCommon() COVERITY_NOEXCEPT_FALSE; + SAL_DLLPRIVATE ~TextLayoutCommon(); private: SAL_DLLPRIVATE OUString GetCenterEllipsisString(std::u16string_view rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth); diff --git a/vcl/jsdialog/jsdialogsender.cxx b/vcl/jsdialog/jsdialogsender.cxx index 9df5f99299b3..3b1a499b6f3e 100644 --- a/vcl/jsdialog/jsdialogsender.cxx +++ b/vcl/jsdialog/jsdialogsender.cxx @@ -295,7 +295,7 @@ void JSDialogNotifyIdle::Invoke() void JSDialogNotifyIdle::clearQueue() { m_aMessageQueue.clear(); } -JSDialogSender::~JSDialogSender() COVERITY_NOEXCEPT_FALSE +JSDialogSender::~JSDialogSender() { sendClose(); diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 0b4f4972f683..a15b59e76842 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; -vcl::unohelper::DragAndDropClient::~DragAndDropClient() COVERITY_NOEXCEPT_FALSE {} +vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ ) { diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index 70b742f91e58..563ed746bfeb 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -34,7 +34,7 @@ void BuilderPage::Activate() {} void BuilderPage::Deactivate() {} -BuilderPage::~BuilderPage() COVERITY_NOEXCEPT_FALSE {} +BuilderPage::~BuilderPage() {} namespace weld { @@ -44,7 +44,7 @@ bool DialogController::runAsync(const std::shared_ptr<DialogController>& rContro return rController->getDialog()->runAsync(rController, func); } -DialogController::~DialogController() COVERITY_NOEXCEPT_FALSE {} +DialogController::~DialogController() {} Dialog* GenericDialogController::getDialog() { return m_xDialog.get(); } @@ -55,7 +55,7 @@ GenericDialogController::GenericDialogController(weld::Widget* pParent, const OU { } -GenericDialogController::~GenericDialogController() COVERITY_NOEXCEPT_FALSE {} +GenericDialogController::~GenericDialogController() {} Dialog* MessageDialogController::getDialog() { return m_xDialog.get(); } diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 94ee667bb398..f760a1434f8b 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -80,7 +80,7 @@ bool SalGraphics::initWidgetDrawBackends(bool bForce) return false; } -SalGraphics::~SalGraphics() COVERITY_NOEXCEPT_FALSE +SalGraphics::~SalGraphics() { // can't call ReleaseFonts here, as the destructor just calls this classes SetFont (pure virtual)! } diff --git a/vcl/source/text/textlayout.cxx b/vcl/source/text/textlayout.cxx index 76a5062bb0b0..50ab30d921d9 100644 --- a/vcl/source/text/textlayout.cxx +++ b/vcl/source/text/textlayout.cxx @@ -62,7 +62,7 @@ void ImplMultiTextLineInfo::Clear() namespace vcl { - TextLayoutCommon::~TextLayoutCommon() COVERITY_NOEXCEPT_FALSE + TextLayoutCommon::~TextLayoutCommon() {} OUString TextLayoutCommon::GetCenterEllipsisString(std::u16string_view rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth) commit 80e32e6dee78eb85629940b5890fea0371550036 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Oct 12 12:24:24 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 12 18:17:23 2025 +0200 cid#1666675 Unchecked dynamic_cast Change-Id: Id589ad19df4bf5d5f68e5a8545c06a0c23f851b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192241 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index 2271d92118ae..5befb7c3f2e3 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -281,9 +281,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestFODGExportPDF(SvStream& rStream) uno::Reference<css::frame::XLoadable> xModelLoad(xModel, uno::UNO_QUERY_THROW); xModelLoad->initNew(); - SdXImpressDocument* pDrawDoc = dynamic_cast<SdXImpressDocument*>(xModel.get()); + SdXImpressDocument& rDrawDoc = dynamic_cast<SdXImpressDocument&>(*xModel); - bool ret = ImportPDF(rStream, *pDrawDoc->GetDoc()); + bool ret = ImportPDF(rStream, *rDrawDoc.GetDoc()); if (ret) {
