You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2023/01/10 13:41:21 UTC

[openoffice] branch trunk updated: Remove Bitmaps from build (#163)

This is an automated email from the ASF dual-hosted git repository.

jim 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 9fd60fc0f5 Remove Bitmaps from build (#163)
9fd60fc0f5 is described below

commit 9fd60fc0f5d74aa825b2e0d57825f37c7eb00367
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Tue Jan 10 14:41:15 2023 +0100

    Remove Bitmaps from build (#163)
    
    * Remove Bitmaps from build
    
    * Remove directory
    
    * Remove directory from packaging
    
    * Cleanup
    
    * Further cleanup
---
 main/cui/source/inc/cuires.hrc                     |  12 +-
 main/cui/source/options/optpath.src                |  30 +-
 main/extras/prj/build.lst                          |  55 ++-
 main/extras/source/symbols/delzip                  |   1 -
 main/extras/source/symbols/l_2people.bmp           | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_attention1.bmp        | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_attention2.bmp        | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_attention3.bmp        | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_candy.bmp             | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_face.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_flower.bmp            | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_ghost.bmp             | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_halloween.bmp         | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_home.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_lamp.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_lock.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_page_b.bmp            | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_page_g.bmp            | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_page_y.bmp            | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_people.bmp            | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_rose.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_save.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_smiley_1.bmp          | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_smiley_oh.bmp         | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_smiley_sad.bmp        | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_snow.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/l_star.bmp              | Bin 2136 -> 0 bytes
 main/extras/source/symbols/makefile.mk             |  47 --
 main/extras/source/symbols/s_arrow-1.bmp           | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_arrow-2.bmp           | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_arrow-3.bmp           | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_arrow-4.bmp           | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_attention1.bmp        | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_attention2.bmp        | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_attention3.bmp        | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ball-b.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ball-g.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ball-r.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ball.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_bug.bmp               | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_clover.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_egg.bmp               | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_face.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_flower.bmp            | Bin 344 -> 0 bytes
 main/extras/source/symbols/s_ghost.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_group.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_halloween.bmp         | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_heart.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_home.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_lock.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ok-g.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ok-r.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_ok.bmp                | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_page_b.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_page_g.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_page_y.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_pen-b.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_pen-g.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_pen-r.bmp             | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_people.bmp            | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_smily_1.bmp           | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_smily_oh.bmp          | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_smily_sad.bmp         | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_snow.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_star.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_team.bmp              | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_x-g.bmp               | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_x-r.bmp               | Bin 824 -> 0 bytes
 main/extras/source/symbols/s_x.bmp                 | Bin 824 -> 0 bytes
 .../registry/data/org/openoffice/Office/Paths.xcu  |  18 +-
 .../schema/org/openoffice/Office/Common.xcs        |  13 -
 main/scp2/source/ooo/directory_ooo.scp             |  13 +-
 main/scp2/source/ooo/file_extra_ooo.scp            | 484 ++++++++++-----------
 73 files changed, 296 insertions(+), 377 deletions(-)

diff --git a/main/cui/source/inc/cuires.hrc b/main/cui/source/inc/cuires.hrc
index 04db85d363..b28f3993c1 100644
--- a/main/cui/source/inc/cuires.hrc
+++ b/main/cui/source/inc/cuires.hrc
@@ -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,19 +7,20 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
+
 #ifndef _CUI_RESID_HRC
 #define _CUI_RESID_HRC
 
@@ -204,7 +205,6 @@
 #define RID_SVXSTR_KEY_WORK_PATH            (RID_SVX_START + 1024)//?
 #define RID_SVXSTR_KEY_GRAPHICS_PATH        (RID_SVX_START + 1014)//?
 #define RID_SVXSTR_KEY_BASIC_PATH           (RID_SVX_START + 1007)//?
-#define RID_SVXSTR_KEY_BITMAP_PATH          (RID_SVX_START + 1008)//?
 #define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)//?
 
 // dialogs
@@ -252,7 +252,7 @@
 #define RID_SVXSTR_HYPERDLG_FROM_TEXT		(RID_SVX_START +  814)
 
 // imap dialog
-#define	RID_SVX_IMAPDLG_START				(RID_SVX_START + 100)			
+#define	RID_SVX_IMAPDLG_START				(RID_SVX_START + 100)
 #define RID_SVXDLG_IMAPURL					(RID_SVX_IMAPDLG_START + 2)
 
 // name dialog
diff --git a/main/cui/source/options/optpath.src b/main/cui/source/options/optpath.src
index 5b8f6ddabd..5b310cac1d 100644
--- a/main/cui/source/options/optpath.src
+++ b/main/cui/source/options/optpath.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,20 +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 "optpath.hrc"
 #include <cuires.hrc>
 #ifndef _SFX_HRC
@@ -28,7 +29,7 @@
 #endif
 #include "helpid.hrc"
 
- // RID_SFXPAGE_PATH -----------------------------------------------------
+// RID_SFXPAGE_PATH -----------------------------------------------------
 TabPage RID_SFXPAGE_PATH
 {
 	HelpId = HID_OPTIONS_PATH ;
@@ -39,14 +40,14 @@ TabPage RID_SFXPAGE_PATH
 	Text [ en-US ] = "Paths" ;
 	FixedText FT_TYPE
 	{
-		Hide = TRUE;
+		Hide = TRUE ;
 		Pos = MAP_APPFONT ( 12, 14 ) ;
 		Size = MAP_APPFONT ( 40, 10 ) ;
 		Text [ en-US ] = "Type" ;
 	};
 	FixedText FT_PATH
 	{
-		Hide = TRUE;
+		Hide = TRUE ;
 		Pos = MAP_APPFONT ( 110, 14 ) ;
 		Size = MAP_APPFONT ( 40, 10 ) ;
 		Text [ en-US ] = "Path" ;
@@ -60,14 +61,14 @@ TabPage RID_SFXPAGE_PATH
 	};
 	PushButton BTN_PATH
 	{
-		HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH";
+		HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH" ;
 		Pos = MAP_APPFONT ( 183, 165 ) ;
 		Size = MAP_APPFONT ( 65, 14 ) ;
 		Text [ en-US ] = "~Edit..." ;
 	};
 	PushButton BTN_STANDARD
 	{
-		HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
+		HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD" ;
 		Pos = MAP_APPFONT ( 115, 165 ) ;
 		Size = MAP_APPFONT ( 65, 14 ) ;
 		Text [ en-US ] = "~Default" ;
@@ -80,11 +81,11 @@ TabPage RID_SFXPAGE_PATH
 	};
 	Image IMG_LOCK
 	{
-		ImageBitmap = Bitmap { File = "lock.png"; } ;
+		ImageBitmap = Bitmap { File = "lock.png" ; } ;
 	};
 	Image IMG_LOCK_HC
 	{
-		ImageBitmap = Bitmap { File = "lock_hc.png"; } ;
+		ImageBitmap = Bitmap { File = "lock_hc.png" ; } ;
 	};
 	String STR_MULTIPATHDLG
 	{
@@ -110,10 +111,6 @@ String RID_SVXSTR_KEY_GRAPHICS_PATH
 {
 	Text [ en-US ] = "Graphics" ;
 };
-String RID_SVXSTR_KEY_BITMAP_PATH
-{
-	Text [ en-US ] = "Icons" ;
-};
 String RID_SVXSTR_KEY_BASIC_PATH
 {
 	Text = "BASIC" ;
@@ -193,3 +190,4 @@ String RID_SVXSTR_KEY_LINGUISTIC_DIR
 	Text [ en-US ] = "Writing aids" ;
 };
 
+// ********************************************************************** EOF
diff --git a/main/extras/prj/build.lst b/main/extras/prj/build.lst
index 04acbf0f1b..a1fb7b0c5c 100644
--- a/main/extras/prj/build.lst
+++ b/main/extras/prj/build.lst
@@ -4,37 +4,36 @@ er	extras\source\autotext					nmake	-	all	er_atxt NULL
 er	extras\source\autotext\lang				nmake	-	all	er_atxtl NULL
 er	extras\source\database					nmake	-	all	er_datbs NULL
 er	extras\source\gallery					nmake	-	all	er_gal NULL
-er      extras\source\gallery\arrows                            nmake   -       all     er_garrows NULL
-er      extras\source\gallery\bullets                           nmake   -       all     er_gbull NULL
-er      extras\source\gallery\computers                         nmake   -       all     er_gcomputers NULL
-er      extras\source\gallery\diagrams                          nmake   -       all     er_gdiagrams NULL
-er      extras\source\gallery\education                         nmake   -       all     er_geducation NULL
-er      extras\source\gallery\environment                       nmake   -       all     er_genvironment NULL
-er      extras\source\gallery\finance                           nmake   -       all     er_gfinance NULL
-er      extras\source\gallery\gallery_sound                     nmake   -       all     er_gsnd NULL
-er      extras\source\gallery\gallery_system                    nmake   -       all     er_gsys NULL
-er      extras\source\gallery\htmlexpo                          nmake   -       all     er_ghtml NULL
-er      extras\source\gallery\people                            nmake   -       all     er_gpeople NULL
-er      extras\source\gallery\rulers                            nmake   -       all     er_grulr NULL
-er      extras\source\gallery\sounds                            nmake   -       all     er_gsnds NULL
-er      extras\source\gallery\symbols                           nmake   -       all     er_gsymbols NULL
-er      extras\source\gallery\transportation                    nmake   -       all     er_gtransportation NULL
-er      extras\source\gallery\txtshapes                         nmake   -       all     er_gtxtshapes NULL
-er      extras\source\gallery\www-back                          nmake   -       all     er_gwbck NULL
-er      extras\source\gallery\www-graf                          nmake   -       all     er_gwgrf NULL
+er	extras\source\gallery\arrows			nmake	-	all	er_garrows NULL
+er	extras\source\gallery\bullets			nmake	-	all	er_gbull NULL
+er	extras\source\gallery\computers			nmake	-	all	er_gcomputers NULL
+er	extras\source\gallery\diagrams			nmake	-	all	er_gdiagrams NULL
+er	extras\source\gallery\education			nmake	-	all	er_geducation NULL
+er	extras\source\gallery\environment		nmake	-	all	er_genvironment NULL
+er	extras\source\gallery\finance			nmake	-	all	er_gfinance NULL
+er	extras\source\gallery\gallery_sound		nmake	-	all	er_gsnd NULL
+er	extras\source\gallery\gallery_system	nmake	-	all	er_gsys NULL
+er	extras\source\gallery\htmlexpo			nmake	-	all	er_ghtml NULL
+er	extras\source\gallery\people			nmake	-	all	er_gpeople NULL
+er	extras\source\gallery\rulers			nmake	-	all	er_grulr NULL
+er	extras\source\gallery\sounds			nmake	-	all	er_gsnds NULL
+er	extras\source\gallery\symbols			nmake	-	all	er_gsymbols NULL
+er	extras\source\gallery\transportation	nmake	-	all	er_gtransportation NULL
+er	extras\source\gallery\txtshapes			nmake	-	all	er_gtxtshapes NULL
+er	extras\source\gallery\www-back			nmake	-	all	er_gwbck NULL
+er	extras\source\gallery\www-graf			nmake	-	all	er_gwgrf NULL
 er	extras\source\misc_config				nmake	-	all	er_mcnf NULL
 er	extras\source\palettes\lang				nmake	-	all	er_pall NULL
 er	extras\source\palettes					nmake	-	all	er_palet NULL
-er	extras\source\symbols					nmake	-	all	er_symb NULL
-er      extras\source\templates\layout\lang                     nmake   -       all     er_tlal NULL
-er      extras\source\templates\presnt\lang                     nmake   -       all     er_tprel NULL
-er      extras\source\templates\wizard\agenda\lang              nmake   -       all     er_twagl NULL
-er      extras\source\templates\wizard\bitmap                   nmake   -       all     er_twbmp NULL
-er      extras\source\templates\wizard\desktop\lang             nmake   -       all     er_twdkl NULL
-er      extras\source\templates\wizard\fax\lang                 nmake   -       all     er_twfal NULL
-er      extras\source\templates\wizard\letter\lang              nmake   -       all     er_twlel NULL
-er      extras\source\templates\wizard\report\lang              nmake   -       all     er_twrel NULL
-er      extras\source\templates\wizard\styles\lang              nmake   -       all     er_stls NULL
+er	extras\source\templates\layout\lang			nmake	-	all	er_tlal NULL
+er	extras\source\templates\presnt\lang			nmake	-	all	er_tprel NULL
+er	extras\source\templates\wizard\agenda\lang	nmake	-	all	er_twagl NULL
+er	extras\source\templates\wizard\bitmap		nmake	-	all	er_twbmp NULL
+er	extras\source\templates\wizard\desktop\lang	nmake	-	all	er_twdkl NULL
+er	extras\source\templates\wizard\fax\lang		nmake	-	all	er_twfal NULL
+er	extras\source\templates\wizard\letter\lang	nmake	-	all	er_twlel NULL
+er	extras\source\templates\wizard\report\lang	nmake	-	all	er_twrel NULL
+er	extras\source\templates\wizard\styles\lang	nmake	-	all	er_stls NULL
 er	extras\source\wordbook					nmake	-	all	er_wrdb NULL
 er	extras\source\wordbook\lang				nmake	-	all	er_wrdbl NULL
 er	extras\unx\source\bitmaps				nmake	-	all	er_bmpu NULL
diff --git a/main/extras/source/symbols/delzip b/main/extras/source/symbols/delzip
deleted file mode 100644
index 636fda90bf..0000000000
--- a/main/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/main/extras/source/symbols/l_2people.bmp b/main/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc17f..0000000000
Binary files a/main/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_attention1.bmp b/main/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f393..0000000000
Binary files a/main/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_attention2.bmp b/main/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9f22..0000000000
Binary files a/main/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_attention3.bmp b/main/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9cf0b..0000000000
Binary files a/main/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_candy.bmp b/main/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8c37..0000000000
Binary files a/main/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_face.bmp b/main/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d95616a..0000000000
Binary files a/main/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_flower.bmp b/main/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409f12..0000000000
Binary files a/main/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_ghost.bmp b/main/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27138..0000000000
Binary files a/main/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_halloween.bmp b/main/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd23a2..0000000000
Binary files a/main/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_home.bmp b/main/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a2bc..0000000000
Binary files a/main/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_lamp.bmp b/main/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef26e..0000000000
Binary files a/main/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_lock.bmp b/main/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0555..0000000000
Binary files a/main/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_page_b.bmp b/main/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67dd5..0000000000
Binary files a/main/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_page_g.bmp b/main/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7dc65..0000000000
Binary files a/main/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_page_y.bmp b/main/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98c2c..0000000000
Binary files a/main/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_people.bmp b/main/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 112339015a..0000000000
Binary files a/main/extras/source/symbols/l_people.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_rose.bmp b/main/extras/source/symbols/l_rose.bmp
deleted file mode 100644
index 5feafeed39..0000000000
Binary files a/main/extras/source/symbols/l_rose.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_save.bmp b/main/extras/source/symbols/l_save.bmp
deleted file mode 100644
index 77a33b032d..0000000000
Binary files a/main/extras/source/symbols/l_save.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_smiley_1.bmp b/main/extras/source/symbols/l_smiley_1.bmp
deleted file mode 100644
index 1d4c064b4c..0000000000
Binary files a/main/extras/source/symbols/l_smiley_1.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_smiley_oh.bmp b/main/extras/source/symbols/l_smiley_oh.bmp
deleted file mode 100644
index 54d6067f21..0000000000
Binary files a/main/extras/source/symbols/l_smiley_oh.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_smiley_sad.bmp b/main/extras/source/symbols/l_smiley_sad.bmp
deleted file mode 100644
index bfa17eaf01..0000000000
Binary files a/main/extras/source/symbols/l_smiley_sad.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_snow.bmp b/main/extras/source/symbols/l_snow.bmp
deleted file mode 100644
index fce169d0a6..0000000000
Binary files a/main/extras/source/symbols/l_snow.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/l_star.bmp b/main/extras/source/symbols/l_star.bmp
deleted file mode 100644
index 5a12554911..0000000000
Binary files a/main/extras/source/symbols/l_star.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/makefile.mk b/main/extras/source/symbols/makefile.mk
deleted file mode 100644
index b6b446b7e3..0000000000
--- a/main/extras/source/symbols/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  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
-#  regarding copyright ownership.  The ASF licenses this file
-#  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.
-#  
-#**************************************************************
-
-
-PRJ=..$/..
-
-
-
-PRJNAME=extras
-TARGET=symbols
-
-.INCLUDE : settings.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-
-
-ZIP1TARGET      = $(SYMBOLS_ALL_TARGET)
-
-ZIP1LIST        = * -x makefile.*
-
-
-
-.INCLUDE : target.mk
-
-
-
-
-
diff --git a/main/extras/source/symbols/s_arrow-1.bmp b/main/extras/source/symbols/s_arrow-1.bmp
deleted file mode 100644
index 4b77c9b44a..0000000000
Binary files a/main/extras/source/symbols/s_arrow-1.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_arrow-2.bmp b/main/extras/source/symbols/s_arrow-2.bmp
deleted file mode 100644
index e7c94e7259..0000000000
Binary files a/main/extras/source/symbols/s_arrow-2.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_arrow-3.bmp b/main/extras/source/symbols/s_arrow-3.bmp
deleted file mode 100644
index 14d544dc8c..0000000000
Binary files a/main/extras/source/symbols/s_arrow-3.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_arrow-4.bmp b/main/extras/source/symbols/s_arrow-4.bmp
deleted file mode 100644
index d0a192b6ce..0000000000
Binary files a/main/extras/source/symbols/s_arrow-4.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_attention1.bmp b/main/extras/source/symbols/s_attention1.bmp
deleted file mode 100644
index d3fe270df9..0000000000
Binary files a/main/extras/source/symbols/s_attention1.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_attention2.bmp b/main/extras/source/symbols/s_attention2.bmp
deleted file mode 100644
index dc9df13aa9..0000000000
Binary files a/main/extras/source/symbols/s_attention2.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_attention3.bmp b/main/extras/source/symbols/s_attention3.bmp
deleted file mode 100644
index b52cd4d4e9..0000000000
Binary files a/main/extras/source/symbols/s_attention3.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ball-b.bmp b/main/extras/source/symbols/s_ball-b.bmp
deleted file mode 100644
index aba133720c..0000000000
Binary files a/main/extras/source/symbols/s_ball-b.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ball-g.bmp b/main/extras/source/symbols/s_ball-g.bmp
deleted file mode 100644
index be71aa3045..0000000000
Binary files a/main/extras/source/symbols/s_ball-g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ball-r.bmp b/main/extras/source/symbols/s_ball-r.bmp
deleted file mode 100644
index 40f49878b7..0000000000
Binary files a/main/extras/source/symbols/s_ball-r.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ball.bmp b/main/extras/source/symbols/s_ball.bmp
deleted file mode 100644
index 423f065ebd..0000000000
Binary files a/main/extras/source/symbols/s_ball.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_bug.bmp b/main/extras/source/symbols/s_bug.bmp
deleted file mode 100644
index ca450ae47c..0000000000
Binary files a/main/extras/source/symbols/s_bug.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_clover.bmp b/main/extras/source/symbols/s_clover.bmp
deleted file mode 100644
index cff9bd253a..0000000000
Binary files a/main/extras/source/symbols/s_clover.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_egg.bmp b/main/extras/source/symbols/s_egg.bmp
deleted file mode 100644
index 7a3a5521e9..0000000000
Binary files a/main/extras/source/symbols/s_egg.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_face.bmp b/main/extras/source/symbols/s_face.bmp
deleted file mode 100644
index 60b5db9bd3..0000000000
Binary files a/main/extras/source/symbols/s_face.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_flower.bmp b/main/extras/source/symbols/s_flower.bmp
deleted file mode 100644
index b560e32404..0000000000
Binary files a/main/extras/source/symbols/s_flower.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ghost.bmp b/main/extras/source/symbols/s_ghost.bmp
deleted file mode 100644
index a657110ab5..0000000000
Binary files a/main/extras/source/symbols/s_ghost.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_group.bmp b/main/extras/source/symbols/s_group.bmp
deleted file mode 100644
index fe80f86083..0000000000
Binary files a/main/extras/source/symbols/s_group.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_halloween.bmp b/main/extras/source/symbols/s_halloween.bmp
deleted file mode 100644
index d188517832..0000000000
Binary files a/main/extras/source/symbols/s_halloween.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_heart.bmp b/main/extras/source/symbols/s_heart.bmp
deleted file mode 100644
index 6cea8eca90..0000000000
Binary files a/main/extras/source/symbols/s_heart.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_home.bmp b/main/extras/source/symbols/s_home.bmp
deleted file mode 100644
index 931d25dc69..0000000000
Binary files a/main/extras/source/symbols/s_home.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_lock.bmp b/main/extras/source/symbols/s_lock.bmp
deleted file mode 100644
index 09914cbd14..0000000000
Binary files a/main/extras/source/symbols/s_lock.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ok-g.bmp b/main/extras/source/symbols/s_ok-g.bmp
deleted file mode 100644
index 8c3480ce0b..0000000000
Binary files a/main/extras/source/symbols/s_ok-g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ok-r.bmp b/main/extras/source/symbols/s_ok-r.bmp
deleted file mode 100644
index 442391512e..0000000000
Binary files a/main/extras/source/symbols/s_ok-r.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_ok.bmp b/main/extras/source/symbols/s_ok.bmp
deleted file mode 100644
index ca73720115..0000000000
Binary files a/main/extras/source/symbols/s_ok.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_page_b.bmp b/main/extras/source/symbols/s_page_b.bmp
deleted file mode 100644
index c97bc83c22..0000000000
Binary files a/main/extras/source/symbols/s_page_b.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_page_g.bmp b/main/extras/source/symbols/s_page_g.bmp
deleted file mode 100644
index ddeb8b5776..0000000000
Binary files a/main/extras/source/symbols/s_page_g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_page_y.bmp b/main/extras/source/symbols/s_page_y.bmp
deleted file mode 100644
index 1af3658593..0000000000
Binary files a/main/extras/source/symbols/s_page_y.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_pen-b.bmp b/main/extras/source/symbols/s_pen-b.bmp
deleted file mode 100644
index bc340dbe86..0000000000
Binary files a/main/extras/source/symbols/s_pen-b.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_pen-g.bmp b/main/extras/source/symbols/s_pen-g.bmp
deleted file mode 100644
index fe5ae67e90..0000000000
Binary files a/main/extras/source/symbols/s_pen-g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_pen-r.bmp b/main/extras/source/symbols/s_pen-r.bmp
deleted file mode 100644
index 437df472c2..0000000000
Binary files a/main/extras/source/symbols/s_pen-r.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_people.bmp b/main/extras/source/symbols/s_people.bmp
deleted file mode 100644
index d0add8e7b1..0000000000
Binary files a/main/extras/source/symbols/s_people.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_smily_1.bmp b/main/extras/source/symbols/s_smily_1.bmp
deleted file mode 100644
index 0fcdfdf0dc..0000000000
Binary files a/main/extras/source/symbols/s_smily_1.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_smily_oh.bmp b/main/extras/source/symbols/s_smily_oh.bmp
deleted file mode 100644
index a9e15d73cd..0000000000
Binary files a/main/extras/source/symbols/s_smily_oh.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_smily_sad.bmp b/main/extras/source/symbols/s_smily_sad.bmp
deleted file mode 100644
index 62f140edc9..0000000000
Binary files a/main/extras/source/symbols/s_smily_sad.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_snow.bmp b/main/extras/source/symbols/s_snow.bmp
deleted file mode 100644
index a19e235e3c..0000000000
Binary files a/main/extras/source/symbols/s_snow.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_star.bmp b/main/extras/source/symbols/s_star.bmp
deleted file mode 100644
index 275325f4b3..0000000000
Binary files a/main/extras/source/symbols/s_star.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_team.bmp b/main/extras/source/symbols/s_team.bmp
deleted file mode 100644
index 08fcc178ee..0000000000
Binary files a/main/extras/source/symbols/s_team.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_x-g.bmp b/main/extras/source/symbols/s_x-g.bmp
deleted file mode 100644
index e014a6cb79..0000000000
Binary files a/main/extras/source/symbols/s_x-g.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_x-r.bmp b/main/extras/source/symbols/s_x-r.bmp
deleted file mode 100644
index 01c236860d..0000000000
Binary files a/main/extras/source/symbols/s_x-r.bmp and /dev/null differ
diff --git a/main/extras/source/symbols/s_x.bmp b/main/extras/source/symbols/s_x.bmp
deleted file mode 100644
index 01cbbc1b9e..0000000000
Binary files a/main/extras/source/symbols/s_x.bmp and /dev/null differ
diff --git a/main/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/main/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index be6788fd82..e3579eb1de 100644
--- a/main/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/main/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -8,16 +8,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.
- * 
+ *
  ***********************************************************-->
 
 
@@ -70,12 +70,6 @@
 			</prop>
 		</node>
 
-		<node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true">
-			<node oor:name="InternalPaths">
-   			      <node oor:name="$(insturl)/share/config/symbol" oor:op="fuse" />
-			</node>
-		</node>
-
 		<node oor:name="Config" oor:op="fuse" oor:mandatory="true">
 			<node oor:name="InternalPaths">
    			      <node oor:name="$(insturl)/share/config" oor:op="fuse" />
@@ -135,7 +129,7 @@
                 <value>$(userurl)/wordbook</value>
             </prop>
         </node>
-        
+
         <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
             <node oor:name="InternalPaths">
                 <node oor:name="$(insturl)/share/wordbook/$(vlang)" oor:op="fuse"/>
@@ -144,7 +138,7 @@
                 <value>$(userurl)/wordbook</value>
             </prop>
         </node>
-        
+
 		<node oor:name="Module" oor:op="fuse" oor:mandatory="true">
 			<node oor:name="InternalPaths">
    			      <node oor:name="$(progpath)" oor:op="fuse" />
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index de1c56b0b0..fc6ed8c052 100644
--- a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1594,13 +1594,6 @@
 					</info>
 					<value oor:separator=":">$(insturl)/share/basic:$(userurl)/basic</value>
 				</prop>
-				<prop oor:name="Bitmap" oor:type="xs:string">
-					<info>
-						<author>MBA</author>
-						<desc>Contains the bitmap files which can be used for menu and toolbar icons.</desc>
-					</info>
-					<value>$(insturl)/share/config/symbol</value>
-				</prop>
 				<prop oor:name="Config" oor:type="xs:string">
 					<info>
 						<author>MBA</author>
@@ -1765,12 +1758,6 @@
 					</info>
 					<value oor:separator=":">$(insturl)/share/basic:$(userurl)/basic</value>
 				</prop>
-				<prop oor:name="Bitmap" oor:type="xs:string">
-					<info>
-						<desc>Specifies the default directory where the bitmap files, which can be used for the menu and toolbar icons, are located.</desc>
-					</info>
-					<value>$(insturl)/share/config/symbol</value>
-				</prop>
 				<prop oor:name="Config" oor:type="xs:string">
 					<info>
 						<desc>Specifies the default directory where the configuration files are stored.</desc>
diff --git a/main/scp2/source/ooo/directory_ooo.scp b/main/scp2/source/ooo/directory_ooo.scp
index 28dc215e8d..b69c6a2079 100644
--- a/main/scp2/source/ooo/directory_ooo.scp
+++ b/main/scp2/source/ooo/directory_ooo.scp
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -827,11 +827,6 @@ Directory gid_Dir_Config_Settings
     DosName = "settings";
 End
 
-Directory gid_Dir_Config_Symbol
-    ParentID = gid_Dir_Config;
-    DosName = "symbol";
-End
-
 Directory gid_Dir_Config_Webcast
     ParentID = gid_Dir_Config;
     DosName = "webcast";
diff --git a/main/scp2/source/ooo/file_extra_ooo.scp b/main/scp2/source/ooo/file_extra_ooo.scp
index 44f4ea53c8..307743b46f 100644
--- a/main/scp2/source/ooo/file_extra_ooo.scp
+++ b/main/scp2/source/ooo/file_extra_ooo.scp
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -24,180 +24,180 @@
 #include "macros.inc"
 
 File gid_File_Extra_Autocorr
-    Dir = gid_Dir_Share_Autocorr;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "autocorr.zip";
+	Dir = gid_Dir_Share_Autocorr;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE);
+	Name = "autocorr.zip";
 End
 
 File gid_File_Extra_Autotextshare_Lang
-    Dir = gid_Dir_Autotext_Language;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(autotextshare,zip);
+	Dir = gid_Dir_Autotext_Language;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(autotextshare,zip);
 End
 
 File gid_File_Extra_Autotextuser
-    Dir = gid_Dir_User_Autotext;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DOCLANG, DONT_OVERWRITE);
-    Name = "autotextuser.zip";
+	Dir = gid_Dir_User_Autotext;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DOCLANG, DONT_OVERWRITE);
+	Name = "autotextuser.zip";
 End
 
 #ifdef UNX
 
 File gid_File_Extra_Cfgsrv_Bitmap_Unx
-    Dir = gid_Dir_Config;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "cfgsrvbitmapunx.zip";
+	Dir = gid_Dir_Config;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "cfgsrvbitmapunx.zip";
 End
 
 #endif
 
 File gid_File_Extra_Cfgusr
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "cfgusr.zip";
+	Dir = gid_Dir_User_Config;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	Name = "cfgusr.zip";
 End
 
 File gid_File_Extra_Cfgsrv
-    Dir = gid_Dir_Config;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "cfgsrvnolang.zip";
-    Patchfiles = ();
+	Dir = gid_Dir_Config;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE);
+	Name = "cfgsrvnolang.zip";
+	Patchfiles = ();
 End
 
 File gid_File_Extra_Common_Inc
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.inc";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "common.inc";
 End
 
 File gid_File_Extra_Common_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "common.pl";
 End
 
 File gid_File_Extra_Database
-    Dir = gid_Dir_Database;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "database.zip";
+	Dir = gid_Dir_Database;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	Name = "database.zip";
 End
 
 File gid_File_Extra_Databasebiblio
-    Dir = gid_Dir_Database_Biblio;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "databasebiblio.zip";
+	Dir = gid_Dir_Database_Biblio;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	Name = "databasebiblio.zip";
 End
 
 File gid_File_Extra_Edit_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "edit.asp";
 End
 
 File gid_File_Extra_Edit_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "edit.pl";
 End
 
 File gid_File_Extra_Editpic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "editpic.asp";
 End
 
 File gid_File_Extra_Editpic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "editpic.pl";
 End
 
 File gid_File_Extra_Glas_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "glas-blue.zip";
+	Name = "glas-blue.zip";
 End
 
 File gid_File_Extra_Glas_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "glas-green.zip";
+	Name = "glas-green.zip";
 End
 
 File gid_File_Extra_Glas_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "glas-red.zip";
+	Name = "glas-red.zip";
 End
 
 File gid_File_Extra_Round_Gorilla_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "round-gorilla.zip";
+	Name = "round-gorilla.zip";
 End
 
 File gid_File_Extra_Round_White_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "round-white.zip";
+	Name = "round-white.zip";
 End
 File gid_File_Extra_Simple_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "simple.zip";
+	Name = "simple.zip";
 End
 File gid_File_Extra_Square_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "square-blue.zip";
+	Name = "square-blue.zip";
 End
 File gid_File_Extra_Square_Gray_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "square-gray.zip";
+	Name = "square-gray.zip";
 End
 File gid_File_Extra_Square_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "square-green.zip";
+	Name = "square-green.zip";
 End
 File gid_File_Extra_Square_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "square-red.zip";
+	Name = "square-red.zip";
 End
 File gid_File_Extra_Square_Yellow_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
+	Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
+	USER_FILE_BODY;
 	Styles = ();
-    Name = "square-yellow.zip";
+	Name = "square-yellow.zip";
 End
 
 #ifdef UNX
 
 #ifndef WITHOUT_AFMS
 File gid_File_Extra_Fontunxafm
-    Dir = gid_Dir_Psprint_Fontmetric;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxafm.zip";
+	Dir = gid_Dir_Psprint_Fontmetric;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE);
+	Name = "fontunxafm.zip";
 End
 #endif
 
@@ -207,10 +207,10 @@ End
 
 #ifndef WITHOUT_PPDS
 File gid_File_Extra_Fontunxppds
-    Dir = gid_Dir_Psprint_Driver;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxppds.zip";
+	Dir = gid_Dir_Psprint_Driver;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE);
+	Name = "fontunxppds.zip";
 End
 #endif
 
@@ -219,286 +219,280 @@ End
 #ifdef UNX
 
 File gid_File_Extra_Fontunxpsprint
-    Dir = gid_Dir_Psprint;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "fontunxpsprint.zip";
+	Dir = gid_Dir_Psprint;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	Name = "fontunxpsprint.zip";
 End
 
 #endif
 
 File gid_File_Extra_Gallbullets
-    Dir = gid_Dir_Gallery_Bullets;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallbullets.zip";
+	Dir = gid_Dir_Gallery_Bullets;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallbullets.zip";
 End
 
 File gid_File_Extra_Gallhtmlexpo
-    Dir = gid_Dir_Gallery_Htmlexpo;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallhtmlexpo.zip";
+	Dir = gid_Dir_Gallery_Htmlexpo;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallhtmlexpo.zip";
 End
 
 File gid_File_Extra_Gallroot
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallroot.zip";
+	Dir = gid_Dir_Gallery;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallroot.zip";
 End
 
 //////////////////////////////////////////////////////////////////////////////
 
 File gid_File_Extra_Gallarrows
