[Libreoffice-commits] core.git: dbaccess/source desktop/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 6 10:55:58 UTC 2017
dbaccess/source/core/api/RowSet.hxx | 6 ----
dbaccess/source/core/api/RowSetCacheIterator.hxx | 4 +-
dbaccess/source/core/api/resultset.hxx | 6 +---
dbaccess/source/core/dataaccess/connection.hxx | 7 +----
dbaccess/source/core/inc/bookmarkcontainer.hxx | 6 +---
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 12 ++------
dbaccess/source/filter/xml/xmlHelper.hxx | 3 --
dbaccess/source/inc/dsntypes.hxx | 3 --
dbaccess/source/ui/dlg/ConnectionPage.hxx | 5 +--
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 17 +++++-------
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 4 +-
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 4 --
dbaccess/source/ui/dlg/UserAdmin.hxx | 3 --
dbaccess/source/ui/dlg/advancedsettings.hxx | 12 ++------
dbaccess/source/ui/dlg/detailpages.hxx | 4 +-
dbaccess/source/ui/dlg/dsselect.hxx | 5 +--
dbaccess/source/ui/dlg/finteraction.hxx | 5 +--
dbaccess/source/ui/dlg/generalpage.hxx | 7 ++---
dbaccess/source/ui/dlg/odbcconfig.hxx | 4 +-
dbaccess/source/ui/dlg/tablespage.hxx | 6 +---
dbaccess/source/ui/inc/HtmlReader.hxx | 3 --
dbaccess/source/ui/inc/JoinExchange.hxx | 6 +---
dbaccess/source/ui/inc/RTableConnectionData.hxx | 3 --
dbaccess/source/ui/inc/RelationDlg.hxx | 5 +--
dbaccess/source/ui/inc/RtfReader.hxx | 3 --
dbaccess/source/ui/inc/TableController.hxx | 4 +-
dbaccess/source/ui/inc/WCPage.hxx | 3 --
dbaccess/source/ui/inc/WTypeSelect.hxx | 6 +---
dbaccess/source/ui/inc/brwview.hxx | 10 ++-----
dbaccess/source/ui/inc/charsets.hxx | 11 +++----
dbaccess/source/ui/inc/databaseobjectview.hxx | 4 --
dbaccess/source/ui/inc/datasourceconnector.hxx | 3 --
dbaccess/source/ui/inc/dbadmin.hxx | 5 +--
dbaccess/source/ui/inc/dbwizsetup.hxx | 5 +--
dbaccess/source/ui/inc/directsql.hxx | 7 +----
dbaccess/source/ui/inc/dlgsize.hxx | 3 --
dbaccess/source/ui/inc/exsrcbrw.hxx | 4 +-
dbaccess/source/ui/inc/formadapter.hxx | 4 +-
dbaccess/source/ui/inc/indexdialog.hxx | 15 +++-------
dbaccess/source/ui/inc/indexes.hxx | 4 --
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 7 +----
dbaccess/source/ui/inc/linkeddocuments.hxx | 3 --
dbaccess/source/ui/inc/opendoccontrols.hxx | 9 ++----
dbaccess/source/ui/inc/paramdialog.hxx | 6 +---
dbaccess/source/ui/inc/queryfilter.hxx | 4 +-
dbaccess/source/ui/inc/queryorder.hxx | 3 --
dbaccess/source/ui/inc/sbagrid.hxx | 12 ++------
dbaccess/source/ui/inc/sbamultiplex.hxx | 5 +--
dbaccess/source/ui/inc/sqledit.hxx | 4 --
dbaccess/source/ui/inc/tabletree.hxx | 5 +--
dbaccess/source/ui/inc/undosqledit.hxx | 3 --
dbaccess/source/ui/inc/unodatbr.hxx | 7 +----
dbaccess/source/ui/inc/unosqlmessage.hxx | 6 +---
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 3 --
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 6 +---
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 3 --
dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx | 3 --
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 6 +---
dbaccess/source/ui/querydesign/querydlg.hxx | 3 --
dbaccess/source/ui/tabledesign/TEditControl.hxx | 4 +-
dbaccess/source/ui/tabledesign/TableUndo.hxx | 18 ++++---------
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 6 +---
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 6 +---
dbaccess/source/ui/uno/TableFilterDlg.hxx | 7 ++---
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 5 +--
dbaccess/source/ui/uno/admindlg.hxx | 6 +---
desktop/source/deployment/inc/dp_persmap.h | 4 +-
desktop/source/deployment/manager/dp_manager.h | 3 --
68 files changed, 141 insertions(+), 247 deletions(-)
New commits:
commit 315bf654595fc621c2beb8bc332df419ff387b44
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 6 11:11:04 2017 +0200
loplugin:finalclasses in dbaccess
Change-Id: I7cbc786407ee798950a7fdc98f43aee0845ff862
Reviewed-on: https://gerrit.libreoffice.org/44347
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 2e6b3fc3dcff..261864096bae 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -70,7 +70,7 @@ namespace dbaccess
> ORowSet_BASE1;
class OTableContainer;
- class ORowSet : public cppu::BaseMutex
+ class ORowSet final : public cppu::BaseMutex
, public ORowSet_BASE1
, public ORowSetBase
, public ::comphelper::OPropertyArrayUsageHelper<ORowSet>
@@ -144,7 +144,6 @@ namespace dbaccess
bool m_bOwnConnection;
bool m_bPropChangeNotifyEnabled;
- private:
/** builds m_aActiveCommand from our settings
@return
@@ -226,7 +225,6 @@ namespace dbaccess
// restore the old state of the data column read-only state
void impl_restoreDataColumnsWriteable_throw();
- protected:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override;
virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override;
@@ -394,7 +392,6 @@ namespace dbaccess
virtual css::uno::Any SAL_CALL getWarnings( ) override;
virtual void SAL_CALL clearWarnings( ) override;
- protected:
/** implement the <method>execute</method>, without calling the approve listeners and without building a new
connection
@param _rClearForNotification mutex to clear before doing the final notifications
@@ -441,7 +438,6 @@ namespace dbaccess
*/
void impl_disposeParametersContainer_nothrow();
- protected:
using ORowSetBase::getFastPropertyValue;
using ORowSetBase::firePropertyChange;
using ORowSetBase::doCancelModification;
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 6c4a63367961..6e844e29422f 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -38,13 +38,13 @@ namespace dbaccess
typedef std::map<sal_Int32, ORowSetCacheIterator_Helper> ORowSetCacheMap;
class ORowSetCache;
- class ORowSetCacheIterator
+ class ORowSetCacheIterator final
{
friend class ORowSetCache;
ORowSetCacheMap::iterator m_aIter;
ORowSetCache* m_pCache;
ORowSetBase* m_pRowSet;
- protected:
+
ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet)
: m_aIter(_rIter)
,m_pCache(_pCache)
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index 10306d7d95dd..9d498584c012 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -58,12 +58,11 @@ namespace dbaccess
// OResultSet
- class OResultSet : public cppu::BaseMutex,
+ class OResultSet final : public cppu::BaseMutex,
public OResultSetBase,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OResultSet >
{
- protected:
css::uno::Reference< css::uno::XInterface> m_aStatement;
css::uno::Reference< css::sdbc::XResultSet > m_xDelegatorResultSet;
@@ -213,11 +212,10 @@ namespace dbaccess
virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
- protected:
+ private:
void checkReadOnly() const;
void checkBookmarkable() const;
- private:
using ::cppu::OPropertySetHelper::getFastPropertyValue;
};
}
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index d0670c78321e..497f03f24f24 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -70,13 +70,12 @@ typedef cppu::ImplHelper13 < css::container::XChild
class ODatabaseSource;
// OConnection
-class OConnection :public ::cppu::BaseMutex
+class OConnection final :public ::cppu::BaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
,public OConnection_Base
,public IRefreshListener
{
-protected:
css::uno::Reference< css::sdbcx::XTablesSupplier >
m_xMasterTables; // just to avoid the recreation of the catalog
connectivity::OWeakRefArray m_aStatements;
@@ -105,7 +104,6 @@ protected:
bool m_bSupportsUsers;
bool m_bSupportsGroups;
-protected:
virtual ~OConnection() override;
public:
OConnection(ODatabaseSource& _rDB
@@ -198,7 +196,7 @@ public:
// IRefreshListener
virtual void refresh(const css::uno::Reference< css::container::XNameAccess >& _rToBeRefreshed) override;
-protected:
+private:
/// @throws css::lang::DisposedException
void checkDisposed()
{
@@ -208,7 +206,6 @@ protected:
css::uno::Reference< css::sdbcx::XTablesSupplier > const & getMasterTables();
-private:
/** checks whether or not there are naming conflicts between tables and queries
*/
void impl_checkTableQueryNames_nothrow();
diff --git a/dbaccess/source/core/inc/bookmarkcontainer.hxx b/dbaccess/source/core/inc/bookmarkcontainer.hxx
index 97a61141005d..400bddcdb092 100644
--- a/dbaccess/source/core/inc/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/inc/bookmarkcontainer.hxx
@@ -52,17 +52,15 @@ typedef ::cppu::WeakImplHelper<
, css::container::XChild
> OBookmarkContainer_Base;
-class OBookmarkContainer
+class OBookmarkContainer final
:public OBookmarkContainer_Base
{
-protected:
typedef std::map<OUString, OUString> MapString2String;
typedef std::vector<MapString2String::iterator> MapIteratorVector;
MapString2String m_aBookmarks; // the bookmarks itself
MapIteratorVector m_aBookmarksIndexed; // for index access to the
-protected:
::cppu::OWeakObject& m_rParent; // for the ref counting
::comphelper::OInterfaceContainerHelper2
m_aContainerListeners;
@@ -123,7 +121,7 @@ public:
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override;
virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
-protected:
+private:
/** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e.
if there is such an object which is not already loaded, it won't be loaded now.
@param _rName the object name to check
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index ad82d28c54ee..6bba4ef64a27 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -52,7 +52,7 @@ namespace dbmm
};
// PreparationPage
- class PreparationPage : public MacroMigrationPage
+ class PreparationPage final : public MacroMigrationPage
{
public:
explicit PreparationPage(vcl::Window *pParent);
@@ -61,15 +61,14 @@ namespace dbmm
static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
- public:
void showCloseDocsError(bool _bShow);
- protected:
+ private:
VclPtr<FixedText> m_pCloseDocError;
};
// SaveDBDocPage
- class SaveDBDocPage : public MacroMigrationPage
+ class SaveDBDocPage final : public MacroMigrationPage
{
public:
explicit SaveDBDocPage(MacroMigrationDialog& _rParentDialog);
@@ -77,23 +76,20 @@ namespace dbmm
virtual void dispose() override;
static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
- public:
OUString getBackupLocation() const { return m_pLocationController->getURL(); }
void grabLocationFocus() { m_pSaveAsLocation->GrabFocus(); }
- protected:
+ private:
VclPtr< ::svt::OFileURLControl> m_pSaveAsLocation;
VclPtr<PushButton> m_pBrowseSaveAsLocation;
VclPtr<FixedText> m_pStartMigration;
svx::DatabaseLocationInputController* m_pLocationController;
- protected:
// IWizardPageController overridables
virtual void initializePage() override;
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
virtual bool canAdvance() const override;
- private:
DECL_LINK( OnLocationModified, Edit&, void );
void impl_updateLocationDependentItems();
};
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index 2731ea6b058c..fc1c20d3f7f9 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -35,9 +35,8 @@
namespace dbaxml
{
- class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory
+ class OPropertyHandlerFactory final : public ::xmloff::OControlPropertyHandlerFactory
{
- protected:
mutable std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler;
public:
OPropertyHandlerFactory();
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 521af5a2184d..c06e24a29a6c 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -98,9 +98,8 @@ enum DATASOURCE_TYPE
#define PAGE_DBSETUPWIZARD_MYSQL_NATIVE 18
// ODsnTypeCollection
-class OOO_DLLPUBLIC_DBA ODsnTypeCollection
+class OOO_DLLPUBLIC_DBA ODsnTypeCollection final
{
-protected:
typedef std::vector<OUString> StringVector;
StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 88c56afa9dd7..7b21837dd1ef 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -32,10 +32,10 @@ namespace dbaui
/** implements the connection page of the data source properties dialog.
*/
- class OConnectionTabPage : public OConnectionHelper
+ class OConnectionTabPage final : public OConnectionHelper
{
friend class VclPtr<OConnectionTabPage>;
- protected:
+ private:
// user authentication
VclPtr<FixedText> m_pFL2;
VclPtr<FixedText> m_pUserNameLabel;
@@ -71,7 +71,6 @@ namespace dbaui
OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
// nControlFlags is a combination of the CBTP_xxx-constants
- private:
/** enables the test connection button, if allowed
*/
virtual bool checkTestConnection() override;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 60018b394033..5f2d865f0c13 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -36,7 +36,7 @@ namespace dbaui
{
// OSpreadSheetConnectionPageSetup
- class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
+ class OSpreadSheetConnectionPageSetup final : public OConnectionTabPageSetup
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
@@ -45,7 +45,7 @@ namespace dbaui
virtual ~OSpreadSheetConnectionPageSetup() override;
virtual void dispose() override;
- protected:
+ private:
VclPtr<CheckBox> m_pPasswordrequired;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override;
@@ -127,7 +127,7 @@ namespace dbaui
};
// OGeneralSpecialJDBCConnectionPageSetup
- class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage
+ class OGeneralSpecialJDBCConnectionPageSetup final : public OGenericAdministrationPage
{
public:
OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent
@@ -142,7 +142,7 @@ namespace dbaui
static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
static VclPtr<OGenericAdministrationPage> CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
- protected:
+ private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override;
@@ -169,7 +169,7 @@ namespace dbaui
};
// OJDBCConnectionPageSetup
- class OJDBCConnectionPageSetup : public OConnectionTabPageSetup
+ class OJDBCConnectionPageSetup final : public OConnectionTabPageSetup
{
public:
OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
@@ -177,7 +177,7 @@ namespace dbaui
virtual void dispose() override;
static VclPtr<OGenericAdministrationPage> CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
- protected:
+ private:
virtual bool checkTestConnection() override;
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
@@ -228,7 +228,7 @@ namespace dbaui
};
// OAuthentificationPageSetup
- class OAuthentificationPageSetup : public OGenericAdministrationPage
+ class OAuthentificationPageSetup final : public OGenericAdministrationPage
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
@@ -237,14 +237,13 @@ namespace dbaui
virtual ~OAuthentificationPageSetup() override;
virtual void dispose() override;
- protected:
+ private:
VclPtr<FixedText> m_pFTHelpText;
VclPtr<FixedText> m_pFTUserName;
VclPtr<Edit> m_pETUserName;
VclPtr<CheckBox> m_pCBPasswordRequired;
VclPtr<PushButton> m_pPBTestConnection;
- protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index fe3c39fe536e..945a8dbec435 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -50,7 +50,7 @@ namespace dbaui
};
class IItemSetHelper;
// ODbDataSourceAdministrationHelper
- class ODbDataSourceAdministrationHelper
+ class ODbDataSourceAdministrationHelper final
{
public:
typedef std::map<sal_Int32, OUString> MapInt2String;
@@ -146,7 +146,7 @@ namespace dbaui
const css::uno::Reference< css::beans::XPropertySet >& _rxDest);
bool saveChanges(const SfxItemSet& _rSource);
- protected:
+ private:
/** fill a data source info array with the settings from a given item set
*/
void fillDatasourceInfo(const SfxItemSet& _rSource, css::uno::Sequence< css::beans::PropertyValue >& _rInfo);
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 61074846f264..8a134b5c84f7 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -40,7 +40,7 @@ namespace dbaui
#define TC_CHARSET ((short)0x08) // not yet implemented
// OTextConnectionPage
- class OTextConnectionHelper : public TabPage
+ class OTextConnectionHelper final : public TabPage
{
public:
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
@@ -75,11 +75,9 @@ namespace dbaui
short m_nAvailableSections;
- protected:
DECL_LINK(OnSetExtensionHdl,RadioButton&,void);
DECL_LINK(OnEditModified, Edit&, void);
- private:
OUString GetSeparator( const ComboBox& rBox, const OUString& rList );
void SetSeparator( ComboBox& rBox, const OUString& rList, const OUString& rVal );
void SetExtension(const OUString& _rVal);
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index c7b47f6bc561..0b1dc557fa9d 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -38,10 +38,9 @@ namespace com { namespace sun { namespace star {
namespace dbaui
{
-class OUserAdmin : public OGenericAdministrationPage
+class OUserAdmin final : public OGenericAdministrationPage
{
friend class VclPtr<OUserAdmin>;
-protected:
VclPtr<ListBox> m_pUSER;
VclPtr<PushButton> m_pNEWUSER;
VclPtr<PushButton> m_pCHANGEPWD;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index bc538ec577b7..233502b18635 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -37,9 +37,8 @@ namespace dbaui
// SpecialSettingsPage
// implements the "Special Settings" page of the advanced database settings
- class SpecialSettingsPage : public OGenericAdministrationPage
+ class SpecialSettingsPage final : public OGenericAdministrationPage
{
- protected:
VclPtr<CheckBox> m_pIsSQL92Check;
VclPtr<CheckBox> m_pAppendTableAlias;
VclPtr<CheckBox> m_pAsBeforeCorrelationName;
@@ -76,7 +75,7 @@ namespace dbaui
SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
- protected:
+ private:
virtual ~SpecialSettingsPage() override;
virtual void dispose() override;
@@ -89,16 +88,13 @@ namespace dbaui
// <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override;
- private:
void impl_initBooleanSettings();
DECL_LINK(BooleanComparisonSelectHdl, ListBox&, void);
};
// GeneratedValuesPage
- class GeneratedValuesPage : public OGenericAdministrationPage
+ class GeneratedValuesPage final : public OGenericAdministrationPage
{
- protected:
-
VclPtr<VclFrame> m_pAutoFrame;
VclPtr<CheckBox> m_pAutoRetrievingEnabled;
VclPtr<FixedText> m_pAutoIncrementLabel;
@@ -113,7 +109,7 @@ namespace dbaui
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
- protected:
+ private:
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~GeneratedValuesPage() override;
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 41d1263a4473..eb76ce72fb8f 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -164,7 +164,7 @@ namespace dbaui
};
// OGeneralSpecialJDBCDetailsPage
- class OGeneralSpecialJDBCDetailsPage : public OCommonBehaviourTabPage
+ class OGeneralSpecialJDBCDetailsPage final : public OCommonBehaviourTabPage
{
public:
OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent
@@ -175,7 +175,7 @@ namespace dbaui
virtual ~OGeneralSpecialJDBCDetailsPage() override;
virtual void dispose() override;
- protected:
+ private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index e99937f83df2..43d4293f7da1 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -38,9 +38,8 @@ namespace dbaui
{
// ODatasourceSelector
-class ODatasourceSelectDialog : public ModalDialog
+class ODatasourceSelectDialog final : public ModalDialog
{
-protected:
VclPtr<ListBox> m_pDatasource;
VclPtr<OKButton> m_pOk;
VclPtr<CancelButton> m_pCancel;
@@ -63,7 +62,7 @@ public:
virtual bool Close() override;
-protected:
+private:
DECL_LINK( ListDblClickHdl, ListBox&, void );
#ifdef HAVE_ODBC_ADMINISTRATION
DECL_LINK(ManageClickHdl, Button*, void);
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx
index 9c78f99ee8c1..350cd9f8029a 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -32,9 +32,8 @@ namespace dbaui
/** a InteractionHandler implementation which extends another handler with some customizability
*/
- class OFilePickerInteractionHandler : public OFilePickerInteractionHandler_Base
+ class OFilePickerInteractionHandler final : public OFilePickerInteractionHandler_Base
{
- protected:
css::uno::Reference< css::task::XInteractionHandler >
m_xMaster; // our master handler
bool m_bDoesNotExist;
@@ -44,7 +43,7 @@ namespace dbaui
bool isDoesNotExist() const { return m_bDoesNotExist; }
- protected:
+ private:
// XInteractionHandler
virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) override;
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index ac415990e832..e8a3f444806a 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -111,13 +111,13 @@ namespace dbaui
};
// OGeneralPageWizard
- class OGeneralPageWizard : public OGeneralPage
+ class OGeneralPageWizard final : public OGeneralPage
{
public:
OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems );
virtual ~OGeneralPageWizard() override;
virtual void dispose() override;
- public:
+
enum CreationMode
{
eCreateNew,
@@ -166,7 +166,7 @@ namespace dbaui
void SetChooseDocumentHandler( const Link<OGeneralPageWizard&,void>& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
DocumentDescriptor GetSelectedDocument() const;
- protected:
+ private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void GetFocus() override;
@@ -181,7 +181,6 @@ namespace dbaui
OUString getEmbeddedDBName( const SfxItemSet& _rSet );
void initializeEmbeddedDBList();
- protected:
DECL_LINK( OnEmbeddedDBTypeSelected, ListBox&, void );
DECL_LINK( OnCreateDatabaseModeSelected, Button*, void );
DECL_LINK( OnSetupModeSelected, Button*, void );
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index e0d0a243f4a4..ae6abcc945d7 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -40,7 +40,7 @@ namespace dbaui
// OOdbcEnumeration
struct OdbcTypesImpl;
-class OOdbcEnumeration
+class OOdbcEnumeration final
{
oslModule m_pOdbcLib; // the library handle
OUString m_sLibPath; // the path to the library
@@ -70,7 +70,7 @@ public:
void getDatasourceNames(StringBag& _rNames);
-protected:
+private:
oslGenericFunction loadSymbol(const sal_Char* _pFunctionName);
/// load the lib
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index ebfa57f066fb..46c098d6e2f1 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -31,7 +31,7 @@ namespace dbaui
// OTableSubscriptionPage
class OTableSubscriptionDialog;
- class OTableSubscriptionPage
+ class OTableSubscriptionPage final
:public OGenericAdministrationPage
{
private:
@@ -59,7 +59,7 @@ namespace dbaui
virtual ~OTableSubscriptionPage() override;
virtual void dispose() override;
- protected:
+ private:
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override;
@@ -67,8 +67,6 @@ namespace dbaui
DECL_LINK( OnTreeEntryChecked, void*, void );
DECL_LINK( OnTreeEntryButtonChecked, SvTreeListBox*, void );
- private:
-
/** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg>
*/
void implCheckTables(const css::uno::Sequence< OUString >& _rTables);
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index b610912f791d..3420042f5089 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -29,13 +29,12 @@ class SvStream;
namespace dbaui
{
- class OHTMLReader : public HTMLParser, public ODatabaseExport
+ class OHTMLReader final : public HTMLParser, public ODatabaseExport
{
OUString m_sCurrent;
sal_Int32 m_nTableCount;
sal_Int16 m_nColumnWidth; ///< maximum column width
- protected:
virtual void NextToken( HtmlTokenId nToken ) override; // base class
bool CreateTable( HtmlTokenId nToken );
virtual TypeSelectionPageFactory
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index c614f5802c74..b643729ba1c1 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -31,11 +31,10 @@ namespace dbaui
// OJoinExchObj: Additional data to create Joins in the JoinShell
typedef ::cppu::ImplHelper1< css::lang::XUnoTunnel > OJoinExchObj_Base;
- class OJoinExchObj : public TransferableHelper, public OJoinExchObj_Base
+ class OJoinExchObj final : public TransferableHelper, public OJoinExchObj_Base
{
bool m_bFirstEntry;
- protected:
OJoinExchangeData m_jxdSourceDescription;
IDragTransferableListener* m_pDragListener;
@@ -58,14 +57,13 @@ namespace dbaui
static OJoinExchangeData GetSourceDescription(const css::uno::Reference< css::datatransfer::XTransferable >& _rxObject);
static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID=SotClipboardFormatId::SBA_JOIN);
- protected:
+ private:
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
virtual void DragFinished( sal_Int8 nDropAction ) override;
static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
- private:
using TransferableHelper::StartDrag;
};
}
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 51b8bed797f6..fe26d68bb2ba 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -31,7 +31,7 @@ namespace dbaui
};
class OConnectionLineData;
- class ORelationTableConnectionData : public OTableConnectionData
+ class ORelationTableConnectionData final : public OTableConnectionData
{
friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs);
@@ -46,7 +46,6 @@ namespace dbaui
bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); }
bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); }
- protected:
virtual OConnectionLineDataRef CreateLineDataObj() override;
ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData );
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 35b2a0814da0..a02ede2e6023 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -32,7 +32,7 @@
namespace dbaui
{
class OJoinTableView;
- class ORelationDialog : public ModalDialog
+ class ORelationDialog final : public ModalDialog
,public IRelationControlInterface
{
std::unique_ptr<OTableListBoxControl> m_xTableControl;
@@ -73,10 +73,9 @@ namespace dbaui
@param _pConnectionData the connection which exists between the new tables
*/
virtual void notifyConnectionChange() override;
- protected:
+ private:
void Init(const TTableConnectionData::value_type& _pConnectionData);
- private:
DECL_LINK( OKClickHdl, Button*, void );
};
}
diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx
index 9b61853e9fa6..3e9c3badd2d9 100644
--- a/dbaccess/source/ui/inc/RtfReader.hxx
+++ b/dbaccess/source/ui/inc/RtfReader.hxx
@@ -27,11 +27,10 @@ class SvStream;
namespace dbaui
{
- class ORTFReader : public SvRTFParser , public ODatabaseExport
+ class ORTFReader final : public SvRTFParser , public ODatabaseExport
{
std::vector<sal_Int32> m_vecColor;
- protected:
bool CreateTable(int nToken);
virtual void NextToken( int nToken ) override; // base class
virtual TypeSelectionPageFactory
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index bb04ebf8c273..add296253741 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -35,7 +35,7 @@ namespace dbaui
{
class OTableRow;
typedef OSingleDocumentController OTableController_BASE;
- class OTableController : public OTableController_BASE
+ class OTableController final : public OTableController_BASE
{
private:
std::vector< std::shared_ptr<OTableRow> > m_vRowList;
@@ -131,7 +131,7 @@ namespace dbaui
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
- protected:
+ private:
void startTableListening();
void stopTableListening();
virtual void impl_initialize() override;
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 4aec33c666c7..388665c2c680 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -31,9 +31,8 @@ namespace dbaui
{
class OWizColumnSelect;
class OWizNormalExtend;
- class OCopyTable : public OWizardPage
+ class OCopyTable final : public OWizardPage
{
- protected:
VclPtr<Edit> m_pEdTableName;
VclPtr<RadioButton> m_pRB_DefData;
VclPtr<RadioButton> m_pRB_Def;
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 24b9b72bccbd..794d0203d221 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -34,9 +34,8 @@ namespace dbaui
{
class OTableDesignHelpBar;
// OWizTypeSelectControl
- class OWizTypeSelectControl : public OFieldDescControl
+ class OWizTypeSelectControl final : public OFieldDescControl
{
- protected:
VclPtr<vcl::Window> m_pParentTabPage;
virtual void ActivateAggregate( EControlType eType ) override;
virtual void DeactivateAggregate( EControlType eType ) override;
@@ -61,14 +60,13 @@ namespace dbaui
// Wizard Page: OWizTypeSelectList
// just defines the css::ucb::Command for the Contextmenu
- class OWizTypeSelectList : public MultiListBox
+ class OWizTypeSelectList final : public MultiListBox
{
bool m_bPKey;
bool IsPrimaryKeyAllowed() const;
void setPrimaryKey( OFieldDescription* _pFieldDescr,
sal_uInt16 _nPos,
bool _bSet = false);
- protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
VclPtr<vcl::Window> m_pParentTabPage;
public:
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index f8701058b4e6..f3ddc8add4ca 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -39,9 +39,8 @@ namespace dbaui
class DBTreeView;
class SbaGridControl;
- class UnoDataBrowserView : public ODataView, public ::utl::OEventListenerAdapter
+ class UnoDataBrowserView final : public ODataView, public ::utl::OEventListenerAdapter
{
- protected:
css::uno::Reference< css::awt::XControl > m_xGrid; // our grid's UNO representation
css::uno::Reference< css::awt::XControlContainer > m_xMe; // our own UNO representation
VclPtr<DBTreeView> m_pTreeView;
@@ -55,7 +54,6 @@ namespace dbaui
const css::uno::Reference< css::awt::XControl >& getGridControl() const { return m_xGrid; }
SbaGridControl* getVclControl() const;
- public:
UnoDataBrowserView( vcl::Window* pParent,
IController& _rController,
const css::uno::Reference< css::uno::XComponentContext >& );
@@ -79,19 +77,17 @@ namespace dbaui
const css::uno::Reference< css::awt::XControlContainer >& getContainer() { return m_xMe; }
- protected:
+ private:
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
virtual void GetFocus() override;
virtual void resizeDocumentView(tools::Rectangle& rRect) override;
virtual void _disposing( const css::lang::EventObject& _rSource ) override;
- private:
using ODataView::Construct;
};
- class BrowserViewStatusDisplay
+ class BrowserViewStatusDisplay final
{
- protected:
VclPtr<UnoDataBrowserView> m_pView;
public:
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 5bce762d0c68..04f7515afef4 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -29,9 +29,9 @@ namespace dbaui
// OCharsetDisplay
typedef ::dbtools::OCharsetMap OCharsetDisplay_Base;
- class OCharsetDisplay : protected OCharsetDisplay_Base
+ class OCharsetDisplay final : protected OCharsetDisplay_Base
{
- protected:
+ private:
OUString m_aSystemDisplayName;
public:
@@ -53,16 +53,15 @@ namespace dbaui
/// get access to the (last + 1st) element of the charset collection
const_iterator end() const;
- protected:
+ private:
virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const override;
- private:
using OCharsetDisplay_Base::find;
};
//- CharsetDisplayDerefHelper
typedef ::dbtools::CharsetIteratorDerefHelper CharsetDisplayDerefHelper_Base;
- class CharsetDisplayDerefHelper : protected CharsetDisplayDerefHelper_Base
+ class CharsetDisplayDerefHelper final : protected CharsetDisplayDerefHelper_Base
{
friend class OCharsetDisplay::ExtendedCharsetIterator;
@@ -74,7 +73,7 @@ namespace dbaui
OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); }
const OUString& getDisplayName() const { return m_sDisplayName; }
- protected:
+ private:
CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName);
};
diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx
index fe42de6415ed..ca4a905ff1b7 100644
--- a/dbaccess/source/ui/inc/databaseobjectview.hxx
+++ b/dbaccess/source/ui/inc/databaseobjectview.hxx
@@ -144,12 +144,10 @@ namespace dbaui
};
// QueryDesigner
- class QueryDesigner : public DatabaseObjectView
+ class QueryDesigner final : public DatabaseObjectView
{
- protected:
sal_Int32 m_nCommandType;
- protected:
virtual void fillDispatchArgs(
::comphelper::NamedValueCollection& i_rDispatchArgs,
const css::uno::Any& _aDataSource,
diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx
index e05da1b5a14f..39c81a2f8738 100644
--- a/dbaccess/source/ui/inc/datasourceconnector.hxx
+++ b/dbaccess/source/ui/inc/datasourceconnector.hxx
@@ -36,9 +36,8 @@ namespace dbaui
{
// ODatasourceConnector
- class ODatasourceConnector
+ class ODatasourceConnector final
{
- protected:
VclPtr<vcl::Window> m_pErrorMessageParent;
css::uno::Reference< css::uno::XComponentContext >
m_xContext;
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 979d0bcd9357..466c6b216598 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -45,7 +45,7 @@ namespace dbaui
class ODbDataSourceAdministrationHelper;
/** tab dialog for administrating the office wide registered data sources
*/
-class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbAdminDialog final : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog
{
private:
typedef std::stack< sal_Int32 > PageStack;
@@ -95,14 +95,13 @@ public:
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
-protected:
+private:
// adds a new detail page and remove all the old ones
void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc);
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override;
virtual short Ok() override;
-private:
/// select a datasource with a given name, adjust the item set accordingly, and everything like that ..
void impl_selectDataSource(const css::uno::Any& _aDataSourceName);
/// reset the tag pages according to m_sCurrentDatasource and <arg>_rxDatasource</arg>
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 2fe1d70b3549..6a177b163d30 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -56,7 +56,7 @@ class ODbDataSourceAdministrationHelper;
class OMySQLIntroPageSetup;
class OFinalDBPageSetup;
-class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbTypeWizDialogSetup final : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
{
private:
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
@@ -121,7 +121,7 @@ public:
*/
bool IsTableWizardToBeStarted() const;
-protected:
+private:
/// to override to create new pages
virtual VclPtr<TabPage> createPage(WizardState _nState) override;
virtual bool leaveState(WizardState _nState) override;
@@ -131,7 +131,6 @@ protected:
void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource);
-private:
/** declares a path with or without authentication, as indicated by the database type
@param _sURL
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index d61e863a53c3..a4063ff65a9e 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -41,11 +41,10 @@ namespace dbaui
{
// DirectSQLDialog
- class DirectSQLDialog
+ class DirectSQLDialog final
:public ModalDialog
,public ::utl::OEventListenerAdapter
{
- protected:
::osl::Mutex m_aMutex;
VclPtr<MultiLineEditSyntaxHighlight> m_pSQL;
@@ -76,21 +75,19 @@ namespace dbaui
/// number of history entries
sal_Int32 getHistorySize() const;
- protected:
+ private:
void executeCurrent();
void switchToHistory(sal_Int32 _nHistoryPos);
// OEventListenerAdapter
virtual void _disposing( const css::lang::EventObject& _rSource ) override;
- protected:
DECL_LINK( OnExecute, Button*, void );
DECL_LINK( OnClose, void*, void );
DECL_LINK( OnCloseClick, Button*, void );
DECL_LINK( OnListEntrySelected, ListBox&, void );
DECL_LINK( OnStatementModified, Edit&, void );
- private:
/// adds a statement to the statement history
void implAddToStatementHistory(const OUString& _rStatement);
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index b0f8a32c0271..f7c4b1db0cd8 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -30,13 +30,12 @@
namespace dbaui
{
- class DlgSize : public ModalDialog
+ class DlgSize final : public ModalDialog
{
private:
sal_Int32 m_nPrevValue, m_nStandard;
void SetValue( sal_Int32 nVal );
- protected:
DECL_LINK( CbClickHdl, Button *, void );
VclPtr<MetricField> m_pMF_VALUE;
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index f38683efc960..8c1442d1b7d2 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -29,7 +29,7 @@
namespace dbaui
{
class SbaXFormAdapter;
- class SbaExternalSourceBrowser
+ class SbaExternalSourceBrowser final
:public SbaXDataBrowserController
,public css::util::XModifyBroadcaster
{
@@ -83,7 +83,7 @@ namespace dbaui
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
- protected:
+ private:
virtual ~SbaExternalSourceBrowser() override;
virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm() override;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 7bb3d35a0a61..7781efb83f28 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -114,7 +114,7 @@ namespace dbaui
, css::beans::XPropertyChangeListener
> SbaXFormAdapter_BASE3;
- class SbaXFormAdapter
+ class SbaXFormAdapter final
:public SbaXFormAdapter_BASE1
,public SbaXFormAdapter_BASE2
,public SbaXFormAdapter_BASE3
@@ -423,7 +423,7 @@ namespace dbaui
// css::beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
- protected:
+ private:
// container handling
/// @throws css::lang::IllegalArgumentException
void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr);
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 2f379ea54158..766177035374 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -39,9 +39,8 @@ namespace dbaui
{
// DbaIndexList
- class DbaIndexList : public SvTreeListBox
+ class DbaIndexList final : public SvTreeListBox
{
- protected:
css::uno::Reference< css::sdbc::XConnection > m_xConnection;
Link<DbaIndexList&,void> m_aSelectHdl;
Link<SvTreeListEntry*,bool> m_aEndEditHdl;
@@ -66,20 +65,18 @@ namespace dbaui
m_xConnection = _rxConnection;
}
- protected:
+ private:
virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
- private:
using SvTreeListBox::Select;
};
// DbaIndexDialog
class IndexFieldsControl;
class OIndexCollection;
- class DbaIndexDialog : public ModalDialog,
- public OToolBoxHelper
+ class DbaIndexDialog final : public ModalDialog,
+ public OToolBoxHelper
{
- protected:
css::uno::Reference< css::sdbc::XConnection > m_xConnection;
VclPtr<ToolBox> m_pActions;
@@ -120,12 +117,11 @@ namespace dbaui
<svtools/imgdef.hxx>
*/
virtual void setImageList(sal_Int16 _eBitmapSet) override;
- protected:
+ private:
void fillIndexList();
void updateToolbox();
void updateControls(const SvTreeListEntry* _pEntry);
- protected:
DECL_LINK( OnIndexSelected, DbaIndexList&, void );
DECL_LINK( OnIndexAction, ToolBox*, void );
DECL_LINK( OnEntryEdited, SvTreeListEntry*, bool );
@@ -135,7 +131,6 @@ namespace dbaui
DECL_LINK( OnEditIndexAgain, void*, void );
- private:
sal_uInt16 mnNewCmdId;
sal_uInt16 mnDropCmdId;
sal_uInt16 mnRenameCmdId;
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index b7c765ffc99c..ee7cef14af15 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -45,9 +45,8 @@ namespace dbaui
GrantIndexAccess() { }
};
- struct OIndex
+ struct OIndex final
{
- protected:
OUString sOriginalName;
bool bModified;
@@ -58,7 +57,6 @@ namespace dbaui
bool bUnique;
IndexFields aFields;
- public:
OIndex(const OUString& _rOriginalName)
: sOriginalName(_rOriginalName), bModified(false), sName(_rOriginalName), bPrimaryKey(false), bUnique(false)
{
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index f03f10af62ce..4ec3f9906227 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -31,9 +31,8 @@ namespace dbaui
class DbaMouseDownListBoxController;
// IndexFieldsControl
- class IndexFieldsControl : public ::svt::EditBrowseBox
+ class IndexFieldsControl final : public ::svt::EditBrowseBox
{
- protected:
IndexFields m_aSavedValue;
IndexFields m_aFields; // !! order matters !!
@@ -68,7 +67,7 @@ namespace dbaui
void SetModifyHdl(const Link<IndexFieldsControl&,void>& _rHdl) { m_aModifyHdl = _rHdl; }
virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const override;
- protected:
+ private:
// EditBrowseBox overridables
virtual void PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, sal_uInt16 _nColumnId ) const override;
virtual bool SeekRow(long nRow) override;
@@ -78,7 +77,6 @@ namespace dbaui
::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId) override;
void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId) override;
- protected:
OUString GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const;
bool implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos);
@@ -86,7 +84,6 @@ namespace dbaui
DECL_LINK( OnListEntrySelected, DbaMouseDownListBoxController&, void );
- private:
using ::svt::EditBrowseBox::Init;
};
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index acad9b7e7b30..697dacb33ac9 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -37,9 +37,8 @@ namespace dbaui
{
// OLinkedDocumentsAccess
- class OLinkedDocumentsAccess
+ class OLinkedDocumentsAccess final
{
- protected:
css::uno::Reference< css::uno::XComponentContext >
m_xContext;
css::uno::Reference< css::container::XNameAccess >
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 6ac17f1b1920..a5d476616a8f 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -34,7 +34,7 @@ namespace dbaui
The text of the button is the same as for the "Open" command in the application
UI. Additionally, the icon for this command is also displayed on the button.
*/
- class OpenDocumentButton : public PushButton
+ class OpenDocumentButton final : public PushButton
{
private:
OUString m_sModule;
@@ -42,12 +42,12 @@ namespace dbaui
public:
OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName );
- protected:
+ private:
void impl_init( const sal_Char* _pAsciiModuleName );
};
// OpenDocumentListBox
- class OpenDocumentListBox : public ListBox
+ class OpenDocumentListBox final : public ListBox
{
private:
typedef std::pair< OUString, OUString > StringPair;
@@ -61,12 +61,11 @@ namespace dbaui
OUString GetSelectedDocumentURL() const;
OUString GetSelectedDocumentFilter() const;
- protected:
+ private:
virtual void RequestHelp( const HelpEvent& _rHEvt ) override;
StringPair impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation = false ) const;
- private:
void impl_init( const sal_Char* _pAsciiModuleName );
};
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index bfc6e44234dc..dfe396321a41 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -57,11 +57,10 @@ namespace dbaui
{
// OParameterDialog
- class OParameterDialog
+ class OParameterDialog final
:public ModalDialog
,public ::svxform::OParseContextClient
{
- protected:
// the controls
VclPtr<ListBox> m_pAllParams;
VclPtr<Edit> m_pParam;
@@ -100,10 +99,9 @@ namespace dbaui
const css::uno::Sequence< css::beans::PropertyValue >&
getValues() const { return m_aFinalValues; }
- protected:
+ private:
void Construct();
- private:
DECL_LINK(OnVisitedTimeout, Timer*, void);
DECL_LINK(OnValueModified, Edit&, void);
DECL_LINK(OnEntryListBoxSelected, ListBox&, void);
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index 734d06dd5f00..377fb8dd51b9 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -63,7 +63,7 @@ namespace com
// DlgFilterCrit
namespace dbaui
{
- class DlgFilterCrit :public ModalDialog
+ class DlgFilterCrit final :public ModalDialog
,public ::svxform::OParseContextClient
{
private:
@@ -117,7 +117,7 @@ namespace dbaui
void BuildWherePart();
- protected:
+ private:
DECL_LINK( PredicateLoseFocus, Control&, void );
};
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 71cca836f1b5..ef4330484243 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -56,9 +56,8 @@ namespace com
// DlgOrderCrit
namespace dbaui
{
- class DlgOrderCrit : public ModalDialog
+ class DlgOrderCrit final : public ModalDialog
{
- protected:
VclPtr<ListBox> m_pLB_ORDERFIELD1;
VclPtr<ListBox> m_pLB_ORDERVALUE1;
VclPtr<ListBox> m_pLB_ORDERFIELD2;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 7c7bc1dd0eb6..203f5627d31f 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -96,7 +96,7 @@ namespace dbaui
// SbaXGridPeer
- class SbaXGridPeer
+ class SbaXGridPeer final
:public FmXGridPeer
,public css::frame::XDispatch
{
@@ -129,7 +129,7 @@ namespace dbaui
// css::lang::XComponent
virtual void SAL_CALL dispose() override;
- protected:
+ private:
virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle) override;
#ifdef _MSC_VER
typedef css::frame::XStatusListener xstlist_type;
@@ -139,7 +139,6 @@ namespace dbaui
void NotifyStatusChanged(const css::util::URL& aUrl, const css::uno::Reference< css::frame::XStatusListener > & xControl);
#endif // # _MSC_VER
- private:
// for any execution of XDispatch::dispatch
struct DispatchArgs
{
@@ -208,13 +207,12 @@ namespace dbaui
};
// SbaGridControl
- class SbaGridControl : public FmGridControl
+ class SbaGridControl final : public FmGridControl
{
friend class SbaGridHeader;
friend class SbaXGridPeer;
// Attributes
- protected:
svx::ODataAccessDescriptor m_aDataDescriptor;
SbaGridListener* m_pMasterListener;
@@ -256,7 +254,7 @@ namespace dbaui
*/
void CopySelectedRowsToClipboard();
- protected:
+ private:
// DragSourceHelper overridables
virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override;
@@ -296,11 +294,9 @@ namespace dbaui
DECL_LINK(AsynchDropEvent, void*, void);
- private:
bool IsReadOnlyDB() const;
void implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfClipboardFalseIfDrag );
- private:
using FmGridControl::AcceptDrop;
using FmGridControl::ExecuteDrop;
using FmGridControl::MouseButtonDown;
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index bc7a3f8d4c9b..ddc5297554ae 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -181,7 +181,7 @@ namespace dbaui
// (with support for specialized and unspecialized property listeners)
#define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype) \
- class classname \
+ class classname final \
:public OSbaWeakSubObject \
,public listenerclass \
{ \
@@ -200,7 +200,6 @@ namespace dbaui
\
virtual void SAL_CALL methodname(const eventtype& e) override; \
\
- public: \
void addInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener); \
void removeInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener); \
\
@@ -211,7 +210,7 @@ namespace dbaui
::cppu::OInterfaceContainerHelper* getContainer(const OUString& rName) \
{ return m_aListeners.getContainer(rName); } \
\
- protected: \
+ private: \
void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \
}; \
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 4c902ab8405d..9319c4690e4a 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace beans {
namespace dbaui
{
class OQueryTextView;
- class OSqlEdit : public MultiLineEditSyntaxHighlight, public utl::ConfigurationListener
+ class OSqlEdit final : public MultiLineEditSyntaxHighlight, public utl::ConfigurationListener
{
private:
class ChangesListener;
@@ -54,10 +54,8 @@ namespace dbaui
DECL_LINK(OnUndoActionTimer, Timer*, void);
DECL_LINK(OnInvalidateTimer, Timer*, void);
- private:
void ImplSetFont();
- protected:
virtual void KeyInput( const KeyEvent& rKEvt ) override;
virtual void GetFocus() override;
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 424315f773d4..22047acba375 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -35,9 +35,8 @@ namespace dbaui
{
// OTableTreeListBox
-class OTableTreeListBox : public OMarkableTreeListBox
+class OTableTreeListBox final : public OMarkableTreeListBox
{
-protected:
css::uno::Reference< css::sdbc::XConnection >
m_xConnection; // the connection we're working for, set in implOnNewConnection, called by UpdateTableList
std::unique_ptr< ImageProvider >
@@ -121,7 +120,7 @@ public:
*/
static bool isWildcardChecked(SvTreeListEntry* _pEntry);
-protected:
+private:
virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) override;
virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry) override;
diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx
index 8d558c562e89..b1e132d4e9e8 100644
--- a/dbaccess/source/ui/inc/undosqledit.hxx
+++ b/dbaccess/source/ui/inc/undosqledit.hxx
@@ -27,9 +27,8 @@ namespace dbaui
{
class OSqlEdit;
// OSqlEditUndoAct - Undo-class for changing sql text
- class OSqlEditUndoAct : public OCommentUndoAction
+ class OSqlEditUndoAct final : public OCommentUndoAction
{
- protected:
VclPtr<OSqlEdit> m_pOwner;
OUString m_strNextText;
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index e6953517a1f3..f41b0762d9e3 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -63,14 +63,12 @@ namespace dbaui
, css::ui::XContextMenuInterception
, css::sdb::XDatabaseRegistrationsListener
> SbaTableQueryBrowser_Base;
- class SbaTableQueryBrowser
+ class SbaTableQueryBrowser final
:public SbaXDataBrowserController
,public SbaTableQueryBrowser_Base
,public IControlActionListener
,public IContextMenuProvider
{
- protected:
-
css::uno::Reference< css::i18n::XCollator > m_xCollator;
css::uno::Reference< css::frame::XFrame > m_xCurrentFrameParent;
css::uno::Reference< css::awt::XWindow > m_xMainToolbar;
@@ -204,7 +202,7 @@ namespace dbaui
virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
- protected:
+ private:
// SbaXDataBrowserController overridables
virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override;
virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
@@ -262,7 +260,6 @@ namespace dbaui
virtual void loadMenu(const css::uno::Reference< css::frame::XFrame >& _xFrame) override;
- private:
// check the state of the external slot given, update any UI elements if necessary
void implCheckExternalSlot( sal_uInt16 _nId );
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index ed26b04e402b..650527dc9efc 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -28,17 +28,15 @@ namespace dbaui
{
typedef ::svt::OGenericUnoDialog OSQLMessageDialogBase;
-class OSQLMessageDialog
+class OSQLMessageDialog final
:public OSQLMessageDialogBase
,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog >
{
-protected:
// <properties>
css::uno::Any m_aException;
OUString m_sHelpURL;
// </properties>
-protected:
OSQLMessageDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -64,7 +62,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) override;
// OPropertySetHelper overridables
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 524177b20f57..ee24068f94f5 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -25,14 +25,13 @@
namespace dbaui
{
- class OQueryTableConnectionData : public OTableConnectionData
+ class OQueryTableConnectionData final : public OTableConnectionData
{
sal_Int32 m_nFromEntryIndex;
sal_Int32 m_nDestEntryIndex;
EJoinType m_eJoinType;
bool m_bNatural;
- protected:
// for creation and duplication of lines of own type
virtual OConnectionLineDataRef CreateLineDataObj() override;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index db7dbeec49b8..6f99819d077d 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -50,9 +50,8 @@ namespace dbaui
// OTabFieldCellModifiedUndoAct - undo class to change a line of the column description
- class OTabFieldCellModifiedUndoAct : public OQueryDesignFieldUndoAct
+ class OTabFieldCellModifiedUndoAct final : public OQueryDesignFieldUndoAct
{
- protected:
OUString m_strNextCellContents;
sal_Int32 m_nCellIndex;
@@ -70,9 +69,8 @@ namespace dbaui
// OTabFieldSizedUndoAct - undo class to change the column width
- class OTabFieldSizedUndoAct : public OQueryDesignFieldUndoAct
+ class OTabFieldSizedUndoAct final : public OQueryDesignFieldUndoAct
{
- protected:
long m_nNextWidth;
public:
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index 9e5e907a47bd..d60e5fb95e54 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -28,12 +28,11 @@ namespace dbaui
// OQueryMoveTabWinUndoAct - Undo class for moving a TabWin
class OTableWindow;
- class OJoinMoveTabWinUndoAct : public OQueryDesignUndoAction
+ class OJoinMoveTabWinUndoAct final : public OQueryDesignUndoAction
{
Point m_ptNextPosition;
VclPtr<OTableWindow> m_pTabWin;
- protected:
void TogglePosition();
public:
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index aaea469c267a..fb0c48b30ad1 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
@@ -27,13 +27,12 @@ namespace dbaui
// OQuerySizeTabWinUndoAct - undo class to change size of TabWins
class OTableWindow;
- class OJoinSizeTabWinUndoAct : public OQueryDesignUndoAction
+ class OJoinSizeTabWinUndoAct final : public OQueryDesignUndoAction
{
Point m_ptNextPosition;
Size m_szNextSize;
VclPtr<OTableWindow> m_pTabWin;
- protected:
inline void ToggleSizePosition();
public:
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 782dd6f9ae05..489cc798b425 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -48,7 +48,7 @@ namespace dbaui
#define BROW_ROW_CNT 12
class OQueryDesignView;
- class OSelectionBrowseBox : public ::svt::EditBrowseBox
+ class OSelectionBrowseBox final : public ::svt::EditBrowseBox
{
friend class OQueryDesignView;
std::vector<bool> m_bVisibleRow; // at pos we find the RowId
@@ -179,7 +179,7 @@ namespace dbaui
@return The XAccessible interface of the specified cell. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override;
- protected:
+ private:
virtual bool SeekRow( long nRow ) override;
virtual void PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const override;
@@ -208,7 +208,6 @@ namespace dbaui
void stopTimer();
void startTimer();
- private:
OTableFieldDescRef FindFirstFreeCol(sal_uInt16& _rColumnPosition);
// rCol contains the Nummer (in pOTableFieldDescList) of the first column, which itself tells it is empty
@@ -314,7 +313,6 @@ namespace dbaui
*/
void setFunctionCell(OTableFieldDescRef const & _pEntry);
- private:
using ::svt::EditBrowseBox::AcceptDrop;
using ::svt::EditBrowseBox::ExecuteDrop;
using ::svt::EditBrowseBox::MouseButtonDown;
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index dc423e2184c7..215a9c857c5f 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -35,10 +35,9 @@ namespace dbaui
{
class OTableListBoxControl;
class OQueryTableView;
- class DlgQryJoin : public ModalDialog
+ class DlgQryJoin final : public ModalDialog
,public IRelationControlInterface
{
- protected:
VclPtr<FixedText> m_pML_HelpText;
VclPtr<OKButton> m_pPB_OK;
VclPtr<ListBox> m_pLB_JoinType;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 180b560d118a..d017e2526d29 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -65,7 +65,7 @@ namespace dbaui
bool bReadOnly;
// helper class
- class ClipboardInvalidator
+ class ClipboardInvalidator final
{
private:
AutoTimer m_aInvalidateTimer;
@@ -76,7 +76,7 @@ namespace dbaui
~ClipboardInvalidator();
void Stop();
- protected:
+ private:
DECL_LINK(OnInvalidate, Timer*, void);
};
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 1f4e70ac0671..d4beb0f5375c 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -55,9 +55,8 @@ namespace dbaui
virtual ~OTableEditorUndoAct() override;
};
- class OTableDesignCellUndoAct : public OTableDesignUndoAct
+ class OTableDesignCellUndoAct final : public OTableDesignUndoAct
{
- protected:
sal_uInt16 m_nCol;
long m_nRow;
css::uno::Any m_sOldText;
@@ -70,9 +69,8 @@ namespace dbaui
virtual ~OTableDesignCellUndoAct() override;
};
- class OTableEditorTypeSelUndoAct : public OTableEditorUndoAct
+ class OTableEditorTypeSelUndoAct final : public OTableEditorUndoAct
{
- protected:
sal_uInt16 m_nCol;
long m_nRow;
TOTypeInfoSP m_pOldType;
@@ -85,9 +83,8 @@ namespace dbaui
virtual ~OTableEditorTypeSelUndoAct() override;
};
- class OTableEditorDelUndoAct : public OTableEditorUndoAct
+ class OTableEditorDelUndoAct final : public OTableEditorUndoAct
{
- protected:
std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows;
virtual void Undo() override;
@@ -97,9 +94,8 @@ namespace dbaui
virtual ~OTableEditorDelUndoAct() override;
};
- class OTableEditorInsUndoAct : public OTableEditorUndoAct
+ class OTableEditorInsUndoAct final : public OTableEditorUndoAct
{
- protected:
std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows;
long m_nInsPos;
@@ -112,9 +108,8 @@ namespace dbaui
virtual ~OTableEditorInsUndoAct() override;
};
- class OTableEditorInsNewUndoAct : public OTableEditorUndoAct
+ class OTableEditorInsNewUndoAct final : public OTableEditorUndoAct
{
- protected:
long m_nInsPos;
long m_nInsRows;
@@ -125,9 +120,8 @@ namespace dbaui
virtual ~OTableEditorInsNewUndoAct() override;
};
- class OPrimKeyUndoAct : public OTableEditorUndoAct
+ class OPrimKeyUndoAct final : public OTableEditorUndoAct
{
- protected:
MultiSelection m_aDelKeys,
m_aInsKeys;
VclPtr<OTableEditorCtrl> m_pEditorCtrl;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 0d2a4ac5c9e9..d0fc12e261b1 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -24,13 +24,11 @@
namespace dbaui
{
-// ODBTypeWizDialog
-class ODBTypeWizDialog
+class ODBTypeWizDialog final
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialog >
{
-protected:
explicit ODBTypeWizDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -55,7 +53,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
};
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index c32e37c9140d..12f81aad6232 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -24,15 +24,13 @@
namespace dbaui
{
-// ODBTypeWizDialogSetup
-class ODBTypeWizDialogSetup
+class ODBTypeWizDialogSetup final
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup >
{
bool m_bOpenDatabase;
bool m_bStartTableWizard;
-protected:
explicit ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -57,7 +55,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
virtual void executedDialog(sal_Int16 _nExecutionResult) override;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index b6b27951a30f..114698dab832 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -24,13 +24,12 @@
namespace dbaui
{
-// OTableFilterDialog
-class OTableFilterDialog
+
+class OTableFilterDialog final
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< OTableFilterDialog >
{
-protected:
explicit OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -55,7 +54,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
};
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index e9fa5c4bcf8f..75aba227b0ca 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -25,12 +25,11 @@
namespace dbaui
{
// OUserSettingsDialog
-class OUserSettingsDialog
+class OUserSettingsDialog final
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< OUserSettingsDialog >
{
-protected:
explicit OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -55,7 +54,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
};
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 52271e54ab63..f2941fe3a00c 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -24,13 +24,11 @@
namespace dbaui
{
-// ODataSourcePropertyDialog
-class ODataSourcePropertyDialog
+class ODataSourcePropertyDialog final
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< ODataSourcePropertyDialog >
{
-protected:
explicit ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
@@ -55,7 +53,7 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-protected:
+private:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
};
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index fb59cd5a0680..c42841c83f84 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -32,7 +32,7 @@ typedef std::unordered_map<
// Class to read obsolete registered extensions
// should be removed for LibreOffice 4.0
-class PersistentMap
+class PersistentMap final
{
::osl::File m_MapFile;
t_string2string_map m_entries;
@@ -52,7 +52,7 @@ public:
void put( OString const & key, OString const & value );
bool erase( OString const & key );
-protected:
+private:
void open();
void readAll();
void add( OString const & key, OString const & value );
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 54b694c17d39..f5ffe6996d49 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -39,7 +39,7 @@ typedef ::cppu::WeakComponentImplHelper<
css::deployment::XPackageManager > t_pm_helper;
-class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
+class PackageManagerImpl final : private ::dp_misc::MutexHolder, public t_pm_helper
{
css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
OUString m_context;
@@ -115,7 +115,6 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
virtual void SAL_CALL pop() override;
};
-protected:
inline void check();
virtual void SAL_CALL disposing() override;
More information about the Libreoffice-commits
mailing list