diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
| commit | dbdcf80ba8e559236f9937aaafba1d14b1cee46e (patch) | |
| tree | d5711b633861b6ffc879fbbce08ea1364e9a64c9 /embed/mozilla/MozillaPrivate.cpp | |
| parent | 9765279aba4cbed66b182e91eaa18e8225305a18 (diff) | |
| download | gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.gz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.bz2 gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.lz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.xz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.zst gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.zip | |
merging pre-gnome-2-8 branch
Diffstat (limited to 'embed/mozilla/MozillaPrivate.cpp')
| -rw-r--r-- | embed/mozilla/MozillaPrivate.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp index aacb2c629..82dd5cd32 100644 --- a/embed/mozilla/MozillaPrivate.cpp +++ b/embed/mozilla/MozillaPrivate.cpp @@ -105,21 +105,21 @@ NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info, options->SetPrinterName(NS_LITERAL_STRING("PostScript/default").get()); - options->SetHeaderStrLeft(NS_ConvertUTF8toUCS2(info->header_left_string).get()); + options->SetHeaderStrLeft(NS_ConvertUTF8toUTF16(info->header_left_string).get()); - options->SetHeaderStrCenter(NS_ConvertUTF8toUCS2(info->header_center_string).get()); + options->SetHeaderStrCenter(NS_ConvertUTF8toUTF16(info->header_center_string).get()); - options->SetHeaderStrRight(NS_ConvertUTF8toUCS2(info->header_right_string).get()); + options->SetHeaderStrRight(NS_ConvertUTF8toUTF16(info->header_right_string).get()); - options->SetFooterStrLeft(NS_ConvertUTF8toUCS2(info->footer_left_string).get()); + options->SetFooterStrLeft(NS_ConvertUTF8toUTF16(info->footer_left_string).get()); - options->SetFooterStrCenter(NS_ConvertUTF8toUCS2(info->footer_center_string).get()); + options->SetFooterStrCenter(NS_ConvertUTF8toUTF16(info->footer_center_string).get()); - options->SetFooterStrRight(NS_ConvertUTF8toUCS2(info->footer_right_string).get()); + options->SetFooterStrRight(NS_ConvertUTF8toUTF16(info->footer_right_string).get()); - options->SetToFileName (NS_ConvertUTF8toUCS2(info->file).get()); + options->SetToFileName (NS_ConvertUTF8toUTF16(info->file).get()); - options->SetPrintCommand (NS_ConvertUTF8toUCS2(info->printer).get()); + options->SetPrintCommand (NS_ConvertUTF8toUTF16(info->printer).get()); /** * Work around a mozilla bug where paper size & orientation are ignored @@ -138,7 +138,7 @@ NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info, /* native paper size formats. Our dialog does not support custom yet */ options->SetPaperSize (nsIPrintSettings::kPaperSizeNativeData); - options->SetPaperName (NS_ConvertUTF8toUCS2(info->paper).get()); + options->SetPaperName (NS_ConvertUTF8toUTF16(info->paper).get()); options->SetPrintInColor (info->print_color); options->SetOrientation (info->orientation); |