forked from pool/MozillaThunderbird
114 lines
5.8 KiB
Diff
114 lines
5.8 KiB
Diff
--- ./layout/base/nsCSSRendering.cpp 2005-12-27 13:52:01.000000000 +0100
|
|
+++ ./layout/base/nsCSSRendering.cpp.new 2007-01-18 23:40:30.741771000 +0100
|
|
@@ -979,14 +979,14 @@
|
|
FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height-adjust,isInvert);
|
|
FillOrInvertRect(aContext,dashRect.x,(borderOutside.YMost()-(dashRect.height-adjust)),dashRect.width, dashRect.height-adjust,isInvert);
|
|
currRect.y += (dashRect.height-adjust);
|
|
- temp = temp-= (dashRect.height-adjust);
|
|
+ temp -= (dashRect.height-adjust);
|
|
} else {
|
|
adjust = (temp%dashRect.width)/2; // adjust a tad longer
|
|
// draw in the left and right
|
|
FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height+adjust,isInvert);
|
|
FillOrInvertRect(aContext, dashRect.x,(borderOutside.YMost()-(dashRect.height+adjust)),dashRect.width, dashRect.height+adjust,isInvert);
|
|
currRect.y += (dashRect.height+adjust);
|
|
- temp = temp-= (dashRect.height+adjust);
|
|
+ temp -= (dashRect.height+adjust);
|
|
}
|
|
|
|
if( temp > ywidth)
|
|
@@ -1045,14 +1045,14 @@
|
|
FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width-adjust,dashRect.height,isInvert);
|
|
FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width-adjust)),dashRect.y,dashRect.width-adjust,dashRect.height,isInvert);
|
|
currRect.x += (dashRect.width-adjust);
|
|
- temp = temp-= (dashRect.width-adjust);
|
|
+ temp -= (dashRect.width-adjust);
|
|
} else {
|
|
adjust = (temp%dashRect.width)/2;
|
|
// draw in the left and right
|
|
FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width+adjust,dashRect.height,isInvert);
|
|
FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width+adjust)),dashRect.y,dashRect.width+adjust,dashRect.height,isInvert);
|
|
currRect.x += (dashRect.width+adjust);
|
|
- temp = temp-= (dashRect.width+adjust);
|
|
+ temp -= (dashRect.width+adjust);
|
|
}
|
|
|
|
|
|
--- ./layout/xul/base/src/nsBox.cpp 2006-01-07 21:27:40.000000000 +0100
|
|
+++ ./layout/xul/base/src/nsBox.cpp.new 2007-01-18 23:43:58.695609000 +0100
|
|
@@ -863,7 +863,7 @@
|
|
while (box) {
|
|
nsRect* overflowArea = box->GetOverflowAreaProperty();
|
|
nsRect bounds = overflowArea ? *overflowArea + box->GetPosition() :
|
|
- bounds = box->GetRect();
|
|
+ box->GetRect();
|
|
rect.UnionRect(rect, bounds);
|
|
|
|
box->GetNextBox(&box);
|
|
--- ./mailnews/compose/src/nsMsgCompose.cpp 2007-01-19 00:53:23.575133000 +0100
|
|
+++ ./mailnews/compose/src/nsMsgCompose.cpp.new 2007-01-19 00:55:33.114466000 +0100
|
|
@@ -1476,7 +1476,7 @@
|
|
}
|
|
else // check if we're dealing with a displayed message/rfc822 attachment
|
|
{
|
|
- PRInt32 typeIndex = typeIndex = msgUri.Find("&type=application/x-message-display");
|
|
+ PRInt32 typeIndex = msgUri.Find("&type=application/x-message-display");
|
|
if (typeIndex != kNotFound)
|
|
{
|
|
msgUri.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1);
|
|
--- ./intl/unicharutil/src/nsEntityConverter.cpp 2005-04-02 20:44:00.000000000 +0200
|
|
+++ ./intl/unicharutil/src/nsEntityConverter.cpp.new 2007-01-19 00:14:59.413600000 +0100
|
|
@@ -236,7 +236,9 @@
|
|
if (IS_HIGH_SURROGATE(inString[i]) &&
|
|
i + 2 < len &&
|
|
IS_LOW_SURROGATE(inString[i + 1])) {
|
|
- key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10);
|
|
+ // key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10);
|
|
+ key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[i + 1]), 10);
|
|
+ ++i;
|
|
}
|
|
else {
|
|
key.AppendInt(inString[i],10);
|
|
--- ./netwerk/cache/src/nsDiskCacheMap.h 2006-02-22 04:23:13.000000000 +0100
|
|
+++ ./netwerk/cache/src/nsDiskCacheMap.h.new 2007-01-19 00:16:52.302599000 +0100
|
|
@@ -168,7 +168,7 @@
|
|
|
|
// set blockCount
|
|
NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count");
|
|
- blockCount = --blockCount;
|
|
+ --blockCount;
|
|
mDataLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask;
|
|
|
|
mDataLocation |= eLocationInitializedMask;
|
|
@@ -236,7 +236,7 @@
|
|
|
|
// set blockCount
|
|
NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count");
|
|
- blockCount = --blockCount;
|
|
+ --blockCount;
|
|
mMetaLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask;
|
|
|
|
mMetaLocation |= eLocationInitializedMask;
|
|
--- ./mailnews/local/src/nsMailboxService.cpp 2007-01-19 00:53:23.280426000 +0100
|
|
+++ ./mailnews/local/src/nsMailboxService.cpp.new 2007-01-19 00:56:19.625909000 +0100
|
|
@@ -228,7 +228,7 @@
|
|
|
|
// this happens with forward inline of message/rfc822 attachment
|
|
// opened in a stand-alone msg window.
|
|
- PRInt32 typeIndex = typeIndex = uriString.Find("&type=application/x-message-display");
|
|
+ PRInt32 typeIndex = uriString.Find("&type=application/x-message-display");
|
|
if (typeIndex != kNotFound)
|
|
{
|
|
uriString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1);
|
|
--- ./content/events/src/nsEventStateManager.cpp 2006-08-21 19:49:44.000000000 +0200
|
|
+++ ./content/events/src/nsEventStateManager.cpp.new 2007-01-19 00:31:01.921129000 +0100
|
|
@@ -4162,7 +4162,7 @@
|
|
do_QueryInterface(GetDocumentOuterWindow(mDocument));
|
|
if (newWindow) {
|
|
nsIFocusController *newFocusController =
|
|
- newFocusController = newWindow->GetRootFocusController();
|
|
+ newWindow->GetRootFocusController();
|
|
nsCOMPtr<nsPIDOMWindow> oldWindow =
|
|
do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument));
|
|
if (oldWindow) {
|