merge with master
This commit is contained in:
		| @@ -1,11 +1,9 @@ | ||||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||||
| // Licensed under the MIT License. | ||||
|  | ||||
| #include "pch.h" | ||||
| #include "BooleanToVisibilityConverter.h" | ||||
|  | ||||
| using namespace CalculatorApp::Common; | ||||
|  | ||||
| using namespace Platform; | ||||
| using namespace Windows::Foundation; | ||||
| using namespace Windows::UI::Xaml; | ||||
|   | ||||
| @@ -28,22 +28,22 @@ namespace CalculatorApp | ||||
|             { | ||||
|             case RADIX_TYPE::BIN_RADIX: | ||||
|             { | ||||
|                 convertedValue = resourceLoader.GetResourceString("Bin"); | ||||
|                 convertedValue = resourceLoader->GetResourceString("Bin"); | ||||
|                 break; | ||||
|             } | ||||
|             case RADIX_TYPE::OCT_RADIX: | ||||
|             { | ||||
|                 convertedValue = resourceLoader.GetResourceString("Oct"); | ||||
|                 convertedValue = resourceLoader->GetResourceString("Oct"); | ||||
|                 break; | ||||
|             } | ||||
|             case RADIX_TYPE::DEC_RADIX: | ||||
|             { | ||||
|                 convertedValue = resourceLoader.GetResourceString("Dec"); | ||||
|                 convertedValue = resourceLoader->GetResourceString("Dec"); | ||||
|                 break; | ||||
|             } | ||||
|             case RADIX_TYPE::HEX_RADIX: | ||||
|             { | ||||
|                 convertedValue = resourceLoader.GetResourceString("Hex"); | ||||
|                 convertedValue = resourceLoader->GetResourceString("Hex"); | ||||
|                 break; | ||||
|             } | ||||
|             default: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user