You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/02/23 00:16:53 UTC
[openoffice] branch AOO42X updated: Fixed Notes vs. Comments
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a7d42b4 Fixed Notes vs. Comments
a7d42b4 is described below
commit a7d42b49d7dc4596b1577059aadba54fd64deca8
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Feb 23 01:14:54 2021 +0100
Fixed Notes vs. Comments
(cherry picked from commit f7eabbf26acaba809e9c1fd81062d9d8d0c959b1)
---
main/cui/source/options/optcolor.src | 516 ++++++++++-----------
main/cui/source/options/securityoptions.src | 2 +-
.../source/text/swriter/01/02110100.xhp | 4 +-
main/svx/source/dialog/srchdlg.src | 4 +-
4 files changed, 249 insertions(+), 277 deletions(-)
diff --git a/main/cui/source/options/optcolor.src b/main/cui/source/options/optcolor.src
index ba82391..3722dc3 100644
--- a/main/cui/source/options/optcolor.src
+++ b/main/cui/source/options/optcolor.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,117 +7,117 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
- // include ---------------------------------------------------------------
+
+// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
#include "optcolor.hrc"
- // pragma ----------------------------------------------------------------
+// pragma ----------------------------------------------------------------
TabPage RID_SVXPAGE_COLORCONFIG
{
- HelpId = HID_OPTIONS_COLORCONFIG ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
+ HelpId = HID_OPTIONS_COLORCONFIG ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- FixedLine FL_COLORSCHEME
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Color scheme";
+ Size = MAP_APPFONT ( 260, 185 ) ;
+ FixedLine FL_COLORSCHEME
+ {
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
+ Text [ en-US ] = "Color scheme" ;
};
- FixedText FT_COLORSCHEME
- {
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Scheme";
+ FixedText FT_COLORSCHEME
+ {
+ Pos = MAP_APPFONT ( 12, 16 ) ;
+ Size = MAP_APPFONT ( 50, 8 ) ;
+ Text [ en-US ] = "Scheme" ;
};
- ListBox LB_COLORSCHEME
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME";
- Pos = MAP_APPFONT ( 65 , 13 ) ;
- Size = MAP_APPFONT ( 77 , 58 ) ;
- Border = TRUE;
- Sort = TRUE;
- DropDown = TRUE;
- };
- PushButton PB_SAVESCHEME
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME";
- Pos = MAP_APPFONT ( 145, 13 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "Save...";
+ ListBox LB_COLORSCHEME
+ {
+ HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME" ;
+ Pos = MAP_APPFONT ( 65, 13 ) ;
+ Size = MAP_APPFONT ( 77, 58 ) ;
+ Border = TRUE ;
+ Sort = TRUE ;
+ DropDown = TRUE ;
};
- PushButton PB_DELETESCHEME
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME";
- Pos = MAP_APPFONT ( 198 , 13 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "Delete";
+ PushButton PB_SAVESCHEME
+ {
+ HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME" ;
+ Pos = MAP_APPFONT ( 145, 13 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "Save..." ;
};
- FixedLine FL_CUSTOMCOLORS
- {
- Pos = MAP_APPFONT ( 6 , 34 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
-
- Text [ en-US ] = "Custom colors";
+ PushButton PB_DELETESCHEME
+ {
+ HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME" ;
+ Pos = MAP_APPFONT ( 198, 13 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "Delete" ;
+ };
+ FixedLine FL_CUSTOMCOLORS
+ {
+ Pos = MAP_APPFONT ( 6, 34 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
+ Text [ en-US ] = "Custom colors" ;
};
- Control CT_COLORCONFIG
- {
- Pos = MAP_APPFONT ( 12 , 45 ) ;
- Size = MAP_APPFONT ( 236 , 138 ) ;
- Border = TRUE;
- DialogControl = TRUE;
- OutputSize = TRUE ;
- ScrollBar VB_VSCROLL
- {
- Pos = MAP_APPFONT ( 228 , 10 ) ;
- Size = MAP_APPFONT ( 8 , 128 ) ;
- VScroll = TRUE;
- };
- String ST_ON
- {
- Text [ en-US ] = "On";
+ Control CT_COLORCONFIG
+ {
+ Pos = MAP_APPFONT ( 12, 45 ) ;
+ Size = MAP_APPFONT ( 236, 138 ) ;
+ Border = TRUE ;
+ DialogControl = TRUE ;
+ OutputSize = TRUE ;
+ ScrollBar VB_VSCROLL
+ {
+ Pos = MAP_APPFONT ( 228, 10 ) ;
+ Size = MAP_APPFONT ( 8, 128 ) ;
+ VScroll = TRUE ;
};
- String ST_UIELEM
- {
- Text [ en-US ] = "User interface elements";
+ String ST_ON
+ {
+ Text [ en-US ] = "On" ;
};
- String ST_COLSET
- {
- Text [ en-US ] = "Color setting";
+ String ST_UIELEM
+ {
+ Text [ en-US ] = "User interface elements" ;
};
- String ST_PREVIEW
- {
- Text [ en-US ] = "Preview";
+ String ST_COLSET
+ {
+ Text [ en-US ] = "Color setting" ;
};
- Window WN_SCROLL
- {
+ String ST_PREVIEW
+ {
+ Text [ en-US ] = "Preview" ;
+ };
+ Window WN_SCROLL
+ {
// misc defines to shorten defining of standard elements
// standard sizes
-#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH , 8 )
-#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT )
-#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT )
-#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT )
-#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT )
+#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH, 8 )
+#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH, _FT_HEIGHT )
+#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH, _LB_HEIGHT )
+#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH, _WN_HEIGHT )
+#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH, _FT_HEIGHT )
// combination of position and size
-#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
+#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX, LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
// ... for special types
#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE )
@@ -130,427 +130,401 @@ TabPage RID_SVXPAGE_COLORCONFIG
#define LB_WN( ID_POST, LINENUM ) ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;};
OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 0 , 10 ) ;
- Size = MAP_APPFONT ( 228 , 128 ) ;
- DialogControl = TRUE;
+ Pos = MAP_APPFONT ( 0, 10 ) ;
+ Size = MAP_APPFONT ( 228, 128 ) ;
+ DialogControl = TRUE ;
FixedText FT_GENERAL
{
- FT_SEP_POS_SIZE( 0 );
- Text [ en-US ] = "General";
+ FT_SEP_POS_SIZE( 0 ) ;
+ Text [ en-US ] = "General" ;
};
FixedText FT_DOCCOLOR
{
- FT_POS_SIZE( 1 );
- Text [ en-US ] = "Document background";
+ FT_POS_SIZE( 1 ) ;
+ Text [ en-US ] = "Document background" ;
};
LB_WN( DOCCOLOR, 1 )
CheckBox CB_DOCBOUND
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND";
- CB_POS_SIZE( 2 );
- Text [ en-US ] = "Text boundaries";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND" ;
+ CB_POS_SIZE( 2 ) ;
+ Text [ en-US ] = "Text boundaries" ;
};
LB_WN( DOCBOUND, 2 )
FixedText FT_APPBACKGROUND
{
- FT_POS_SIZE( 3 );
- Text [ en-US ] = "Application background";
+ FT_POS_SIZE( 3 ) ;
+ Text [ en-US ] = "Application background" ;
};
LB_WN( APPBACKGROUND, 3 )
CheckBox CB_OBJECTBOUNDARIES
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES";
- CB_POS_SIZE( 4 );
- Text [ en-US ] = "Object boundaries";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES" ;
+ CB_POS_SIZE( 4 ) ;
+ Text [ en-US ] = "Object boundaries" ;
};
LB_WN( OBJECTBOUNDARIES, 4 )
CheckBox CB_TABLEBOUNDARIES
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES";
- CB_POS_SIZE( 5 );
- Text [ en-US ] = "Table boundaries";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES" ;
+ CB_POS_SIZE( 5 ) ;
+ Text [ en-US ] = "Table boundaries" ;
};
LB_WN( TABLEBOUNDARIES, 5 )
FixedText FT_FONTCOLOR
{
- FT_POS_SIZE( 6 );
- Text [ en-US ] = "Font color";
+ FT_POS_SIZE( 6 ) ;
+ Text [ en-US ] = "Font color" ;
};
LB_WN( FONTCOLOR, 6 )
CheckBox CB_LINKS
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS";
- CB_POS_SIZE( 7 );
- Text [ en-US ] = "Unvisited links";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS" ;
+ CB_POS_SIZE( 7 ) ;
+ Text [ en-US ] = "Unvisited links" ;
};
LB_WN( LINKS, 7 )
CheckBox CB_LINKSVISITED
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED";
- CB_POS_SIZE( 8 );
- Text [ en-US ] = "Visited links";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED" ;
+ CB_POS_SIZE( 8 ) ;
+ Text [ en-US ] = "Visited links" ;
};
LB_WN( LINKSVISITED, 8 )
FixedText FT_SPELL
{
- FT_POS_SIZE( 9 );
- Text [ en-US ] = "AutoSpellcheck";
+ FT_POS_SIZE( 9 ) ;
+ Text [ en-US ] = "AutoSpellcheck" ;
};
LB_WN( SPELL, 9 )
FixedText FT_SMARTTAGS
{
- FT_POS_SIZE( 10 );
- Text [ en-US ] = "Smart Tags";
+ FT_POS_SIZE( 10 ) ;
+ Text [ en-US ] = "Smart Tags" ;
};
LB_WN( SMARTTAGS, 10 )
FixedText FT_WRITER
{
- FT_SEP_POS_SIZE( 11 );
- Text [ en-US ] = "Text Document";
+ FT_SEP_POS_SIZE( 11 ) ;
+ Text [ en-US ] = "Text Document" ;
};
FixedText FT_WRITERTEXTGRID
{
- FT_POS_SIZE( 12 );
- Text [ en-US ] = "Grid";
+ FT_POS_SIZE( 12 ) ;
+ Text [ en-US ] = "Grid" ;
};
LB_WN( WRITERTEXTGRID, 12 )
CheckBox CB_WRITERFIELDSHADINGS
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS";
- CB_POS_SIZE( 13 );
- Text [ en-US ] = "Field shadings";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS" ;
+ CB_POS_SIZE( 13 ) ;
+ Text [ en-US ] = "Field shadings" ;
};
LB_WN( WRITERFIELDSHADINGS, 13 )
CheckBox CB_WRITERIDXSHADINGS
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS";
- CB_POS_SIZE( 14 );
- Text [ en-US ] = "Index and table shadings";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS" ;
+ CB_POS_SIZE( 14 ) ;
+ Text [ en-US ] = "Index and table shadings" ;
};
LB_WN( WRITERIDXSHADINGS, 14 )
FixedText FT_WRITERSCRIPTINDICATOR
{
- FT_POS_SIZE( 15 );
- Text [ en-US ] = "Script indicator";
+ FT_POS_SIZE( 15 ) ;
+ Text [ en-US ] = "Script indicator" ;
};
LB_WN( WRITERSCRIPTINDICATOR, 15 )
CheckBox CB_WRITERSECTIONBOUNDARIES
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES";
- CB_POS_SIZE( 16 );
- Text [ en-US ] = "Section boundaries";
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES" ;
+ CB_POS_SIZE( 16 ) ;
+ Text [ en-US ] = "Section boundaries" ;
};
LB_WN( WRITERSECTIONBOUNDARIES, 16 )
- FixedText FT_WRITERPAGEBREAKS
+ FixedText FT_WRITERPAGEBREAKS
{
- FT_POS_SIZE( 17 );
- Text [ en-US ] = "Page and column breaks";
+ FT_POS_SIZE( 17 ) ;
+ Text [ en-US ] = "Page and column breaks" ;
};
- LB_WN( WRITERPAGEBREAKS, 17 )
+ LB_WN( WRITERPAGEBREAKS, 17 )
- FixedText FT_WRITERDIRECTCURSOR
+ FixedText FT_WRITERDIRECTCURSOR
{
- FT_POS_SIZE( 18 );
- Text [ en-US ] = "Direct cursor";
+ FT_POS_SIZE( 18 ) ;
+ Text [ en-US ] = "Direct cursor" ;
};
- LB_WN( WRITERDIRECTCURSOR, 18 )
+ LB_WN( WRITERDIRECTCURSOR, 18 )
FixedText FT_HTML
{
- FT_SEP_POS_SIZE( 19 );
- Text [ en-US ] = "HTML Document";
+ FT_SEP_POS_SIZE( 19 ) ;
+ Text [ en-US ] = "HTML Document" ;
};
FixedText FT_HTMLSGML
{
- FT_POS_SIZE( 20 );
- Text [ en-US ] = "SGML syntax highlighting";
+ FT_POS_SIZE( 20 ) ;
+ Text [ en-US ] = "SGML syntax highlighting" ;
};
- LB_WN( HTMLSGML, 20 )
+ LB_WN( HTMLSGML, 20 )
FixedText FT_HTMLCOMMENT
{
- FT_POS_SIZE( 21 );
- Text [ en-US ] = "Comment highlighting";
+ FT_POS_SIZE( 21 ) ;
+ Text [ en-US ] = "Comment highlighting" ;
};
- LB_WN( HTMLCOMMENT, 21 )
+ LB_WN( HTMLCOMMENT, 21 )
FixedText FT_HTMLKEYWORD
{
- FT_POS_SIZE( 22 );
- Text [ en-US ] = "Keyword highlighting";
+ FT_POS_SIZE( 22 ) ;
+ Text [ en-US ] = "Keyword highlighting" ;
};
- LB_WN( HTMLKEYWORD, 22 )
+ LB_WN( HTMLKEYWORD, 22 )
FixedText FT_HTMLUNKNOWN
{
- FT_POS_SIZE( 23 );
- Text [ en-US ] = "Text";
+ FT_POS_SIZE( 23 ) ;
+ Text [ en-US ] = "Text" ;
};
- LB_WN( HTMLUNKNOWN, 23 )
+ LB_WN( HTMLUNKNOWN, 23 )
FixedText FT_CALC
{
- FT_SEP_POS_SIZE( 24 );
- Text [ en-US ] = "Spreadsheet";
+ FT_SEP_POS_SIZE( 24 ) ;
+ Text [ en-US ] = "Spreadsheet" ;
};
FixedText FT_CALCGRID
{
- FT_POS_SIZE( 25 );
- Text [ en-US ] = "Grid lines";
+ FT_POS_SIZE( 25 ) ;
+ Text [ en-US ] = "Grid lines" ;
};
- LB_WN( CALCGRID, 25 )
+ LB_WN( CALCGRID, 25 )
FixedText FT_CALCPAGEBREAK
{
- FT_POS_SIZE( 26 );
- Text [ en-US ] = "Page breaks";
+ FT_POS_SIZE( 26 ) ;
+ Text [ en-US ] = "Page breaks" ;
};
- LB_WN( CALCPAGEBREAK, 26 )
+ LB_WN( CALCPAGEBREAK, 26 )
FixedText FT_CALCPAGEBREAKMANUAL
{
- FT_POS_SIZE( 27 );
- Text [ en-US ] = "Manual page breaks";
+ FT_POS_SIZE( 27 ) ;
+ Text [ en-US ] = "Manual page breaks" ;
};
- LB_WN( CALCPAGEBREAKMANUAL, 27 )
+ LB_WN( CALCPAGEBREAKMANUAL, 27 )
FixedText FT_CALCPAGEBREAKAUTO
{
- FT_POS_SIZE( 28 );
- Text [ en-US ] = "Automatic page breaks";
+ FT_POS_SIZE( 28 ) ;
+ Text [ en-US ] = "Automatic page breaks" ;
};
- LB_WN( CALCPAGEBREAKAUTO, 28)
+ LB_WN( CALCPAGEBREAKAUTO, 28)
FixedText FT_CALCDETECTIVE
{
- FT_POS_SIZE( 29 );
- Text [ en-US ] = "Detective";
+ FT_POS_SIZE( 29 ) ;
+ Text [ en-US ] = "Detective" ;
};
- LB_WN( CALCDETECTIVE, 29 )
+ LB_WN( CALCDETECTIVE, 29 )
FixedText FT_CALCDETECTIVEERROR
{
- FT_POS_SIZE( 30 );
- Text [ en-US ] = "Detective error";
+ FT_POS_SIZE( 30 ) ;
+ Text [ en-US ] = "Detective error" ;
};
- LB_WN( CALCDETECTIVEERROR, 30 )
+ LB_WN( CALCDETECTIVEERROR, 30 )
FixedText FT_CALCREFERENCE
{
- FT_POS_SIZE( 31 );
- Text [ en-US ] = "References";
+ FT_POS_SIZE( 31 ) ;
+ Text [ en-US ] = "References" ;
};
- LB_WN( CALCREFERENCE, 31 )
+ LB_WN( CALCREFERENCE, 31 )
FixedText FT_CALCNOTESBACKGROUND
{
- FT_POS_SIZE( 32 );
- Text [ en-US ] = "Notes background";
+ FT_POS_SIZE( 32 ) ;
+ Text [ en-US ] = "Comment background" ;
};
- LB_WN( CALCNOTESBACKGROUND, 32 )
+ LB_WN( CALCNOTESBACKGROUND, 32 )
FixedText FT_DRAW
{
- FT_SEP_POS_SIZE( 33 );
- Text [ en-US ] = "Drawing / Presentation";
+ FT_SEP_POS_SIZE( 33 ) ;
+ Text [ en-US ] = "Drawing / Presentation" ;
};
FixedText FT_DRAWGRID
{
- FT_POS_SIZE( 34 );
- Text [ en-US ] = "Grid";
+ FT_POS_SIZE( 34 ) ;
+ Text [ en-US ] = "Grid" ;
};
- LB_WN( DRAWGRID, 34 )
+ LB_WN( DRAWGRID, 34 )
- FixedText FT_BASIC
+ FixedText FT_BASIC
{
- FT_SEP_POS_SIZE( 35 );
- Text [ en-US ] = "Basic Syntax Highlighting";
+ FT_SEP_POS_SIZE( 35 ) ;
+ Text [ en-US ] = "Basic Syntax Highlighting" ;
};
FixedText FT_BASICIDENTIFIER
{
- FT_POS_SIZE( 36 );
- Text [ en-US ] = "Identifier";
+ FT_POS_SIZE( 36 ) ;
+ Text [ en-US ] = "Identifier" ;
};
- LB_WN( BASICIDENTIFIER, 36 )
+ LB_WN( BASICIDENTIFIER, 36 )
FixedText FT_BASICCOMMENT
{
- FT_POS_SIZE( 37 );
- Text [ en-US ] = "Comment";
+ FT_POS_SIZE( 37 ) ;
+ Text [ en-US ] = "Comment" ;
};
- LB_WN( BASICCOMMENT, 37 )
+ LB_WN( BASICCOMMENT, 37 )
FixedText FT_BASICNUMBER
{
- FT_POS_SIZE( 38 );
- Text [ en-US ] = "Number";
+ FT_POS_SIZE( 38 ) ;
+ Text [ en-US ] = "Number" ;
};
- LB_WN( BASICNUMBER, 38)
+ LB_WN( BASICNUMBER, 38)
FixedText FT_BASICSTRING
{
- FT_POS_SIZE( 39 );
- Text [ en-US ] = "String";
+ FT_POS_SIZE( 39 ) ;
+ Text [ en-US ] = "String" ;
};
- LB_WN( BASICSTRING, 39 )
+ LB_WN( BASICSTRING, 39 )
FixedText FT_BASICOPERATOR
{
- FT_POS_SIZE( 40 );
- Text [ en-US ] = "Operator";
+ FT_POS_SIZE( 40 ) ;
+ Text [ en-US ] = "Operator" ;
};
- LB_WN( BASICOPERATOR, 40 )
+ LB_WN( BASICOPERATOR, 40 )
FixedText FT_BASICKEYWORD
{
- FT_POS_SIZE( 41 );
- Text [ en-US ] = "Reserved expression";
+ FT_POS_SIZE( 41 ) ;
+ Text [ en-US ] = "Reserved expression" ;
};
- LB_WN( BASICKEYWORD, 41 )
+ LB_WN( BASICKEYWORD, 41 )
FixedText FT_BASICERROR
{
- FT_POS_SIZE( 42 );
- Text [ en-US ] = "Error";
+ FT_POS_SIZE( 42 ) ;
+ Text [ en-US ] = "Error" ;
};
- LB_WN( BASICERROR, 42 )
-
- FixedText FT_SQL_COMMAND
+ LB_WN( BASICERROR, 42 )
+
+ FixedText FT_SQL_COMMAND
{
- FT_SEP_POS_SIZE( 43 );
- Text [ en-US ] = "SQL Syntax Highlighting";
+ FT_SEP_POS_SIZE( 43 ) ;
+ Text [ en-US ] = "SQL Syntax Highlighting" ;
};
-
- FixedText FT_SQLIDENTIFIER
+
+ FixedText FT_SQLIDENTIFIER
{
- FT_POS_SIZE( 44 );
- Text [ en-US ] = "Identifier";
+ FT_POS_SIZE( 44 ) ;
+ Text [ en-US ] = "Identifier" ;
};
LB_WN( SQLIDENTIFIER, 44 )
-
+
FixedText FT_SQLNUMBER
{
- FT_POS_SIZE( 45 );
- Text [ en-US ] = "Number";
+ FT_POS_SIZE( 45 ) ;
+ Text [ en-US ] = "Number" ;
};
LB_WN( SQLNUMBER, 45 )
-
+
FixedText FT_SQLSTRING
{
- FT_POS_SIZE( 46 );
- Text [ en-US ] = "String";
+ FT_POS_SIZE( 46 ) ;
+ Text [ en-US ] = "String" ;
};
LB_WN( SQLSTRING, 46 )
-
+
FixedText FT_SQLOPERATOR
{
- FT_POS_SIZE( 47 );
- Text [ en-US ] = "Operator";
+ FT_POS_SIZE( 47 ) ;
+ Text [ en-US ] = "Operator" ;
};
LB_WN( SQLOPERATOR, 47 )
-
+
FixedText FT_SQLKEYWORD
{
- FT_POS_SIZE( 48 );
- Text [ en-US ] = "Keyword";
+ FT_POS_SIZE( 48 ) ;
+ Text [ en-US ] = "Keyword" ;
};
LB_WN( SQLKEYWORD, 48 )
-
+
FixedText FT_SQLPARAMETER
{
- FT_POS_SIZE( 49 );
- Text [ en-US ] = "Parameter";
+ FT_POS_SIZE( 49 ) ;
+ Text [ en-US ] = "Parameter" ;
};
LB_WN( SQLPARAMETER, 49 )
-
+
FixedText FT_SQLCOMMENT
{
- FT_POS_SIZE( 50 );
- Text [ en-US ] = "Comment";
+ FT_POS_SIZE( 50 ) ;
+ Text [ en-US ] = "Comment" ;
};
LB_WN( SQLCOMMENT, 50 )
- String ST_EXTENSION
+ String ST_EXTENSION
{
- Text [ en-US ] = "Colorsettings of the Extensions";
+ Text [ en-US ] = "Colorsettings of the Extensions" ;
};
- String ST_SPELL_CHECK_HIGHLIGHTING
- {
- Text [ en-US ] = "Spell check highlighting";
- };
- String ST_GRAMMAR_CHECK_HIGHLIGHTING
- {
- Text [ en-US ] = "Grammar check highlighting";
- };
- };
- };
+ String ST_SPELL_CHECK_HIGHLIGHTING
+ {
+ Text [ en-US ] = "Spell check highlighting" ;
+ };
+ String ST_GRAMMAR_CHECK_HIGHLIGHTING
+ {
+ Text [ en-US ] = "Grammar check highlighting" ;
+ };
+ };
+ };
};
QueryBox RID_SVXQB_DELETE_COLOR_CONFIG
{
Buttons = WB_YES_NO ;
DefButton = WB_DEF_NO ;
- Message [ en-US ] = "Do you really want to delete the color scheme?" ;
+ Message [ en-US ] = "Do you really want to delete the color scheme?" ;
};
String RID_SVXSTR_COLOR_CONFIG_DELETE
{
- Text [ en-US ] = "Color Scheme Deletion" ;
+ Text [ en-US ] = "Color Scheme Deletion" ;
};
String RID_SVXSTR_COLOR_CONFIG_SAVE1
{
- Text [ en-US ] = "Save scheme" ;
+ Text [ en-US ] = "Save scheme" ;
};
String RID_SVXSTR_COLOR_CONFIG_SAVE2
{
- Text [ en-US ] = "Name of color scheme" ;
+ Text [ en-US ] = "Name of color scheme" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/securityoptions.src b/main/cui/source/options/securityoptions.src
index 51cb2a1..63562a1 100644
--- a/main/cui/source/options/securityoptions.src
+++ b/main/cui/source/options/securityoptions.src
@@ -48,7 +48,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
Size = MAP_APPFONT ( COL_3-COL_1, 2*RSC_CD_FIXEDLINE_HEIGHT ) ;
Wordbreak = TRUE ;
- Text [ en-US ] = "Warn if document contains recorded changes, versions, hidden information or notes:" ;
+ Text [ en-US ] = "Warn if document contains recorded changes, versions, hidden information or comments:" ;
};
FixedImage FI_SAVESENDDOCS
{
diff --git a/main/helpcontent2/source/text/swriter/01/02110100.xhp b/main/helpcontent2/source/text/swriter/01/02110100.xhp
index c458601..f94386b 100644
--- a/main/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/main/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -24,8 +24,6 @@
-
-
<helpdocument version="1.0">
<meta>
<topic id="textswriter0102110100xml" indexer="include" status="PUBLISH">
@@ -46,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEDOWN" id="bm_id3156109" localize="false"/>
<paragraph role="paragraph" id="par_id3156098" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_SCRL_PAGEDOWN">Click the down button to scroll to the next page or object.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155076" xml-lang="en-US" l10n="U" oldref="3">By default, as long as you have not selected any other entry, the arrow buttons jump to the previous or the next page in the document. The arrow buttons are black if you are browsing through pages and blue if you jump to other objects.</paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="4">The entries largely correspond to those in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> selection box. You can also select other jump destinations. An example are the reminders, which you can set with the <emph>Set Reminder</emph> icon in the Navigator. You can select an object from among the following options on the <emph>Navigation</emph> toolbar: table, text frame, gr [...]
+<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="4">The entries largely correspond to those in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> selection box. You can also select other jump destinations. An example are the reminders, which you can set with the <emph>Set Reminder</emph> icon in the Navigator. You can select an object from among the following options on the <emph>Navigation</emph> toolbar: table, text frame, gr [...]
<paragraph role="paragraph" id="par_id3148783" xml-lang="en-US" l10n="U" oldref="12">For table formulas, you can either jump to all table formulas located within your document or only to the incorrect ones. For incorrect formulas, you jump only to formulas that have resulted in errors. The program skips over formulas with resulting errors (those that reference incorrect formulas).</paragraph>
<paragraph role="heading" id="hd_id3150031" xml-lang="en-US" level="2" l10n="U" oldref="5">Working With the Navigation Toolbar</paragraph>
<paragraph role="paragraph" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="6">Open the <emph>Navigation</emph> toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen.</paragraph>
diff --git a/main/svx/source/dialog/srchdlg.src b/main/svx/source/dialog/srchdlg.src
index f22b5b0..85b5fa0 100644
--- a/main/svx/source/dialog/srchdlg.src
+++ b/main/svx/source/dialog/srchdlg.src
@@ -301,7 +301,7 @@ ModelessDialog RID_SVXDLG_SEARCH
Pos = MAP_APPFONT ( 12, 232 ) ;
Size = MAP_APPFONT ( 126, 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Notes" ;
+ Text [ en-US ] = "Comments" ;
};
CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
{
@@ -383,7 +383,7 @@ ModelessDialog RID_SVXDLG_SEARCH
{
< "Formulas" ; Default ; > ;
< "Values" ; Default ; > ;
- < "Notes" ; Default ; > ;
+ < "Comments" ; Default ; > ;
};
};
FixedText FT_CALC_SEARCHDIR