diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-09 16:45:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-06-10 09:13:36 +0200 |
| commit | c6d0a104aa7abdd5e08fa5c6c528f5b4cfd73c86 (patch) | |
| tree | a361b15d6205956eb94c7b3cbd173fc839fc7abd /include | |
| parent | 5f1b9ae3994282ec1be3690292957b8b99032e2d (diff) | |
update mergeclasses results
and do one trivial merge
Change-Id: Iff30553f73de946c74fa6b082928e7d47adadd04
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/core/filterdetect.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 30dd7fdf3bcd..a2c4ff5e86e8 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -95,9 +95,7 @@ private: }; -class SAL_DLLPUBLIC_TEMPLATE FilterDetect_BASE : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> {}; - -class OOX_DLLPUBLIC FilterDetect : public FilterDetect_BASE +class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> { public: explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) |