Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 148470: Xprint-specific X font banning code is broken. Author=Roland.Mainz@informatik.med.uni-giessen.de, r=timeless, sr=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@123094 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smontagu%netscape.com
2002-06-11 22:34:25 +00:00
parent 49fadf233c
commit 8cd326a2d9
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
View File

@@ -1165,7 +1165,16 @@ nsFontMetricsXlib::InitGlobals(nsIDeviceContext *aDevice)
#ifdef ENABLE_X_FONT_BANNING
/* get the font banning pattern */
nsXPIDLCString fbpattern;
rv = gPref->GetCharPref("font.x11.rejectfontpattern", getter_Copies(fbpattern));
#ifdef USE_XPRINT
if (nsFontMetricsXlib::mPrinterMode) {
rv = gPref->GetCharPref("print.xprint.font.rejectfontpattern", getter_Copies(fbpattern));
}
if (!nsFontMetricsXlib::mPrinterMode || NS_FAILED(rv)) {
#endif /* USE_XPRINT */
rv = gPref->GetCharPref("font.x11.rejectfontpattern", getter_Copies(fbpattern));
#ifdef USE_XPRINT
}
#endif /* USE_XPRINT */
if (NS_SUCCEEDED(rv)) {
gFontRejectRegEx = new regex_t;
if (!gFontRejectRegEx) {
@@ -1185,7 +1194,16 @@ nsFontMetricsXlib::InitGlobals(nsIDeviceContext *aDevice)
}
}
rv = gPref->GetCharPref("font.x11.acceptfontpattern", getter_Copies(fbpattern));
#ifdef USE_XPRINT
if (nsFontMetricsXlib::mPrinterMode) {
rv = gPref->GetCharPref("print.xprint.font.acceptfontpattern", getter_Copies(fbpattern));
}
if (!nsFontMetricsXlib::mPrinterMode || NS_FAILED(rv)) {
#endif /* USE_XPRINT */
rv = gPref->GetCharPref("font.x11.acceptfontpattern", getter_Copies(fbpattern));
#ifdef USE_XPRINT
}
#endif /* USE_XPRINT */
if (NS_SUCCEEDED(rv)) {
gFontAcceptRegEx = new regex_t;
if (!gFontAcceptRegEx) {