[Libreoffice-commits] core.git: xmloff/source

[Chris Sherlock]

 xmloff/source/draw/ximpbody.cxx |    6 +++---
 xmloff/source/draw/ximpbody.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0cb61caefa8563bc1a4b63411ccd11ffaf1c0ddf
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date:   Sun Dec 27 02:34:01 2015 +1100

    xmloff: change instances of maName to more descriptive names
    
    Change-Id: I7ff771f78481677ae65f933608e484714cd43f4f
    Reviewed-on: https://gerrit.libreoffice.org/20961
    Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
    Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>

diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index c574d4e..7f38008 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -65,7 +65,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& 
rImport,
         {
             case XML_TOK_DRAWPAGE_NAME:
             {
-                maName = sValue;
+                maContextName = sValue;
                 break;
             }
             case XML_TOK_DRAWPAGE_STYLE_NAME:
@@ -128,13 +128,13 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& 
rImport,
     uno::Reference< drawing::XDrawPage > xShapeDrawPage(rShapes, 
uno::UNO_QUERY);
 
     // set PageName?
-    if(!maName.isEmpty())
+    if(!maContextName.isEmpty())
     {
         if(xShapeDrawPage.is())
         {
             uno::Reference < container::XNamed > xNamed(xShapeDrawPage, 
uno::UNO_QUERY);
             if(xNamed.is())
-                xNamed->setName(maName);
+                xNamed->setName(maContextName);
         }
     }
 
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index d7ebb8b..ea7acdd 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -29,7 +29,7 @@
 
 class SdXMLDrawPageContext : public SdXMLGenericPageContext
 {
-    OUString               maName;
+    OUString               maContextName;
     OUString               maMasterPageName;
     OUString               maStyleName;
     OUString               maHREF;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits