[Libreoffice-commits] core.git: 2 commits - basic/inc basic/source chart2/source include/basegfx include/basic include/canvas
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 10 06:45:15 UTC 2017
basic/inc/sbstdobj.hxx | 10 +++-------
basic/source/inc/namecont.hxx | 6 +++---
basic/source/inc/symtbl.hxx | 3 +--
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 6 ++----
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 6 ++----
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 6 ++----
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx | 6 ++----
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx | 4 ++--
chart2/source/controller/dialogs/tp_ChartType.hxx | 5 ++---
chart2/source/controller/dialogs/tp_DataSource.hxx | 6 ++----
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 6 ++----
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 5 ++---
chart2/source/controller/inc/CharacterPropertyItemConverter.hxx | 5 ++---
chart2/source/controller/inc/dlg_DataSource.hxx | 5 ++---
chart2/source/inc/CachedDataSequence.hxx | 6 ++----
chart2/source/inc/ErrorBar.hxx | 5 ++---
chart2/source/inc/LifeTime.hxx | 8 +++-----
chart2/source/inc/MediaDescriptorHelper.hxx | 7 ++-----
chart2/source/inc/UncachedDataSequence.hxx | 5 ++---
chart2/source/inc/WrappedIgnoreProperty.hxx | 4 ++--
chart2/source/model/inc/DataSeries.hxx | 5 ++---
chart2/source/model/inc/Diagram.hxx | 5 ++---
chart2/source/model/inc/StockBar.hxx | 5 ++---
chart2/source/model/main/Axis.hxx | 7 ++-----
chart2/source/model/main/DataPoint.hxx | 5 ++---
chart2/source/model/main/FormattedString.hxx | 5 ++---
chart2/source/model/main/GridProperties.hxx | 5 ++---
chart2/source/model/main/Legend.hxx | 5 ++---
chart2/source/model/main/PageBackground.hxx | 5 ++---
chart2/source/model/main/Title.hxx | 5 ++---
chart2/source/model/main/Wall.hxx | 4 ++--
chart2/source/model/template/AreaChartType.hxx | 4 ++--
chart2/source/model/template/BarChartType.hxx | 4 ++--
chart2/source/model/template/BubbleChartType.hxx | 4 ++--
chart2/source/model/template/CandleStickChartType.hxx | 4 ++--
chart2/source/model/template/ColumnChartType.hxx | 4 ++--
chart2/source/model/template/FilledNetChartType.hxx | 4 ++--
chart2/source/model/template/GL3DBarChartType.hxx | 4 ++--
chart2/source/model/template/LineChartType.hxx | 4 ++--
chart2/source/model/template/NetChartType.hxx | 4 ++--
chart2/source/model/template/PieChartType.hxx | 4 ++--
chart2/source/model/template/ScatterChartType.hxx | 4 ++--
chart2/source/tools/RegressionEquation.hxx | 5 ++---
chart2/source/view/axes/Tickmarks.hxx | 5 ++---
include/basegfx/color/bcolormodifier.hxx | 3 +--
include/basegfx/pixel/bpixel.hxx | 3 +--
include/basegfx/tuple/b2i64tuple.hxx | 3 +--
include/basic/sbx.hxx | 3 +--
include/canvas/parametricpolypolygon.hxx | 5 ++---
49 files changed, 96 insertions(+), 145 deletions(-)
New commits:
commit 049e026755f7c36c7594bf4e7891603930669a54
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 7 15:01:52 2017 +0200
loplugin:finalclasses in basic,basegfx
Change-Id: Iff223782fa0ded0fe46b8b7af35bfd21f331015f
Reviewed-on: https://gerrit.libreoffice.org/44535
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 8fe8c336b848..ba2190b143e2 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -35,9 +35,8 @@ public:
};
// class SbStdPicture
-class BASIC_DLLPUBLIC SbStdPicture : public SbxObject
+class BASIC_DLLPUBLIC SbStdPicture final : public SbxObject
{
-protected:
Graphic aGraphic;
virtual ~SbStdPicture() override;
@@ -56,9 +55,8 @@ public:
};
// class SbStdFont
-class BASIC_DLLPUBLIC SbStdFont : public SbxObject
+class BASIC_DLLPUBLIC SbStdFont final : public SbxObject
{
-protected:
bool bBold;
bool bItalic;
bool bStrikeThrough;
@@ -94,10 +92,8 @@ public:
};
// class SbStdClipboard
-class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject
+class BASIC_DLLPUBLIC SbStdClipboard final : public SbxObject
{
-protected:
-
virtual ~SbStdClipboard() override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 72016292713f..203660ae6ff0 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -613,13 +613,13 @@ public:
};
-class ScriptExtensionIterator
+class ScriptExtensionIterator final
{
public:
ScriptExtensionIterator();
OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
-protected:
+private:
css::uno::Reference< css::deployment::XPackage >
implGetNextUserScriptPackage( bool& rbPureDialogLib );
css::uno::Reference< css::deployment::XPackage >
@@ -648,7 +648,7 @@ protected:
int m_iUserPackage;
int m_iSharedPackage;
- int m_iBundledPackage;
+ int m_iBundledPackage;
ScriptSubPackageIterator* m_pScriptSubPackageIterator;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 5ff54d2f87af..64a11ea814f3 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -46,10 +46,9 @@ public:
};
-class SbiSymPool {
+class SbiSymPool final {
friend class SbiSymDef;
friend class SbiProcDef;
-protected:
SbiStringPool& rStrings;
std::vector<std::unique_ptr<SbiSymDef>> m_Data;
SbiSymPool* pParent;
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index def842fabf59..56b6c0a3a386 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -371,9 +371,8 @@ namespace basegfx
All references to BColorModifier members use shared pointers, thus instances of
BColorModifierStack can be copied by the default mechanisms if needed.
*/
- class BASEGFX_DLLPUBLIC BColorModifierStack
+ class BASEGFX_DLLPUBLIC BColorModifierStack final
{
- protected:
::std::vector< BColorModifierSharedPtr > maBColorModifiers;
public:
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index ed1dadc06a09..6ea620b0037c 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -27,9 +27,8 @@
namespace basegfx
{
- class BASEGFX_DLLPUBLIC BPixel
+ class BASEGFX_DLLPUBLIC BPixel final
{
- protected:
union
{
struct
diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index 10942b0dd452..ae3ec5f5a969 100644
--- a/include/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
@@ -35,9 +35,8 @@ namespace basegfx
@derive Use this class to implement Points or Vectors
which are based on two sal_Int64 values
*/
- class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2I64Tuple
+ class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2I64Tuple final
{
- protected:
sal_Int64 mnX;
sal_Int64 mnY;
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 45d00555ec3d..3bc9b9953017 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -218,9 +218,8 @@ public:
virtual void Clear() override;
};
-class BASIC_DLLPUBLIC SbxStdCollection : public SbxCollection
+class BASIC_DLLPUBLIC SbxStdCollection final : public SbxCollection
{
-protected:
OUString aElemClass;
bool bAddRemoveOk;
virtual ~SbxStdCollection() override;
commit 37a4a250662cbfb394f02ad29edca53d898a05d7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 7 14:56:48 2017 +0200
loplugin:finalclasses in chart2
Change-Id: I35afa226beb6fe4319313125c323d9f059837357
Reviewed-on: https://gerrit.libreoffice.org/44534
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 6e754d0bd446..8d613361be46 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -39,7 +39,7 @@ namespace wrapper
class Chart2ModelContact;
struct lcl_Operator;
-class ChartDataWrapper : public MutexContainer, public
+class ChartDataWrapper final : public MutexContainer, public
::cppu::WeakImplHelper<
css::chart2::XAnyDescriptionAccess,
css::chart::XDateCategories,
@@ -58,7 +58,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-protected:
+private:
// ____ XDateCategories ____
virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override;
virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override;
@@ -107,12 +107,10 @@ protected:
void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent );
-private: //methods
void switchToInternalDataProvider();
void initDataAccess();
void applyData( lcl_Operator& rDataOperator );
-private: //member
css::uno::Reference< css::chart2::XAnyDescriptionAccess > m_xDataAccess;
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 0890a9f47cc7..7b6f000c864a 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -41,7 +41,7 @@ namespace wrapper
class Chart2ModelContact;
-class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper<
+class DataSeriesPointWrapper final : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, css::lang::XServiceInfo
, css::lang::XInitialization
@@ -84,7 +84,7 @@ public:
virtual css::uno::Any getReferenceSize() override;
virtual css::awt::Size getCurrentSizeForReference() override;
-protected:
+private:
// ____ XComponent ____
virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
@@ -93,7 +93,6 @@ protected:
// ____ XEventListener ____
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
-protected:
// ____ WrappedPropertySet ____
virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
virtual const std::vector< WrappedProperty* > createWrappedProperties() override;
@@ -109,7 +108,6 @@ protected:
css::uno::Reference< css::chart2::XDataSeries > getDataSeries();
css::uno::Reference< css::beans::XPropertySet > getDataPointProperties();
-private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index a21671cf2963..59a2bea8c409 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -39,7 +39,7 @@ namespace chart
namespace wrapper
{
-class TitleWrapper : public ::cppu::ImplInheritanceHelper<
+class TitleWrapper final : public ::cppu::ImplInheritanceHelper<
WrappedPropertySet
, css::drawing::XShape
, css::lang::XComponent
@@ -62,7 +62,7 @@ public:
virtual css::uno::Any getReferenceSize() override;
virtual css::awt::Size getCurrentSizeForReference() override;
-protected:
+private:
// ____ XShape ____
virtual css::awt::Point SAL_CALL getPosition() override;
virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
@@ -101,10 +101,8 @@ protected:
css::uno::Reference< css::beans::XPropertySet > getFirstCharacterPropertySet();
-private:
css::uno::Reference< css::chart2::XTitle > getTitleObject();
-private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 1ad84ded5870..3c4a1358b651 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -30,7 +30,7 @@ namespace chart
namespace wrapper
{
-class WrappedScaleProperty : public WrappedProperty
+class WrappedScaleProperty final : public WrappedProperty
{
public:
enum tScaleProperty
@@ -53,7 +53,6 @@ public:
, SCALE_PROP_REVERSEDIRECTION
};
-public:
WrappedScaleProperty(tScaleProperty eScaleProperty, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
virtual ~WrappedScaleProperty() override;
@@ -63,7 +62,7 @@ public:
virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
-protected: //methods
+private:
/// @throws css::beans::UnknownPropertyException
/// @throws css::beans::PropertyVetoException
/// @throws css::lang::IllegalArgumentException
@@ -75,7 +74,6 @@ protected: //methods
/// @throws css::uno::RuntimeException
css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
-private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
tScaleProperty m_eScaleProperty;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
index 17adb3fdd209..58392f0a7a84 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class WrappedTextRotationProperty : public WrappedProperty
+class WrappedTextRotationProperty final : public WrappedProperty
{
public:
explicit WrappedTextRotationProperty( bool bDirectState=false );
@@ -32,7 +32,7 @@ public:
virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
-protected:
+private:
virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override;
virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index cac7eef81570..0fd92b0ff5dd 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -45,7 +45,7 @@ class ChartTypeParameter;
class SortByXValuesResourceGroup;
class GL3DResourceGroup;
-class ChartTypeTabPage : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider
+class ChartTypeTabPage final : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider
{
public:
ChartTypeTabPage( vcl::Window* pParent
@@ -59,7 +59,7 @@ public:
virtual css::uno::Reference< css::chart2::XChartTypeTemplate > getCurrentTemplate() const override;
-protected:
+private:
ChartTypeDialogController* getSelectedMainType();
void showAllControls( ChartTypeDialogController& rTypeController );
void fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList=true );
@@ -73,7 +73,6 @@ protected:
DECL_LINK( SelectMainTypeHdl, ListBox&, void );
DECL_LINK( SelectSubTypeHdl, ValueSet*, void );
-protected:
VclPtr<FixedText> m_pFT_ChooseType;
VclPtr<ListBox> m_pMainTypeList;
VclPtr<ValueSet> m_pSubTypeList;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 8975f633d2b8..d3507fcc9bfe 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -47,7 +47,7 @@ namespace chart
class ChartTypeTemplateProvider;
class DialogModel;
-class DataSourceTabPage :
+class DataSourceTabPage final :
public ::svt::OWizardPage,
public RangeSelectionListenerParent
{
@@ -63,7 +63,7 @@ public:
void commitPage();
-protected:
+private:
// OWizardPage
virtual void ActivatePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override;
@@ -90,7 +90,6 @@ protected:
void updateControlState();
-protected:
/** updates the internal data according to the content of the given edit
field. If pField is 0, all relevant fields are used
@@ -115,7 +114,6 @@ protected:
void fillSeriesListBox();
void fillRoleListBox();
-private:
VclPtr<FixedText> m_pFT_CAPTION;
VclPtr<FixedText> m_pFT_SERIES;
VclPtr<SvTreeListBox> m_pLB_SERIES;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index bb9e6384cff2..ffd0c67fd096 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -37,7 +37,7 @@ namespace chart
class ChartTypeTemplateProvider;
class DialogModel;
-class RangeChooserTabPage : public svt::OWizardPage, public RangeSelectionListenerParent
+class RangeChooserTabPage final : public svt::OWizardPage, public RangeSelectionListenerParent
{
public:
@@ -55,7 +55,7 @@ public:
void commitPage();
-protected: //methods
+private:
//OWizardPage
virtual void ActivatePage() override;
@@ -75,8 +75,6 @@ protected: //methods
DECL_LINK( ControlChangedRadioHdl, RadioButton&, void );
DECL_LINK( ControlEditedHdl, Edit&, void );
-protected: //member
-
VclPtr<FixedText> m_pFT_Caption;
VclPtr<FixedText> m_pFT_Range;
VclPtr<Edit> m_pED_Range;
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index dcba05766407..ae070e09cf11 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -36,7 +36,7 @@
namespace chart
{
-class TitlesAndObjectsTabPage : public svt::OWizardPage
+class TitlesAndObjectsTabPage final : public svt::OWizardPage
{
public:
TitlesAndObjectsTabPage( svt::OWizardMachine* pParent
@@ -49,13 +49,12 @@ public:
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override;
virtual bool canAdvance() const override;
-protected:
+private:
void commitToModel();
DECL_LINK( ChangeHdl, LinkParamNone*, void );
DECL_LINK( ChangeEditHdl, Edit&, void );
DECL_LINK( ChangeCheckBoxHdl, CheckBox&, void );
-protected:
std::unique_ptr< TitleResources > m_xTitleResources;
std::unique_ptr< LegendPositionResources > m_xLegendPositionResources;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 5c21d43c9365..42a7ef895493 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -27,7 +27,7 @@
namespace chart { namespace wrapper {
-class CharacterPropertyItemConverter : public ItemConverter
+class CharacterPropertyItemConverter final : public ItemConverter
{
public:
CharacterPropertyItemConverter(
@@ -43,7 +43,7 @@ public:
virtual ~CharacterPropertyItemConverter() override;
-protected:
+private:
virtual const sal_uInt16* GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
@@ -51,7 +51,6 @@ protected:
const css::uno::Reference<css::beans::XPropertySet>& GetRefSizePropertySet() const;
-private:
OUString m_aRefSizePropertyName;
css::uno::Reference<css::beans::XPropertySet> m_xRefSizePropSet;
boost::optional<css::awt::Size> m_pRefSize;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index c3be2086e7e4..1e5c4fee95fb 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -38,7 +38,7 @@ class DataSourceTabPage;
class ChartTypeTemplateProvider;
class DialogModel;
-class DataSourceDialog :
+class DataSourceDialog final :
public TabDialog,
public TabPageNotifiable
{
@@ -57,11 +57,10 @@ public:
virtual void setInvalidPage( TabPage * pTabPage ) override;
virtual void setValidPage( TabPage * pTabPage ) override;
-protected:
+private:
std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
std::unique_ptr< DialogModel > m_apDialogModel;
-private:
VclPtr<DataSourceTabControl> m_pTabControl;
VclPtr<OKButton> m_pBtnOK;
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 2e4c6359550e..91bbd3870baf 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -58,7 +58,7 @@ typedef ::cppu::WeakComponentImplHelper<
/**
* This sequence object does store actual values within, hence "cached".
*/
-class CachedDataSequence :
+class CachedDataSequence final :
public ::comphelper::OMutexAndBroadcastHelper,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper< CachedDataSequence >,
@@ -91,7 +91,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
// ____ XPropertySet ____
/// @see css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
@@ -144,7 +144,6 @@ protected:
*/
void registerProperties();
-private:
/** is used by interface method getNumericalData().
*/
css::uno::Sequence< double > Impl_getNumericalData() const;
@@ -155,7 +154,6 @@ private:
*/
css::uno::Sequence< css::uno::Any > Impl_getMixedData() const;
-private:
enum DataType m_eCurrentDataType;
css::uno::Sequence< double > m_aNumericalSequence;
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 93d3128fd2cd..da8b3d8ec9da 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -59,7 +59,7 @@ typedef ::cppu::WeakImplHelper<
ErrorBar_Base;
}
-class ErrorBar :
+class ErrorBar final :
public MutexContainer,
public impl::ErrorBar_Base
{
@@ -104,7 +104,7 @@ public:
virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) override;
virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) override;
-protected:
+private:
ErrorBar( const ErrorBar & rOther );
// ____ XCloneable ____
@@ -130,7 +130,6 @@ protected:
// ____ XDataSource ____
virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
-private:
typedef std::vector< css::uno::Reference<
css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index f129a06829d4..1745e5552cf8 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -72,9 +72,8 @@ protected:
sal_Int32 volatile m_nLongLastingCallCount;
};
-class CloseableLifeTimeManager : public LifeTimeManager
+class CloseableLifeTimeManager final : public LifeTimeManager
{
-protected:
css::util::XCloseable* m_pCloseable;
::osl::Condition m_aEndTryClosingCondition;
@@ -100,7 +99,7 @@ OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose();
/// @throws css::uno::RuntimeException
OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener );
-protected:
+private:
virtual bool impl_canStartApiCall() override;
virtual void impl_apiCallCountReachedNull() override;
@@ -206,9 +205,8 @@ private:
};
template<class T>
-class NegativeGuard
+class NegativeGuard final
{
-protected:
T * m_pT;
public:
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index f7d589692111..be9d258d9ae0 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -43,16 +43,13 @@
namespace apphelper
{
-class OOO_DLLPUBLIC_CHARTTOOLS MediaDescriptorHelper
+class OOO_DLLPUBLIC_CHARTTOOLS MediaDescriptorHelper final
{
-private:
- //MediaDescriptorHelper(){};
public:
MediaDescriptorHelper( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor );
const css::uno::Sequence< css::beans::PropertyValue >& getReducedForModel() { return m_aModelProperties;}
-public:
//all properties given in the constructor are stored in the following three sequences
css::uno::Sequence< css::beans::PropertyValue >
@@ -97,7 +94,7 @@ public:
Stream;
bool ISSET_Stream;
-protected:
+private:
SAL_DLLPRIVATE void impl_init();
};
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 3077586c3803..b1187dd05731 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -70,7 +70,7 @@ typedef ::cppu::WeakComponentImplHelper<
* <p>A range representation can be either '0', '1', '2', ..., or 'label 1',
* 'label 2', ....</p>
*/
-class UncachedDataSequence :
+class UncachedDataSequence final :
public ::comphelper::OMutexAndBroadcastHelper,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper< UncachedDataSequence >,
@@ -100,7 +100,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
// ____ XPropertySet ____
/// @see css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
@@ -165,7 +165,6 @@ protected:
*/
void registerProperties();
-private:
css::uno::Reference< css::chart2::XInternalDataProvider > m_xDataProvider;
OUString m_aSourceRepresentation;
css::uno::Reference< css::util::XModifyListener >
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index 14bf3ddf514d..2dfed48aa838 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -27,7 +27,7 @@
namespace chart
{
-class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty
+class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty final : public WrappedProperty
{
public:
WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue );
@@ -43,7 +43,7 @@ SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Referen
SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
-protected:
+private:
css::uno::Any m_aDefaultValue;
mutable css::uno::Any m_aCurrentValue;
};
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 49e2e5f72c7b..ee45f584d7b9 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -60,7 +60,7 @@ typedef ::cppu::WeakImplHelper<
DataSeries_Base;
}
-class DataSeries :
+class DataSeries final :
public MutexContainer,
public impl::DataSeries_Base,
public ::property::OPropertySet
@@ -79,7 +79,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit DataSeries( const DataSeries & rOther );
// late initialization to call after copy-constructing
@@ -150,7 +150,6 @@ protected:
void fireModifyEvent();
-private:
typedef std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 12102cc1bbb4..e622cca202a3 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -55,7 +55,7 @@ typedef ::cppu::WeakImplHelper<
Diagram_Base;
}
-class Diagram :
+class Diagram final :
public MutexContainer,
public impl::Diagram_Base,
public ::property::OPropertySet
@@ -74,7 +74,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit Diagram( const Diagram & rOther );
// ____ OPropertySet ____
@@ -152,7 +152,6 @@ protected:
void fireModifyEvent();
-private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
typedef
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index 06ff1cc59f3f..ed3afcf20a99 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper<
StockBar_Base;
}
-class StockBar :
+class StockBar final :
public MutexContainer,
public impl::StockBar_Base,
public ::property::OPropertySet
@@ -52,7 +52,7 @@ public:
/// merge XInterface implementations
DECLARE_XINTERFACE()
-protected:
+private:
explicit StockBar( const StockBar & rOther );
// ____ OPropertySet ____
@@ -85,7 +85,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
-private:
const bool m_bRisingCourse;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index e82190e97532..942dd7d4c489 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -48,7 +48,7 @@ typedef ::cppu::WeakImplHelper<
Axis_Base;
}
-class Axis :
+class Axis final :
public MutexContainer,
public impl::Axis_Base,
public ::property::OPropertySet
@@ -67,7 +67,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit Axis( const Axis & rOther );
// late initialization to call after copy-constructing
@@ -119,11 +119,8 @@ protected:
void fireModifyEvent();
-private: //methods
void AllocateSubGrids();
-private: //member
-
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
css::chart2::ScaleData m_aScaleData;
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 22914a12018a..6236d210d6b8 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -44,7 +44,7 @@ typedef ::cppu::WeakImplHelper<
DataPoint_Base;
}
-class DataPoint :
+class DataPoint final :
public MutexContainer,
public impl::DataPoint_Base,
public ::property::OPropertySet
@@ -60,7 +60,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-protected:
+private:
explicit DataPoint( const DataPoint & rOther );
// ____ OPropertySet ____
@@ -101,7 +101,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
-private:
css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 64fd195ce7e2..16c73372ebcc 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper<
FormattedString_Base;
}
-class FormattedString :
+class FormattedString final :
public MutexContainer,
public impl::FormattedString_Base,
public ::property::OPropertySet
@@ -75,7 +75,7 @@ public:
virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ ::property::OPropertySet::removeVetoableChangeListener(p1, p2); }
-protected:
+private:
explicit FormattedString( const FormattedString & rOther );
// ____ XFormattedString ____
@@ -115,7 +115,6 @@ protected:
void fireModifyEvent();
-private:
OUString m_aString;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index 3ac0cf21b53b..090e37edc2df 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -44,7 +44,7 @@ typedef ::cppu::WeakImplHelper<
GridProperties_Base;
}
-class GridProperties :
+class GridProperties final :
public MutexContainer,
public impl::GridProperties_Base,
public ::property::OPropertySet
@@ -63,7 +63,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit GridProperties( const GridProperties & rOther );
// ____ OPropertySet ____
@@ -96,7 +96,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
-private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 19c2a4b72a8d..74eb63c856b2 100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -45,7 +45,7 @@ typedef ::cppu::WeakImplHelper<
Legend_Base;
}
-class Legend :
+class Legend final :
public MutexContainer,
public impl::Legend_Base,
public ::property::OPropertySet
@@ -64,7 +64,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit Legend( const Legend & rOther );
// ____ OPropertySet ____
@@ -98,7 +98,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
-private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index 98c9c8c3f99a..2863dedde35e 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper<
PageBackground_Base;
}
-class PageBackground :
+class PageBackground final :
public MutexContainer,
public impl::PageBackground_Base,
public ::property::OPropertySet
@@ -59,7 +59,7 @@ public:
/// merge XInterface implementations
DECLARE_XINTERFACE()
-protected:
+private:
explicit PageBackground( const PageBackground & rOther );
// ____ OPropertySet ____
@@ -93,7 +93,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
-private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index 982cbe3a49d2..a402fb9f514a 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper<
Title_Base;
}
-class Title :
+class Title final :
public MutexContainer,
public impl::Title_Base,
public ::property::OPropertySet
@@ -62,7 +62,7 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-protected:
+private:
explicit Title( const Title & rOther );
// ____ OPropertySet ____
@@ -102,7 +102,6 @@ protected:
void fireModifyEvent();
-private:
css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index b325aaca0db9..25bc245292a0 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper<
Wall_Base;
}
-class Wall :
+class Wall final :
public MutexContainer,
public impl::Wall_Base,
public ::property::OPropertySet
@@ -54,7 +54,7 @@ public:
/// merge XInterface implementations
DECLARE_XINTERFACE()
-protected:
+private:
explicit Wall( const Wall & rOther );
// ____ OPropertySet ____
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index 9cbc090f8e3f..8f3b67a2d6b6 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class AreaChartType : public ChartType
+class AreaChartType final : public ChartType
{
public:
explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -37,7 +37,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit AreaChartType( const AreaChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 0db8a8b7d5d5..8d04613ebc97 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class BarChartType : public ChartType
+class BarChartType final : public ChartType
{
public:
explicit BarChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -37,7 +37,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit BarChartType( const BarChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index c3248c0b1a4a..5fe58f3a15da 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -25,7 +25,7 @@
namespace chart
{
-class BubbleChartType : public ChartType
+class BubbleChartType final : public ChartType
{
public:
explicit BubbleChartType(
@@ -39,7 +39,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit BubbleChartType( const BubbleChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index 2e9ae89256f7..c153ad8a5892 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class CandleStickChartType : public ChartType
+class CandleStickChartType final : public ChartType
{
public:
explicit CandleStickChartType(
@@ -38,7 +38,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit CandleStickChartType( const CandleStickChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index 5f2aaea15b14..860c13ceb68a 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class ColumnChartType : public ChartType
+class ColumnChartType final : public ChartType
{
public:
explicit ColumnChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -37,7 +37,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit ColumnChartType( const ColumnChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index 49fc980d1078..48109fb31bec 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class FilledNetChartType : public NetChartType_Base
+class FilledNetChartType final : public NetChartType_Base
{
public:
explicit FilledNetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -37,7 +37,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit FilledNetChartType( const FilledNetChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index 75a156988507..3161285df271 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -18,7 +18,7 @@ namespace chart {
* Chart type that represents 3 dimensional data content in 3D space using
* OpenGL.
*/
-class GL3DBarChartType : public ChartType
+class GL3DBarChartType final : public ChartType
{
public:
explicit GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext );
@@ -33,7 +33,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
GL3DBarChartType( const GL3DBarChartType& rOther );
virtual OUString SAL_CALL getChartType() override;
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index d001b72bf424..18269668db70 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -25,7 +25,7 @@
namespace chart
{
-class LineChartType : public ChartType
+class LineChartType final : public ChartType
{
public:
explicit LineChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -38,7 +38,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit LineChartType( const LineChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index 61a5d4fa184c..53e588751a99 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -47,7 +47,7 @@ protected:
getPropertySetInfo() override;
};
-class NetChartType : public NetChartType_Base
+class NetChartType final : public NetChartType_Base
{
public:
explicit NetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -60,7 +60,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit NetChartType( const NetChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index 86509405b313..ad2da929aa6f 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -24,7 +24,7 @@
namespace chart
{
-class PieChartType : public ChartType
+class PieChartType final: public ChartType
{
public:
explicit PieChartType(
@@ -38,7 +38,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit PieChartType( const PieChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index a09a840224ab..db4899f5534b 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -25,7 +25,7 @@
namespace chart
{
-class ScatterChartType : public ChartType
+class ScatterChartType final : public ChartType
{
public:
ScatterChartType(
@@ -42,7 +42,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-protected:
+private:
explicit ScatterChartType( const ScatterChartType & rOther );
// ____ XChartType ____
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 484323b6a9c7..5f2a1113ca98 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -47,7 +47,7 @@ typedef ::cppu::WeakImplHelper<
RegressionEquation_Base;
}
-class RegressionEquation :
+class RegressionEquation final :
public MutexContainer,
public impl::RegressionEquation_Base,
public ::property::OPropertySet
@@ -69,7 +69,7 @@ public:
/// merge XInterface implementations
DECLARE_XINTERFACE()
-protected:
+private:
explicit RegressionEquation( const RegressionEquation & rOther );
// ____ OPropertySet ____
@@ -112,7 +112,6 @@ protected:
void fireModifyEvent();
-private:
css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index c1bf88f590f1..dbf51d9762bf 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -110,7 +110,7 @@ protected: //member
double m_fScaledVisibleMax;
};
-class TickFactory2D : public TickFactory
+class TickFactory2D final : public TickFactory
{
public:
TickFactory2D(
@@ -137,10 +137,9 @@ public:
bool isHorizontalAxis() const;
bool isVerticalAxis() const;
-protected: //methods
+private:
::basegfx::B2DVector getTickScreenPosition2D( double fScaledLogicTickValue ) const;
-private: //member
::basegfx::B2DVector m_aAxisStartScreenPosition2D;
::basegfx::B2DVector m_aAxisEndScreenPosition2D;
diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index 396b42094ede..060b2037c532 100644
--- a/include/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
@@ -43,7 +43,7 @@ namespace canvas
typedef cppu::WeakComponentImplHelper< css::rendering::XParametricPolyPolygon2D,
css::lang::XServiceInfo > ParametricPolyPolygon_Base;
- class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex,
+ class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon final : public ::cppu::BaseMutex,
public ParametricPolyPolygon_Base
{
public:
@@ -113,12 +113,11 @@ namespace canvas
/// Query all defining values of this object atomically
Values getValues() const;
- protected:
+ private:
virtual ~ParametricPolyPolygon() override; // we're a ref-counted UNO class. _We_ destroy ourselves.
ParametricPolyPolygon(const ParametricPolyPolygon&) = delete;
ParametricPolyPolygon& operator=( const ParametricPolyPolygon& ) = delete;
- private:
static ParametricPolyPolygon* createLinearHorizontalGradient( const css::uno::Reference<
css::rendering::XGraphicDevice >& rDevice,
const css::uno::Sequence< css::uno::Sequence< double > >& colors,
More information about the Libreoffice-commits
mailing list