[Libreoffice-commits] core.git: extensions/source filter/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Nov 2 11:39:00 UTC 2017
extensions/source/abpilot/abpfinalpage.hxx | 6 +---
extensions/source/abpilot/abspilot.hxx | 6 +---
extensions/source/abpilot/admininvokationpage.hxx | 6 +---
extensions/source/abpilot/fieldmappingpage.hxx | 6 +---
extensions/source/abpilot/tableselectionpage.hxx | 6 +---
extensions/source/abpilot/typeselectionpage.hxx | 6 +---
extensions/source/bibliography/bibbeam.hxx | 6 ----
extensions/source/bibliography/datman.hxx | 3 --
extensions/source/dbpilots/commonpagesdbp.hxx | 6 +---
extensions/source/dbpilots/gridwizard.hxx | 12 ++------
extensions/source/dbpilots/groupboxwiz.hxx | 25 ++++++-----------
extensions/source/dbpilots/listcombowizard.hxx | 23 +++++----------
extensions/source/dbpilots/optiongrouplayouter.hxx | 5 +--
extensions/source/dbpilots/unoautopilot.hxx | 5 +--
extensions/source/propctrlr/browserlistbox.hxx | 9 ++----
extensions/source/propctrlr/browserview.hxx | 5 +--
extensions/source/propctrlr/cellbindinghelper.hxx | 6 +---
extensions/source/propctrlr/defaultforminspection.hxx | 7 +---
extensions/source/propctrlr/defaulthelpprovider.hxx | 6 +---
extensions/source/propctrlr/eventhandler.hxx | 7 +---
extensions/source/propctrlr/formmetadata.hxx | 5 +--
extensions/source/propctrlr/genericpropertyhandler.hxx | 9 +-----
extensions/source/propctrlr/propertyeditor.hxx | 8 +----
extensions/source/propctrlr/pushbuttonnavigation.hxx | 3 --
extensions/source/propctrlr/selectlabeldialog.hxx | 4 +-
extensions/source/propctrlr/sqlcommanddesign.hxx | 6 +---
extensions/source/propctrlr/standardcontrol.hxx | 22 +++++---------
extensions/source/scanner/scanner.hxx | 4 --
filter/source/config/cache/configflush.hxx | 7 ----
filter/source/graphicfilter/icgm/chart.hxx | 3 --
filter/source/pdf/impdialog.hxx | 6 +---
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 5 ---
filter/source/xmlfilterdetect/filterdetect.hxx | 3 --
33 files changed, 81 insertions(+), 165 deletions(-)
New commits:
commit 12c7643c5129e3db9200f2564793188ddb5a3917
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 2 09:42:24 2017 +0200
loplugin:finalclasses in filter,extensions
Change-Id: I2822b8c5a91feaf47466356c01728d32a85bbae9
Reviewed-on: https://gerrit.libreoffice.org/44190
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 4766006cdf97..0c92487ed29a 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -32,9 +32,8 @@
namespace abp
{
- class FinalPage : public AddressBookSourcePage
+ class FinalPage final : public AddressBookSourcePage
{
- protected:
VclPtr< ::svt::OFileURLControl> m_pLocation;
VclPtr<PushButton> m_pBrowse;
VclPtr<CheckBox> m_pRegisterName;
@@ -54,7 +53,7 @@ namespace abp
virtual ~FinalPage() override;
virtual void dispose() override;
- protected:
+ private:
// OWizardPage overridables
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
@@ -66,7 +65,6 @@ namespace abp
// OImportPage overridables
virtual bool canAdvance() const override;
- private:
DECL_LINK( OnNameModified, Edit&, void );
DECL_LINK(OnRegister, Button*, void);
DECL_LINK(OnEmbed, Button*, void);
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 34903b91a129..b55122eebf84 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -30,9 +30,8 @@ namespace abp
{
typedef ::svt::RoadmapWizard OAddressBookSourcePilot_Base;
- class OAddressBookSourcePilot : public OAddressBookSourcePilot_Base
+ class OAddressBookSourcePilot final : public OAddressBookSourcePilot_Base
{
- protected:
css::uno::Reference< css::uno::XComponentContext >
m_xORB;
AddressSettings m_aSettings;
@@ -61,7 +60,7 @@ namespace abp
/// to be called when the selected type changed
void typeSelectionChanged( AddressSourceType _eType );
- protected:
+ private:
// OWizardMachine overridables
virtual VclPtr<TabPage> createPage( WizardState _nState ) override;
virtual void enterState( WizardState _nState ) override;
@@ -73,7 +72,6 @@ namespace abp
virtual bool Close() override;
- private:
DECL_LINK( OnCancelClicked, Button*, void );
/** creates a new data source of the type indicated by m_aSettings
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index bb03aba0c1b2..22e8ac21cdb0 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -25,9 +25,8 @@
namespace abp
{
- class AdminDialogInvokationPage : public AddressBookSourcePage
+ class AdminDialogInvokationPage final : public AddressBookSourcePage
{
- protected:
VclPtr<PushButton> m_pInvokeAdminDialog;
VclPtr<FixedText> m_pErrorMessage;
@@ -35,7 +34,7 @@ namespace abp
explicit AdminDialogInvokationPage(OAddressBookSourcePilot* _pParent);
virtual ~AdminDialogInvokationPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabDialog overridables
virtual void ActivatePage() override;
virtual void initializePage() override;
@@ -43,7 +42,6 @@ namespace abp
// OImportPage overridables
virtual bool canAdvance() const override;
- private:
DECL_LINK( OnInvokeAdminDialog, Button*, void );
void implTryConnect();
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index edb34f14de05..8623b6d21220 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -27,9 +27,8 @@
namespace abp
{
- class FieldMappingPage : public AddressBookSourcePage
+ class FieldMappingPage final : public AddressBookSourcePage
{
- protected:
VclPtr<PushButton> m_pInvokeDialog;
VclPtr<FixedText> m_pHint;
@@ -37,14 +36,13 @@ namespace abp
explicit FieldMappingPage(OAddressBookSourcePilot* _pParent);
virtual ~FieldMappingPage() override;
virtual void dispose() override;
- protected:
+ private:
// OWizardPage overridables
virtual void initializePage() override;
// TabDialog overridables
virtual void ActivatePage() override;
- private:
DECL_LINK( OnInvokeDialog, Button*, void );
void implUpdateHint();
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 595faf69885c..31ffa8a4e08d 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -28,16 +28,15 @@
namespace abp
{
- class TableSelectionPage : public AddressBookSourcePage
+ class TableSelectionPage final : public AddressBookSourcePage
{
- protected:
VclPtr<ListBox> m_pTableList;
public:
explicit TableSelectionPage( OAddressBookSourcePilot* _pParent );
virtual ~TableSelectionPage() override;
virtual void dispose() override;
- protected:
+ private:
// OWizardPage overridables
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
@@ -48,7 +47,6 @@ namespace abp
// OImportPage overridables
virtual bool canAdvance() const override;
- private:
DECL_LINK( OnTableSelected, ListBox&, void );
DECL_LINK( OnTableDoubleClicked, ListBox&, void );
};
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 8b9b9b609468..0146e7c85ec5 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -29,9 +29,8 @@
namespace abp
{
- class TypeSelectionPage : public AddressBookSourcePage
+ class TypeSelectionPage final : public AddressBookSourcePage
{
- protected:
VclPtr<RadioButton> m_pEvolution;
VclPtr<RadioButton> m_pEvolutionGroupwise;
VclPtr<RadioButton> m_pEvolutionLdap;
@@ -65,7 +64,7 @@ namespace abp
// retrieves the currently selected type
AddressSourceType getSelectedType() const;
- protected:
+ private:
// OWizardPage overridables
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
@@ -77,7 +76,6 @@ namespace abp
// OImportPage overridables
virtual bool canAdvance() const override;
- private:
DECL_LINK( OnTypeSelected, Button*, void );
void selectType( AddressSourceType _eType );
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 21d557dd711b..b9dd224e3263 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -38,12 +38,10 @@ namespace bib
class BibGridwin;
- class BibBeamer
+ class BibBeamer final
:public BibSplitWindow
,public FormControlContainer
{
- private:
-
css::uno::Reference< css::frame::XController > m_xController;
BibDataManager* pDatMan;
@@ -52,8 +50,6 @@ namespace bib
DECL_LINK( RecalcLayout_Impl, void*, void );
- protected:
-
void createToolBar();
void createGridWin();
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 139c0b7dd9ff..3fd40140397f 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -76,7 +76,7 @@ public:
typedef cppu::WeakComponentImplHelper < css::beans::XPropertyChangeListener
, css::form::XLoadable
> BibDataManager_Base;
-class BibDataManager
+class BibDataManager final
:public ::comphelper::OMutexAndBroadcastHelper
,public BibDataManager_Base
{
@@ -99,7 +99,6 @@ private:
VclPtr<BibToolBar> pToolbar;
OUString sIdentifierMapping;
-protected:
void InsertFields(const css::uno::Reference< css::form::XFormComponent > & xGrid);
void SetMeAsUidListener();
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 99d3ad09ac80..13fac75f5b22 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -29,9 +29,8 @@
namespace dbp
{
- class OTableSelectionPage : public OControlWizardPage
+ class OTableSelectionPage final : public OControlWizardPage
{
- protected:
VclPtr<FixedText> m_pDatasourceLabel;
VclPtr<ListBox> m_pDatasource;
VclPtr<PushButton> m_pSearchDatabase;
@@ -45,7 +44,7 @@ namespace dbp
virtual ~OTableSelectionPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
void ActivatePage() override;
@@ -53,7 +52,6 @@ namespace dbp
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
- protected:
DECL_LINK( OnListboxSelection, ListBox&, void );
DECL_LINK( OnListboxDoubleClicked, ListBox&, void );
DECL_LINK( OnSearchClicked, Button*, void );
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index efb8a8488f07..4943946182b3 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -31,9 +31,8 @@ namespace dbp
css::uno::Sequence< OUString > aSelectedFields;
};
- class OGridWizard : public OControlWizard
+ class OGridWizard final : public OControlWizard
{
- protected:
OGridSettings m_aSettings;
bool m_bHadDataSelection : 1;
@@ -46,7 +45,7 @@ namespace dbp
OGridSettings& getSettings() { return m_aSettings; }
- protected:
+ private:
// OWizardMachine overridables
virtual VclPtr<TabPage> createPage( WizardState _nState ) override;
virtual WizardState determineNextState( WizardState _nCurrentState ) const override;
@@ -56,7 +55,6 @@ namespace dbp
virtual bool approveControl(sal_Int16 _nClassId) override;
- protected:
void implApplySettings();
};
@@ -69,9 +67,8 @@ namespace dbp
OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); }
};
- class OGridFieldsSelection : public OGridPage
+ class OGridFieldsSelection final : public OGridPage
{
- protected:
VclPtr<ListBox> m_pExistFields;
VclPtr<PushButton> m_pSelectOne;
VclPtr<PushButton> m_pSelectAll;
@@ -84,7 +81,7 @@ namespace dbp
virtual ~OGridFieldsSelection() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
virtual void ActivatePage() override;
@@ -93,7 +90,6 @@ namespace dbp
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
virtual bool canAdvance() const override;
- protected:
DECL_LINK(OnMoveOneEntry, Button*, void);
DECL_LINK(OnMoveAllEntries, Button*, void);
DECL_LINK(OnEntrySelected, ListBox&, void);
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 2745de988d17..1d15d6b71a58 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -35,9 +35,8 @@ namespace dbp
OUString sDBField;
};
- class OGroupBoxWizard : public OControlWizard
+ class OGroupBoxWizard final : public OControlWizard
{
- protected:
OOptionGroupSettings m_aSettings;
bool m_bVisitedDefault : 1;
@@ -52,7 +51,7 @@ namespace dbp
OOptionGroupSettings& getSettings() { return m_aSettings; }
- protected:
+ private:
// OWizardMachine overridables
virtual VclPtr<TabPage> createPage( WizardState _nState ) override;
virtual WizardState determineNextState( WizardState _nCurrentState ) const override;
@@ -74,9 +73,8 @@ namespace dbp
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
};
- class ORadioSelectionPage : public OGBWPage
+ class ORadioSelectionPage final : public OGBWPage
{
- protected:
VclPtr<Edit> m_pRadioName;
VclPtr<PushButton> m_pMoveRight;
VclPtr<PushButton> m_pMoveLeft;
@@ -87,7 +85,7 @@ namespace dbp
virtual ~ORadioSelectionPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
void ActivatePage() override;
@@ -103,9 +101,8 @@ namespace dbp
void implCheckMoveButtons();
};
- class ODefaultFieldSelectionPage : public OMaybeListSelectionPage
+ class ODefaultFieldSelectionPage final : public OMaybeListSelectionPage
{
- protected:
VclPtr<RadioButton> m_pDefSelYes;
VclPtr<RadioButton> m_pDefSelNo;
VclPtr<ListBox> m_pDefSelection;
@@ -115,7 +112,7 @@ namespace dbp
virtual ~ODefaultFieldSelectionPage() override;
virtual void dispose() override;
- protected:
+ private:
// OWizardPage overridables
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
@@ -123,9 +120,8 @@ namespace dbp
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
};
- class OOptionValuesPage : public OGBWPage
+ class OOptionValuesPage final : public OGBWPage
{
- protected:
VclPtr<Edit> m_pValue;
VclPtr<ListBox> m_pOptions;
@@ -138,7 +134,7 @@ namespace dbp
virtual ~OOptionValuesPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
void ActivatePage() override;
@@ -161,9 +157,8 @@ namespace dbp
virtual OUString& getDBFieldSetting() override;
};
- class OFinalizeGBWPage : public OGBWPage
+ class OFinalizeGBWPage final : public OGBWPage
{
- protected:
VclPtr<Edit> m_pName;
public:
@@ -171,7 +166,7 @@ namespace dbp
virtual ~OFinalizeGBWPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
void ActivatePage() override;
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 135bc1da88aa..af77d557baed 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -42,9 +42,8 @@ namespace dbp
OUString sLinkedListField;
};
- class OListComboWizard : public OControlWizard
+ class OListComboWizard final : public OControlWizard
{
- protected:
OListComboSettings m_aSettings;
bool m_bListBox : 1;
bool m_bHadDataSelection : 1;
@@ -60,7 +59,7 @@ namespace dbp
bool isListBox() const { return m_bListBox; }
- protected:
+ private:
// OWizardMachine overridables
virtual VclPtr<TabPage> createPage( WizardState _nState ) override;
virtual WizardState determineNextState( WizardState _nCurrentState ) const override;
@@ -72,7 +71,6 @@ namespace dbp
WizardState getFinalState() const { return isListBox() ? LCW_STATE_FIELDLINK : LCW_STATE_COMBODBFIELD; }
- private:
void implApplySettings();
};
@@ -93,9 +91,8 @@ namespace dbp
css::uno::Sequence< OUString > getTableFields();
};
- class OContentTableSelection : public OLCPage
+ class OContentTableSelection final : public OLCPage
{
- protected:
VclPtr<ListBox> m_pSelectTable;
public:
@@ -103,7 +100,7 @@ namespace dbp
virtual ~OContentTableSelection() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
virtual void ActivatePage() override;
@@ -112,14 +109,12 @@ namespace dbp
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
virtual bool canAdvance() const override;
- protected:
DECL_LINK( OnTableDoubleClicked, ListBox&, void );
DECL_LINK( OnTableSelected, ListBox&, void );
};
- class OContentFieldSelection : public OLCPage
+ class OContentFieldSelection final : public OLCPage
{
- protected:
VclPtr<ListBox> m_pSelectTableField;
VclPtr<Edit> m_pDisplayedField;
VclPtr<FixedText> m_pInfo;
@@ -130,7 +125,7 @@ namespace dbp
virtual ~OContentFieldSelection() override;
virtual void dispose() override;
- protected:
+ private:
DECL_LINK( OnFieldSelected, ListBox&, void );
DECL_LINK( OnTableDoubleClicked, ListBox&, void );
@@ -140,9 +135,8 @@ namespace dbp
virtual bool canAdvance() const override;
};
- class OLinkFieldsPage : public OLCPage
+ class OLinkFieldsPage final : public OLCPage
{
- protected:
VclPtr<ComboBox> m_pValueListField;
VclPtr<ComboBox> m_pTableField;
@@ -152,7 +146,7 @@ namespace dbp
virtual ~OLinkFieldsPage() override;
virtual void dispose() override;
- protected:
+ private:
// TabPage overridables
virtual void ActivatePage() override;
@@ -161,7 +155,6 @@ namespace dbp
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
virtual bool canAdvance() const override;
- private:
void implCheckFinish();
DECL_LINK(OnSelectionModified, Edit&, void);
diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx
index 98bb21cf99b8..f6ccccf62b2a 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.hxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.hxx
@@ -34,7 +34,7 @@ namespace dbp
struct OControlWizardContext;
struct OOptionGroupSettings;
- class OOptionGroupLayouter
+ class OOptionGroupLayouter final
{
css::uno::Reference< css::uno::XComponentContext >
mxContext;
@@ -44,13 +44,12 @@ namespace dbp
const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
- public:
void doLayout(
const OControlWizardContext& _rContext,
const OOptionGroupSettings& _rSettings
);
- protected:
+ private:
static void implAnchorShape(
const css::uno::Reference< css::beans::XPropertySet >& _rxShapeProps
);
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 1ab19e75ced7..49bbf19ec1a4 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -33,7 +33,7 @@ namespace dbp
{
typedef ::svt::OGenericUnoDialog OUnoAutoPilot_Base;
template <class TYPE, class SERVICEINFO>
- class OUnoAutoPilot
+ class OUnoAutoPilot final
:public OUnoAutoPilot_Base
,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > >
{
@@ -43,7 +43,6 @@ namespace dbp
}
- protected:
css::uno::Reference< css::beans::XPropertySet > m_xObjectModel;
public:
@@ -103,7 +102,7 @@ namespace dbp
return new ::cppu::OPropertyArrayHelper(aProps);
}
- protected:
+ private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override
{
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index dfdbefaa4e90..9ec019fe9c64 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -72,10 +72,9 @@ namespace pcr
typedef std::vector< ListBoxLine > ListBoxLines;
- class OBrowserListBox :public Control
+ class OBrowserListBox final : public Control
,public IButtonClickListener
{
- protected:
VclPtr<Window> m_aLinesPlayground;
VclPtr<ScrollBar> m_aVScroll;
VclPtr<InspectorHelpWindow> m_pHelpWindow;
@@ -94,7 +93,6 @@ namespace pcr
::rtl::Reference< PropertyControlContext_Impl >
m_pControlContextImpl;
- protected:
void PositionLine( ListBoxLines::size_type _nIndex );
void UpdatePosNSize();
void UpdatePlayGround();
@@ -152,12 +150,12 @@ namespace pcr
/// @throws css::uno::RuntimeException
void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl );
- protected:
+ private:
// IButtonClickListener
void buttonClicked( OBrowserLine* _pLine, bool _bPrimary ) override;
using Window::SetHelpText;
- private:
+
DECL_LINK( ScrollHdl, ScrollBar*, void );
/** retrieves the index of a given control in our line list
@@ -198,7 +196,6 @@ namespace pcr
*/
long impl_getPrefererredHelpHeight();
- private:
using Window::Activate;
};
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 394d3ebf4aa4..30203162fdab 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -31,13 +31,12 @@ namespace pcr
class OPropertyEditor;
- class OPropertyBrowserView : public vcl::Window
+ class OPropertyBrowserView final : public vcl::Window
{
VclPtr<OPropertyEditor> m_pPropBox;
sal_uInt16 m_nActivePage;
Link<LinkParamNone*,void> m_aPageActivationHandler;
- protected:
virtual void Resize() override;
virtual void GetFocus() override;
virtual bool EventNotify( NotifyEvent& _rNEvt ) override;
@@ -58,7 +57,7 @@ namespace pcr
css::awt::Size getMinimumSize();
- protected:
+ private:
DECL_LINK(OnPageActivation, LinkParamNone*, void);
};
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 2fe8de94be89..a2f73741fed1 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -36,9 +36,8 @@ namespace pcr
/** encapsulates functionality related to binding a form control to a spreadsheet cell
*/
- class CellBindingHelper
+ class CellBindingHelper final
{
- protected:
css::uno::Reference< css::beans::XPropertySet >
m_xControlModel; // the model we work for
css::uno::Reference< css::sheet::XSpreadsheetDocument >
@@ -54,7 +53,6 @@ namespace pcr
const css::uno::Reference< css::frame::XModel >& _rxContextDocument
);
- public:
/** determines whether the given model is a spreadsheet document model
<p>If this method returns <FALSE/>, you cannot instantiate a CellBindingHelper with
@@ -196,7 +194,7 @@ namespace pcr
css::uno::Reference< css::sheet::XSpreadsheet >& _out_rxSheet
) const;
- protected:
+ private:
/** creates an address object from a string representation of a cell address
*/
bool convertStringAddress(
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index e1ded25292fe..cd55848bfc09 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -30,16 +30,14 @@ namespace pcr
class OPropertyInfoService;
- class DefaultFormComponentInspectorModel : public ImplInspectorModel
+ class DefaultFormComponentInspectorModel final : public ImplInspectorModel
{
- private:
bool m_bUseFormComponentHandlers;
bool m_bConstructed;
/// access to property meta data
std::unique_ptr< OPropertyInfoService > m_pInfoService;
- protected:
virtual ~DefaultFormComponentInspectorModel() override;
// XServiceInfo
@@ -63,10 +61,9 @@ namespace pcr
static css::uno::Reference< css::uno::XInterface > SAL_CALL
Create(const css::uno::Reference< css::uno::XComponentContext >&);
- public:
explicit DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers = true );
- protected:
+ private:
// Service constructors
void createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines );
};
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index c5181b1f2d24..702e2b7ee2a2 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -39,7 +39,7 @@ namespace pcr
typedef ::cppu::WeakImplHelper < css::inspection::XPropertyControlObserver
, css::lang::XInitialization
> DefaultHelpProvider_Base;
- class DefaultHelpProvider : public DefaultHelpProvider_Base
+ class DefaultHelpProvider final : public DefaultHelpProvider_Base
{
private:
bool m_bConstructed;
@@ -57,7 +57,7 @@ namespace pcr
static css::uno::Reference< css::uno::XInterface > SAL_CALL
Create(const css::uno::Reference< css::uno::XComponentContext >&);
- protected:
+ private:
virtual ~DefaultHelpProvider() override;
// XPropertyControlObserver
@@ -67,11 +67,9 @@ namespace pcr
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
- protected:
// Service constructors
void create( const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxUI );
- private:
static vcl::Window* impl_getVclControlWindow_nothrow( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl );
static OUString impl_getHelpText_nothrow( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl );
};
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 21e87766a07d..bf6582623dd1 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -73,7 +73,7 @@ namespace pcr
typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler
, css::lang::XServiceInfo
> EventHandler_Base;
- class EventHandler : public EventHandler_Base
+ class EventHandler final : public EventHandler_Base
{
private:
mutable ::osl::Mutex m_aMutex;
@@ -102,14 +102,13 @@ namespace pcr
static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( );
static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
- protected:
+ private:
explicit EventHandler(
const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
virtual ~EventHandler() override;
- protected:
// XPropertyHandler overridables
virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
@@ -137,7 +136,6 @@ namespace pcr
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- private:
/** returns the script events associated with our introspectee
@param _out_rEvents
Takes, upon successful return, the events currently associated with the introspectee
@@ -240,7 +238,6 @@ namespace pcr
*/
bool impl_filterMethod_nothrow( const EventDescription& _rEvent ) const;
- private:
EventHandler( const EventHandler& ) = delete;
EventHandler& operator=( const EventHandler& ) = delete;
};
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 7e5e750ba027..2f0370c64746 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -34,10 +34,9 @@ namespace pcr
//= OPropertyInfoService
- class OPropertyInfoService
+ class OPropertyInfoService final
:public IPropertyInfoService
{
- protected:
static sal_uInt16 s_nCount;
static OPropertyInfoImpl* s_pPropertyInfos;
// TODO: a real structure which allows quick access by name as well as by id
@@ -53,7 +52,7 @@ namespace pcr
bool isComposeable( const OUString& _rPropertyName ) const;
- protected:
+ private:
static const OPropertyInfoImpl* getPropertyInfo();
static const OPropertyInfoImpl* getPropertyInfo(const OUString& _rName);
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 6cca09093ca4..c85732fc412d 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -53,12 +53,10 @@ namespace pcr
typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler
, css::lang::XServiceInfo
> GenericPropertyHandler_Base;
- class GenericPropertyHandler : public GenericPropertyHandler_Base
+ class GenericPropertyHandler final : public GenericPropertyHandler_Base
{
- private:
mutable ::osl::Mutex m_aMutex;
- private:
/// the service factory for creating services
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/// need this to keep alive as long as m_xComponent lives
@@ -87,14 +85,13 @@ namespace pcr
static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( );
static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
- protected:
+ private:
explicit GenericPropertyHandler(
const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
virtual ~GenericPropertyHandler() override;
- protected:
// XPropertyHandler overridables
virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
@@ -125,7 +122,6 @@ namespace pcr
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- private:
/** ensures that ->m_aProperties is initialized
@precond
our mutex is locked
@@ -137,7 +133,6 @@ namespace pcr
::rtl::Reference< IPropertyEnumRepresentation >
impl_getEnumConverter( const css::uno::Type& _rEnumType );
- private:
GenericPropertyHandler( const GenericPropertyHandler& ) = delete;
GenericPropertyHandler& operator=( const GenericPropertyHandler& ) = delete;
};
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 5a74e9200c27..0c7adb04554f 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -39,7 +39,7 @@ namespace pcr
//= OPropertyEditor
- class OPropertyEditor : public Control
+ class OPropertyEditor final : public Control
{
private:
typedef std::map< OUString, sal_uInt16 > MapStringToPageId;
@@ -51,7 +51,6 @@ namespace pcr
HiddenPage( sal_uInt16 _nPos, TabPage* _pPage ) : nPos( _nPos ), pPage( _pPage ) { }
};
- private:
VclPtr<TabControl> m_aTabControl;
IPropertyLineListener* m_pListener;
IPropertyControlObserver* m_pObserver;
@@ -64,7 +63,6 @@ namespace pcr
MapStringToPageId m_aPropertyPageIds;
std::map< sal_uInt16, HiddenPage > m_aHiddenPages;
- protected:
void Resize() override;
void GetFocus() override;
@@ -112,11 +110,10 @@ namespace pcr
void CommitModified();
- protected:
+ private:
using Window::SetHelpText;
using Window::Update;
- private:
OBrowserPage* getPage( sal_uInt16& _rPageId );
const OBrowserPage* getPage( sal_uInt16& _rPageId ) const;
@@ -134,7 +131,6 @@ namespace pcr
static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString );
void setHelpLineLimits( OBrowserPage& _rPage, const void* );
- protected:
DECL_LINK(OnPageDeactivate, TabControl*, bool);
DECL_LINK(OnPageActivate, TabControl*, void);
};
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx
index 2ee906b0c406..5929b0854e56 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.hxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx
@@ -31,9 +31,8 @@ namespace pcr
//= PushButtonNavigation
- class PushButtonNavigation
+ class PushButtonNavigation final
{
- protected:
css::uno::Reference< css::beans::XPropertySet >
m_xControlModel;
bool m_bIsPushButton;
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index e31f86a88e60..be83dc484fd0 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -35,7 +35,7 @@ namespace pcr
// OSelectLabelDialog
- class OSelectLabelDialog
+ class OSelectLabelDialog final
:public ModalDialog
{
VclPtr<FixedText> m_pMainDesc;
@@ -59,7 +59,7 @@ namespace pcr
css::uno::Reference< css::beans::XPropertySet > GetSelected() const { return m_pNoAssignment->IsChecked() ? css::uno::Reference< css::beans::XPropertySet > () : m_xSelectedControl; }
- protected:
+ private:
sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry);
DECL_LINK(OnEntrySelected, SvTreeListBox*, void);
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index c562617ed1c8..fe99a7ece42c 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -46,7 +46,7 @@ namespace pcr
/** encapsulates the code for calling and managing a query design frame, used
for interactively designing the Command property of a ->RowSet
*/
- class SQLCommandDesigner : public SQLCommandDesigner_Base
+ class SQLCommandDesigner final : public SQLCommandDesigner_Base
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -107,14 +107,13 @@ namespace pcr
*/
void dispose();
- protected:
+ private:
// XPropertyChangeListener
virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
- protected:
virtual ~SQLCommandDesigner() override;
/** opens a new frame for interactively designing an SQL command
@@ -164,7 +163,6 @@ namespace pcr
*/
bool impl_trySuspendDesigner_nothrow() const;
- private:
SQLCommandDesigner( const SQLCommandDesigner& ) = delete;
SQLCommandDesigner& operator=( const SQLCommandDesigner& ) = delete;
};
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index b4fdb34e1196..1a48386a73b9 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -110,9 +110,8 @@ namespace pcr
//= OEditControl
typedef CommonBehaviourControl< css::inspection::XPropertyControl, Edit > OEditControl_Base;
- class OEditControl : public OEditControl_Base
+ class OEditControl final : public OEditControl_Base
{
- protected:
bool m_bIsPassword : 1;
public:
@@ -123,7 +122,7 @@ namespace pcr
virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
virtual css::uno::Type SAL_CALL getValueType() override;
- protected:
+ private:
// CommonBehaviourControlHelper::modified
virtual void setModified() override;
};
@@ -175,9 +174,8 @@ namespace pcr
//= OHyperlinkControl
typedef CommonBehaviourControl< css::inspection::XHyperlinkControl, HyperlinkInput > OHyperlinkControl_Base;
- class OHyperlinkControl : public OHyperlinkControl_Base
+ class OHyperlinkControl final : public OHyperlinkControl_Base
{
- private:
::comphelper::OInterfaceContainerHelper2 m_aActionListeners;
public:
@@ -192,11 +190,10 @@ namespace pcr
virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override;
virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override;
- protected:
+ private:
// XComponent
virtual void SAL_CALL disposing() override;
- protected:
DECL_LINK( OnHyperlinkClicked, void*, void );
};
@@ -310,7 +307,7 @@ namespace pcr
//= OComboboxControl
typedef CommonBehaviourControl< css::inspection::XStringListControl, ComboBox > OComboboxControl_Base;
- class OComboboxControl : public OComboboxControl_Base
+ class OComboboxControl final : public OComboboxControl_Base
{
public:
OComboboxControl( vcl::Window* pParent, WinBits nWinStyle );
@@ -326,7 +323,7 @@ namespace pcr
virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) override;
- protected:
+ private:
DECL_LINK( OnEntrySelected, ComboBox&, void );
};
@@ -344,9 +341,8 @@ namespace pcr
class OMultilineFloatingEdit;
/** an Edit field which can be used as ControlWindow, and has a drop-down button
*/
- class DropDownEditControl : public Edit
+ class DropDownEditControl final : public Edit
{
- private:
VclPtr<OMultilineFloatingEdit> m_pFloatingEdit;
VclPtr<MultiLineEdit> m_pImplEdit;
VclPtr<PushButton> m_pDropdownButton;
@@ -370,15 +366,13 @@ namespace pcr
StlSyntaxSequence< OUString >
GetStringListValue() const;
- protected:
+ private:
// Window overridables
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
virtual void Resize() override;
- protected:
long FindPos(long nSinglePos);
- private:
DECL_LINK( ReturnHdl, FloatingWindow*, void );
DECL_LINK( DropDownHdl, Button*, void );
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 878f6b201ddb..d0bea52c2d8e 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -37,12 +37,10 @@ using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::scanner;
-class ScannerManager:
+class ScannerManager final :
public cppu::WeakImplHelper<
XScannerManager2, css::awt::XBitmap, css::lang::XServiceInfo>
{
-protected:
-
osl::Mutex maProtector;
void* mpData;
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index f2cd8bd9ee3e..5d0d8de84195 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -37,17 +37,12 @@ namespace filter{
@descr Such refresh listener will be called in case the
type/filter configuration will be changed at runtime.
*/
-class ConfigFlush : public BaseLock
+class ConfigFlush final : public BaseLock
, public ::cppu::WeakImplHelper<
css::util::XRefreshable,
css::lang::XServiceInfo
>
{
-
- // member
-
- protected:
-
/** @short holds all listener, which are registered at this instance. */
::cppu::OMultiTypeInterfaceContainerHelper m_lListener;
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index f22e526de86a..445d558978d3 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -58,12 +58,11 @@ struct DataNode
class CGM;
class CGMImpressOutAct;
-class CGMChart
+class CGMChart final
{
friend class CGM;
friend class CGMImpressOutAct;
- protected:
sal_Int8 mnCurrentFileType;
::std::vector< TextEntry* > maTextEntryList;
DataNode mDataNode[ 7 ];
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 526fa0cdf96f..e6d332cbaa3e 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -64,9 +64,8 @@ class ImpPDFTabLinksPage;
/// Class tabbed dialog
-class ImpPDFTabDialog : public SfxTabDialog
+class ImpPDFTabDialog final : public SfxTabDialog
{
-private:
FilterConfigItem maConfigItem;
FilterConfigItem maConfigI18N;
@@ -81,7 +80,6 @@ private:
sal_uInt16 mnViewPageId;
sal_uInt16 mnGeneralPageId;
-protected:
// the following data are the configuration used throughout the dialog and pages
bool mbIsPresentation;
bool mbIsSpreadsheet;
@@ -176,7 +174,7 @@ public:
ImpPDFTabLinksPage* getLinksPage() const;
ImpPDFTabGeneralPage* getGeneralPage() const;
-protected:
+private:
virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) override;
virtual short Ok() override;
};
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 5bab49ee71e8..b33af42f9c16 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -41,7 +41,7 @@ enum FilterType
* setSourceDocument or setTargetDocument determines which Impl function the filter
* member calls */
-class XmlFilterAdaptor : public cppu::WeakImplHelper
+class XmlFilterAdaptor final : public cppu::WeakImplHelper
<
css::document::XFilter,
css::document::XExporter,
@@ -50,9 +50,6 @@ class XmlFilterAdaptor : public cppu::WeakImplHelper
css::lang::XServiceInfo
>
{
-
-protected:
-
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::lang::XComponent > mxDoc;
OUString msFilterName;
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 886fb1c64f72..5db916d76e5e 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -29,14 +29,13 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
-class FilterDetect : public cppu::WeakImplHelper <
+class FilterDetect final : public cppu::WeakImplHelper <
css::document::XExtendedFilterDetection,
css::lang::XInitialization,
css::lang::XServiceInfo
>
{
-protected:
css::uno::Reference< css::uno::XComponentContext > mxCtx;
public:
More information about the Libreoffice-commits
mailing list