loplugin:singlevalfields in chart2

Change-Id: I8b8bf093736a191c90d765dce82b00e15bb398d6
Reviewed-on: https://gerrit.libreoffice.org/26708
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

16 files changed, 18 insertions, 81 deletions

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 90980488fc0a..cbf741bbc68e 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -52,9 +52,7 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram
                   )
                 , m_xChartModel(xChartModel,uno::UNO_QUERY)
                 , m_xCC( xContext )
-                , m_bIsClosable(true)
                 , m_pTemplateProvider(nullptr)
-                , m_nFirstState(STATE_FIRST)
                 , m_nLastState(STATE_LAST)
                 , m_aTimerTriggeredControllerLock( xChartModel )
                 , m_bCanTravel( true )
@@ -150,7 +148,7 @@ svt::WizardTypes::WizardState CreationWizard::determineNextState( WizardState nC
 void CreationWizard::enterState(WizardState nState)
 {
     m_aTimerTriggeredControllerLock.startTimer();
-    enableButtons( WizardButtonFlags::PREVIOUS, bool( nState > m_nFirstState ) );
+    enableButtons( WizardButtonFlags::PREVIOUS, bool( nState > STATE_FIRST ) );
     enableButtons( WizardButtonFlags::NEXT, bool( nState < m_nLastState ) );
     if( isStateEnabled( nState ))
         svt::RoadmapWizard::enterState(nState);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 807fe68fa874..0795c317d55b 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -161,14 +161,6 @@ uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() t
 // XTerminateListener
 void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception)
 {
-    SolarMutexGuard aSolarGuard;
-
-    // we will never give a veto here
-    if( m_pDialog && !m_pDialog->isClosable() )
-    {
-        m_pDialog->ToTop();
-        throw frame::TerminationVetoException();
-    }
 }
 
 void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception)
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 40ee6a22f074..8974352f1ec4 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -327,7 +327,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
     : SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr)
     , eObjectType(pDialogParameter->getObjectType())
     , nDlgType(nNoArrowNoShadowDlg)
-    , nPageType(0)
     , m_pParameter( pDialogParameter )
     , m_pViewElementListProvider( pViewElementListProvider )
     , m_pNumberFormatter(nullptr)
@@ -504,7 +503,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
             aSet.Put (SvxColorListItem(m_pViewElementListProvider->GetColorTable(),SID_COLOR_TABLE));
             aSet.Put (SvxDashListItem(m_pViewElementListProvider->GetDashList(),SID_DASH_LIST));
             aSet.Put (SvxLineEndListItem(m_pViewElementListProvider->GetLineEndList(),SID_LINEEND_LIST));
-            aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+            aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
             aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
 
             if( m_pParameter->HasSymbolProperties() )
@@ -523,13 +522,13 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
             aSet.Put(SvxGradientListItem(m_pViewElementListProvider->GetGradientList(),SID_GRADIENT_LIST));
             aSet.Put(SvxHatchListItem(m_pViewElementListProvider->GetHatchList(),SID_HATCH_LIST));
             aSet.Put(SvxBitmapListItem(m_pViewElementListProvider->GetBitmapList(),SID_BITMAP_LIST));
-            aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+            aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,0));
             aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType));
             rPage.PageCreated(aSet);
             break;
 
         case RID_SVXPAGE_TRANSPARENCE:
-            aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+            aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
             aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
             rPage.PageCreated(aSet);
             break;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index dbe081fccb3d..810788f8bd61 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -426,7 +426,6 @@ private:
     mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
 
     bool m_bSuspended;
-    bool m_bCanClose;
 
     css::uno::Reference< css::uno::XComponentContext> m_xCC;
 
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index bf36a91f2b95..473f0b16eb6b 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -100,7 +100,6 @@ private:
     ObjectHierarchy::tOID m_aCurrentOID;
     css::uno::Reference< css::chart2::XChartDocument > m_xChartDocument;
     ExplicitValueProvider * m_pExplicitValueProvider;
