133193 - "Mozilla Document" string hardcoded in nsDocumentViewer.cpp

Status: VERIFIED FIXED

(Core :: Printing: Output, defect, P2)

Description

[Hixie (not reading bugmail)]

STEPS TO REPRODUCE
   Look at the print progress dialog title when using a vendor-customised 
   version of Mozilla (e.g. Netscape commercial builds).
ACTUAL RESULTS
   It says "Mozilla Document"

EXPECTED RESULTS
   It should use whatever is in brand.properties, accessible via the string 
   bundle APIs. For example, "Netscape 6 Document".

The error is specifically here:
http://lxr.mozilla.org/seamonkey/source/content/base/src/nsDocumentViewer.cpp#2560

Comment 1

[rods (gone)]

Attachment: patch

Reads the "brnad name" property and then caches it so it can use it on
documents with no title.

Comment 2

[rods (gone)]

Attachment: patch

Note that the these two parts are in debug code:
@@ -2123,9 +2145,10 @@
@@ -2138,6 +2161,10 @@

Comment 3

[dcone (gone)]

Comment on attachment 76263 [details] [diff] [review]
patch

r=dcone

Comment 4

[Marc Attinasi]

Comment on attachment 76263 [details] [diff] [review]
patch

sr=attinasi

Comment 5

[Kevin McCluskey (gone)]

nsbeta1+

Comment 6

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 76263 [details] [diff] [review]
patch

a=dbaron for trunk checkin

A few comments, though:

>+                                    PRUnichar*        aBrandName,

This could be |const PRUnichar*| (and should be if you follow our
usual string conventions)

>+  nsXPIDLString uStr;
>+  nsCOMPtr<nsIStringBundleService> svc( do_GetService( NS_STRINGBUNDLE_CONTRACTID ) );
>+  if (svc) {
>+    svc->CreateBundle( "chrome://global/locale/brand.properties", getter_AddRefs( brandBundle ) );
>+    if (brandBundle) {
>+      brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), getter_Copies( uStr ) );
>+      mBrandName = ToNewUnicode(uStr);

There's no need for |uStr| here, and you could save a string-copy
and some code size with:

>nsCOMPtr<nsIStringBundleService> svc( do_GetService( NS_STRINGBUNDLE_CONTRACTID ) );
>if (svc) {
>  svc->CreateBundle( "chrome://global/locale/brand.properties", getter_AddRefs( brandBundle ) );
>  if (brandBundle) {
>    brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), &mBrandName );

Comment 7

[Kevin McCluskey (gone)]

Fix was checked in. Marking fixed.

Comment 8

[sujay]

ian, please verify...and mark verified-fixed..thanks

Comment 9

[rods (gone)]

verified