-    Dir = gid_Dir_Gallery_Arrows;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallarrows.zip";
+	Dir = gid_Dir_Gallery_Arrows;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallarrows.zip";
 End
 
 File gid_File_Extra_Gallcomputers
-    Dir = gid_Dir_Gallery_Computers;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallcomputers.zip";
+	Dir = gid_Dir_Gallery_Computers;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallcomputers.zip";
 End
 
 File gid_File_Extra_Galldiagrams
-    Dir = gid_Dir_Gallery_Diagrams;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "galldiagrams.zip";
+	Dir = gid_Dir_Gallery_Diagrams;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "galldiagrams.zip";
 End
 
 File gid_File_Extra_Galleducation
-    Dir = gid_Dir_Gallery_Education;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "galleducation.zip";
+	Dir = gid_Dir_Gallery_Education;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "galleducation.zip";
 End
 
 File gid_File_Extra_Gallenvironment
-    Dir = gid_Dir_Gallery_Environment;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallenvironment.zip";
+	Dir = gid_Dir_Gallery_Environment;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallenvironment.zip";
 End
 
 File gid_File_Extra_Gallfinance
-    Dir = gid_Dir_Gallery_Finance;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallfinance.zip";
+	Dir = gid_Dir_Gallery_Finance;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallfinance.zip";
 End
 
 File gid_File_Extra_Gallpeople
