diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-19 16:44:51 +0100 |
---|---|---|
committer | Bosdonnat Cedric <cedric.bosdonnat@free.fr> | 2013-02-22 14:44:19 +0000 |
commit | 4c0e53e6530c5590f7123f506a1a58bcbd04e13d (patch) | |
tree | 6d0391e34b3a795530c6cebe7fb4ae41ca535326 /writerperfect | |
parent | 74d1466914547aaa5369f18727c228db9ce88121 (diff) |
Allow specifying of page names
Allow specifying of page names
(cherry picked from commit bee8ed6772f420f9eefc57fee01da29ff466a8e9)
We need to escape special characters in slide names
(cherry picked from commit ea4581a914cb1aad29f16b73e35350f05f8adc1c)
Change-Id: I5f523642b980469afa46e1895cfd39aa08b9941d
Reviewed-on: https://gerrit.libreoffice.org/2333
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/source/filter/OdgGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index 86611389acd5..1caebdd084df 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -664,7 +664,10 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList &propList) TagOpenElement *pStylePageLayoutOpenElement = new TagOpenElement("style:page-layout"); WPXString sValue; - sValue.sprintf("page%i", mpImpl->miPageIndex); + if (propList["draw:name"]) + sValue = WPXString(propList["draw:name"]->getStr(), true); // escape special xml characters + else + sValue.sprintf("page%i", mpImpl->miPageIndex); pDrawPageOpenElement->addAttribute("draw:name", sValue); #ifdef MULTIPAGE_WORKAROUND pStyleMasterPageOpenElement->addAttribute("style:page-layout-name", "PM0"); |