diff options
| -rw-r--r-- | sc/source/ui/inc/tabview.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview5.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideanimations.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideanimations.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 7dfcaea6de79..8ce857b54d20 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -174,7 +174,7 @@ private: std::unique_ptr<ScPageBreakData> pPageBreakData; std::vector<ScHighlightEntry> maHighlightRanges; - std::unique_ptr<ScDocument> pBrushDocument; // cell formats for format paint brush + ScDocumentUniquePtr pBrushDocument; // cell formats for format paint brush std::unique_ptr<SfxItemSet> pDrawBrushSet; // drawing object attributes for paint brush Timer aScrollTimer; @@ -600,7 +600,7 @@ public: ScDocument* GetBrushDocument() const { return pBrushDocument.get(); } SfxItemSet* GetDrawBrushSet() const { return pDrawBrushSet.get(); } bool IsPaintBrushLocked() const { return bLockPaintBrush; } - void SetBrushDocument( std::unique_ptr<ScDocument> pNew, bool bLock ); + void SetBrushDocument( ScDocumentUniquePtr pNew, bool bLock ); void SetDrawBrushSet( std::unique_ptr<SfxItemSet> pNew, bool bLock ); void ResetBrushDocument(); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index cd52cbd4aaf9..4b9e14c3c59a 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2780,7 +2780,7 @@ void ScFormatShell::ExecFormatPaintbrush( const SfxRequest& rReq ) if ( pViewData->GetSimpleArea(aDummy) != SC_MARK_SIMPLE ) pView->Unmark(); - std::unique_ptr<ScDocument> pBrushDoc(new ScDocument( SCDOCMODE_CLIP )); + ScDocumentUniquePtr pBrushDoc(new ScDocument( SCDOCMODE_CLIP )); pView->CopyToClip( pBrushDoc.get(), false, true ); pView->SetBrushDocument( std::move(pBrushDoc), bLock ); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index c4e7768da626..4262c03a1e17 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -616,7 +616,7 @@ void ScTabView::MakeVisible( const tools::Rectangle& rHMMRect ) } } -void ScTabView::SetBrushDocument( std::unique_ptr<ScDocument> pNew, bool bLock ) +void ScTabView::SetBrushDocument( ScDocumentUniquePtr pNew, bool bLock ) { pDrawBrushSet.reset(); pBrushDocument = std::move(pNew); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index ff3dcad81c0d..ed2d3c500d5c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -39,7 +39,7 @@ SelectionObserver::Context::Context (SlideSorter const & rSlideSorter) mpSelectionObserver->StartObservation(); } -SelectionObserver::Context::~Context() +SelectionObserver::Context::~Context() COVERITY_NOEXCEPT_FALSE { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 43ac2f89e369..8c6be3eeb99f 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -43,7 +43,7 @@ namespace slideshow "SlideAnimations::SlideAnimations(): Invalid SlideShowContext" ); } - SlideAnimations::~SlideAnimations() + SlideAnimations::~SlideAnimations() COVERITY_NOEXCEPT_FALSE { if( mpRootNode ) { diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index e4739027395a..3954aa345120 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -57,7 +57,7 @@ namespace slideshow */ SlideAnimations( const SlideShowContext& rContext, const ::basegfx::B2DVector& rSlideSize ); - ~SlideAnimations(); + ~SlideAnimations() COVERITY_NOEXCEPT_FALSE; /** Import animations from a SMIL root animation node. |