diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-09 10:54:48 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-09 10:59:47 -0400 |
| commit | dc2aa496c0252ef4a95289935eeac3340de1ca8b (patch) | |
| tree | 0bd03a8a0b2cb3ec4bd3d8443c3e7bfec0101523 /sc/qa | |
| parent | e35482d7f099ac313b0d77ca687daccd5fced18d (diff) | |
Attempt to fix windows link error.
Change-Id: I27ef805c16dde46b9dff037356e8316e32c2d8c0
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/helper/csv_handler.hxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 4 | ||||
| -rw-r--r-- | sc/qa/unit/helper/qahelper.hxx | 7 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_sharedformula.cxx | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx index 0f4b018d9168..1223ef6cf356 100644 --- a/sc/qa/unit/helper/csv_handler.hxx +++ b/sc/qa/unit/helper/csv_handler.hxx @@ -81,8 +81,6 @@ OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, } -enum StringType { PureString, FormulaValue, StringValue }; - class csv_handler { public: diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index d16d33d588e1..5692b8d11c8e 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -7,7 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#undef SC_DLLIMPLEMENTATION #include "qahelper.hxx" +#include "csv_handler.hxx" #if defined WNT #define __ORCUS_STATIC_LIB @@ -242,7 +244,7 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam* aTestValues, unsigned in SCTAB nTab = aTestValues[ index ].pData[ i ].nTab; int nExpectedHeight = aTestValues[ index ].pData[ i ].nExpectedHeight; if ( nExpectedHeight == -1 ) - nExpectedHeight = sc::TwipsToHMM( ScGlobal::nStdRowHeight ); + nExpectedHeight = sc::TwipsToHMM( ScGlobal::GetStandardRowHeight() ); bool bCheckOpt = ( ( aTestValues[ index ].pData[ i ].nCheck & CHECK_OPTIMAL ) == CHECK_OPTIMAL ); for ( ; nRow <= nEndRow; ++nRow ) { diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index efbd3b9171f8..bec76e84b175 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -10,9 +10,12 @@ #ifndef SC_QA_HELPER_HXX #define SC_QA_HELPER_HXX +#define SC_DLLIMPLEMENTATION + #include "scdllapi.h" #include "debughelper.hxx" -#include "csv_handler.hxx" +#include "address.hxx" +#include "docsh.hxx" #include <test/bootstrapfixture.hxx> #include <comphelper/documentconstants.hxx> @@ -44,6 +47,8 @@ #define LOTUS123 5 #define DIF 6 +enum StringType { PureString, FormulaValue, StringValue }; + SC_DLLPUBLIC bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol ); #define CHECK_OPTIMAL 0x1 diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index 3025b5204f28..b6a52cde090a 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -9,6 +9,8 @@ #include "ucalc.hxx" #include "editutil.hxx" +#include "formulacell.hxx" +#include "cellvalue.hxx" void Test::testSharedFormulas() { |