[Libreoffice-commits] core.git: basctl/source chart2/source include/basic include/codemaker
Noel Grandin
noel.grandin at collabora.co.uk
Tue Nov 8 08:57:32 UTC 2016
basctl/source/basicide/moduldl2.cxx | 4 ++--
chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx | 4 ++--
chart2/source/controller/dialogs/DataBrowserModel.hxx | 4 ++--
chart2/source/controller/dialogs/res_DataLabel.hxx | 4 ++--
chart2/source/controller/dialogs/res_Trendline.hxx | 4 ++--
chart2/source/controller/inc/ChartController.hxx | 4 ++--
chart2/source/controller/inc/TimerTriggeredControllerLock.hxx | 4 ++--
chart2/source/controller/inc/ViewElementListProvider.hxx | 4 ++--
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 4 ++--
chart2/source/controller/inc/res_LegendPosition.hxx | 4 ++--
chart2/source/controller/inc/res_Titles.hxx | 4 ++--
chart2/source/inc/ExplicitCategoriesProvider.hxx | 4 ++--
chart2/source/inc/NumberFormatterWrapper.hxx | 10 ++++------
chart2/source/inc/TrueGuard.hxx | 4 ++--
chart2/source/view/inc/VDiagram.hxx | 4 ++--
chart2/source/view/main/VTitle.hxx | 7 ++-----
include/basic/codecompletecache.hxx | 4 ++--
include/codemaker/global.hxx | 8 ++++----
18 files changed, 40 insertions(+), 45 deletions(-)
New commits:
commit f606a6b248956094a14c15d8154af5f8522e415b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 8 08:32:23 2016 +0200
loplugin:unnecessaryvirtual in basctl..chart2
Change-Id: Id4eeb12792c3a66b68a907cb459ab437e3d64e4c
Reviewed-on: https://gerrit.libreoffice.org/30680
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b51ae9e..92062a6 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -92,7 +92,7 @@ public:
};
// LibUserData
-class LibUserData
+class LibUserData final
{
private:
ScriptDocument m_aDocument;
@@ -102,7 +102,7 @@ public:
: m_aDocument(rDocument)
{
}
- virtual ~LibUserData() {};
+ ~LibUserData() {};
const ScriptDocument& GetDocument() const { return m_aDocument; }
};
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index a0e9305..214963c 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -43,11 +43,11 @@ class ChartModel;
namespace wrapper
{
-class Chart2ModelContact
+class Chart2ModelContact final
{
public:
explicit Chart2ModelContact( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual ~Chart2ModelContact();
+ ~Chart2ModelContact();
public:
void setModel( const css::uno::Reference< css::frame::XModel >& xChartModel );
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index c57d4ef..f191a60 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -35,13 +35,13 @@ namespace chart
class DialogModel;
-class DataBrowserModel
+class DataBrowserModel final
{
public:
explicit DataBrowserModel(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc,
const css::uno::Reference< css::uno::XComponentContext > & xContext );
- virtual ~DataBrowserModel();
+ ~DataBrowserModel();
/** Inserts a new data series after the data series to which the data column
with index nAfterColumnIndex belongs.
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 0136665..4b86489 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -31,11 +31,11 @@ class SvNumberFormatter;
namespace chart
{
-class DataLabelResources
+class DataLabelResources final
{
public:
DataLabelResources( VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs );
- virtual ~DataLabelResources();
+ ~DataLabelResources();
bool FillItemSet(SfxItemSet* rOutAttrs) const;
void Reset(const SfxItemSet& rInAttrs);
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 1dccbd3..ffe35e7 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -31,11 +31,11 @@
namespace chart
{
-class TrendlineResources
+class TrendlineResources final
{
public:
TrendlineResources( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- virtual ~TrendlineResources();
+ ~TrendlineResources();
void Reset(const SfxItemSet& rInAttrs);
bool FillItemSet(SfxItemSet* rOutAttrs) const;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index a128a03..b056c79 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -408,14 +408,14 @@ private:
//each controller might consider himself as owner of the model first
bool m_bOwnership;
};
- class TheModelRef
+ class TheModelRef final
{
public:
TheModelRef( TheModel* pTheModel, ::osl::Mutex& rMutex );
TheModelRef( const TheModelRef& rTheModel, ::osl::Mutex& rMutex );
TheModelRef& operator=(ChartController::TheModel* pTheModel);
TheModelRef& operator=(const TheModelRef& rTheModel);
- virtual ~TheModelRef();
+ ~TheModelRef();
bool is() const;
TheModel* operator->() const { return m_pTheModel; }
private:
diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
index dd2c3dc..2e26054 100644
--- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
@@ -28,11 +28,11 @@
namespace chart
{
-class TimerTriggeredControllerLock
+class TimerTriggeredControllerLock final
{
public:
TimerTriggeredControllerLock( const css::uno::Reference< css::frame::XModel >& xModel );
- virtual ~TimerTriggeredControllerLock();
+ ~TimerTriggeredControllerLock();
void startTimer();
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index c1b9bdd..d61d380 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -29,11 +29,11 @@ namespace chart
class DrawModelWrapper;
-class ViewElementListProvider
+class ViewElementListProvider final
{
public:
ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper );
- virtual ~ViewElementListProvider();
+ ~ViewElementListProvider();
XColorListRef GetColorTable() const;
XDashListRef GetDashList() const;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 4c82d01..2eda271 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -27,11 +27,11 @@
namespace chart
{
-class ObjectPropertiesDialogParameter
+class ObjectPropertiesDialogParameter final
{
public:
ObjectPropertiesDialogParameter( const OUString& rObjectCID );
- virtual ~ObjectPropertiesDialogParameter();
+ ~ObjectPropertiesDialogParameter();
void init( const css::uno::Reference< css::frame::XModel >& xModel );
ObjectType getObjectType() const { return m_eObjectType;}
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index cf64420..bed2a64 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -29,7 +29,7 @@
namespace chart
{
-class LegendPositionResources
+class LegendPositionResources final
{
public:
@@ -38,7 +38,7 @@ public:
//constructor inclusive Display checkbox
LegendPositionResources(VclBuilderContainer& rParent, const css::uno::Reference<
css::uno::XComponentContext>& xCC );
- virtual ~LegendPositionResources();
+ ~LegendPositionResources();
void writeToResources( const css::uno::Reference< css::frame::XModel >& xChartModel );
void writeToModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) const;
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index 79c1ce7..1902a57 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -26,11 +26,11 @@
namespace chart
{
-class TitleResources
+class TitleResources final
{
public:
TitleResources(VclBuilderContainer& rParent, bool bShowSecondaryAxesTitle);
- virtual ~TitleResources();
+ ~TitleResources();
void writeToResources( const TitleDialogData& rInput );
void readFromResources( TitleDialogData& rOutput );
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 54763be..7a39bf6 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -47,13 +47,13 @@ public:
virtual css::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
};
-class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider
+class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider final
{
public:
ExplicitCategoriesProvider( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel
, ChartModel& rChartModel
);
- virtual ~ExplicitCategoriesProvider();
+ ~ExplicitCategoriesProvider();
void init();
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index 4743054..a978b2b 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -26,15 +26,13 @@
namespace chart
{
-/**
-*/
class FixedNumberFormatter;
-class OOO_DLLPUBLIC_CHARTTOOLS NumberFormatterWrapper
+class OOO_DLLPUBLIC_CHARTTOOLS NumberFormatterWrapper final
{
public:
NumberFormatterWrapper( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier );
- virtual ~NumberFormatterWrapper();
+ ~NumberFormatterWrapper();
SvNumberFormatter* getSvNumberFormatter() const { return m_pNumberFormatter;}
const css::uno::Reference< css::util::XNumberFormatsSupplier >&
@@ -51,12 +49,12 @@ private: //private member
css::uno::Any m_aNullDate;
};
-class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter
+class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter final
{
public:
FixedNumberFormatter( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier
, sal_Int32 nNumberFormatKey );
- virtual ~FixedNumberFormatter();
+ ~FixedNumberFormatter();
OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx
index 2cf602a..36121f3 100644
--- a/chart2/source/inc/TrueGuard.hxx
+++ b/chart2/source/inc/TrueGuard.hxx
@@ -25,11 +25,11 @@ namespace chart
{
/** This guard sets the given boolean reference to true in the constructor and to false in the destructor
*/
-class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard
+class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard final
{
public:
explicit TrueGuard( bool& rbTrueDuringGuardedTime );
- virtual ~TrueGuard();
+ ~TrueGuard();
private:
bool& m_rbTrueDuringGuardedTime;
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 9a684ea..6dc7fbd 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -36,13 +36,13 @@ The axes and data series are subobjects which are created and managed by the
diagram.
*/
-class VDiagram
+class VDiagram final
{
public: //methods
VDiagram( const css::uno::Reference<css::chart2::XDiagram>& xDiagram,
const css::drawing::Direction3D& rPreferredAspectRatio,
sal_Int32 nDimension = 3 );
- virtual ~VDiagram();
+ ~VDiagram();
void init(
const css::uno::Reference<css::drawing::XShapes>& xTarget,
diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx
index 983b341..7ccbe7a 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -26,14 +26,11 @@
namespace chart
{
-/**
-*/
-
-class VTitle
+class VTitle final
{
public:
explicit VTitle( const css::uno::Reference< css::chart2::XTitle > & xTitle );
- virtual ~VTitle();
+ ~VTitle();
void init( const css::uno::Reference< css::drawing::XShapes >& xTargetPage
, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index 07e6c37..f1c3a9f 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -70,7 +70,7 @@ public:
static void SetAutoCorrectOn( bool b );
};
-class BASIC_DLLPUBLIC CodeCompleteDataCache
+class BASIC_DLLPUBLIC CodeCompleteDataCache final
{
/*
* cache to store data for
@@ -82,7 +82,7 @@ private:
public:
CodeCompleteDataCache(){}
- virtual ~CodeCompleteDataCache(){}
+ ~CodeCompleteDataCache(){}
friend BASIC_DLLPUBLIC std::ostream& operator<< (std::ostream& aStream, const CodeCompleteDataCache& aCache);
diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index d9dc636..f171411 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -37,11 +37,11 @@ typedef ::std::set< ::rtl::OString > StringSet;
// FileStream
-class FileStream
+class FileStream final
{
public:
FileStream();
- virtual ~FileStream();
+ ~FileStream();
bool isValid();
@@ -84,11 +84,11 @@ bool removeTypeFile(const ::rtl::OString& fileName);
::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);
-class CannotDumpException {
+class CannotDumpException final {
public:
CannotDumpException(OUString const & message): message_(message) {}
- virtual ~CannotDumpException() throw ();
+ ~CannotDumpException() throw ();
const OUString& getMessage() const { return message_; }
More information about the Libreoffice-commits
mailing list