-    bool m_bStepDownInDiagram;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index eb2ed7373590..bc250be6c8c5 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -46,8 +46,6 @@ public:
 
     CreationWizard() = delete;
 
-    bool isClosable() { /*@todo*/ return m_bIsClosable;}
-
     // TabPageNotifiable
     virtual void setInvalidPage( TabPage * pTabPage ) override;
     virtual void setValidPage( TabPage * pTabPage ) override;
@@ -64,11 +62,9 @@ private:
 
     css::uno::Reference< css::chart2::XChartDocument >   m_xChartModel;
     css::uno::Reference< css::uno::XComponentContext>    m_xCC;
-    bool m_bIsClosable;
     ChartTypeTemplateProvider*   m_pTemplateProvider;
     std::unique_ptr<DialogModel> m_pDialogModel;
 
-    WizardState m_nFirstState;
     WizardState m_nLastState;
 
     TimerTriggeredControllerLock   m_aTimerTriggeredControllerLock;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 781ef20b8a62..5c2ea039ad93 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -108,7 +108,6 @@ class SchAttribTabDlg : public SfxTabDialog
 private:
     ObjectType               eObjectType;
     sal_uInt16                   nDlgType;
-    sal_uInt16                   nPageType;
 
     const ObjectPropertiesDialogParameter * const        m_pParameter;
     const ViewElementListProvider* const                 m_pViewElementListProvider;
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 974d52d49561..cd86b366a0bb 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -101,7 +101,6 @@ using ::com::sun::star::uno::Sequence;
 ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) :
     m_aLifeTimeManager( nullptr ),
     m_bSuspended( false ),
-    m_bCanClose( true ),
     m_xCC(xContext), //@todo is it allowed to hold this context??
     m_xFrame( nullptr ),
     m_aModelMutex(),
