formatting cleanup for Cocoa printing impl. no bug. rs=roc
authorJosh Aas <joshmoz@gmail.com>
Wed, 24 Sep 2008 22:26:58 -0400
changeset 19670 e85f3b24d81a819cd4ed86a1326be16484b1afab
parent 19669 67c6e7d04d40fa1488d79250bf358a4179391a74
child 19671 5986b4269d9dd1e68119cbf4a11d0d524c07b2b6
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
milestone1.9.1b1pre
formatting cleanup for Cocoa printing impl. no bug. rs=roc
widget/src/cocoa/nsPrintOptionsX.h
widget/src/cocoa/nsPrintOptionsX.mm
widget/src/cocoa/nsPrintSessionX.h
widget/src/cocoa/nsPrintSessionX.mm
widget/src/cocoa/nsPrintSettingsX.h
widget/src/cocoa/nsPrintSettingsX.mm
--- a/widget/src/cocoa/nsPrintOptionsX.h
+++ b/widget/src/cocoa/nsPrintOptionsX.h
@@ -36,32 +36,23 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsPrintOptionsX_h_
 #define nsPrintOptionsX_h_
 
 #include "nsPrintOptionsImpl.h"
 
-
-//*****************************************************************************
-//***    nsPrintOptions
-//*****************************************************************************
-
 class nsPrintOptionsX : public nsPrintOptions
 {
 public:
-              nsPrintOptionsX();
-  virtual     ~nsPrintOptionsX();
-
-  NS_IMETHOD  ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings);
-  
-  NS_IMETHOD  GetNativeData(PRInt16 aDataType, void * *_retval);
+             nsPrintOptionsX();
+  virtual    ~nsPrintOptionsX();
+  NS_IMETHOD ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings);
+  NS_IMETHOD GetNativeData(PRInt16 aDataType, void * *_retval);
 
 protected:
-  nsresult    _CreatePrintSettings(nsIPrintSettings **_retval);
-
-  nsresult    ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags);
-  nsresult    WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags);
+  nsresult   _CreatePrintSettings(nsIPrintSettings **_retval);
+  nsresult   ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags);
+  nsresult   WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags);
 };
 
-
 #endif // nsPrintOptionsX_h_
--- a/widget/src/cocoa/nsPrintOptionsX.mm
+++ b/widget/src/cocoa/nsPrintOptionsX.mm
@@ -51,38 +51,16 @@ nsPrintOptionsX::nsPrintOptionsX()
 }
 
 
 nsPrintOptionsX::~nsPrintOptionsX()
 {
 }
 
 
-nsresult nsPrintOptionsX::_CreatePrintSettings(nsIPrintSettings **_retval)
-{
-  nsresult rv;
-  *_retval = nsnull;
-
-  nsPrintSettingsX* printSettings = new nsPrintSettingsX; // does not initially ref count
-  NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ADDREF(*_retval = printSettings); // ref count
-
-  rv = printSettings->Init();
-  if (NS_FAILED(rv)) {
-    NS_RELEASE(*_retval);
-    return rv;
-  }
-
-  (void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE,
-                                   nsIPrintSettings::kInitSaveAll);
-  return rv;
-}
-
-
 NS_IMETHODIMP
 nsPrintOptionsX::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 } 
 
 
 NS_IMETHODIMP
