incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1233647 - in /incubator/ooo/trunk/main: desktop/source/app/ desktop/util/ desktop/win32/source/applauncher/ desktop/win32/source/applauncher/ooo/ helpauthoring/HelpAuthoring/ offapi/util/ oovbaapi/ooo/vba/ setup_native/scripts/ solenv/bin/...
Date Thu, 19 Jan 2012 23:03:59 GMT
Author: arist
Date: Thu Jan 19 23:03:58 2012
New Revision: 1233647

URL: http://svn.apache.org/viewvc?rev=1233647&view=rev
Log:
Update headers to Alv2 headers

Modified:
    incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_ooo.c
    incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_sun.c
    incubator/ooo/trunk/main/desktop/util/ooverinfo.rc
    incubator/ooo/trunk/main/desktop/util/verinfo.rc
    incubator/ooo/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc
    incubator/ooo/trunk/main/desktop/win32/source/applauncher/verinfo.rc
    incubator/ooo/trunk/main/helpauthoring/HelpAuthoring/_Main.xba
    incubator/ooo/trunk/main/offapi/util/checknewapi.pl
    incubator/ooo/trunk/main/oovbaapi/ooo/vba/XCollectionBase.idl
    incubator/ooo/trunk/main/setup_native/scripts/stclient_wrapper.sh
    incubator/ooo/trunk/main/solenv/bin/convertlinks.pl
    incubator/ooo/trunk/main/solenv/bin/converttags.pl
    incubator/ooo/trunk/main/solenv/bin/mkdir.pl
    incubator/ooo/trunk/main/svx/source/intro/about_ooo.src
    incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt

Modified: incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_ooo.c
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_ooo.c?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_ooo.c (original)
+++ incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_ooo.c Thu Jan 19 23:03:58
2012
@@ -27,5 +27,5 @@
  
 extern const char copyright_text_1[];
 
-const char copyright_text_1[] = "Copyright © 2000, 2010 Oracle and/or its affiliates, All
rights reserved.";
+const char copyright_text_1[] = "Copyright © 2012 Apache Software Foundation, All rights
reserved.";
 

Modified: incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_sun.c
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_sun.c?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_sun.c (original)
+++ incubator/ooo/trunk/main/desktop/source/app/copyright_ascii_sun.c Thu Jan 19 23:03:58
2012
@@ -25,5 +25,5 @@
   *
   */
  
-const char copyright_text_1[] = "Copyright © 2000, 2010 Oracle and/or its affiliates, All
rights reserved.";
+const char copyright_text_1[] = "Copyright © 2012 Apache Software Foundation, All rights
reserved.";
 

Modified: incubator/ooo/trunk/main/desktop/util/ooverinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/util/ooverinfo.rc?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/util/ooverinfo.rc (original)
+++ incubator/ooo/trunk/main/desktop/util/ooverinfo.rc Thu Jan 19 23:03:58 2012
@@ -65,7 +65,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName",		"SOFFICE\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Apache Software Foundation\0"
 			}
 #else
 			block "040904E4"
@@ -77,7 +77,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName", 		"SOFFICE\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Apache Software Foundation\0"
 			}
 #endif
 		}

Modified: incubator/ooo/trunk/main/desktop/util/verinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/util/verinfo.rc?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/util/verinfo.rc (original)
+++ incubator/ooo/trunk/main/desktop/util/verinfo.rc Thu Jan 19 23:03:58 2012
@@ -70,7 +70,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName",		"SOFFICE\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright",		S_CRIGHT " Apache Software Foundation\0"
 			}
 #else
 			block "040904E4"
@@ -82,7 +82,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName", 		"SOFFICE\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright", 	S_CRIGHT " Apache Software Foundation\0"
 			}
 #endif
 		}

Modified: incubator/ooo/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc (original)
+++ incubator/ooo/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc Thu Jan 19 23:03:58
2012
@@ -65,7 +65,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright",		S_CRIGHT " Apache Software Foundation. All rights reserved.\0"
 			}
 #else
 			block "040904E4"
