Kaydet (Commit) b6785eb5 authored tarafından Michael Stahl's avatar Michael Stahl

sax: stop using SAX_DLLIMPLEMENTATION for both sax and fastsax

Change-Id: I243ec20015beec6b98ee0af55eb7c387008f32f1
üst 4c9ddd59
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
#include "saxdllapi.h" #include <sax/fastsaxdllapi.h>
namespace com { namespace sun { namespace star { namespace xml { namespace sax { namespace com { namespace sun { namespace star { namespace xml { namespace sax {
...@@ -41,7 +41,10 @@ namespace sax_fastparser { ...@@ -41,7 +41,10 @@ namespace sax_fastparser {
class FastSaxParserImpl; class FastSaxParserImpl;
// This class implements the external Parser interface // 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; FastSaxParserImpl* mpImpl;
......
/* -*- 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: */
...@@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,fastsax,\ ...@@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,fastsax,\
)) ))
$(eval $(call gb_Library_add_defs,fastsax,\ $(eval $(call gb_Library_add_defs,fastsax,\
-DSAX_DLLIMPLEMENTATION \ -DFASTSAX_DLLIMPLEMENTATION \
)) ))
$(eval $(call gb_Library_use_sdk_api,fastsax)) $(eval $(call gb_Library_use_sdk_api,fastsax))
......
...@@ -83,7 +83,7 @@ struct Event ...@@ -83,7 +83,7 @@ struct Event
CallbackType maType; CallbackType maType;
}; };
struct SAX_DLLPUBLIC NameWithToken struct NameWithToken
{ {
OUString msName; OUString msName;
sal_Int32 mnToken; sal_Int32 mnToken;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment