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 2022/12/06 11:10:07 UTC

[openoffice] branch AOO42X updated: Cleanup resource file, removed Maskcolor, small string change

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 03043f4f77 Cleanup resource file, removed Maskcolor, small string change
03043f4f77 is described below

commit 03043f4f776ca8fa281b0669d5f03795b2dbff0c
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 6 12:07:34 2022 +0100

    Cleanup resource file, removed Maskcolor, small string change
    
    (cherry picked from commit bc53c6886054c47639e9d49e7b8ca17fb9a33fbe)
---
 main/formula/source/ui/dlg/formdlgs.src | 835 +++++++++++++++-----------------
 1 file changed, 400 insertions(+), 435 deletions(-)

diff --git a/main/formula/source/ui/dlg/formdlgs.src b/main/formula/source/ui/dlg/formdlgs.src
index da31f2c6a6..7872379538 100644
--- a/main/formula/source/ui/dlg/formdlgs.src
+++ b/main/formula/source/ui/dlg/formdlgs.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,16 +7,16 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
@@ -25,123 +25,113 @@
 #include "ForResId.hrc"
 #include "helpids.hrc"
 
-
-#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
- //---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 TabPage RID_FORMULATAB_FUNCTION
 {
 	Hide = TRUE ;
-	Size = MAP_APPFONT ( 96 , 180 ) ;
-    HelpId = HID_FORMULATAB_FUNCTION ;
-	 //	Titel wird dynamisch gesetzt (s.u.)
-	 //	1. Seite
+	Size = MAP_APPFONT ( 96, 180 ) ;
+	HelpId = HID_FORMULATAB_FUNCTION ;
+	// Titel wird dynamisch gesetzt (s.u.)
+	// 1. page
 	ListBox LB_CATEGORY
 	{
-        HelpId = HID_FORMULA_LB_CATEGORY;
+		HelpId = HID_FORMULA_LB_CATEGORY ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 86 , 112 ) ;
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 86, 112 ) ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Last Used" ; Default ; > ;
-			< "All" ; Default ; > ;
-        };
-		//	< "Database" ; Default ; > ;
-		//	< "Date&Time" ; Default ; > ;
-		//	< "Financial" ; Default ; > ;
-		//	< "Information" ; Default ; > ;
-		//	< "Logical" ; Default ; > ;
-		//	< "Mathematical" ; Default ; > ;
-		//	< "Array" ; Default ; > ;
-		//	< "Statistical" ; Default ; > ;
-		//	< "Spreadsheet" ; Default ; > ;
-		//	< "Text" ; Default ; > ;
-		//	< "Add-in" ; Default ; > ;
+			< "Last Used" ; Default ;		> ;
+			< "All" ; Default ;				> ;
+		};
+		//	< "Database" ; Default ;		> ;
+		//	< "Date&Time" ; Default ;		> ;
+		//	< "Financial" ; Default ;		> ;
+		//	< "Information" ; Default ;		> ;
+		//	< "Logical" ; Default ;			> ;
+		//	< "Mathematical" ; Default ;	> ;
+		//	< "Array" ; Default ;			> ;
+		//	< "Statistical" ; Default ;		> ;
+		//	< "Spreadsheet" ; Default ;		> ;
+		//	< "Text" ; Default ;			> ;
+		//	< "Add-in" ; Default ;			> ;
 		//};
 	};
 	ListBox LB_FUNCTION
 	{
-        HelpId = HID_FORMULA_LB_FUNCTION;
+		HelpId = HID_FORMULA_LB_FUNCTION ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 43 ) ;
-        Size = MAP_APPFONT ( 86 , 133 ) ;
-		Sort = TRUE;
+		Pos = MAP_APPFONT ( 6, 43 ) ;
+		Size = MAP_APPFONT ( 86, 133 ) ;
+		Sort = TRUE ;
 	};
 	FixedText FT_CATEGORY
 	{
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 84 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 84, 8 ) ;
 		Text [ en-US ] = "~Category" ;
 	};
 	FixedText FT_FUNCTION
 	{
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 72 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 32 ) ;
+		Size = MAP_APPFONT ( 72, 8 ) ;
 		Text [ en-US ] = "~Function" ;
 	};
 };
 TabPage RID_FORMULATAB_STRUCT
 {
 	Hide = TRUE ;
-	Size = MAP_APPFONT ( 96 , 180 ) ;
-    HelpId = HID_FORMULATAB_STRUCT ;
-	 //	Titel wird dynamisch gesetzt (s.u.)
-	 //	1. Seite
+	Size = MAP_APPFONT ( 96, 180 ) ;
+	HelpId = HID_FORMULATAB_STRUCT ;
+	// Titel wird dynamisch gesetzt (s.u.)
+	// 1. page
 	Control TLB_STRUCT
 	{
 		Border = TRUE ;
 		TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 86 , 162 ) ;
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 86, 162 ) ;
 		HelpId = HID_FORMULA_FAP_STRUCT ;
 	};
 	FixedText FT_STRUCT
 	{
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 86 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 86, 8 ) ;
 		Text [ en-US ] = "~Structure" ;
 	};
