[Libreoffice-commits] core.git: sc/qa

[Noel Grandin (via logerrit)]

 sc/qa/unit/helper/qahelper.hxx       |    7 +------
 sc/qa/unit/helper/scqahelperdllapi.h |   23 +++++++++++++++++++++++
 sc/qa/unit/helper/xpath.hxx          |    7 +------
 3 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit 5687a2ec116071a5062fc8ae5494f6c351c9e4ac
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 10:26:29 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 20 13:45:59 2019 +0100

    loplugin:duplicate-defines
    
    move these into their own file, the way we do elsewhere
    
    Change-Id: Ib97e09c80537e31d795a8c66a6dfb06b350ff0e2
    Reviewed-on: https://gerrit.libreoffice.org/85560
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 3e8e5d455484..4cf5ddea1a40 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -20,6 +20,7 @@
 
 #include <comphelper/fileformat.h>
 #include <formula/grammar.hxx>
+#include "scqahelperdllapi.h"
 
 #include <string>
 #include <sstream>
@@ -30,12 +31,6 @@
 
 namespace utl { class TempFile; }
 
-#if defined(SCQAHELPER_DLLIMPLEMENTATION)
-#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-
 #define ODS_FORMAT_TYPE      (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::TEMPLATE | SfxFilterFlags::OWN | SfxFilterFlags::DEFAULT | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY)
 #define XLS_FORMAT_TYPE      (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY | SfxFilterFlags::PREFERED)
 #define XLSX_FORMAT_TYPE     (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED)
diff --git a/sc/qa/unit/helper/scqahelperdllapi.h b/sc/qa/unit/helper/scqahelperdllapi.h
new file mode 100644
index 000000000000..216ccc0146f1
--- /dev/null
+++ b/sc/qa/unit/helper/scqahelperdllapi.h
@@ -0,0 +1,23 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_SC_QA_UNIT_HELPER_DLLAPI_H
+#define INCLUDED_SC_QA_UNIT_HELPER_DLLAPI_H
+
+#include <sal/types.h>
+
+#if defined(SCQAHELPER_DLLIMPLEMENTATION)
+#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 39813bea85cd..16d0fec07f25 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -14,6 +14,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
+#include "scqahelperdllapi.h"
 
 #include <memory>
 
@@ -23,12 +24,6 @@ namespace utl { class TempFile; }
 class ScDocShell;
 class SvStream;
 
-#if defined(SCQAHELPER_DLLIMPLEMENTATION)
-#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-
 using namespace com::sun::star;
 
 class ScBootstrapFixture;