Skip to content

Commit 7dbe28d

Browse files
authored
Remove leftover from Mozilla address book (#401)
* Remove leftover from Mozilla address book * Additional files * Update datasourcehandling.hxx * Fix error
1 parent 478fe41 commit 7dbe28d

File tree

7 files changed

+317
-350
lines changed

7 files changed

+317
-350
lines changed

main/connectivity/source/inc/resource/mozab_res.hrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
// mozab driver resource strings
3030

31-
//#define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 )
31+
// FREE
3232
#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 )
3333
#define STR_OE_ADDRESSBOOK ( STR_MOZAB_BASE + 2 )
3434
#define STR_OUTLOOK_MAPI_ADDRESSBOOK ( STR_MOZAB_BASE + 3 )

main/extensions/source/abpilot/abpresid.hrc

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "abpilot.hrc"
2626
#include "extensio.hrc"
2727

28-
//========================================================================
2928
// basics
3029

3130
#define RID_DIALOG_START RID_ABP_START
@@ -36,74 +35,65 @@
3635
#define RID_QUERYBOX_START RID_ABP_START
3736
#define RID_BITMAP_START RID_ABP_START
3837

39-
//========================================================================
4038
// dialogs
4139

42-
#define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 )
40+
#define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 )
4341
// please adjust RID_DIALOG_END (below) when adding new dialogs
4442

4543
#define RID_DIALOG_END RID_DLG_ADDRESSBOOKSOURCEPILOT
4644

47-
//========================================================================
4845
// tab pages
4946

50-
#define RID_PAGE_SELECTABTYPE ( RID_PAGE_START + 0 )
51-
#define RID_PAGE_ADMININVOKATION ( RID_PAGE_START + 1 )
52-
#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
53-
#define RID_PAGE_FIELDMAPPING ( RID_PAGE_START + 3 )
54-
#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
47+
#define RID_PAGE_SELECTABTYPE ( RID_PAGE_START + 0 )
48+
#define RID_PAGE_ADMININVOKATION ( RID_PAGE_START + 1 )
49+
#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
50+
#define RID_PAGE_FIELDMAPPING ( RID_PAGE_START + 3 )
51+
#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
5552
// please adjust RID_PAGE_END (below) when adding new tab pages
5653

5754
#define RID_PAGE_END RID_PAGE_FINAL
5855

59-
//========================================================================
6056
// strings
6157

62-
#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 )
63-
#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 )
64-
#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 )
65-
#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 )
66-
#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 )
67-
#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 )
58+
#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 )
59+
#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 )
60+
#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 )
61+
#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 )
62+
#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 )
63+
#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 )
6864
// please adjust RID_STRING_END (below) when adding new strings
6965

7066
#define RID_STRING_END RID_STR_NOFIELDSASSIGNED
7167

72-
//========================================================================
7368
// error boxes
7469

75-
#define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 )
70+
#define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 )
7671
// please adjust RID_ERRORBOX_END (below) when adding new error boxes
7772

7873
#define RID_ERRORBOX_END RID_ERR_NEEDTYPESELECTION
7974

80-
//========================================================================
8175
// query boxes
8276

83-
#define RID_QRY_NOTABLES ( RID_QUERYBOX_START + 0 )
77+
#define RID_QRY_NOTABLES ( RID_QUERYBOX_START + 0 )
8478
// please adjust RID_QUERYBOX_END (below) when adding new query boxes
8579

8680
#define RID_QUERYBOX_END RID_QRY_NOTABLES
8781

88-
//========================================================================
8982
// untyped resources
9083

91-
#define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0 )
84+
#define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0 )
9285
// please adjust RID_UNTYPED_END (below) when adding new untyped resources
9386

9487
#define RID_UNTYPED_END RID_RSC_NOTUSEDYET
9588

96-
//========================================================================
9789
// bitmaps
9890

99-
#define BMP_HEADERIMAGE ( RID_BITMAP_START + 0 )
91+
#define BMP_HEADERIMAGE ( RID_BITMAP_START + 0 )
10092
// please adjust RID_BITMAP_END (below) when adding new bitmaps
10193

10294
#define RID_BITMAP_END BMP_HEADERIMAGE
10395

104-
//========================================================================
105-
//========================================================================
106-
//= range checks
96+
// range checks
10797

10898
#if RID_DIALOG_END > RID_ABP_END
10999
#error "please adjust the resource id ranges!!"
@@ -127,7 +117,6 @@
127117
#error "please adjust the resource id ranges!!"
128118
#endif
129119

130-
//========================================================================
131120
// local resource ids
132121

133122
//........................................................................
@@ -141,14 +130,14 @@
141130
#define FT_NAME_EXPL 4
142131
#define FT_ERROR 5
143132
#define FL_TOOMUCHTABLES 6
144-
#define FT_FIELDASSIGMENTEXPL 7
133+
#define FT_FIELDASSIGMENTEXPL 7
145134
#define FT_ASSIGNEDFIELDS 8
146135
#define FT_FINISH_EXPL 9
147136
#define FT_DUPLICATENAME 10
148137
#define FT_LOCATION 11
149138

150139
//........................................................................
151-
//#define RB_MORK 1
140+
// FREE
152141
#define RB_THUNDERBIRD 2
153142
#define RB_EVOLUTION 3
154143
#define RB_KAB 4
@@ -179,24 +168,23 @@
179168
#define CBB_LOCATION 1
180169

181170
//........................................................................
182-
#define STR_SELECT_ABTYPE 1
183-
#define STR_INVOKE_ADMIN_DIALOG 2
184-
#define STR_TABLE_SELECTION 3
185-
#define STR_MANUAL_FIELD_MAPPING 4
186-
#define STR_FINAL_CONFIRM 5
171+
#define STR_SELECT_ABTYPE 1
172+
#define STR_INVOKE_ADMIN_DIALOG 2
173+
#define STR_TABLE_SELECTION 3
174+
#define STR_MANUAL_FIELD_MAPPING 4
175+
#define STR_FINAL_CONFIRM 5
187176

188-
//========================================================================
189177
// some defines
190178

191179
//........................................................................
192180
#define WINDOW_SIZE_X 240
193181
#define WINDOW_SIZE_Y 185
194182

195-
#define WINDOW_BORDER_X 12
196-
#define WINDOW_BORDER_Y 14
183+
#define WINDOW_BORDER_X 12
184+
#define WINDOW_BORDER_Y 14
197185

198-
#define BUTTON_SIZE_X 50
199-
#define BUTTON_SIZE_Y 14
186+
#define BUTTON_SIZE_X 50
187+
#define BUTTON_SIZE_Y 14
200188

201189
#define HEADER_SIZE_Y 30
202190

@@ -209,5 +197,5 @@
209197
/*************************************************************************
210198
* history:
211199
*
212-
* Revision 1.0 30.01.01 16:38:29 fs
200+
* Revision 1.0 30.01.01 16:38:29 fs
213201
************************************************************************/

0 commit comments

Comments
 (0)