[Libreoffice-commits] core.git: 2 commits - sc/Library_scqahelper.mk sc/qa sw/CppunitTest_sw_filters_test.mk

[Michael Stahl]

 sc/Library_scqahelper.mk          |    2 +-
 sc/qa/unit/helper/qahelper.hxx    |   28 ++++++++++++++++++----------
 sw/CppunitTest_sw_filters_test.mk |    1 +
 3 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 4159310a06d57efed75f8fa619c813c0222c4c58
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 5 23:20:33 2013 +0200

    sc: fix exports of scqahelper library
    
    Change-Id: I36d853e9f98ee5ed15d086f6b0fcec5bf3f6f54b

diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index fd1d4a1..f0be599 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_externals,scqahelper, \
 ))
 
 $(eval $(call gb_Library_add_defs,scqahelper,\
-	-DSC_DLLIMPLEMENTATION \
+	-DSCQAHELPER_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,scqahelper))
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 3597dd1..7bcf519 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -29,6 +29,14 @@
 #include <string>
 #include <sstream>
 
+#include "sal/types.h"
+
+#if defined(SCQAHELPER_DLLIMPLEMENTATION)
+#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+
 #define ODS_FORMAT_TYPE 50331943
 #define XLS_FORMAT_TYPE 318767171
 #define XLSX_FORMAT_TYPE 268959811
@@ -49,7 +57,7 @@
 
 enum StringType { PureString, FormulaValue, StringValue };
 
-SC_DLLPUBLIC bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol );
+SCQAHELPER_DLLPUBLIC bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol );
 
 #define CHECK_OPTIMAL 0x1
 
@@ -95,25 +103,25 @@ std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList);
 // eventually perhaps iOS) special cases here, too)?  Please move this to osl,
 // it sure looks gemerally useful. Or am I missing something?
 
-SC_DLLPUBLIC void loadFile(const OUString& aFileName, std::string& aContent);
+SCQAHELPER_DLLPUBLIC void loadFile(const OUString& aFileName, std::string& aContent);
 
-SC_DLLPUBLIC void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStringFormat = StringValue);
+SCQAHELPER_DLLPUBLIC void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStringFormat = StringValue);
 
 //need own handler because conditional formatting strings must be generated
-SC_DLLPUBLIC void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab);
+SCQAHELPER_DLLPUBLIC void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab);
 
-SC_DLLPUBLIC const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage);
+SCQAHELPER_DLLPUBLIC const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage);
 
-SC_DLLPUBLIC std::vector<OUString> getChartRangeRepresentations(const SdrOle2Obj& rChartObj);
+SCQAHELPER_DLLPUBLIC std::vector<OUString> getChartRangeRepresentations(const SdrOle2Obj& rChartObj);
 
-SC_DLLPUBLIC ScRangeList getChartRanges(ScDocument& rDoc, const SdrOle2Obj& rChartObj);
+SCQAHELPER_DLLPUBLIC ScRangeList getChartRanges(ScDocument& rDoc, const SdrOle2Obj& rChartObj);
 
-SC_DLLPUBLIC bool checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected);
+SCQAHELPER_DLLPUBLIC bool checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected);
 
 /**
  * Convert formula token array to a formula string.
  */
-SC_DLLPUBLIC OUString toString(
+SCQAHELPER_DLLPUBLIC OUString toString(
     ScDocument& rDoc, const ScAddress& rPos, ScTokenArray& rArray,
     formula::FormulaGrammar::Grammar eGram = formula::FormulaGrammar::GRAM_NATIVE);
 
@@ -150,7 +158,7 @@ struct assertion_traits<ScRange>
 class ScDocShellRef;
 class ScDocShell;
 
-class SC_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
+class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
 {
 protected:
     OUString m_aBaseString;
commit 5cfa3d919a559f0b00c71cc4798410ab0b6332d8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 5 23:27:45 2013 +0200

    tinderbox is unhappy, let's link sot in this test
    
    Change-Id: I428545774544826be82459791e2d29d8195d1eb5

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index b47f4af..2545b35 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
     sfx \
     svl \
     svt \
+    sot \
 	test \
     tl \
     ucbhelper \