diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-11 18:30:52 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-11 21:26:11 +0200 |
commit | 8f2c47739f05c422c9c9c242f1adad0865c232de (patch) | |
tree | 01aad0a095da137e1863f48599048f5a5627c356 | |
parent | Add this back. (diff) | |
download | core-8f2c47739f05c422c9c9c242f1adad0865c232de.tar.gz core-8f2c47739f05c422c9c9c242f1adad0865c232de.zip |
writerfilter: remove no longer needed WRITERFILTER_WRITERFILTER_DLLPUBLIC
Change-Id: Idedee38be19bc770518b85af62c9fc2b5b64e822
34 files changed, 4 insertions, 70 deletions
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx deleted file mode 100644 index a02d47ab2c24..000000000000 --- a/writerfilter/inc/WriterFilterDllApi.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_WRITERFILTERDLLAPI_H -#define INCLUDED_WRITERFILTERDLLAPI_H - -#include "sal/types.h" - -#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION) -#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif /* INCLUDED_WRITERFILTERDLLAPI_H */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index c820d167635f..edbec2847357 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DOMAINMAPPER_HXX #define INCLUDED_DOMAINMAPPER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/FontEmphasis.hpp> diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx index 0693a6a5592d..855b7bb457ae 100644 --- a/writerfilter/inc/resourcemodel/Fraction.hxx +++ b/writerfilter/inc/resourcemodel/Fraction.hxx @@ -21,7 +21,6 @@ #include <sal/types.h> -#include <WriterFilterDllApi.hxx> namespace writerfilter { namespace resourcemodel { diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx index 44da514cab54..4e4df1236943 100644 --- a/writerfilter/inc/resourcemodel/LoggedResources.hxx +++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx @@ -23,7 +23,6 @@ #include "WW8ResourceModel.hxx" #include "TagLogger.hxx" -#include <WriterFilterDllApi.hxx> namespace writerfilter { diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index 12742eb4a744..80908820577d 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_QNAME_TO_STRING_HXX #define INCLUDED_QNAME_TO_STRING_HXX -#include <WriterFilterDllApi.hxx> #include <boost/shared_ptr.hpp> #include <map> #include <string> diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index a1e104e4100e..e65f13659bdd 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <WriterFilterDllApi.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <string> #include <boost/unordered_map.hpp> diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx index 7c56e0c111ad..bc6d7190932c 100644 --- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx +++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx @@ -26,7 +26,6 @@ #include <sal/types.h> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/uno/Any.hxx> -#include <WriterFilterDllApi.hxx> /** @file WW8ResourceModel.hxx diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx index bae6ed72faa4..06a58e0bb376 100644 --- a/writerfilter/inc/resourcemodel/XPathLogger.hxx +++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx @@ -26,7 +26,6 @@ #include <vector> #include <boost/shared_ptr.hpp> #include <boost/unordered_map.hpp> -#include <WriterFilterDllApi.hxx> namespace writerfilter { diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx index 38d61c262b52..8c5f860796a8 100644 --- a/writerfilter/inc/resourcemodel/util.hxx +++ b/writerfilter/inc/resourcemodel/util.hxx @@ -21,7 +21,6 @@ #define INCLUDED_RESOURCEMODEL_UTIL_HXX #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextRange.hpp> -#include <WriterFilterDllApi.hxx> #include <string> namespace writerfilter diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx index 6e9883d669ad..ea0cfd20ef17 100644 --- a/writerfilter/qa/cppunittests/misc/misc.cxx +++ b/writerfilter/qa/cppunittests/misc/misc.cxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> -#include <WriterFilterDllApi.hxx> using namespace std; diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index dda58287e36c..26beb9f3afeb 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -20,7 +20,6 @@ #define INCLUDED_BORDERHANDLER_HXX #include <vector> -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <com/sun/star/table/BorderLine2.hpp> diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 8ee753dbac23..8c671bf927af 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CELLCOLORHANDLER_HXX #define INCLUDED_CELLCOLORHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx index 533f75738e64..38e4742bdb28 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.hxx +++ b/writerfilter/source/dmapper/CellMarginHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CELLMARGINHANDLER_HXX #define INCLUDED_CELLMARGINHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 07cf04eae0a8..bc8eb9957e3d 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FONTTABLE_HXX #include <boost/shared_ptr.hpp> -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index dbb282adea25..f55a2fc74e1e 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -22,7 +22,6 @@ #include "PropertyMap.hxx" -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index 09ea006a7ad4..168f307a0548 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_MEASUREHANDLER_HXX #define INCLUDED_MEASUREHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx index 491754e0f614..5e03cae31c30 100644 --- a/writerfilter/source/dmapper/ModelEventListener.hxx +++ b/writerfilter/source/dmapper/ModelEventListener.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_MODELEVENTLISTENER_HXX #define INCLUDED_MODELEVENTLISTENER_HXX -#include <WriterFilterDllApi.hxx> #include <com/sun/star/document/XEventListener.hpp> #include <cppuhelper/implbase1.hxx> diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 68db3ca7b857..66a5178feeba 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -22,7 +22,6 @@ #include "PropertyMap.hxx" -#include <WriterFilterDllApi.hxx> #include <dmapper/DomainMapper.hxx> #include <resourcemodel/LoggedResources.hxx> diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index f8651f6380b9..79a29869ceb7 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_OLEHANDLER_HXX #define INCLUDED_OLEHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index caf1145058bd..8f934bc5be56 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -22,7 +22,6 @@ #include "BorderHandler.hxx" #include "PropertyMap.hxx" -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index 76ef4624033a..8ac1fd40f1ab 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -15,7 +15,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustrbuf.hxx> -#include <WriterFilterDllApi.hxx> namespace com { diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index 9378724c8500..55683dd15e0b 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SECTIONCOLUMNHANDLER_HXX #define INCLUDED_SECTIONCOLUMNHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 41dca03c1751..4821d03374cb 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SETTINGSTABLE_HXX #define INCLUDED_SETTINGSTABLE_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/XTextDocument.hpp> diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 1eeac648e4bb..9ddb26e75741 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -21,7 +21,6 @@ #include "TblStylePrHandler.hxx" -#include <WriterFilterDllApi.hxx> #include <dmapper/DomainMapper.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index eac84b505ed0..45d8e12080f6 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_TDEFTABLEHANDLER_HXX #define INCLUDED_TDEFTABLEHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index 2037e4dbfc17..8e5e9c30bf9d 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -9,7 +9,6 @@ #ifndef INCLUDED_POSITIONHANDLER_HXX #define INCLUDED_POSITIONHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx index 6ce9b36c7422..95ac5ed102fc 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx @@ -23,7 +23,6 @@ #include <PropertyMap.hxx> #include <resourcemodel/TableManager.hxx> -#include <WriterFilterDllApi.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <boost/shared_ptr.hpp> diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx index 2b8445ab1105..40ccb0ffcc93 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.hxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx @@ -23,7 +23,6 @@ #include "TablePropertiesHandler.hxx" #include <dmapper/DomainMapper.hxx> -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index 3929ca0d03db..9b5c9457e3c6 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -11,7 +11,6 @@ #ifndef INCLUDED_TEXTEFFECTSHANDLER_HXX #define INCLUDED_TEXTEFFECTSHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index 2064e41a7589..ed98e9793eec 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_THEMETABLE_HXX #define INCLUDED_THEMETABLE_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 0a70962e4292..170d130ee8a6 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -9,7 +9,6 @@ #ifndef INCLUDED_TRACKCHANGESHANDLER_HXX #define INCLUDED_TRACKCHANGESHANDLER_HXX -#include <WriterFilterDllApi.hxx> #include <resourcemodel/LoggedResources.hxx> #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx index 33faa57afc81..605e790a6355 100644 --- a/writerfilter/source/filter/RtfFilter.hxx +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -27,10 +27,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <cppuhelper/implbase5.hxx> -#include <WriterFilterDllApi.hxx> /// Common RTF filter, calls RtfImportFilter and RtfExportFilter via UNO. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 +class 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 efec97733c07..f1d8bdd72bf4 100644 --- a/writerfilter/source/filter/WriterFilter.hxx +++ b/writerfilter/source/filter/WriterFilter.hxx @@ -27,10 +27,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <cppuhelper/implbase5.hxx> -#include <WriterFilterDllApi.hxx> -/// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOC (currently unused) / DOCX import. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5 +/// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOCX import. +class 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 26cd114b0a70..2c1d70f2ec07 100644 --- a/writerfilter/source/filter/WriterFilterDetection.hxx +++ b/writerfilter/source/filter/WriterFilterDetection.hxx @@ -23,10 +23,9 @@ #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> -#include <WriterFilterDllApi.hxx> /// File format detection service for DOC (unused) / DOCX. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2 +class WriterFilterDetection : public cppu::WeakImplHelper2 < com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo |