diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
| commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
| tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /sw/inc/unotxdoc.hxx | |
| parent | svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID (diff) | |
| download | core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.tar.gz core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.zip | |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sw/inc/unotxdoc.hxx')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 4ceaef815bb6..f4d666221397 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -466,7 +466,7 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2 public: SwXLinkTargetSupplier(SwXTextDocument& rxDoc); - ~SwXLinkTargetSupplier(); + virtual ~SwXLinkTargetSupplier(); //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -505,7 +505,7 @@ public: const OUString& rLinkDisplayName, const OUString& sSuffix); SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, const OUString& rLinkDisplayName, const OUString& sSuffix); - ~SwXLinkNameAccessWrapper(); + virtual ~SwXLinkNameAccessWrapper(); //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -546,7 +546,7 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2 public: SwXOutlineTarget(const OUString& rOutlineText); - ~SwXOutlineTarget(); + virtual ~SwXOutlineTarget(); //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -576,7 +576,7 @@ class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable SwDoc* m_pDoc; public: SwXDocumentPropertyHelper(SwDoc& rDoc); - ~SwXDocumentPropertyHelper(); + virtual ~SwXDocumentPropertyHelper(); css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich); void Invalidate(); |