openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject [openoffice] branch trunk updated: Cleaned up resource files
Date Thu, 07 Nov 2019 11:56:32 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/trunk by this push:
     new db2d270  Cleaned up resource files
db2d270 is described below

commit db2d270d11234a238d8ea67b7171d900a83dc846
Author: mseidel <mseidel@apache.org>
AuthorDate: Thu Nov 7 12:56:03 2019 +0100

    Cleaned up resource files
---
 main/chart2/source/controller/dialogs/Bitmaps.src |  96 +++---
 main/cui/source/options/optchart.src              |  60 ++--
 main/cui/source/options/optctl.src                |  94 +++---
 main/cui/source/options/optdict.src               | 199 +++++-------
 main/cui/source/options/optgdlg.src               |  58 ++--
 main/cui/source/options/opthtml.src               |  52 +--
 main/cui/source/options/optmemory.src             |  32 +-
 main/extensions/source/abpilot/abspilot.src       | 376 +++++++++++-----------
 main/sd/source/ui/dlg/PaneDockingWindow.src       |  22 +-
 9 files changed, 468 insertions(+), 521 deletions(-)

diff --git a/main/chart2/source/controller/dialogs/Bitmaps.src b/main/chart2/source/controller/dialogs/Bitmaps.src
index 124dcea..2f126f3 100644
--- a/main/chart2/source/controller/dialogs/Bitmaps.src
+++ b/main/chart2/source/controller/dialogs/Bitmaps.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,70 +7,61 @@
  * 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 "Bitmaps.hrc"
 
 Image IMG_TYPE_COLUMN
 {
-	ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typecolumn_16.png" ;} ;
 };
 Image IMG_TYPE_BAR
 {
-	ImageBitmap = Bitmap { File = "typebar_16.png " ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typebar_16.png " ;} ;
 };
 Image IMG_TYPE_PIE
 {
-	ImageBitmap = Bitmap { File = "typepie_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typepie_16.png" ;} ;
 };
 Image IMG_TYPE_LINE
 {
-	ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typepointline_16.png" ;} ;
 };
 Image IMG_TYPE_XY
 {
-	ImageBitmap = Bitmap { File = "typexy_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typexy_16.png" ;} ;
 };
 Image IMG_TYPE_AREA
 {
-	ImageBitmap = Bitmap { File = "typearea_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typearea_16.png" ;} ;
 };
 Image IMG_TYPE_NET
 {
-	ImageBitmap = Bitmap { File = "typenet_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typenet_16.png" ;} ;
 };
 Image IMG_TYPE_STOCK
 {
-	ImageBitmap = Bitmap { File = "typestock_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typestock_16.png" ;} ;
 };
 Image IMG_TYPE_COLUMN_LINE
 {
-	ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typecolumnline_16.png" ;} ;
 };
 Image IMG_TYPE_BUBBLE
 {
-	ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
-	MaskColor = STD_MASKCOLOR;
+	ImageBitmap = Bitmap {File = "typebubble_16.png" ;} ;
 };
 Bitmap BMP_BUBBLE_1
 {
@@ -149,7 +140,7 @@ Bitmap BMP_CIRCLES_3D_EXPLODED
 //---------------------
 Bitmap BMP_DONUT_2D
 {
-    File = "donut_52x60.png" ;
+	File = "donut_52x60.png" ;
 };
 Bitmap BMP_DONUT_2D_EXPLODED
 {
@@ -157,11 +148,11 @@ Bitmap BMP_DONUT_2D_EXPLODED
 };
 Bitmap BMP_DONUT_3D
 {
-    File = "donut3d_52x60.png" ;
+	File = "donut3d_52x60.png" ;
 };
 Bitmap BMP_DONUT_3D_EXPLODED
 {
-    File = "donut3dexploded_52x60.png" ;
+	File = "donut3dexploded_52x60.png" ;
 };
 //---------------------
 Bitmap BMP_COLUMNS_2D_1
@@ -445,50 +436,48 @@ Bitmap BMP_STOCK_4
 	File = "stockcolumnsattach_52x60.png" ;
 };
 //---------------------
-//---------------------
-//---------------------
 //error indicator
 Image BMP_INDICATE_BOTH_VERTI
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errorbothverti_30.png" ;
-    };
+		File = "errorbothverti_30.png" ;
+	};
 };
 Image BMP_INDICATE_DOWN
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errordown_30.png" ;
-    };
+		File = "errordown_30.png" ;
+	};
 };
 Image BMP_INDICATE_UP
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errorup_30.png" ;
-    };
+		File = "errorup_30.png" ;
+	};
 };
 Image BMP_INDICATE_BOTH_HORI
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errorbothhori_30.png" ;
-    };
+		File = "errorbothhori_30.png" ;
+	};
 };
 Image BMP_INDICATE_RIGHT
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errorright_30.png" ;
-    };
+		File = "errorright_30.png" ;
+	};
 };
 Image BMP_INDICATE_LEFT
 {
 	ImageBitmap = Bitmap
 	{
-        File = "errorleft_30.png" ;
-    };
+		File = "errorleft_30.png" ;
+	};
 };
 
 //---------------------
@@ -497,43 +486,44 @@ Image BMP_REGRESSION_NONE
 {
 	ImageBitmap = Bitmap
 	{
-        File = "regno.bmp" ;
-    };
+		File = "regno.png" ;
+	};
 };
 Image BMP_REGRESSION_LINEAR
 {
 	ImageBitmap = Bitmap
 	{
-        File = "reglin.bmp" ;
-    };
+		File = "reglin.png" ;
+	};
 };
 Image BMP_REGRESSION_LOG
 {
 	ImageBitmap = Bitmap
 	{
-        File = "reglog.bmp" ;
-    };
+		File = "reglog.png" ;
+	};
 };
 Image BMP_REGRESSION_EXP
 {
 	ImageBitmap = Bitmap
 	{
-        File = "regexp.bmp" ;
-    };
+		File = "regexp.png" ;
+	};
 };
 Image BMP_REGRESSION_POWER
 {
 	ImageBitmap = Bitmap
 	{
-        File = "regpow.bmp" ;
-    };
+		File = "regpow.png" ;
+	};
 };
 //---------------------
 Image IMG_SELECTRANGE
 {
 	ImageBitmap = Bitmap
 	{
-		File = "selectrange.png";
+		File = "selectrange.png" ;
 	};
-    MaskColor = STD_MASKCOLOR;
 };
+
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/optchart.src b/main/cui/source/options/optchart.src
index 91b644f..1257381 100644
--- a/main/cui/source/options/optchart.src
+++ b/main/cui/source/options/optchart.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.
- * 
+ *
  *************************************************************/
 
 
@@ -29,44 +29,44 @@
 
 TabPage RID_OPTPAGE_CHART_DEFCOLORS
 {
-	HelpID	= HID_OPTIONS_CHART_DEFCOLORS;
-	Size	= MAP_APPFONT ( 260 , 185 ) ;
-	Hide	= TRUE;
-	Text [ en-US ] = "Default Colors";
-    FixedLine FL_CHART_COLOR_LIST
+	HelpID = HID_OPTIONS_CHART_DEFCOLORS ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
+	Hide = TRUE ;
+	Text [ en-US ] = "Default Colors" ;
+	FixedLine FL_CHART_COLOR_LIST
 	{
-		Pos		= MAP_APPFONT ( 6 , 3  ) ;
-        Size    = MAP_APPFONT ( 80 , 8 ) ;
-		Text [ en-US ] = "Chart colors";
+		Pos = MAP_APPFONT ( 6, 3  ) ;
+		Size = MAP_APPFONT ( 80, 8 ) ;
+		Text [ en-US ] = "Chart colors" ;
 	};
 	ListBox LB_CHART_COLOR_LIST
 	{
-	    HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST";
-		Border		= TRUE;
-		Pos			= MAP_APPFONT ( 12 , 15  );
-		Size		= MAP_APPFONT ( 68 , 152 );
-		DropDown	= FALSE;
-		TabStop		= TRUE ;
+		HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST" ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 12, 15 ) ;
+		Size = MAP_APPFONT ( 68, 152 ) ;
+		DropDown = FALSE ;
+		TabStop = TRUE ;
 	};
-    FixedLine FL_COLOR_BOX
+	FixedLine FL_COLOR_BOX
 	{
-		Pos		= MAP_APPFONT ( 92 , 3  ) ;
-        Size    = MAP_APPFONT ( 106 , 8 ) ;
+		Pos = MAP_APPFONT ( 92, 3 ) ;
+		Size = MAP_APPFONT ( 106, 8 ) ;
 		Text [ en-US ] = "Color table" ;
 	};
 	Control CT_COLOR_BOX
 	{
-		Border		= TRUE;
-		Pos			= MAP_APPFONT ( 98 , 15  );
-		Size		= MAP_APPFONT ( 94 , 152 );
-		TabStop		= TRUE ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 98, 15 ) ;
+		Size = MAP_APPFONT ( 94, 152 ) ;
+		TabStop = TRUE ;
 	};
 	PushButton PB_RESET_TO_DEFAULT
 	{
-	    HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT";
-        Pos = MAP_APPFONT ( 204 , 165 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
-		Text [ en-US ] = "~Default";
+		HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT" ;
+		Pos = MAP_APPFONT ( 204, 165 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text [ en-US ] = "~Default" ;
 	};
 };
 
@@ -76,3 +76,5 @@ String RID_SVXSTR_DIAGRAM_ROW
 
 	Text [ en-US ] = "Data Series $(ROW)" ;
 };
+
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/optctl.src b/main/cui/source/options/optctl.src
index 453d25b..f91ad0e 100644
--- a/main/cui/source/options/optctl.src
+++ b/main/cui/source/options/optctl.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.
- * 
+ *
  *************************************************************/
 
 
@@ -31,88 +31,90 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
 {
 	HelpId = HID_OPTIONS_CTL ;
 	OutputSize = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	SVLook = TRUE ;
 	Hide = TRUE ;
-   	Text [ en-US ] = "Complex Text Layout" ;
+	Text [ en-US ] = "Complex Text Layout" ;
 	FixedLine FL_SEQUENCECHECKING
 	{
 		Pos = MAP_APPFONT ( 6, ROW_0 ) ;
-        Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
-    	Text [ en-US ] = "Sequence checking";
+		Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Sequence checking" ;
 	};
 	CheckBox CB_SEQUENCECHECKING
 	{
-	    HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING";
+		HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING" ;
 		Pos = MAP_APPFONT ( 12, ROW_1 ) ;
-        Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
-    	Text [ en-US ] = "Use se~quence checking";
+		Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Use se~quence checking" ;
 	};
 	CheckBox CB_RESTRICTED
 	{
-	    HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED";
-		Pos = MAP_APPFONT ( 18, ROW_2 );
-        Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
-    	Text[ en-US ] = "Restricted";
+		HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED" ;
+		Pos = MAP_APPFONT ( 18, ROW_2 ) ;
+		Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
+		Text [ en-US ] = "Restricted" ;
 	};
-    CheckBox CB_TYPE_REPLACE
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE";
-        Pos = MAP_APPFONT ( 18, ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y );
-        Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
-        Text[ en-US ] = "~Type and replace";
-    };
-    FixedLine FL_CURSORCONTROL
+	CheckBox CB_TYPE_REPLACE
+	{
+		HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE" ;
+		Pos = MAP_APPFONT ( 18, ROW_2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+		Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Type and replace" ;
+	};
+	FixedLine FL_CURSORCONTROL
 	{
 		Pos = MAP_APPFONT ( 6, ROW_3 ) ;
-        Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
-    	Text [ en-US ] = "Cursor control";
+		Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Cursor control" ;
 	};
 	FixedText FT_MOVEMENT
 	{
 		Pos = MAP_APPFONT ( 12, ROW_5 ) ;
-        Size = MAP_APPFONT ( 90 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-    	Text [ en-US ] = "Movement";
+		Size = MAP_APPFONT ( 90, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Movement" ;
 	};
 	RadioButton RB_MOVEMENT_LOGICAL
 	{
-	    HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL";
+		HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL" ;
 		Pos = MAP_APPFONT ( 105, ROW_4 ) ;
-        Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
-    	Text [ en-US ] = "Lo~gical";
+		Size = MAP_APPFONT ( 69, RSC_CD_RADIOBUTTON_HEIGHT ) ;
+		Text [ en-US ] = "Lo~gical" ;
 	};
 	RadioButton RB_MOVEMENT_VISUAL
 	{
-	    HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL";
+		HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL" ;
 		Pos = MAP_APPFONT ( 177, ROW_4 ) ;
-        Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
-    	Text [ en-US ] = "~Visual";
+		Size = MAP_APPFONT ( 69, RSC_CD_RADIOBUTTON_HEIGHT ) ;
+		Text [ en-US ] = "~Visual" ;
 	};
 	FixedLine FL_GENERAL
 	{
 		Pos = MAP_APPFONT ( 6, ROW_6 ) ;
-        Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
-    	Text [ en-US ] = "General options";
+		Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "General options" ;
 	};
 	FixedText FT_NUMERALS
 	{
 		Pos = MAP_APPFONT ( 12, ROW_8 ) ;
-        Size = MAP_APPFONT ( 90 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-    	Text [ en-US ] = "~Numerals";
+		Size = MAP_APPFONT ( 90, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Numerals" ;
 	};
 	ListBox LB_NUMERALS
 	{
-	    HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS";
+		HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS" ;
 		Pos = MAP_APPFONT ( 105, ROW_7 ) ;
-        Size = MAP_APPFONT ( 69 , 3*RSC_CD_DROPDOWN_HEIGHT ) ;
-        DropDown = TRUE ;
+		Size = MAP_APPFONT ( 69, 3 * RSC_CD_DROPDOWN_HEIGHT ) ;
+		DropDown = TRUE ;
 		Border = TRUE ;
-        StringList [ en-US ]=
+		StringList [ en-US ] =
 		{
-            < "Arabic" ; > ;
-            < "Hindi" ; > ;
-            < "System" ; > ;
-            < "Context" ; > ;
-        };
+			< "Arabic" ;	> ;
+			< "Hindi" ;		> ;
+			< "System" ;	> ;
+			< "Context" ;	> ;
+		};
 	};
 };
+
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/optdict.src b/main/cui/source/options/optdict.src
index 81b358c..596b8b7 100644
--- a/main/cui/source/options/optdict.src
+++ b/main/cui/source/options/optdict.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,201 +7,195 @@
  * 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 <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
 #include "optdict.hrc"
- // pragma ----------------------------------------------------------------
+// pragma ----------------------------------------------------------------
 
- // RID_SFXDLG_NEWDICT ----------------------------------------------------
+// RID_SFXDLG_NEWDICT ----------------------------------------------------
 ModalDialog RID_SFXDLG_NEWDICT
 {
 	HelpId = HID_OPTIONS_DICT_NEW ;
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 213 , 66 ) ;
+	Size = MAP_APPFONT ( 213, 66 ) ;
 	Moveable = TRUE ;
-	/* ### ACHTUNG: Neuer Text in Resource? Benutzerw�rterbuch anlegen : Benutzerw�rterbuch anlegen */
-	/* ### ACHTUNG: Neuer Text in Resource? Benutzerw�rterbuch anlegen : Benutzerw�rterbuch anlegen */
 	Text [ en-US ] = "New Dictionary" ;
 	FixedText FT_DICTNAME
 	{
-		Pos = MAP_APPFONT ( 11 , 15 ) ;
-		Size = MAP_APPFONT ( 40 , 10 ) ;
+		Pos = MAP_APPFONT ( 11, 15 ) ;
+		Size = MAP_APPFONT ( 40, 10 ) ;
 		Text [ en-US ] = "~Name" ;
 		LeftLabel = TRUE ;
 	};
 	Edit ED_DICTNAME
 	{
-	    HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME";
+		HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 55 , 14 ) ;
-		Size = MAP_APPFONT ( 90 , 12 ) ;
+		Pos = MAP_APPFONT ( 55, 14 ) ;
+		Size = MAP_APPFONT ( 90, 12 ) ;
 		MaxTextLength = 32 ;
 	};
 	FixedText FT_DICTLANG
 	{
-		Pos = MAP_APPFONT ( 12 , 30 ) ;
-		Size = MAP_APPFONT ( 40 , 10 ) ;
+		Pos = MAP_APPFONT ( 12, 30 ) ;
+		Size = MAP_APPFONT ( 40, 10 ) ;
 		Text [ en-US ] = "~Language" ;
 		LeftLabel = TRUE ;
 	};
 	ListBox LB_DICTLANG
 	{
-	    HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG";
+		HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 55 , 30 ) ;
-		Size = MAP_APPFONT ( 90 , 66 ) ;
+		Pos = MAP_APPFONT ( 55, 30 ) ;
+		Size = MAP_APPFONT ( 90, 66 ) ;
 		DropDown = TRUE ;
 	};
 	CheckBox BTN_EXCEPT
 	{
-	    HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT";
-		Pos = MAP_APPFONT ( 12 , 44 ) ;
-		Size = MAP_APPFONT ( 57 , 10 ) ;
+		HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT" ;
+		Pos = MAP_APPFONT ( 12, 44 ) ;
+		Size = MAP_APPFONT ( 57, 10 ) ;
 		Text [ en-US ] = "~Exception (-)" ;
 	};
-    FixedLine GB_NEWDICT
+	FixedLine GB_NEWDICT
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-		Size = MAP_APPFONT ( 145 , 8 ) ;
-		/* ### ACHTUNG: Neuer Text in Resource? W�rterbuch : W�rterbuch */
-		/* ### ACHTUNG: Neuer Text in Resource? W�rterbuch : W�rterbuch */
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 145, 8 ) ;
 		Text [ en-US ] = "Dictionary" ;
 	};
 	OKButton BTN_NEWDICT_OK
 	{
-		Pos = MAP_APPFONT ( 157 , 6 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 157, 6 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 		Disable = TRUE ;
 		DefButton = TRUE ;
 	};
 	CancelButton BTN_NEWDICT_ESC
 	{
-		Pos = MAP_APPFONT ( 157 , 23 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 157, 23 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 	};
 	HelpButton BTN_NEWDICT_HLP
 	{
-		Pos = MAP_APPFONT ( 157 , 43 ) ;
-		Size = MAP_APPFONT ( 50 , 14 ) ;
+		Pos = MAP_APPFONT ( 157, 43 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
 	};
 };
 
- // RID_SFXDLG_EDITDICT ---------------------------------------------------
+// RID_SFXDLG_EDITDICT ---------------------------------------------------
 ModalDialog RID_SFXDLG_EDITDICT
 {
 	HelpId = HID_OPTIONS_DICT_EDIT ;
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT( 270, 161 );
-
-	/* ### ACHTUNG: Neuer Text in Resource? Benutzerw�rterbuch bearbeiten : Benutzerw�rterbuch bearbeiten */
-	/* ### ACHTUNG: Neuer Text in Resource? Benutzerw�rterbuch bearbeiten : Benutzerw�rterbuch bearbeiten */
+	Size = MAP_APPFONT ( 270, 161 ) ;
 	Text [ en-US ] = "Edit Custom Dictionary" ;
 
 	Moveable = TRUE ;
 	FixedText FT_BOOK
 	{
-		Pos = MAP_APPFONT ( 12 , 10 ) ;
-		Size = MAP_APPFONT ( 86 , 10 ) ;
+		Pos = MAP_APPFONT ( 12, 10 ) ;
+		Size = MAP_APPFONT ( 86, 10 ) ;
 		Text [ en-US ] = "~Book" ;
 	};
 	ListBox LB_ALLDICTS
 	{
-	    HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS";
+		HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 82 , 9 ) ;
-		Size = MAP_APPFONT ( 121 , 62 ) ;
+		Pos = MAP_APPFONT ( 82, 9 ) ;
+		Size = MAP_APPFONT ( 121, 62 ) ;
 		DropDown = TRUE ;
 	};
 	FixedText FT_DICTLANG
 	{
-		Pos = MAP_APPFONT ( 12 , 26 ) ;
-		Size = MAP_APPFONT ( 86 , 10 ) ;
+		Pos = MAP_APPFONT ( 12, 26 ) ;
+		Size = MAP_APPFONT ( 86, 10 ) ;
 		Text [ en-US ] = "~Language" ;
 	};
 	ListBox LB_DICTLANG
 	{
-	    HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG";
+		HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 82 , 25 ) ;
-		Size = MAP_APPFONT ( 121 , 66 ) ;
+		Pos = MAP_APPFONT ( 82, 25 ) ;
+		Size = MAP_APPFONT ( 121, 66 ) ;
 		DropDown = TRUE ;
 	};
 
-    FixedLine GB_EDITDICTS
+	FixedLine GB_EDITDICTS
 	{
-		Pos = MAP_APPFONT( 1, 1 );
-		Size = MAP_APPFONT( 268, 138 );
-		Hide=TRUE;
+		Pos = MAP_APPFONT ( 1, 1 ) ;
+		Size = MAP_APPFONT ( 268, 138 ) ;
+		Hide = TRUE ;
 	};
 
 	FixedText FT_WORD
 	{
-		Pos = MAP_APPFONT ( 13 , 46 ) ;
-		Size = MAP_APPFONT ( 40 , 8 ) ;
-		Text [ en-US ] = "~Word";
+		Pos = MAP_APPFONT ( 13, 46 ) ;
+		Size = MAP_APPFONT ( 40, 8 ) ;
+		Text [ en-US ] = "~Word" ;
 	};
 	Edit ED_WORD
 	{
-	    HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD";
-		Pos = MAP_APPFONT ( 12 , 56 ) ;
-		Size = MAP_APPFONT ( 71 , 12 ) ;
+		HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD" ;
+		Pos = MAP_APPFONT ( 12, 56 ) ;
+		Size = MAP_APPFONT ( 71, 12 ) ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 	};
 	FixedText FT_REPLACE
 	{
-		Pos = MAP_APPFONT ( 84 , 46 ) ;
-		Size = MAP_APPFONT ( 60 , 8 ) ;
-		Text [ en-US ] = "Replace ~By:";
+		Pos = MAP_APPFONT ( 84, 46 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
+		Text [ en-US ] = "Replace ~By:" ;
 	};
 
 	Edit ED_REPLACE
 	{
-	    HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE";
-		Pos = MAP_APPFONT ( 83 , 56 ) ;
-		Size = MAP_APPFONT ( 120 , 12 ) ;
+		HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE" ;
+		Pos = MAP_APPFONT ( 83, 56 ) ;
+		Size = MAP_APPFONT ( 120, 12 ) ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 	};
 
 	PushButton PB_NEW_REPLACE
 	{
-	    HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE";
-		Pos = MAP_APPFONT ( 209 , 56 ) ;
-		Size = MAP_APPFONT ( 55 , 12 ) ;
+		HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" ;
+		Pos = MAP_APPFONT ( 209, 56 ) ;
+		Size = MAP_APPFONT ( 55, 12 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~New" ;
 	};
 	PushButton PB_DELETE_REPLACE
 	{
-	    HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE";
-		Pos = MAP_APPFONT ( 209 , 71 ) ;
-		Size = MAP_APPFONT ( 55 , 12 ) ;
+		HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" ;
+		Pos = MAP_APPFONT ( 209, 71 ) ;
+		Size = MAP_APPFONT ( 55, 12 ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "~Delete" ;
 	};
 	Control TLB_REPLACE
 	{
-        HelpId = HID_OPTIONS_DICT_EDIT_ENTRIES_LIST;
-		Pos = MAP_APPFONT ( 12 , 71 ) ;
-		Size = MAP_APPFONT ( 191 , 58 ) ;
+		HelpId = HID_OPTIONS_DICT_EDIT_ENTRIES_LIST ;
+		Pos = MAP_APPFONT ( 12, 71 ) ;
+		Size = MAP_APPFONT ( 191, 58 ) ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 	};
@@ -211,74 +205,31 @@ ModalDialog RID_SFXDLG_EDITDICT
 	};
 
 
-
 	HelpButton BTN_EDITHELP
 	{
-		Pos = MAP_APPFONT( 145, 143 );
-		Size = MAP_APPFONT( 55, 14 );
+		Pos = MAP_APPFONT ( 145, 143 ) ;
+		Size = MAP_APPFONT ( 55, 14 ) ;
 	};
 
 	CancelButton BTN_EDITCLOSE
 	{
-		Pos = MAP_APPFONT ( 209 , 143 ) ;
-		Size = MAP_APPFONT ( 55 , 14 ) ;
-
-		/* ### ACHTUNG: Neuer Text in Resource? ~Schlie�en : ~Schlie�en */
-		/* ### ACHTUNG: Neuer Text in Resource? ~Schlie�en : ~Schlie�en */
+		Pos = MAP_APPFONT ( 209, 143 ) ;
+		Size = MAP_APPFONT ( 55, 14 ) ;
 		Text [ en-US ] = "~Close" ;
 	};
 };
 
- // Strings ---------------------------------------------------------------
+// Strings ---------------------------------------------------------------
 String RID_SVXSTR_OPT_DOUBLE_DICTS
 {
 	Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ;
 };
- // RID_SFXQB_SET_LANGUAGE ------------------------------------------------
+// RID_SFXQB_SET_LANGUAGE ------------------------------------------------
 QueryBox RID_SFXQB_SET_LANGUAGE
 {
 	Buttons = WB_YES_NO ;
 	DefButton = WB_DEF_NO ;
-	/* ### ACHTUNG: Neuer Text in Resource? M�chten Sie die Sprache des W�rterbuches '%1' �ndern? : M�chten Sie die Sprache des W�rterbuches ''%1'' �ndern? */
-	/* ### ACHTUNG: Neuer Text in Resource? M�chten Sie die Sprache des W�rterbuches '%1' �ndern? : M�chten Sie die Sprache des W�rterbuches ''%1'' �ndern? */
-	/* ### ACHTUNG: Neuer Text in Resource? M�chten Sie die Sprache des W�rterbuches '%1' �ndern? : M�chten Sie die Sprache des W�rterbuches '%1' �ndern? */
-	/* ### ACHTUNG: Neuer Text in Resource? M�chten Sie die Sprache des W�rterbuches '%1' �ndern? : M�chten Sie die Sprache des W�rterbuches '%1' �ndern? */
 	Message [ en-US ] = "Do you want to change the '%1' dictionary language?" ;
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/optgdlg.src b/main/cui/source/options/optgdlg.src
index b70a8a5..d0ea28c 100644
--- a/main/cui/source/options/optgdlg.src
+++ b/main/cui/source/options/optgdlg.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.
- * 
+ *
  *************************************************************/
 
 
@@ -28,9 +28,7 @@
 #include "helpid.hrc"
 
 //****************************************************************************
-//
 // TabPage General
-//
 //****************************************************************************
 
 TabPage OFA_TP_MISC
@@ -75,8 +73,8 @@ TabPage OFA_TP_MISC
 	};
 	FixedText FT_HELPFORMAT
 	{
-		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ) ;
-		Size = MAP_APPFONT ( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW5 ) ) ;
+		Size = MAP_APPFONT ( DIFF ( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ) ;
 		Text [ en-US ] = "Help ~formatting" ;
 	};
 	ListBox LB_HELPFORMAT
@@ -89,7 +87,7 @@ TabPage OFA_TP_MISC
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Default"		; > ;
+			< "Default"				; > ;
 			< "High Contrast #1"	; > ;
 			< "High Contrast #2"	; > ;
 			< "High Contrast Black"	; > ;
@@ -136,7 +134,7 @@ TabPage OFA_TP_MISC
 	};
 	FixedText FT_INTERPRET
 	{
-		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW11 ) ) ;
 		Size = MAP_APPFONT ( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ) ;
 		Text [ en-US ] = "Interpret as years between" ;
 	};
@@ -153,7 +151,7 @@ TabPage OFA_TP_MISC
 	};
 	FixedText FT_TOYEAR
 	{
-		Pos = MAP_APPFONT ( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+		Pos = MAP_APPFONT ( COL6, OFFS_TEXTBOX_FIXEDTEXT ( ROW11 ) ) ;
 		Size = MAP_APPFONT ( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ) ;
 		Text [ en-US ] = "and " ;
 	};
@@ -173,9 +171,7 @@ TabPage OFA_TP_MISC
 };
 
 //****************************************************************************
-//
 // TabPage View
-//
 //****************************************************************************
 
 TabPage OFA_TP_VIEW
@@ -235,8 +231,8 @@ TabPage OFA_TP_VIEW
 		StringList [ en-US ] =
 		{
 			< "Automatic" ;	> ;
-			< "Small" ;	> ;
-			< "Large" ;	> ;
+			< "Small" ;		> ;
+			< "Large" ;		> ;
 		};
 	};
 	ListBox LB_ICONSTYLE
@@ -249,11 +245,11 @@ TabPage OFA_TP_VIEW
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Automatic" ;		> ;
+			< "Automatic" ;			> ;
 			< "Galaxy (default)" ;	> ;
-			< "High Contrast" ;	> ;
-			< "Industrial" ;	> ;
-			< "Classic" ;		> ;
+			< "High Contrast" ;		> ;
+			< "Industrial" ;		> ;
+			< "Classic" ;			> ;
 		};
 	};
 	CheckBox CB_SYSTEM_FONT