@@ -77,7 +77,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright", 	S_CRIGHT " Apache Software Foundation. All rights reserved.\0"
 			}
 #endif
 		}

Modified: incubator/ooo/trunk/main/desktop/win32/source/applauncher/verinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/win32/source/applauncher/verinfo.rc?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/win32/source/applauncher/verinfo.rc (original)
+++ incubator/ooo/trunk/main/desktop/win32/source/applauncher/verinfo.rc Thu Jan 19 23:03:58
2012
@@ -64,25 +64,25 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"Oracle\0"
+				value "CompanyName",		"Apache Software Foundation\0"
 				value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright",		S_CRIGHT " Apache Software Foundation. All rights reserved.\0"
 			}
 #else
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"Oracle\0"
+				value "CompanyName", 		"Apache Software Foundation\0"
 				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				value "LegalCopyright", 	S_CRIGHT " Apache Software Foundation. All rights reserved.\0"
 			}
 #endif
 		}

Modified: incubator/ooo/trunk/main/helpauthoring/HelpAuthoring/_Main.xba
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpauthoring/HelpAuthoring/_Main.xba?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpauthoring/HelpAuthoring/_Main.xba (original)
+++ incubator/ooo/trunk/main/helpauthoring/HelpAuthoring/_Main.xba Thu Jan 19 23:03:58 2012
@@ -6,60 +6,26 @@
 ' -------------------------------------
 '
 
-' ***********************************************************************
-' *
-' *  The Contents of this file are made available subject to the terms of
-' *  either of the following licenses
-' *
-' *         - GNU Lesser General Public License Version 2.1
-' *         - Sun Industry Standards Source License Version 1.1
-' *
-' *  Sun Microsystems Inc., October, 2000
-' *
-' *  GNU Lesser General Public License Version 2.1
-' *  =============================================
-' *  Copyright 2000 by Sun Microsystems, Inc.
-' *  901 San Antonio Road, Palo Alto, CA 94303, USA
-' *
-' *  This library is free software; you can redistribute it and/or
-' *  modify it under the terms of the GNU Lesser General Public
-' *  License version 2.1, as published by the Free Software Foundation.
-' *
-' *  This library is distributed in the hope that it will be useful,
-' *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-' *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-' *  Lesser General Public License for more details.
-' *
-' *  You should have received a copy of the GNU Lesser General Public
-' *  License along with this library; if not, write to the Free Software
-' *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-' *  MA  02111-1307  USA
-' *
-' *
-' *  Sun Industry Standards Source License Version 1.1
-' *  =================================================
-' *  The contents of this file are subject to the Sun Industry Standards
-' *  Source 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.openoffice.org/license.html.
-' *
-' *  Software provided under this License is provided on an "AS IS"
basis,
-' *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
-' *  WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-' *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-' *  See the License for the specific provisions governing your rights and
-' *  obligations concerning the Software.
-' *
-' *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
-' *
-' *  Copyright: 2000 by Sun Microsystems, Inc.
-' *
-' *  All Rights Reserved.
-' *
-' *  Contributor(s): _______________________________________
-' *
-' *
-' ************************************************************************
+' #**************************************************************
+' #  
+' #  Licensed to the Apache Software Foundation (ASF) under one
+' #  or more contributor license agreements.  See the NOTICE file
+' #  distributed with this work for additional information
+' #  regarding copyright ownership.  The ASF licenses this file
+' #  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+' #  
+' #  Unless required by applicable law or agreed to in writing,
+' #  software distributed under the License is distributed on an
+' #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+' #  KIND, either express or implied.  See the License for the
+' #  specific language governing permissions and limitations
+' #  under the License.
+' #  
+' #**************************************************************
 
 Global Const Version = "v3.20100805"
 
@@ -220,4 +186,4 @@ End Sub
 Sub DisplayVersion
 	msgbox "OpenOffice.org Help Authoring Framework"+chr(13)+"Version
"+Version+chr(13)+chr(13)+"(c) 2010 Oracle, Licensed under LGPL",256
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>

