Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Side by Side Diff: source/i18n/windtfmt.cpp

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/i18n/windtfmt.h ('k') | source/i18n/winnmfmt.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ******************************************************************************** 2 ********************************************************************************
3 * Copyright (C) 2005-2013, International Business Machines 3 * Copyright (C) 2005-2014, International Business Machines
4 * Corporation and others. All Rights Reserved. 4 * Corporation and others. All Rights Reserved.
5 ******************************************************************************** 5 ********************************************************************************
6 * 6 *
7 * File WINDTFMT.CPP 7 * File WINDTFMT.CPP
8 * 8 *
9 ******************************************************************************** 9 ********************************************************************************
10 */ 10 */
11 11
12 #include "unicode/utypes.h" 12 #include "unicode/utypes.h"
13 13
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 delete fDateTimeMsg; 117 delete fDateTimeMsg;
118 } 118 }
119 119
120 Win32DateFormat &Win32DateFormat::operator=(const Win32DateFormat &other) 120 Win32DateFormat &Win32DateFormat::operator=(const Win32DateFormat &other)
121 { 121 {
122 // The following handles fCalendar 122 // The following handles fCalendar
123 DateFormat::operator=(other); 123 DateFormat::operator=(other);
124 124
125 // delete fCalendar; 125 // delete fCalendar;
126 126
127 this->fDateTimeMsg = other.fDateTimeMsg; 127 this->fDateTimeMsg = other.fDateTimeMsg == NULL ? NULL : new UnicodeString(* other.fDateTimeMsg);
128 this->fTimeStyle = other.fTimeStyle; 128 this->fTimeStyle = other.fTimeStyle;
129 this->fDateStyle = other.fDateStyle; 129 this->fDateStyle = other.fDateStyle;
130 this->fLocale = other.fLocale; 130 this->fLocale = other.fLocale;
131 this->fLCID = other.fLCID; 131 this->fLCID = other.fLCID;
132 // this->fCalendar = other.fCalendar->clone(); 132 // this->fCalendar = other.fCalendar->clone();
133 this->fZoneID = other.fZoneID; 133 this->fZoneID = other.fZoneID;
134 134
135 this->fTZI = NEW_ARRAY(TIME_ZONE_INFORMATION, 1); 135 this->fTZI = NEW_ARRAY(TIME_ZONE_INFORMATION, 1);
136 *this->fTZI = *other.fTZI; 136 *this->fTZI = *other.fTZI;
137 137
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 return zoneID; 314 return zoneID;
315 } 315 }
316 316
317 U_NAMESPACE_END 317 U_NAMESPACE_END
318 318
319 #endif /* #if !UCONFIG_NO_FORMATTING */ 319 #endif /* #if !UCONFIG_NO_FORMATTING */
320 320
321 #endif // U_PLATFORM_HAS_WIN32_API 321 #endif // U_PLATFORM_HAS_WIN32_API
322 322
OLDNEW
« no previous file with comments | « source/i18n/windtfmt.h ('k') | source/i18n/winnmfmt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698