INTEGRATION: CWS extras18 (1.5.256); FILE MERGED

2005/02/28 16:25:23 va 1.5.256.1: #i40799# Corrected Internet Update.

3 files changed, 12 insertions, 15 deletions

diff --git a/wizards/source/depot/Internet.xba b/wizards/source/depot/Internet.xba
index d6d718561384..f8b646d54133 100644
--- a/wizards/source/depot/Internet.xba
+++ b/wizards/source/depot/Internet.xba
@@ -25,7 +25,7 @@ Sub InsertCompanyHistory()
 Dim StockName as String
 Dim CurRow as Integer
 Dim sMsgInternetError as String
-Dim CurRate
+Dim CurRate as Double
 Dim oCell as Object
 Dim sStockID as String
 Dim ChartSource as String	
@@ -91,7 +91,7 @@ Dim StocksCount as Integer
 Dim iStartRow as Integer
 Dim sUrl as String
 Dim StockName as String		
-Dim CurRate
+Dim CurRate as Double
 Dim oCell as Object
 Dim sMsgInternetError as String
 Dim sStockID as String
@@ -200,7 +200,6 @@ Dim iCellValue as Long
 	If RemoveCount > 1 Then
 		oSheet.Rows.RemoveByIndex(iCurRow, RemoveCount-1)
 	End If
-	CurDate = EndDate
 	For i = 1 To iLastLinkRow
 		oCell = oSheet.GetCellbyPosition(SBDATECOLUMN,iCurRow)
 		iCellValue = oLinkSheet.GetCellByPosition(0,i).Value
@@ -209,11 +208,8 @@ Dim iCellValue as Long
 		Else
 			oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String)
 		End If
-		oCell.SetValue(CurDate)
-		CurDate = CurDate - iStep
 		oCell = oSheet.GetCellbyPosition(SBVALUECOLUMN,iCurRow)
 		oCell.SetValue(oLinkSheet.GetCellByPosition(4,i).Value)
-		
 		If i < iLastLinkRow Then
 			iCurRow = iCurRow + 1
 			oSheet.Rows.InsertByIndex(iCurRow,1)
@@ -339,4 +335,5 @@ Dim bLeaveLoop as Boolean
 		oDateCell = oSheet.GetCellbyPosition(SBDATECOLUMN, SBSTARTROW + i-1)
 		oDateCell.Annotation.SetString(NoteText)
 	End If
-End Sub</script:module>
\ No newline at end of file
+End Sub
+</script:module>
\ No newline at end of file
diff --git a/wizards/source/depot/Lang_de.xba b/wizards/source/depot/Lang_de.xba
index d2b9362872e9..1fe55bcca0b6 100644
--- a/wizards/source/depot/Lang_de.xba
+++ b/wizards/source/depot/Lang_de.xba
@@ -54,10 +54,10 @@ Sub LoadGermanLanguage()
 	sMarket(0,0) = &quot;Amerikanischer Dollar&quot;
 	sMarket(0,1) = &quot;$&quot;
 	sMarket(0,2) = &quot;New York&quot;
-	sMarket(0,3) = &quot;http://quote.yahoo.com/d/quotes.csv?s=&lt;StockID&gt;&amp;f=sl1d1t1c1ohgv&amp;e=.csv&quot;
-	sMarket(0,4) = &quot;http://table.finance.yahoo.com/table.csv?&quot; &amp;_
-					&quot;a=&lt;StartMonth&gt;&amp;b=&lt;StartDay&gt;&amp;c=&lt;Startyear&gt;&amp;d=&lt;EndMonth&gt;&amp;&quot; &amp;_
-					&quot;e=&lt;EndDay&gt;&amp;f=&lt;Endyear&gt;&amp;s=&lt;StockID&gt;&amp;y=0&amp;g=&lt;interval&gt;&amp;ignore=.csv&quot;
+	sMarket(0,3) = &quot;http://finance.yahoo.com/d/quotes.csv?s=&lt;StockID&gt;&amp;f=sl1d1t1c1ohgv&amp;e=.csv&quot;
+	sMarket(0,4) = &quot;http://ichart.finance.yahoo.com/table.csv?&quot; &amp;_
+				   &quot;s=&lt;StockID&gt;&amp;d=&lt;EndMonth&gt;&amp;e=&lt;EndDay&gt;&amp;f=&lt;Endyear&gt;&amp;g=d&amp;&quot; &amp;_
+				   &quot;a=&lt;StartMonth&gt;&amp;b=&lt;StartDay&gt;&amp;c=&lt;Startyear&gt;&amp;ignore=.csv&quot;
 	sMarket(0,5) = &quot;Symbol&quot;
 	sMarket(0,6) = &quot;en&quot;
 	sMarket(0,7) = &quot;US&quot;
diff --git a/wizards/source/depot/Lang_en.xba b/wizards/source/depot/Lang_en.xba
index fa8beb77dde4..347c5c2544b0 100644
--- a/wizards/source/depot/Lang_en.xba
+++ b/wizards/source/depot/Lang_en.xba
@@ -54,10 +54,10 @@ Sub LoadEnglishLanguage()
 	sMarket(0,0) = &quot;American Dollar&quot;
 	sMarket(0,1) = &quot;$&quot;
 	sMarket(0,2) = &quot;New York&quot;
-	sMarket(0,3) = &quot;http://quote.yahoo.com/d/quotes.csv?s=&lt;StockID&gt;&amp;f=sl1d1t1c1ohgv&amp;e=.csv&quot;
-	sMarket(0,4) = &quot;http://table.finance.yahoo.com/table.csv?&quot; &amp;_
-					&quot;a=&lt;StartMonth&gt;&amp;b=&lt;StartDay&gt;&amp;c=&lt;Startyear&gt;&amp;d=&lt;EndMonth&gt;&amp;&quot; &amp;_
-					&quot;e=&lt;EndDay&gt;&amp;f=&lt;Endyear&gt;&amp;s=&lt;StockID&gt;&amp;y=0&amp;g=&lt;interval&gt;&amp;ignore=.csv&quot;
+	sMarket(0,3) = &quot;http://finance.yahoo.com/d/quotes.csv?s=&lt;StockID&gt;&amp;f=sl1d1t1c1ohgv&amp;e=.csv&quot;
+	sMarket(0,4) = &quot;http://ichart.finance.yahoo.com/table.csv?&quot; &amp;_
+				   &quot;s=&lt;StockID&gt;&amp;d=&lt;EndMonth&gt;&amp;e=&lt;EndDay&gt;&amp;f=&lt;Endyear&gt;&amp;g=d&amp;&quot; &amp;_
+				   &quot;a=&lt;StartMonth&gt;&amp;b=&lt;StartDay&gt;&amp;c=&lt;Startyear&gt;&amp;ignore=.csv&quot;
 	sMarket(0,5) = &quot;Symbol&quot;
 	sMarket(0,6) = &quot;en&quot;
 	sMarket(0,7) = &quot;US&quot;