INTEGRATION: CWS qadev19 (1.7.56); FILE MERGED

2004/08/02 09:26:22 lla 1.7.56.1: #117552# remove toFLoat, which produce compile problems.

1 files changed, 37 insertions, 34 deletions

diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx
index fbcf145b5..359b15ae3 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtl_OUString.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:31:00 $
+ *  last change: $Author: pjunck $ $Date: 2004-11-02 10:31:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3248,13 +3248,15 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
 // LLA:             lastRes=(fabs(intRes-expVal[i])<=1e-35);
 // LLA:             meth="toDouble";
 // LLA:         }
-        if(base==5) 
-        {	
-            intRes=str.toFloat();
-            T nPrec = _fPrecision[i];
-            lastRes=(fabs(intRes-expVal[i])<= nPrec /* 1e-35 */ );
-            meth="toFloat";
-        }
+
+// LLA: dt:20040802 create compile problems within wntmsci10
+//		if(base==5) 
+//		{	
+//            intRes=str.toFloat();
+//            T nPrec = _fPrecision[i];
+//            lastRes=(fabs((T)(intRes-expVal[i])) <= nPrec /* 1e-35 */ );
+//            meth="toFloat";
+//        }
         if(base==6)
         {
             intRes=str.toChar();
@@ -3307,30 +3309,31 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
 //------------------------------------------------------------------------
 //    testing the method toFloat()
 //------------------------------------------------------------------------
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toFloat(
-    hTestResult hRtlTestResult )
-{
-    c_rtl_tres_state_start( hRtlTestResult, "toFloat");
-    sal_Bool bRes=sal_False;
-    
-    bRes=c_rtl_tres_state
-        (
-              hRtlTestResult,
-              test_toData<float>((const char**)inputFloat,
-                               nFloatCount,
-                               10, /* radix */
-                               expValFloat,
-                               5,  /* float */
-                               fPrecision,
-                               hRtlTestResult),
-              "toFloat",
-              "toFloat()"
-              );
-              
-    c_rtl_tres_state_end( hRtlTestResult, "toFloat");
-//	 return ( bRes ); 
-        
-} 
+// LLA: dt:20040802 the test_toData() has compile problems.
+// LLA: extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toFloat(
+// LLA:     hTestResult hRtlTestResult )
+// LLA: {
+// LLA:     c_rtl_tres_state_start( hRtlTestResult, "toFloat");
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
+// LLA:         (
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_toData<float>((const char**)inputFloat,
+// LLA:                                nFloatCount,
+// LLA:                                10, /* radix */
+// LLA:                                expValFloat,
+// LLA:                                5,  /* float */
+// LLA:                                fPrecision,
+// LLA:                                hRtlTestResult),
+// LLA: 	      	"toFloat",
+// LLA: 	      	"toFloat()"
+// LLA: 	      	);
+// LLA: 	      	
+// LLA:     c_rtl_tres_state_end( hRtlTestResult, "toFloat");
+// LLA: //	 return ( bRes ); 
+// LLA: 		
+// LLA: } 
 //------------------------------------------------------------------------
 //    testing the method toChar()
 //------------------------------------------------------------------------
@@ -3879,7 +3882,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString( hTestResult hRtlTestR
     test_rtl_OUString_toAsciiUpperCase( hRtlTestResult );
     test_rtl_OUString_trim( hRtlTestResult );
 // LLA: removed, it is in a new test in rtl/oustring. test_rtl_OUString_toDouble( hRtlTestResult );
-    test_rtl_OUString_toFloat( hRtlTestResult );
+// LLA: removed, has compile problems.    test_rtl_OUString_toFloat( hRtlTestResult );
     test_rtl_OUString_toChar( hRtlTestResult );
     test_rtl_OUString_toBoolean( hRtlTestResult );
     test_rtl_OUString_toInt32( hRtlTestResult );