From df4d4db7408ed3fc135eded6787bad80853619fd Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 12 Dec 2012 19:20:46 +0000 Subject: 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. --- source/auxiliary/is/default.css | 20 +++++++++++++++++++- source/auxiliary/is/highcontrast1.css | 20 +++++++++++++++++++- source/auxiliary/is/highcontrast2.css | 20 +++++++++++++++++++- source/auxiliary/is/highcontrastblack.css | 20 +++++++++++++++++++- source/auxiliary/is/highcontrastwhite.css | 20 +++++++++++++++++++- source/auxiliary/is/sbasic.cfg | 17 +++++++++++++++++ source/auxiliary/is/scalc.cfg | 17 +++++++++++++++++ source/auxiliary/is/schart.cfg | 17 +++++++++++++++++ source/auxiliary/is/sdatabase.cfg | 17 +++++++++++++++++ source/auxiliary/is/sdraw.cfg | 17 +++++++++++++++++ source/auxiliary/is/simpress.cfg | 17 +++++++++++++++++ source/auxiliary/is/smath.cfg | 17 +++++++++++++++++ source/auxiliary/is/swriter.cfg | 17 +++++++++++++++++ 13 files changed, 231 insertions(+), 5 deletions(-) (limited to 'source/auxiliary/is') diff --git a/source/auxiliary/is/default.css b/source/auxiliary/is/default.css index e99c5548c1..6539c25667 100644 --- a/source/auxiliary/is/default.css +++ b/source/auxiliary/is/default.css @@ -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 . + */ + /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + OPENOFFICE.ORG 2.0 HELP + @@ -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/is/highcontrast1.css b/source/auxiliary/is/highcontrast1.css index b6059a0b81..ba39fb2eca 100644 --- a/source/auxiliary/is/highcontrast1.css +++ b/source/auxiliary/is/highcontrast1.css @@ -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 . + */ + /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + OPENOFFICE.ORG 2.0 HELP + @@ -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/is/highcontrast2.css b/source/auxiliary/is/highcontrast2.css index 7d9c2ce3ff..0e31b90466 100644 --- a/source/auxiliary/is/highcontrast2.css +++ b/source/auxiliary/is/highcontrast2.css @@ -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 . + */ + /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + OPENOFFICE.ORG 2.0 HELP + @@ -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/is/highcontrastblack.css b/source/auxiliary/is/highcontrastblack.css index 9ccac2c16c..535d46ca5a 100644 --- a/source/auxiliary/is/highcontrastblack.css +++ b/source/auxiliary/is/highcontrastblack.css @@ -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 . + */ + /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + OPENOFFICE.ORG 2.0 HELP + @@ -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/is/highcontrastwhite.css b/source/auxiliary/is/highcontrastwhite.css index 261b1309fa..1213aba213 100644 --- a/source/auxiliary/is/highcontrastwhite.css +++ b/source/auxiliary/is/highcontrastwhite.css @@ -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 . + */ + /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + OPENOFFICE.ORG 2.0 HELP + @@ -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/is/sbasic.cfg b/source/auxiliary/is/sbasic.cfg index a9d3e993cc..a3e3dfeaba 100644 --- a/source/auxiliary/is/sbasic.cfg +++ b/source/auxiliary/is/sbasic.cfg @@ -1,3 +1,20 @@ +# +# 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/is/scalc.cfg b/source/auxiliary/is/scalc.cfg index 6d191bb368..d3b1c7ec76 100644 --- a/source/auxiliary/is/scalc.cfg +++ b/source/auxiliary/is/scalc.cfg @@ -1,3 +1,20 @@ +# +# 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/is/schart.cfg b/source/auxiliary/is/schart.cfg index 06b7a47c0e..4f2c6e3e7f 100644 --- a/source/auxiliary/is/schart.cfg +++ b/source/auxiliary/is/schart.cfg @@ -1,3 +1,20 @@ +# +# 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=is diff --git a/source/auxiliary/is/sdatabase.cfg b/source/auxiliary/is/sdatabase.cfg index 7c07e2cc1a..1bc553ad3d 100644 --- a/source/auxiliary/is/sdatabase.cfg +++ b/source/auxiliary/is/sdatabase.cfg @@ -1,3 +1,20 @@ +# +# 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/is/sdraw.cfg b/source/auxiliary/is/sdraw.cfg index afb738697a..affa243386 100644 --- a/source/auxiliary/is/sdraw.cfg +++ b/source/auxiliary/is/sdraw.cfg @@ -1,3 +1,20 @@ +# +# 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/is/simpress.cfg b/source/auxiliary/is/simpress.cfg index 7a266de3bc..2c00f20f21 100644 --- a/source/auxiliary/is/simpress.cfg +++ b/source/auxiliary/is/simpress.cfg @@ -1,3 +1,20 @@ +# +# 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/is/smath.cfg b/source/auxiliary/is/smath.cfg index eff5dc8f52..1478303b9d 100644 --- a/source/auxiliary/is/smath.cfg +++ b/source/auxiliary/is/smath.cfg @@ -1,3 +1,20 @@ +# +# 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/is/swriter.cfg b/source/auxiliary/is/swriter.cfg index 09291e4d07..7f4a589ea1 100644 --- a/source/auxiliary/is/swriter.cfg +++ b/source/auxiliary/is/swriter.cfg @@ -1,3 +1,20 @@ +# +# 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 -- cgit