Skip to content

Commit

Permalink
Remove Bitmaps from build (#163)
Browse files Browse the repository at this point in the history
* Remove Bitmaps from build

* Remove directory

* Remove directory from packaging

* Cleanup

* Further cleanup
  • Loading branch information
Pilot-Pirx authored Jan 10, 2023
1 parent 415e9fa commit 9fd60fc
Show file tree
Hide file tree
Showing 73 changed files with 296 additions and 377 deletions.
12 changes: 6 additions & 6 deletions main/cui/source/inc/cuires.hrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
/**************************************************************
*
*
* 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.
*
*
*************************************************************/



#ifndef _CUI_RESID_HRC
#define _CUI_RESID_HRC

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
30 changes: 14 additions & 16 deletions main/cui/source/options/optpath.src
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
/**************************************************************
*
*
* 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.
*
*
*************************************************************/


// include --------------------------------------------------------------

// include --------------------------------------------------------------
#include "optpath.hrc"
#include <cuires.hrc>
#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
#endif
#include "helpid.hrc"

// RID_SFXPAGE_PATH -----------------------------------------------------
// RID_SFXPAGE_PATH -----------------------------------------------------
TabPage RID_SFXPAGE_PATH
{
HelpId = HID_OPTIONS_PATH ;
Expand All @@ -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" ;
Expand All @@ -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" ;
Expand All @@ -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
{
Expand All @@ -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" ;
Expand Down Expand Up @@ -193,3 +190,4 @@ String RID_SVXSTR_KEY_LINGUISTIC_DIR
Text [ en-US ] = "Writing aids" ;
};

// ********************************************************************** EOF
55 changes: 27 additions & 28 deletions main/extras/prj/build.lst
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion main/extras/source/symbols/delzip

This file was deleted.

Binary file removed main/extras/source/symbols/l_2people.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_attention1.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_attention2.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_attention3.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_candy.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_face.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_flower.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_ghost.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_halloween.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_home.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_lamp.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_lock.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_page_b.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_page_g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_page_y.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_people.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_rose.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_save.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_smiley_1.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_smiley_oh.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_smiley_sad.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_snow.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/l_star.bmp
Binary file not shown.
47 changes: 0 additions & 47 deletions main/extras/source/symbols/makefile.mk

This file was deleted.

Binary file removed main/extras/source/symbols/s_arrow-1.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_arrow-2.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_arrow-3.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_arrow-4.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_attention1.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_attention2.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_attention3.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ball-b.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ball-g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ball-r.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ball.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_bug.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_clover.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_egg.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_face.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_flower.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ghost.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_group.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_halloween.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_heart.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_home.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_lock.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ok-g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ok-r.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_ok.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_page_b.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_page_g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_page_y.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_pen-b.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_pen-g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_pen-r.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_people.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_smily_1.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_smily_oh.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_smily_sad.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_snow.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_star.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_team.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_x-g.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_x-r.bmp
Binary file not shown.
Binary file removed main/extras/source/symbols/s_x.bmp
Binary file not shown.
18 changes: 6 additions & 12 deletions main/officecfg/registry/data/org/openoffice/Office/Paths.xcu
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?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
* 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.
*
*
***********************************************************-->


Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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"/>
Expand All @@ -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" />
Expand Down
13 changes: 0 additions & 13 deletions main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 4 additions & 9 deletions main/scp2/source/ooo/directory_ooo.scp
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/**************************************************************
*
*
* 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.
*
*
*************************************************************/


Expand Down Expand Up @@ -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";
Expand Down
Loading

0 comments on commit 9fd60fc

Please sign in to comment.