diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-12-12 19:20:46 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-13 13:02:02 +0000 |
commit | df4d4db7408ed3fc135eded6787bad80853619fd (patch) | |
tree | 050f1e400474991f0611e685c37de6899229b571 /source/text/shared/01/05200100.xhp | |
parent | Revert "fdo#36057 time format using [] is needed to show hours non-modulo 24" (diff) | |
download | help-df4d4db7408ed3fc135eded6787bad80853619fd.tar.gz help-df4d4db7408ed3fc135eded6787bad80853619fd.zip |
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.
Diffstat (limited to 'source/text/shared/01/05200100.xhp')
-rw-r--r-- | source/text/shared/01/05200100.xhp | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/source/text/shared/01/05200100.xhp b/source/text/shared/01/05200100.xhp index 6dcfd1f810..931fd3e709 100644 --- a/source/text/shared/01/05200100.xhp +++ b/source/text/shared/01/05200100.xhp @@ -3,32 +3,21 @@ <!-- - *********************************************************************** + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * 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/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************ + * 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 . --> @@ -95,6 +84,13 @@ <paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_END">Places the center of the arrowhead(s) on the endpoint(s) of the selected line.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE" id="bm_id3154138" localize="false"/><paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="21">Synchronize ends</paragraph> <paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE">Automatically updates both arrowhead settings when you enter a different width, select a different arrowhead style,or center an arrowhead.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3154580" xml-lang="en-US" level="2" l10n="">Corner and cap styles</paragraph> +<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE" id="bm_id3154581" localize="false" /> +<paragraph role="heading" id="hd_id3154582" xml-lang="en-US" level="3" l10n="">Corner style</paragraph> +<paragraph role="paragraph" id="par_id3154583" xml-lang="en-US" l10n=""><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLE">Select the shape to be used at the corners of the line. In case of a small angle between lines, a mitered shape is replaced with a beveled shape.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_CAP_STYLE" id="bm_id3154584" localize="false" /> +<paragraph role="heading" id="hd_id3154585" xml-lang="en-US" level="3" l10n="">Cap style</paragraph> +<paragraph role="paragraph" nil="par_id3154586" xml-lang="en-US" l10n=""><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLE">Select the style of the line end caps. The caps are added to inner dashes as well.</ahelp></paragraph> <embed href="text/shared/00/00000001.xhp#vorschau"/> </body> </helpdocument> |