github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some spacing issues after merge

Browse source
This commit is contained in:
rudyhuyn 2019-05-09 01:51:47 -07:00
commit c64c5340a4
4 changed files with 70 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcViewModel/Common/LocalizationService.cpp
View file

@ -373,8 +373,7 @@ DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatte
// If successful, returns a formatter that respects the user's regional format settings, // If successful, returns a formatter that respects the user's regional format settings,
// as configured by running intl.cpl. // as configured by running intl.cpl.
DateTimeFormatter DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const
^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const
{ {
IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers();
if (languageIdentifiers == nullptr) if (languageIdentifiers == nullptr)
@ -406,7 +405,6 @@ CurrencyFormatter^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatte
IIterable<String ^> ^ LocalizationService::GetLanguageIdentifiers() const IIterable<String ^> ^ LocalizationService::GetLanguageIdentifiers() const
{ {
WCHAR currentLocale[LOCALE_NAME_MAX_LENGTH] = {}; WCHAR currentLocale[LOCALE_NAME_MAX_LENGTH] = {};
int result = GetUserDefaultLocaleName(currentLocale, LOCALE_NAME_MAX_LENGTH); int result = GetUserDefaultLocaleName(currentLocale, LOCALE_NAME_MAX_LENGTH);

3
src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
View file

@ -205,7 +205,6 @@ namespace CalculatorUnitTests
TEST_METHOD(LoadFromCache_Fail_NoCacheKey) TEST_METHOD(LoadFromCache_Fail_NoCacheKey)
{ {
RemoveFromLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey); RemoveFromLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey);
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); bool didLoad = loader.TryLoadDataFromCacheAsync().get();
@ -342,7 +341,6 @@ TEST_METHOD(LoadFromWeb_Success)
TEST_METHOD(Load_Success_LoadedFromCache) TEST_METHOD(Load_Success_LoadedFromCache)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
@ -391,7 +389,6 @@ TEST_CLASS(CurrencyConverterUnitTests){ const UCM::Unit GetUnit(const vector<UCM
TEST_METHOD(Loaded_LoadOrderedUnits) TEST_METHOD(Loaded_LoadOrderedUnits)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();