@@ -90,19 +68,16 @@ nsPrintOptionsX::GetNativeData(PRInt16 a
 {
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = nsnull;
 
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
-#pragma mark -
-
-
 nsresult
 nsPrintOptionsX::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags)
 {
   nsresult rv;
   
   rv = nsPrintOptions::ReadPrefs(aPS, aPrinterName, aFlags);
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::ReadPrefs() failed");
   
@@ -111,24 +86,44 @@ nsPrintOptionsX::ReadPrefs(nsIPrintSetti
     return NS_ERROR_NO_INTERFACE;
   rv = printSettingsX->ReadPageFormatFromPrefs();
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsIPrintSettingsX::ReadPageFormatFromPrefs() failed");
   
   return NS_OK;
 }
 
 
+nsresult nsPrintOptionsX::_CreatePrintSettings(nsIPrintSettings **_retval)
+{
+  nsresult rv;
+  *_retval = nsnull;
+
+  nsPrintSettingsX* printSettings = new nsPrintSettingsX; // does not initially ref count
+  NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
+  NS_ADDREF(*_retval = printSettings);
+
+  rv = printSettings->Init();
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(*_retval);
+    return rv;
+  }
+
+  InitPrintSettingsFromPrefs(*_retval, PR_FALSE, nsIPrintSettings::kInitSaveAll);
+  return rv;
+}
+
+
 nsresult
 nsPrintOptionsX::WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags)
 {
   nsresult rv;
-  
+
   rv = nsPrintOptions::WritePrefs(aPS, aPrinterName, aFlags);
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::WritePrefs() failed");
-  
+
   nsCOMPtr<nsIPrintSettingsX> printSettingsX(do_QueryInterface(aPS));
   if (!printSettingsX)
     return NS_ERROR_NO_INTERFACE;
   rv = printSettingsX->WritePageFormatToPrefs();
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsIPrintSettingsX::WritePageFormatToPrefs() failed");
-  
+
   return NS_OK;
 }
--- a/widget/src/cocoa/nsPrintSessionX.h
+++ b/widget/src/cocoa/nsPrintSessionX.h
@@ -37,29 +37,26 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsPrintSessionX_h_
 #define nsPrintSessionX_h_
 
 #include "nsPrintSession.h"
 #include "nsIPrintSessionX.h"
 
-//*****************************************************************************
-//***    nsPrintSessionX
-//*****************************************************************************
 
 class nsPrintSessionX : public nsPrintSession,
                         public nsIPrintSessionX
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPRINTSESSIONX
 
   nsPrintSessionX();
   virtual ~nsPrintSessionX();
-  
+
   nsresult Init();
-  
+
 protected:
-  PMPrintSession    mSession;
+  PMPrintSession mSession;
 };
 
 #endif // nsPrintSessionX_h_
--- a/widget/src/cocoa/nsPrintSessionX.mm
+++ b/widget/src/cocoa/nsPrintSessionX.mm
@@ -34,65 +34,60 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsPrintSessionX.h"
 #include "nsObjCExceptions.h"
 
-//*****************************************************************************
-//***    nsPrintSessionX
-//*****************************************************************************
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSessionX, 
                              nsPrintSession, 
                              nsIPrintSessionX)
                              
-//-----------------------------------------------------------------------------
 nsPrintSessionX::nsPrintSessionX()
 {
 }
 
-//-----------------------------------------------------------------------------
+
 nsPrintSessionX::~nsPrintSessionX()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   if (mSession) {
     ::PMRelease(mSession);
     mSession = nsnull;
   }
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
-//-----------------------------------------------------------------------------
+
 nsresult nsPrintSessionX::Init()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   nsresult rv = nsPrintSession::Init();
   if (NS_FAILED(rv))
     return rv;
-  
+
   OSStatus status = ::PMCreateSession(&mSession);
   if (status != noErr)
     return NS_ERROR_FAILURE;
-    
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-//-----------------------------------------------------------------------------
-/* readonly attribute nsPMPrintSession nativeSession; */
+
 NS_IMETHODIMP nsPrintSessionX::GetNativeSession(PMPrintSession *aNativeSession)
 {
   NS_ENSURE_ARG_POINTER(aNativeSession);
   *aNativeSession = nsnull;
-  
+
   if (!mSession)
     return NS_ERROR_NOT_INITIALIZED;
-    
+
   *aNativeSession = mSession;
   return NS_OK;
 }
