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 2020/07/24 15:12:37 UTC

[openoffice] branch AOO418 updated (c47bc2a -> 49cf81a)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


    from c47bc2a  Updated graphics for StartCenter
     new 96bf921  Cleaned up resource file
     new b38e0b5  Added space before strings - This fixes issue 128353
     new 49cf81a  Unified size of More button, removed whitespace

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/cui/source/dialogs/passwdomdlg.src |   2 +-
 main/sc/source/ui/src/filter.src        | 667 ++++++++++++++++----------------
 main/svx/source/dialog/srchdlg.src      | 631 +++++++++++++++---------------
 3 files changed, 650 insertions(+), 650 deletions(-)


[openoffice] 02/03: Added space before strings - This fixes issue 128353

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit b38e0b5488caf3c70f99e627b627a500e06f4b71
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Apr 4 15:00:26 2020 +0200

    Added space before strings - This fixes issue 128353
    
    (cherry picked from commit 7257d2a7ed5e882fc1d61eaa70fe929bd9ef0c7a)
---
 main/svx/source/dialog/srchdlg.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/svx/source/dialog/srchdlg.src b/main/svx/source/dialog/srchdlg.src
index fde8b51..9d56ecc 100644
--- a/main/svx/source/dialog/srchdlg.src
+++ b/main/svx/source/dialog/srchdlg.src
@@ -35,11 +35,11 @@ String RID_SVXSTR_SEARCH_STYLES
 };
 String RID_SVXSTR_SEARCH
 {
-	Text [ en-US ] = "(Search)" ;
+	Text [ en-US ] = " (Search)" ;
 };
 String RID_SVXSTR_REPLACE
 {
-	Text [ en-US ] = "(Replace)" ;
+	Text [ en-US ] = " (Replace)" ;
 };
 
 // RID_SVXDLG_SEARCH -----------------------------------------------------


[openoffice] 01/03: Cleaned up resource file

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 96bf921d446c76f8a736777680863b62728f54d6
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Feb 20 11:56:55 2020 +0100

    Cleaned up resource file
    
    (cherry picked from commit 546573de7d213e861263a754754c15008efd0169)
---
 main/svx/source/dialog/srchdlg.src | 627 ++++++++++++++++++-------------------
 1 file changed, 312 insertions(+), 315 deletions(-)

diff --git a/main/svx/source/dialog/srchdlg.src b/main/svx/source/dialog/srchdlg.src
index 7d4fef5..fde8b51 100644
--- a/main/svx/source/dialog/srchdlg.src
+++ b/main/svx/source/dialog/srchdlg.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,29 +7,27 @@
  * 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 <svx/dialogs.hrc>
 #include "srchdlg.hrc"
 #include <sfx2/sfxcommands.h>
 
-#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
-
- // Strings ---------------------------------------------------------------
+// Strings ---------------------------------------------------------------
 
 String RID_SVXSTR_SEARCH_STYLES
 {
@@ -44,7 +42,7 @@ String RID_SVXSTR_REPLACE
 	Text [ en-US ] = "(Replace)" ;
 };
 
