diff --git a/gfx/src/gtk/nsFontMetricsGTK.cpp b/gfx/src/gtk/nsFontMetricsGTK.cpp index a5bab6d2c77..24648c2b299 100644 --- a/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -23,6 +23,7 @@ * Pierre Phaneuf * Roland Mainz * Brian Stell + * Morten Nilsen * * * Alternatively, the contents of this file may be used under the terms of @@ -52,6 +53,7 @@ #include "nsISaveAsCharset.h" #include "nsIPref.h" #include "nsCOMPtr.h" +#include "nsPrintfCString.h" #include "nspr.h" #include "nsHashtable.h" #include "nsReadableUtils.h" @@ -1879,7 +1881,7 @@ SetUpFontCharSetInfo(nsFontCharSetInfo* aSelf) if (mapper) { aSelf->mCCMap = MapperToCCMap(mapper); if (aSelf->mCCMap) { - DEBUG_PRINTF(("\n\ncharset = %s", atomToName(charset))); + NS_WARNING(nsPrintfCString("\n\ncharset = %s", atomToName(charset)).get()); /* * We used to disable special characters like smart quotes diff --git a/intl/uconv/public/nsICharsetConverterManager.h b/intl/uconv/public/nsICharsetConverterManager.h index e761a11bd3c..f888740dc78 100644 --- a/intl/uconv/public/nsICharsetConverterManager.h +++ b/intl/uconv/public/nsICharsetConverterManager.h @@ -20,6 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Morten Nilsen * * * Alternatively, the contents of this file may be used under the terms of @@ -71,11 +72,8 @@ #define REGSELF_PRINTF(x,y) \ printf("RegSelf %s to %s converter complete\n", \ x, y) -#define UCONV_DEBUG_PRINTF(x) \ - printf(x) #else #define REGSELF_PRINTF(x,y) -#define UCONV_DEBUG_PRINTF(x) #endif #define NS_IMPL_NSUCONVERTERREGSELF \ @@ -136,8 +134,8 @@ _InstanceClass##UnRegSelf (nsIComponentManager *aCompMgr, \ const char* registryLocation, \ const nsModuleComponentInfo *info) \ { \ - UCONV_DEBUG_PRINTF("UnRegSelf " _From " to " _To "converter not implement\n"); \ - return NS_OK; \ + NS_WARNING("UnRegSelf " _From " to " _To "converter not implemented\n"); \ + return NS_ERROR_NOT_IMPLEMENTED; \ } /** diff --git a/widget/src/gtk/nsKeyboardUtils.cpp b/widget/src/gtk/nsKeyboardUtils.cpp index 87c31ee614f..27dcd3cc6b1 100644 --- a/widget/src/gtk/nsKeyboardUtils.cpp +++ b/widget/src/gtk/nsKeyboardUtils.cpp @@ -32,6 +32,7 @@ #include "nsKeyboardUtils.h" #include "nspr.h" #include "nsWindow.h" +#include "nsPrintfCString.h" // // xkbms: X KeyBoard Mode Switch @@ -58,20 +59,6 @@ // application to filter events with a non-null window // -#undef DEBUG_X_KEYBOARD_MODE_SWITCH -#ifdef DEBUG_X_KEYBOARD_MODE_SWITCH -#define DEBUG_PRINTF(x) \ - PR_BEGIN_MACRO \ - printf x ; \ - printf(", %s %d\n", __FILE__, __LINE__); \ - PR_END_MACRO -#else -#define DEBUG_PRINTF(x) \ - PR_BEGIN_MACRO \ - PR_END_MACRO -#endif - - // Xlib should define this! #define MODIFIERMAP_ROW_SIZE 8 @@ -88,11 +75,9 @@ void nsXKBModeSwitch::ControlWorkaround(gboolean grab_during_popup, gboolean ungrab_during_mode_switch) { - DEBUG_PRINTF(("nsXKBModeSwitch::ControlWorkaround:")); - DEBUG_PRINTF((" grab_during_popup = %d", - grab_during_popup)); - DEBUG_PRINTF((" ungrab_during_mode_switch = %d", - ungrab_during_mode_switch)); + NS_WARNING("nsXKBModeSwitch::ControlWorkaround:"); + NS_WARNING(nsPrintfCString(" grab_during_popup = %d", grab_during_popup).get()); + NS_WARNING(nsPrintfCString(" ungrab_during_mode_switch = %d", ungrab_during_mode_switch).get()); gGrabDuringPopup = grab_during_popup; gUnGrabDuringModeSwitch = ungrab_during_mode_switch; @@ -164,11 +149,11 @@ nsXKBModeSwitch::HandleMappingNotify() XFreeModifiermap(xmodmap); if (!gModeSwitchKeycode1) { - DEBUG_PRINTF(("\n\nnsXKBModeSwitch::HandleMappingNotify: no Mode_switch\n\n")); + NS_WARNING("\n\nnsXKBModeSwitch::HandleMappingNotify: no Mode_switch\n\n"); } - DEBUG_PRINTF(("\n\nnsXKBModeSwitch::HandleMappingNotify:")); - DEBUG_PRINTF((" gModeSwitchKeycode1 = %d", gModeSwitchKeycode1)); - DEBUG_PRINTF((" gModeSwitchKeycode2 = %d", gModeSwitchKeycode2)); + NS_WARNING("\n\nnsXKBModeSwitch::HandleMappingNotify:"); + NS_WARNING(nsPrintfCString(" gModeSwitchKeycode1 = %d", gModeSwitchKeycode1).get()); + NS_WARNING(nsPrintfCString(" gModeSwitchKeycode2 = %d", gModeSwitchKeycode2).get()); #if defined(HAVE_X11_XKBLIB_H) && \ defined(XkbMajorVersion) && defined(XbMinorVersion) @@ -207,14 +192,14 @@ nsXKBModeSwitch::HandleKeyPress(XKeyEvent *xke) if ((xke->keycode == gModeSwitchKeycode1) || (xke->keycode == gModeSwitchKeycode2)) { gModeSwitchDown = TRUE; - DEBUG_PRINTF(("nsXKBModeSwitch::HandleKeyPress: Mode_switch is down")); + NS_WARNING("nsXKBModeSwitch::HandleKeyPress: Mode_switch is down"); nsWindow *win = nsWindow::GetGrabWindow(); if (!win) return; if (win->GrabInProgress()) { if (gUnGrabDuringModeSwitch) { gdk_keyboard_ungrab(GDK_CURRENT_TIME); - DEBUG_PRINTF(("\n\n*** ungrab keyboard ***\n\n")); + NS_WARNING("\n\n*** ungrab keyboard ***\n\n"); } } } @@ -232,7 +217,7 @@ nsXKBModeSwitch::HandleKeyRelease(XKeyEvent *xke) if ((xke->keycode == gModeSwitchKeycode1) || (xke->keycode == gModeSwitchKeycode2)) { gModeSwitchDown = FALSE; - DEBUG_PRINTF(("nsXKBModeSwitch::HandleKeyPress: Mode_switch is up")); + NS_WARNING("nsXKBModeSwitch::HandleKeyPress: Mode_switch is up"); nsWindow *win = nsWindow::GetGrabWindow(); if (!win) return; @@ -241,7 +226,7 @@ nsXKBModeSwitch::HandleKeyRelease(XKeyEvent *xke) if (!win->GetGdkGrabWindow()) return; gdk_keyboard_grab(win->GetGdkGrabWindow(), gOwnerEvents, gGrabTime); - DEBUG_PRINTF(("\n\n*** re-grab keyboard ***\n\n")); + NS_WARNING("\n\n*** re-grab keyboard ***\n\n"); } } } diff --git a/xpfe/components/find/src/nsFindComponent.cpp b/xpfe/components/find/src/nsFindComponent.cpp index aacdcb3edc9..e69de29bb2d 100644 --- a/xpfe/components/find/src/nsFindComponent.cpp +++ b/xpfe/components/find/src/nsFindComponent.cpp @@ -1,721 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Pierre Phaneuf - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIFindComponent.h" - -#include "nsCOMPtr.h" -#include "nsString.h" -#include "nsReadableUtils.h" -#include "pratom.h" -#include "prio.h" -#include "prprf.h" - -#include "nsIDOMDocument.h" -#include "nsIDocument.h" -#include "nsITextServicesDocument.h" -#include "nsTextServicesCID.h" -#include "nsIDocShell.h" -#include "nsIPresShell.h" -#include "nsIContent.h" -#include "nsIDOMWindowInternal.h" - -#include "nsIURL.h" - -#include "nsIServiceManager.h" -#include "nsIScriptGlobalObject.h" -#include "nsISupportsPrimitives.h" - -#include "nsISound.h" -#include "nsWidgetsCID.h" // ugh! contractID, please - -#include "nsFindComponent.h" -#include "nsIFindAndReplace.h" -#include "nsIEditor.h" - -#include "nsIGenericFactory.h" - -#ifdef DEBUG -#define DEBUG_FIND -#define DEBUG_PRINTF PR_fprintf -#else -#define DEBUG_PRINTF (void) -#endif - - -/* - - Warning: this code is soon to become obsolete. The Find code has moved - into mozilla/embedding/components/find, and is now shared between - embedding apps and mozilla. - - This code remains because editor needs its find and replace functionality, - for now. - - Simon Fraser sfraser@netscape.com - -*/ - - -nsFindComponent::Context::Context() -{ - NS_INIT_REFCNT(); - // all our other members are self-initiating -} - - -nsFindComponent::Context::~Context() -{ - #ifdef DEBUG_law - printf( "\nnsFindComponent::Context destructor called\n\n" ); - #endif - - // Close the dialog (if there is one). - if ( mFindDialog ) { - mFindDialog->Close(); - mFindDialog = 0; - } - - // Close the dialog (if there is one). - if ( mReplaceDialog ) { - mReplaceDialog->Close(); - mReplaceDialog = 0; - } -} - -// nsFindComponent::Context implementation... -NS_IMPL_ISUPPORTS1( nsFindComponent::Context, nsISearchContext) - -NS_IMETHODIMP -nsFindComponent::Context::Init( nsIDOMWindowInternal *aWindow, - nsIEditorShell* aEditorShell, - const nsString& lastSearchString, - const nsString& lastReplaceString, - PRBool lastCaseSensitive, - PRBool lastSearchBackward, - PRBool lastWrapSearch) -{ - if (!aWindow) - return NS_ERROR_INVALID_ARG; - - mEditorShell = aEditorShell; // don't AddRef - mTargetWindow = aWindow; // don't AddRef - mSearchString = lastSearchString; - mReplaceString = lastReplaceString; - mCaseSensitive = lastCaseSensitive; - mSearchBackwards = lastSearchBackward; - mWrapSearch = lastWrapSearch; - mFindDialog = 0; - mReplaceDialog = 0; - - nsresult rv = NS_OK; - mTSFind = do_CreateInstance(NS_FINDANDREPLACE_CONTRACTID, &rv); - - return rv; -} - - -static NS_DEFINE_CID(kCTextServicesDocumentCID, NS_TEXTSERVICESDOCUMENT_CID); - - -NS_IMETHODIMP -nsFindComponent::Context::MakeTSDocument(nsIDOMWindowInternal* aWindow, nsITextServicesDocument** aDoc) -{ - if (!aWindow) - return NS_ERROR_INVALID_ARG; - - if (!aDoc) - return NS_ERROR_NULL_POINTER; - - *aDoc = NULL; - - // Create the text services document. - nsCOMPtr tempDoc; - nsresult rv = nsComponentManager::CreateInstance(kCTextServicesDocumentCID, - nsnull, - NS_GET_IID(nsITextServicesDocument), - getter_AddRefs(tempDoc)); - if (NS_FAILED(rv) || !tempDoc) - return rv; - - if (mEditorShell) - { - nsCOMPtr editor; - rv = mEditorShell->GetEditor(getter_AddRefs(editor)); - if (NS_FAILED(rv)) - return rv; - if (!editor) - return NS_ERROR_FAILURE; - rv = tempDoc->InitWithEditor(editor); - if (NS_FAILED(rv)) - return rv; - } - else - { - nsCOMPtr globalObj = do_QueryInterface(aWindow, &rv); - if (NS_FAILED(rv) || !globalObj) - return NS_ERROR_FAILURE; - - nsCOMPtr docShell; - globalObj->GetDocShell(getter_AddRefs(docShell)); - if (!docShell) - return NS_ERROR_FAILURE; - - nsCOMPtr presShell; - docShell->GetPresShell(getter_AddRefs(presShell)); - if (!presShell) - return NS_ERROR_FAILURE; - - nsCOMPtr document; - presShell->GetDocument(getter_AddRefs(document)); - nsCOMPtr domDoc = do_QueryInterface(document); - if (!domDoc) - return NS_ERROR_FAILURE; - - // Initialize the text services document. - rv = tempDoc->InitWithDocument(domDoc, presShell); - if (NS_FAILED(rv)) - return rv; - } - - // Return the resulting text services document. - *aDoc = tempDoc; - NS_IF_ADDREF(*aDoc); - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::DoFind(PRBool *aDidFind) -{ - if (!aDidFind) - return NS_ERROR_NULL_POINTER; - - *aDidFind = PR_FALSE; - - if (!mTargetWindow) - return NS_ERROR_NOT_INITIALIZED; - - nsresult rv = NS_OK; - - // Construct a text services document to use. This is freed when we - // return from this function. - nsCOMPtr txtDoc; - rv = MakeTSDocument(mTargetWindow, getter_AddRefs(txtDoc)); - if (NS_FAILED(rv) || !txtDoc) - return rv; - - if (!mTSFind) - return NS_ERROR_NOT_INITIALIZED; - - rv = mTSFind->SetCaseSensitive(mCaseSensitive); - rv = mTSFind->SetFindBackwards(mSearchBackwards); - rv = mTSFind->SetWrapFind(mWrapSearch); - - rv = mTSFind->SetTsDoc(txtDoc); - if (NS_FAILED(rv)) - return rv; - - rv = mTSFind->Find(mSearchString.get(), aDidFind); - - mTSFind->SetTsDoc(nsnull); - - return rv; -} - - -NS_IMETHODIMP -nsFindComponent::Context::DoReplace(PRBool aAllOccurrences, PRBool *aDidFind) -{ - if (!mTargetWindow) - return NS_ERROR_NOT_INITIALIZED; - - if (!aDidFind) - return NS_ERROR_NULL_POINTER; - - *aDidFind = PR_FALSE; - - nsresult rv = NS_OK; - - // Construct a text services document to use. This is freed when we - // return from this function. - nsCOMPtr txtDoc; - rv = MakeTSDocument(mTargetWindow, getter_AddRefs(txtDoc)); - if (NS_FAILED(rv) || !txtDoc) - return rv; - - if (!mTSFind) - return NS_ERROR_NOT_INITIALIZED; - - rv = mTSFind->SetCaseSensitive(mCaseSensitive); - rv = mTSFind->SetFindBackwards(mSearchBackwards); - rv = mTSFind->SetWrapFind(mWrapSearch); - - rv = mTSFind->SetTsDoc(txtDoc); - if (NS_FAILED(rv)) - return rv; - - rv = mTSFind->Replace(mSearchString.get(), - mReplaceString.get(), - aAllOccurrences, aDidFind); - - mTSFind->SetTsDoc(nsnull); - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::Reset( nsIDOMWindowInternal *aNewWindow ) -{ - if (!aNewWindow) - return NS_ERROR_INVALID_ARG; - - mTargetWindow = aNewWindow; // don't AddRef - return NS_OK; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetSearchString(PRUnichar * *aSearchString) { - nsresult rv = NS_OK; - if ( aSearchString ) { - *aSearchString = ToNewUnicode(mSearchString); - if ( !*aSearchString ) { - rv = NS_ERROR_OUT_OF_MEMORY; - } - } else { - rv = NS_ERROR_NULL_POINTER; - } - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetSearchString(const PRUnichar *aSearchString) { - nsresult rv = NS_OK; - mSearchString = aSearchString ? nsString( aSearchString ) : nsString(); - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetReplaceString(PRUnichar * *aReplaceString) { - nsresult rv = NS_OK; - if ( aReplaceString ) { - *aReplaceString = ToNewUnicode(mReplaceString); - if ( !*aReplaceString ) { - rv = NS_ERROR_OUT_OF_MEMORY; - } - } else { - rv = NS_ERROR_NULL_POINTER; - } - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetReplaceString(const PRUnichar *aReplaceString) { - nsresult rv = NS_OK; - mReplaceString = aReplaceString ? nsString( aReplaceString ) : nsString(); - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetSearchBackwards(PRBool *aBool) { - nsresult rv = NS_OK; - if ( aBool ) { - *aBool = mSearchBackwards; - } else { - rv = NS_ERROR_NULL_POINTER; - } - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetSearchBackwards(PRBool aBool) { - nsresult rv = NS_OK; - mSearchBackwards = aBool; - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetCaseSensitive(PRBool *aBool) { - nsresult rv = NS_OK; - if ( aBool ) { - *aBool = mCaseSensitive; - } else { - rv = NS_ERROR_NULL_POINTER; - } - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetCaseSensitive(PRBool aBool) { - nsresult rv = NS_OK; - mCaseSensitive = aBool; - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetWrapSearch(PRBool *aBool) { - nsresult rv = NS_OK; - if ( aBool ) { - *aBool = mWrapSearch; - } else { - rv = NS_ERROR_NULL_POINTER; - } - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetWrapSearch(PRBool aBool) -{ - nsresult rv = NS_OK; - mWrapSearch = aBool; - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetTargetWindow( nsIDOMWindowInternal * *aWindow) -{ - NS_ENSURE_ARG_POINTER(aWindow); - NS_IF_ADDREF(*aWindow = mTargetWindow); - return NS_OK; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetFindDialog( nsIDOMWindowInternal * *aDialog) -{ - NS_ENSURE_ARG_POINTER(aDialog); - NS_IF_ADDREF(*aDialog = mFindDialog); - return NS_OK; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetFindDialog( nsIDOMWindowInternal *aDialog ) -{ - mFindDialog = aDialog; - return NS_OK; -} - -NS_IMETHODIMP -nsFindComponent::Context::GetReplaceDialog( nsIDOMWindowInternal * *aDialog) -{ - NS_ENSURE_ARG_POINTER(aDialog); - NS_IF_ADDREF(*aDialog = mReplaceDialog); - return NS_OK; -} - -NS_IMETHODIMP -nsFindComponent::Context::SetReplaceDialog( nsIDOMWindowInternal *aDialog ) -{ - mReplaceDialog = aDialog; - return NS_OK; -} - -#ifdef XP_MAC -#pragma mark - -#endif - - -/* - - Warning: this code is soon to become obsolete. The Find code has moved - into mozilla/embedding/components/find, and is now shared between - embedding apps and mozilla. - - This code remains because editor needs its find and replace functionality, - for now. - - Simon Fraser sfraser@netscape.com - -*/ - - - -// ctor -nsFindComponent::nsFindComponent() - : mLastSearchString(), - mLastCaseSensitive( PR_FALSE ), - mLastSearchBackwards( PR_FALSE ), - mLastWrapSearch( PR_FALSE ) -{ - NS_INIT_REFCNT(); - - // Initialize "last" stuff from prefs, if we wanted to be really clever... -} - -NS_IMPL_ISUPPORTS1(nsFindComponent, nsIFindComponent) - -// dtor -nsFindComponent::~nsFindComponent() -{ -} - -NS_IMETHODIMP -nsFindComponent::CreateContext( nsIDOMWindowInternal *aWindow, nsIEditorShell* aEditorShell, - nsISupports **aResult ) -{ - - if (!aResult) - return NS_ERROR_NULL_POINTER; - - // Construct a new Context with this document. - Context *newContext = new Context(); - if (!newContext) - return NS_ERROR_OUT_OF_MEMORY; - - // Do the expected AddRef on behalf of caller. - newContext->AddRef(); - - nsresult rv = newContext->Init( aWindow, - aEditorShell, - mLastSearchString, - mLastReplaceString, - mLastCaseSensitive, - mLastSearchBackwards, - mLastWrapSearch); - if (NS_FAILED(rv)) - { - NS_RELEASE(newContext); - return rv; - } - - *aResult = newContext; - return NS_OK; -} - -static nsresult -OpenDialogWithArg(nsIDOMWindowInternal *parent, nsISearchContext *arg, - const char *url) -{ - nsresult rv = NS_OK; - - if (parent && arg && url) { - nsCOMPtr ifptr = - do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - ifptr->SetData(arg); - ifptr->SetDataIID(&NS_GET_IID(nsISearchContext)); - - nsCOMPtr newWindow; - rv = parent->OpenDialog(NS_ConvertASCIItoUCS2(url), - NS_LITERAL_STRING("_blank"), - NS_LITERAL_STRING("chrome,resizable=no,dependent=yes"), - ifptr, getter_AddRefs(newWindow)); - } - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Find(nsISupports *aContext, PRBool *aDidFind) -{ - nsresult rv = NS_OK; - - // See if find dialog is already up. - if ( aContext ) { - nsCOMPtr context = do_QueryInterface( aContext, &rv ); - if ( NS_SUCCEEDED( rv ) && context ) { - nsCOMPtr dialog; - rv = context->GetFindDialog( getter_AddRefs( dialog ) ); - if ( NS_SUCCEEDED( rv ) && dialog ) { - // Just give focus back to the dialog. - dialog->Focus(); - return NS_OK; - } - } - // Test for error (GetFindDialog succeeds if there's no dialog). - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Error getting find dialog, rv=0x%08X\n", - __FILE__, (int)__LINE__, (int)rv ); - return rv; - } - } - - if (aContext) - { - nsCOMPtr context = do_QueryInterface( aContext, &rv ); - if (NS_FAILED(rv)) - return rv; - - // Open Find dialog and prompt for search parameters. - const char urlStr[] = "chrome://global/content/finddialog.xul"; - - // We need the parent's nsIDOMWindowInternal... - // 1. Get topLevelWindow nsIWebShellContainer (chrome included). - nsCOMPtr window; - rv = context->GetTargetWindow( getter_AddRefs( window ) ); - if ( NS_SUCCEEDED( rv ) && window ) - { - nsCOMPtr topWindow; - window->GetTop(getter_AddRefs(topWindow)); - if (topWindow) { - nsCOMPtr topInternal = do_QueryInterface(topWindow); - rv = OpenDialogWithArg(topInternal, context, urlStr); - } - } - } else { - rv = NS_ERROR_NULL_POINTER; - } - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::FindNext(nsISupports *aContext, PRBool *aDidFind) -{ - nsresult rv = NS_OK; - - if (!aContext) - return NS_ERROR_NULL_POINTER; - - Context *context = (Context*)aContext; - - // If we haven't searched yet, put up dialog (via Find). - if ( context->mSearchString.IsEmpty() ) { - return this->Find( aContext, aDidFind ); - } - - context->DoFind(aDidFind); - - // Record this for out-of-the-blue FindNext calls. - mLastSearchString = context->mSearchString; - mLastCaseSensitive = context->mCaseSensitive; - mLastSearchBackwards = context->mSearchBackwards; - mLastWrapSearch = context->mWrapSearch; - - if (!*aDidFind) - { - static NS_DEFINE_IID(kSoundCID, NS_SOUND_CID); - nsCOMPtr sound = do_CreateInstance(kSoundCID); - if (sound) - sound->Beep(); - } - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::Replace( nsISupports *aContext ) -{ - nsresult rv = NS_OK; - - // See if replace dialog is already up. - if ( aContext ) { - nsCOMPtr context = do_QueryInterface( aContext, &rv ); - if ( NS_SUCCEEDED( rv ) && context ) { - nsCOMPtr dialog; - rv = context->GetReplaceDialog( getter_AddRefs( dialog ) ); - if ( NS_SUCCEEDED( rv ) && dialog ) { - // Just give focus back to the dialog. - dialog->Focus(); - return NS_OK; - } - } - // Test for error (GetReplaceDialog succeeds if there's no dialog). - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Error getting replace dialog, rv=0x%08X\n", - __FILE__, (int)__LINE__, (int)rv ); - return rv; - } - } - - if (aContext) - { - nsCOMPtr context = do_QueryInterface( aContext, &rv ); - if (NS_FAILED(rv)) - return rv; - - // Open Replace dialog and prompt for search parameters. - const char urlStr[] = "chrome://global/content/replacedialog.xul"; - - // We need the parent's nsIDOMWindowInternal... - // 1. Get topLevelWindow nsIWebShellContainer (chrome included). - nsCOMPtr window; - rv = context->GetTargetWindow( getter_AddRefs( window ) ); - if ( NS_SUCCEEDED( rv ) && window ) - { - nsCOMPtr topWindow; - window->GetTop(getter_AddRefs(topWindow)); - if (topWindow) { - nsCOMPtr topInternal = do_QueryInterface(topWindow); - rv = OpenDialogWithArg(topInternal, context, urlStr); - } - } - } else { - rv = NS_ERROR_NULL_POINTER; - } - - return rv; -} - -NS_IMETHODIMP -nsFindComponent::ReplaceNext( nsISupports *aContext, PRBool aAllOccurrences, PRBool *aDidFind ) -{ - if (!aContext) - return NS_ERROR_NULL_POINTER; - - Context *context = (Context*)aContext; - - if (!context) - return NS_ERROR_FAILURE; - - nsresult rv = context->DoReplace(aAllOccurrences, aDidFind); - - // Record this for out-of-the-blue FindNext calls. - mLastSearchString = context->mSearchString; - mLastCaseSensitive = context->mCaseSensitive; - mLastSearchBackwards = context->mSearchBackwards; - mLastWrapSearch = context->mWrapSearch; - - return rv; -} - - -NS_IMETHODIMP -nsFindComponent::ResetContext( nsISupports *aContext, - nsIDOMWindowInternal *aNewWindow, - nsIEditorShell* aEditorShell ) -{ - NS_ENSURE_ARG(aContext); - NS_ENSURE_ARG(aNewWindow); - - // Pass on the new document to the context. - Context *context = (Context*)aContext; - context->Reset(aNewWindow); - - return NS_OK; -} - diff --git a/xpfe/components/xfer/src/nsStreamXferOp.cpp b/xpfe/components/xfer/src/nsStreamXferOp.cpp index ad36f33f329..bf9bb3bcfb4 100644 --- a/xpfe/components/xfer/src/nsStreamXferOp.cpp +++ b/xpfe/components/xfer/src/nsStreamXferOp.cpp @@ -21,6 +21,7 @@ * * Contributor(s): * Pierre Phaneuf + * Morten Nilsen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -63,12 +64,6 @@ #include "nsIStringBundle.h" static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -#ifdef NS_DEBUG -#define DEBUG_PRINTF PR_fprintf -#else -#define DEBUG_PRINTF (void) -#endif - #ifdef USE_ASYNC_READ NS_IMPL_ISUPPORTS5(nsStreamXferOp, nsIStreamListener, nsIRequestObserver, nsIStreamTransferOperation, nsIProgressEventSink, nsIInterfaceRequestor); #else @@ -145,10 +140,7 @@ nsStreamXferOp::OnError( int operation, nsresult errorCode ) { rv = mObserver->Observe( (nsIStreamTransferOperation*)this, NS_ISTREAMTRANSFER_CONTRACTID ";onError", NS_ConvertASCIItoUCS2( buf ).get() ); - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Observe failed, rv=0x%08X\n", - (char*)__FILE__, (int)__LINE__, (int)rv ); - } + NS_ASSERTION(NS_SUCCEEDED(rv), "Observe failed"); } return rv; @@ -277,8 +269,7 @@ nsStreamXferOp::OnStartRequest(nsIRequest *request, nsISupports* aContext) { nsresult rv = NS_OK; #ifdef DEBUG_law - DEBUG_PRINTF( PR_STDOUT, "nsStreamXferOp::OnStartRequest; request=0x%08X, context=0x%08X\n", - (int)(void*)request, (int)(void*)aContext ); + NS_WARNING(nsPrintfCString("nsStreamXferOp::OnStartRequest; request=0x%08X, context=0x%08X\n",(int)(void*)request, (int)(void*)aContext).get()); #endif #ifdef USE_ASYNC_READ @@ -407,10 +398,7 @@ nsStreamXferOp::OnProgress(nsIRequest *request, nsISupports* aContext, rv = mObserver->Observe( (nsIStreamTransferOperation*)this, NS_ISTREAMTRANSFER_CONTRACTID ";onProgress", NS_ConvertASCIItoUCS2( buf ).get() ); - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Observe failed, rv=0x%08X\n", - (char*)__FILE__, (int)__LINE__, (int)rv ); - } + NS_ASSERTION(NS_SUCCEEDED(rv), "Observe failed"); } return rv; @@ -436,10 +424,7 @@ nsStreamXferOp::OnStatus( nsIRequest *request, rv = mObserver->Observe( (nsIStreamTransferOperation*)this, NS_ISTREAMTRANSFER_CONTRACTID ";onStatus", msg.get() ); - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Observe failed, rv=0x%08X\n", - (char*)__FILE__, (int)__LINE__, (int)rv ); - } + NS_ASSERTION(NS_SUCCEEDED(rv), "Observe failed"); } return rv; @@ -546,10 +531,7 @@ nsStreamXferOp::OnStopRequest( nsIRequest *request, rv = kungFuDeathGrip->Observe( (nsIStreamTransferOperation*)this, NS_ISTREAMTRANSFER_CONTRACTID ";onCompletion", nsnull ); - if ( NS_FAILED( rv ) ) { - DEBUG_PRINTF( PR_STDOUT, "%s %d: Observe failed, rv=0x%08X\n", - (char*)__FILE__, (int)__LINE__, (int)rv ); - } + NS_ASSERTION(NS_SUCCEEDED(rv), "Observe failed"); } return rv;