-    Image BMP_STR_CLOSE
-	{
-        ImageBitmap = Bitmap { File = "fapclose.png"; };
-        MaskColor = STD_MASKCOLOR;
-	};
-    Image BMP_STR_CLOSE_H
-    {
-        ImageBitmap = Bitmap { File = "fapclose_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    Image BMP_STR_OPEN
-	{
-        ImageBitmap = Bitmap { File = "fapopen.png"; };
-        MaskColor = STD_MASKCOLOR;
-	};
-    Image BMP_STR_OPEN_H
-    {
-        ImageBitmap = Bitmap { File = "fapopen_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    Image BMP_STR_END
-	{
-        ImageBitmap = Bitmap { File = "fapok.png"; };
-        MaskColor = STD_MASKCOLOR;
-	};
-    Image BMP_STR_END_H
-    {
-        ImageBitmap = Bitmap { File = "fapok_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    Image BMP_STR_ERROR
-	{
-        ImageBitmap = Bitmap { File = "faperror.png"; };
-        MaskColor = STD_MASKCOLOR;
-	};
-    Image BMP_STR_ERROR_H
-    {
-        ImageBitmap = Bitmap { File = "faperror_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
+	Image BMP_STR_CLOSE
+	{
+		ImageBitmap = Bitmap { File = "fapclose.png" ; };
+	};
+	Image BMP_STR_CLOSE_H
+	{
+		ImageBitmap = Bitmap { File = "fapclose_h.png" ; };
+	};
+	Image BMP_STR_OPEN
+	{
+		ImageBitmap = Bitmap { File = "fapopen.png" ; };
+	};
+	Image BMP_STR_OPEN_H
+	{
+		ImageBitmap = Bitmap { File = "fapopen_h.png" ; };
+	};
+	Image BMP_STR_END
+	{
+		ImageBitmap = Bitmap { File = "fapok.png" ; };
+	};
+	Image BMP_STR_END_H
+	{
+		ImageBitmap = Bitmap { File = "fapok_h.png" ; };
+	};
+	Image BMP_STR_ERROR
+	{
+		ImageBitmap = Bitmap { File = "faperror.png" ; };
+	};
+	Image BMP_STR_ERROR_H
+	{
+		ImageBitmap = Bitmap { File = "faperror_h.png" ; };
+	};
 	String STR_STRUCT_ERR1
 	{
 		Text [ en-US ] = "=?" ;
@@ -153,335 +143,335 @@ TabPage RID_FORMULATAB_STRUCT
 };
 ModalDialog RID_FORMULADLG_FORMULA_MODAL
 {
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 321 , 228 ) ;
-    HelpId = HID_FORMULADLG_FORMULA ;
-    Moveable = TRUE ;
-    TabControl TC_FUNCTION
-    {
-        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
-	    Pos = MAP_APPFONT ( 6 , 5 ) ;
-	    Size = MAP_APPFONT ( 102 , 199 ) ;
-	    PageList =
-	    {
-		    PageItem
-		    {
-			    Identifier = TP_FUNCTION ;
-			    Text [ en-US ] = "Functions" ;
-		    };
-		    PageItem
-		    {
-			    Identifier = TP_STRUCT ;
-			    Text [ en-US ] = "Structure" ;
-		    };
-	    };
-    };
-    FixedText FT_HEADLINE
-    {
-	    Pos = MAP_APPFONT ( 115 , 24 ) ;
-        Size = MAP_APPFONT ( 194 , 8 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCNAME
-    {
-        Pos = MAP_APPFONT ( 115 , 38 ) ;
-        Size = MAP_APPFONT ( 194 , 24 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCDESC
-    {
-        Pos = MAP_APPFONT ( 115 , 68 ) ;
-        Size = MAP_APPFONT ( 194 , 64 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_EDITNAME
-    {
-	    Pos = MAP_APPFONT ( 113 , 6 ) ;
-	    Size = MAP_APPFONT ( 83 , 10 ) ;
-    };
-    GroupBox GB_EDIT
-    {
-	    Pos = MAP_APPFONT ( 112 , 18 ) ;
-	    Size = MAP_APPFONT ( 203 , 128 ) ;
-    };
-    FixedText FT_FORMULA
-    {
-	    Pos = MAP_APPFONT ( 112 , 151 ) ;
-	    Size = MAP_APPFONT ( 50 , 10 ) ;
-	    WordBreak = TRUE ;
-	    Text [ en-US ] = "For~mula" ;
-    };
-    Control ED_FORMULA
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 112 , 161 ) ;
-	    Size = MAP_APPFONT ( 203 , 43 ) ;
-	    HelpId = HID_FORMULA_FAP_FORMULA ;
-    };
-    FixedText FT_RESULT
-    {
-	    Pos = MAP_APPFONT ( 198 , 6 ) ;
-	    Size = MAP_APPFONT ( 55 , 10 ) ;
-	    Right = TRUE ;
-	    Text [ en-US ] = "Function result" ;
-    };
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( 321, 228 ) ;
+	HelpId = HID_FORMULADLG_FORMULA ;
+	Moveable = TRUE ;
+	TabControl TC_FUNCTION
+	{
+		HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION" ;
+		Pos = MAP_APPFONT ( 6, 5 ) ;
+		Size = MAP_APPFONT ( 102, 199 ) ;
+		PageList =
+		{
+			PageItem
+			{
+				Identifier = TP_FUNCTION ;
+				Text [ en-US ] = "Functions" ;
+			};
+			PageItem
+			{
+				Identifier = TP_STRUCT ;
+				Text [ en-US ] = "Structure" ;
+			};
+		};
+	};
+	FixedText FT_HEADLINE
+	{
+		Pos = MAP_APPFONT ( 115, 24 ) ;
+		Size = MAP_APPFONT ( 194, 8 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_FUNCNAME
+	{
+		Pos = MAP_APPFONT ( 115, 38 ) ;
+		Size = MAP_APPFONT ( 194, 24 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_FUNCDESC
+	{
+		Pos = MAP_APPFONT ( 115, 68 ) ;
+		Size = MAP_APPFONT ( 194, 64 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_EDITNAME
+	{
+		Pos = MAP_APPFONT ( 113, 6 ) ;
+		Size = MAP_APPFONT ( 83, 10 ) ;
+	};
+	GroupBox GB_EDIT
+	{
+		Pos = MAP_APPFONT ( 112, 18 ) ;
+		Size = MAP_APPFONT ( 203, 128 ) ;
+	};
+	FixedText FT_FORMULA
+	{
+		Pos = MAP_APPFONT ( 112, 151 ) ;
+		Size = MAP_APPFONT ( 50, 10 ) ;
+		WordBreak = TRUE ;
+		Text [ en-US ] = "For~mula" ;
+	};
+	Control ED_FORMULA
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 112, 161 ) ;
+		Size = MAP_APPFONT ( 203, 43 ) ;
+		HelpId = HID_FORMULA_FAP_FORMULA ;
+	};
+	FixedText FT_RESULT
+	{
+		Pos = MAP_APPFONT ( 198, 6 ) ;
+		Size = MAP_APPFONT ( 55, 10 ) ;
+		Right = TRUE ;
+		Text [ en-US ] = "Function result" ;
+	};
 	FixedText WND_RESULT
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 255 , 4 ) ;
-	    Size = MAP_APPFONT ( 60 , 12 ) ;
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 255, 4 ) ;
+		Size = MAP_APPFONT ( 60, 12 ) ;
 		Text [ en-US ] = "Function result" ;
-    };
-    FixedText FT_FORMULA_RESULT
-    {
-	    Pos = MAP_APPFONT ( 217 , 149 ) ;
-	    Size = MAP_APPFONT ( 35 , 10 ) ;
-	    Text [ en-US ] = "Result" ;
-	    Right = TRUE ;
-    };
-    Window WND_FORMULA_RESULT
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 255 , 147 ) ;
-	    Size = MAP_APPFONT ( 60 , 12 ) ;
-    };
-    CheckBox BTN_MATRIX
-    {
-        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
-	    Pos = MAP_APPFONT ( 6 , 208 ) ;
-	    Size = MAP_APPFONT ( 50 , 10 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "Array" ;
-    };
-    Edit ED_REF
-    {
-        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF";
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 76 , 205 ) ;
-	    Size = MAP_APPFONT ( 66 , 12 ) ;
-    };
-    ImageButton RB_REF
-    {
-        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF";
-	    Pos = MAP_APPFONT ( 144 , 205 ) ;
-	    Size = MAP_APPFONT ( 13 , 15 ) ;
-	    TabStop = FALSE ;
-	    QuickHelpText [ en-US ] = "Maximize" ;
-    };
-    HelpButton BTN_HELP
-    {
-	    Pos = MAP_APPFONT ( 72 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-	    Pos = MAP_APPFONT ( 121 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-    };
-    PushButton BTN_BACKWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD";
-	    Pos = MAP_APPFONT ( 171 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "<< ~Back" ;
-    };
-    PushButton BTN_FORWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD";
-	    Pos = MAP_APPFONT ( 219 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "~Next >>" ;
-    };
-    OKButton BTN_END
-    {
-	    Pos = MAP_APPFONT ( 270 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    DefButton = TRUE ;
-    };
-    String STR_TITLE1
-    {
-        Text [ en-US ] = "Function Wizard" ;
-    };
-    String STR_TITLE2
-    {
-        Text [ en-US ] = "Function Wizard  -" ;
-    };
-    String STR_END
-    {
-        Text [ en-US ] = "~End" ;
-    };
+	};
+	FixedText FT_FORMULA_RESULT
+	{
+		Pos = MAP_APPFONT ( 217, 149 ) ;
+		Size = MAP_APPFONT ( 35, 10 ) ;
+		Text [ en-US ] = "Result" ;
+		Right = TRUE ;
+	};
+	Window WND_FORMULA_RESULT
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 255, 147 ) ;
+		Size = MAP_APPFONT ( 60, 12 ) ;
+	};
+	CheckBox BTN_MATRIX
+	{
+		HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX" ;
+		Pos = MAP_APPFONT ( 6, 208 ) ;
+		Size = MAP_APPFONT ( 50, 10 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Array" ;
+	};
+	Edit ED_REF
+	{
+		HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF" ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 76, 205 ) ;
+		Size = MAP_APPFONT ( 66, 12 ) ;
+	};
+	ImageButton RB_REF
+	{
+		HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF" ;
+		Pos = MAP_APPFONT ( 144, 205 ) ;
+		Size = MAP_APPFONT ( 13, 15 ) ;
+		TabStop = FALSE ;
+		QuickHelpText [ en-US ] = "Maximize" ;
+	};
+	HelpButton BTN_HELP
+	{
+		Pos = MAP_APPFONT ( 72, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+	};
+	CancelButton BTN_CANCEL
+	{
+		Pos = MAP_APPFONT ( 121, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+	};
+	PushButton BTN_BACKWARD
+	{
+		HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD" ;
+		Pos = MAP_APPFONT ( 171, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "< ~Back" ;
+	};
+	PushButton BTN_FORWARD
+	{
+		HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD" ;
+		Pos = MAP_APPFONT ( 219, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~Next >" ;
+	};
+	OKButton BTN_END
+	{
+		Pos = MAP_APPFONT ( 270, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		DefButton = TRUE ;
+	};
+	String STR_TITLE1
+	{
+		Text [ en-US ] = "Function Wizard" ;
+	};
+	String STR_TITLE2
+	{
+		Text [ en-US ] = "Function Wizard  -" ;
+	};
+	String STR_END
+	{
+		Text [ en-US ] = "~End" ;
+	};
 
 };
 ModelessDialog RID_FORMULADLG_FORMULA
 {
 	// OutputSize = TRUE ;
 	Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 321 , 228 ) ;
-    HelpId = HID_FORMULADLG_FORMULA ;
-    Moveable = TRUE ;
-    TabControl TC_FUNCTION
-    {
-        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION";
-	    Pos = MAP_APPFONT ( 6 , 5 ) ;
-	    Size = MAP_APPFONT ( 102 , 199 ) ;
-	    PageList =
-	    {
-		    PageItem
-		    {
-			    Identifier = TP_FUNCTION ;
-			    Text [ en-US ] = "Functions" ;
-		    };
-		    PageItem
-		    {
-			    Identifier = TP_STRUCT ;
-			    Text [ en-US ] = "Structure" ;
-		    };
-	    };
-    };
-    FixedText FT_HEADLINE
-    {
-	    Pos = MAP_APPFONT ( 115 , 24 ) ;
-        Size = MAP_APPFONT ( 194 , 8 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCNAME
-    {
-        Pos = MAP_APPFONT ( 115 , 38 ) ;
-        Size = MAP_APPFONT ( 194 , 24 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCDESC
-    {
-        Pos = MAP_APPFONT ( 115 , 68 ) ;
-        Size = MAP_APPFONT ( 194 , 64 ) ;
-	    WordBreak = TRUE ;
-    };
-    FixedText FT_EDITNAME
-    {
-	    Pos = MAP_APPFONT ( 113 , 6 ) ;
-	    Size = MAP_APPFONT ( 83 , 10 ) ;
-    };
-    GroupBox GB_EDIT
-    {
-	    Pos = MAP_APPFONT ( 112 , 18 ) ;
-	    Size = MAP_APPFONT ( 203 , 128 ) ;
-    };
-    FixedText FT_FORMULA
-    {
-	    Pos = MAP_APPFONT ( 112 , 151 ) ;
-	    Size = MAP_APPFONT ( 50 , 10 ) ;
-	    WordBreak = TRUE ;
-	    Text [ en-US ] = "For~mula" ;
-    };
-    Control ED_FORMULA
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 112 , 161 ) ;
-	    Size = MAP_APPFONT ( 203 , 43 ) ;
-	    HelpId = HID_FORMULA_FAP_FORMULA ;
-    };
-    FixedText FT_RESULT
-    {
-	    Pos = MAP_APPFONT ( 198 , 6 ) ;
-	    Size = MAP_APPFONT ( 55 , 10 ) ;
-	    Right = TRUE ;
-	    Text [ en-US ] = "Function result" ;
-    };
-    Window WND_RESULT
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 255 , 4 ) ;
-	    Size = MAP_APPFONT ( 60 , 12 ) ;
-    };
-    FixedText FT_FORMULA_RESULT
-    {
-	    Pos = MAP_APPFONT ( 217 , 149 ) ;
-	    Size = MAP_APPFONT ( 35 , 10 ) ;
-	    Text [ en-US ] = "Result" ;
-	    Right = TRUE ;
-    };
-    Window WND_FORMULA_RESULT
-    {
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 255 , 147 ) ;
-	    Size = MAP_APPFONT ( 60 , 12 ) ;
-    };
-    CheckBox BTN_MATRIX
-    {
-        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX";
-	    Pos = MAP_APPFONT ( 6 , 208 ) ;
-	    Size = MAP_APPFONT ( 50 , 10 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "Array" ;
-    };
-    Edit ED_REF
-    {
-        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF";
-	    Border = TRUE ;
-	    Pos = MAP_APPFONT ( 76 , 205 ) ;
-	    Size = MAP_APPFONT ( 66 , 12 ) ;
-    };
-    ImageButton RB_REF
-    {
-        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF";
-	    Pos = MAP_APPFONT ( 144 , 205 ) ;
-	    Size = MAP_APPFONT ( 13 , 15 ) ;
-	    TabStop = FALSE ;
-	    QuickHelpText [ en-US ] = "Maximize" ;
-    };
-    HelpButton BTN_HELP
-    {
-	    Pos = MAP_APPFONT ( 72 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-	    Pos = MAP_APPFONT ( 121 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-    };
-    PushButton BTN_BACKWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD";
-	    Pos = MAP_APPFONT ( 171 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "<< ~Back" ;
-    };
-    PushButton BTN_FORWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD";
-	    Pos = MAP_APPFONT ( 219 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    Text [ en-US ] = "~Next >>" ;
-    };
-    OKButton BTN_END
-    {
-	    Pos = MAP_APPFONT ( 270 , 208 ) ;
-	    Size = MAP_APPFONT ( 45 , 14 ) ;
-	    TabStop = TRUE ;
-	    DefButton = TRUE ;
-    };
-    String STR_TITLE1
-    {
-        Text [ en-US ] = "Function Wizard" ;
-    };
-    String STR_TITLE2
-    {
-        Text [ en-US ] = "Function Wizard  -" ;
-    };
-    String STR_END
-    {
-        Text [ en-US ] = "~End" ;
-    };
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( 321, 228 ) ;
+	HelpId = HID_FORMULADLG_FORMULA ;
+	Moveable = TRUE ;
+	TabControl TC_FUNCTION
+	{
+		HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION" ;
+		Pos = MAP_APPFONT ( 6, 5 ) ;
+		Size = MAP_APPFONT ( 102, 199 ) ;
+		PageList =
+		{
+			PageItem
+			{
+				Identifier = TP_FUNCTION ;
+				Text [ en-US ] = "Functions" ;
+			};
+			PageItem
+			{
+				Identifier = TP_STRUCT ;
+				Text [ en-US ] = "Structure" ;
+			};
+		};
+	};
+	FixedText FT_HEADLINE
+	{
+		Pos = MAP_APPFONT ( 115, 24 ) ;
+		Size = MAP_APPFONT ( 194, 8 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_FUNCNAME
+	{
+		Pos = MAP_APPFONT ( 115, 38 ) ;
+		Size = MAP_APPFONT ( 194, 24 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_FUNCDESC
+	{
+		Pos = MAP_APPFONT ( 115, 68 ) ;
+		Size = MAP_APPFONT ( 194, 64 ) ;
+		WordBreak = TRUE ;
+	};
+	FixedText FT_EDITNAME
+	{
+		Pos = MAP_APPFONT ( 113, 6 ) ;
+		Size = MAP_APPFONT ( 83, 10 ) ;
+	};
+	GroupBox GB_EDIT
+	{
+		Pos = MAP_APPFONT ( 112, 18 ) ;
+		Size = MAP_APPFONT ( 203, 128 ) ;
+	};
+	FixedText FT_FORMULA
+	{
+		Pos = MAP_APPFONT ( 112, 151 ) ;
+		Size = MAP_APPFONT ( 50, 10 ) ;
+		WordBreak = TRUE ;
+		Text [ en-US ] = "For~mula" ;
+	};
+	Control ED_FORMULA
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 112, 161 ) ;
+		Size = MAP_APPFONT ( 203, 43 ) ;
+		HelpId = HID_FORMULA_FAP_FORMULA ;
+	};
+	FixedText FT_RESULT
+	{
+		Pos = MAP_APPFONT ( 198, 6 ) ;
+		Size = MAP_APPFONT ( 55, 10 ) ;
+		Right = TRUE ;
+		Text [ en-US ] = "Function result" ;
+	};
+	Window WND_RESULT
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 255, 4 ) ;
+		Size = MAP_APPFONT ( 60, 12 ) ;
+	};
+	FixedText FT_FORMULA_RESULT
+	{
+		Pos = MAP_APPFONT ( 217, 149 ) ;
+		Size = MAP_APPFONT ( 35, 10 ) ;
+		Text [ en-US ] = "Result" ;
+		Right = TRUE ;
+	};
+	Window WND_FORMULA_RESULT
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 255, 147 ) ;
+		Size = MAP_APPFONT ( 60, 12 ) ;
+	};
+	CheckBox BTN_MATRIX
+	{
+		HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX" ;
+		Pos = MAP_APPFONT ( 6, 208 ) ;
+		Size = MAP_APPFONT ( 50, 10 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Array" ;
+	};
+	Edit ED_REF
+	{
+		HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF" ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 76, 205 ) ;
+		Size = MAP_APPFONT ( 66, 12 ) ;
+	};
+	ImageButton RB_REF
+	{
+		HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF" ;
+		Pos = MAP_APPFONT ( 144, 205 ) ;
+		Size = MAP_APPFONT ( 13, 15 ) ;
+		TabStop = FALSE ;
+		QuickHelpText [ en-US ] = "Maximize" ;
+	};
+	HelpButton BTN_HELP
+	{
+		Pos = MAP_APPFONT ( 72, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+	};
+	CancelButton BTN_CANCEL
+	{
+		Pos = MAP_APPFONT ( 121, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+	};
+	PushButton BTN_BACKWARD
+	{
+		HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD" ;
+		Pos = MAP_APPFONT ( 171, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "< ~Back" ;
+	};
+	PushButton BTN_FORWARD
+	{
+		HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD" ;
+		Pos = MAP_APPFONT ( 219, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~Next >" ;
+	};
+	OKButton BTN_END
+	{
+		Pos = MAP_APPFONT ( 270, 208 ) ;
+		Size = MAP_APPFONT ( 45, 14 ) ;
+		TabStop = TRUE ;
+		DefButton = TRUE ;
+	};
+	String STR_TITLE1
+	{
+		Text [ en-US ] = "Function Wizard" ;
+	};
+	String STR_TITLE2
+	{
+		Text [ en-US ] = "Function Wizard  -" ;
+	};
+	String STR_END
+	{
+		Text [ en-US ] = "~End" ;
+	};
 };
 
 
@@ -489,57 +479,32 @@ Image RID_BMP_REFBTN1
 {
 	ImageBitmap = Bitmap
 	{
-		File = "refinp1.png";
+		File = "refinp1.png" ;
 	};
-    MaskColor = STD_MASKCOLOR;
 };
 
 Image RID_BMP_REFBTN1_H
 {
 	ImageBitmap = Bitmap
 	{
-        File = "refinp1_h.png";
+		File = "refinp1_h.png" ;
 	};
-    MaskColor = STD_MASKCOLOR;
 };
 
 Image RID_BMP_REFBTN2
 {
 	ImageBitmap = Bitmap
 	{
-		File = "refinp2.png";
+		File = "refinp2.png" ;
 	};
-    MaskColor = STD_MASKCOLOR;
 };
 
 Image RID_BMP_REFBTN2_H
 {
 	ImageBitmap = Bitmap
 	{
-        File = "refinp2_h.png";
+		File = "refinp2_h.png" ;
 	};
-    MaskColor = STD_MASKCOLOR;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF