diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:49:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:49:45 +0000 |
| commit | 24caccce3e9960e4613e5ff400cfb9d96d4d4481 (patch) | |
| tree | 94ff5bc602f4d167859452246d4164e3f6b9290e /xmloff | |
| parent | c0931660e10321293b4574f7d37034826ba81da0 (diff) | |
INTEGRATION: CWS navorder (1.3.22); FILE MERGED
2007/08/28 08:05:16 af 1.3.22.3: #i68097# Resolved merge conflict.
2007/07/05 14:06:44 af 1.3.22.2: RESYNC: (1.3-1.4); FILE MERGED
2007/06/21 13:35:23 cl 1.3.22.1: #i68097# added draw:nav-order attribute
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 1672113dd35f..cff8e2a53a87 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xmltoken.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ihi $ $Date: 2007-08-20 16:31:50 $ + * last change: $Author: vg $ $Date: 2007-08-28 13:49:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2952,6 +2952,7 @@ namespace xmloff { namespace token { XML_SOFT_PAGE_BREAK, XML_USE_SOFT_PAGE_BREAKS, XML_DEPENDENCY, + XML_NAV_ORDER, XML_TOKEN_END }; |