--- a/widget/src/cocoa/nsPrintSettingsX.h
+++ b/widget/src/cocoa/nsPrintSettingsX.h
@@ -1,11 +1,10 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ -37,43 +36,38 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsPrintSettingsX_h_
 #define nsPrintSettingsX_h_
 
 #include "nsPrintSettingsImpl.h"  
 #include "nsIPrintSettingsX.h"  
 
-//*****************************************************************************
-//***    nsPrintSettingsX
-//*****************************************************************************
 
 class nsPrintSettingsX : public nsPrintSettings,
                          public nsIPrintSettingsX
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPRINTSETTINGSX
 
   nsPrintSettingsX();
   virtual ~nsPrintSettingsX();
-  
+
   nsresult Init();
 
 protected:
   nsPrintSettingsX(const nsPrintSettingsX& src);
   nsPrintSettingsX& operator=(const nsPrintSettingsX& rhs);
 
   nsresult _Clone(nsIPrintSettings **_retval);
   nsresult _Assign(nsIPrintSettings *aPS);
-  
-  /**
-   * Re-initialize mUnwriteableMargin with values from mPageFormat.
-   * Should be called whenever mPageFormat is initialized or overwritten.
-   */
+
+  // Re-initialize mUnwriteableMargin with values from mPageFormat.
+  // Should be called whenever mPageFormat is initialized or overwritten.
   nsresult InitUnwriteableMargin();
 
   // The out param has a ref count of 1 on return so caller needs to PMRelase() when done.
   OSStatus CreateDefaultPageFormat(PMPrintSession aSession, PMPageFormat& outFormat);
   OSStatus CreateDefaultPrintSettings(PMPrintSession aSession, PMPrintSettings& outSettings);
 
   PMPageFormat mPageFormat;
   PMPrintSettings mPrintSettings;
--- a/widget/src/cocoa/nsPrintSettingsX.mm
+++ b/widget/src/cocoa/nsPrintSettingsX.mm
@@ -43,33 +43,30 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsServiceManagerUtils.h"
 
 #include "plbase64.h"
 #include "prmem.h"
 #include "prnetdb.h"
 
+
 // This struct should be represented identically on all architectures, and
 // there shouldn't be any padding before the data field.
 struct FrozenHandle {
   PRUint32 size;
-  char     data[0];
+  char data[0];
 };
 
-// Constants
+
 #define PRINTING_PREF_BRANCH            "print."
 #define MAC_OS_X_PAGE_SETUP_PREFNAME    "macosx.pagesetup-2"
 
 
-
-/** ------------------------------------------------------------
- *	Utility class stack-based handle ownership
- */
-
+// Utility class stack-based handle ownership
 class StHandleOwner
 {
 public:
   StHandleOwner(Handle inHandle)
     : mHandle(inHandle)
   {
   }
 
@@ -93,29 +90,25 @@ public:
       ::DisposeHandle(mHandle);
 
     mHandle = nsnull;
 
     NS_OBJC_END_TRY_ABORT_BLOCK;
   }
 
 protected:
-
-  Handle            mHandle;
+  Handle mHandle;
 };
 
-/** ------------------------------------------------------------
- *	Utility class for saving, locking, and restoring handle state
- *  Ok with null handle
- */
 
+//	Utility class for saving, locking, and restoring handle state.
+//  Ok with null handle.
 class StHandleLocker
 {
 public:
-
   StHandleLocker(Handle theHandle)
     :	mHandle(theHandle)
   {
     NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
     if (mHandle) {
       mOldHandleState = ::HGetState(mHandle);
       ::HLock(mHandle);
@@ -130,63 +123,55 @@ public:
 
     if (mHandle)
       ::HSetState(mHandle, mOldHandleState);
 
     NS_OBJC_END_TRY_ABORT_BLOCK;
   }
 
 protected:
-
-  Handle          mHandle;
-  SInt8           mOldHandleState;
+  Handle mHandle;
+  SInt8 mOldHandleState;
 };
 
 
-NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsX, 
-                             nsPrintSettings, 
-                             nsIPrintSettingsX)
+NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsX, nsPrintSettings, nsIPrintSettingsX)
 
