openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject [openoffice] branch AOO42X updated: Removed whitespace, removed MASKCOLOR
Date Sun, 18 Aug 2019 10:53:01 GMT
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 09cf1e5  Removed whitespace, removed MASKCOLOR
09cf1e5 is described below

commit 09cf1e5792df88b40070e20b06c47796f50dcc8a
Author: mseidel <mseidel@apache.org>
AuthorDate: Sun Aug 18 12:05:22 2019 +0200

    Removed whitespace, removed MASKCOLOR
    
    (cherry picked from commit 346a883464684225badf58c49b7a26254320f353)
---
 main/sw/source/ui/fldui/fldvar.src | 148 +++++++++++++++----------------------
 1 file changed, 58 insertions(+), 90 deletions(-)

diff --git a/main/sw/source/ui/fldui/fldvar.src b/main/sw/source/ui/fldui/fldvar.src
index 461248b..efd9182 100644
--- a/main/sw/source/ui/fldui/fldvar.src
+++ b/main/sw/source/ui/fldui/fldvar.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.
- * 
+ *
  *************************************************************/
 
 
@@ -30,94 +30,94 @@ TabPage TP_FLD_VAR
 	HelpID = HID_FLD_VAR ;
 	SVLook = TRUE ;
 	Hide = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	FixedText FT_VARTYPE
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-		Size = MAP_APPFONT ( 76 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 76, 8 ) ;
 		Text [ en-US ] = "~Type" ;
 		Left = TRUE ;
 	};
 	ListBox LB_VARTYPE
 	{
-	    HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE";
+		HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 6 , 14 ) ;
-		Size = MAP_APPFONT ( 76 , 135 ) ;
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 76, 135 ) ;
 		TabStop = TRUE ;
 		Sort = FALSE ;
 		AutoHScroll = TRUE ;
 	};
 	FixedText FT_VARSELECTION
 	{
-		Pos = MAP_APPFONT ( 88 , 3 ) ;
-		Size = MAP_APPFONT ( 76 , 8 ) ;
+		Pos = MAP_APPFONT ( 88, 3 ) ;
+		Size = MAP_APPFONT ( 76, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "S~election" ;
 	};
 	ListBox LB_VARSELECTION
 	{
-	    HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION";
+		HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 88 , 14 ) ;
-		Size = MAP_APPFONT ( 76 , 135 ) ;
+		Pos = MAP_APPFONT ( 88, 14 ) ;
+		Size = MAP_APPFONT ( 76, 135 ) ;
 		TabStop = TRUE ;
 		Sort = TRUE ;
 	};
 	FixedText FT_VARFORMAT
 	{
-		Pos = MAP_APPFONT ( 170 , 3 ) ;
-		Size = MAP_APPFONT ( 84 , 8 ) ;
+		Pos = MAP_APPFONT ( 170, 3 ) ;
+		Size = MAP_APPFONT ( 84, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "Format" ;
 	};
 	ListBox LB_VARFORMAT
 	{
-	    HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT";
+		HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 170 , 14 ) ;
-		Size = MAP_APPFONT ( 84 , 123 ) ;
+		Pos = MAP_APPFONT ( 170, 14 ) ;
+		Size = MAP_APPFONT ( 84, 123 ) ;
 		TabStop = TRUE ;
 		DropDown = FALSE ;
 	};
 	ListBox LB_VARNUMFORMAT
 	{
-	    HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT";
+		HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 170 , 14 ) ;
-		Size = MAP_APPFONT ( 84 , 123 ) ;
+		Pos = MAP_APPFONT ( 170, 14 ) ;
+		Size = MAP_APPFONT ( 84, 123 ) ;
 		TabStop = TRUE ;
 		DropDown = FALSE ;
 	};
 	CheckBox CB_VARINVISIBLE
 	{
-	    HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE";
-		Pos = MAP_APPFONT ( 170 , 141 ) ;
-		Size = MAP_APPFONT ( 84 , 10 ) ;
+		HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE" ;
+		Pos = MAP_APPFONT ( 170, 141 ) ;
+		Size = MAP_APPFONT ( 84, 10 ) ;
 		Text [ en-US ] = "Invisi~ble" ;
 		TabStop = TRUE ;
 	};
 	FixedText FT_VARCHAPTERHEADER
 	{
-		Pos = MAP_APPFONT ( 170 , 112 ) ;
-		Size = MAP_APPFONT ( 84 , 8 ) ;
+		Pos = MAP_APPFONT ( 170, 112 ) ;
+		Size = MAP_APPFONT ( 84, 8 ) ;
 		Hide = TRUE ;
 		Text [ en-US ] = "Numbering by chapter" ;
 	};
 	FixedText FT_VARCHAPTERLEVEL
 	{
-		Pos = MAP_APPFONT ( 175 , 125 ) ;
-		Size = MAP_APPFONT ( 30 , 8 ) ;
+		Pos = MAP_APPFONT ( 175, 125 ) ;
+		Size = MAP_APPFONT ( 30, 8 ) ;
 		Hide = TRUE ;
 		Text [ en-US ] = "~Level" ;
 	};
 	ListBox LB_VARCHAPTERLEVEL
 	{
-	    HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL";
+		HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL" ;
 		Border = TRUE ;
 		Hide = TRUE ;
-		Pos = MAP_APPFONT ( 208 , 123 ) ;
-		Size = MAP_APPFONT ( 46 , 76 ) ;
+		Pos = MAP_APPFONT ( 208, 123 ) ;
+		Size = MAP_APPFONT ( 46, 76 ) ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
 		StringList [ en-US ] =
@@ -127,16 +127,16 @@ TabPage TP_FLD_VAR
 	};
 	FixedText FT_VARSEPARATOR
 	{
-		Pos = MAP_APPFONT ( 175 , 140 ) ;
-		Size = MAP_APPFONT ( 30 , 10 ) ;
+		Pos = MAP_APPFONT ( 175, 140 ) ;
+		Size = MAP_APPFONT ( 30, 10 ) ;
 		Hide = TRUE ;
 		Text [ en-US ] = "~Separator" ;
 	};
 	Edit ED_VARSEPARATOR
 	{
-	    HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR";
-		Pos = MAP_APPFONT ( 208 , 138 ) ;
-		Size = MAP_APPFONT ( 46 , 12 ) ;
+		HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR" ;
+		Pos = MAP_APPFONT ( 208, 138 ) ;
+		Size = MAP_APPFONT ( 46, 12 ) ;
 		Border = TRUE ;
 		Hide = TRUE ;
 		MaxTextLength = 1 ;
@@ -144,39 +144,39 @@ TabPage TP_FLD_VAR
 	};
 	FixedText FT_VARNAME
 	{
-		Pos = MAP_APPFONT ( 6 , 155 ) ;
-		Size = MAP_APPFONT ( 76 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 155 ) ;
+		Size = MAP_APPFONT ( 76, 8 ) ;
 		Left = TRUE ;
 		Text [ en-US ] = "Na~me" ;
 	};
 	Edit ED_VARNAME
 	{
-	    HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME";
+		HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 6 , 166 ) ;
-		Size = MAP_APPFONT ( 76 , 12 ) ;
+		Pos = MAP_APPFONT ( 6, 166 ) ;
+		Size = MAP_APPFONT ( 76, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 	};
 	FixedText FT_VARVALUE
 	{
-		Pos = MAP_APPFONT ( 88 , 155 ) ;
-		Size = MAP_APPFONT ( 76 , 8 ) ;
+		Pos = MAP_APPFONT ( 88, 155 ) ;
+		Size = MAP_APPFONT ( 76, 8 ) ;
 		Text [ en-US ] = "~Value" ;
 		Left = TRUE ;
 	};
 	Edit ED_VARVALUE
 	{
-	    HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE";
+		HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 88 , 166 ) ;
-		Size = MAP_APPFONT ( 76 , 12 ) ;
+		Pos = MAP_APPFONT ( 88, 166 ) ;
+		Size = MAP_APPFONT ( 76, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 	};
 	ToolBox TBX_VARNEWDEL
 	{
-		Pos = MAP_APPFONT ( 167 , 167 ) ;
+		Pos = MAP_APPFONT ( 167, 167 ) ;
 		SVLook = TRUE ;
 		Border = FALSE ;
 		ItemList =
@@ -185,22 +185,20 @@ TabPage TP_FLD_VAR
 			{
 				Identifier = BT_VARAPPLY ;
 				HelpID = HID_FLDVAR_APPLY ;
-                ItemImage = Image
-                {
-                    ImageBitmap = Bitmap{ File = "sc20558.bmp" ;};
-                    MaskColor = IMAGE_MASK_COLOR ;
-                };
+				ItemImage = Image
+				{
+					ImageBitmap = Bitmap { File = "sc20558.png" ;} ;
+				};
 				Text [ en-US ] = "Apply" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = BT_VARDELETE ;
 				HelpID = HID_FLDVAR_DELETE ;
-                ItemImage = Image
-                {
-                    ImageBitmap = Bitmap{ File = "sc20557.bmp" ;};
-                    MaskColor = IMAGE_MASK_COLOR ;
-                };
+				ItemImage = Image
+				{
+					ImageBitmap = Bitmap { File = "sc20557.png" ;} ;
+				};
 				Text [ en-US ] = "Delete" ;
 			};
 		};
@@ -208,34 +206,4 @@ TabPage TP_FLD_VAR
 	Text [ en-US ] = "Variables" ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF


Mime
View raw message