diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 09:34:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 09:34:55 +0000 |
| commit | 07f0f989e87aa0ac1967c1ccb5b994fd5409c643 (patch) | |
| tree | c735e98eae1e60beb2492b2f2e47dfa7e49c993d /xmloff/source/core/xmltoken.cxx | |
| parent | 6cfdec38e12d11d7947545d07454d2fdc910b55e (diff) | |
#i10000# conflict fixed
Diffstat (limited to 'xmloff/source/core/xmltoken.cxx')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index bf64fb507d..8baeecea86 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmltoken.cxx,v $ * - * $Revision: 1.119 $ + * $Revision: 1.120 $ * - * last change: $Author: kz $ $Date: 2008-03-06 10:27:49 $ + * last change: $Author: kz $ $Date: 2008-03-06 10:34:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2978,13 +2978,11 @@ namespace xmloff { namespace token { TOKEN( "character-set", XML_CHARACTER_SET ), TOKEN( "application-connection-settings", XML_APPLICATION_CONNECTION_SETTINGS ), TOKEN( "table-include-filter", XML_TABLE_INCLUDE_FILTER ), -<<<<<<< xmltoken.cxx TOKEN( "angle-offset", XML_ANGLE_OFFSET ), // --> OD 2007-09-14 #i81002# TOKEN( "number-no-superior", XML_NUMBER_NO_SUPERIOR ), TOKEN( "number-all-superior", XML_NUMBER_ALL_SUPERIOR ), // <-- -======= // --> OD 2008-01-15 #newlistlevelattrs# TOKEN( "list-level-position-and-space-mode", XML_LIST_LEVEL_POSITION_AND_SPACE_MODE ), TOKEN( "label-width-and-position", XML_LABEL_WIDTH_AND_POSITION ), @@ -2996,7 +2994,6 @@ namespace xmloff { namespace token { TOKEN( "nothing", XML_NOTHING ), TOKEN( "list-tab-stop-position", XML_LIST_TAB_STOP_POSITION ), // <-- ->>>>>>> 1.115.32.1 #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } #else |