mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS custommeta (1.115.12); FILE MERGED

Browse Source 
2008/02/26 10:33:32 mst 1.115.12.2: RESYNC: (1.115-1.116); FILE MERGED
2008/01/16 14:56:55 mst 1.115.12.1: remove import of obsolete text:user-info-0 elements
cvs archeology revealed these have never been written by a published OOo version
- xmloff/source/core/xmltoken.cxx, xmloff/inc/{xmlkywd.hxx,txtimp.hxx},
  xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/text/txtimp.cxx:
  + remove tokens user-info-[0-3]
  + remove XML_TOK_TEXT_DOCUMENT_INFORMATION_[0-3] from enum XMLTextPElemTokens
  + remove XML_USER_INFO[0-3]
- xmloff/source/text/txtfldi.cxx:
  + remove all handling of user-info-[0-3] tokens
  + fix bug: the fixed attribute of text:user-defined fields was ignored
This commit is contained in:
Oliver Bolte
2008-02-26 12:34:59 +00:00
parent 1404a02eda
commit a294f08b81
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xmloff/source/core/xmltoken.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: xmltoken.cxx,v $
*
* $Revision: 1.117 $
* $Revision: 1.118 $
*
* last change: $Author: obo $ $Date: 2008-02-26 11:01:01 $
* last change: $Author: obo $ $Date: 2008-02-26 13:34:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1884,10 +1884,6 @@ namespace xmloff { namespace token {
TOKEN( "user-index-mark-end", XML_USER_INDEX_MARK_END ),
TOKEN( "user-index-mark-start", XML_USER_INDEX_MARK_START ),
TOKEN( "user-index-source", XML_USER_INDEX_SOURCE ),
TOKEN( "user-info-0", XML_USER_INFO_0 ),
TOKEN( "user-info-1", XML_USER_INFO_1 ),
TOKEN( "user-info-2", XML_USER_INFO_2 ),
TOKEN( "user-info-3", XML_USER_INFO_3 ),
TOKEN( "user-transformed", XML_USER_TRANSFORMED ),
TOKEN( "username", XML_USERNAME ),
TOKEN( "value", XML_VALUE ),