[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/auxiliary source/text

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 1 10:07:34 UTC 2018


 AllLangHelp_shared.mk                    |    1 
 source/auxiliary/shared.tree             |    1 
 source/text/sdraw/guide/color_define.xhp |    1 
 source/text/shared/01/05020200.xhp       |    1 
 source/text/shared/01/05210100.xhp       |    2 
 source/text/shared/optionen/01010000.xhp |    2 
 source/text/shared/optionen/01010500.xhp |   78 -------------------------------
 7 files changed, 2 insertions(+), 84 deletions(-)

New commits:
commit c5ee45213fccf09f14c6fe13fd25cae0c8a71b43
Author:     Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
AuthorDate: Sat Sep 29 17:10:15 2018 +0200
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Oct 1 12:07:13 2018 +0200

    tdf#103527 Remove Colors from Options help
    
    Change-Id: I5ea31c33a438f170e9141474065e3a3256bcb4b9
    Reviewed-on: https://gerrit.libreoffice.org/61134
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index b019c5d6b..97f266bfd 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -826,7 +826,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/optionen/01010301 \
     helpcontent2/source/text/shared/optionen/01010400 \
     helpcontent2/source/text/shared/optionen/01010401 \
-    helpcontent2/source/text/shared/optionen/01010500 \
     helpcontent2/source/text/shared/optionen/01010501 \
     helpcontent2/source/text/shared/optionen/01010600 \
     helpcontent2/source/text/shared/optionen/01010700 \
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index 8879add90..b5722fc1c 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -43,7 +43,6 @@
 <topic id="shared/text/shared/optionen/01010200.xhp">General</topic>
 <topic id="shared/text/shared/optionen/01010300.xhp">Paths</topic>
 <topic id="shared/text/shared/optionen/01010400.xhp">Writing Aids</topic>
-<topic id="shared/text/shared/optionen/01010500.xhp">Colors</topic>
 <topic id="shared/text/shared/optionen/01010600.xhp">General</topic>
 <topic id="shared/text/shared/optionen/01010700.xhp">Fonts</topic>
 <topic id="shared/text/shared/optionen/01010800.xhp">View</topic>
diff --git a/source/text/sdraw/guide/color_define.xhp b/source/text/sdraw/guide/color_define.xhp
index caefb26c5..916805253 100644
--- a/source/text/sdraw/guide/color_define.xhp
+++ b/source/text/sdraw/guide/color_define.xhp
@@ -53,7 +53,6 @@
    </list>
    <paragraph role="tip" id="par_id701522707038880" xml-lang="en-US">To remove a color from the <emph>Custom</emph> color palette, select the <emph>Custom</emph> color palette in the <emph>Colors</emph> area, select the color to be deleted and click <emph>Delete</emph>.</paragraph>
    <section id="relatedtopics">
-       <paragraph role="paragraph" id="par_id661522713547390" xml-lang="en-US"><link href="text/shared/optionen/01010500.xhp" name="Color">Color dialog</link>.</paragraph>
        <embed href="text/sdraw/guide/eyedropper.xhp#eyedropper"/>
        <paragraph xml-lang="en-US" id="par_id3145236" role="paragraph"><link href="text/shared/01/03170000.xhp" name="Color bar">Color bar</link></paragraph>
    </section>
diff --git a/source/text/shared/01/05020200.xhp b/source/text/shared/01/05020200.xhp
index 8e1fdd742..e8aac4e5a 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -168,7 +168,6 @@
       <section id="relatedtopics">
          <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
          <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-         <paragraph xml-lang="en-US" id="par_id3151053" role="paragraph"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
          <embed href="text/shared/guide/text_color.xhp#text_color"/>
       </section>
 </body>
diff --git a/source/text/shared/01/05210100.xhp b/source/text/shared/01/05210100.xhp
index bb20e675a..56008a0e7 100644
--- a/source/text/shared/01/05210100.xhp
+++ b/source/text/shared/01/05210100.xhp
@@ -57,7 +57,7 @@
 <paragraph role="paragraph" id="par_id3149751" xml-lang="en-US"><ahelp hid="cui/ui/areatabpage/btnnone">Do not fill the selected object.</ahelp></paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/cui/ui/areatabpage/btncolor" id="bm_id3149244" localize="false"/>
-<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3"><link href="text/shared/optionen/01010500.xhp" name="Color">Color</link></paragraph>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3">Color</paragraph>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US"><ahelp hid="cui/ui/areatabpage/btncolor">Fills the object with a color selected on this page.</ahelp></paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/cui/ui/areatabpage/btngradient" id="bm_id3145085" localize="false"/>
diff --git a/source/text/shared/optionen/01010000.xhp b/source/text/shared/optionen/01010000.xhp
index 84d4858f4..036300f5b 100644
--- a/source/text/shared/optionen/01010000.xhp
+++ b/source/text/shared/optionen/01010000.xhp
@@ -28,7 +28,7 @@
    </meta>
    <body>
 <paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="1">$[officename]</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph"><variable id="optionenallgemein">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</variable> These settings are saved automatically.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph"><variable id="optionenallgemein">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories.</variable> These settings are saved automatically.</paragraph>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
       </section>
diff --git a/source/text/shared/optionen/01010500.xhp b/source/text/shared/optionen/01010500.xhp
deleted file mode 100644
index aed035d83..000000000
--- a/source/text/shared/optionen/01010500.xhp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--
- * 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 .
- -->
-
-
-<meta>
-<topic id="textsharedoptionen01010500xml" indexer="include">
-<title id="tit" xml-lang="en-US">Color</title>
-<filename>/text/shared/optionen/01010500.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="farben">
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/ColorPage" id="bm_id3151211" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/@@nowidget@@" id="bm_id3151211" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>colors; models</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="1"><link href="text/shared/optionen/01010500.xhp" name="Color">Color</link></paragraph>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/ColorPage">Allows you to select a color from a color palette, edit an existing color, or define new colors.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#color"/>
-</section>
-<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2">Colors</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/paletteselector" id="bm_id3156215" localize="false"/>
-<paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="3">Palette</paragraph>
-<paragraph role="paragraph" id="par_id3149809" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/paletteselector">Specifies the name of a selected palette. You can select a different palette here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/colorset" id="bm_id3149202" localize="false"/>
-<paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="3">Color Set</paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/colorset">Contains a list of available colors. Click on the desired one in the list to select it.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/recentcolorset" id="bm_id31562781" localize="false"/>
-<paragraph role="heading" id="hd_id31563321" xml-lang="en-US" level="3">Recent Colors</paragraph>
-<paragraph role="paragraph" id="par_id31544811" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/recentcolorset">Displays the last twelve colors selected and applied.</ahelp> Upon selecting a new color it is added to the left of the list. If the list is full and a new color is selected then the rightmost color is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/add" id="bm_id3156278" localize="false"/>
-<paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3">Add</paragraph>
-<paragraph role="paragraph" id="par_id3154481" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/add">Adds the new color to the <emph>Custom</emph> palette.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/delete" id="bm_id3153767" localize="false"/>
-<paragraph role="heading" id="hd_id31547578" xml-lang="en-US" level="3">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3154483" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/delete">Deletes the selected color without confirmation.</ahelp></paragraph>
-<paragraph role="note" id="par_id3154574" xml-lang="en-US">You can only delete colors from the <emph>custom</emph> palette.</paragraph>
-<paragraph role="heading" id="hd_id31507671" xml-lang="en-US" level="2">New</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/newpreview" id="bm_id3153767" localize="false"/>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/newpreview">Displays a preview of the color selected from the color palette and the changes you make with the controls below.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/R_custom" id="bm_id3146976" localize="false"/>
-<paragraph role="heading" id="hd_id3150103" xml-lang="en-US" level="3">R</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/R_custom">The color code of the red component of the color. Possible values are between 0 and 255.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/G_custom" id="bm_id3159156" localize="false"/>
-<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3">G</paragraph>
-<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/G_custom">The color code of the green component of the color. Possible values are between 0 and 255.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/B_custom" id="bm_id3154319" localize="false"/>
-<paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3">B</paragraph>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/B_custom">The color code of the blue component of the color. Possible values are between 0 and 255.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/hex_custom" id="bm_id31543191" localize="false"/>
-<paragraph role="heading" id="hd_id31535731" xml-lang="en-US" level="3">Hex</paragraph>
-<paragraph role="paragraph" id="par_id31537261" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/hex_custom">The color code of the color expressed as a hexadecimal value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/edit" id="bm_id31543192" localize="false"/>
-<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="3"><link href="text/shared/optionen/01010501.xhp" name="Pick">Pick</link></paragraph>
-<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
-
-</body>
-</helpdocument>


More information about the Libreoffice-commits mailing list