diff --git a/src/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/util/MsgLoaders/ICU/ICUMsgLoader.cpp index a54ca6ea3448e25b7aac7906a9a6ec3ae9c8e9ad..1cd25796024c8ce9838f9e6eede565f235116415 100644 --- a/src/util/MsgLoaders/ICU/ICUMsgLoader.cpp +++ b/src/util/MsgLoaders/ICU/ICUMsgLoader.cpp @@ -56,6 +56,9 @@ /** * $Log$ + * Revision 1.3 2000/01/19 00:58:38 roddey + * Update to support new ICU 1.4 release. + * * Revision 1.2 1999/11/19 21:24:03 aruna1 * incorporated ICU 1.3.1 related changes int he file * @@ -99,26 +102,6 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const toLoad) : fBundle(0) , fBundleType((XMLCh*)toLoad) { - // - // Use the platform util's path to figure out where the resource bundles - // are. We keep them in an NLS directory underneath the DLL/Lib path. - // - const unsigned int maxChars = 4095; - char tmpPath[maxChars + 1]; - strncpy(tmpPath, XMLPlatformUtils::fgLibLocation, maxChars); - - // Now copy the relative path part onto it - strncat(tmpPath, "NLS//ICU//", maxChars); - - if (toLoad == 0) - strncat(tmpPath, "XMLExceptMsgs", maxChars); - else if (toLoad == 0) - strncat(tmpPath, "XMLErrors", maxChars); - else - { - // <TBD> Need to do something here. Panic call? - } - // Ok, lets try to create the bundle now UErrorCode err = U_ZERO_ERROR; fBundle = new ResourceBundle(tmpPath, err); diff --git a/src/util/Transcoders/ICU/ICUTransService.cpp b/src/util/Transcoders/ICU/ICUTransService.cpp index 5bb3d1dd623932753b62c62f734e9a24e5485cf5..2772322aafab25ca164b4a3c4a6923baca092314 100644 --- a/src/util/Transcoders/ICU/ICUTransService.cpp +++ b/src/util/Transcoders/ICU/ICUTransService.cpp @@ -56,6 +56,9 @@ /** * $Log$ + * Revision 1.7 2000/01/19 00:58:07 roddey + * Update to support new ICU 1.4 release. + * * Revision 1.6 1999/12/18 00:22:32 roddey * Changes to support the new, completely orthagonal, transcoder architecture. * @@ -88,20 +91,12 @@ #include <util/TranscodingException.hpp> #include "ICUTransService.hpp" #include <string.h> -#include <uloc.h> -#include <unicode.h> -#include <ucnv.h> -#include <ustring.h> - +#include <unicode/uloc.h> +#include <unicode/unicode.h> +#include <unicode/ucnv.h> +#include <unicode/ustring.h> -// --------------------------------------------------------------------------- -// ICUTransService: Public, static methods -// --------------------------------------------------------------------------- -void ICUTransService::setICUPath(const char* const pathToSet) -{ - uloc_setDataDirectory(pathToSet); -} // --------------------------------------------------------------------------- @@ -200,9 +195,9 @@ bool ICUTransService::isSpace(const XMLCh toCheck) const XMLLCPTranscoder* ICUTransService::makeNewLCPTranscoder() { // - // Try to create a default converter. If it fails, return a null pointer - // which will basically cause the system to give up because we really can't - // do anything without one. + // Try to create a default converter. If it fails, return a null + // pointer which will basically cause the system to give up because + // we really can't do anything without one. // UErrorCode uerr = U_ZERO_ERROR; UConverter* converter = ucnv_open(NULL, &uerr); diff --git a/src/util/Transcoders/ICU/ICUTransService.hpp b/src/util/Transcoders/ICU/ICUTransService.hpp index b4d608b8e446e7e0d314136190251ccaf83c4d6c..edefc554d2435e5fe91b5988cd9949d269ac0157 100644 --- a/src/util/Transcoders/ICU/ICUTransService.hpp +++ b/src/util/Transcoders/ICU/ICUTransService.hpp @@ -56,6 +56,9 @@ /** * $Log$ + * Revision 1.4 2000/01/19 00:58:07 roddey + * Update to support new ICU 1.4 release. + * * Revision 1.3 1999/12/18 00:22:32 roddey * Changes to support the new, completely orthagonal, transcoder architecture. * @@ -82,12 +85,6 @@ struct UConverter; class XMLUTIL_EXPORT ICUTransService : public XMLTransService { public : - // ----------------------------------------------------------------------- - // Public, static methods - // ----------------------------------------------------------------------- - static void setICUPath(const char* const pathToSet); - - // ----------------------------------------------------------------------- // Constructors and Destructor // -----------------------------------------------------------------------