diff --git a/editor/base/nsEditorEventListeners.cpp b/editor/base/nsEditorEventListeners.cpp index 88c1c312b500..edc79678245c 100644 --- a/editor/base/nsEditorEventListeners.cpp +++ b/editor/base/nsEditorEventListeners.cpp @@ -1139,7 +1139,6 @@ nsTextEditorDragListener::HandleEvent(nsIDOMEvent* aEvent) nsresult nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) { -#ifdef NEW_DRAG_AND_DROP nsIDragService* dragService; nsresult rv = nsServiceManager::GetService(kCDragServiceCID, nsIDragService::GetIID(), @@ -1155,7 +1154,7 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } -#endif + return NS_OK; } @@ -1163,7 +1162,6 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { -#ifdef NEW_DRAG_AND_DROP nsIDragService* dragService; nsresult rv = nsServiceManager::GetService(kCDragServiceCID, nsIDragService::GetIID(), @@ -1177,7 +1175,7 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } -#endif + return NS_OK; } @@ -1193,8 +1191,6 @@ nsTextEditorDragListener::DragExit(nsIDOMEvent* aDragEvent) nsresult nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) { - -#ifdef NEW_DRAG_AND_DROP // String for doing paste nsString stuffToPaste; @@ -1255,8 +1251,6 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } // if valid drag service -#endif - return NS_OK; } diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp index 88c1c312b500..edc79678245c 100644 --- a/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/editor/libeditor/text/nsEditorEventListeners.cpp @@ -1139,7 +1139,6 @@ nsTextEditorDragListener::HandleEvent(nsIDOMEvent* aEvent) nsresult nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) { -#ifdef NEW_DRAG_AND_DROP nsIDragService* dragService; nsresult rv = nsServiceManager::GetService(kCDragServiceCID, nsIDragService::GetIID(), @@ -1155,7 +1154,7 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } -#endif + return NS_OK; } @@ -1163,7 +1162,6 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { -#ifdef NEW_DRAG_AND_DROP nsIDragService* dragService; nsresult rv = nsServiceManager::GetService(kCDragServiceCID, nsIDragService::GetIID(), @@ -1177,7 +1175,7 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } -#endif + return NS_OK; } @@ -1193,8 +1191,6 @@ nsTextEditorDragListener::DragExit(nsIDOMEvent* aDragEvent) nsresult nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) { - -#ifdef NEW_DRAG_AND_DROP // String for doing paste nsString stuffToPaste; @@ -1255,8 +1251,6 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) nsServiceManager::ReleaseService(kCDragServiceCID, dragService); } // if valid drag service -#endif - return NS_OK; }