@@ -947,7 +946,7 @@ void SAL_CALL ChartController::removeEventListener(
 // util::XCloseListener
 void SAL_CALL ChartController::queryClosing(
     const lang::EventObject& rSource,
-    sal_Bool bGetsOwnership )
+    sal_Bool /*bGetsOwnership*/ )
         throw(util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     //do not use the m_aControllerMutex here because this call is not allowed to block
@@ -963,19 +962,7 @@ void SAL_CALL ChartController::queryClosing(
         return;
     }
 
-    if( !m_bCanClose )//@todo try acquire mutex
-    {
-        if( bGetsOwnership )
-        {
-            aModelRef->SetOwnership( bGetsOwnership );
-        }
-
-        throw util::CloseVetoException();
-    }
-    else
-    {
-        //@ todo prepare to closing model -> don't start any further hindering actions
-    }
+    //@ todo prepare to closing model -> don't start any further hindering actions
 }
 
 void SAL_CALL ChartController::notifyClosing(
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 6b58b1235131..5d86a04b3ad6 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -697,8 +697,7 @@ ObjectKeyNavigation::ObjectKeyNavigation(
     ExplicitValueProvider * pExplicitValueProvider /* = 0 */ ) :
         m_aCurrentOID( rCurrentOID ),
         m_xChartDocument( xChartDocument ),
-        m_pExplicitValueProvider( pExplicitValueProvider ),
-        m_bStepDownInDiagram( true )
+        m_pExplicitValueProvider( pExplicitValueProvider )
 {
     if ( !m_aCurrentOID.isValid() )
     {
@@ -749,7 +748,7 @@ void ObjectKeyNavigation::setCurrentSelection( const ObjectHierarchy::tOID& rOID
 
 bool ObjectKeyNavigation::first()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aSiblings( aHierarchy.getSiblings( getCurrentSelection() ) );
     bool bResult = !aSiblings.empty();
     if( bResult )
@@ -761,7 +760,7 @@ bool ObjectKeyNavigation::first()
 
 bool ObjectKeyNavigation::last()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aSiblings( aHierarchy.getSiblings( getCurrentSelection() ) );
     bool bResult = !aSiblings.empty();
     if( bResult )
@@ -773,7 +772,7 @@ bool ObjectKeyNavigation::last()
 
 bool ObjectKeyNavigation::next()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aSiblings( aHierarchy.getSiblings( getCurrentSelection() ) );
     bool bResult = !aSiblings.empty();
     if( bResult )
@@ -793,7 +792,7 @@ bool ObjectKeyNavigation::next()
 
 bool ObjectKeyNavigation::previous()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aSiblings( aHierarchy.getSiblings( getCurrentSelection()));
     bool bResult = !aSiblings.empty();
     if( bResult )
@@ -813,7 +812,7 @@ bool ObjectKeyNavigation::previous()
 
 bool ObjectKeyNavigation::up()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     bool bResult = !ObjectHierarchy::isRootNode( getCurrentSelection());
     if( bResult )
         setCurrentSelection( aHierarchy.getParent( getCurrentSelection()));
@@ -822,7 +821,7 @@ bool ObjectKeyNavigation::up()
 
 bool ObjectKeyNavigation::down()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     bool bResult = aHierarchy.hasChildren( getCurrentSelection());
     if( bResult )
     {
@@ -835,7 +834,7 @@ bool ObjectKeyNavigation::down()
 
 bool ObjectKeyNavigation::veryFirst()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aChildren( aHierarchy.getTopLevelChildren());
     bool bResult = !aChildren.empty();
     if( bResult )
@@ -845,7 +844,7 @@ bool ObjectKeyNavigation::veryFirst()
 
 bool ObjectKeyNavigation::veryLast()
 {
-    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
+    ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, true/*StepDownInDiagram*/ );
     ObjectHierarchy::tChildContainer aChildren( aHierarchy.getTopLevelChildren());
     bool bResult = !aChildren.empty();
     if( bResult )
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 4d857746dd9b..0c425a4cda4f 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -371,7 +371,6 @@ AxisLabelProperties::AxisLabelProperties()
                         , bStackCharacters( false )
                         , fRotationAngleDegree( 0.0 )
                         , nRhythm( 1 )
-                        , bRhythmIsFix(false)
 {
 
 }
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index e6ecc72061a9..53770dc9b6b2 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -75,7 +75,6 @@ struct AxisLabelProperties final
     double               fRotationAngleDegree;
 
     sal_Int32   nRhythm; //show only each nth label with n==nRhythm
-    bool        bRhythmIsFix; //states whether the given rhythm is fix or may be changed
 
     //methods:
     void init( const css::uno::Reference< css::chart2::XAxis >&  xAxisModel );
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 97912a5cb349..0e0920b4d2e7 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -776,8 +776,6 @@ bool VCartesianAxis::createTextShapes(
                     // Increment the visible tick intervals (if that's
                     // allowed) and start over.
 
-                    if( rAxisLabelProperties.bRhythmIsFix )
-                        continue;
                     rAxisLabelProperties.nRhythm++;
                     removeShapesAtWrongRhythm( rTickIter, rAxisLabelProperties.nRhythm, nTick, xTarget );
                     return false;
@@ -872,15 +870,6 @@ bool VCartesianAxis::createTextShapes(
                         return false;
                     }
 
-                    if( rAxisLabelProperties.bRhythmIsFix )
-                    {
-                        // Tick interval is fixed.  We have no choice but to
-                        // remove this label.
-                        xTarget->remove(pTickInfo->xTextShape);
-                        pTickInfo->xTextShape = nullptr;
-                        continue;
-                    }
-
                     // Try incrementing the tick interval and start over.
                     rAxisLabelProperties.nRhythm++;
                     removeShapesAtWrongRhythm( rTickIter, rAxisLabelProperties.nRhythm, nTick, xTarget );
@@ -956,8 +945,6 @@ bool VCartesianAxis::createTextShapesSimple(
                 // This tick overlaps with its neighbor. Increment the visible
                 // tick intervals (if that's allowed) and start over.
 
-                if( rAxisLabelProperties.bRhythmIsFix )
-                    continue;
                 rAxisLabelProperties.nRhythm++;
                 removeShapesAtWrongRhythm( rTickIter, rAxisLabelProperties.nRhythm, nTick, xTarget );
                 return false;
@@ -1014,15 +1001,6 @@ bool VCartesianAxis::createTextShapesSimple(
                     return false;
                 }
 
-                if( rAxisLabelProperties.bRhythmIsFix )
-                {
-                    // Tick interval is fixed.  We have no choice but to
-                    // remove this label.
-                    xTarget->remove(pTickInfo->xTextShape);
-                    pTickInfo->xTextShape = nullptr;
-                    continue;
-                }
-
                 // Try incrementing the tick interval and start over.
                 rAxisLabelProperties.nRhythm++;
                 removeShapesAtWrongRhythm( rTickIter, rAxisLabelProperties.nRhythm, nTick, xTarget );
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 3470dcebfeae..2f8f9c7dc8dd 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -47,7 +47,6 @@ BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel
                      , sal_Int32 nDimensionCount )
         : VSeriesPlotter( xChartTypeModel, nDimensionCount, false )
         , m_bShowNegativeValues(false)
-        , m_bBubbleSizeAsArea(true)
         , m_fBubbleSizeScaling(1.0)
         , m_fMaxLogicBubbleSize( 0.0 )
         , m_fBubbleSizeFactorToScreen( 1.0 )
@@ -133,11 +132,8 @@ drawing::Direction3D BubbleChart::transformToScreenBubbleSize( double fLogicSize
 
     double fMaxRadius = fMaxSize;
     double fRaduis = fLogicSize;
-    if( m_bBubbleSizeAsArea )
-    {
-        fMaxRadius = sqrt( fMaxSize / F_PI );
-        fRaduis = sqrt( fLogicSize / F_PI );
-    }
+    fMaxRadius = sqrt( fMaxSize / F_PI );
+    fRaduis = sqrt( fLogicSize / F_PI );
 
     aRet.DirectionX = m_fBubbleSizeScaling * m_fBubbleSizeFactorToScreen * fRaduis / fMaxRadius;
     aRet.DirectionY = aRet.DirectionX;
diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx
index 5c7d49caf9ed..7b3a9206ef8a 100644
--- a/chart2/source/view/charttypes/BubbleChart.hxx
+++ b/chart2/source/view/charttypes/BubbleChart.hxx
@@ -56,7 +56,6 @@ private: //methods
 private: //member
 
     bool   m_bShowNegativeValues;//input parameter
-    bool   m_bBubbleSizeAsArea;//input parameter
     double m_fBubbleSizeScaling;//input parameter
 
     double m_fMaxLogicBubbleSize;//calculated values
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index 27123ce8e563..fd2c8b23c277 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -66,7 +66,6 @@ public:
 
     virtual void render() override;
 private:
-    bool mbRoundedCorners;
     glm::mat4 maPos;
     Color maColor; // RGBA fill color
 };
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 50ca93944910..ebedc36800dd 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -32,7 +32,6 @@ void Renderable3DObject::render()
 
 Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 aColor, sal_uInt32 nId)
     : Renderable3DObject(pRenderer, nId)
-    , mbRoundedCorners(true)
     , maPos(rPosition)
     , maColor(aColor)
 {
@@ -41,7 +40,7 @@ Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 aCo
 
 void Bar::render()
 {
-    mpRenderer->AddShape3DExtrudeObject(mbRoundedCorners, maColor.GetColor(), 0xFFFFFF, maPos, mnUniqueId);
+    mpRenderer->AddShape3DExtrudeObject(true/*RoundedCorners*/, maColor.GetColor(), 0xFFFFFF, maPos, mnUniqueId);
     mpRenderer->EndAddShape3DExtrudeObject();
 }