Modified: incubator/ooo/trunk/main/offapi/util/checknewapi.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/offapi/util/checknewapi.pl?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/offapi/util/checknewapi.pl (original)
+++ incubator/ooo/trunk/main/offapi/util/checknewapi.pl Thu Jan 19 23:03:58 2012
@@ -1,10 +1,28 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
 #
 # checknewapi - a perl script to check for new API's
 # using two outputs from regview and dump the interscetion
 # of new types
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
 
 if($#ARGV != 3)
 {

Modified: incubator/ooo/trunk/main/oovbaapi/ooo/vba/XCollectionBase.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/oovbaapi/ooo/vba/XCollectionBase.idl?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/oovbaapi/ooo/vba/XCollectionBase.idl (original)
+++ incubator/ooo/trunk/main/oovbaapi/ooo/vba/XCollectionBase.idl Thu Jan 19 23:03:58 2012
@@ -1,8 +1,23 @@
-/*************************************************************************
- *
- * Copyright 2010, Oracle and/or its affiliates. All rights reserved.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #ifndef OOO_VBA_XOLLECTIONBASE_IDL
 #define OOO_VBA_XOLLECTIONBASE_IDL

Modified: incubator/ooo/trunk/main/setup_native/scripts/stclient_wrapper.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/setup_native/scripts/stclient_wrapper.sh?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/setup_native/scripts/stclient_wrapper.sh (original)
+++ incubator/ooo/trunk/main/setup_native/scripts/stclient_wrapper.sh Thu Jan 19 23:03:58
2012
@@ -1,8 +1,24 @@
 #!/bin/sh
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-# All rights reserved.
-#
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
 
 if [ `uname -s` = "SunOS" ]; then
   STCLIENT=/usr/bin/stclient

Modified: incubator/ooo/trunk/main/solenv/bin/convertlinks.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/convertlinks.pl?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/convertlinks.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/convertlinks.pl Thu Jan 19 23:03:58 2012
@@ -1,9 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
 #
 # convertlinks - a perl script to make hrefs to 
 # http://api.openoffice.org/common/ref relativ.
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
 
 use File::Find;
 

Modified: incubator/ooo/trunk/main/solenv/bin/converttags.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/converttags.pl?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/converttags.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/converttags.pl Thu Jan 19 23:03:58 2012
@@ -1,9 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
 #
 # converttags - a perl script to coonvert some predefined tags
 # to user specified values
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
 
 if($#ARGV == -1)
 {

Modified: incubator/ooo/trunk/main/solenv/bin/mkdir.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/mkdir.pl?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/mkdir.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/mkdir.pl Thu Jan 19 23:03:58 2012
@@ -1,13 +1,32 @@
 : # -*- perl -*-
 eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
 #
 # mkdir - a perl script to substitute mkdir -p
 # accepts "/", ":", and "\" as delimiters of subdirectories
 # options -p (for compatibility)
 #         -mode mode
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
 
 use Cwd;
 

Modified: incubator/ooo/trunk/main/svx/source/intro/about_ooo.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/intro/about_ooo.src?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/intro/about_ooo.src (original)
+++ incubator/ooo/trunk/main/svx/source/intro/about_ooo.src Thu Jan 19 23:03:58 2012
@@ -26,7 +26,7 @@
 
 String ABOUT_STR_COPYRIGHT
 {
-	Text[ en-US ] = "Copyright © 2000, 2011 Oracle and/or its affiliates. All rights reserved.\nThis
product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all
community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";

+	Text[ en-US ] = "Copyright © 2012 Apache Software Foundation. All rights reserved.\nThis
product was created by %OOOVENDOR, based on Apache OpenOffice.\nApache OpenOffice acknowledges
all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";

 };
 
 StringArray ABOUT_STR_DEVELOPER_ARY

Modified: incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt?rev=1233647&r1=1233646&r2=1233647&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt (original)
+++ incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt Thu Jan 19 23:03:58
2012
@@ -1,3 +1,3 @@
 [Current program versions]
-Oracle Open Office=3.4
-OpenOffice.org=3.4
+Apache OpenOffice=3.4
+



Mime
View raw message