[Libreoffice-commits] core.git: writerfilter/inc
Miklos Vajna
vmiklos at collabora.co.uk
Tue Apr 8 13:00:06 PDT 2014
writerfilter/inc/WriterFilterDllApi.hxx | 18 ------------------
writerfilter/inc/rtftok/RTFDocument.hxx | 4 ++--
2 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit 07f7a26e2f293c11570beb3a4c0c8c15e96fa1f6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Apr 8 21:53:05 2014 +0200
writerfilter: remove no longer needed WRITERFILTER_*TOK_DLLPUBLIC
Change-Id: I1dc7a935e3004b0ce0b0f943405b2a79992fa982
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx
index df89c70..a02d47a 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -22,30 +22,12 @@
#include "sal/types.h"
-#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_RTFTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION)
#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#if defined(WRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#endif /* INCLUDED_WRITERFILTERDLLAPI_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
index 2515e4a..76f749c 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -21,7 +21,7 @@ namespace writerfilter
namespace rtftok
{
/// The RTFDocument opens and resolves the RTF document.
-class WRITERFILTER_RTFTOK_DLLPUBLIC RTFDocument
+class RTFDocument
: public writerfilter::Reference<Stream>
{
public:
@@ -38,7 +38,7 @@ public:
};
/// Interface to create an RTFDocument instance.
-class WRITERFILTER_RTFTOK_DLLPUBLIC RTFDocumentFactory
+class RTFDocumentFactory
{
public:
static RTFDocument::Pointer_t
More information about the Libreoffice-commits
mailing list