Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Static build bustage fix

Browse Source
This commit is contained in:
rods%netscape.com 2002-05-14 14:15:19 +00:00
parent 93ac2ed60b
commit 517bc877a1
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/base/src/nsDocumentViewer.cpp
View File

@ -133,8 +133,8 @@
static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
// PrintOptions is now implemented by PrintSettingsService
const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
// Printing Events
#include "nsIEventQueue.h"
@ -8236,7 +8236,6 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
nsresult rv = NS_ERROR_FAILURE;
//nsCOMPtr<nsIPrintOptions> printSettingsService = do_GetService(kPrintOptionsCID, &rv);
nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);

2
embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
View File

@ -55,7 +55,7 @@
#include "nsIPrintOptions.h"
#include "nsIServiceManager.h"
#include "nsGfxCIID.h"
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char *kPrintDialogURL = "chrome://global/content/printdialog.xul";
static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul";

2
gfx/src/nsPrintOptionsImpl.cpp
View File

@ -1172,7 +1172,7 @@ public:
};
Tester::Tester()
{
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
nsCOMPtr<nsIPrintSettings> ps;
nsresult rv;
nsCOMPtr<nsIPrintOptions> printService = do_GetService(kPrintOptionsCID, &rv);

5
layout/base/nsDocumentViewer.cpp
View File

@ -133,8 +133,8 @@
static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
// PrintOptions is now implemented by PrintSettingsService
const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
// Printing Events
#include "nsIEventQueue.h"
@ -8236,7 +8236,6 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
nsresult rv = NS_ERROR_FAILURE;
//nsCOMPtr<nsIPrintOptions> printSettingsService = do_GetService(kPrintOptionsCID, &rv);
nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);

3
layout/generic/nsSimplePageSequence.cpp
View File

@ -80,7 +80,8 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
#include "nsIPrintOptions.h"
#include "nsGfxCIID.h"
#include "nsIServiceManager.h"
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
//
static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);

3
layout/html/base/src/nsSimplePageSequence.cpp
View File

@ -80,7 +80,8 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
#include "nsIPrintOptions.h"
#include "nsGfxCIID.h"
#include "nsIServiceManager.h"
const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
//
static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);