diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
| commit | 57272eaaf5776f673b5141354a1d1e1af080d575 (patch) | |
| tree | 9241d5523e03af24cd7ba2e45dd8b0951a9fdeb1 /wizards/source/formwizard/dbwizres.src | |
| parent | 1df024d97cc44155566f8db279e8cdba37e95fcf (diff) | |
| parent | f9d40c2b591215b57ece4ba6e623b7808a7ae717 (diff) | |
Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards
Conflicts:
wizards/com/sun/star/wizards/common/Resource.java
merged resolved as per:
e52421bc118e9c5f3fce5a32ba9efdcad7627d92
9e91dbca08056fc31f388f5642fdfa3d2b910990
in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there
Diffstat (limited to 'wizards/source/formwizard/dbwizres.src')
| -rw-r--r-- | wizards/source/formwizard/dbwizres.src | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index c04d77b9fcdd..160bb08d90db 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,34 +25,34 @@ * ************************************************************************/// common -#define RID_COMMON_START 500 -#define RID_DB_COMMON_START 1000 +#define RID_COMMON_START 500 +#define RID_DB_COMMON_START 1000 // db wizards -#define RID_DB_FORM_WIZARD_START 2200 -#define RID_DB_QUERY_WIZARD_START 2300 -#define RID_DB_REPORT_WIZARD_START 2400 -#define RID_DB_TABLE_WIZARD_START 2500 +#define RID_DB_FORM_WIZARD_START 2200 +#define RID_DB_QUERY_WIZARD_START 2300 +#define RID_DB_REPORT_WIZARD_START 2400 +#define RID_DB_TABLE_WIZARD_START 2500 -#define RID_LETTERWIZARDDIALOG_START 3000 -#define RID_LETTERWIZARDGREETING_START 3080 -#define RID_LETTERWIZARDSALUTATION_START 3090 -#define RID_LETTERWIZARDROADMAP_START 3100 -#define RID_LETTERWIZARDLANGUAGE_START 3110 +#define RID_LETTERWIZARDDIALOG_START 3000 +#define RID_LETTERWIZARDGREETING_START 3080 +#define RID_LETTERWIZARDSALUTATION_START 3090 +#define RID_LETTERWIZARDROADMAP_START 3100 +#define RID_LETTERWIZARDLANGUAGE_START 3110 -#define RID_FAXWIZARDDIALOG_START 3200 -#define RID_FAXWIZARDCOMMUNICATION_START 3270 -#define RID_FAXWIZARDGREETING_START 3280 -#define RID_FAXWIZARDSALUTATION_START 3290 -#define RID_FAXWIZARDROADMAP_START 3300 +#define RID_FAXWIZARDDIALOG_START 3200 +#define RID_FAXWIZARDCOMMUNICATION_START 3270 +#define RID_FAXWIZARDGREETING_START 3280 +#define RID_FAXWIZARDSALUTATION_START 3290 +#define RID_FAXWIZARDROADMAP_START 3300 // web wizard -#define RID_WEBWIZARDDIALOG_START 4000 -#define RID_WEBWIZARDDIALOG_FTP 4200 +#define RID_WEBWIZARDDIALOG_START 4000 +#define RID_WEBWIZARDDIALOG_FTP 4200 // agenda wizard @@ -1748,9 +1748,9 @@ String RID_DB_TABLE_WIZARD_START + 51 // ============================================================================ -// ============================ ====================== -// ====================== LETTER WIZARD RESOURCES ================ -// ============================ ====================== +// ============================ ====================== +// ====================== LETTER WIZARD RESOURCES ================ +// ============================ ====================== // ============================================================================ @@ -2110,9 +2110,9 @@ String RID_LETTERWIZARDROADMAP_START + 6 // ============================================================================ -// ============================ ====================== -// ====================== FAX WIZARD RESOURCES ================ -// ============================ ====================== +// ============================ ====================== +// ====================== FAX WIZARD RESOURCES ================ +// ============================ ====================== // ============================================================================ @@ -2406,9 +2406,9 @@ String RID_FAXWIZARDROADMAP_START + 5 // ============================================================================ -// ============================ ====================== -// ====================== WEB WIZARD RESOURCES ================ -// ============================ ====================== +// ============================ ====================== +// ====================== WEB WIZARD RESOURCES ================ +// ============================ ====================== // ============================================================================ @@ -3063,7 +3063,7 @@ String RID_WEBWIZARDDIALOG_START +152 // ============================================================================ -// ================= WEB WIZARD FTP DIALOG RESOURCES ============= +// ================= WEB WIZARD FTP DIALOG RESOURCES ============= // ============================================================================ @@ -3166,9 +3166,9 @@ String RID_WEBWIZARDDIALOG_FTP +18 // ============================================================================ -// ============================ ====================== -// ====================== AGENDA WIZARD RESOURCES ================ -// ============================ ====================== +// ============================ ====================== +// ====================== AGENDA WIZARD RESOURCES ================ +// ============================ ====================== // ============================================================================ String RID_AGENDAWIZARDDIALOG_START +1 |