diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-05-29 20:24:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-30 08:45:46 +0200 |
| commit | cf4a1c42d6a90ec73ab1504d4bfaf3004bad33da (patch) | |
| tree | 14b2d0207c55ae53fb141cf6a038ce9c33d5956f /include | |
| parent | dc50abb7f972c53fcca08d2ac3627e7848456520 (diff) | |
merge expwrap into sax library
there is no need for 2 shared libs for such a small module
Change-Id: Id28c9038f3e16931bfb8af3532eca172998da1aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152374
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sax/fastparser.hxx | 4 | ||||
| -rw-r--r-- | include/sax/fastsaxdllapi.h | 33 |
2 files changed, 2 insertions, 35 deletions
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index aebaa4056aa0..fe388fce21cc 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> -#include <sax/fastsaxdllapi.h> +#include <sax/saxdllapi.h> #include <memory> namespace com::sun::star::xml::sax { @@ -39,7 +39,7 @@ namespace sax_fastparser { class FastSaxParserImpl; // This class implements the external Parser interface -class FASTSAX_DLLPUBLIC FastSaxParser final +class SAX_DLLPUBLIC FastSaxParser final : public ::cppu::WeakImplHelper< css::lang::XInitialization, css::xml::sax::XFastParser, diff --git a/include/sax/fastsaxdllapi.h b/include/sax/fastsaxdllapi.h deleted file mode 100644 index e532dd2c519a..000000000000 --- a/include/sax/fastsaxdllapi.h +++ /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_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: */ |