diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-05-15 13:38:07 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-05-18 16:51:59 +0200 |
| commit | b5e16d8dab070cfef908e7b5ca0417da534b82bf (patch) | |
| tree | a7e46b3f133f44b356eb7e585472c8cb5220e38a /include/xmloff | |
| parent | don't assert on export of ooo74510-1.odt to .docx (diff) | |
| download | core-b5e16d8dab070cfef908e7b5ca0417da534b82bf.tar.gz core-b5e16d8dab070cfef908e7b5ca0417da534b82bf.zip | |
Related tdf#88056: use better-fitting <text:page-name>
Implemented Regina's suggestions:
* this is a text field, therefore it belongs to text namespace
* page-name (evtl. slide-name) describes much better what this
field really contains
This (among other changes) reverts commit 6609de8856519e0e9
Change-Id: Idab3b7c291839a9137f80d325a7d3f5ef0ff2636
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/txtimp.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index a5721a1c7e0f..ca0ce7ab7e5a 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -208,6 +208,7 @@ enum XMLTextPElemTokens XML_TOK_TEXT_SEQUENCE_REF, XML_TOK_TEXT_NOTE_REF, XML_TOK_TEXT_SHEET_NAME, + XML_TOK_TEXT_PAGE_NAME, XML_TOK_TEXT_BIBLIOGRAPHY_MARK, XML_TOK_TEXT_ANNOTATION, XML_TOK_TEXT_ANNOTATION_END, @@ -231,7 +232,6 @@ enum XMLTextPElemTokens XML_TOK_DRAW_FOOTER, XML_TOK_DRAW_DATE_TIME, XML_TOK_TEXT_PAGE_CONTINUATION, - XML_TOK_DRAW_PAGE_TITLE, XML_TOK_TEXT_FIELDMARK, XML_TOK_TEXT_FIELDMARK_START, diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 5b0167116dbc..bf6ad207d953 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -1372,8 +1372,8 @@ namespace xmloff { namespace token { XML_PAGE_HEIGHT, XML_PAGE_MASTER, XML_PAGE_MASTER_NAME, + XML_PAGE_NAME, XML_PAGE_NUMBER, - XML_PAGE_TITLE, XML_PAGE_START_MARGIN, XML_PAGE_STYLE_NAME, XML_PAGE_THUMBNAIL, |