@@ -263,7 +259,7 @@ TabPage OFA_TP_VIEW
 		Pos = MAP_APPFONT ( 12, ROW_CB_SYSTEM_FONT ) ;
 		Size = MAP_APPFONT ( 114, 16 ) ;
 		WordBreak = TRUE ;
-		Text[ en-US ] = "Use system ~font for user interface" ;
+		Text [ en-US ] = "Use system ~font for user interface" ;
 	};
 
 	CheckBox CB_FONTANTIALIASING
@@ -286,9 +282,9 @@ TabPage OFA_TP_VIEW
 		Border = TRUE ;
 		Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
-		Minimum = 1;
-		Maximum = 10000;
-		SpinSize = 1;
+		Minimum = 1 ;
+		Maximum = 10000 ;
+		SpinSize = 1 ;
 		Spin = TRUE ;
 		Repeat = TRUE ;
 	};
@@ -321,8 +317,8 @@ TabPage OFA_TP_VIEW
 		StringList [ en-US ] =
 		{
 			< "Automatic" ;	> ;
-			< "Hide" ;	> ;
-			< "Show" ;	> ;
+			< "Hide" ;		> ;
+			< "Show" ;		> ;
 		};
 	};
 	FixedLine FL_FONTLISTS
@@ -390,8 +386,8 @@ TabPage OFA_TP_VIEW
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Default button" ;		> ;
-			< "Dialog center" ;		> ;
+			< "Default button" ;			> ;
+			< "Dialog center" ;				> ;
 			< "No automatic positioning" ;	> ;
 		};
 	};
@@ -411,7 +407,7 @@ TabPage OFA_TP_VIEW
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "No function" ;		> ;
+			< "No function" ;			> ;
 			< "Automatic scrolling" ;	> ;
 			< "Paste clipboard" ;		> ;
 		};
@@ -428,7 +424,7 @@ TabPage OFA_TP_VIEW
 	CheckBox CB_SELECTION
 	{
 		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION" ;
-		Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
+		Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + ( ( ( 12 - RSC_CD_CHECKBOX_HEIGHT ) / 2 ) + 1 ) ) ;
 		Size = MAP_APPFONT ( 118 - 34, RSC_CD_CHECKBOX_HEIGHT ) ;
 		Text [ en-US ] = "Transparency" ;
 	};
@@ -453,9 +449,7 @@ TabPage OFA_TP_VIEW
 };
 
 //****************************************************************************
-//
 // TabPage Languages
-//
 //****************************************************************************
 
 TabPage OFA_TP_LANGUAGES
@@ -667,3 +661,5 @@ InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART
 {
 	Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION" ;
 };
+
+// ********************************************************************** EOF
diff --git a/main/cui/source/options/opthtml.src b/main/cui/source/options/opthtml.src
index c639399..8280d93 100644
--- a/main/cui/source/options/opthtml.src
+++ b/main/cui/source/options/opthtml.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.
- * 
+ *
  *************************************************************/
 
 
@@ -28,7 +28,7 @@
 // RID_OFAPAGE_HTMLOPT -----------------------------------------------------
 TabPage RID_OFAPAGE_HTMLOPT
 {
-	HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
+	HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT" ;
 	OutputSize = TRUE ;
 	Size = MAP_APPFONT ( 260, 185 ) ;
 	SVLook = TRUE ;
@@ -41,7 +41,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE1
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1" ;
 		Pos = MAP_APPFONT ( 45, 14 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -64,7 +64,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE2
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2" ;
 		Pos = MAP_APPFONT ( 45, 30 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -87,7 +87,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE3
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3" ;
 		Pos = MAP_APPFONT ( 45, 46 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -110,7 +110,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE4
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4" ;
 		Pos = MAP_APPFONT ( 45, 62 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -133,7 +133,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE5
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5" ;
 		Pos = MAP_APPFONT ( 45, 78 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -156,7 +156,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE6
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6" ;
 		Pos = MAP_APPFONT ( 45, 94 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -179,7 +179,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	NumericField NF_SIZE7
 	{
-		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7";
+		HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7" ;
 		Pos = MAP_APPFONT ( 45, 110 ) ;
 		Size = MAP_APPFONT ( 30, 12 ) ;
 		Border = TRUE ;
@@ -208,7 +208,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	CheckBox CB_NUMBERS_ENGLISH_US
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" ;
 		Pos = MAP_APPFONT ( 93, 14 ) ;
 		Size = MAP_APPFONT ( 161, 10 ) ;
 		TabStop = TRUE ;
@@ -216,7 +216,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	CheckBox CB_UNKNOWN_TAGS
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" ;
 		Pos = MAP_APPFONT ( 93, 28 ) ;
 		Size = MAP_APPFONT ( 155, 10 ) ;
 		TabStop = TRUE ;
@@ -224,7 +224,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	CheckBox CB_IGNORE_FONTNAMES
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES" ;
 		Pos = MAP_APPFONT ( 93, 42 ) ;
 		Size = MAP_APPFONT ( 155, 10 ) ;
 		TabStop = TRUE ;
@@ -238,43 +238,43 @@ TabPage RID_OFAPAGE_HTMLOPT
 	};
 	ListBox LB_EXPORT
 	{
-		HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT";
+		HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT" ;
 		Pos = MAP_APPFONT ( 93, 69 ) ;
 		Size = MAP_APPFONT ( 155, 50 ) ;
 		Border = TRUE ;
 		DropDown = TRUE ;
 		StringList =
 		{
-			< "HTML 3.2" ; > ;
-			< "Microsoft Internet Explorer" ; > ;
-			< "Netscape Navigator" ; > ;
-			< "%PRODUCTNAME Writer" ; > ;
+			< "HTML 3.2" ;						> ;
+			< "Microsoft Internet Explorer" ;	> ;
+			< "Netscape Navigator" ;			> ;
+			< "%PRODUCTNAME Writer" ;			> ;
 		};
 	};
 	CheckBox CB_STARBASIC
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC" ;
 		Pos = MAP_APPFONT ( 93, 88 ) ;
 		Size = MAP_APPFONT ( 155, 10 ) ;
 		Text = "%PRODUCTNAME ~Basic" ;
 	};
 	CheckBox CB_STARBASIC_WARNING
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING" ;
 		Pos = MAP_APPFONT ( 99, 102 ) ;
 		Size = MAP_APPFONT ( 149, 10 ) ;
 		Text [ en-US ] = "Display ~warning" ;
 	};
 	CheckBox CB_PRINT_EXTENSION
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" ;
 		Pos = MAP_APPFONT ( 93, 116 ) ;
 		Size = MAP_APPFONT ( 155, 10 ) ;
 		Text [ en-US ] = "~Print layout" ;
 	};
 	CheckBox CB_LOCAL_GRF
 	{
-		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF";
+		HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" ;
 		Pos = MAP_APPFONT ( 93, 130 ) ;
 		Size = MAP_APPFONT ( 155, 10 ) ;
 		Text [ en-US ] = "~Copy local graphics to Internet" ;
@@ -284,11 +284,11 @@ TabPage RID_OFAPAGE_HTMLOPT
 	{
 		Pos = MAP_APPFONT ( 93, 144 ) ;
 		Size = MAP_APPFONT ( 65, 8 ) ;
-		Text [ en-US ] = "Character set";
+		Text [ en-US ] = "Character set" ;
 	};
 	ListBox LB_CHARSET
 	{
-		HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET";
+		HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET" ;
 		Pos = MAP_APPFONT ( 162, 143 ) ;
 		Size = MAP_APPFONT ( 86, 61 ) ;
 		TabStop = TRUE ;
diff --git a/main/cui/source/options/optmemory.src b/main/cui/source/options/optmemory.src
index 253e4da..bcc6adc 100644
--- a/main/cui/source/options/optmemory.src
+++ b/main/cui/source/options/optmemory.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,21 +7,21 @@
  * 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 <cuires.hrc>
 #include "optmemory.hrc"
@@ -61,7 +61,7 @@ TabPage OFA_TP_MEMORY
 		Value = 100 ;
 		Last = 100 ;
 		SpinSize = 1 ;
-		MaxTextLength = 4;
+		MaxTextLength = 4 ;
 	};
 	FixedLine GB_GRAPHICCACHE
 	{
@@ -81,9 +81,9 @@ TabPage OFA_TP_MEMORY
 		Border = TRUE ;
 		Pos = MAP_APPFONT ( COL3, ROW3 ) ;
 		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
-		Minimum = 1;
-		Maximum = 256;
-		SpinSize = 1;
+		Minimum = 1 ;
+		Maximum = 256 ;
+		SpinSize = 1 ;
 		Spin = TRUE ;
 		Repeat = TRUE ;
 	};
@@ -105,12 +105,12 @@ TabPage OFA_TP_MEMORY
 		Border = TRUE ;
 		Pos = MAP_APPFONT ( COL3, ROW4 ) ;
 		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
-		Minimum = 10;
-		Maximum = 2560;
-		SpinSize = 1;
+		Minimum = 10 ;
+		Maximum = 2560 ;
+		SpinSize = 1 ;
 		Spin = TRUE ;
 		Repeat = TRUE ;
-		DecimalDigits = 1;
+		DecimalDigits = 1 ;
 	};
 	FixedText FT_GRAPHICOBJECTCACHE_UNIT
 	{
@@ -183,8 +183,8 @@ TabPage OFA_TP_MEMORY
 		Border = TRUE ;
 		Pos = MAP_APPFONT ( COL3, ROW7 ) ;
 		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
-		Minimum = 1;
-		Maximum = 1024;
+		Minimum = 1 ;
+		Maximum = 1024 ;
 		Spin = TRUE ;
 		Repeat = TRUE ;
 	};
@@ -206,3 +206,5 @@ TabPage OFA_TP_MEMORY
 		Text [ en-US ] = "Enable systray Quickstarter" ;
 	};
 };
+
+// ********************************************************************** EOF
diff --git a/main/extensions/source/abpilot/abspilot.src b/main/extensions/source/abpilot/abspilot.src
index d111c0d..67ec231 100644
--- a/main/extensions/source/abpilot/abspilot.src
+++ b/main/extensions/source/abpilot/abspilot.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,366 +30,368 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
 {
 	Text [ en-US ] = "Address Book Data Source Wizard" ;
 
-	HelpId = HID_ABSPILOT;
-
-	OutputSize		= TRUE ;
-	SVLook			= TRUE ;
-	Moveable		= TRUE ;
-	Closeable		= TRUE ;
-	Hide			= TRUE;
-
-    String STR_SELECT_ABTYPE
-    {
-        Text [ en-US ] = "Address book type";
-    };
-
-    String STR_INVOKE_ADMIN_DIALOG
-    {
-        Text [ en-US ] = "Connection Settings";
-    };
-
-    String STR_TABLE_SELECTION
-    {
-        Text [ en-US ] = "Table selection";
-    };
-
-    String STR_MANUAL_FIELD_MAPPING
-    {
-        Text [ en-US ] = "Field Assignment";
-    };
-
-    String STR_FINAL_CONFIRM
-    {
-        Text [ en-US ] = "Data Source Title";
-    };
+	HelpId = HID_ABSPILOT ;
+
+	OutputSize = TRUE ;
+	SVLook = TRUE ;
+	Moveable = TRUE ;
+	Closeable = TRUE ;
+	Hide = TRUE ;
+
+	String STR_SELECT_ABTYPE
+	{
+		Text [ en-US ] = "Address book type" ;
+	};
+
+	String STR_INVOKE_ADMIN_DIALOG
+	{
+		Text [ en-US ] = "Connection Settings" ;
+	};
+
+	String STR_TABLE_SELECTION
+	{
+		Text [ en-US ] = "Table selection" ;
+	};
+
+	String STR_MANUAL_FIELD_MAPPING
+	{
+		Text [ en-US ] = "Field Assignment" ;
+	};
+
+	String STR_FINAL_CONFIRM
+	{
+		Text [ en-US ] = "Data Source Title" ;
+	};
 };
 
 //........................................................................
 TabPage RID_PAGE_SELECTABTYPE
 {
-    HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE";
-	SVLook	= TRUE ;
-	Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+	HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE" ;
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
 	FixedText FT_TYPE_HINTS
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
+		WordBreak = TRUE ;
 
-		Text [ en-US ] = "%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form.\n\nThis wizard helps you create the data source.";
+		Text [ en-US ] = "%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form.\n\nThis wizard helps you create the data source." ;
 	};
 
 	FixedLine FL_TYPE
 	{
-		Pos		= MAP_APPFONT ( 7, 56 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
+		Pos = MAP_APPFONT ( 7, 56 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
 
-		Text [ en-US ] = "Please select the type of your external address book:";
+		Text [ en-US ] = "Please select the type of your external address book:" ;
 	};
 
 	RadioButton RB_EVOLUTION
- 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION";
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Evolution";
+	{
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Evolution" ;
 	};
 	RadioButton RB_EVOLUTION_GROUPWISE
- 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE";
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Groupwise";
+	{
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Groupwise" ;
 	};
 	RadioButton RB_EVOLUTION_LDAP
- 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP";
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Evolution LDAP";
+	{
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Evolution LDAP" ;
 	};
 	RadioButton RB_MORK
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Mozilla / Netscape";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Mozilla / Netscape" ;
 	};
 	RadioButton RB_THUNDERBIRD
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Thunderbird";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Thunderbird" ;
 	};
 	RadioButton RB_KAB
- 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB";
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "KDE address book";
+	{
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "KDE address book" ;
 	};
 	RadioButton RB_MACAB
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Mac OS X address book";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Mac OS X address book" ;
 	};
 	RadioButton RB_LDAP
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "LDAP address data";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "LDAP address data" ;
 	};
 	RadioButton RB_OUTLOOK
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Outlook address book";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Outlook address book" ;
 	};
 	RadioButton RB_OUTLOOKEXPRESS
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Windows system address book";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Windows system address book" ;
 	};
 	RadioButton RB_OTHER
 	{
-	    HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER";
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Text [ en-US ] = "Other external data source";
+		HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER" ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+		Text [ en-US ] = "Other external data source" ;
 	};
 };
 
 //........................................................................
 TabPage RID_PAGE_ADMININVOKATION
 {
-    HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION";
-	SVLook	= TRUE ;
-	Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+	HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION" ;
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
 	FixedText FT_ADMINEXPLANATION
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
+		WordBreak = TRUE ;
 
-		Text [ en-US ] = "To set up the new data source, additional information is required.\n\nClick the following button to open another dialog in which you then enter the necessary information.";
+		Text [ en-US ] = "To set up the new data source, additional information is required.\n\nClick the following button to open another dialog in which you then enter the necessary information." ;
 	};
 
 	PushButton PB_INVOKE_ADMIN_DIALOG
 	{
-	    HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG";
-		Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
-		Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+		HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG" ;
+		Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
+		Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
-		Text [ en-US ] = "Settings";
+		Text [ en-US ] = "Settings" ;
 	};
 
 	FixedText FT_ERROR
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 48 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
-		WordBreak = TRUE;
-		Hide = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 48 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
+		WordBreak = TRUE ;
+		Hide = TRUE ;
 
-		Text [ en-US ] = "The connection to the data source could not be established.\nBefore you proceed, please check the settings made, or (on the previous page) choose another address data source type.";
+		Text [ en-US ] = "The connection to the data source could not be established.\nBefore you proceed, please check the settings made, or (on the previous page) choose another address data source type." ;
 	};
 };
 
 //........................................................................
 TabPage RID_PAGE_TABLESELECTION_AB
 {
-    HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB";
-	SVLook	= TRUE ;
-	Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+	HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB" ;
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
 	FixedText FL_TOOMUCHTABLES
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24 ) ;
+		WordBreak = TRUE ;
 
-		Text [ en-US ] = "The external data source you have chosen contains more than one address book.\nPlease select the one you mainly want to work with:";
+		Text [ en-US ] = "The external data source you have chosen contains more than one address book.\nPlease select the one you mainly want to work with:" ;
 	};
 
 	ListBox LB_TABLELIST
 	{
-	    HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST";
-		Pos		= MAP_APPFONT ( BORDER_X, 36 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
-		SVLook = TRUE;
-		Sort = TRUE;
-		DropDown = FALSE;
-		AutoHScroll = TRUE;
-		Border = TRUE;
+		HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST" ;
+		Pos = MAP_APPFONT ( BORDER_X, 36 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
+		SVLook = TRUE ;
+		Sort = TRUE ;
+		DropDown = FALSE ;
+		AutoHScroll = TRUE ;
+		Border = TRUE ;
 	};
 };
 
 //........................................................................
 TabPage RID_PAGE_FIELDMAPPING
 {
-    HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING";
-	SVLook	= TRUE ;
-	Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+	HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING" ;
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
 	FixedText FT_FIELDASSIGMENTEXPL
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 72 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 72 ) ;
+		WordBreak = TRUE ;
 
-		Text [ en-US ] = "To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data.\n\nFor instance, you could have stored the e-mail addresses in a field named \"email\", or \"E-mail\" or \"EM\" - or something completely different.\n\nClick the button below to open another dialog where you can enter the settings for your data source.";
+		Text [ en-US ] = "To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data.\n\nFor instance, you could have stored the e-mail addresses in a field named \"email\", or \"E-mail\" or \"EM\" - or something completely different.\n\nClick the button below to open another dialog where you can enter the settings for your data source." ;
 	};
 
 	PushButton PB_INVOKE_FIELDS_DIALOG
 	{
-	    HelpID = "extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG";
-		Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
-		Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+		HelpID = "extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG" ;
+		Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
+		Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
-		Text [ en-US ] = "Field Assignment";
+		Text [ en-US ] = "Field Assignment" ;
 	};
 
 	FixedText FT_ASSIGNEDFIELDS
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 32 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 32 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 32 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 32 ) ;
+		WordBreak = TRUE ;
 	};
 };
 
 //........................................................................
 TabPage RID_PAGE_FINAL
 {
-    HelpID = "extensions:TabPage:RID_PAGE_FINAL";
-	SVLook	= TRUE ;
-	Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+	HelpID = "extensions:TabPage:RID_PAGE_FINAL" ;
+	SVLook = TRUE ;
+	Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
 	FixedText FT_FINISH_EXPL
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
-		WordBreak = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
+		WordBreak = TRUE ;
 
-		Text [ en-US ] = "That was all the information necessary to integrate your address data into %PRODUCTNAME.\n\nNow, just enter the name under which you want to register the data source in %PRODUCTNAME.";
+		Text [ en-US ] = "That was all the information necessary to integrate your address data into %PRODUCTNAME.\n\nNow, just enter the name under which you want to register the data source in %PRODUCTNAME." ;
 	};
-	
+
 	FixedText FT_LOCATION
 	{
-		Pos		= MAP_APPFONT ( BORDER_X, 53 ) ;
-		Size	= MAP_APPFONT ( 50, 8 ) ;
-		Group = TRUE;
+		Pos = MAP_APPFONT ( BORDER_X, 53 ) ;
+		Size = MAP_APPFONT ( 50, 8 ) ;
+		Group = TRUE ;
 
-		Text [ en-US ] = "Location";
+		Text [ en-US ] = "Location" ;
 	};
