dbertoni 2003/01/20 18:23:21
Modified: c/src/ICUBridge ICUBridge.cpp ICUBridgeCleanup.cpp
ICUXalanNumberFormatProxy.cpp
Log:
Updates for ICU 2.4.
Revision Changes Path
1.20 +1 -5 xml-xalan/c/src/ICUBridge/ICUBridge.cpp
Index: ICUBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridge.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ICUBridge.cpp 7 Dec 2002 01:48:36 -0000 1.19
+++ ICUBridge.cpp 21 Jan 2003 02:23:21 -0000 1.20
@@ -306,7 +306,7 @@
XalanDOMString&
theResult)
{
if (theStatus == U_ZERO_ERROR ||
- theStatus == U_USING_DEFAULT_ERROR)
+ theStatus == U_USING_DEFAULT_WARNING)
{
// Use a XalanAutoPtr, to keep this safe until we construct the
DecimalFormat instance.
XalanAutoPtr<DecimalFormatSymbols> theDFS(new
DecimalFormatSymbols(theStatus));
@@ -316,11 +316,7 @@
theDFS->setSymbol(DecimalFormatSymbols::kZeroDigitSymbol,
UChar(theXalanDFS.getZeroDigit()));
theDFS->setSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol,
UChar(theXalanDFS.getGroupingSeparator()));
theDFS->setSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol,
UChar(theXalanDFS.getDecimalSeparator()));
-#if U_ICU_VERSION_MAJOR_NUM < 2
- theDFS->setSymbol(DecimalFormatSymbols::kPermillSymbol,
UChar(theXalanDFS.getPerMill()));
-#else
theDFS->setSymbol(DecimalFormatSymbols::kPerMillSymbol,
UChar(theXalanDFS.getPerMill()));
-#endif
theDFS->setSymbol(DecimalFormatSymbols::kPercentSymbol,
UChar(theXalanDFS.getPercent()));
theDFS->setSymbol(DecimalFormatSymbols::kDigitSymbol,
UChar(theXalanDFS.getDigit()));
theDFS->setSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol,
UChar(theXalanDFS.getPatternSeparator()));
1.4 +0 -4 xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp
Index: ICUBridgeCleanup.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ICUBridgeCleanup.cpp 7 Dec 2002 01:48:36 -0000 1.3
+++ ICUBridgeCleanup.cpp 21 Jan 2003 02:23:21 -0000 1.4
@@ -60,9 +60,7 @@
#include <unicode/utypes.h>
-#if (U_ICU_VERSION_MAJOR_NUM >= 2)
#include <unicode/uclean.h>
-#endif
@@ -73,10 +71,8 @@
void
ICUBridgeCleanup::cleanup()
{
-#if (U_ICU_VERSION_MAJOR_NUM >= 2)
// release all lasily allocated data
u_cleanup();
-#endif
}
1.12 +0 -3 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp
Index: ICUXalanNumberFormatProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ICUXalanNumberFormatProxy.cpp 7 Dec 2002 01:48:36 -0000 1.11
+++ ICUXalanNumberFormatProxy.cpp 21 Jan 2003 02:23:21 -0000 1.12
@@ -63,10 +63,7 @@
-#if U_ICU_VERSION_MAJOR_NUM >= 2
-// this is the ICU's macro for using namespace ...
U_NAMESPACE_USE
-#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
