summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/xml/saxnamespacefilter.hxx6
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx6
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx6
3 files changed, 12 insertions, 6 deletions
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