ICU 56 update step 1

source/i18n/ucol_res.cpp

 /*
 *******************************************************************************
 *   Copyright (C) 1996-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucol_res.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ skipping 206 matching lines @@
         return loadFromCollations(errorCode);
     } else {
         return loadFromData(errorCode);
     }
 }
 
 const CollationCacheEntry *
 CollationLoader::loadFromLocale(UErrorCode &errorCode) {
     if(U_FAILURE(errorCode)) { return NULL; }
     U_ASSERT(bundle == NULL);
-    bundle = ures_open(U_ICUDATA_COLL, locale.getBaseName(), &errorCode);
+    bundle = ures_openNoDefault(U_ICUDATA_COLL, locale.getBaseName(), &errorCode);
     if(errorCode == U_MISSING_RESOURCE_ERROR) {
         errorCode = U_USING_DEFAULT_WARNING;
 
         // Have to add that ref that we promise.
         rootEntry->addRef();
         return rootEntry;
     }
     Locale requestedLocale(locale);
     const char *vLocale = ures_getLocaleByType(bundle, ULOC_ACTUAL_LOCALE, &errorCode);
     if(U_FAILURE(errorCode)) { return NULL; }
@@ skipping 498 matching lines @@
                              const char* keyword, const char* locale,
                              UBool* isAvailable, UErrorCode* status)
 {
     // N.B.: Resource name is "collations" but keyword is "collation"
     return ures_getFunctionalEquivalent(result, resultCapacity, U_ICUDATA_COLL,
         "collations", keyword, locale,
         isAvailable, TRUE, status);
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */