[Libreoffice-commits] core.git: sc/inc sc/Library_scqahelper.mk sc/qa sc/source

[Kohei Yoshida]

 sc/Library_scqahelper.mk            |    3 +++
 sc/inc/formulacell.hxx              |    2 +-
 sc/inc/global.hxx                   |    1 +
 sc/qa/unit/helper/csv_handler.hxx   |    2 --
 sc/qa/unit/helper/qahelper.cxx      |    4 +++-
 sc/qa/unit/helper/qahelper.hxx      |    7 ++++++-
 sc/qa/unit/ucalc_sharedformula.cxx  |    2 ++
 sc/source/core/data/formulacell.cxx |    5 +++++
 sc/source/core/data/global.cxx      |    5 +++++
 9 files changed, 26 insertions(+), 5 deletions(-)

New commits:
commit dc2aa496c0252ef4a95289935eeac3340de1ca8b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jul 9 10:54:48 2013 -0400

    Attempt to fix windows link error.
    
    Change-Id: I27ef805c16dde46b9dff037356e8316e32c2d8c0

diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index d2370b0..c978c95 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -33,12 +33,15 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
 	comphelper \
 	cppu \
 	cppuhelper \
+	for \
 	sal \
 	sfx \
 	sot \
 	svl \
 	svt \
+	test \
 	tl \
+	unotest \
 	utl \
 	sc \
 	ucbhelper \
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 07b726a..231789f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -272,7 +272,7 @@ public:
         formula string because the formula is present as a token array, as it
         is the case for binary Excel import.
      */
-    void            SetResultDouble( double n )     { aResult.SetDouble( n); }
+    void SetResultDouble( double n );
 
     void SetResultToken( const formula::FormulaToken* pToken );
 
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dd60c4b..2b86a7c 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -576,6 +576,7 @@ public:
     SC_DLLPUBLIC static sal_uLong               GetStandardFormat( double, SvNumberFormatter&,
                                     sal_uLong nFormat, short nType );
 
+    SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
     SC_DLLPUBLIC static double              nScreenPPTX;
     SC_DLLPUBLIC static double              nScreenPPTY;
 
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 0f4b018..1223ef6 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 d16d33d..5692b8d 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 efbd3b9..bec76e8 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 3025b52..b6a52cd 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()
 {
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 288eaeb..0616acc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1593,6 +1593,11 @@ bool ScFormulaCell::IsDirtyOrInTableOpDirty() const
     return bDirty || (bTableOpDirty && pDocument->IsInInterpreterTableOp());
 }
 
+void ScFormulaCell::SetResultDouble( double n )
+{
+    aResult.SetDouble( n);
+}
+
 void ScFormulaCell::SetResultToken( const formula::FormulaToken* pToken )
 {
     aResult.SetToken(pToken);
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index a34b1de..1ca26a7 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -191,6 +191,11 @@ sal_uLong ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
     return rFormatter.GetStandardFormat( nType, eLnge );
 }
 
+sal_uInt16 ScGlobal::GetStandardRowHeight()
+{
+    return nStdRowHeight;
+}
+
 sal_uLong ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter& rFormatter,
         sal_uLong nFormat, short nType )
 {