summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:10:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:30 +0200
commitba45d25420ea0692db78677d6e994dfaaf295604 (patch)
tree0a33695b0b5bbe01896cd520ffc1226d8fec6ecd /sw/inc
parentb9f34146be786f3f40625e285a87111a01b874d9 (diff)
Replace "SAL_FINAL" with "final" in LIBO_INTERNAL_ONLY code
Change-Id: Ifa5ba21308e32df44571fa2941370f2f11179580
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/calbck.hxx8
-rw-r--r--sw/inc/ndindex.hxx2
-rw-r--r--sw/inc/pagedesc.hxx2
-rw-r--r--sw/inc/ring.hxx4
-rw-r--r--sw/inc/unocrsr.hxx2
-rw-r--r--sw/inc/unotbl.hxx6
6 files changed, 12 insertions, 12 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index c283a96686df..f6383d0b8e70 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,7 +65,7 @@ template<typename E, typename S> class SwIterator;
namespace sw
{
class ClientIteratorBase;
- struct SW_DLLPUBLIC LegacyModifyHint SAL_FINAL: SfxHint
+ struct SW_DLLPUBLIC LegacyModifyHint final: SfxHint
{
LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : m_pOld(pOld), m_pNew(pNew) {};
virtual ~LegacyModifyHint();
@@ -207,7 +207,7 @@ public:
/*
* Helper class for objects that need to depend on more than one SwClient
*/
-class SW_DLLPUBLIC SwDepend SAL_FINAL : public SwClient
+class SW_DLLPUBLIC SwDepend final : public SwClient
{
SwClient *m_pToTell;
@@ -280,7 +280,7 @@ namespace sw
};
}
-template< typename TElementType, typename TSource > class SwIterator SAL_FINAL : private sw::ClientIteratorBase
+template< typename TElementType, typename TSource > class SwIterator final : private sw::ClientIteratorBase
{
static_assert(std::is_base_of<SwClient,TElementType>::value, "TElementType needs to be derived from SwClient");
static_assert(std::is_base_of<SwModify,TSource>::value, "TSource needs to be derived from SwModify");
@@ -324,7 +324,7 @@ public:
using sw::ClientIteratorBase::IsChanged;
};
-template< typename TSource > class SwIterator<SwClient, TSource> SAL_FINAL : private sw::ClientIteratorBase
+template< typename TSource > class SwIterator<SwClient, TSource> final : private sw::ClientIteratorBase
{
static_assert(std::is_base_of<SwModify,TSource>::value, "TSource needs to be derived from SwModify");
public:
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 167a5af81751..5d40d86b8445 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -32,7 +32,7 @@ class SwNode;
class SwNodes;
/// Marks a node in the document model.
-class SW_DLLPUBLIC SwNodeIndex SAL_FINAL : public sw::Ring<SwNodeIndex>
+class SW_DLLPUBLIC SwNodeIndex final : public sw::Ring<SwNodeIndex>
{
SwNode * m_pNode;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 074620c6a090..b258ec1fc155 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -336,7 +336,7 @@ public:
};
namespace sw {
- class PageFootnoteHint SAL_FINAL : public SfxHint {};
+ class PageFootnoteHint final : public SfxHint {};
}
#endif // INCLUDED_SW_INC_PAGEDESC_HXX
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 61423d0223a6..3a57d9e19ce5 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -148,7 +148,7 @@ namespace sw
* helper class that provides Svalue_typeL-style container iteration to the ring
*/
template <typename value_type>
- class RingContainer SAL_FINAL
+ class RingContainer final
{
private:
/** the item in the ring where iteration starts */
@@ -192,7 +192,7 @@ namespace sw
};
template <typename value_type>
- class RingIterator SAL_FINAL : public boost::iterator_facade<
+ class RingIterator final : public boost::iterator_facade<
RingIterator<value_type>
, value_type
, boost::forward_traversal_tag
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index de8bd3756330..3cf2c2c3322f 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -24,7 +24,7 @@
namespace sw
{
- struct SW_DLLPUBLIC DocDisposingHint SAL_FINAL : public SfxHint
+ struct SW_DLLPUBLIC DocDisposingHint final : public SfxHint
{
DocDisposingHint() {}
virtual ~DocDisposingHint();
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 75793b5e536f..68ac78adc58e 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -61,7 +61,7 @@ cppu::WeakImplHelper
::com::sun::star::container::XEnumerationAccess
>
SwXCellBaseClass;
-class SwXCell SAL_FINAL : public SwXCellBaseClass,
+class SwXCell final : public SwXCellBaseClass,
public SwXText,
public SwClient
{
@@ -158,7 +158,7 @@ public:
css::uno::Any GetAny() const;
};
-class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
+class SwXTextTableRow final : public cppu::WeakImplHelper
<
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo
@@ -548,7 +548,7 @@ public:
const SwUnoCrsr* GetTableCrsr() const;
};
-class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
+class SwXTableRows final : public cppu::WeakImplHelper
<
::com::sun::star::table::XTableRows,
::com::sun::star::lang::XServiceInfo