[Libreoffice-commits] core.git: 2 commits - basegfx/source chart2/source compilerplugins/clang include/basegfx

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sat Sep 28 15:57:40 UTC 2019


 basegfx/source/tools/systemdependentdata.cxx                       |    8 ------
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx     |    8 ------
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx     |    2 -
 chart2/source/controller/dialogs/tp_ChartType.cxx                  |    2 -
 chart2/source/controller/sidebar/ChartAreaPanel.cxx                |    4 ---
 chart2/source/controller/sidebar/ChartAreaPanel.hxx                |    1 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx                |    4 ---
 chart2/source/controller/sidebar/ChartAxisPanel.hxx                |    1 
 chart2/source/controller/sidebar/ChartLinePanel.cxx                |    4 ---
 chart2/source/controller/sidebar/ChartLinePanel.hxx                |    1 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx              |    4 ---
 chart2/source/controller/sidebar/ChartSeriesPanel.hxx              |    1 
 chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx |    1 
 chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx |    2 -
 compilerplugins/clang/virtualdead.results                          |   12 ----------
 include/basegfx/utils/systemdependentdata.hxx                      |    6 -----
 16 files changed, 2 insertions(+), 59 deletions(-)

New commits:
commit 664f8632b1f4720475e6cb7176a08d3d204affd5
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 26 14:11:14 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 28 17:56:57 2019 +0200

    loplugin:virtualdead in basegfx
    
    Change-Id: I8b3f7810eb08b5217df30b7be27aafadeeed247a
    Reviewed-on: https://gerrit.libreoffice.org/79647
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/basegfx/source/tools/systemdependentdata.cxx b/basegfx/source/tools/systemdependentdata.cxx
index 2c1c173eff96..6f1e789d16c8 100644
--- a/basegfx/source/tools/systemdependentdata.cxx
+++ b/basegfx/source/tools/systemdependentdata.cxx
@@ -77,7 +77,7 @@ namespace basegfx
         if(0 == mnCalculatedCycles)
         {
             const sal_Int64 nBytes(estimateUsageInBytes());
-            const sal_uInt32 nSeconds(getHoldCyclesInSeconds());
+            const sal_uInt32 nSeconds = 60; // HoldCyclesInSeconds
 
             // default is Seconds (minimal is one)
             sal_uInt32 nResult(0 == nSeconds ? 1 : nSeconds);
@@ -115,12 +115,6 @@ namespace basegfx
         return mnCalculatedCycles;
     }
 
