AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11706 (and #11726) more code cleanup (rolling in from J)

Browse Source 
X-SVN-Rev: 37617
This commit is contained in:
Peter Edberg 2015-06-24 08:03:16 +00:00
parent 656838dbad
commit 52acc7a249
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/source/i18n/dtitvfmt.cpp
View File

@ -1330,13 +1330,14 @@ DateIntervalFormat::adjustPosition(UnicodeString& combiningPattern, // has {0} a
if (index0 < 0 || index1 < 0) { if (index0 < 0 || index1 < 0) {
return; return;
} }
int32_t placeholderLen = 3; // length of "{0}" or "{1}"
if (index0 < index1) { if (index0 < index1) {
if (pos0.getEndIndex() > 0) { if (pos0.getEndIndex() > 0) {
posResult.setBeginIndex(pos0.getBeginIndex() + index0); posResult.setBeginIndex(pos0.getBeginIndex() + index0);
posResult.setEndIndex(pos0.getEndIndex() + index0); posResult.setEndIndex(pos0.getEndIndex() + index0);
} else if (pos1.getEndIndex() > 0) { } else if (pos1.getEndIndex() > 0) {
// here index1 >= 3 // here index1 >= 3
index1 += pat0.length() - 3; // adjust for pat0 replacing {0} index1 += pat0.length() - placeholderLen; // adjust for pat0 replacing {0}
posResult.setBeginIndex(pos1.getBeginIndex() + index1); posResult.setBeginIndex(pos1.getBeginIndex() + index1);
posResult.setEndIndex(pos1.getEndIndex() + index1); posResult.setEndIndex(pos1.getEndIndex() + index1);
} }
@ -1346,7 +1347,7 @@ DateIntervalFormat::adjustPosition(UnicodeString& combiningPattern, // has {0} a
posResult.setEndIndex(pos1.getEndIndex() + index1); posResult.setEndIndex(pos1.getEndIndex() + index1);
} else if (pos0.getEndIndex() > 0) { } else if (pos0.getEndIndex() > 0) {
// here index0 >= 3 // here index0 >= 3
index0 += pat1.length() - 3; // adjust for pat1 replacing {1} index0 += pat1.length() - placeholderLen; // adjust for pat1 replacing {1}
posResult.setBeginIndex(pos0.getBeginIndex() + index0); posResult.setBeginIndex(pos0.getBeginIndex() + index0);
posResult.setEndIndex(pos0.getEndIndex() + index0); posResult.setEndIndex(pos0.getEndIndex() + index0);
} }