writerfilter: whoever started non-reference variable names with "r"

... was evidently not a Hungarian speaker.

Change-Id: I87b0690d839057272c9653b222ed4dc61a75963a

2 files changed, 15 insertions, 11 deletions

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f8940247917c..4ded0548a808 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -184,7 +184,7 @@ static void lcl_AnyToTag(const uno::Any & rAny)
 }
 #endif
 
-void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite, GrabBagType rGrabBagType )
+void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite, GrabBagType i_GrabBagType )
 {
 #ifdef DEBUG_DOMAINMAPPER
     const OUString& rInsert = PropertyNameSupplier::
@@ -200,11 +200,11 @@ void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite
     if (aElement != end())
     {
         if (bOverwrite)
-            aElement->second = PropValue(rAny, rGrabBagType);
+            aElement->second = PropValue(rAny, i_GrabBagType);
 
         return;
     }
-    _PropertyMap::insert(_PropertyMap::value_type(eId, PropValue(rAny, rGrabBagType)));
+    _PropertyMap::insert(_PropertyMap::value_type(eId, PropValue(rAny, i_GrabBagType)));
 
     Invalidate();
 }
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 8ed3b2ad4a9d..a4c99154176b 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -74,19 +74,23 @@ enum GrabBagType
 class PropValue
 {
     css::uno::Any m_aValue;
-    GrabBagType m_rGrabBagType;
+    GrabBagType m_GrabBagType;
 
 public:
-    PropValue(const css::uno::Any& rValue, GrabBagType rGrabBagType = NO_GRAB_BAG) :
-        m_aValue(rValue), m_rGrabBagType(rGrabBagType) {}
+    PropValue(const css::uno::Any& rValue, GrabBagType i_GrabBagType = NO_GRAB_BAG) :
+        m_aValue(rValue), m_GrabBagType(i_GrabBagType) {}
 
-    PropValue() : m_aValue(), m_rGrabBagType(NO_GRAB_BAG) {}
+    PropValue() : m_aValue(), m_GrabBagType(NO_GRAB_BAG) {}
 
-    PropValue& operator=(const PropValue& rProp) { m_aValue = rProp.m_aValue; m_rGrabBagType = rProp.m_rGrabBagType; return *this; }
+    PropValue& operator=(const PropValue& rProp) {
+        m_aValue = rProp.m_aValue;
+        m_GrabBagType = rProp.m_GrabBagType;
+        return *this;
+    }
 
     const css::uno::Any& getValue() const { return m_aValue; }
-    bool hasGrabBag() const { return m_rGrabBagType != NO_GRAB_BAG; }
-    GrabBagType getGrabBagType() const { return m_rGrabBagType; }
+    bool hasGrabBag() const { return m_GrabBagType != NO_GRAB_BAG; }
+    GrabBagType getGrabBagType() const { return m_GrabBagType; }
 };
 typedef std::map< PropertyIds, PropValue > _PropertyMap;
 
@@ -116,7 +120,7 @@ public:
     bool hasEmptyPropertyValues() const {return !m_aValues.getLength();}
     /** Add property, usually overwrites already available attributes. It shouldn't overwrite in case of default attributes
      */
-    void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true, GrabBagType rGrabBagType = NO_GRAB_BAG );
+    void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true, GrabBagType i_GrabBagType = NO_GRAB_BAG );
     void Insert( PropertyIds eId, const PropValue& rValue, bool bOverwrite = true );
     void InsertProps(const boost::shared_ptr<PropertyMap> pMap);
     const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>&  GetFootnote() const { return m_xFootnote;}