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/05/15 20:17:38 UTC

[openoffice] branch AOO42X updated: Cleaned up resource file

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 4ec186a  Cleaned up resource file
4ec186a is described below

commit 4ec186a031a78fc3425551faa3c8d03002a92c7f
Author: mseidel <ms...@apache.org>
AuthorDate: Fri May 15 22:14:04 2020 +0200

    Cleaned up resource file
    
    (cherry picked from commit ff29ddc6d056e90e04af6c467652073a012e3593)
---
 main/sw/source/ui/dbui/dbui.src | 129 ++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/main/sw/source/ui/dbui/dbui.src b/main/sw/source/ui/dbui/dbui.src
index 990d1f3..b457052 100644
--- a/main/sw/source/ui/dbui/dbui.src
+++ b/main/sw/source/ui/dbui/dbui.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,66 +7,67 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
- // #pragma ******************************************************************
 
- // #include *****************************************************************
+// #pragma ******************************************************************
+
+// #include *****************************************************************
 #include "dbui.hrc"
 #include "helpid.h"
 ModalDialog DLG_DBSELECTION
 {
-    HelpID = "sw:ModalDialog:DLG_DBSELECTION";
+	HelpID = "sw:ModalDialog:DLG_DBSELECTION" ;
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 168 , 132 ) ;
+	Size = MAP_APPFONT ( 168, 132 ) ;
 	Moveable = TRUE ;
 	Control TLB_DBLIST
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 6 , 6 ) ;
-		Size = MAP_APPFONT ( 100 , 120 ) ;
+		Pos = MAP_APPFONT ( 6, 6 ) ;
+		Size = MAP_APPFONT ( 100, 120 ) ;
 	};
 	OKButton BTN_OK
 	{
-		Pos = MAP_APPFONT ( 112 , 6 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 112, 6 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 		Disable = TRUE ;
 	};
 	CancelButton BTN_CANCEL
 	{
-		Pos = MAP_APPFONT ( 112 , 23 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 112, 23 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	HelpButton BTN_HELP
 	{
-		Pos = MAP_APPFONT ( 112 , 43 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 112, 43 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 	Text [ en-US ] = "Database Selection" ;
 };
- // DLG_PRINTMONITOR ------------------------------------------------------
+// DLG_PRINTMONITOR ------------------------------------------------------
 ModelessDialog DLG_PRINTMONITOR
 {
-	HelpID = HID_MERGE_PRINTMONITOR  ;
+	HelpID = HID_MERGE_PRINTMONITOR ;
 	SVLOOK = TRUE ;
 	HIDE = TRUE ;
 	OUTPUTSIZE = TRUE ;
-    Size = MAP_APPFONT ( 118, 72 ) ;
+	Size = MAP_APPFONT ( 118, 72 ) ;
 	MOVEABLE = TRUE ;
 	APP = FALSE ;
 	FixedText FT_DOCNAME
@@ -78,49 +79,49 @@ ModelessDialog DLG_PRINTMONITOR
 	FixedText FT_PRINTING
 	{
 		Pos = MAP_APPFONT ( 6, 17 ) ;
-		Size = MAP_APPFONT (  100, 8 ) ;
+		Size = MAP_APPFONT ( 100, 8 ) ;
 		CENTER = TRUE ;
 		Text [ en-US ] = "is being prepared for printing on" ;
 	};
 	FixedText FT_SENDING
 	{
 		Pos = MAP_APPFONT ( 6, 17 ) ;
-		Size = MAP_APPFONT (  100, 8 ) ;
+		Size = MAP_APPFONT ( 100, 8 ) ;
 		CENTER = TRUE ;
-		Text [ en-US ] = "is being sent to";
+		Text [ en-US ] = "is being sent to" ;
 	};
 	FixedText FT_SAVING
 	{
 		Pos = MAP_APPFONT ( 6, 17 ) ;
-		Size = MAP_APPFONT (  100, 8 ) ;
+		Size = MAP_APPFONT ( 100, 8 ) ;
 		CENTER = TRUE ;
 		Text [ en-US ] = "is being saved to" ;
 	};
 	FixedText FT_PRINTER
 	{
 		Pos = MAP_APPFONT ( 6, 28 ) ;
-		Size = MAP_APPFONT (  100, 8 ) ;
+		Size = MAP_APPFONT ( 100, 8 ) ;
 		CENTER = TRUE ;
 	};
 	FixedText FT_PRINTINFO
 	{
 		Pos = MAP_APPFONT ( 6, 39 ) ;
-		Size = MAP_APPFONT (  100, 8 ) ;
+		Size = MAP_APPFONT ( 100, 8 ) ;
 		CENTER = TRUE ;
 	};
 	CancelButton PB_CANCELPRNMON
 	{
 		Pos = MAP_APPFONT ( 31, 52 ) ;
-		Size = MAP_APPFONT (  50, 14 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TABSTOP = TRUE ;
 	};
 	String STR_EMAILMON
 	{
-		Text [ en-US ] = "Send-Monitor";
+		Text [ en-US ] = "Send-Monitor" ;
 	};
 	String STR_SAVEMON
 	{
-		Text [ en-US ] = "Save-Monitor";
+		Text [ en-US ] = "Save-Monitor" ;
 	};
 	Text [ en-US ] = "Print monitor" ;
 };
@@ -132,73 +133,73 @@ String STR_DB_EMAIL
 
 StringArray SA_ADDRESS_HEADER
 {
-    ItemList [en-US]=
-    {
-        < "Title" ;                 MM_PART_TITLE           ;> ;
-        < "First Name" ;            MM_PART_FIRSTNAME       ;> ;
-        < "Last Name" ;             MM_PART_LASTNAME        ;> ;
-        < "Company Name" ;          MM_PART_COMPANY         ;> ;
-        < "Address Line 1" ;        MM_PART_ADDRESS_1       ;> ;
-        < "Address Line 2" ;        MM_PART_ADDRESS_2       ;> ;
-        < "City" ;                  MM_PART_CITY            ;> ;
-        < "State" ;                 MM_PART_REGION          ;> ;
-        < "ZIP" ;                   MM_PART_ZIP             ;> ;
-        < "Country" ;               MM_PART_COUNTRY         ;> ;
-        < "Telephone private" ;     MM_PART_PHONE_PRIVATE   ;> ;
-        < "Telephone business" ;    MM_PART_PHONE_BUSINESS  ;> ;
-        < "E-mail Address" ;        MM_PART_E_MAIL          ;> ;
-        < "Gender";                 MM_PART_GENDER          ;> ;
-    };
+	ItemList [en-US]=
+	{
+		< "Title" ;					MM_PART_TITLE			;> ;
+		< "First Name" ;			MM_PART_FIRSTNAME		;> ;
+		< "Last Name" ;				MM_PART_LASTNAME		;> ;
+		< "Company Name" ;			MM_PART_COMPANY			;> ;
+		< "Address Line 1" ;		MM_PART_ADDRESS_1		;> ;
+		< "Address Line 2" ;		MM_PART_ADDRESS_2		;> ;
+		< "City" ;					MM_PART_CITY			;> ;
+		< "State" ;					MM_PART_REGION			;> ;
+		< "ZIP" ;					MM_PART_ZIP				;> ;
+		< "Country" ;				MM_PART_COUNTRY			;> ;
+		< "Telephone private" ;		MM_PART_PHONE_PRIVATE	;> ;
+		< "Telephone business" ;	MM_PART_PHONE_BUSINESS	;> ;
+		< "E-mail Address" ;		MM_PART_E_MAIL			;> ;
+		< "Gender" ;				MM_PART_GENDER			;> ;
+	};
 };
 String STR_NOTASSIGNED
 {
-    Text[ en-US ] = " not yet matched ";
+	Text [ en-US ] = " not yet matched " ;
 };
 String STR_FILTER_ALL
 {
-    Text [ en-US ] = "All files (*.*)" ;
+	Text [ en-US ] = "All files (*.*)" ;
 };
 String STR_FILTER_ALL_DATA
 {
-    Text [ en-US ] = "Address lists(*.*)" ;
+	Text [ en-US ] = "Address lists (*.*)" ;
 };
 String STR_FILTER_SXB
 {
-    Text [ en-US ] = "%PRODUCTNAME Base (*.odb)" ;
+	Text [ en-US ] = "%PRODUCTNAME Base (*.odb)" ;
 };
 String STR_FILTER_SXC
 {
-    Text [ en-US ] = "%PRODUCTNAME Calc (*.ods;*.sxc)" ;
+	Text [ en-US ] = "%PRODUCTNAME Calc (*.ods;*.sxc)" ;
 };
 String STR_FILTER_DBF
 {
-    Text [ en-US ] = "dBase (*.dbf)" ;
+	Text [ en-US ] = "dBase (*.dbf)" ;
 };
 String STR_FILTER_XLS
 {
-    Text [ en-US ] = "Microsoft Excel (*.xls)" ;
+	Text [ en-US ] = "Microsoft Excel (*.xls)" ;
 };
 String STR_FILTER_TXT
 {
-    Text [ en-US ] = "Plain text (*.txt)" ;
+	Text [ en-US ] = "Plain text (*.txt)" ;
 };
 String STR_FILTER_CSV
 {
-    Text [ en-US ] = "Text Comma Separated (*.csv)" ;
+	Text [ en-US ] = "Text Comma Separated (*.csv)" ;
 };
 String STR_FILTER_MDB
 {
-    Text [ en-US ] = "Microsoft Access (*.mdb)" ;
+	Text [ en-US ] = "Microsoft Access (*.mdb)" ;
 };
 String STR_FILTER_ACCDB
 {
-    Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
+	Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
 };
 
- // DLG_MM_CREATIONMONITOR ------------------------------------------------------
+// DLG_MM_CREATIONMONITOR ------------------------------------------------------
 ModelessDialog DLG_MM_CREATIONMONITOR
 {
-	HelpID = HID_MERGE_PRINTMONITOR  ;
+	HelpID = HID_MERGE_PRINTMONITOR ;
 	SVLOOK = TRUE ;
 	HIDE = TRUE ;
 	OUTPUTSIZE = TRUE ;
@@ -207,10 +208,10 @@ ModelessDialog DLG_MM_CREATIONMONITOR
 	_HEIGHT = 52 ;
 	MOVEABLE = TRUE ;
 	APP = FALSE ;
-	
+
 	Text [ en-US ] = "Mail Merge" ;
-	
-    FixedText FT_STATUS
+
+	FixedText FT_STATUS
 	{
 		HIDE = FALSE ;
 		_XYMAPMODE = MAP_APPFONT ;
@@ -247,7 +248,7 @@ ModelessDialog DLG_MM_CREATIONMONITOR
 		_WHMAPMODE = MAP_APPFONT ;
 		_WIDTH = 91 ;
 		_HEIGHT = 8 ;
-		Text [ en-US ] = "Creating documents...";
+		Text [ en-US ] = "Creating documents..." ;
 		LEFT = TRUE ;
 		CENTER = FALSE ;
 		RIGHT = FALSE ;
@@ -261,7 +262,7 @@ ModelessDialog DLG_MM_CREATIONMONITOR
 		_WHMAPMODE = MAP_APPFONT ;
 		_WIDTH = 91 ;
 		_HEIGHT = 8 ;
-		Text [ en-US ] = "%X of %Y";
+		Text [ en-US ] = "%X of %Y" ;
 		LEFT = TRUE ;
 		CENTER = FALSE ;
 		RIGHT = FALSE ;
@@ -278,3 +279,5 @@ ModelessDialog DLG_MM_CREATIONMONITOR
 		TABSTOP = TRUE ;
 	};
 };
+
+// ********************************************************************** EOF