-	
+
 	ComboBox CBB_LOCATION
 	{
-	    HelpID = "extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION";
-		Pos		= MAP_APPFONT ( BORDER_X , 64 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
-		SVLook = TRUE;
-		Border = TRUE;
+		HelpID = "extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION" ;
+		Pos = MAP_APPFONT ( BORDER_X, 64 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
+		SVLook = TRUE ;
+		Border = TRUE ;
 		DropDown = TRUE ;
 		AutoHScroll = TRUE ;
 	};
-	
+
 	PushButton PB_BROWSE
 	{
-	    HelpID = "extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE";
-		Pos		= MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X  , 63 ) ;
-		Size	= MAP_APPFONT ( 50, 14) ;
-		SVLook = TRUE;
-		Group = FALSE;
-		
-		Text [ en-US ] = "Browse...";
+		HelpID = "extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE" ;
+		Pos = MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X, 63 ) ;
+		Size = MAP_APPFONT ( 50, 14) ;
+		SVLook = TRUE ;
+		Group = FALSE ;
+
+		Text [ en-US ] = "Browse..." ;
 	};
 
 	CheckBox CB_REGISTER_DS
 	{
-	    HelpID = "extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS";
-		Pos		= MAP_APPFONT ( BORDER_X, 82 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
-		SVLook = TRUE;
-		Group = TRUE;
-		
-		Text [ en-US ] = "Make this address book available to all modules in %PRODUCTNAME.";
+		HelpID = "extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS" ;
+		Pos = MAP_APPFONT ( BORDER_X, 82 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
+		SVLook = TRUE ;
+		Group = TRUE ;
+
+		Text [ en-US ] = "Make this address book available to all modules in %PRODUCTNAME." ;
 	};
 	FixedText FT_NAME_EXPL
 	{
-		Pos		= MAP_APPFONT ( BORDER_X + 10, 93 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X - 10, 8 ) ;
+		Pos = MAP_APPFONT ( BORDER_X + 10, 93 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X - 10, 8 ) ;
 
-		Text [ en-US ] = "Address book name";
+		Text [ en-US ] = "Address book name" ;
 	};
 
 	Edit ET_DATASOURCENAME
 	{
-	    HelpID = "extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME";
-		Pos		= MAP_APPFONT ( BORDER_X + 10, 104 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
-		SVLook = TRUE;
-		Border = TRUE;
+		HelpID = "extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME" ;
+		Pos = MAP_APPFONT ( BORDER_X + 10, 104 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
+		SVLook = TRUE ;
+		Border = TRUE ;
 	};
 
 	FixedText FT_DUPLICATENAME
 	{
-		Pos		= MAP_APPFONT ( BORDER_X + 10, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 24 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24) ;
-		WordBreak = TRUE;
-		Hide = TRUE;
-		Group = FALSE;
+		Pos = MAP_APPFONT ( BORDER_X + 10, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 24 ) ;
+		Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24) ;
+		WordBreak = TRUE ;
+		Hide = TRUE ;
+		Group = FALSE ;
 
-		Text [ en-US ] = "Another data source already has this name. As data sources have to have globally unique names, you need to choose another one.";
+		Text [ en-US ] = "Another data source already has this name. As data sources have to have globally unique names, you need to choose another one." ;
 	};
 };
 
 //........................................................................
 ErrorBox RID_ERR_NEEDTYPESELECTION
 {
-	Buttons = WB_OK;
+	Buttons = WB_OK ;
 
-	Message [ en-US ] = "Please select a type of address book.";
+	Message [ en-US ] = "Please select a type of address book." ;
 };
 
 //........................................................................
 QueryBox RID_QRY_NOTABLES
 {
-	Buttons = WB_YES_NO;
-	DefButton = WB_DEF_NO;
+	Buttons = WB_YES_NO ;
+	DefButton = WB_DEF_NO ;
 
-	Message [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?";
+	Message [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?" ;
 };
 
 //........................................................................
 String RID_STR_DEFAULT_NAME
 {
-	Text [ en-US ] = "Addresses";
+	Text [ en-US ] = "Addresses" ;
 };
 
 String RID_STR_ADMINDIALOGTITLE
 {
-	Text [ en-US ] = "Create Address Data Source";
+	Text [ en-US ] = "Create Address Data Source" ;
 };
 
 String RID_STR_NOCONNECTION
 {
-	Text [ en-US ] = "The connection could not be established.";
+	Text [ en-US ] = "The connection could not be established." ;
 };
 
 String RID_STR_PLEASECHECKSETTINGS
 {
-	Text [ en-US ] = "Please check the settings made for the data source.";
+	Text [ en-US ] = "Please check the settings made for the data source." ;
 };
 
 String RID_STR_FIELDDIALOGTITLE
 {
-	Text [ en-US ] = "Address Data - Field Assignment";
+	Text [ en-US ] = "Address Data - Field Assignment" ;
 };
 
 String RID_STR_NOFIELDSASSIGNED
 {
-	Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\"";
+	Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\"" ;
 };
 
 //........................................................................
 Bitmap BMP_HEADERIMAGE
 {
-	file = "addresspilot.bmp";
+	file = "addresspilot.png" ;
 };
+
+// ********************************************************************** EOF
diff --git a/main/sd/source/ui/dlg/PaneDockingWindow.src b/main/sd/source/ui/dlg/PaneDockingWindow.src
index 37d7a9d..cc4f25f 100644
--- a/main/sd/source/ui/dlg/PaneDockingWindow.src
+++ b/main/sd/source/ui/dlg/PaneDockingWindow.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,7 +25,7 @@
 
 DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW
 {
-    HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW";
+	HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW" ;
 	Border = TRUE ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
@@ -35,13 +35,13 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW
 	Zoomable = TRUE ;
 	Dockable = TRUE ;
 	EnableResizing = TRUE ;
-	Size = MAP_APPFONT (100,200) ;
+	Size = MAP_APPFONT ( 100, 200 ) ;
 	Text [ en-US ] = "Slide Pane" ;
 };
 
 DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW
 {
-    HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW";
+	HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW" ;
 	Border = TRUE ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
@@ -51,13 +51,13 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW
 	Zoomable = TRUE ;
 	Dockable = TRUE ;
 	EnableResizing = TRUE ;
-	Size = MAP_APPFONT (100,200) ;
+	Size = MAP_APPFONT ( 100, 200 ) ;
 	Text [ en-US ] = "Page Pane" ;
 };
 
 DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW
 {
-    HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW";
+	HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW" ;
 	Border = TRUE ;
 	Hide = TRUE ;
 	SVLook = TRUE ;
@@ -67,6 +67,8 @@ DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW
 	Zoomable = TRUE ;
 	Dockable = TRUE ;
 	EnableResizing = TRUE ;
-	Size = MAP_APPFONT (100,200) ;
+	Size = MAP_APPFONT ( 100, 200 ) ;
 	Text [ en-US ] = "Task Pane" ;
 };
+
+// ********************************************************************** EOF


Mime
View raw message