This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new cfaf75ede1 Remove Bitmaps from build (PR #163)
cfaf75ede1 is described below
commit cfaf75ede1a1c20f04cded528fcff3e4688768e5
Author: mseidel <[email protected]>
AuthorDate: Tue Feb 28 17:31:23 2023 +0100
Remove Bitmaps from build (PR #163)
---
main/cui/source/inc/cuires.hrc | 12 +++---
main/cui/source/options/optpath.src | 22 ++++------
main/extras/prj/build.lst | 1 -
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 | 25 +++--------
main/scp2/source/ooo/directory_ooo.scp | 13 ++----
main/scp2/source/ooo/file_extra_ooo.scp | 14 ++----
73 files changed, 35 insertions(+), 118 deletions(-)
diff --git a/main/cui/source/inc/cuires.hrc b/main/cui/source/inc/cuires.hrc
index 478204d2fd..bf8d3a620f 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
@@ -200,7 +201,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
@@ -248,7 +248,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 b2ded8cfcb..0878fbcc62 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 -----------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
TabPage RID_SFXPAGE_PATH
{
@@ -71,7 +72,7 @@ TabPage RID_SFXPAGE_PATH
HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
Pos = MAP_APPFONT ( 115 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
- Text [ en-US ] = "~Default" ;
+ Text [ en-US ] = "~Default" ;
};
FixedLine GB_STD
{
@@ -100,7 +101,7 @@ ErrorBox RID_SVXERR_OPT_DOUBLEPATHS
DEFBUTTON = WB_DEF_OK ;
Message [ en-US ] = "The configuration and mail directories must be
specified as separate directories.\nPlease choose a new path." ;
};
- // ******************************************************************* EOF
+// ******************************************************************* EOF
String RID_SVXSTR_KEY_CONFIG_DIR
{
Text [ en-US ] = "Configuration" ;
@@ -113,10 +114,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" ;
@@ -195,4 +192,3 @@ String RID_SVXSTR_KEY_LINGUISTIC_DIR
{
Text [ en-US ] = "Writing aids";
};
-
diff --git a/main/extras/prj/build.lst b/main/extras/prj/build.lst
index 04acbf0f1b..a16165dfca 100644
--- a/main/extras/prj/build.lst
+++ b/main/extras/prj/build.lst
@@ -25,7 +25,6 @@ er extras\source\gallery\www-graf
nmake -
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
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 8000a105db..0a0c0e50e4 100644
--- a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -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.
- *
+ *
***********************************************************-->
@@ -1593,13 +1593,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>
@@ -1764,12 +1757,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>
@@ -4816,7 +4803,7 @@
</info>
<value>true</value>
</prop>
- </group>
+ </group>
</group>
</group>
<group oor:name="HTML">
@@ -6202,7 +6189,7 @@
<info>
<author>ALG</author>
<desc>
- This option allows to make previews (e.g. UI previews for
object attirbutes) show the content with a checkeded
+ This option allows to make previews (e.g. UI previews for
object attributes) show the content with a checked
background to allow simple identification and better preview
of transparent content, e.g. when a draw object
is filled with a transparent graphic (SVG or bitmap) the
preview will show the checkered background shine
through, so the user can identify that the fill has
transparency with a single look.
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..34244fb694 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.
- *
+ *
*************************************************************/
@@ -404,12 +404,6 @@ File gid_File_Extra_Show_Pl
Name = "show.pl";
End
-File gid_File_Extra_Symbols
- Dir = gid_Dir_Config_Symbol;
- ARCHIVE_TXT_FILE_BODY;
- Name = "symbols.zip";
-End
-
File gid_File_Extra_Tpllayoutimpr_Lang
Dir = gid_Dir_Template_Layout;
TXT_FILE_BODY;
