[Libreoffice-commits] core.git: comphelper/source connectivity/source cui/source dbaccess/source desktop/source editeng/source filter/source forms/source include/comphelper include/connectivity include/dbaccess include/editeng
Noel Grandin
noel.grandin at collabora.co.uk
Tue Nov 8 06:58:26 UTC 2016
comphelper/source/container/enumerablemap.cxx | 4 +--
comphelper/source/property/propertysetinfo.cxx | 4 +--
connectivity/source/drivers/mork/MQueryHelper.hxx | 4 +--
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 5 +---
connectivity/source/inc/dbase/DIndexIter.hxx | 4 +--
connectivity/source/inc/file/fanalyzer.hxx | 4 +--
cui/source/inc/scriptdlg.hxx | 4 +--
dbaccess/source/ui/inc/ConnectionLine.hxx | 4 +--
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 4 +--
dbaccess/source/ui/inc/RelationControl.hxx | 6 +----
dbaccess/source/ui/inc/brwctrlr.hxx | 4 +--
desktop/source/app/cmdlineargs.hxx | 5 ++--
desktop/source/deployment/manager/dp_properties.hxx | 8 +-----
editeng/source/lookuptree/Trie.cxx | 4 +--
filter/source/svg/svgwriter.hxx | 12 +++++-----
forms/source/component/GroupManager.hxx | 4 +--
include/comphelper/proparrhlp.hxx | 12 ----------
include/comphelper/threadpool.hxx | 4 +--
include/connectivity/formattedcolumnvalue.hxx | 4 +--
include/dbaccess/AsynchronousLink.hxx | 6 +----
include/editeng/Trie.hxx | 4 +--
include/editeng/acorrcfg.hxx | 4 +--
include/editeng/editview.hxx | 4 +--
include/editeng/numitem.hxx | 4 +--
include/editeng/outliner.hxx | 4 +--
25 files changed, 54 insertions(+), 72 deletions(-)
New commits:
commit c123c528bf1550e544b29e5a22a94a0452d5f349
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 8 08:13:11 2016 +0200
loplugin:unnecessaryvirtual in comphelper..forms
Change-Id: Iabe292e68cb84b97f207061347ed6a30309dc9fd
Reviewed-on: https://gerrit.libreoffice.org/30679
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 4c9940d..1dc2329 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -208,7 +208,7 @@ namespace comphelper
};
- class MapEnumerator
+ class MapEnumerator final
{
public:
MapEnumerator( ::cppu::OWeakObject& _rParent, MapData& _mapData, const EnumerationType _type )
@@ -221,7 +221,7 @@ namespace comphelper
lcl_registerMapModificationListener( m_rMapData, *this );
}
- virtual ~MapEnumerator()
+ ~MapEnumerator()
{
dispose();
}
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 9c1e809..9329336 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -31,11 +31,11 @@ using namespace ::com::sun::star::lang;
namespace comphelper
{
-class PropertyMapImpl
+class PropertyMapImpl final
{
public:
PropertyMapImpl() throw();
- virtual ~PropertyMapImpl() throw();
+ ~PropertyMapImpl() throw();
void add(PropertyMapEntry const * pMap) throw();
void remove( const OUString& aName ) throw();
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 2fffac1..1871b45 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -159,7 +159,7 @@ namespace connectivity
void setValue( const OString &key, const OUString & rValue);
};
- class MQueryHelper
+ class MQueryHelper final
{
private:
typedef std::vector< MQueryHelperResultEntry* > resultsArray;
@@ -174,7 +174,7 @@ namespace connectivity
public:
explicit MQueryHelper(const OColumnAlias& _ca);
- virtual ~MQueryHelper();
+ ~MQueryHelper();
void reset();
MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow );
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index d2eed6c..aabcc49 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -65,11 +65,10 @@ namespace connectivity
};
//Used to query profiles information
- class ProfileAccess
+ class ProfileAccess final
{
public:
-
- virtual ~ProfileAccess();
+ ~ProfileAccess();
ProfileAccess();
OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException);
::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException);
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 55305bf..3491828 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -31,7 +31,7 @@ namespace connectivity
// IndexIterator
- class OIndexIterator
+ class OIndexIterator final
{
protected:
file::OBoolOperator* m_pOperator;
@@ -60,7 +60,7 @@ namespace connectivity
{
}
- virtual ~OIndexIterator();
+ ~OIndexIterator();
sal_uInt32 First();
sal_uInt32 Next();
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index d719b24..1eee9ed 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -28,7 +28,7 @@ namespace connectivity
namespace file
{
class OConnection;
- class OOO_DLLPUBLIC_FILE OSQLAnalyzer
+ class OOO_DLLPUBLIC_FILE OSQLAnalyzer final
{
typedef ::std::list<OEvaluateSet*> OEvaluateSetList;
typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates;
@@ -45,7 +45,7 @@ namespace connectivity
public:
OSQLAnalyzer(OConnection* _pConnection);
- virtual ~OSQLAnalyzer();
+ ~OSQLAnalyzer();
inline static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 7a582ed..462285f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -109,7 +109,7 @@ public:
}
};
-class SFEntry
+class SFEntry final
{
private:
sal_uInt8 nType;
@@ -121,7 +121,7 @@ public:
const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
- virtual ~SFEntry() {}
+ ~SFEntry() {}
const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode() { return nodes ;}
const css::uno::Reference< css::frame::XModel >& GetModel() { return model ;};
bool isLoaded() const { return loaded; }
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index f8d16a4..5ad1708 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -36,7 +36,7 @@ namespace dbaui
the class OConnectionLine represents the graphical line between the to two windows
**/
class OTableConnection;
- class OConnectionLine
+ class OConnectionLine final
{
VclPtr<OTableConnection> m_pTabConn;
OConnectionLineDataRef m_pData;
@@ -48,7 +48,7 @@ namespace dbaui
public:
OConnectionLine( OTableConnection* pConn, OConnectionLineDataRef const & pLineData );
OConnectionLine( const OConnectionLine& rLine );
- virtual ~OConnectionLine();
+ ~OConnectionLine();
OConnectionLine& operator=( const OConnectionLine& rLine );
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 397a5db..2442b18 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -34,14 +34,14 @@ namespace dbaui
class OQueryContainerWindow;
class OQueryController;
- class OQueryViewSwitch
+ class OQueryViewSwitch final
{
VclPtr<OQueryDesignView> m_pDesignView;
VclPtr<OQueryTextView> m_pTextView;
bool m_bAddTableDialogWasVisible; // true if so
public:
OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& );
- virtual ~OQueryViewSwitch();
+ ~OQueryViewSwitch();
bool isCutAllowed();
bool isPasteAllowed();
diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx
index 24b9d2d..8fe8ed1 100644
--- a/dbaccess/source/ui/inc/RelationControl.hxx
+++ b/dbaccess/source/ui/inc/RelationControl.hxx
@@ -30,23 +30,21 @@ namespace dbaui
class IRelationControlInterface;
class ORelationControl;
- class OTableListBoxControl
+ class OTableListBoxControl final
{
VclPtr<ListBox> m_pLeftTable;
VclPtr<ListBox> m_pRightTable;
-
VclPtr<ORelationControl> m_pRC_Tables;
const OJoinTableView::OTableWindowMap* m_pTableMap;
IRelationControlInterface* m_pParentDialog;
OUString m_strCurrentLeft;
OUString m_strCurrentRight;
- private:
DECL_LINK( OnTableChanged, ListBox&, void );
public:
OTableListBoxControl(VclBuilderContainer* _pParent,
const OJoinTableView::OTableWindowMap* _pTableMap,
IRelationControlInterface* _pParentDialog);
- virtual ~OTableListBoxControl();
+ ~OTableListBoxControl();
/** fillListBoxes fills the list boxes with the table windows
*/
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index d953491..c227b9d 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -113,12 +113,12 @@ namespace dbaui
bool m_bCannotSelectUnfiltered : 1; // received an DATA_CANNOT_SELECT_UNFILTERED error
protected:
- class FormErrorHelper
+ class FormErrorHelper final
{
SbaXDataBrowserController* m_pOwner;
public:
FormErrorHelper(SbaXDataBrowserController* pOwner) : m_pOwner(pOwner) { m_pOwner->enterFormAction(); }
- virtual ~FormErrorHelper() { m_pOwner->leaveFormAction(); }
+ ~FormErrorHelper() { m_pOwner->leaveFormAction(); }
};
friend class FormErrorHelper;
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index c8f0711..7a52e04 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -36,11 +36,12 @@ class CommandLineArgs
struct Supplier
{
// Thrown from constructors and next:
- class Exception {
+ class Exception final
+ {
public:
Exception();
Exception(Exception const &);
- virtual ~Exception();
+ ~Exception();
Exception & operator =(Exception const &);
};
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index c1850cf..e1ebace 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -29,12 +29,8 @@
namespace dp_manager {
-/**
-
- */
-class ExtensionProperties
+class ExtensionProperties final
{
-protected:
OUString m_propFileUrl;
const css::uno::Reference<css::ucb::XCommandEnvironment> m_xCmdEnv;
const css::uno::Reference<css::uno::XComponentContext> m_xContext;
@@ -44,7 +40,7 @@ protected:
static OUString getPropertyValue(css::beans::NamedValue const & v);
public:
- virtual ~ExtensionProperties() {};
+ ~ExtensionProperties() {};
ExtensionProperties(OUString const & urlExtension,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
css::uno::Reference<css::uno::XComponentContext> const & xContext);
diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx
index cc5c126..57b0167 100644
--- a/editeng/source/lookuptree/Trie.cxx
+++ b/editeng/source/lookuptree/Trie.cxx
@@ -16,7 +16,7 @@ using namespace std;
/* TrieNode */
-struct TrieNode
+struct TrieNode final
{
static const int LATIN_ARRAY_SIZE = 26;
@@ -27,7 +27,7 @@ struct TrieNode
explicit TrieNode(sal_Unicode aCharacter = '\0');
- virtual ~TrieNode();
+ ~TrieNode();
void markWord();
TrieNode* findChild(sal_Unicode aCharacter);
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 0ea1c7c..b06998b 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -146,7 +146,7 @@ class SVGExport;
class SVGFontExport;
-class SVGAttributeWriter
+class SVGAttributeWriter final
{
private:
@@ -161,7 +161,7 @@ private:
public:
SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport, SVGState& rCurState );
- virtual ~SVGAttributeWriter();
+ ~SVGAttributeWriter();
void AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor );
void AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, OUString& rGradientId );
@@ -214,7 +214,7 @@ struct BulletListItemInfo
};
-class SVGTextWriter
+class SVGTextWriter final
{
public:
typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap;
@@ -255,7 +255,7 @@ class SVGTextWriter
public:
explicit SVGTextWriter( SVGExport& rExport, SVGAttributeWriter& rAttributeWriter );
- virtual ~SVGTextWriter();
+ ~SVGTextWriter();
sal_Int32 setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nCurAction );
void setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction );
@@ -312,7 +312,7 @@ class SVGTextWriter
};
-class SVGActionWriter
+class SVGActionWriter final
{
private:
@@ -377,7 +377,7 @@ public:
public:
SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport );
- virtual ~SVGActionWriter();
+ ~SVGActionWriter();
void WriteMetaFile( const Point& rPos100thmm,
const Size& rSize100thmm,
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 35f1c9e..470925f 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -130,7 +130,7 @@ public:
const OGroupComp& GetGroupComponent() const { return m_aGroupComp; }
};
-class OGroup
+class OGroup final
{
OGroupCompArr m_aCompArray;
std::vector<OGroupCompAcc> m_aCompAccArray;
@@ -142,7 +142,7 @@ class OGroup
public:
explicit OGroup(const OUString& rGroupName);
- virtual ~OGroup();
+ ~OGroup();
const OUString& GetGroupName() const { return m_aGroupName; }
css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > GetControlModels() const;
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 3584553..114efda 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -85,16 +85,6 @@ protected:
the additional parameters of the OPropertyArrayAggregationHelper.
*/
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
- /** the return value is used for the construction of the OPropertyArrayAggregationHelper.
- Beware of the lifetime of the returned object, as it has to exist 'til the last instance
- of this class dies.
- */
- virtual IPropertyInfoService* getInfoService() const { return nullptr; }
-
- /** the return value is used for the construction of the OPropertyArrayAggregationHelper.
- */
- virtual sal_Int32 getFirstAggregateId() const { return DEFAULT_AGGREGATE_PROPERTY_ID; }
};
template<class TYPE>
@@ -145,7 +135,7 @@ template <class TYPE> inline
css::uno::Sequence< css::beans::Property > aAggregateProps;
fillProperties(aProps, aAggregateProps);
OSL_ENSURE(aProps.getLength(), "OAggregationArrayUsageHelper::createArrayHelper : fillProperties returned nonsense !");
- return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId());
+ return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, nullptr, DEFAULT_AGGREGATE_PROPERTY_ID);
}
}
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index 93f6b59..7910a83 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -36,7 +36,7 @@ public:
};
/// A very basic thread pool implementation
-class COMPHELPER_DLLPUBLIC ThreadPool
+class COMPHELPER_DLLPUBLIC ThreadPool final
{
public:
/// returns a pointer to a shared pool with optimal thread
@@ -54,7 +54,7 @@ public:
static sal_Int32 getPreferredConcurrency();
ThreadPool( sal_Int32 nWorkers );
- virtual ~ThreadPool();
+ ~ThreadPool();
/// push a new task onto the work queue
void pushTask( ThreadTask *pTask /* takes ownership */ );
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index 1b3598f..d7f7d8a 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -38,7 +38,7 @@ namespace dbtools
/** a class which helps retrieving and setting the value of a database column
as formatted string.
*/
- class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue
+ class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue final
{
public:
/** constructs an instance
@@ -74,7 +74,7 @@ namespace dbtools
// note that all methods of this class need to be virtual, since it's
// used in a load-on-demand context in module SVX
- virtual ~FormattedColumnValue();
+ ~FormattedColumnValue();
void clear();
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx
index 1f19469..d8ca5b1 100644
--- a/include/dbaccess/AsynchronousLink.hxx
+++ b/include/dbaccess/AsynchronousLink.hxx
@@ -36,11 +36,9 @@ namespace dbaui
event while another thread tries to delete this event in the _destructor_ of the
class).
*/
- class OAsynchronousLink
+ class OAsynchronousLink final
{
Link<void*,void> m_aHandler;
-
- protected:
::osl::Mutex m_aEventSafety;
::osl::Mutex m_aDestructionSafety;
ImplSVEvent * m_nEventId;
@@ -50,7 +48,7 @@ namespace dbaui
@param _rHandler The link to be called asynchronously
*/
OAsynchronousLink( const Link<void*,void>& _rHandler );
- virtual ~OAsynchronousLink();
+ ~OAsynchronousLink();
bool IsRunning() const { return m_nEventId != nullptr; }
diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx
index 4cdcdc9..62e2ff9 100644
--- a/include/editeng/Trie.hxx
+++ b/include/editeng/Trie.hxx
@@ -21,14 +21,14 @@ namespace editeng
struct TrieNode;
-class EDITENG_DLLPUBLIC Trie
+class EDITENG_DLLPUBLIC Trie final
{
private:
std::unique_ptr<TrieNode> mRoot;
public:
Trie();
- virtual ~Trie();
+ ~Trie();
void insert(const OUString& sInputString) const;
void findSuggestions(const OUString& sWordPart, std::vector<OUString>& rSuggestionList) const;
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index ee21ebc..6eef058 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -60,7 +60,7 @@ public:
/*--------------------------------------------------------------------
Description: Configuration for Auto Correction
--------------------------------------------------------------------*/
-class EDITENG_DLLPUBLIC SvxAutoCorrCfg
+class EDITENG_DLLPUBLIC SvxAutoCorrCfg final
{
friend class SvxBaseAutoCorrCfg;
friend class SvxSwAutoCorrCfg;
@@ -111,7 +111,7 @@ public:
bool IsSearchInAllCategories() const { return bSearchInAllCategories;}
SvxAutoCorrCfg();
- virtual ~SvxAutoCorrCfg();
+ ~SvxAutoCorrCfg();
static SvxAutoCorrCfg& Get();
};
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 007f368..c05371d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -79,7 +79,7 @@ enum class ScrollRangeCheck
};
-class EDITENG_DLLPUBLIC EditView
+class EDITENG_DLLPUBLIC EditView final
{
friend class EditEngine;
friend class ImpEditEngine;
@@ -101,7 +101,7 @@ private:
public:
EditView( EditEngine* pEng, vcl::Window* pWindow );
- virtual ~EditView();
+ ~EditView();
void SetEditEngine( EditEngine* pEditEngine );
EditEngine* GetEditEngine() const;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 5466ae8..86d8b05 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -235,7 +235,7 @@ enum class SvxNumRuleType
END
};
-class EDITENG_DLLPUBLIC SvxNumRule
+class EDITENG_DLLPUBLIC SvxNumRule final
{
sal_uInt16 nLevelCount; // Number of supported levels
SvxNumRuleFlags nFeatureFlags; // What is supported?
@@ -257,7 +257,7 @@ public:
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule& rCopy);
SvxNumRule(SvStream &rStream);
- virtual ~SvxNumRule();
+ ~SvxNumRule();
bool operator==( const SvxNumRule& ) const;
bool operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index bfe11fc..cdc7cb1 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -188,7 +188,7 @@ inline void ParaRange::Adjust()
}
}
-class EDITENG_DLLPUBLIC OutlinerView
+class EDITENG_DLLPUBLIC OutlinerView final
{
friend class Outliner;
@@ -218,7 +218,7 @@ private:
public:
OutlinerView( Outliner* pOut, vcl::Window* pWindow );
- virtual ~OutlinerView();
+ ~OutlinerView();
EditView& GetEditView() const { return *pEditView; }
More information about the Libreoffice-commits
mailing list