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 /include/oox/ole | |
| parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) | |
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 'include/oox/ole')
| -rw-r--r-- | include/oox/ole/olehelper.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 82afa4173112..5b25c1df7e6e 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -173,7 +173,7 @@ protected: sal_Int32 nSize ); public: MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); - ~MSConvertOCXControls(); + virtual ~MSConvertOCXControls(); sal_Bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp ); sal_Bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, sal_Int32 nPos, sal_Int32 nSize ); |