This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 06edef0e42 Remove 'Mozilla / Netscape' entry from Address Book Data
Source Wizard
06edef0e42 is described below
commit 06edef0e427055b25ffda00b4f507ee17a7c0fb3
Author: mseidel <[email protected]>
AuthorDate: Wed Aug 20 17:48:22 2025 +0200
Remove 'Mozilla / Netscape' entry from Address Book Data Source Wizard
(cherry picked from commit e94227aa73166c92d52758cd78486376a334d048)
---
.../connectivity/source/inc/resource/mozab_res.hrc | 10 +++-----
.../source/resource/conn_shared_res.src | 27 +++++++++-------------
main/extensions/source/abpilot/abpresid.hrc | 8 +++----
main/extensions/source/abpilot/abspilot.src | 10 +-------
.../source/abpilot/typeselectionpage.cxx | 4 ----
.../source/abpilot/typeselectionpage.hxx | 3 ---
main/helpcontent2/helpers/help_hid.lst | 1 -
.../source/text/shared/autopi/01170000.xhp | 3 ---
.../text/shared/explorer/database/dabawiz01.xhp | 2 +-
9 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/main/connectivity/source/inc/resource/mozab_res.hrc
b/main/connectivity/source/inc/resource/mozab_res.hrc
index 47ce3caa8c..9b218d9528 100644
--- a/main/connectivity/source/inc/resource/mozab_res.hrc
+++ b/main/connectivity/source/inc/resource/mozab_res.hrc
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef CONNECTIVITY_RESOURCE_MOZAB_HRC
#define CONNECTIVITY_RESOURCE_MOZAB_HRC
@@ -28,15 +26,13 @@
#include "resource/conn_shared_res.hrc"
#endif
-// ============================================================================
-// = the mozab driver's resource strings
-// ============================================================================
+// mozab driver resource strings
-#define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 )
+//#define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 )
#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 )
#define STR_OE_ADDRESSBOOK ( STR_MOZAB_BASE + 2 )
#define STR_OUTLOOK_MAPI_ADDRESSBOOK ( STR_MOZAB_BASE + 3 )
- // FREE
+// FREE
#define STR_NO_TABLE_CREATION_SUPPORT ( STR_MOZAB_BASE + 5 )
#define STR_MOZILLA_IS_RUNNING ( STR_MOZAB_BASE + 6 )
#define STR_COULD_NOT_RETRIEVE_AB_ENTRY ( STR_MOZAB_BASE + 7 )
diff --git a/main/connectivity/source/resource/conn_shared_res.src
b/main/connectivity/source/resource/conn_shared_res.src
index 083da8b570..598e9dfd81 100644
--- a/main/connectivity/source/resource/conn_shared_res.src
+++ b/main/connectivity/source/resource/conn_shared_res.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "resource/mozab_res.hrc"
#include "resource/macab_res.hrc"
#include "resource/calc_res.hrc"
@@ -32,14 +30,7 @@
#include "resource/adabas_res.hrc"
#include "resource/hsqldb_res.hrc"
-// ============================================================================
-// = the mozab driver's resource strings
-// ============================================================================
-
-String STR_MOZILLA_ADDRESSBOOKS
-{
- Text [ en-US ] = "Mozilla/Seamonkey Addressbook Directory" ;
-};
+// mozab driver resource strings
String STR_THUNDERBIRD_ADDRESSBOOKS
{
@@ -196,9 +187,8 @@ String STR_COULD_NOT_CONNECT_LDAP
Text [ en-US ] = "The connection to the LDAP server could not be
established." ;
};
-// ============================================================================
-// = common strings
-// ============================================================================
+// common strings
+
String STR_NO_CONNECTION_GIVEN
{
Text [ en-US ] = "It doesn't exist a connection to the database." ;
@@ -322,9 +312,8 @@ String STR_LOAD_FILE_ERROR_MESSAGE
Text [ en-US ] = "The attempt to load the file resulted in the
following error message ($exception_type$):\n\n$error_message$" ;
};
-// ============================================================================
-// = the ado driver's resource strings
-// ============================================================================
+// ado driver resource strings
+
String STR_TYPE_NOT_CONVERT
{
Text [ en-US ] = "The type could not be converted." ;
@@ -373,6 +362,7 @@ String STR_NO_CONNECTION
};
// dBASE
+
String STR_COULD_NOT_DELETE_INDEX
{
Text [ en-US ] = "The index could not be deleted. An unknown error
while accessing the file system occurred." ;
@@ -480,6 +470,7 @@ String STR_SORT_BY_COL_ONLY
};
// File
+
String STR_QUERY_COMPLEX_COUNT
{
Text [ en-US ] = "The query can not be executed. It is too complex.
Only \"COUNT(*)\" is supported." ;
@@ -581,6 +572,7 @@ String STR_PARA_ONLY_PREPARED
};
// MACAB
+
String STR_NO_TABLE
{
Text [ en-US ] = "No such table!" ;
@@ -592,6 +584,7 @@ String STR_NO_MAC_OS_FOUND
};
// ADABAS D
+
String STR_NO_DISK_SPACE
{
Text [ en-US ] = "The database file '$filename$' could not be created.
Please check your disk space." ;
@@ -609,7 +602,9 @@ String STR_USER_NO_DELETE
{
Text [ en-US ] = "This user couldn't be deleted. Otherwise the database
stays in a inconsistent state." ;
};
+
// hsqldb
+
String STR_NO_STROAGE
{
Text [ en-US ] = "The connection can not be established. No storage or
URL was given." ;
diff --git a/main/extensions/source/abpilot/abpresid.hrc
b/main/extensions/source/abpilot/abpresid.hrc
index f6154c2f70..1bcb070b4b 100644
--- a/main/extensions/source/abpilot/abpresid.hrc
+++ b/main/extensions/source/abpilot/abpresid.hrc
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef EXTENSIONS_ABPRESID_HRC
#define EXTENSIONS_ABPRESID_HRC
@@ -150,8 +148,8 @@
#define FT_LOCATION 11
//........................................................................
-#define RB_MORK 1
-#define RB_THUNDERBIRD 2
+//#define RB_MORK 1
+#define RB_THUNDERBIRD 2
#define RB_EVOLUTION 3
#define RB_KAB 4
#define RB_MACAB 5
@@ -159,7 +157,7 @@
#define RB_OUTLOOK 7
#define RB_OUTLOOKEXPRESS 8
#define RB_OTHER 9
-#define RB_EVOLUTION_GROUPWISE 10
+#define RB_EVOLUTION_GROUPWISE 10
#define RB_EVOLUTION_LDAP 11
//........................................................................
diff --git a/main/extensions/source/abpilot/abspilot.src
b/main/extensions/source/abpilot/abspilot.src
index 67ec231ac4..814c93cb13 100644
--- a/main/extensions/source/abpilot/abspilot.src
+++ b/main/extensions/source/abpilot/abspilot.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef EXTENSIONS_ABPRESID_HRC
#include "abpresid.hrc"
#endif
@@ -77,7 +75,7 @@ TabPage RID_PAGE_SELECTABTYPE
Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
WordBreak = TRUE ;
- Text [ en-US ] = "%PRODUCTNAME lets you access address data
already present in your system. To do this, a %PRODUCTNAME data source will be
created in which your address data is available in tabular form.\n\nThis wizard
helps you create the data source." ;
+ Text [ en-US ] = "%PRODUCTNAME lets you access address data
already present in your system. To do this, a data source will be created in
which your address data is available in tabular form.\n\nThis wizard helps you
create the data source." ;
};
FixedLine FL_TYPE
@@ -106,12 +104,6 @@ TabPage RID_PAGE_SELECTABTYPE
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Evolution LDAP" ;
};
- RadioButton RB_MORK
- {
- HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK"
;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
- Text [ en-US ] = "Mozilla / Netscape" ;
- };
RadioButton RB_THUNDERBIRD
{
HelpID =
"extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD" ;
diff --git a/main/extensions/source/abpilot/typeselectionpage.cxx
b/main/extensions/source/abpilot/typeselectionpage.cxx
index ca0faf2ac4..054ae1239d 100644
--- a/main/extensions/source/abpilot/typeselectionpage.cxx
+++ b/main/extensions/source/abpilot/typeselectionpage.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
#include "typeselectionpage.hxx"
@@ -48,7 +46,6 @@ namespace abp
,m_aEvolution (this, ModuleRes(RB_EVOLUTION))
,m_aEvolutionGroupwise (this, ModuleRes(RB_EVOLUTION_GROUPWISE))
,m_aEvolutionLdap (this, ModuleRes(RB_EVOLUTION_LDAP))
- ,m_aMORK (this, ModuleRes(RB_MORK))
,m_aThunderbird (this, ModuleRes(RB_THUNDERBIRD))
,m_aKab (this,
ModuleRes(RB_KAB))
,m_aMacab (this, ModuleRes(RB_MACAB))
@@ -98,7 +95,6 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( &m_aEvolution,
AST_EVOLUTION, bHaveEvolution ) );
m_aAllTypes.push_back( ButtonItem( &m_aEvolutionGroupwise,
AST_EVOLUTION_GROUPWISE, bHaveEvolution ) );
m_aAllTypes.push_back( ButtonItem( &m_aEvolutionLdap,
AST_EVOLUTION_LDAP, bHaveEvolution ) );
- m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK,
bWithMozilla ) );
m_aAllTypes.push_back( ButtonItem( &m_aThunderbird,
AST_THUNDERBIRD, bWithMozilla ) );
m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab )
);
m_aAllTypes.push_back( ButtonItem( &m_aMacab, AST_MACAB,
bHaveMacab ) );
diff --git a/main/extensions/source/abpilot/typeselectionpage.hxx
b/main/extensions/source/abpilot/typeselectionpage.hxx
index 96fabf6e5a..f4d089daf4 100644
--- a/main/extensions/source/abpilot/typeselectionpage.hxx
+++ b/main/extensions/source/abpilot/typeselectionpage.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
#define EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
@@ -44,7 +42,6 @@ namespace abp
RadioButton m_aEvolution;
RadioButton m_aEvolutionGroupwise;
RadioButton m_aEvolutionLdap;
- RadioButton m_aMORK;
RadioButton m_aThunderbird;
RadioButton m_aKab;
RadioButton m_aMacab;
diff --git a/main/helpcontent2/helpers/help_hid.lst
b/main/helpcontent2/helpers/help_hid.lst
index c9ea5ba3e4..3062a700d3 100644
--- a/main/helpcontent2/helpers/help_hid.lst
+++ b/main/helpcontent2/helpers/help_hid.lst
@@ -6694,7 +6694,6 @@
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP,860619275,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB,860619268,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_LDAP,860619270,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB,860619269,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MORK,860619265,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER,860619273,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOK,860619271,
extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS,860619272,
diff --git a/main/helpcontent2/source/text/shared/autopi/01170000.xhp
b/main/helpcontent2/source/text/shared/autopi/01170000.xhp
index 0d68c4430e..41cfb7e4a4 100644
--- a/main/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/main/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -44,9 +44,6 @@
<embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2"
l10n="U">Please select the type of your external address book</paragraph>
<paragraph role="paragraph" id="par_id5782036" xml-lang="en-US" l10n="NEW">Not
all types are available on all systems.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK"
id="bm_id3149096" localize="false"/>
-<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3"
l10n="U">Seamonkey / Netscape</paragraph>
-<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US"
l10n="U"><ahelp
hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option
if you already use an address book in Seamonkey or Netscape.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD"
id="bm_id611896" localize="false"/>
<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3"
l10n="NEW">Thunderbird</paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select this option if you already use an address book
in Thunderbird.</ahelp></paragraph>
diff --git
a/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
b/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 2681e5b957..ba635f27a8 100644
--- a/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -58,7 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DSTYPE"
id="bm_id763267" localize="false"/>
<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3"
l10n="NEW">Database type</paragraph>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the database type for the existing database
connection.</ahelp></paragraph>
-<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The
Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need
additional information. For other database types, the wizard contains
additional pages to specify the required information.</paragraph>
+<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The
Outlook, Evolution, and KDE Address Book database types do not need additional
information. For other database types, the wizard contains additional pages to
specify the required information.</paragraph>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US" l10n="NEW">The
next wizard page is one of the following pages:</paragraph>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"
l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up
text file connection</link></paragraph>