-/** ---------------------------------------------------
- */
 nsPrintSettingsX::nsPrintSettingsX() :
   mPageFormat(kPMNoPageFormat),
   mPrintSettings(kPMNoPrintSettings)
 {
 }
 
-/** ---------------------------------------------------
- */
+
 nsPrintSettingsX::nsPrintSettingsX(const nsPrintSettingsX& src) :
   mPageFormat(kPMNoPageFormat),
   mPrintSettings(kPMNoPrintSettings)
 {
   *this = src;
 }
 
-/** ---------------------------------------------------
- */
+
 nsPrintSettingsX::~nsPrintSettingsX()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   if (mPageFormat != kPMNoPageFormat) {
     ::PMRelease(mPageFormat);
     mPageFormat = kPMNoPageFormat;
   }
   if (mPrintSettings != kPMNoPrintSettings) {
     ::PMRelease(mPrintSettings);
     mPrintSettings = kPMNoPrintSettings;
   }
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
-/** ---------------------------------------------------
- */
+
 nsPrintSettingsX& nsPrintSettingsX::operator=(const nsPrintSettingsX& rhs)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   if (this == &rhs) {
     return *this;
   }
   
@@ -230,18 +215,17 @@ nsPrintSettingsX& nsPrintSettingsX::oper
     }
   }
 
   return *this;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(*this);
 }
 
-/** ---------------------------------------------------
- */
+
 nsresult nsPrintSettingsX::Init()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   OSStatus status;
 
   PMPrintSession printSession = NULL;
   status = ::PMCreateSession(&printSession);
@@ -259,73 +243,70 @@ nsresult nsPrintSettingsX::Init()
     if (status == noErr)
       status = tempStatus;
   }
   return (status == noErr) ? NS_OK : NS_ERROR_FAILURE;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
