re-base on ALv2 code. Includes:

Patch contributed by Oliver Rainer-Wittmann
i#118572 - remove ui string and help content regarding
usage of Java Mail in Writer's Mail Merge as Java
Mail is not used.
http://svn.apache.org/viewvc?view=revision&revision=1197035

Patches contributed by Herbert Duerr
updated help text for regexp word boundaries
http://svn.apache.org/viewvc?view=revision&revision=1228026
improved help text for word boundary regexp expression \b
http://svn.apache.org/viewvc?view=revision&revision=1234738

Patches contributed by Jurgen Schmidt
remove onlineregistration with dependencies
http://svn.apache.org/viewvc?view=revision&revision=1240245

Patch contributed by Regina Henschel
Extended tips for corner and cap style
http://svn.apache.org/viewvc?view=revision&revision=1242287

* re-enable on-line update help, remove obsolete on-line purchasing.

13 files changed, 239 insertions, 5 deletions

diff --git a/source/auxiliary/el/default.css b/source/auxiliary/el/default.css
index 7b7218a05f..5c0910e5db 100644
--- a/source/auxiliary/el/default.css
+++ b/source/auxiliary/el/default.css
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+
+/*
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 +                          OPENOFFICE.ORG 2.0 HELP                  +
 +                          DEFAULT STYLESHEET                       +
@@ -28,7 +46,7 @@ pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable,
 	{ font-weight: bold; margin-top: 0px;}
 
 .howtogetheader
-	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}
 
 h1, h2, h3, h4, h5, h6
 	{ margin-bottom: 5pt; }
diff --git a/source/auxiliary/el/highcontrast1.css b/source/auxiliary/el/highcontrast1.css
index abdc6151c7..960abdb977 100644
--- a/source/auxiliary/el/highcontrast1.css
+++ b/source/auxiliary/el/highcontrast1.css
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+
+/*
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 +                          OPENOFFICE.ORG 2.0 HELP                  +
 +                       HIGH CONTRAST #1 STYLESHEET                 +
@@ -28,7 +46,7 @@ pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable,
 	{ font-weight: bold; margin-top: 0px;}
 
 .howtogetheader
-	{ font-weight: bold; padding: 3px;}	
+	{ font-weight: bold; padding: 3px;}
 
 h1, h2, h3, h4, h5, h6
 	{ margin-bottom: 5pt; }
diff --git a/source/auxiliary/el/highcontrast2.css b/source/auxiliary/el/highcontrast2.css
index 711647ca28..1ab0217e39 100644
--- a/source/auxiliary/el/highcontrast2.css
+++ b/source/auxiliary/el/highcontrast2.css
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+
+/*
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 +                          OPENOFFICE.ORG 2.0 HELP                  +
 +                       HIGH CONTRAST #2 STYLESHEET                 +
@@ -28,7 +46,7 @@ pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable,
 	{ font-weight: bold; margin-top: 0px;}
 
 .howtogetheader
-	{ font-weight: bold; padding: 3px;}	
+	{ font-weight: bold; padding: 3px;}
 
 h1, h2, h3, h4, h5, h6
 	{ margin-bottom: 5pt; }
diff --git a/source/auxiliary/el/highcontrastblack.css b/source/auxiliary/el/highcontrastblack.css
index e1bfc2dfd1..28099f5904 100644
--- a/source/auxiliary/el/highcontrastblack.css
+++ b/source/auxiliary/el/highcontrastblack.css
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+
+/*
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 +                          OPENOFFICE.ORG 2.0 HELP                  +
 +                      HIGH CONTRAST BLACK STYLESHEET               +
@@ -28,7 +46,7 @@ pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable,
 	{ font-weight: bold; margin-top: 0px;}
 
 .howtogetheader
-	{ font-weight: bold; padding: 3px;}	
+	{ font-weight: bold; padding: 3px;}
 
 h1, h2, h3, h4, h5, h6
 	{ margin-bottom: 5pt; }
diff --git a/source/auxiliary/el/highcontrastwhite.css b/source/auxiliary/el/highcontrastwhite.css
index aefff2cac3..90a6b17ff0 100644
--- a/source/auxiliary/el/highcontrastwhite.css
+++ b/source/auxiliary/el/highcontrastwhite.css
@@ -1,4 +1,22 @@
 /*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+
+/*
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 +                          OPENOFFICE.ORG 2.0 HELP                  +
 +                      HIGH CONTRAST WHITE STYLESHEET               +
@@ -28,7 +46,7 @@ pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable,
 	{ font-weight: bold; margin-top: 0px;}
 
 .howtogetheader
-	{ font-weight: bold; padding: 3px;}	
+	{ font-weight: bold; padding: 3px;}
 
 h1, h2, h3, h4, h5, h6
 	{ margin-bottom: 5pt; }
diff --git a/source/auxiliary/el/sbasic.cfg b/source/auxiliary/el/sbasic.cfg
index 1a0b852f7f..b482f711e4 100644
--- a/source/auxiliary/el/sbasic.cfg
+++ b/source/auxiliary/el/sbasic.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Basic
 
diff --git a/source/auxiliary/el/scalc.cfg b/source/auxiliary/el/scalc.cfg
index 5eda5a88df..fa6d099b6c 100644
--- a/source/auxiliary/el/scalc.cfg
+++ b/source/auxiliary/el/scalc.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Calc
 
diff --git a/source/auxiliary/el/schart.cfg b/source/auxiliary/el/schart.cfg
index b7e05a5fdd..af4c98851c 100644
--- a/source/auxiliary/el/schart.cfg
+++ b/source/auxiliary/el/schart.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 Title=%PRODUCTNAME Chart
 
 Language=el
diff --git a/source/auxiliary/el/sdatabase.cfg b/source/auxiliary/el/sdatabase.cfg
index 631dfa5e84..40d415d143 100644
--- a/source/auxiliary/el/sdatabase.cfg
+++ b/source/auxiliary/el/sdatabase.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Base
 
diff --git a/source/auxiliary/el/sdraw.cfg b/source/auxiliary/el/sdraw.cfg
index d6b6cb158a..0adea95204 100644
--- a/source/auxiliary/el/sdraw.cfg
+++ b/source/auxiliary/el/sdraw.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Draw
 
diff --git a/source/auxiliary/el/simpress.cfg b/source/auxiliary/el/simpress.cfg
index 26c26ef29c..092138d4f7 100644
--- a/source/auxiliary/el/simpress.cfg
+++ b/source/auxiliary/el/simpress.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Impress
 
diff --git a/source/auxiliary/el/smath.cfg b/source/auxiliary/el/smath.cfg
index ff94e4d7ce..2f18026f98 100644
--- a/source/auxiliary/el/smath.cfg
+++ b/source/auxiliary/el/smath.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Math
 
diff --git a/source/auxiliary/el/swriter.cfg b/source/auxiliary/el/swriter.cfg
index ae84c5b657..42df110bf7 100644
--- a/source/auxiliary/el/swriter.cfg
+++ b/source/auxiliary/el/swriter.cfg
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 .
+#
+
 
 Title=%PRODUCTNAME Writer