[Libreoffice-commits] core.git: cui/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Nov 7 06:36:53 UTC 2017
cui/source/inc/SvxToolbarConfigPage.hxx | 4 ---
cui/source/inc/cuifmsearch.hxx | 5 +---
cui/source/inc/cuitabarea.hxx | 4 ---
cui/source/inc/cuitabline.hxx | 4 ---
cui/source/inc/headertablistbox.hxx | 3 --
cui/source/inc/hldoctp.hxx | 3 --
cui/source/inc/macroass.hxx | 3 --
cui/source/inc/numpages.hxx | 31 +++++++++++++-----------------
cui/source/inc/showcols.hxx | 4 +--
cui/source/inc/treeopt.hxx | 3 --
cui/source/options/connpooloptions.hxx | 6 +----
cui/source/options/connpoolsettings.hxx | 7 +-----
cui/source/options/dbregistersettings.hxx | 3 --
cui/source/options/doclinkdialog.hxx | 5 +---
14 files changed, 32 insertions(+), 53 deletions(-)
New commits:
commit d0a4b17d58285ad616cf951d7e3b5fe89802c01d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 6 14:02:20 2017 +0200
loplugin:finalclasses in cui
Change-Id: I59c148dbc2bfc1dff554efe7e7c974dc557b2aeb
Reviewed-on: https://gerrit.libreoffice.org/44362
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index 7426fb2b7be3..aedc7066678c 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -92,7 +92,7 @@ public:
bool docConfig ) override;
};
-class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
+class SvxToolbarEntriesListBox final : public SvxMenuEntriesListBox
{
Size m_aCheckBoxImageSizePixel;
SvLBoxButtonData* m_pButtonData;
@@ -100,8 +100,6 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
void ChangeVisibility( SvTreeListEntry* pEntry );
-protected:
-
virtual void CheckButtonHdl() override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void BuildCheckBoxButtonImages( SvLBoxButtonData* );
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 51e521f26881..ccc7e88a8469 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -42,7 +42,7 @@ struct FmSearchProgress;
class FmSearchEngine;
/// Dialog for searching in Forms/Tables
-class FmSearchDialog : public ModalDialog
+class FmSearchDialog final : public ModalDialog
{
friend class FmSearchEngine;
@@ -131,7 +131,7 @@ public:
inline void SetActiveField(const OUString& strField);
-protected:
+private:
virtual bool Close() override;
void Init(const OUString& strVisibleFields, const OUString& strInitialText);
@@ -155,7 +155,6 @@ protected:
void LoadParams();
void SaveParams() const;
-private:
// Handler for the Controls
DECL_LINK( OnClickedFieldRadios, Button*, void );
DECL_LINK(OnClickedSearchAgain, Button *, void);
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 12b48faa7566..37dcc7ac2afb 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -94,13 +94,12 @@ enum class PageType
Transparence,
};
-class SvxAreaTabDialog : public SfxTabDialog
+class SvxAreaTabDialog final : public SfxTabDialog
{
sal_uInt16 m_nAreaTabPage;
sal_uInt16 m_nShadowTabPage;
sal_uInt16 m_nTransparenceTabPage;
-private:
SdrModel* mpDrawModel;
XColorListRef mpColorList;
@@ -124,7 +123,6 @@ private:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
-protected:
virtual short Ok() override;
DECL_LINK( CancelHdlImpl, Button*, void );
void SavePalettes();
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 95fbe6ed9f0c..5fabc21eada0 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -27,14 +27,13 @@
enum class PageType;
class SvxColorListBox;
-class SvxLineTabDialog : public SfxTabDialog
+class SvxLineTabDialog final : public SfxTabDialog
{
sal_uInt16 m_nLineTabPage;
sal_uInt16 m_nShadowTabPage;
sal_uInt16 m_nStyleTabPage;
sal_uInt16 m_nEndTabPage;
-private:
SdrModel* pDrawModel;
const SdrObject* pObj;
@@ -58,7 +57,6 @@ private:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
-protected:
virtual short Ok() override;
DECL_LINK( CancelHdlImpl, Button*, void );
void SavePalettes();
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 2b8cea750c7c..bab7574d570c 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -24,12 +24,11 @@
#include <svtools/svtabbx.hxx>
-class MacroEventListBox : public Control
+class MacroEventListBox final : public Control
{
private:
VclPtr<HeaderBar> maHeaderBar;
VclPtr<SvHeaderTabListBox> maListBox;
-protected:
DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void );
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
public:
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 51e4f9cc7002..b8a8b8dfb30d 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -27,7 +27,7 @@
|*
\************************************************************************/
-class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase
+class SvxHyperlinkDocTp final : public SvxHyperlinkTabPageBase
{
private:
VclPtr<SvxHyperURLBox> m_pCbbPath;
@@ -56,7 +56,6 @@ private:
Type_ExistsDir, Type_Dir };
static EPathType GetPathType ( const OUString& rStrPath );
-protected:
void FillDlgFields(const OUString& rStrURL) override;
void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 8fe19005b034..dd34296043d5 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -33,7 +33,7 @@ class SvTabListBox;
class SvTreeListBox;
class SfxMacroTabPage_Impl;
-class SfxMacroTabPage : public SfxTabPage
+class SfxMacroTabPage final : public SfxTabPage
{
SvxMacroTableDtor aTbl;
DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void );
@@ -45,7 +45,6 @@ class SfxMacroTabPage : public SfxTabPage
bool AssignDeleteHdl(Control const *);
DECL_LINK( TimeOut_Impl, Timer*, void );
-protected:
std::unique_ptr<SfxMacroTabPage_Impl> mpImpl;
void InitAndSetHandler();
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 68d63f72e8da..01a542f6b9f4 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -82,7 +82,7 @@ struct SvxNumSettings_Impl
typedef std::vector<std::unique_ptr<SvxNumSettings_Impl> > SvxNumSettingsArr_Impl;
-class SvxSingleNumPickTabPage : public SfxTabPage
+class SvxSingleNumPickTabPage final : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -97,9 +97,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage
sal_uInt16 nNumItemId;
-protected:
- DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
- DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
+ DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
+ DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
public:
SvxSingleNumPickTabPage(vcl::Window* pParent,
@@ -117,7 +116,7 @@ public:
};
-class SvxBulletPickTabPage : public SfxTabPage
+class SvxBulletPickTabPage final : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -131,9 +130,9 @@ class SvxBulletPickTabPage : public SfxTabPage
sal_uInt16 nNumItemId;
OUString sBulletCharFormatName;
-protected:
- DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
- DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
+
+ DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
+ DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
public:
SvxBulletPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
@@ -154,7 +153,7 @@ public:
#define NUM_VALUSET_COUNT 16
/// TabPage for complete numeration
-class SvxNumPickTabPage : public SfxTabPage
+class SvxNumPickTabPage final : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -173,9 +172,8 @@ class SvxNumPickTabPage : public SfxTabPage
bool bPreset : 1;
-protected:
- DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
- DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
+ DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
+ DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
public:
SvxNumPickTabPage(vcl::Window* pParent,
@@ -198,7 +196,7 @@ public:
};
-class SvxBitmapPickTabPage : public SfxTabPage
+class SvxBitmapPickTabPage final : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -217,10 +215,9 @@ class SvxBitmapPickTabPage : public SfxTabPage
bool bModified : 1;
bool bPreset : 1;
-protected:
- DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
- DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
- DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void );
+ DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
+ DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
+ DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void );
public:
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index 4fce7ae2550b..d3135f303a80 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -33,7 +33,7 @@
// FmShowColsDialog
-class FmShowColsDialog : public ModalDialog
+class FmShowColsDialog final : public ModalDialog
{
VclPtr<ListBox> m_pList;
VclPtr<OKButton> m_pOK;
@@ -47,7 +47,7 @@ public:
void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols);
-protected:
+private:
DECL_LINK(OnClickedOk, Button*, void);
};
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index d01c1c10e2fe..efad9eb74137 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -126,7 +126,7 @@ struct Module;
class ExtensionsTabPage;
class SvxColorTabPage;
-class OfaTreeOptionsDialog : public SfxModalDialog
+class OfaTreeOptionsDialog final: public SfxModalDialog
{
private:
SvTreeListEntry* pCurrentPageEntry;
@@ -164,7 +164,6 @@ private:
static VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId );
void InsertNodes( const VectorOfNodes& rNodeList );
-protected:
DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void );
DECL_LINK(ShowPageHdl_Impl, SvTreeListBox*, void);
DECL_LINK(BackHdl_Impl, Button*, void);
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 9e0c5bca3347..36f06b7eaf39 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -33,11 +33,10 @@ namespace offapp
struct DriverPooling;
class DriverListControl;
- class ConnectionPoolOptionsPage : public SfxTabPage
+ class ConnectionPoolOptionsPage final : public SfxTabPage
{
using TabPage::ActivatePage;
- protected:
VclPtr<CheckBox> m_pEnablePooling;
VclPtr<FixedText> m_pDriversLabel;
VclPtr<DriverListControl> m_pDriverList;
@@ -53,14 +52,13 @@ namespace offapp
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
- protected:
+ private:
virtual bool EventNotify( NotifyEvent& _rNEvt ) override;
virtual bool FillItemSet(SfxItemSet* _rSet) override;
virtual void Reset(const SfxItemSet* _rSet) override;
virtual void ActivatePage( const SfxItemSet& _rSet) override;
- protected:
DECL_LINK( OnEnabledDisabled, Button*, void );
DECL_LINK( OnDriverRowChanged, const DriverPooling*, void );
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 7ef6bc7f61df..d5bd7e336a7d 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -43,9 +43,8 @@ namespace offapp
bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); }
};
- class DriverPoolingSettings
+ class DriverPoolingSettings final
{
- protected:
typedef std::vector<DriverPooling> DriverSettings;
DriverSettings m_aDrivers;
@@ -53,7 +52,6 @@ namespace offapp
typedef DriverSettings::const_iterator const_iterator;
typedef DriverSettings::iterator iterator;
- public:
DriverPoolingSettings();
sal_Int32 size() const { return m_aDrivers.size(); }
@@ -67,9 +65,8 @@ namespace offapp
void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); }
};
- class DriverPoolingSettingsItem : public SfxPoolItem
+ class DriverPoolingSettingsItem final : public SfxPoolItem
{
- protected:
DriverPoolingSettings m_aSettings;
public:
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 8a05ce5520f7..05e1f5fadc37 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -59,9 +59,8 @@ namespace svx
typedef std::map< OUString, DatabaseRegistration > DatabaseRegistrations;
- class DatabaseMapItem : public SfxPoolItem
+ class DatabaseMapItem final : public SfxPoolItem
{
- protected:
DatabaseRegistrations m_aRegistrations;
public:
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 6406ae737ee5..435bc286efc7 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -33,9 +33,8 @@ namespace svx
/** dialog for editing document links associated with data sources
*/
- class ODocumentLinkDialog : public ModalDialog
+ class ODocumentLinkDialog final : public ModalDialog
{
- protected:
VclPtr< ::svt::OFileURLControl> m_pURL;
VclPtr<PushButton> m_pBrowseFile;
VclPtr<Edit> m_pName;
@@ -58,7 +57,7 @@ namespace svx
void setLink( const OUString& _rName, const OUString& _rURL );
void getLink( OUString& _rName, OUString& _rURL ) const;
- protected:
+ private:
DECL_LINK( OnTextModified, Edit&, void );
DECL_LINK( OnBrowseFile, Button*, void );
DECL_LINK( OnOk, Button*, void );
More information about the Libreoffice-commits
mailing list