Bug 797316 - Fix -Werror=conversion-null errors in Windows-only code (embedding/components/printingui part) r=ehsan

--HG--
extra : rebase_source : c68328d354d498c5d51ce85d79964eeaa88b18bd

embedding/components/printingui/src/win/nsPrintDialogUtil.cpp

@@ -409,7 +409,7 @@ static PropKeyInfo gAllPropKeys[] = {
     {"asLaidOutWindows", rad4},
     {"selectedFrameWindows", rad5},
     {"separateFramesWindows", rad6},
-    {NULL, NULL}};
+    {NULL, 0}};
 
 //--------------------------------------------------------
 //--------------------------------------------------------
@@ -883,7 +883,7 @@ ShowNativePrintDialog(HWND              aHWnd,
   prntdlg.lpPrintTemplateName = NULL;
 
   if (!ShouldExtendPrintDialog()) {
-    prntdlg.lCustData         = NULL;
+    prntdlg.lCustData         = 0;
     prntdlg.lpfnPrintHook     = NULL;
   } else {
     // Set up print dialog "hook" procedure for extending the dialog

embedding/components/printingui/src/win/nsPrintingPromptService.cpp

@@ -41,9 +41,6 @@ static const char *kPrintProgressDialogURL  = "chrome://global/content/printProg
 static const char *kPrtPrvProgressDialogURL = "chrome://global/content/printPreviewProgress.xul";
 static const char *kPageSetupDialogURL      = "chrome://global/content/printPageSetup.xul";
 
-// Static Data 
-static HINSTANCE gInstance;
-
 /****************************************************************
  ************************* ParamBlock ***************************
  ****************************************************************/
@@ -96,7 +93,6 @@ HWND
 nsPrintingPromptService::GetHWNDForDOMWindow(nsIDOMWindow *aWindow)
 {
     nsCOMPtr<nsIWebBrowserChrome> chrome;
-    HWND hWnd = NULL;
 
     // We might be embedded so check this path first
     if (mWatcher) {