diff options
-rw-r--r-- | basctl/source/inc/dlged.hxx | 3 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ReportWindow.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 3 | ||||
-rw-r--r-- | sw/inc/pausethreadstarting.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/pausethreadstarting.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/retrieveinputstreamconsumer.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/anchoreddrawobject.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/redlnitr.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/redlnitr.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/swdll.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/swdllimpl.hxx | 2 |
13 files changed, 20 insertions, 16 deletions
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 791cc74bc216..d844255c837b 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <o3tl/deleter.hxx> #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <tools/gen.hxx> @@ -118,7 +119,7 @@ private: css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavors; css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xSupplier; - std::unique_ptr<DlgEdFactory> pObjFac; // never nullptr + std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory>> pObjFac; // never nullptr vcl::Window& rWindow; // DialogWindow std::unique_ptr<DlgEdFunc> pFunc; DialogWindowLayout& rLayout; diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index efb776e20fab..dc00f4c3f91e 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/report/XSection.hpp> #include "ReportDefines.hxx" #include "StartMarker.hxx" +#include <o3tl/deleter.hxx> #include <svtools/ruler.hxx> #include <svx/svdedtv.hxx> #include <sfx2/zoomitem.hxx> @@ -49,9 +50,8 @@ namespace rptui VclPtr<ODesignView> m_pView; VclPtr<OScrollWindowHelper> m_pParent; VclPtr<OViewsWindow> m_aViewsWindow; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; - ::std::unique_ptr<DlgEdFactory> - m_pObjFac; + rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory>> m_pObjFac; void ImplInitSettings(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 90307b453147..f0cd3c4ce7d3 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -24,6 +24,7 @@ #include "viewutil.hxx" #include "viewdata.hxx" #include "cbutton.hxx" +#include <o3tl/deleter.hxx> #include <svx/sdr/overlay/overlayobject.hxx> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -137,7 +138,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou ScHSplitPos eHWhich; ScVSplitPos eVWhich; - std::unique_ptr<ScNoteMarker> mpNoteMarker; + std::unique_ptr<ScNoteMarker, o3tl::default_delete<ScNoteMarker>> mpNoteMarker; VclPtr<ScFilterListBox> mpFilterBox; VclPtr<FloatingWindow> mpFilterFloat; diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx index 370367ea6ff9..d0eff0d0557d 100644 --- a/sw/inc/pausethreadstarting.hxx +++ b/sw/inc/pausethreadstarting.hxx @@ -19,6 +19,8 @@ #ifndef INCLUDED_SW_INC_PAUSETHREADSTARTING_HXX #define INCLUDED_SW_INC_PAUSETHREADSTARTING_HXX +#include <sal/types.h> + /** Helper class to pause starting of threads during existence of an instance of this class @@ -31,7 +33,7 @@ class SwPauseThreadStarting public: SwPauseThreadStarting(); - ~SwPauseThreadStarting(); + ~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE; private: diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 63a487c367a6..48d2aabaa3ed 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1401,7 +1401,7 @@ class SwNotifyAccAboutInvalidTextSelections : mrCursorSh( _rCursorSh ) {} - ~SwNotifyAccAboutInvalidTextSelections() + ~SwNotifyAccAboutInvalidTextSelections() COVERITY_NOEXCEPT_FALSE { mrCursorSh.InvalidateAccessibleParaTextSelection(); } diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx index 005ace7e43a0..5d93ea9236d9 100644 --- a/sw/source/core/docnode/pausethreadstarting.cxx +++ b/sw/source/core/docnode/pausethreadstarting.cxx @@ -37,7 +37,7 @@ SwPauseThreadStarting::SwPauseThreadStarting() } } -SwPauseThreadStarting::~SwPauseThreadStarting() +SwPauseThreadStarting::~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE { if ( mbPausedThreadStarting ) { diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx index a6a69be55dc0..e5848c534175 100644 --- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx +++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx @@ -34,7 +34,7 @@ SwAsyncRetrieveInputStreamThreadConsumer::SwAsyncRetrieveInputStreamThreadConsum { } -SwAsyncRetrieveInputStreamThreadConsumer::~SwAsyncRetrieveInputStreamThreadConsumer() +SwAsyncRetrieveInputStreamThreadConsumer::~SwAsyncRetrieveInputStreamThreadConsumer() COVERITY_NOEXCEPT_FALSE { SwThreadManager::GetThreadManager().RemoveThread( mnThreadID ); } diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx index 2cacf10234c4..8b01e75a57cb 100644 --- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx +++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx @@ -36,7 +36,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer public: SwAsyncRetrieveInputStreamThreadConsumer( SwGrfNode& rGrfNode ); - ~SwAsyncRetrieveInputStreamThreadConsumer(); + ~SwAsyncRetrieveInputStreamThreadConsumer() COVERITY_NOEXCEPT_FALSE; /** method to create thread */ diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 0855c22c30b0..dfbdce3021bb 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -46,7 +46,7 @@ class SwPosNotify public: explicit SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj ); - ~SwPosNotify(); + ~SwPosNotify() COVERITY_NOEXCEPT_FALSE; // #i32795# Point LastObjPos() const; }; @@ -59,7 +59,7 @@ SwPosNotify::SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj ) : mpOldPageFrame = mpAnchoredDrawObj->GetPageFrame(); } -SwPosNotify::~SwPosNotify() +SwPosNotify::~SwPosNotify() COVERITY_NOEXCEPT_FALSE { if ( maOldObjRect != mpAnchoredDrawObj->GetObjRect() ) { diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 2ce260da2dea..af89c69f513d 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -177,7 +177,7 @@ SwRedlineItr::SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt, Seek (rFnt, 0, COMPLETE_STRING); } -SwRedlineItr::~SwRedlineItr() +SwRedlineItr::~SwRedlineItr() COVERITY_NOEXCEPT_FALSE { Clear( nullptr ); delete pExt; diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 251e1db3efb1..1e7258228390 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -89,7 +89,7 @@ public: SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt, SwAttrHandler& rAH, sal_Int32 nRedlPos, bool bShw, const std::vector<ExtTextInputAttr> *pArr = nullptr, sal_Int32 nExtStart = COMPLETE_STRING ); - ~SwRedlineItr(); + ~SwRedlineItr() COVERITY_NOEXCEPT_FALSE; bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); } void ChangeTextAttr( SwFont* pFnt, SwTextAttr const &rHt, bool bChg ); diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 10e6f59d3bc6..f1f7b9039d86 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -147,7 +147,7 @@ SwDLL::SwDLL() } } -SwDLL::~SwDLL() +SwDLL::~SwDLL() COVERITY_NOEXCEPT_FALSE { if (m_pAutoCorrCfg) { diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx index 8f6707fe7b26..44131eadfccf 100644 --- a/sw/source/uibase/app/swdllimpl.hxx +++ b/sw/source/uibase/app/swdllimpl.hxx @@ -26,7 +26,7 @@ public: static void RegisterControls(); SwDLL(); - ~SwDLL(); + ~SwDLL() COVERITY_NOEXCEPT_FALSE; sw::Filters & getFilters(); |