- // RID_SVXDLG_SEARCH -----------------------------------------------------
+// RID_SVXDLG_SEARCH -----------------------------------------------------
 
 ModelessDialog RID_SVXDLG_SEARCH
 {
@@ -52,29 +50,29 @@ ModelessDialog RID_SVXDLG_SEARCH
 	OutputSize = TRUE ;
 	Hide = TRUE ;
 	SvLook = TRUE ;
-    Size = MAP_APPFONT ( 200 , 155 ) ;
+	Size = MAP_APPFONT ( 200, 155 ) ;
 	Text [ en-US ] = "Find & Replace" ;
 	Moveable = TRUE ;
 	FixedText FT_SEARCH
 	{
-		Pos = MAP_APPFONT ( 6 , 7 ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 7 ) ;
+		Size = MAP_APPFONT ( 132, 8 ) ;
 		Text [ en-US ] = "~Search for" ;
 	};
 	ComboBox ED_SEARCH
 	{
-	    HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH";
-        Pos = MAP_APPFONT ( 6 , 18 ) ;
-        Size = MAP_APPFONT ( 132 , 98 ) ;
+		HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH" ;
+		Pos = MAP_APPFONT ( 6, 18 ) ;
+		Size = MAP_APPFONT ( 132, 98 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_SEARCH
 	{
-	    HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH";
+		HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 18 ) ;
-        Size = MAP_APPFONT ( 132 , 98 ) ;
+		Pos = MAP_APPFONT ( 6, 18 ) ;
+		Size = MAP_APPFONT ( 132, 98 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		Hide = TRUE ;
@@ -82,38 +80,38 @@ ModelessDialog RID_SVXDLG_SEARCH
 	};
 	FixedText FT_SEARCH_ATTR
 	{
-        Pos = MAP_APPFONT ( 9 , 35 ) ;
-        Size = MAP_APPFONT ( 129 , 16 ) ;
+		Pos = MAP_APPFONT ( 9, 35 ) ;
+		Size = MAP_APPFONT ( 129, 16 ) ;
 		WordBreak = TRUE ;
 		Hide = TRUE ;
 	};
-    FixedText FT_SEARCH_FORMATS
+	FixedText FT_SEARCH_FORMATS
 	{
-        Pos = MAP_APPFONT ( 9 , 35 ) ;
-        Size = MAP_APPFONT ( 129 , 16 ) ;
-        WordBreak = TRUE ;
+		Pos = MAP_APPFONT ( 9, 35 ) ;
+		Size = MAP_APPFONT ( 129, 16 ) ;
+		WordBreak = TRUE ;
 		Hide = TRUE ;
 	};
 	FixedText FT_REPLACE
 	{
-        Pos = MAP_APPFONT ( 6 , 54 ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 54 ) ;
+		Size = MAP_APPFONT ( 132, 8 ) ;
 		Text [ en-US ] = "Re~place with" ;
 	};
 	ComboBox ED_REPLACE
 	{
-	    HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE";
-        Pos = MAP_APPFONT ( 6 , 65 ) ;
-        Size = MAP_APPFONT ( 132 , 98 ) ;
+		HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE" ;
+		Pos = MAP_APPFONT ( 6, 65 ) ;
+		Size = MAP_APPFONT ( 132, 98 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_REPLACE
 	{
-	    HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE";
+		HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 65 ) ;
-        Size = MAP_APPFONT ( 132 , 98 ) ;
+		Pos = MAP_APPFONT ( 6, 65 ) ;
+		Size = MAP_APPFONT ( 132, 98 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		Hide = TRUE ;
@@ -121,318 +119,317 @@ ModelessDialog RID_SVXDLG_SEARCH
 	};
 	FixedText FT_REPLACE_ATTR
 	{
-        Pos = MAP_APPFONT ( 9 , 82 ) ;
-        Size = MAP_APPFONT ( 129 , 16 ) ;
+		Pos = MAP_APPFONT ( 9, 82 ) ;
+		Size = MAP_APPFONT ( 129, 16 ) ;
 		WordBreak = TRUE ;
 		Hide = TRUE ;
 	};
 	FixedText FT_REPLACE_FORMATS
 	{
-        Pos = MAP_APPFONT ( 9 , 82 ) ;
-        Size = MAP_APPFONT ( 129 , 16 ) ;
-        WordBreak = TRUE ;
+		Pos = MAP_APPFONT ( 9, 82 ) ;
+		Size = MAP_APPFONT ( 129, 16 ) ;
+		WordBreak = TRUE ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_SEARCH
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH" ;
+		Pos = MAP_APPFONT ( 144, 9 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "~Find" ;
+		TabStop = TRUE ;
+		DefButton = TRUE ;
+	};
+	PushButton BTN_SEARCH_ALL
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" ;
+		Pos = MAP_APPFONT ( 144, 26 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "Find ~All" ;
+		TabStop = TRUE ;
+	};
+	FixedLine FL_SEARCH_COMMAND
+	{
+		Pos = MAP_APPFONT ( 141, 44 ) ;
+		Size = MAP_APPFONT ( 56, 8 ) ;
+	};
+	PushButton BTN_REPLACE
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE" ;
+		Pos = MAP_APPFONT ( 144, 56 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "~Replace" ;
+		TabStop = TRUE ;
+	};
+	PushButton BTN_REPLACE_ALL
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL" ;
+		Pos = MAP_APPFONT ( 144, 73 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "Replace A~ll" ;
+		TabStop = TRUE ;
+	};
+	FixedLine FL_SEARCH_COMPONENT
+	{
+		Pos = MAP_APPFONT ( 141, 91 ) ;
+		Size = MAP_APPFONT ( 56, 8 ) ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_COMPONENT_1
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1" ;
+		Pos = MAP_APPFONT ( 144, 103 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_COMPONENT_2
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2" ;
+		Pos = MAP_APPFONT ( 144, 120 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_MATCH_CASE
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE" ;
+		Pos = MAP_APPFONT ( 12, 101 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Ma~tch case" ;
+	};
+	CheckBox CB_WHOLE_WORDS
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS" ;
+		Pos = MAP_APPFONT ( 12, 114 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		Text [ en-US ] = "Whole wor~ds only" ;
+		TabStop = TRUE ;
+	};
+	FixedLine FL_BUTTONS
+	{
+		Pos = MAP_APPFONT ( 0, 124 ) ;
+		Size = MAP_APPFONT ( 200, 8 ) ;
+	};
+	MoreButton BTN_MORE
+	{
+		HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE" ;
+		Pos = MAP_APPFONT ( 6, 135 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+		MapUnit = MAP_APPFONT ;
+		Delta = 174 ;
+		State = FALSE ;
+	};
+	HelpButton BTN_HELP
+	{
+		Pos = MAP_APPFONT ( 88, 135 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+	};
+	CancelButton BTN_CLOSE
+	{
+		Pos = MAP_APPFONT ( 144, 135 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "~Close" ;
+		TabStop = TRUE ;
+	};
+	FixedLine FL_OPTIONS
+	{
+		Pos = MAP_APPFONT ( 6, 152 ) ;
+		Size = MAP_APPFONT ( 191, 8 ) ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_SELECTIONS
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS" ;
+		Pos = MAP_APPFONT ( 12, 163 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		Text [ en-US ] = "C~urrent selection only" ;
+		TabStop = TRUE ;
 		Hide = TRUE ;
 	};
-    PushButton BTN_SEARCH
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH";
-        Pos = MAP_APPFONT ( 144 , 9 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Find" ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    PushButton BTN_SEARCH_ALL
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL";
-        Pos = MAP_APPFONT ( 144 , 26 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Find ~All" ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_SEARCH_COMMAND
-    {
-        Pos = MAP_APPFONT ( 141 , 44 ) ;
-        Size = MAP_APPFONT ( 56 , 8 ) ;
-    };
-    PushButton BTN_REPLACE
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE";
-        Pos = MAP_APPFONT ( 144 , 56 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Replace" ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_REPLACE_ALL
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL";
-        Pos = MAP_APPFONT ( 144 , 73 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Replace A~ll" ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_SEARCH_COMPONENT
-    {
-        Pos = MAP_APPFONT ( 141 , 91 ) ;
-        Size = MAP_APPFONT ( 56 , 8 ) ;
-        Hide = TRUE;
-    };
-    PushButton BTN_COMPONENT_1
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1";
-        Pos = MAP_APPFONT ( 144 , 103 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE;
-    };
-    PushButton BTN_COMPONENT_2
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2";
-        Pos = MAP_APPFONT ( 144 , 120 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE;
-    };
-    CheckBox CB_MATCH_CASE
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE";
-        Pos = MAP_APPFONT ( 12 , 101 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Ma~tch case";
-    };
-    CheckBox CB_WHOLE_WORDS
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS";
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "Whole wor~ds only" ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_BUTTONS
-    {
-        Pos = MAP_APPFONT ( 0 , 124 ) ;
-        Size = MAP_APPFONT ( 200 , 8 ) ;
-    };
-    MoreButton BTN_MORE
-    {
-        HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE";
-        Pos = MAP_APPFONT ( 6 , 135 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        MapUnit = MAP_APPFONT ;
-        Delta = 174 ;
-        State = FALSE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 88 , 135 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton BTN_CLOSE
-    {
-        Pos = MAP_APPFONT ( 144 , 135 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Close" ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 152 ) ;
-        Size = MAP_APPFONT ( 191 , 8 ) ;
-        Hide = TRUE ;
-    };
-    CheckBox CB_SELECTIONS
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS";
-        Pos = MAP_APPFONT ( 12 , 163 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "C~urrent selection only" ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    CheckBox CB_BACKWARDS
-	{
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS";
-        Pos = MAP_APPFONT ( 12 , 176 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
+	CheckBox CB_BACKWARDS
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS" ;
+		Pos = MAP_APPFONT ( 12, 176 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
 		Text [ en-US ] = "Bac~kwards" ;
 		TabStop = TRUE ;
-        Hide = TRUE ;
-	};
-    CheckBox CB_REGEXP
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP";
-        Pos = MAP_APPFONT ( 12 , 189 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "Regular e~xpressions" ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    CheckBox CB_SIMILARITY
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY";
-        Pos = MAP_APPFONT ( 12 , 204 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
-        Text [ en-US ] = "S~imilarity search" ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    PushButton PB_SIMILARITY
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY";
-        Pos = MAP_APPFONT ( 124 , 202 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        Text = "~..." ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    CheckBox CB_LAYOUTS
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS";
-        Pos = MAP_APPFONT ( 12 , 219 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "Search for St~yles" ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    CheckBox CB_NOTES
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES";
-        Pos = MAP_APPFONT ( 12 , 232 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Notes";
-    };
-    CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
-	{
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH";
-        Pos = MAP_APPFONT ( 12 , 247 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_REGEXP
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP" ;
+		Pos = MAP_APPFONT ( 12, 189 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		Text [ en-US ] = "Regular e~xpressions" ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "Match character width";
-        Hide = TRUE ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_SIMILARITY
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY" ;
+		Pos = MAP_APPFONT ( 12, 204 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
+		Text [ en-US ] = "S~imilarity search" ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	PushButton PB_SIMILARITY
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY" ;
+		Pos = MAP_APPFONT ( 124, 202 ) ;
+		Size = MAP_APPFONT ( 14, 14 ) ;
+		Text = "~..." ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_LAYOUTS
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS" ;
+		Pos = MAP_APPFONT ( 12, 219 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		Text [ en-US ] = "Search for St~yles" ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_NOTES
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES" ;
+		Pos = MAP_APPFONT ( 12, 232 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Notes" ;
+	};
+	CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH" ;
+		Pos = MAP_APPFONT ( 12, 247 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Match character width" ;
+		Hide = TRUE ;
 	};
 	CheckBox CB_JAP_SOUNDS_LIKE
 	{
-	    HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE";
-        Pos = MAP_APPFONT ( 12 , 260 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE" ;
+		Pos = MAP_APPFONT ( 12, 260 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "Sounds like (Japanese)";
-        Hide = TRUE ;
+		Text [ en-US ] = "Sounds like (Japanese)" ;
+		Hide = TRUE ;
 	};
 	PushButton PB_JAP_OPTIONS
 	{
-	    HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS";
-        Pos = MAP_APPFONT ( 124 , 258 ) ;
-		Size = MAP_APPFONT ( 14 , 14 ) ;
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS" ;
+		Pos = MAP_APPFONT ( 124, 258 ) ;
+		Size = MAP_APPFONT ( 14, 14 ) ;
 		Text = "..." ;
 		TabStop = TRUE ;
-        Hide = TRUE ;
-	};
-    PushButton BTN_ATTRIBUTE
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE";
-        Pos = MAP_APPFONT ( 144 , 163 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Attri~butes..." ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    PushButton BTN_FORMAT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT";
-        Pos = MAP_APPFONT ( 144 , 180 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "For~mat..." ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    PushButton BTN_NOFORMAT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT";
-        Pos = MAP_APPFONT ( 144 , 197 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~No Format" ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-    };
-    FixedLine FL_CALC
-    {
-        Pos = MAP_APPFONT ( 6 , 272 ) ;
-        Size = MAP_APPFONT ( 191 , 8 ) ;
-        Hide = TRUE ;
-    };
-    FixedText FT_CALC_SEARCHIN
-    {
-        Pos = MAP_APPFONT ( 12 , 285 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Search i~n" ;
-        Hide = TRUE ;
-    };
-    ListBox LB_CALC_SEARCHIN
-    {
-        HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 283 ) ;
-        Size = MAP_APPFONT ( 63 , 48 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Hide = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Formulas" ; Default ; > ;
-            < "Values" ; Default ; > ;
-            < "Notes" ; Default ; > ;
-        };
-    };
-    FixedText FT_CALC_SEARCHDIR
-    {
-        Pos = MAP_APPFONT ( 12 , 300 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Search ~direction" ;
-        Hide = TRUE ;
-    };
-    RadioButton RB_CALC_ROWS
-	{
-        HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS";
-        Pos = MAP_APPFONT ( 75 , 300 ) ;
-        Size = MAP_APPFONT ( 63 , 10 ) ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_ATTRIBUTE
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE" ;
+		Pos = MAP_APPFONT ( 144, 163 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "Attri~butes..." ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_FORMAT
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT" ;
+		Pos = MAP_APPFONT ( 144, 180 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "For~mat..." ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	PushButton BTN_NOFORMAT
+	{
+		HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT" ;
+		Pos = MAP_APPFONT ( 144, 197 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "~No Format" ;
+		TabStop = TRUE ;
+		Hide = TRUE ;
+	};
+	FixedLine FL_CALC
+	{
+		Pos = MAP_APPFONT ( 6, 272 ) ;
+		Size = MAP_APPFONT ( 191, 8 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_CALC_SEARCHIN
+	{
+		Pos = MAP_APPFONT ( 12, 285 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
+		Text [ en-US ] = "Search i~n" ;
+		Hide = TRUE ;
+	};
+	ListBox LB_CALC_SEARCHIN
+	{
+		HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN" ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 75, 283 ) ;
+		Size = MAP_APPFONT ( 63, 48 ) ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+		Hide = TRUE ;
+		StringList [ en-US ] =
+		{
+			< "Formulas" ; Default ;	> ;
+			< "Values" ; Default ;		> ;
+			< "Notes" ; Default ;		> ;
+		};
+	};
+	FixedText FT_CALC_SEARCHDIR
+	{
+		Pos = MAP_APPFONT ( 12, 300 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
+		Text [ en-US ] = "Search ~direction" ;
+		Hide = TRUE ;
+	};
+	RadioButton RB_CALC_ROWS
+	{
+		HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS" ;
+		Pos = MAP_APPFONT ( 75, 300 ) ;
+		Size = MAP_APPFONT ( 63, 10 ) ;
 		Text [ en-US ] = "Ro~ws" ;
 		Hide = TRUE ;
 	};
-    RadioButton RB_CALC_COLUMNS
+	RadioButton RB_CALC_COLUMNS
 	{
-        HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS";
-        Pos = MAP_APPFONT ( 75 , 313 ) ;
-        Size = MAP_APPFONT ( 63 , 10 ) ;
+		HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS" ;
+		Pos = MAP_APPFONT ( 75, 313 ) ;
+		Size = MAP_APPFONT ( 63, 10 ) ;
 		Text [ en-US ] = "Colu~mns" ;
 		Hide = TRUE ;
 	};
-    CheckBox CB_ALL_SHEETS
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS";
-        Pos = MAP_APPFONT ( 12 , 326 ) ;
-        Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "Search in all sheets" ;
-        Hide = TRUE ;
-    };
+	CheckBox CB_ALL_SHEETS
+	{
+		HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS" ;
+		Pos = MAP_APPFONT ( 12, 326 ) ;
+		Size = MAP_APPFONT ( 126, 10 ) ;
+		Text [ en-US ] = "Search in all sheets" ;
+		Hide = TRUE ;
+	};
 
-    String STR_WORDCALC
+	String STR_WORDCALC
 	{
 		Text [ en-US ] = "~Entire cells" ;
 	};
-    String STR_MORE_BTN
-    {
-        Text [ en-US ] = "More ~Options" ;
-    };
-    String STR_LESS_BTN
-    {
-        Text [ en-US ] = "Fewer ~Options" ;
-    };
+	String STR_MORE_BTN
+	{
+		Text [ en-US ] = "More ~Options" ;
+	};
+	String STR_LESS_BTN
+	{
+		Text [ en-US ] = "Fewer ~Options" ;
+	};
 };
 
- // ********************************************************************** EOF
-
+// ********************************************************************** EOF


[openoffice] 03/03: Unified size of More button, removed whitespace

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 49cf81a2ae4889ca57116186240d3f205ed4b2cc
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Jul 24 16:59:16 2020 +0200

    Unified size of More button, removed whitespace
    
    (cherry picked from commit b464c4e8143ab968a7bf07ce7a1418fabaa1d785)
---
 main/cui/source/dialogs/passwdomdlg.src |   2 +-
 main/sc/source/ui/src/filter.src        | 667 ++++++++++++++++----------------
 main/svx/source/dialog/srchdlg.src      |   2 +-
 3 files changed, 337 insertions(+), 334 deletions(-)

diff --git a/main/cui/source/dialogs/passwdomdlg.src b/main/cui/source/dialogs/passwdomdlg.src
index 9bb9321..ff8911e 100644
--- a/main/cui/source/dialogs/passwdomdlg.src
+++ b/main/cui/source/dialogs/passwdomdlg.src
@@ -101,7 +101,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 	{
 		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE ;
 		Pos = MAP_APPFONT ( 6, 135 ) ;
-		Size = MAP_APPFONT ( 63, 14 ) ;
+		Size = MAP_APPFONT ( 65, 14 ) ;
 		Delta = 92 ;
 		MapUnit = MAP_APPFONT ;
 		State = FALSE ;
diff --git a/main/sc/source/ui/src/filter.src b/main/sc/source/ui/src/filter.src
index f89f0b7..a65c3f5 100644
--- a/main/sc/source/ui/src/filter.src
+++ b/main/sc/source/ui/src/filter.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,19 +7,20 @@
  * 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 "filter.hrc"
 ModelessDialog RID_SCDLG_FILTER
 {
@@ -27,841 +28,841 @@ ModelessDialog RID_SCDLG_FILTER
 	HelpId = CMD_SID_FILTER ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 279 , 121 ) ;
+	Size = MAP_APPFONT ( 279, 121 ) ;
 	Text [ en-US ] = "Standard Filter" ;
 	Moveable = TRUE ;
 	Closeable = FALSE ;
 	FixedText FT_OP
 	{
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 44 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 14 ) ;
+        Size = MAP_APPFONT ( 44, 8 ) ;
 		Text [ en-US ] = "Operator" ;
 	};
 	FixedText FT_FIELD
 	{
-        Pos = MAP_APPFONT ( 58 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 58, 14 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "Field name" ;
 	};
 	FixedText FT_COND
 	{
-        Pos = MAP_APPFONT ( 122 , 14 ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
+        Pos = MAP_APPFONT ( 122, 14 ) ;
+        Size = MAP_APPFONT ( 47, 8 ) ;
 		Text [ en-US ] = "Condition" ;
 	};
 	FixedText FT_VAL
 	{
-        Pos = MAP_APPFONT ( 201 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 201, 14 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "Value" ;
 	};
 	ListBox LB_OP1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP1";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 25 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 25 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_OP2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP2";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 41 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 41 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_OP3
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP3";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP3" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 57 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 57 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_OP4
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP4";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP4" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 73 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 73 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_FIELD1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 25 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 25 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_FIELD2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 41 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 41 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_FIELD3
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 57 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 57 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_FIELD4
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 73 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 73 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_COND1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND1";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 25 ) ;
-        Size = MAP_APPFONT ( 75 , 145 ) ;
+        Pos = MAP_APPFONT ( 122, 25 ) ;
+        Size = MAP_APPFONT ( 75, 145 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		stringlist [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
-			< "Largest" ; Default ; > ;
-			< "Smallest" ; Default ; > ;
-			< "Largest %" ; Default ; > ;
-			< "Smallest %" ; Default ; > ;
-            < "Contains" ; Default ; > ;
-            < "Does not contain" ; Default ; > ;
-            < "Begins with" ; Default ; > ;
-            < "Does not begin with" ; Default ; > ;
-            < "Ends with" ; Default ; > ;
-            < "Does not end with" ; Default ; > ;
+			< "=" ; Default ;					> ;
+			< "<" ; Default ;					> ;
+			< ">" ; Default ;					> ;
+			< "<=" ; Default ;					> ;
+			< ">=" ; Default ;					> ;
+			< "<>" ; Default ;					> ;
+			< "Largest" ; Default ;				> ;
+			< "Smallest" ; Default ;			> ;
+			< "Largest %" ; Default ;			> ;
+			< "Smallest %" ; Default ;			> ;
+            < "Contains" ; Default ;			> ;
+            < "Does not contain" ; Default ;	> ;
+            < "Begins with" ; Default ;			> ;
+            < "Does not begin with" ; Default ;	> ;
+            < "Ends with" ; Default ;			> ;
+            < "Does not end with" ; Default ;	> ;
 		};
 	};
 	ListBox LB_COND2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND2";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 41 ) ;
-        Size = MAP_APPFONT ( 75 , 145 ) ;
+        Pos = MAP_APPFONT ( 122, 41 ) ;
+        Size = MAP_APPFONT ( 75, 145 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		stringlist [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
-			< "Largest" ; Default ; > ;
-			< "Smallest" ; Default ; > ;
-			< "Largest %" ; Default ; > ;
-			< "Smallest %" ; Default ; > ;
-            < "Contains" ; Default ; > ;
-            < "Does not contain" ; Default ; > ;
-            < "Begins with" ; Default ; > ;
-            < "Does not begin with" ; Default ; > ;
-            < "Ends with" ; Default ; > ;
-            < "Does not end with" ; Default ; > ;
+			< "=" ; Default ;					> ;
+			< "<" ; Default ;					> ;
+			< ">" ; Default ;					> ;
+			< "<=" ; Default ;					> ;
+			< ">=" ; Default ;					> ;
+			< "<>" ; Default ;					> ;
+			< "Largest" ; Default ;				> ;
+			< "Smallest" ; Default ;			> ;
+			< "Largest %" ; Default ;			> ;
+			< "Smallest %" ; Default ;			> ;
+            < "Contains" ; Default ;			> ;
+            < "Does not contain" ; Default ;	> ;
+            < "Begins with" ; Default ;			> ;
+            < "Does not begin with" ; Default ;	> ;
+            < "Ends with" ; Default ;			> ;
+            < "Does not end with" ; Default ;	> ;
 		};
 	};
 	ListBox LB_COND3
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND3";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND3" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 57 ) ;
-        Size = MAP_APPFONT ( 75 , 145 ) ;
+        Pos = MAP_APPFONT ( 122, 57 ) ;
+        Size = MAP_APPFONT ( 75, 145 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		stringlist [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
-			< "Largest" ; Default ; > ;
-			< "Smallest" ; Default ; > ;
-			< "Largest %" ; Default ; > ;
-			< "Smallest %" ; Default ; > ;
-            < "Contains" ; Default ; > ;
-            < "Does not contain" ; Default ; > ;
-            < "Begins with" ; Default ; > ;
-            < "Does not begin with" ; Default ; > ;
-            < "Ends with" ; Default ; > ;
-            < "Does not end with" ; Default ; > ;
+			< "=" ; Default ;					> ;
+			< "<" ; Default ;					> ;
+			< ">" ; Default ;					> ;
+			< "<=" ; Default ;					> ;
+			< ">=" ; Default ;					> ;
+			< "<>" ; Default ;					> ;
+			< "Largest" ; Default ;				> ;
+			< "Smallest" ; Default ;			> ;
+			< "Largest %" ; Default ;			> ;
+			< "Smallest %" ; Default ;			> ;
+            < "Contains" ; Default ;			> ;
+            < "Does not contain" ; Default ;	> ;
+            < "Begins with" ; Default ;			> ;
+            < "Does not begin with" ; Default ;	> ;
+            < "Ends with" ; Default ;			> ;
+            < "Does not end with" ; Default ;	> ;
 		};
 	};
 	ListBox LB_COND4
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND4";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND4" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 73 ) ;
-        Size = MAP_APPFONT ( 75 , 145 ) ;
+        Pos = MAP_APPFONT ( 122, 73 ) ;
+        Size = MAP_APPFONT ( 75, 145 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		stringlist [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
-			< "Largest" ; Default ; > ;
-			< "Smallest" ; Default ; > ;
-			< "Largest %" ; Default ; > ;
-			< "Smallest %" ; Default ; > ;
-            < "Contains" ; Default ; > ;
-            < "Does not contain" ; Default ; > ;
-            < "Begins with" ; Default ; > ;
-            < "Does not begin with" ; Default ; > ;
-            < "Ends with" ; Default ; > ;
-            < "Does not end with" ; Default ; > ;
+			< "=" ; Default ;					> ;
+			< "<" ; Default ;					> ;
+			< ">" ; Default ;					> ;
+			< "<=" ; Default ;					> ;
+			< ">=" ; Default ;					> ;
+			< "<>" ; Default ;					> ;
+			< "Largest" ; Default ;				> ;
+			< "Smallest" ; Default ;			> ;
+			< "Largest %" ; Default ;			> ;
+			< "Smallest %" ; Default ;			> ;
+            < "Contains" ; Default ;			> ;
+            < "Does not contain" ; Default ;	> ;
+            < "Begins with" ; Default ;			> ;
+            < "Does not begin with" ; Default ;	> ;
+            < "Ends with" ; Default ;			> ;
+            < "Does not end with" ; Default ;	> ;
 		};
 	};
 	ComboBox ED_VAL1
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1";
-        Pos = MAP_APPFONT ( 201 , 25 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1" ;
+        Pos = MAP_APPFONT ( 201, 25 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ComboBox ED_VAL2
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2";
-        Pos = MAP_APPFONT ( 201 , 41 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2" ;
+        Pos = MAP_APPFONT ( 201, 41 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ComboBox ED_VAL3
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3";
-        Pos = MAP_APPFONT ( 201 , 57 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3" ;
+        Pos = MAP_APPFONT ( 201, 57 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ComboBox ED_VAL4
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4";
-        Pos = MAP_APPFONT ( 201 , 73 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4" ;
+        Pos = MAP_APPFONT ( 201, 73 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ScrollBar LB_SCROLL
     {
         Pos = MAP_APPFONT ( 265, 25 ) ;
-        Size = MAP_APPFONT ( 8 , 60 ) ;
+        Size = MAP_APPFONT ( 8, 60 ) ;
         TabStop = TRUE ;
         VScroll = TRUE ;
     };
 
     FixedLine FL_CRITERIA
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 267 , 8 ) ;
-		Text [ en-US ] = "Filter criteria";
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 267, 8 ) ;
+		Text [ en-US ] = "Filter criteria" ;
 	};
 	CheckBox BTN_CASE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 130 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 130 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Case ~sensitive" ;
 	};
 	CheckBox BTN_REGEXP
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 130 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 130 ) ;
+        Size = MAP_APPFONT ( 94, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Regular ~expression" ;
 	};
 	CheckBox BTN_HEADER
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 144 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 144 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Range contains ~column labels" ;
 	};
 	CheckBox BTN_UNIQUE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 144 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 144 ) ;
+        Size = MAP_APPFONT ( 94, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~No duplication" ;
 	};
 	CheckBox BTN_COPY_RESULT
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 158 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 158 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Copy ~results to..." ;
 	};
 	CheckBox BTN_DEST_PERS
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS";
+	    HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 158 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 158 ) ;
+        Size = MAP_APPFONT ( 94, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Keep filter criteria" ;
 	};
 	ListBox LB_COPY_AREA
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA";
+	    HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA" ;
 		Border = TRUE ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 21 , 170 ) ;
-        Size = MAP_APPFONT ( 110 , 90 ) ;
+        Pos = MAP_APPFONT ( 21, 170 ) ;
+        Size = MAP_APPFONT ( 110, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	Edit ED_COPY_AREA
 	{
-	    HelpID = "sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA";
+	    HelpID = "sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA" ;
 		Border = TRUE ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 136 , 170 ) ;
-        Size = MAP_APPFONT ( 110 , 12 ) ;
+        Pos = MAP_APPFONT ( 136, 170 ) ;
+        Size = MAP_APPFONT ( 110, 12 ) ;
 		TabStop = TRUE ;
 	};
 	ImageButton RB_COPY_AREA
 	{
-	    HelpID = "sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA";
-        Pos = MAP_APPFONT ( 248 , 169 ) ;
-		Size = MAP_APPFONT ( 13 , 15 ) ;
+	    HelpID = "sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA" ;
+        Pos = MAP_APPFONT ( 248, 169 ) ;
+		Size = MAP_APPFONT ( 13, 15 ) ;
 		TabStop = FALSE ;
 		QuickHelpText [ en-US ] = "Shrink" ;
 	};
     FixedLine FL_OPTIONS
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 118 ) ;
-        Size = MAP_APPFONT ( 267 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 118 ) ;
+        Size = MAP_APPFONT ( 267, 8 ) ;
 	};
 	FixedText FT_DBAREA
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 188 ) ;
-        Size = MAP_APPFONT ( 167 , 8 ) ;
+        Pos = MAP_APPFONT ( 66, 188 ) ;
+        Size = MAP_APPFONT ( 167, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "dummy" ;
 	};
 	FixedText FT_DBAREA_LABEL
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 188 ) ;
-        Size = MAP_APPFONT ( 58 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 188 ) ;
+        Size = MAP_APPFONT ( 58, 8 ) ;
 		Text [ en-US ] = "Data range:" ;
 	};
 	OKButton BTN_OK
 	{
-		Pos = MAP_APPFONT ( 169 , 101 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 168, 101 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		DefButton = TRUE ;
 	};
 	CancelButton BTN_CANCEL
 	{
-		Pos = MAP_APPFONT ( 223 , 101 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 223, 101 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	HelpButton BTN_HELP
 	{
-		Pos = MAP_APPFONT ( 62 , 101 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 113, 101 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	MoreButton BTN_MORE
 	{
-	    HelpID = "sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE";
-		Pos = MAP_APPFONT ( 6 , 101 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		HelpID = "sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE" ;
+		Pos = MAP_APPFONT ( 6, 101 ) ;
+		Size = MAP_APPFONT ( 65, 14 ) ;
 		TabStop = TRUE ;
 		MapUnit = MAP_APPFONT ;
-        Delta = 81 ;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 0 , 91 ) ;
-        Size = MAP_APPFONT ( 279 , 6 ) ;
+		Delta = 81 ;
+	};
+	FixedLine FL_SEPARATOR
+	{
+		Pos = MAP_APPFONT ( 0, 91 ) ;
+		Size = MAP_APPFONT ( 279, 6 ) ;
 	};
 };
- //============================================================================
+//============================================================================
 ModelessDialog RID_SCDLG_SPEC_FILTER
 {
 	OutputSize = TRUE ;
 	HelpId = CMD_SID_SPECIAL_FILTER ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 278 , 83 ) ;
+	Size = MAP_APPFONT ( 278, 83 ) ;
 	Text [ en-US ] = "Advanced Filter" ;
 	Moveable = TRUE ;
 	Closeable = FALSE ;
 	FixedText FT_CRITERIA_AREA
 	{
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 210 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 210, 8 ) ;
 		Text [ en-US ] = "Read ~filter criteria from" ;
 	};
 	ListBox LB_CRITERIA_AREA
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA";
+		HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 90 , 90 ) ;
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 90, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	Edit ED_CRITERIA_AREA
 	{
-	    HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA";
+		HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 14 ) ;
-        Size = MAP_APPFONT ( 99 , 12 ) ;
+		Pos = MAP_APPFONT ( 100, 14 ) ;
+		Size = MAP_APPFONT ( 99, 12 ) ;
 		TabStop = TRUE ;
 	};
 	ImageButton RB_CRITERIA_AREA
 	{
-	    HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA";
-        Pos = MAP_APPFONT ( 201 , 13 ) ;
-		Size = MAP_APPFONT ( 13 , 15 ) ;
+	    HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" ;
+        Pos = MAP_APPFONT ( 201, 13 ) ;
+		Size = MAP_APPFONT ( 13, 15 ) ;
 		TabStop = FALSE ;
 		QuickHelpText [ en-US ] = "Shrink" ;
 	};
 	CheckBox BTN_CASE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 43 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Case sensitive" ;
 	};
 	CheckBox BTN_REGEXP
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 43 ) ;
-        Size = MAP_APPFONT ( 74 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 43 ) ;
+        Size = MAP_APPFONT ( 74, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Regular ~expressions" ;
 	};
 	CheckBox BTN_HEADER
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 57 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 57 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Range c~ontains column labels" ;
 	};
 	CheckBox BTN_UNIQUE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 57 ) ;
-        Size = MAP_APPFONT ( 74 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 57 ) ;
+        Size = MAP_APPFONT ( 74, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~No duplication" ;
 	};
 	CheckBox BTN_COPY_RESULT
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 71 ) ;
-        Size = MAP_APPFONT ( 128 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 71 ) ;
+        Size = MAP_APPFONT ( 128, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Co~py results to" ;
 	};
 	CheckBox BTN_DEST_PERS
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS";
+	    HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 71 ) ;
-        Size = MAP_APPFONT ( 74 , 10 ) ;
+        Pos = MAP_APPFONT ( 142, 71 ) ;
+        Size = MAP_APPFONT ( 74, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Keep filter criteria" ;
 	};
 	ListBox LB_COPY_AREA
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA";
+	    HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA" ;
 		Border = TRUE ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 20 , 83 ) ;
-        Size = MAP_APPFONT ( 76 , 90 ) ;
+        Pos = MAP_APPFONT ( 20, 83 ) ;
+        Size = MAP_APPFONT ( 76, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	Edit ED_COPY_AREA
 	{
-	    HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA";
+	    HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA" ;
 		Border = TRUE ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 83 ) ;
-        Size = MAP_APPFONT ( 99 , 12 ) ;
+        Pos = MAP_APPFONT ( 100, 83 ) ;
+        Size = MAP_APPFONT ( 99, 12 ) ;
 		TabStop = TRUE ;
 	};
 	ImageButton RB_COPY_AREA
 	{
-	    HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA";
-        Pos = MAP_APPFONT ( 201 , 82 ) ;
-		Size = MAP_APPFONT ( 13 , 15 ) ;
+	    HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" ;
+        Pos = MAP_APPFONT ( 201, 82 ) ;
+		Size = MAP_APPFONT ( 13, 15 ) ;
 		TabStop = FALSE ;
 		QuickHelpText [ en-US ] = "Shrink" ;
 	};
     FixedLine FL_OPTIONS
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 210 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 32 ) ;
+        Size = MAP_APPFONT ( 210, 8 ) ;
 		Text [ en-US ] = "Options" ;
 	};
 	FixedText FT_DBAREA
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 101 ) ;
-        Size = MAP_APPFONT ( 155 , 8 ) ;
+        Pos = MAP_APPFONT ( 58, 101 ) ;
+        Size = MAP_APPFONT ( 155, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "dummy" ;
 	};
 	FixedText FT_DBAREA_LABEL
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 101 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 101 ) ;
+        Size = MAP_APPFONT ( 50, 8 ) ;
 		Text [ en-US ] = "Data range:" ;
 	};
 	OKButton BTN_OK
 	{
-		Pos = MAP_APPFONT ( 222 , 6 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 222, 6 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		DefButton = TRUE ;
 	};
 	CancelButton BTN_CANCEL
 	{
-		Pos = MAP_APPFONT ( 222 , 23 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 222, 23 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	HelpButton BTN_HELP
 	{
-		Pos = MAP_APPFONT ( 222 , 43 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 222, 43 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	MoreButton BTN_MORE
 	{
-	    HelpID = "sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE";
-		Pos = MAP_APPFONT ( 223 , 63 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+	    HelpID = "sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE" ;
+		Pos = MAP_APPFONT ( 223, 63 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		MapUnit = MAP_APPFONT ;
         Delta = 32 ;
 	};
 };
- //============================================================================
+//============================================================================
 ModalDialog RID_SCDLG_PIVOTFILTER
 {
 	OutputSize = TRUE ;
 	HelpId = HID_SC_PIVOTFILTER ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
-    Size = MAP_APPFONT ( 298 , 83 ) ;
+    Size = MAP_APPFONT ( 298, 83 ) ;
 	Text [ en-US ] = "Filter" ;
 	Moveable = TRUE ;
 	Closeable = FALSE ;
 	FixedText FT_OP
 	{
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 14 ) ;
+        Size = MAP_APPFONT ( 40, 8 ) ;
 		Text [ en-US ] = "Operator" ;
 	};
 	FixedText FT_FIELD
 	{
-        Pos = MAP_APPFONT ( 58 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 58, 14 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "Field name" ;
 	};
 	FixedText FT_COND
 	{
-        Pos = MAP_APPFONT ( 122 , 14 ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
+        Pos = MAP_APPFONT ( 122, 14 ) ;
+        Size = MAP_APPFONT ( 47, 8 ) ;
 		Text [ en-US ] = "Condition" ;
 	};
 	FixedText FT_VAL
 	{
-        Pos = MAP_APPFONT ( 173 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 173, 14 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "Value" ;
 	};
 	ListBox LB_OP1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 41 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 41 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_OP2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 57 ) ;
-		Size = MAP_APPFONT ( 40 , 46 ) ;
+        Pos = MAP_APPFONT ( 12, 57 ) ;
+		Size = MAP_APPFONT ( 40, 46 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "AND" ; Default ; > ;
-			< "OR" ; Default ; > ;
+			< "AND" ; Default ;	> ;
+			< "OR" ; Default ;	> ;
 		};
 	};
 	ListBox LB_FIELD1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 25 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 25 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_FIELD2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 41 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 41 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_FIELD3
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 57 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+        Pos = MAP_APPFONT ( 58, 57 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ListBox LB_COND1
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 25 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
+        Pos = MAP_APPFONT ( 122, 25 ) ;
+        Size = MAP_APPFONT ( 47, 65 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
+			< "=" ; Default ;	> ;
+			< "<" ; Default ;	> ;
+			< ">" ; Default ;	> ;
+			< "<=" ; Default ;	> ;
+			< ">=" ; Default ;	> ;
+			< "<>" ; Default ;	> ;
 		};
 	};
 	ListBox LB_COND2
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 41 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
+        Pos = MAP_APPFONT ( 122, 41 ) ;
+        Size = MAP_APPFONT ( 47, 65 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
+			< "=" ; Default ;	> ;
+			< "<" ; Default ;	> ;
+			< ">" ; Default ;	> ;
+			< "<=" ; Default ;	> ;
+			< ">=" ; Default ;	> ;
+			< "<>" ; Default ;	> ;
 		};
 	};
 	ListBox LB_COND3
 	{
-	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3";
+	    HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 57 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
+        Pos = MAP_APPFONT ( 122, 57 ) ;
+        Size = MAP_APPFONT ( 47, 65 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "=" ; Default ; > ;
-			< "<" ; Default ; > ;
-			< ">" ; Default ; > ;
-			< "<=" ; Default ; > ;
-			< ">=" ; Default ; > ;
-			< "<>" ; Default ; > ;
+			< "=" ; Default ;	> ;
+			< "<" ; Default ;	> ;
+			< ">" ; Default ;	> ;
+			< "<=" ; Default ;	> ;
+			< ">=" ; Default ;	> ;
+			< "<>" ; Default ;	> ;
 		};
 	};
 	ComboBox ED_VAL1
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1";
-        Pos = MAP_APPFONT ( 173 , 25 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1" ;
+        Pos = MAP_APPFONT ( 173, 25 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ComboBox ED_VAL2
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2";
-        Pos = MAP_APPFONT ( 173 , 41 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2" ;
+        Pos = MAP_APPFONT ( 173, 41 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
 	ComboBox ED_VAL3
 	{
-	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3";
-        Pos = MAP_APPFONT ( 173 , 57 ) ;
-		Size = MAP_APPFONT ( 60 , 90 ) ;
+	    HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3" ;
+        Pos = MAP_APPFONT ( 173, 57 ) ;
+		Size = MAP_APPFONT ( 60, 90 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 	};
     FixedLine FL_CRITERIA
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-		Text [ en-US ] = "Filter criteria";
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 230, 8 ) ;
+		Text [ en-US ] = "Filter criteria" ;
 	};
 	CheckBox BTN_CASE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 86 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 86 ) ;
+        Size = MAP_APPFONT ( 221, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Case sensitive" ;
 	};
 	CheckBox BTN_REGEXP
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP";
+	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 100 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 100 ) ;
+        Size = MAP_APPFONT ( 221, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Regular expression" ;
 	};
 	CheckBox BTN_UNIQUE
 	{
-	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE";
+	    HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE" ;
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 114 ) ;
+        Size = MAP_APPFONT ( 221, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~No duplication" ;
 	};
     FixedLine FL_OPTIONS
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 75 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 75 ) ;
+        Size = MAP_APPFONT ( 230, 8 ) ;
 		Text [ en-US ] = "Options" ;
 	};
 	FixedText FT_DBAREA
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 130 ) ;
-        Size = MAP_APPFONT ( 166 , 8 ) ;
+        Pos = MAP_APPFONT ( 70, 130 ) ;
+        Size = MAP_APPFONT ( 166, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "dummy" ;
 	};
 	FixedText FT_DBAREA_LABEL
 	{
 		Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 130 ) ;
-        Size = MAP_APPFONT ( 58 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 130 ) ;
+        Size = MAP_APPFONT ( 58, 8 ) ;
 		Text [ en-US ] = "Data range:" ;
 	};
 	OKButton BTN_OK
 	{
-        Pos = MAP_APPFONT ( 242 , 6 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 242, 6 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		DefButton = TRUE ;
 	};
 	CancelButton BTN_CANCEL
 	{
-        Pos = MAP_APPFONT ( 242 , 23 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 242, 23 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	HelpButton BTN_HELP
 	{
-        Pos = MAP_APPFONT ( 242 , 43 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 242, 43 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	MoreButton BTN_MORE
 	{
-	    HelpID = "sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE";
-        Pos = MAP_APPFONT ( 242 , 63 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+	    HelpID = "sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE" ;
+        Pos = MAP_APPFONT ( 242, 63 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		MapUnit = MAP_APPFONT ;
         Delta = 61 ;
@@ -888,3 +889,5 @@ String RID_FILTER_VALUE
 {
 	Text [ en-US ] = "Value" ;
 };
+
+// ********************************************************************** EOF
diff --git a/main/svx/source/dialog/srchdlg.src b/main/svx/source/dialog/srchdlg.src
index 9d56ecc..f22b5b0 100644
--- a/main/svx/source/dialog/srchdlg.src
+++ b/main/svx/source/dialog/srchdlg.src
@@ -216,7 +216,7 @@ ModelessDialog RID_SVXDLG_SEARCH
 	{
 		HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE" ;
 		Pos = MAP_APPFONT ( 6, 135 ) ;
-		Size = MAP_APPFONT ( 50, 14 ) ;
+		Size = MAP_APPFONT ( 65, 14 ) ;
 		TabStop = TRUE ;
 		MapUnit = MAP_APPFONT ;
 		Delta = 174 ;