dbertoni 00/07/28 14:59:15
Modified: c/src/ICUBridge ICUXalanNumberFormatProxy.cpp
Log:
Linux fixes.
Revision Changes Path
1.4 +10 -46 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ICUXalanNumberFormatProxy.cpp 2000/06/27 01:07:37 1.3
+++ ICUXalanNumberFormatProxy.cpp 2000/07/28 21:59:14 1.4
@@ -72,46 +72,10 @@
-inline UnicodeString
-XalanDOMStringToUnicodeString(const XalanDOMString& theString)
-{
- const XalanDOMChar* const theBuffer = c_wstr(theString);
-
- if (theBuffer == 0)
- {
- return UnicodeString();
- }
- else
- {
- return UnicodeString(theBuffer, length(theBuffer));
- }
-}
-
-
-
-inline XalanDOMString
-UnicodeStringToXalanDOMString(const UnicodeString& theString)
-{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::vector;
-#endif
+#include "ICUBridge.hpp"
- vector<XalanDOMChar> theBuffer;
- const int32_t theLength = theString.length();
- theBuffer.reserve(theLength);
-
- for (int32_t i = 0; i < theLength; ++i)
- {
- theBuffer.push_back(theString[i]);
- }
-
- return XalanDOMString(&theBuffer[0], theBuffer.size());
-}
-
-
-
ICUXalanNumberFormatProxy::ICUXalanNumberFormatProxy() :
XalanNumberFormat(),
m_decimalFormat(0)
@@ -137,7 +101,7 @@
m_decimalFormat->format(theValue, theResult);
- return UnicodeStringToXalanDOMString(theResult);
+ return ICUBridge::UnicodeStringToXalanDOMString(theResult);
}
@@ -147,9 +111,9 @@
{
UnicodeString theResult;
- m_decimalFormat->format(static_cast<long int>(theValue), theResult);
+ m_decimalFormat->format(int32_t(theValue), theResult);
- return UnicodeStringToXalanDOMString(theResult);
+ return ICUBridge::UnicodeStringToXalanDOMString(theResult);
}
@@ -159,9 +123,9 @@
{
UnicodeString theResult;
- m_decimalFormat->format(static_cast<long int>(theValue), theResult);
+ m_decimalFormat->format(int32_t(theValue), theResult);
- return UnicodeStringToXalanDOMString(theResult);
+ return ICUBridge::UnicodeStringToXalanDOMString(theResult);
}
@@ -171,9 +135,9 @@
{
UnicodeString theResult;
- m_decimalFormat->format(theValue, theResult);
+ m_decimalFormat->format(int32_t(theValue), theResult);
- return UnicodeStringToXalanDOMString(theResult);
+ return ICUBridge::UnicodeStringToXalanDOMString(theResult);
}
@@ -183,9 +147,9 @@
{
UnicodeString theResult;
- m_decimalFormat->format(static_cast<long int>(theValue), theResult);
+ m_decimalFormat->format(int32_t(theValue), theResult);
- return UnicodeStringToXalanDOMString(theResult);
+ return ICUBridge::UnicodeStringToXalanDOMString(theResult);
}
