[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - writerperfect/source

[Fridrich Štrba]

 writerperfect/source/filter/OdgGenerator.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 74e60b3a535b4e531c43d95dadacf716dc8aa0e0
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date:   Tue Feb 19 16:44:51 2013 +0100

    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.bosdon...@free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdon...@free.fr>
    (cherry picked from commit 4c0e53e6530c5590f7123f506a1a58bcbd04e13d)
    Reviewed-on: https://gerrit.libreoffice.org/2337
    Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@suse.cz>
    Tested-by: Miklos Vajna <vmik...@suse.cz>

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 8661138..1caebdd 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");

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits