[Libreoffice-commits] core.git: sc/source sd/source starmath/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 11 11:36:53 UTC 2019


 sc/source/core/data/column3.cxx |    4 ++--
 sd/source/ui/view/viewshel.cxx  |   11 ++++-------
 starmath/source/view.cxx        |    7 +------
 3 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 64f5fb6a4976004d4aa3ef983a61f8f20fa0098a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 31 16:04:26 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 11 13:36:09 2019 +0200

    revert some consts to placate coverity Uncaught exceptions
    
    Change-Id: I4d8cccd98a60efd928409514944d60d6ee5532d1
    Reviewed-on: https://gerrit.libreoffice.org/77251
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 795f0fe34c15..5a65e5a2f306 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2722,8 +2722,8 @@ class FormulaToValueHandler
 {
     struct Entry
     {
-        SCROW const mnRow;
-        ScCellValue const maValue;
+        SCROW mnRow;
+        ScCellValue maValue;
 
         Entry(SCROW nRow, double f) : mnRow(nRow), maValue(f) {}
         Entry(SCROW nRow, const svl::SharedString& rStr) : mnRow(nRow), maValue(rStr) {}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index f2c1a5603041..af87a87d271b 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1162,13 +1162,10 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const
 
 class KeepSlideSorterInSyncWithPageChanges
 {
-    sd::slidesorter::view::SlideSorterView::DrawLock const m_aDrawLock;
-    sd::slidesorter::controller::SlideSorterController::ModelChangeLock const m_aModelLock;
-    sd::slidesorter::controller::PageSelector::UpdateLock const m_aUpdateLock;
-    sd::slidesorter::controller::SelectionObserver::Context const m_aContext;
-
-    KeepSlideSorterInSyncWithPageChanges& operator=(const KeepSlideSorterInSyncWithPageChanges&) = delete;
-    KeepSlideSorterInSyncWithPageChanges(const KeepSlideSorterInSyncWithPageChanges&) = delete;
+    sd::slidesorter::view::SlideSorterView::DrawLock m_aDrawLock;
+    sd::slidesorter::controller::SlideSorterController::ModelChangeLock m_aModelLock;
+    sd::slidesorter::controller::PageSelector::UpdateLock m_aUpdateLock;
+    sd::slidesorter::controller::SelectionObserver::Context m_aContext;
 
 public:
     explicit KeepSlideSorterInSyncWithPageChanges(sd::slidesorter::SlideSorter const & rSlideSorter)
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 4c64b59e1c50..3a513cd87aad 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -856,14 +856,9 @@ SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId,
 
 struct SmViewShell_Impl
 {
-private:
-    SmViewShell_Impl& operator=(const SmViewShell_Impl&) = delete;
-    SmViewShell_Impl(const SmViewShell_Impl&) = delete;
-public:
-    SmViewShell_Impl() = default;
     std::unique_ptr<sfx2::DocumentInserter> pDocInserter;
     std::unique_ptr<SfxRequest> pRequest;
-    SvtMiscOptions const        aOpts;
+    SvtMiscOptions          aOpts;
 };
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SmViewShell, SfxViewShell)


More information about the Libreoffice-commits mailing list