From 42b974979330a0d7a16f4fd46033c98b972a707a Mon Sep 17 00:00:00 2001 From: Rudy Huyn Date: Thu, 14 Mar 2019 22:44:37 -0700 Subject: [PATCH] take feedback into account --- src/CalcViewModel/Common/DateCalculator.h | 3 ++- src/Calculator/Views/DateCalculator.xaml.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CalcViewModel/Common/DateCalculator.h b/src/CalcViewModel/Common/DateCalculator.h index eeb3dcac..b755e2ee 100644 --- a/src/CalcViewModel/Common/DateCalculator.h +++ b/src/CalcViewModel/Common/DateCalculator.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once @@ -46,6 +46,7 @@ namespace CalculatorApp bool __nothrow AddDuration(_In_ Windows::Foundation::DateTime startDate, _In_ const DateDifference& duration, _Out_ Windows::Foundation::DateTime *endDate); bool __nothrow SubtractDuration(_In_ Windows::Foundation::DateTime startDate, _In_ const DateDifference& duration, _Out_ Windows::Foundation::DateTime *endDate); void __nothrow GetDateDifference(_In_ Windows::Foundation::DateTime date1, _In_ Windows::Foundation::DateTime date2, _In_ DateUnit outputFormat, _Out_ DateDifference *difference); + private: // Private Variables Windows::Globalization::Calendar^ m_calendar; diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp index ddf0a635..574ad4b5 100644 --- a/src/Calculator/Views/DateCalculator.xaml.cpp +++ b/src/Calculator/Views/DateCalculator.xaml.cpp @@ -37,6 +37,7 @@ using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 + DateCalculator::DateCalculator() { InitializeComponent(); @@ -45,7 +46,7 @@ DateCalculator::DateCalculator() // Set Calendar Identifier DateDiff_FromDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier(); - DateDiff_ToDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier();; + DateDiff_ToDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier(); // Setting the FirstDayofWeek DateDiff_FromDate->FirstDayOfWeek = localizationSettings.GetFirstDayOfWeek();