+
 // Should be called whenever mPageFormat changes.
 NS_IMETHODIMP nsPrintSettingsX::InitUnwriteableMargin()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  if (mPageFormat == kPMNoPageFormat) {
+  if (mPageFormat == kPMNoPageFormat)
     return NS_OK;
-  }
 
   PMPaper paper;
   PMPaperMargins paperMargin;
   ::PMGetPageFormatPaper(mPageFormat, &paper);
   ::PMPaperGetMargins(paper, &paperMargin);
   mUnwriteableMargin.top    = NS_POINTS_TO_TWIPS(paperMargin.top);
   mUnwriteableMargin.left   = NS_POINTS_TO_TWIPS(paperMargin.left);
   mUnwriteableMargin.bottom = NS_POINTS_TO_TWIPS(paperMargin.bottom);
   mUnwriteableMargin.right  = NS_POINTS_TO_TWIPS(paperMargin.right);
 
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;  
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::GetNativePrintSession(PMPrintSession *aNativePrintSession)
 {
    NS_ENSURE_ARG_POINTER(aNativePrintSession);
    *aNativePrintSession = nsnull;
    
    nsCOMPtr<nsIPrintSession> printSession;
    GetPrintSession(getter_AddRefs(printSession));
    if (!printSession)
     return NS_ERROR_FAILURE;
    nsCOMPtr<nsIPrintSessionX> printSessionX(do_QueryInterface(printSession));
    if (!printSession)
     return NS_ERROR_FAILURE;
 
    return printSessionX->GetNativeSession(aNativePrintSession);
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::GetPMPageFormat(PMPageFormat *aPMPageFormat)
 {
   NS_ENSURE_ARG_POINTER(aPMPageFormat);
   *aPMPageFormat = kPMNoPageFormat;
   NS_ENSURE_STATE(mPageFormat != kPMNoPageFormat);
   
   *aPMPageFormat = mPageFormat;
   OSStatus status = noErr;
   
   return (status == noErr) ? NS_OK : NS_ERROR_FAILURE;
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::SetPMPageFormat(PMPageFormat aPMPageFormat)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   NS_ENSURE_ARG(aPMPageFormat);
   
   OSStatus status = ::PMRetain(aPMPageFormat);
   if (status == noErr) {
@@ -334,31 +315,29 @@ NS_IMETHODIMP nsPrintSettingsX::SetPMPag
     mPageFormat = aPMPageFormat;
     InitUnwriteableMargin();
   }        
   return (status == noErr) ? NS_OK : NS_ERROR_FAILURE;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::GetPMPrintSettings(PMPrintSettings *aPMPrintSettings)
 {
   NS_ENSURE_ARG_POINTER(aPMPrintSettings);
   *aPMPrintSettings = kPMNoPrintSettings;
   NS_ENSURE_STATE(mPrintSettings != kPMNoPrintSettings);
   
   *aPMPrintSettings = mPrintSettings;
 
   return NS_OK;
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::SetPMPrintSettings(PMPrintSettings aPMPrintSettings)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   NS_ENSURE_ARG(aPMPrintSettings);
   
   OSStatus status = ::PMRetain(aPMPrintSettings);
   if (status == noErr) {
@@ -366,18 +345,17 @@ NS_IMETHODIMP nsPrintSettingsX::SetPMPri
       status = ::PMRelease(mPrintSettings);
     mPrintSettings = aPMPrintSettings;
   }        
   return (status == noErr) ? NS_OK : NS_ERROR_FAILURE;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::ReadPageFormatFromPrefs()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   nsresult rv;
   nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
   if (NS_FAILED(rv))
     return rv;
@@ -431,18 +409,17 @@ NS_IMETHODIMP nsPrintSettingsX::ReadPage
       InitUnwriteableMargin();
     }
   }
   return (status == noErr) ? NS_OK : NS_ERROR_FAILURE;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-/** ---------------------------------------------------
- */
+
 NS_IMETHODIMP nsPrintSettingsX::WritePageFormatToPrefs()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   if (mPageFormat == kPMNoPageFormat)
     return NS_ERROR_NOT_INITIALIZED;
     
   nsresult rv;
@@ -483,42 +460,41 @@ NS_IMETHODIMP nsPrintSettingsX::WritePag
   if (!encodedData.get())
     return NS_ERROR_OUT_OF_MEMORY;
 
   return prefBranch->SetCharPref(MAC_OS_X_PAGE_SETUP_PREFNAME, encodedData);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-//-------------------------------------------
+
 nsresult nsPrintSettingsX::_Clone(nsIPrintSettings **_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = nsnull;
   
   nsPrintSettingsX *newSettings = new nsPrintSettingsX(*this);
   if (!newSettings)
     return NS_ERROR_FAILURE;
   *_retval = newSettings;
   NS_ADDREF(*_retval);
   return NS_OK;
 }
 
 
-//-------------------------------------------
 NS_IMETHODIMP nsPrintSettingsX::_Assign(nsIPrintSettings *aPS)
 {
   nsPrintSettingsX *printSettingsX = static_cast<nsPrintSettingsX*>(aPS);
   if (!printSettingsX)
     return NS_ERROR_UNEXPECTED;
   *this = *printSettingsX;
   return NS_OK;
 }
 
-//-------------------------------------------
+
 OSStatus nsPrintSettingsX::CreateDefaultPageFormat(PMPrintSession aSession, PMPageFormat& outFormat)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   OSStatus status;
   PMPageFormat pageFormat;
   
   outFormat = kPMNoPageFormat;
@@ -529,18 +505,17 @@ OSStatus nsPrintSettingsX::CreateDefault
       outFormat = pageFormat;
       return NS_OK;
     }
   }
   return status;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(noErr);
 }
-  
-//-------------------------------------------
+
 
 OSStatus nsPrintSettingsX::CreateDefaultPrintSettings(PMPrintSession aSession, PMPrintSettings& outSettings)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   OSStatus status;
   PMPrintSettings printSettings;