diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 15:01:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 15:01:48 +0000 |
| commit | a9232bb320b7bfb1bec7b823fae802cd75e5fd54 (patch) | |
| tree | 4b240287922cb406b94254ee1baea9feaed4d236 /xmloff | |
| parent | f0a994d7ce310162e9390771e9c0e13d32aa91c6 (diff) | |
INTEGRATION: CWS sab008 (1.47.14); FILE MERGED
2004/03/15 11:21:27 dr 1.47.14.4: RESYNC: (1.50-1.51); FILE MERGED
2004/02/11 12:07:50 sab 1.47.14.3: RESYNC: (1.49-1.50); FILE MERGED
2004/01/26 09:41:42 sab 1.47.14.2: RESYNC: (1.47-1.49); FILE MERGED
2004/01/23 11:10:05 sab 1.47.14.1: #i8868#; add scale to x and scale to y
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 2f360d8c912b..5b8d9f3307c2 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltoken.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: hr $ $Date: 2004-03-08 14:10:01 $ + * last change: $Author: obo $ $Date: 2004-03-19 16:01:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2154,8 +2154,11 @@ namespace xmloff { namespace token { TOKEN( "font-independent-line-spacing" ), // XML_FONT_INDEPENDENT_LINE_SPACING TOKEN( "selection" ), // XML_SELECTION TOKEN( "selection-indexes" ), // XML_SELECTION_INDEXES - TOKEN( "keep-together" ), // XML_KEEP_TOGETHER + TOKEN( "scale-to-X" ), //XML_SCALE_TO_X + TOKEN( "scale-to-Y" ), //XML_SCALE_TO_Y + + TOKEN( "keep-together" ), // XML_KEEP_TOGETHER // DVO, OD 01.10.2003 #i18732# TOKEN( "flow-with-text" ), // XML_FLOW_WITH_TEXT |