diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:01:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:01:31 +0000 |
| commit | 73c220b6e14dc07ce10076818634be2d3dc8d32b (patch) | |
| tree | 29fa1f8e1edc3690f33efb20f4c63e1d30a6422b | |
| parent | 67bec79303c78aef064561c770ca71fada0ecd3c (diff) | |
INTEGRATION: CWS swdrawobjapi (1.94.10); FILE MERGED
2004/08/12 06:59:41 od 1.94.10.2: RESYNC: (1.94-1.97); FILE MERGED
resolve merge conflict.
2004/08/06 13:49:28 od 1.94.10.1: #i28749# - adjustments to transform shape position between OpenOffice.org
file format and OASIS Open Office file format
| -rw-r--r-- | sw/inc/unoprnms.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 1a9390bc43ed..7ddad3c4468a 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.98 $ + * $Revision: 1.99 $ * - * last change: $Author: obo $ $Date: 2004-08-11 15:39:51 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:01:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -752,7 +752,11 @@ enum SwPropNameIds /* 0670 */ UNO_NAME_WRAP_INFLUENCE_ON_POSITION, /* 0671 */ UNO_NAME_DATA_BASE_URL, /* 0672 */ UNO_NAME_DATA_BASE_RESOURCE, -/* 0673 */ SW_PROPNAME_END +// --> OD 2004-08-06 #i28749# +/* 0673 */ UNO_NAME_TRANSFORMATION_IN_HORI_L2R, +/* 0674 */ UNO_NAME_POSITION_LAYOUT_DIR, +// <-- +/* 0675 */ SW_PROPNAME_END }; |