-    Dir = gid_Dir_Gallery_People;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallpeople.zip";
+	Dir = gid_Dir_Gallery_People;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallpeople.zip";
 End
 
 File gid_File_Extra_Gallsymbols
-    Dir = gid_Dir_Gallery_Symbols;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsymbols.zip";
+	Dir = gid_Dir_Gallery_Symbols;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallsymbols.zip";
 End
 
 File gid_File_Extra_Galltransport
-    Dir = gid_Dir_Gallery_Transport;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "galltransport.zip";
+	Dir = gid_Dir_Gallery_Transport;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "galltransport.zip";
 End
 
 File gid_File_Extra_Galltxtshapes
-    Dir = gid_Dir_Gallery_Txtshapes;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "galltxtshapes.zip";
+	Dir = gid_Dir_Gallery_Txtshapes;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "galltxtshapes.zip";
 End
 
 //////////////////////////////////////////////////////////////////////////////
 
 File gid_File_Extra_Gallrulers
-    Dir = gid_Dir_Gallery_Rulers;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallrulers.zip";
+	Dir = gid_Dir_Gallery_Rulers;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallrulers.zip";
 End
 
 File gid_File_Extra_Gallsound
-    Dir = gid_Dir_User_Gallery;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "gallsound.zip";
+	Dir = gid_Dir_User_Gallery;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	Name = "gallsound.zip";
 End
 
 File gid_File_Extra_Gallsounds
