include/xmloff/xmltoken.hxx | 1 + xmloff/inc/txtflde.hxx | 1 + xmloff/source/core/xmltoken.cxx | 1 + xmloff/source/text/txtflde.cxx | 17 +++++++++++++++++ 4 files changed, 20 insertions(+)
New commits: commit d34f5fe5ef39de6ddeb10617f27a990c27883361 Author: Katarina Behrens <katarina.behr...@cib.de> Date: Tue Apr 21 11:19:29 2015 +0200 tdf88056: implement export of page title field to ODF to loext namespace so far, since it isn't approved by ODF-TC yet Change-Id: I1bb7723bdccec9b670630da5e4d56f47cd615e43 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 4ad2936..a4f026d 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -1373,6 +1373,7 @@ namespace xmloff { namespace token { XML_PAGE_MASTER, XML_PAGE_MASTER_NAME, XML_PAGE_NUMBER, + XML_PAGE_TITLE, XML_PAGE_START_MARGIN, XML_PAGE_STYLE_NAME, XML_PAGE_THUMBNAIL, diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index 6610964..b37eb3e 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -143,6 +143,7 @@ enum FieldIdEnum { FIELD_ID_DRAW_HEADER, FIELD_ID_DRAW_FOOTER, FIELD_ID_DRAW_DATE_TIME, + FIELD_ID_DRAW_PAGETITLE, // page/slide title FIELD_ID_UNKNOWN // invalid or unknown field type! }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 2f7352d..27d4c32 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -1378,6 +1378,7 @@ namespace xmloff { namespace token { TOKEN( "page-master", XML_PAGE_MASTER ), TOKEN( "page-master-name", XML_PAGE_MASTER_NAME ), TOKEN( "page-number", XML_PAGE_NUMBER ), + TOKEN( "page-title", XML_PAGE_TITLE ), TOKEN( "page-start-margin", XML_PAGE_START_MARGIN ), TOKEN( "page-style-name", XML_PAGE_STYLE_NAME ), TOKEN( "page-thumbnail", XML_PAGE_THUMBNAIL ), diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 626adaa..14f9d09 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -414,6 +414,10 @@ enum FieldIdEnum XMLTextFieldExport::GetFieldID( { return FIELD_ID_DRAW_DATE_TIME; } + else if( sFieldName == "PageTitle" ) + { + return FIELD_ID_DRAW_PAGETITLE; + } } } @@ -738,6 +742,7 @@ bool XMLTextFieldExport::IsStringField( case FIELD_ID_DRAW_HEADER: case FIELD_ID_DRAW_FOOTER: case FIELD_ID_DRAW_DATE_TIME: + case FIELD_ID_DRAW_PAGETITLE: default: OSL_FAIL("unknown field type/field has no content"); return true; // invalid info; string in case of doubt @@ -953,6 +958,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( case FIELD_ID_DRAW_DATE_TIME: case FIELD_ID_DRAW_FOOTER: case FIELD_ID_DRAW_HEADER: + case FIELD_ID_DRAW_PAGETITLE: ; // no formats for these fields! break; @@ -1848,6 +1854,17 @@ void XMLTextFieldExport::ExportFieldHelper( } break; + case FIELD_ID_DRAW_PAGETITLE: + { + if (SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012) + { + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, XML_PAGE_TITLE, false, false ); + GetExport().Characters( sPresentation ); + } + } + break; + + case FIELD_ID_UNKNOWN: default: OSL_FAIL("unknown field type encountered!"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits