You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/12/27 20:19:47 UTC
[openoffice] branch Pilot-Pirx-patch-1 updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-patch-1
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/Pilot-Pirx-patch-1 by this push:
new 5f66afde6c Cleanup
5f66afde6c is described below
commit 5f66afde6c704448f5489f0aad8aa20e2975d369
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 27 21:19:33 2022 +0100
Cleanup
---
main/cui/source/inc/cuires.hrc | 12 ++++-----
main/cui/source/options/optpath.src | 30 ++++++++++------------
.../registry/data/org/openoffice/Office/Paths.xcu | 18 +++++--------
.../schema/org/openoffice/Office/Common.xcs | 13 ----------
4 files changed, 26 insertions(+), 47 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/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>