Use specific DLLPUBLIC for each library

This avoids exporting the same functions from multiple DLLs.

Also don't mark template classes for DLL export/import, I think that
is not what we want. Or am I on crack?

9 files changed, 6 insertions, 112 deletions

diff --git a/writerfilter/source/doctok/genqnametostr b/writerfilter/source/doctok/genqnametostr
deleted file mode 100644
index a7cd32db5296..000000000000
--- a/writerfilter/source/doctok/genqnametostr
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/tcsh
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-xalan -xsl qnametostr.xsl -in resources.xmi > qnametostr.tmp 
-cat qnametostrheader > qnametostr.cxx
-cat qnametostr.tmp >> qnametostr.cxx
-cat ../ooxml/qnametostr.tmp >> qnametostr.cxx
-cat qnametostrfooter >> qnametostr.cxx
diff --git a/writerfilter/source/doctok/qnametostrfooter b/writerfilter/source/doctok/qnametostrfooter
deleted file mode 100644
index 1ec35ed30254..000000000000
--- a/writerfilter/source/doctok/qnametostrfooter
+++ /dev/null
@@ -1,2 +0,0 @@
-}
-}
diff --git a/writerfilter/source/doctok/qnametostrheader b/writerfilter/source/doctok/qnametostrheader
deleted file mode 100644
index 07ce47387153..000000000000
--- a/writerfilter/source/doctok/qnametostrheader
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <doctok/resourceids.hxx>
-#include <ooxml/resourceids.hxx>
-#include "WW8ResourceModelImpl.hxx"
-
-namespace doctok
-{
-
-QNameToString::QNameToString()
-{
diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx
index aada3c609f72..03488db64ff1 100644
--- a/writerfilter/source/filter/RtfFilter.hxx
+++ b/writerfilter/source/filter/RtfFilter.hxx
@@ -39,7 +39,7 @@
 #include <WriterFilterDllApi.hxx>
 
 /// Common RTF filter, calls RtfImportFilter and RtfExportFilter via UNO.
-class WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5
+class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx
index b883ca1e91d7..a2b2fb7a4b5b 100644
--- a/writerfilter/source/filter/WriterFilter.hxx
+++ b/writerfilter/source/filter/WriterFilter.hxx
@@ -39,7 +39,7 @@
 #include <WriterFilterDllApi.hxx>
 
 /// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOC (currently unused) / DOCX import.
-class WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5
+class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx
index f84252e05d1a..f7caa549d6d8 100644
--- a/writerfilter/source/filter/WriterFilterDetection.hxx
+++ b/writerfilter/source/filter/WriterFilterDetection.hxx
@@ -35,7 +35,7 @@
 #include <WriterFilterDllApi.hxx>
 
 /// File format detection service for DOC (unused) / DOCX.
-class WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2
+class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2
 <
     com::sun::star::document::XExtendedFilterDetection,
     com::sun::star::lang::XServiceInfo
diff --git a/writerfilter/source/resourcemodel/genqnametostr b/writerfilter/source/resourcemodel/genqnametostr
deleted file mode 100755
index 12bad07b9b85..000000000000
--- a/writerfilter/source/resourcemodel/genqnametostr
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/tcsh
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-cat qnametostrheader > qnametostr.cxx
-cat ../doctok/qnametostr.tmp >> qnametostr.cxx
-cat ../ooxml/qnametostr.tmp >> qnametostr.cxx
-cat qnametostrfooter >> qnametostr.cxx
-cat sprmcodetostrheader > sprmcodetostr.cxx
-cat ../doctok/sprmcodetostr.tmp >> sprmcodetostr.cxx
-echo "}"  >> sprmcodetostr.cxx
diff --git a/writerfilter/source/resourcemodel/qnametostrfooter b/writerfilter/source/resourcemodel/qnametostrfooter
index d0af0f6fa30f..4cba68b6f852 100644
--- a/writerfilter/source/resourcemodel/qnametostrfooter
+++ b/writerfilter/source/resourcemodel/qnametostrfooter
@@ -4,7 +4,7 @@ QNameToString::QNameToString()
     init_ooxml();
 }
 
-void WRITERFILTER_DLLPUBLIC analyzerIds()
+void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds()
 {
     cout << "<ids type=\"sprm\">" << endl;
     
diff --git a/writerfilter/source/resourcemodel/qnametostrheader b/writerfilter/source/resourcemodel/qnametostrheader
index 6cbd0b3fec10..2705bb30cc73 100644
--- a/writerfilter/source/resourcemodel/qnametostrheader
+++ b/writerfilter/source/resourcemodel/qnametostrheader
@@ -35,7 +35,7 @@ namespace writerfilter
 
 QNameToString::Pointer_t QNameToString::pInstance;
 
-QNameToString::Pointer_t WRITERFILTER_DLLPUBLIC QNameToString::Instance()
+QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Instance()
 {
     if (pInstance.get() == NULL)
         pInstance = QNameToString::Pointer_t(new QNameToString());
@@ -43,7 +43,7 @@ QNameToString::Pointer_t WRITERFILTER_DLLPUBLIC QNameToString::Instance()
     return pInstance;
 }
 
-string WRITERFILTER_DLLPUBLIC QNameToString::operator()(Id qName)
+string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName)
 {
     string sResult;