-    sal_uInt32 SystemDependentData::getHoldCyclesInSeconds() const
-    {
-        // default implementation returns 60(s)
-        return 60;
-    }
-
     sal_Int64 SystemDependentData::estimateUsageInBytes() const
     {
         // default implementation has no idea
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index f7a6ff3dce54..70b36c5e14a9 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -31,12 +31,6 @@ Gui/qaccessible.h:613
 Gui/qaccessible.h:619
     void QAccessibleTableInterface::modelChange(class QAccessibleTableModelChangeEvent *,)
     empty
-include/basegfx/utils/systemdependentdata.hxx:122
-    unsigned int basegfx::SystemDependentData::getHoldCyclesInSeconds()const
-    60
-include/basegfx/utils/unopolypolygon.hxx:97
-    void basegfx::unotools::UnoPolyPolygon::modifying()const
-    empty
 include/canvas/base/bitmapcanvasbase.hxx:80
     unsigned char canvas::BitmapCanvasBase::hasAlpha()
     1
diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx
index 32f02bea6fa2..f3befe06085f 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -115,12 +115,6 @@ namespace basegfx
         // mnCalculatedCycles
         sal_uInt32 calculateCombinedHoldCyclesInSeconds() const;
 
-        // Number of cycles a SystemDependentDataManager should/might
-        // hold this instance in seconds - does not have to be used,
-        // but should be. Default implementation returns 60(s). Override to
-        // offer useful data if you want to have better caching.
-        virtual sal_uInt32 getHoldCyclesInSeconds() const;
-
         // Size estimation of the entry in bytes - does not have to
         // be used, but should be. Default returns zero what
         // means there is no size estimation available. Override to
commit ef98596d62304d64d89b04de04c2bebff76286a0
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 26 13:52:09 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 28 17:56:49 2019 +0200

    loplugin:virtualdead in chart2
    
    Change-Id: Ia24e5072cf4d16e8a437323fa7fd5ab5207e71d2
    Reviewed-on: https://gerrit.libreoffice.org/79645
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 2b6a98c61d02..eeebd989e5ed 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -339,10 +339,6 @@ bool ChartTypeDialogController::shouldShow_StackingControl() const
 {
     return false;
 }
-bool ChartTypeDialogController::shouldShow_DeepStackingControl() const
-{
-    return false;
-}
 bool ChartTypeDialogController::shouldShow_SplineControl() const
 {
     return false;
@@ -714,10 +710,6 @@ bool LineChartDialogController::shouldShow_StackingControl() const
 {
     return true;
 }
-bool LineChartDialogController::shouldShow_DeepStackingControl() const
-{
-    return false;
-}
 bool LineChartDialogController::shouldShow_SplineControl() const
 {
     return true;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 2985d31b10db..e655394c1da3 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -96,7 +96,6 @@ public:
 
     virtual bool    shouldShow_3DLookControl() const;
     virtual bool    shouldShow_StackingControl() const;
-    virtual bool    shouldShow_DeepStackingControl() const;
     virtual bool    shouldShow_SplineControl() const;
     virtual bool    shouldShow_GeometryControl() const;
     virtual bool    shouldShow_SortByXValuesResourceGroup() const;
@@ -192,7 +191,6 @@ public:
     virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ) override;
 
     virtual bool    shouldShow_StackingControl() const override;
-    virtual bool    shouldShow_DeepStackingControl() const override;
     virtual bool    shouldShow_SplineControl() const override;
 };
 
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 1391230ad55f..f2d9e1e22b31 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -830,7 +830,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
     bool bShow = rTypeController.shouldShow_3DLookControl();
     m_pDim3DLookResourceGroup->showControls( bShow );
     bShow = rTypeController.shouldShow_StackingControl();
-    m_pStackingResourceGroup->showControls( bShow, rTypeController.shouldShow_DeepStackingControl() );
+    m_pStackingResourceGroup->showControls( bShow, false );
     bShow = rTypeController.shouldShow_SplineControl();
     m_pSplineResourceGroup->showControls( bShow );
     bShow = rTypeController.shouldShow_GeometryControl();
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 843c4e720e0d..61e72318043c 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -503,10 +503,6 @@ void ChartAreaPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-void ChartAreaPanel::SelectionInvalid()
-{
-}
-
 void ChartAreaPanel::updateModel(
         css::uno::Reference<css::frame::XModel> xModel)
 {
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
index 454c99a86851..5c0e0b23bbc4 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -63,7 +63,6 @@ public:
     virtual void modelInvalid() override;
 
     virtual void selectionChanged(bool bCorrectType) override;
-    virtual void SelectionInvalid() override;
 
     virtual void dispose() override;
 
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 20a848fe4792..384980e94645 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -348,10 +348,6 @@ void ChartAxisPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-void ChartAxisPanel::SelectionInvalid()
-{
-}
-
 IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
 {
     CheckBox* pCheckbox = static_cast<CheckBox*>(pButton);
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 70f0d7583868..f72b12152a7e 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -70,7 +70,6 @@ public:
     virtual void modelInvalid() override;
 
     virtual void selectionChanged(bool bCorrectType) override;
-    virtual void SelectionInvalid() override;
 
     virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) override;
 
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 8310a7a44707..356bd229fa24 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -223,10 +223,6 @@ void ChartLinePanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-void ChartLinePanel::SelectionInvalid()
-{
-}
-
 void ChartLinePanel::updateModel(
         css::uno::Reference<css::frame::XModel> xModel)
 {
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index c0b3d19fd579..c2e5d1fee7e1 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -55,7 +55,6 @@ public:
     virtual void modelInvalid() override;
 
     virtual void selectionChanged(bool bCorrectType) override;
-    virtual void SelectionInvalid() override;
 
     virtual void dispose() override;
 
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 3eddfb58c2dd..e0d28fa3e7bc 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -442,10 +442,6 @@ void ChartSeriesPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-void ChartSeriesPanel::SelectionInvalid()
-{
-}
-
 IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void)
 {
     CheckBox* pCheckBox = static_cast<CheckBox*>(pButton);
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index ba5d55a6b210..e33fec10cf3f 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -76,7 +76,6 @@ public:
     virtual void modelInvalid() override;
 
     virtual void selectionChanged(bool bCorrectType) override;
-    virtual void SelectionInvalid() override;
 
     virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) override;
 
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index 19f4335e0b49..e037fc39aa5f 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -66,7 +66,6 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec
 
 void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/)
 {
-    mpParent->SelectionInvalid();
 }
 
 void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectType>& aTypes)
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
index b0e0c36b981e..84efd0323fc5 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
@@ -26,8 +26,6 @@ public:
     virtual ~ChartSidebarSelectionListenerParent();
 
     virtual void selectionChanged(bool bSelected) = 0;
-
-    virtual void SelectionInvalid() = 0;
 };
 
 class ChartSidebarSelectionListener : public cppu::WeakImplHelper<css::view::XSelectionChangeListener>
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 119fde6bb849..f7a6ff3dce54 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -7,12 +7,6 @@ basic/source/comp/codegen.cxx:476
 basic/source/comp/codegen.cxx:526
     _Bool BufferTransformer::processParams()
     1
-chart2/source/controller/dialogs/ChartTypeDialogController.hxx:99
-    _Bool chart::ChartTypeDialogController::shouldShow_DeepStackingControl()const
-    0
-chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx:30
-    void chart::sidebar::ChartSidebarSelectionListenerParent::SelectionInvalid()
-    empty
 desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
     class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
     "http://openoffi


More information about the Libreoffice-commits mailing list