From 0d239c581b6fe259d740b600bd70be2ed4a2250e Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 4 Apr 2005 14:28:20 +0000 Subject: INTEGRATION: CWS fwkfinal7 (1.60.276); FILE MERGED 2005/03/31 08:37:37 pb 1.60.276.1: fix: #i45745# duplicate id (HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES) removed --- svx/inc/helpid.hrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'svx/inc/helpid.hrc') diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 7265989b2d07..39dd1ca49d42 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -2,9 +2,9 @@ * * $RCSfile: helpid.hrc,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: vg $ $Date: 2004-12-23 11:51:53 $ + * last change: $Author: hr $ $Date: 2005-04-04 15:28:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -764,7 +764,8 @@ #define HID_POPUP_FONTWORK_ALIGN (HID_SVX_EXT0_START + 158) #define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_EXT0_START + 159) -#define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES (HID_SVX_EXT0_START + 160) +// pb: duplicate (see: HID_SVX_EXT0_START + 127) +// #define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES (HID_SVX_EXT0_START + 160) #define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_EXT0_START + 161) #define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_EXT0_START + 162) -- cgit