[Libreoffice-commits] core.git: package/inc reportdesign/inc sc/inc sfx2/inc
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 13 13:58:35 UTC 2020
package/inc/EncryptionData.hxx | 2 +-
package/inc/ZipOutputEntry.hxx | 6 +++---
package/inc/ZipPackageStream.hxx | 2 +-
package/inc/zipfileaccess.hxx | 2 +-
reportdesign/inc/PropertyForward.hxx | 4 ++--
reportdesign/inc/ReportDefinition.hxx | 7 ++-----
reportdesign/inc/RptModel.hxx | 2 +-
reportdesign/inc/RptObject.hxx | 2 +-
reportdesign/inc/RptPage.hxx | 3 +--
reportdesign/inc/UndoActions.hxx | 16 ++++++++--------
sc/inc/sheetlimits.hxx | 2 +-
sfx2/inc/autoredactdialog.hxx | 4 ++--
sfx2/inc/inettbc.hxx | 2 +-
sfx2/inc/preventduplicateinteraction.hxx | 4 ++--
sfx2/inc/saveastemplatedlg.hxx | 2 +-
sfx2/inc/sorgitm.hxx | 2 +-
sfx2/inc/srchdlg.hxx | 2 +-
17 files changed, 30 insertions(+), 34 deletions(-)
New commits:
commit c1e96a5d323614f1566702c933dcda9d89d23632
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 13 15:08:08 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 13 14:58:03 2020 +0100
loplugin:finalclasses in package..sfx2
Change-Id: I2908abc13f16b0011fcb326e8405080cc30df74a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86684
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx
index 66f8aeb5881a..0eae28d3422a 100644
--- a/package/inc/EncryptionData.hxx
+++ b/package/inc/EncryptionData.hxx
@@ -42,7 +42,7 @@ public:
{}
};
-class EncryptionData : public BaseEncryptionData
+class EncryptionData final : public BaseEncryptionData
{
public:
css::uno::Sequence < sal_Int8 > m_aKey;
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 3bace59698b5..a8fbf1563c16 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -107,7 +107,7 @@ protected:
};
// Class that runs the compression in a background thread.
-class ZipOutputEntryInThread : public ZipOutputEntry
+class ZipOutputEntryInThread final : public ZipOutputEntry
{
class Task;
OUString m_aTempURL;
@@ -135,7 +135,7 @@ private:
};
// Class that synchronously runs the compression in multiple threads (using ThreadDeflater).
-class ZipOutputEntryParallel : public ZipOutputEntryBase
+class ZipOutputEntryParallel final : public ZipOutputEntryBase
{
sal_Int64 totalIn;
sal_Int64 totalOut;
@@ -145,7 +145,7 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt);
void writeStream(const css::uno::Reference< css::io::XInputStream >& xInStream) override;
-protected:
+private:
virtual void finishDeflater() override;
virtual sal_Int64 getDeflaterTotalIn() const override;
virtual sal_Int64 getDeflaterTotalOut() const override;
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 7f704ca59232..f4f6d438c8d9 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -38,7 +38,7 @@
class ZipPackage;
struct ZipEntry;
-class ZipPackageStream : public cppu::ImplInheritanceHelper
+class ZipPackageStream final : public cppu::ImplInheritanceHelper
<
ZipPackageEntry,
css::io::XActiveDataSink,
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 901ae060e436..2cd403d54545 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -37,7 +37,7 @@
#include <memory>
-class OZipFileAccess : public ::cppu::WeakImplHelper<
+class OZipFileAccess final : public ::cppu::WeakImplHelper<
css::packages::zip::XZipFileAccess2,
css::lang::XInitialization,
css::lang::XComponent,
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index c86858d87720..4f467c2a0fe0 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -39,7 +39,7 @@ namespace rptui
* Identical properties will be set at the other propertyset.
* \ingroup reportdesign_source_ui_misc
*/
- class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex
+ class REPORTDESIGN_DLLPUBLIC OPropertyMediator final : public ::cppu::BaseMutex
,public OPropertyForward_Base
{
TPropertyNamePair m_aNameMap;
@@ -50,7 +50,7 @@ namespace rptui
bool m_bInChange;
OPropertyMediator(OPropertyMediator const &) = delete;
void operator =(OPropertyMediator const &) = delete;
- protected:
+
virtual ~OPropertyMediator() override;
/** this function is called upon disposing the component
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 9c8c25033e21..49dd3b4ac0fa 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -83,16 +83,14 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
- class REPORTDESIGN_DLLPUBLIC OReportDefinition :public ::cppu::BaseMutex
+ class REPORTDESIGN_DLLPUBLIC OReportDefinition final :public ::cppu::BaseMutex
,public ReportDefinitionBase
,public ReportDefinitionPropertySet
,public ::comphelper::IEmbeddedHelper
{
- private:
std::shared_ptr<OReportComponentProperties> m_aProps;
std::shared_ptr<OReportDefinitionImpl> m_pImpl;
- private:
OReportDefinition(const OReportDefinition&) = delete;
OReportDefinition& operator=(const OReportDefinition&) = delete;
@@ -165,7 +163,6 @@ namespace reportdesign
const css::uno::Sequence< css::beans::PropertyValue >& _rArguments
);
- protected:
virtual ~OReportDefinition() override;
/** this function is called upon disposing the component
@@ -186,7 +183,7 @@ namespace reportdesign
css::uno::Reference< css::uno::XComponentContext > getContext();
- protected:
+ private:
/** abstract SdrModel provider */
virtual SdrModel& getSdrModelFromUnoModel() const override;
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 4c44f5ebe92d..260e40f4c978 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -38,7 +38,7 @@ namespace rptui
class OReportPage;
class OXUndoEnvironment;
-class REPORTDESIGN_DLLPUBLIC OReportModel : public SdrModel
+class REPORTDESIGN_DLLPUBLIC OReportModel final : public SdrModel
{
friend class OReportPage;
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index fdaf799f7285..1b3092155ca5 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -45,7 +45,7 @@ typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap;
};
class OUnoObject;
- class REPORTDESIGN_DLLPUBLIC DlgEdHint: public SfxHint
+ class REPORTDESIGN_DLLPUBLIC DlgEdHint final : public SfxHint
{
private:
DlgEdHintKind const eHintKind;
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index abfa883f93eb..d8ff7fc9d176 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -32,7 +32,7 @@ namespace rptui
class OReportModel;
-class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
+class REPORTDESIGN_DLLPUBLIC OReportPage final : public SdrPage
{
OReportPage& operator=(const OReportPage&) = delete;
OReportPage(const OReportPage&) = delete;
@@ -48,7 +48,6 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
virtual ~OReportPage() override;
-protected:
virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
public:
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index cac660fc520c..78909ac7cda8 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -191,7 +191,7 @@ namespace rptui
// OUndoReportSectionAction
- class OUndoReportSectionAction : public OUndoContainerAction
+ class OUndoReportSectionAction final : public OUndoContainerAction
{
OReportHelper m_aReportHelper;
::std::function<css::uno::Reference< css::report::XSection >(OReportHelper *)> m_pMemberFunction;
@@ -203,14 +203,14 @@ namespace rptui
,const css::uno::Reference< css::uno::XInterface>& xElem
,const char* pCommentId);
- protected:
+ private:
virtual void implReInsert( ) override;
virtual void implReRemove( ) override;
};
// OUndoGroupSectionAction
- class OUndoGroupSectionAction : public OUndoContainerAction
+ class OUndoGroupSectionAction final : public OUndoContainerAction
{
OGroupHelper m_aGroupHelper;
::std::function<css::uno::Reference< css::report::XSection >(OGroupHelper *)> m_pMemberFunction;
@@ -222,7 +222,7 @@ namespace rptui
,const css::uno::Reference< css::uno::XInterface>& xElem
,const char* pCommentId);
- protected:
+ private:
virtual void implReInsert( ) override;
virtual void implReRemove( ) override;
};
@@ -255,11 +255,11 @@ namespace rptui
// OUndoPropertyReportSectionAction
- class OUndoPropertyReportSectionAction : public ORptUndoPropertyAction
+ class OUndoPropertyReportSectionAction final : public ORptUndoPropertyAction
{
OReportHelper m_aReportHelper;
::std::function<css::uno::Reference< css::report::XSection >(OReportHelper *)> m_pMemberFunction;
- protected:
+
virtual css::uno::Reference< css::beans::XPropertySet> getObject() override;
public:
OUndoPropertyReportSectionAction(SdrModel& rMod
@@ -272,11 +272,11 @@ namespace rptui
// OUndoPropertyGroupSectionAction
- class OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction
+ class OUndoPropertyGroupSectionAction final : public ORptUndoPropertyAction
{
OGroupHelper m_aGroupHelper;
::std::function<css::uno::Reference< css::report::XSection >(OGroupHelper *)> m_pMemberFunction;
- protected:
+
virtual css::uno::Reference< css::beans::XPropertySet> getObject() override;
public:
OUndoPropertyGroupSectionAction(SdrModel& rMod
diff --git a/sc/inc/sheetlimits.hxx b/sc/inc/sheetlimits.hxx
index ad9541983a5b..60b6f86ea424 100644
--- a/sc/inc/sheetlimits.hxx
+++ b/sc/inc/sheetlimits.hxx
@@ -24,7 +24,7 @@
// Because some stuff needs this info, and those objects lifetimes sometimes exceeds the lifetime
// of the ScDocument.
-struct ScSheetLimits : public salhelper::SimpleReferenceObject
+struct ScSheetLimits final : public salhelper::SimpleReferenceObject
{
const SCCOL mnMaxCol; /// Maximum addressable column
const SCROW mnMaxRow; /// Maximum addressable row
diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 50b96d6f709b..d43d88e774b1 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -96,7 +96,7 @@ enum class StartFileDialogType
SaveAs
};
-class SfxAutoRedactDialog : public SfxDialogController
+class SfxAutoRedactDialog final : public SfxDialogController
{
SfxObjectShellLock m_xDocShell;
std::vector<std::pair<RedactionTarget*, OUString>> m_aTableTargets;
@@ -142,7 +142,7 @@ public:
bool getTargets(std::vector<std::pair<RedactionTarget*, OUString>>& r_aTargets);
};
-class SfxAddTargetDialog : public weld::GenericDialogController
+class SfxAddTargetDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr<weld::Entry> m_xName;
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 53acd96c9abf..3b940931e6e4 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -26,7 +26,7 @@
class SvtURLBox;
-class SfxURLToolBoxControl_Impl : public SfxToolBoxControl
+class SfxURLToolBoxControl_Impl final : public SfxToolBoxControl
{
private:
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index 92680833c815..a9db2c3b4ebe 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -55,7 +55,7 @@ inline void closedialogs(SystemWindow& rTopLevel, bool bCloseRoot)
//
// If there are dialog children open on exit then veto termination,
// close the topmost dialog and retry termination.
-class WarningDialogsParent :
+class WarningDialogsParent final :
public cppu::WeakComponentImplHelper<css::frame::XTerminateListener>
{
private:
@@ -157,7 +157,7 @@ struct ThreadHelpBase2
mutable ::osl::Mutex m_aLock;
};
-class PreventDuplicateInteraction : private ThreadHelpBase2
+class PreventDuplicateInteraction final : private ThreadHelpBase2
, public ::cppu::WeakImplHelper<css::lang::XInitialization, css::task::XInteractionHandler2>
{
diff --git a/sfx2/inc/saveastemplatedlg.hxx b/sfx2/inc/saveastemplatedlg.hxx
index b029a7e13031..a4df61853aaf 100644
--- a/sfx2/inc/saveastemplatedlg.hxx
+++ b/sfx2/inc/saveastemplatedlg.hxx
@@ -17,7 +17,7 @@
#include <com/sun/star/frame/XModel.hpp>
// class SfxSaveAsTemplateDialog -------------------------------------------------------------------
-class SfxSaveAsTemplateDialog : public weld::GenericDialogController
+class SfxSaveAsTemplateDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr<weld::TreeView> m_xLBCategory;
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 7c07f27917f6..d67d890620eb 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -23,7 +23,7 @@
// class SfxScriptOrganizerItem ---------------------------------------------
-class SfxScriptOrganizerItem : public SfxStringItem
+class SfxScriptOrganizerItem final : public SfxStringItem
{
private:
OUString aLanguage;
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 4767dc28aa1e..4983336b978a 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -27,7 +27,7 @@ namespace sfx2 {
// SearchDialog
-class SearchDialog : public weld::GenericDialogController
+class SearchDialog final : public weld::GenericDialogController
{
private:
Link<SearchDialog&,void> m_aFindHdl;
More information about the Libreoffice-commits
mailing list