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: Cleaned up resource files
Date Sun, 16 Aug 2020 11:19:20 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 fd300f9  Cleaned up resource files
fd300f9 is described below

commit fd300f9f037b8f0f190253e51c565af57b24a846
Author: mseidel <mseidel@apache.org>
AuthorDate: Sun Aug 16 11:52:03 2020 +0200

    Cleaned up resource files
    
    (cherry picked from commit 51f11a454dfb1cd695d77e817d8ea21200d8c1a9)
---
 .../ui/animations/CustomAnimationCreateDialog.src  | 87 ++++++++++-----------
 main/svtools/source/control/ruler.src              | 15 ++--
 main/sw/source/ui/chrdlg/paradlg.src               | 90 ++++++++--------------
 3 files changed, 84 insertions(+), 108 deletions(-)

diff --git a/main/sd/source/ui/animations/CustomAnimationCreateDialog.src b/main/sd/source/ui/animations/CustomAnimationCreateDialog.src
index 4445cc1..848e1da 100644
--- a/main/sd/source/ui/animations/CustomAnimationCreateDialog.src
+++ b/main/sd/source/ui/animations/CustomAnimationCreateDialog.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.
- * 
+ *
  *************************************************************/
 
 
@@ -26,18 +26,18 @@
 
 TabDialog DLG_CUSTOMANIMATION_CREATE
 {
-	Size = MAP_APPFONT ( 162 , 244 ) ;
+	Size = MAP_APPFONT ( 162, 244 ) ;
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
 	Moveable = TRUE ;
 	Closeable = TRUE ;
-	
+
 	Text [ en-US ] = "Custom Animation" ;
 
 	TabControl 1
 	{
 		OutputSize = TRUE ;
-		Pos = MAP_APPFONT ( 3 , 3 ) ;
+		Pos = MAP_APPFONT ( 3, 3 ) ;
 		Size = MAP_APPFONT ( 156, 217 ) ;
 		PageList =
 		{
@@ -49,81 +49,81 @@ TabDialog DLG_CUSTOMANIMATION_CREATE
 
 			PageItem
 			{
-				Identifier = RID_TP_CUSTOMANIMATION_EMPHASIS;
-				Text [ en-US ] = "Emphasis";
+				Identifier = RID_TP_CUSTOMANIMATION_EMPHASIS ;
+				Text [ en-US ] = "Emphasis" ;
 			};
 
 			PageItem
 			{
-				Identifier = RID_TP_CUSTOMANIMATION_EXIT;
-				Text [ en-US ] = "Exit";
+				Identifier = RID_TP_CUSTOMANIMATION_EXIT ;
+				Text [ en-US ] = "Exit" ;
 			};
 
 			PageItem
 			{
-				Identifier = RID_TP_CUSTOMANIMATION_MOTIONPATH;
-				Text [ en-US ] = "Motion Paths";
+				Identifier = RID_TP_CUSTOMANIMATION_MOTIONPATH ;
+				Text [ en-US ] = "Motion Paths" ;
 			};
 
 			PageItem
 			{
-				Identifier = RID_TP_CUSTOMANIMATION_MISCEFFECTS;
-				Text [ en-US ] = "Misc Effects";
+				Identifier = RID_TP_CUSTOMANIMATION_MISCEFFECTS ;
+				Text [ en-US ] = "Misc Effects" ;
 			};
 		};
 	};
 	OKButton 1
 	{
-		Pos = MAP_APPFONT ( 3 , 223 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 3, 223 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
-		DefButton = TRUE;
+		DefButton = TRUE ;
 	};
 	CancelButton 1
 	{
-		Pos = MAP_APPFONT ( 56 , 223 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 56, 223 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
-		DefButton = TRUE;
+		DefButton = TRUE ;
 	};
 	HelpButton 1
 	{
-		Pos = MAP_APPFONT ( 109 , 223 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 109, 223 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		TabStop = TRUE ;
 	};
 };
 
 TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
 {
-    HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE";
-	Hide = TRUE;
-	Size = MAP_APPFONT ( 156, 217 );
-	
+	HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE" ;
+	Hide = TRUE ;
+	Size = MAP_APPFONT ( 156, 217 ) ;
+
 	ListBox LB_EFFECTS
 	{
-	    HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS";
-		Pos = MAP_APPFONT ( 3 , 3  ) ;
-		Size = MAP_APPFONT( 144, 160 );
-		OutputSize = TRUE;
+		HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS" ;
+		Pos = MAP_APPFONT ( 3, 3 ) ;
+		Size = MAP_APPFONT ( 144, 160 ) ;
+		OutputSize = TRUE ;
 		TabStop = TRUE ;
 		Border = TRUE ;
 	};
 
 	FixedText FT_SPEED
 	{
-		OutputSize = TRUE;
-		Pos = MAP_APPFONT ( 3 , 167  ) ;
-		Size = MAP_APPFONT( 42, 8 );
+		OutputSize = TRUE ;
+		Pos = MAP_APPFONT ( 3, 167 ) ;
+		Size = MAP_APPFONT ( 42, 8 ) ;
 
-		Text [ en-US ] = "Speed";
+		Text [ en-US ] = "Speed" ;
 	};
 
 	ComboBox CB_SPEED
 	{
-	    HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED";
-		Pos = MAP_APPFONT ( 48 , 166 ) ;
-        Size = MAP_APPFONT ( 101, 48 );
+		HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED" ;
+		Pos = MAP_APPFONT ( 48, 166 ) ;
+		Size = MAP_APPFONT ( 101, 48 ) ;
 		TabStop = TRUE ;
 		Border = TRUE ;
 		DropDown = TRUE ;
@@ -131,16 +131,17 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
 
 	CheckBox CBX_PREVIEW
 	{
-	    HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW";
-        Pos = MAP_APPFONT ( 3 , 181 ) ;
-        Size = MAP_APPFONT ( 143 , 10 ) ;
+		HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW" ;
+		Pos = MAP_APPFONT ( 3, 181 ) ;
+		Size = MAP_APPFONT ( 143, 10 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Automatic preview" ;
 	};
-	
+
 	String STR_USERPATH
 	{
-		Text [ en-US ] = "User paths";
+		Text [ en-US ] = "User paths" ;
 	};
 };
 
+// ********************************************************************** EOF
diff --git a/main/svtools/source/control/ruler.src b/main/svtools/source/control/ruler.src
index e73b715..c7abb22 100644
--- a/main/svtools/source/control/ruler.src
+++ b/main/svtools/source/control/ruler.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,26 +7,29 @@
  * 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 "svtools/svtools.hrc"
 
 String STR_SVT_ACC_RULER_HORZ_NAME
 {
-	Text[ en-US ] = "Horizontal Ruler";
+	Text [ en-US ] = "Horizontal Ruler" ;
 };
 String STR_SVT_ACC_RULER_VERT_NAME
 {
-	Text[ en-US ] = "Vertical Ruler";
+	Text [ en-US ] = "Vertical Ruler" ;
 };
 
+// ********************************************************************** EOF
diff --git a/main/sw/source/ui/chrdlg/paradlg.src b/main/sw/source/ui/chrdlg/paradlg.src
index 303db15..32190b0 100644
--- a/main/sw/source/ui/chrdlg/paradlg.src
+++ b/main/sw/source/ui/chrdlg/paradlg.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.
- * 
+ *
  *************************************************************/
 
 
@@ -26,8 +26,8 @@
 #include "paradlg.hrc"
 #include <svx/dialogs.hrc>
 
-#define HelpText "error - hier keine HelpTexte HelpText"
- // #define DLG_PARA 256
+#define HelpText "error - no HelpText here"
+// #define DLG_PARA 256
 TabDialog DLG_PARA
 {
 	OutputSize = TRUE ;
@@ -42,7 +42,6 @@ TabDialog DLG_PARA
 			PageItem
 			{
 				Identifier = TP_PARA_STD ;
-				/* ### ACHTUNG: Neuer Text in Resource? Einz�ge und Abst�nde : Einz�ge und Abst�nde
*/
 				Text [ en-US ] = "Indents & Spacing" ;
 				PageResID = TP_PARA_STD ;
 			};
@@ -55,14 +54,13 @@ TabDialog DLG_PARA
 			PageItem
 			{
 				Identifier = TP_PARA_EXT ;
-				/* ### ACHTUNG: Neuer Text in Resource? Textflu?: Textflu?*/
 				Text [ en-US ] = "Text Flow" ;
 				PageResID = TP_PARA_EXT ;
 			};
 			PageItem
 			{
-				Identifier = TP_PARA_ASIAN;
-				Text [ en-US ] = "Asian Typography";
+				Identifier = TP_PARA_ASIAN ;
+				Text [ en-US ] = "Asian Typography" ;
 			};
 			PageItem
 			{
@@ -88,27 +86,27 @@ TabDialog DLG_PARA
 				PageResID = TP_BORDER ;
 			};
 
-            //UUUU new Area and Transparence TabPages
-            PageItem
-            {
-                Identifier = RID_SVXPAGE_AREA;
-                PageResID = RID_SVXPAGE_AREA;
-                Text [ en-US ] = "Area" ;
-            };
-            PageItem
-            {
-                Identifier = RID_SVXPAGE_TRANSPARENCE;
-                PageResID = RID_SVXPAGE_TRANSPARENCE;
-                Text [ en-US ] = "Transparency" ;
-            };
+			//UUUU new Area and Transparence TabPages
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_AREA ;
+				PageResID = RID_SVXPAGE_AREA ;
+				Text [ en-US ] = "Area" ;
+			};
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_TRANSPARENCE ;
+				PageResID = RID_SVXPAGE_TRANSPARENCE ;
+				Text [ en-US ] = "Transparency" ;
+			};
 
-            //UUUU Remove?
-            //PageItem
-            //{
-            //    Identifier = TP_BACKGROUND ;
-            //    Text [ en-US ] = "Background" ;
-            //    PageResID = TP_BACKGROUND ;
-            //};
+			//UUUU Remove?
+			//PageItem
+			//{
+			//	Identifier = TP_BACKGROUND ;
+			//	Text [ en-US ] = "Background" ;
+			//	PageResID = TP_BACKGROUND ;
+			//};
 		};
 	};
 };
@@ -126,7 +124,6 @@ TabDialog DLG_DRAWPARA
 			PageItem
 			{
 				Identifier = TP_PARA_STD ;
-				/* ### ACHTUNG: Neuer Text in Resource? Einz�ge und Abst�nde : Einz�ge und Abst�nde
*/
 				Text [ en-US ] = "Indents & Spacing" ;
 				PageResID = TP_PARA_STD ;
 			};
@@ -138,8 +135,8 @@ TabDialog DLG_DRAWPARA
 			};
 			PageItem
 			{
-				Identifier = TP_PARA_ASIAN;
-				Text [ en-US ] = "Asian Typography";
+				Identifier = TP_PARA_ASIAN ;
+				Text [ en-US ] = "Asian Typography" ;
 			};
 			PageItem
 			{
@@ -151,29 +148,4 @@ TabDialog DLG_DRAWPARA
 	};
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF


Mime
View raw message