summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/appinit.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-04-12 20:04:24 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-04-12 20:04:24 +0200
commite8450ba2e090debab65c77ab489a737be9132481 (patch)
tree9e59f4ea72408a934271ed7c84d0d1d8156c1ce4 /sfx2/source/appl/appinit.cxx
parent9233947f0d9dfab3d7a47645d9bff9ac9d140b74 (diff)
parent0c946f499034229c255ae50bb7c97c9be471ca14 (diff)
slidecopy: merge
Diffstat (limited to 'sfx2/source/appl/appinit.cxx')
-rw-r--r--sfx2/source/appl/appinit.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index acaaed009f94..08023c5414a6 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: appinit.cxx,v $
- * $Revision: 1.65 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -276,8 +273,6 @@ FASTBOOL SfxApplication::Initialize_Impl()
new SfxErrorHandler(
RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END);
new SfxErrorHandler(
- (RID_SJ_START +1), ERRCODE_AREA_JAVA, ERRCODE_AREA_JAVA_END);
- new SfxErrorHandler(
RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END );
// diverse Pointer