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/km/default.css b/source/auxiliary/km/default.css
index 9396b216d1..2340c69cbe 100644
--- a/source/auxiliary/km/default.css
+++ b/source/auxiliary/km/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/km/highcontrast1.css b/source/auxiliary/km/highcontrast1.css
index 89aa35e984..26c439e02a 100644
--- a/source/auxiliary/km/highcontrast1.css
+++ b/source/auxiliary/km/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                  +
 +                          DEFAULT 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/km/highcontrast2.css b/source/auxiliary/km/highcontrast2.css
index 207858f420..2447bcaaf8 100644
--- a/source/auxiliary/km/highcontrast2.css
+++ b/source/auxiliary/km/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                  +
 +                          DEFAULT 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/km/highcontrastblack.css b/source/auxiliary/km/highcontrastblack.css
index 8c5d6708b1..29461d0b95 100644
--- a/source/auxiliary/km/highcontrastblack.css
+++ b/source/auxiliary/km/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                  +
 +                          DEFAULT 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/km/highcontrastwhite.css b/source/auxiliary/km/highcontrastwhite.css
index 720755e82c..5bebf96727 100644
--- a/source/auxiliary/km/highcontrastwhite.css
+++ b/source/auxiliary/km/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                  +
 +                          DEFAULT 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/km/sbasic.cfg b/source/auxiliary/km/sbasic.cfg
index 0abc235cac..b8106ec614 100644
--- a/source/auxiliary/km/sbasic.cfg
+++ b/source/auxiliary/km/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/km/scalc.cfg b/source/auxiliary/km/scalc.cfg
index 4aff7f0944..f084610a3f 100644
--- a/source/auxiliary/km/scalc.cfg
+++ b/source/auxiliary/km/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/km/schart.cfg b/source/auxiliary/km/schart.cfg
index a1c048be69..36efa03eb6 100644
--- a/source/auxiliary/km/schart.cfg
+++ b/source/auxiliary/km/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=km
diff --git a/source/auxiliary/km/sdatabase.cfg b/source/auxiliary/km/sdatabase.cfg
index 5844d5a052..07409c40af 100644
--- a/source/auxiliary/km/sdatabase.cfg
+++ b/source/auxiliary/km/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/km/sdraw.cfg b/source/auxiliary/km/sdraw.cfg
index a46a127f12..6a871f5e24 100644
--- a/source/auxiliary/km/sdraw.cfg
+++ b/source/auxiliary/km/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/km/simpress.cfg b/source/auxiliary/km/simpress.cfg
index 7a9f5ce55a..b50b9d8041 100644
--- a/source/auxiliary/km/simpress.cfg
+++ b/source/auxiliary/km/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/km/smath.cfg b/source/auxiliary/km/smath.cfg
index e15de41f5c..052b5c0fe9 100644
--- a/source/auxiliary/km/smath.cfg
+++ b/source/auxiliary/km/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/km/swriter.cfg b/source/auxiliary/km/swriter.cfg
index a59037936a..90adf3066b 100644
--- a/source/auxiliary/km/swriter.cfg
+++ b/source/auxiliary/km/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