corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #85271: sr=waterson, r={beard, jag, dbaron}, a=asa. Eliminate features of |nsXPIDLC?String| that keep it out of the string hierarchy (i.e., using assigment to rebind ownership, static |Copy| members, and |getter_Shares|), fixing some leaks in the process.

Browse Source
This commit is contained in:
scc@mozilla.org
2001-06-17 05:23:38 +00:00
parent 08b80c39b7
commit ee1d678864
56 changed files with 288 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
embedding/components/windowwatcher/src/nsPromptService.cpp
View File

@@ -280,35 +280,39 @@ nsPromptService::ConfirmEx(nsIDOMWindow *parent,
PRInt32 numberButtons = 0;
for (int i = 0; i < 3; i++) {
nsXPIDLString buttonText;
nsXPIDLString buttonTextStr;
const PRUnichar* buttonText = 0;
switch (buttonFlags & 0xff) {
case BUTTON_TITLE_OK:
GetLocaleString("OK", getter_Copies(buttonText));
GetLocaleString("OK", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_CANCEL:
GetLocaleString("Cancel", getter_Copies(buttonText));
GetLocaleString("Cancel", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_YES:
GetLocaleString("Yes", getter_Copies(buttonText));
GetLocaleString("Yes", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_NO:
GetLocaleString("No", getter_Copies(buttonText));
GetLocaleString("No", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_SAVE:
GetLocaleString("Save", getter_Copies(buttonText));
GetLocaleString("Save", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_DONT_SAVE:
GetLocaleString("DontSave", getter_Copies(buttonText));
GetLocaleString("DontSave", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_REVERT:
GetLocaleString("Revert", getter_Copies(buttonText));
GetLocaleString("Revert", getter_Copies(buttonTextStr));
break;
case BUTTON_TITLE_IS_STRING:
*getter_Shares(buttonText) = buttonStrings[i];
buttonText = buttonStrings[i];
break;
}
if (buttonText.get()) {
block->SetString(buttonIDs[i], buttonText.get());
if (!buttonText)
buttonText = buttonTextStr.get();
if (buttonText) {
block->SetString(buttonIDs[i], buttonText);
++numberButtons;
}
buttonFlags >>= 8;