From e1220d60f7bb045ad86fa2b97d017f6b2974e738 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Wed, 26 Sep 2001 01:10:14 +0000 Subject: [PATCH] oops missed this file - use NS_LITERAL_STRING now that API has changed git-svn-id: svn://10.0.0.236/trunk@103784 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsSimplePageSequence.cpp | 6 +++--- mozilla/layout/html/base/src/nsSimplePageSequence.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp index 9df431ceb00..efa5d4f5b25 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.cpp +++ b/mozilla/layout/generic/nsSimplePageSequence.cpp @@ -632,14 +632,14 @@ nsSimplePageSequenceFrame::StartPrint(nsIPresContext* aPresContext, // // Get default font name and size to be used for the headers and footers nsAutoString fontName; - rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, "fontname", fontName); + rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, NS_LITERAL_STRING("fontname").get(), fontName); if (NS_FAILED(rv)) { fontName.AssignWithConversion("serif"); } nsAutoString fontSizeStr; nscoord pointSize = 10;; - rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, "fontsize", fontSizeStr); + rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, NS_LITERAL_STRING("fontsize").get(), fontSizeStr); if (NS_SUCCEEDED(rv)) { PRInt32 errCode; pointSize = fontSizeStr.ToInteger(&errCode); @@ -655,7 +655,7 @@ nsSimplePageSequenceFrame::StartPrint(nsIPresContext* aPresContext, nsAutoString pageFormatStr; rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, - doingPageTotals?"pageofpages":"pagenumber", + doingPageTotals? NS_LITERAL_STRING("pageofpages").get():NS_LITERAL_STRING("pagenumber").get(), pageFormatStr); if (NS_FAILED(rv)) { // back stop formatting pageFormatStr.AssignWithConversion(doingPageTotals?"%ld of %ld":"%ld"); diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp index 9df431ceb00..efa5d4f5b25 100644 --- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp +++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp @@ -632,14 +632,14 @@ nsSimplePageSequenceFrame::StartPrint(nsIPresContext* aPresContext, // // Get default font name and size to be used for the headers and footers nsAutoString fontName; - rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, "fontname", fontName); + rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, NS_LITERAL_STRING("fontname").get(), fontName); if (NS_FAILED(rv)) { fontName.AssignWithConversion("serif"); } nsAutoString fontSizeStr; nscoord pointSize = 10;; - rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, "fontsize", fontSizeStr); + rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, NS_LITERAL_STRING("fontsize").get(), fontSizeStr); if (NS_SUCCEEDED(rv)) { PRInt32 errCode; pointSize = fontSizeStr.ToInteger(&errCode); @@ -655,7 +655,7 @@ nsSimplePageSequenceFrame::StartPrint(nsIPresContext* aPresContext, nsAutoString pageFormatStr; rv = nsFormControlHelper::GetLocalizedString(PRINTING_PROPERTIES, - doingPageTotals?"pageofpages":"pagenumber", + doingPageTotals? NS_LITERAL_STRING("pageofpages").get():NS_LITERAL_STRING("pagenumber").get(), pageFormatStr); if (NS_FAILED(rv)) { // back stop formatting pageFormatStr.AssignWithConversion(doingPageTotals?"%ld of %ld":"%ld");