From 9739c37d8ad7c6fca269709674a6975fa7ebd191 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 3 Jun 2018 13:07:55 +0200 Subject: enable incremental linking on windows requires a handful of workarounds Change-Id: I77c25580135eeec437716eceea1412607f8d14ca Reviewed-on: https://gerrit.libreoffice.org/55244 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/inc/xml/saxnamespacefilter.hxx | 6 ++++-- framework/inc/xml/statusbardocumenthandler.hxx | 6 ++++-- framework/inc/xml/toolboxdocumenthandler.hxx | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'framework/inc') diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 68fce7d4834c..8fcb84534998 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -32,8 +32,10 @@ namespace framework { -class FWE_DLLPUBLIC SaxNamespaceFilter final : - public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE SaxNamespaceFilter_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {}; + +class FWE_DLLPUBLIC SaxNamespaceFilter final : public SaxNamespaceFilter_Base { public: SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler ); diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index b0cb57c4fe23..bc12c5a724a1 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -35,8 +35,10 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. -class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : - public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE OReadStatusBarDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {}; + +class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : public OReadStatusBarDocumentHandler_Base { public: enum StatusBar_XML_Entry diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index c2be53da64d1..dd13ee53eba5 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -34,8 +34,10 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. -class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : - public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE OReadToolBoxDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {}; + +class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : public OReadToolBoxDocumentHandler_Base { public: enum ToolBox_XML_Entry -- cgit