-    Dir = gid_Dir_Gallery_Sounds;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsounds.zip";
+	Dir = gid_Dir_Gallery_Sounds;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallsounds.zip";
 End
 
 File gid_File_Extra_Gallsystem
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsystem.zip";
-    Patchfiles = ();
+	Dir = gid_Dir_Gallery;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallsystem.zip";
+	Patchfiles = ();
 End
 
 File gid_File_Extra_Gallwwwback
-    Dir = gid_Dir_Gallery_Wwwback;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwback.zip";
+	Dir = gid_Dir_Gallery_Wwwback;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallwwwback.zip";
 End
 
 File gid_File_Extra_Gallwwwgraf
-    Dir = gid_Dir_Gallery_Wwwgraf;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwgraf.zip";
+	Dir = gid_Dir_Gallery_Wwwgraf;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "gallwwwgraf.zip";
 End
 
 File gid_File_Extra_Index_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "index.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "index.pl";
 End
 
 File gid_File_Extra_Palettes
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "palettes.zip";
-    Patchfiles = ();
+	Dir = gid_Dir_User_Config;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	Name = "palettes.zip";
+	Patchfiles = ();
 End
 
 File gid_File_Extra_Palettes_Lang
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(palettes,zip);
+	Dir = gid_Dir_User_Config;
+	USER_FILE_BODY;
+	Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(palettes,zip);
 End
 
 File gid_File_Extra_Poll_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "poll.asp";
 End
 
 File gid_File_Extra_Poll_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "poll.pl";
 End
 
 File gid_File_Extra_Savepic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "savepic.asp";
 End
 
 File gid_File_Extra_Savepic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "savepic.pl";
 End
 
 File gid_File_Extra_Show_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "show.asp";
 End
 
 File gid_File_Extra_Show_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.pl";
-End
-
-File gid_File_Extra_Symbols
-    Dir = gid_Dir_Config_Symbol;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "symbols.zip";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "show.pl";
 End
 
 File gid_File_Extra_Tpllayoutimpr_Lang
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr,zip);
+	Dir = gid_Dir_Template_Layout;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tpllayoutimpr,zip);
 End
 
 File gid_File_Extra_Tplpresntimpr_Lang
-    Dir = gid_Dir_Template_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplpresntimpr,zip);
+	Dir = gid_Dir_Template_Presnt;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizbitmap.zip";
+	Dir = gid_Dir_Share_Template_Wizard_Bitmap;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "tplwizbitmap.zip";
 End
 
 File gid_File_Extra_Tplwizdesktop_Lang
-    Dir = gid_Dir_Template_Internal;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizdesktop,zip);
+	Dir = gid_Dir_Template_Internal;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplwizdesktop,zip);
 End
 
 File gid_File_Extra_Tplwizletter
-    Dir = gid_Dir_Share_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizletter.zip";
+	Dir = gid_Dir_Share_Template_Wizard_Letter;
+	ARCHIVE_TXT_FILE_BODY;
+	Name = "tplwizletter.zip";
 End
 
 File gid_File_Extra_Tplwizletter_Lang
-    Dir = gid_Dir_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter,zip);
+	Dir = gid_Dir_Template_Wizard_Letter;
+	ARCHIVE_TXT_FILE_BODY;
+	EXTRA_ALL_LANG(tplwizletter,zip);
 End
 
 File gid_File_Extra_Tplwizfax_Lang
