summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sax/fastparser.hxx7
-rw-r--r--include/sax/fastsaxdllapi.h33
-rw-r--r--sax/Library_fastsax.mk2
-rw-r--r--sax/source/fastparser/fastparser.cxx2
4 files changed, 40 insertions, 4 deletions
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index 578b114e40cf..afd5add88b00 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
-#include "saxdllapi.h"
+#include <sax/fastsaxdllapi.h>
namespace com { namespace sun { namespace star { namespace xml { namespace sax {
@@ -41,7 +41,10 @@ namespace sax_fastparser {
class FastSaxParserImpl;
// This class implements the external Parser interface
-class SAX_DLLPUBLIC FastSaxParser : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastParser, ::com::sun::star::lang::XServiceInfo >
+class FASTSAX_DLLPUBLIC FastSaxParser
+ : public ::cppu::WeakImplHelper2<
+ ::com::sun::star::xml::sax::XFastParser,
+ ::com::sun::star::lang::XServiceInfo >
{
FastSaxParserImpl* mpImpl;
diff --git a/include/sax/fastsaxdllapi.h b/include/sax/fastsaxdllapi.h
new file mode 100644
index 000000000000..e532dd2c519a
--- /dev/null
+++ b/include/sax/fastsaxdllapi.h
@@ -0,0 +1,33 @@
+/* -*- 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_SAX_FASTSAXDLLAPI_H
+#define INCLUDED_SAX_FASTSAXDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined FASTSAX_DLLIMPLEMENTATION
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 4f98820d0423..1fcb5039da15 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,fastsax,\
))
$(eval $(call gb_Library_add_defs,fastsax,\
- -DSAX_DLLIMPLEMENTATION \
+ -DFASTSAX_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_sdk_api,fastsax))
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 3bff43096935..4f835d5c2dd5 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -83,7 +83,7 @@ struct Event
CallbackType maType;
};
-struct SAX_DLLPUBLIC NameWithToken
+struct NameWithToken
{
OUString msName;
sal_Int32 mnToken;