diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-05 10:33:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-05 10:33:18 +0000 |
| commit | 7fe89c97fc148a4150d7d0e573efbdca399873bf (patch) | |
| tree | ec7ec8cb6fb5ba77916eb57d47ae904cbbb03cfa /sw/inc/unoprnms.hxx | |
| parent | 9c3f223745589ed48c4b0d8ba768d24fc21b8335 (diff) | |
#i10000# - correct merge conflicts.
Diffstat (limited to 'sw/inc/unoprnms.hxx')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index b330c0017ecc..462b32c4491a 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.96 $ + * $Revision: 1.97 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:28:26 $ + * last change: $Author: hr $ $Date: 2004-08-05 11:33:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -752,11 +752,7 @@ enum SwPropNameIds /* 0670 */ UNO_NAME_WRAP_INFLUENCE_ON_POSITION, /* 0671 */ UNO_NAME_DATA_BASE_URL, /* 0672 */ UNO_NAME_DATA_BASE_RESOURCE, -/* 0673 */ UNO_NAME_WIDTH_TYPE, -/* 0674 */ UNO_NAME_SCRIPT_URL, -/* 0675 */ UNO_NAME_RUNTIME_UID, -/* 0676 */ UNO_NAME_COLLAPSING_BORDERS, -/* 0677 */ SW_PROPNAME_END +/* 0673 */ SW_PROPNAME_END }; |