diff options
| author | Noel Grandin <noel@peralex.com> | 2018-06-03 13:07:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-06 08:55:02 +0200 |
| commit | 9739c37d8ad7c6fca269709674a6975fa7ebd191 (patch) | |
| tree | fae0bf0830d41d66017815ff6a665610d2c65a8a /include/svl | |
| parent | a96a260a5fd6303eeebb26aee4be24ddf88391d1 (diff) | |
enable incremental linking on windows
requires a handful of workarounds
Change-Id: I77c25580135eeec437716eceea1412607f8d14ca
Reviewed-on: https://gerrit.libreoffice.org/55244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/itemprop.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 334ae8d5f35a..05dc671fc99b 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -182,7 +182,11 @@ public: }; struct SfxItemPropertySetInfo_Impl; -class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper<css::beans::XPropertySetInfo> + +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE SfxItemPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; + +class SVL_DLLPUBLIC SfxItemPropertySetInfo : public SfxItemPropertySetInfo_Base { std::unique_ptr<SfxItemPropertySetInfo_Impl> m_pImpl; @@ -202,7 +206,10 @@ public: }; -class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper<css::beans::XPropertySetInfo> +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE SfxExtItemPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; + +class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public SfxExtItemPropertySetInfo_Base { SfxItemPropertyMap aExtMap; public: |