From 4d93f82379e2b015bc701ff022b3cf2dea11baeb Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Sat, 12 Jan 2002 12:32:32 +0000 Subject: [PATCH] Gets title and url from PrintService instead of PrintSettings Bug 117894 r=dcone sr=attinasi git-svn-id: svn://10.0.0.236/trunk@112022 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsPageFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsPageFrame.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index c926bb463eb..13b9598a25b 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -379,7 +379,7 @@ nsPageFrame::ProcessSpecialCodes(const nsString& aStr, nsString& aNewStr) if (kTitle != nsnull) { if (aStr.Find(kTitle) > -1) { PRUnichar * uTitle; - mPD->mPrintSettings->GetTitle(&uTitle); // creates memory + mPD->mPrintOptions->GetTitle(&uTitle); // creates memory SubstValueForCode(aNewStr, kTitle, uTitle); nsMemory::Free(uTitle); nsMemory::Free(kTitle); @@ -392,7 +392,7 @@ nsPageFrame::ProcessSpecialCodes(const nsString& aStr, nsString& aNewStr) if (kDocURL != nsnull) { if (aStr.Find(kDocURL) > -1) { PRUnichar * uDocURL; - mPD->mPrintSettings->GetDocURL(&uDocURL); // creates memory + mPD->mPrintOptions->GetDocURL(&uDocURL); // creates memory SubstValueForCode(aNewStr, kDocURL, uDocURL); nsMemory::Free(uDocURL); nsMemory::Free(kDocURL); diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index c926bb463eb..13b9598a25b 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -379,7 +379,7 @@ nsPageFrame::ProcessSpecialCodes(const nsString& aStr, nsString& aNewStr) if (kTitle != nsnull) { if (aStr.Find(kTitle) > -1) { PRUnichar * uTitle; - mPD->mPrintSettings->GetTitle(&uTitle); // creates memory + mPD->mPrintOptions->GetTitle(&uTitle); // creates memory SubstValueForCode(aNewStr, kTitle, uTitle); nsMemory::Free(uTitle); nsMemory::Free(kTitle); @@ -392,7 +392,7 @@ nsPageFrame::ProcessSpecialCodes(const nsString& aStr, nsString& aNewStr) if (kDocURL != nsnull) { if (aStr.Find(kDocURL) > -1) { PRUnichar * uDocURL; - mPD->mPrintSettings->GetDocURL(&uDocURL); // creates memory + mPD->mPrintOptions->GetDocURL(&uDocURL); // creates memory SubstValueForCode(aNewStr, kDocURL, uDocURL); nsMemory::Free(uDocURL); nsMemory::Free(kDocURL);