-    Dir = gid_Dir_Template_Wizard_Fax;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizfax,zip);
+	Dir = gid_Dir_Template_Wizard_Fax;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplwizfax,zip);
 End
 
 File gid_File_Extra_Tplwizagenda_Lang
-    Dir = gid_Dir_Template_Wizard_Agenda;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizagenda,zip);
+	Dir = gid_Dir_Template_Wizard_Agenda;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplwizagenda,zip);
 End
 
 File gid_File_Extra_Tplwizreport_Lang
-    Dir = gid_Dir_Template_Wizard_Report;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizreport,zip);
+	Dir = gid_Dir_Template_Wizard_Report;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplwizreport,zip);
 End
 
 File gid_File_Extra_Tplwizstyles_Lang
-    Dir = gid_Dir_Template_Wizard_Styles;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizstyles,zip);
+	Dir = gid_Dir_Template_Wizard_Styles;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(tplwizstyles,zip);
 End
 
 File gid_File_Extra_Webcast_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.asp";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "webcast.asp";
 End
 
 File gid_File_Extra_Webcast_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.pl";
+	Dir = gid_Dir_Config_Webcast;
+	PACKED_TXT_FILE_BODY;
+	Name = "webcast.pl";
 End
 
 File gid_File_Extra_Wordbook
-    Dir = gid_Dir_Wordbook_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(wordbook.zip);
+	Dir = gid_Dir_Wordbook_Language;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_IDENT_ALL_LANG(wordbook.zip);
 End
 
 File gid_File_Extra_Wordbook_Lang
-    Dir = gid_Dir_Wordbook_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook,zip);
+	Dir = gid_Dir_Wordbook_Language;
+	TXT_FILE_BODY;
+	Styles = (ARCHIVE, DONT_OVERWRITE);
+	EXTRA_ALL_LANG(wordbook,zip);
 End