summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-10 09:24:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-06-06 14:15:43 +0200
commitd0069e5189f5410e1db7aa395f0754109e872f46 (patch)
tree30c860e8d780c3461c6048be9594f642f03de5de /sd
parentcc2db25645ede743bdc3824fe7d26ea4beda6a96 (diff)
add COVERITY_NOEXCEPT_FALSE
to markup dtors that coverity warns might throw exceptions which won't throw in practice, or where std::terminate is an acceptable response if they do Change-Id: I32b94814e8245372e1d1dc36be0d81e3564042f4 Reviewed-on: https://gerrit.libreoffice.org/38318 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx2
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx6
-rw-r--r--sd/source/ui/view/outlview.cxx2
10 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 7bbd68a47510..552bfa041595 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -228,7 +228,7 @@ class OutlineViewModelChangeGuard
{
public:
OutlineViewModelChangeGuard( OutlineView& rView );
- ~OutlineViewModelChangeGuard();
+ ~OutlineViewModelChangeGuard() COVERITY_NOEXCEPT_FALSE;
private:
OutlineView& mrView;
};
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 1fb29620d4ac..782f23f006e7 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -240,7 +240,7 @@ public:
class UpdateLock { public:
UpdateLock(const std::shared_ptr<ToolBarManager>& rpManager)
: mpManager(rpManager) { mpManager->LockUpdate(); }
- ~UpdateLock() { mpManager->UnlockUpdate(); }
+ ~UpdateLock() COVERITY_NOEXCEPT_FALSE { mpManager->UnlockUpdate(); }
private:
std::shared_ptr<ToolBarManager> mpManager;
};
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index 7ffb1e352652..da6fadb944b7 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -174,7 +174,7 @@ public:
public:
UpdateLock (const std::shared_ptr<ViewShellManager>& rpManager)
: mpManager(rpManager) {mpManager->LockUpdate();}
- ~UpdateLock() {mpManager->UnlockUpdate();};
+ ~UpdateLock() COVERITY_NOEXCEPT_FALSE {mpManager->UnlockUpdate();}
private:
std::shared_ptr<ViewShellManager> mpManager;
};
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index dfbf1692ef8d..bb08715be29b 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -926,7 +926,7 @@ SlideSorterController::ModelChangeLock::ModelChangeLock (
mpController->LockModelChange();
}
-SlideSorterController::ModelChangeLock::~ModelChangeLock()
+SlideSorterController::ModelChangeLock::~ModelChangeLock() COVERITY_NOEXCEPT_FALSE
{
Release();
}
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 801e2a3c305b..a9e18419a491 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -62,7 +62,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter)
rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable);
}
-DragAndDropContext::~DragAndDropContext()
+DragAndDropContext::~DragAndDropContext() COVERITY_NOEXCEPT_FALSE
{
SetTargetSlideSorter (Point(0,0));
}
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index dcced0be25e1..60547a8489ff 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -43,7 +43,7 @@ public:
when provided, the pages in the transferable.
*/
explicit DragAndDropContext (SlideSorter& rSlideSorter);
- ~DragAndDropContext();
+ ~DragAndDropContext() COVERITY_NOEXCEPT_FALSE;
/** Call this method (for example as reaction to ESC key press) to avoid
processing (ie moving or inserting) the substition when the called
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 08671ecbbd63..67d9e069f6d3 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -145,7 +145,7 @@ public:
SlideSorter& rSlideSorter,
SelectionFunction& rSelectionFunction,
const bool bIsMouseOverIndicatorAllowed);
- virtual ~ModeHandler();
+ virtual ~ModeHandler() COVERITY_NOEXCEPT_FALSE;
virtual Mode GetMode() const = 0;
virtual void Abort() = 0;
@@ -880,7 +880,7 @@ SelectionFunction::ModeHandler::ModeHandler (
{
}
-SelectionFunction::ModeHandler::~ModeHandler()
+SelectionFunction::ModeHandler::~ModeHandler() COVERITY_NOEXCEPT_FALSE
{
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index cee9f9631bd8..f7674550f008 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -145,7 +145,7 @@ public:
class ModelChangeLock
{public:
ModelChangeLock (SlideSorterController& rController);
- ~ModelChangeLock();
+ ~ModelChangeLock() COVERITY_NOEXCEPT_FALSE;
void Release();
private:
SlideSorterController* mpController;
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index c53179bb9cd2..7b26449ed189 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -96,7 +96,7 @@ public:
Implementation (
ViewShellManager& rManager,
ViewShellBase& rBase);
- ~Implementation();
+ ~Implementation() COVERITY_NOEXCEPT_FALSE;
void AddShellFactory (
const SfxShell* pViewShell,
@@ -129,7 +129,7 @@ public:
{
public:
explicit UpdateLock (Implementation& rImpl) : mrImpl(rImpl) {mrImpl.LockUpdate();}
- ~UpdateLock() {mrImpl.UnlockUpdate();};
+ ~UpdateLock() COVERITY_NOEXCEPT_FALSE {mrImpl.UnlockUpdate();}
private:
Implementation& mrImpl;
};
@@ -376,7 +376,7 @@ ViewShellManager::Implementation::Implementation (
(void)rManager;
}
-ViewShellManager::Implementation::~Implementation()
+ViewShellManager::Implementation::~Implementation() COVERITY_NOEXCEPT_FALSE
{
Shutdown();
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 9627e99edc09..7e4e6f1062ed 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1758,7 +1758,7 @@ OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView )
mrView.BeginModelChange();
}
-OutlineViewModelChangeGuard::~OutlineViewModelChangeGuard()
+OutlineViewModelChangeGuard::~OutlineViewModelChangeGuard() COVERITY_NOEXCEPT_FALSE
{
mrView.EndModelChange();
}