[Libreoffice-commits] core.git: sc/inc sc/Library_sc.mk sc/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 19 09:41:44 UTC 2021


 sc/Library_sc.mk                     |    1 
 sc/inc/bulkdatahint.hxx              |   21 ++++++++-------
 sc/source/core/tool/bulkdatahint.cxx |   48 -----------------------------------
 3 files changed, 11 insertions(+), 59 deletions(-)

New commits:
commit 0067c3bd377bea366cd61cc06bba3b8d521401d4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 19 10:19:39 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 19 11:41:10 2021 +0200

    no need for a pimpl in BulkDataHint
    
    Change-Id: I82c1d61b79d6486f20e51a8814b08149765861d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119159
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 1b3cead83beb..f1b62e1c263d 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -210,7 +210,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
     sc/source/core/tool/adiasync \
     sc/source/core/tool/appoptio \
     sc/source/core/tool/autoform \
-    sc/source/core/tool/bulkdatahint \
     sc/source/core/tool/brdcst \
     sc/source/core/tool/calcconfig \
     sc/source/core/tool/callform \
diff --git a/sc/inc/bulkdatahint.hxx b/sc/inc/bulkdatahint.hxx
index 20fb76f06c9e..d8d51bf96b1c 100644
--- a/sc/inc/bulkdatahint.hxx
+++ b/sc/inc/bulkdatahint.hxx
@@ -20,20 +20,21 @@ class ColumnSpanSet;
 
 class BulkDataHint final : public SfxHint
 {
-    struct Impl;
-    std::unique_ptr<Impl> mpImpl;
-
-    BulkDataHint(const BulkDataHint&) = delete;
-    BulkDataHint& operator=(const BulkDataHint&) = delete;
+    ScDocument& mrDoc;
+    const ColumnSpanSet* mpSpans;
 
 public:
-    BulkDataHint(ScDocument& rDoc, SfxHintId nHintId);
-    virtual ~BulkDataHint() override;
+    BulkDataHint(ScDocument& rDoc, SfxHintId nHintId)
+        : SfxHint(nHintId)
+        , mrDoc(rDoc)
+        , mpSpans(nullptr)
+    {
+    }
 
-    void setSpans(const ColumnSpanSet* pSpans);
-    const ColumnSpanSet* getSpans() const;
+    void setSpans(const ColumnSpanSet* pSpans) { mpSpans = pSpans; }
+    const ColumnSpanSet* getSpans() const { return mpSpans; }
 
-    ScDocument& getDoc();
+    ScDocument& getDoc() { return mrDoc; }
 };
 }
 
diff --git a/sc/source/core/tool/bulkdatahint.cxx b/sc/source/core/tool/bulkdatahint.cxx
deleted file mode 100644
index 5a6bb434420b..000000000000
--- a/sc/source/core/tool/bulkdatahint.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <bulkdatahint.hxx>
-
-namespace sc {
-
-struct BulkDataHint::Impl
-{
-    ScDocument& mrDoc;
-    const ColumnSpanSet* mpSpans;
-
-    explicit Impl( ScDocument& rDoc ) :
-        mrDoc(rDoc),
-        mpSpans(nullptr) {}
-};
-
-BulkDataHint::BulkDataHint( ScDocument& rDoc, SfxHintId nHintId ) :
-    SfxHint( nHintId ), mpImpl(new Impl(rDoc)) {}
-
-BulkDataHint::~BulkDataHint()
-{
-}
-
-void BulkDataHint::setSpans( const ColumnSpanSet* pSpans )
-{
-    mpImpl->mpSpans = pSpans;
-}
-
-const ColumnSpanSet* BulkDataHint::getSpans() const
-{
-    return mpImpl->mpSpans;
-}
-
-ScDocument& BulkDataHint::getDoc()
-{
-    return mpImpl->mrDoc;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list