sw: fix inconsistent param naming in interface/implementation

SvxPostureItem& rWeight is confusing at best.

Change-Id: I70a7e94151f49bf3539af77160cd4a68b8753464
Reviewed-on: https://gerrit.libreoffice.org/41006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

4 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index a745dc68bbd6..9183091f71f8 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -90,7 +90,7 @@ public:
     /// Writes a drawing as VML data.
     void writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft);
     /// Writes a drawing as DML.
-    void writeDMLDrawing(const SdrObject* pSdrObj, const SwFrameFormat* pFrameFormat, int nAnchorId);
+    void writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFormat* pFrameFormat, int nAnchorId);
     /// Writes shape in both DML and VML format.
     void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft, int nAnchorId);
     /// Write <a:effectLst>, the effect list.
@@ -109,7 +109,7 @@ public:
     /// Writes text from Textbox for <w:framePr>
     void writeOnlyTextOfFrame(ww8::Frame* pParentFrame);
     /// Writes the drawingML <a:ln> markup of a box item.
-    void writeBoxItemLine(const SvxBoxItem& rBoxItem);
+    void writeBoxItemLine(const SvxBoxItem& rBox);
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 23885ec5e83e..6a421a182e3f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2210,10 +2210,10 @@ void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut)
     }
 }
 
-void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEsc)
+void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement)
 {
-    short nEsc = rEsc.GetEsc();
-    if (rEsc.GetProportionalHeight() == DFLT_ESC_PROP)
+    short nEsc = rEscapement.GetEsc();
+    if (rEscapement.GetProportionalHeight() == DFLT_ESC_PROP)
     {
         if (DFLT_ESC_SUB == nEsc || DFLT_ESC_AUTO_SUB == nEsc)
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SUB);
@@ -2226,9 +2226,9 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEsc)
 
     SwTwips nH = static_cast<const SvxFontHeightItem&>(m_rExport.GetItem(RES_CHRATR_FONTSIZE)).GetHeight();
 
-    if (0 < rEsc.GetEsc())
+    if (0 < rEscapement.GetEsc())
         pUpDn = OOO_STRING_SVTOOLS_RTF_UP;
-    else if (0 > rEsc.GetEsc())
+    else if (0 > rEscapement.GetEsc())
     {
         pUpDn = OOO_STRING_SVTOOLS_RTF_DN;
         nH = -nH;
@@ -2236,15 +2236,15 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEsc)
     else
         return;
 
-    short nProp = rEsc.GetProportionalHeight() * 100;
+    short nProp = rEscapement.GetProportionalHeight() * 100;
     if (DFLT_ESC_AUTO_SUPER == nEsc)
     {
-        nEsc = 100 - rEsc.GetProportionalHeight();
+        nEsc = 100 - rEscapement.GetProportionalHeight();
         ++nProp;
     }
     else if (DFLT_ESC_AUTO_SUB == nEsc)
     {
-        nEsc = - 100 + rEsc.GetProportionalHeight();
+        nEsc = - 100 + rEscapement.GetProportionalHeight();
         ++nProp;
     }
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 46d586c219ba..20f278a615a2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -221,7 +221,7 @@ public:
 
 protected:
     /// Output frames - the implementation.
-    void OutputFlyFrame_Impl(const ww8::Frame& rFormat, const Point& rNdTopLeft) override;
+    void OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Point& rNdTopLeft) override;
 
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     void CharCaseMap(const SvxCaseMapItem& rCaseMap) override;
@@ -296,7 +296,7 @@ protected:
     void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) override;
 
     /// Sfx item RES_CHRATR_CTL_POSTURE
-    void CharPostureCTL(const SvxPostureItem& rWeight) override;
+    void CharPostureCTL(const SvxPostureItem& rPosture) override;
 
     /// Sfx item RES_CHRATR_CTL_WEIGHT
     void CharWeightCTL(const SvxWeightItem& rWeight) override;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index e83f11e584c4..5c810787f224 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1372,11 +1372,11 @@ public:
     ErrCode WriteStream() override;
 };
 
-SwRTFWriter::SwRTFWriter(const OUString& rFltName, const OUString& rBaseURL)
+SwRTFWriter::SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL)
 {
     SetBaseURL(rBaseURL);
     // export outline nodes, only (send outline to clipboard/presentation)
-    m_bOutOutlineOnly = rFltName.startsWith("O");
+    m_bOutOutlineOnly = rFilterName.startsWith("O");
 }
 
 ErrCode SwRTFWriter::WriteStream()