sw, writerfilter: various small cleanups

Different parameter name in declaration and definition, repeating type
name inside the very same line when initializing from a cast, and so on.

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

include/vcl/pdfread.hxx

@@ -35,15 +35,12 @@ namespace vcl
 VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex,
                              css::uno::Sequence<sal_Int8>& rPdfData,
                              sal_uInt64 nPos = STREAM_SEEK_TO_BEGIN,
-                             sal_uInt64 nSize = STREAM_SEEK_TO_END,
+                             sal_uInt64 nSize = STREAM_SEEK_TO_END, double fResolutionDPI = 96.);
-                             const double fResolutionDPI = 96.);
 
-VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic,
+VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic, double fResolutionDPI = 96.);
-                             const double fResolutionDPI = 96.);
 
 VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector<Bitmap>& rBitmaps,
-                               css::uno::Sequence<sal_Int8>& rPdfData,
+                               css::uno::Sequence<sal_Int8>& rPdfData, double fResolutionDPI = 96.);
-                               const double fResolutionDPI = 96.);
 }
 
 #endif // INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX

svl/source/items/grabbagitem.cxx

@@ -47,7 +47,7 @@ bool SfxGrabBagItem::PutValue(const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
         comphelper::OSequenceIterator<beans::PropertyValue> i(aValue);
         while (i.hasMoreElements())
         {
-            beans::PropertyValue aPropertyValue = i.nextElement().get<beans::PropertyValue>();
+            auto aPropertyValue = i.nextElement().get<beans::PropertyValue>();
             m_aMap[aPropertyValue.Name] = aPropertyValue.Value;
         }
         return true;

sw/source/filter/html/htmlreqifreader.cxx

@@ -27,7 +27,7 @@ class ReqIfRtfReader : public SvRTFParser
 public:
     ReqIfRtfReader(SvStream& rStream);
     void NextToken(int nToken) override;
-    bool WriteObjectData(SvStream& rStream);
+    bool WriteObjectData(SvStream& rOLE);
 
 private:
     bool m_bInObjData = false;

sw/source/filter/html/htmlreqifreader.hxx

@@ -23,7 +23,7 @@ namespace SwReqIfReader
 bool ExtractOleFromRtf(SvStream& rRtf, SvStream& rOle, bool& bOwnFormat);
 
 /// Wraps an OLE2 container binary in an RTF fragment.
-bool WrapOleInRtf(SvStream& rOle, SvStream& rRtf);
+bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf);
 
 /**
  * Wraps an image in an RTF fragment.

sw/source/filter/rtf/swparrtf.cxx

@@ -92,7 +92,7 @@ ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam
             uno::Any(uno::Reference<io::XStream>(new utl::OStreamWrapper(*m_pStream))) },
           { "InsertMode", uno::Any(true) },
           { "TextInsertModeRange", uno::Any(xInsertTextRange) } }));
-    ErrCode ret = ERRCODE_NONE;
+    auto ret = ERRCODE_NONE;
     try
     {
         xFilter->filter(aDescriptor);

sw/source/filter/ww8/docxsdrexport.cxx

@@ -660,7 +660,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons
         auto it = aGrabBag.find("EG_WrapType");
         if (it != aGrabBag.end())
         {
-            OUString sType = it->second.get<OUString>();
+            auto sType = it->second.get<OUString>();
             if (sType == "wrapTight")
                 nWrapToken = XML_wrapTight;
             else if (sType == "wrapThrough")
@@ -677,10 +677,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons
             {
                 m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_wrapPolygon, XML_edited, "0",
                                                        FSEND);
-                drawing::PointSequenceSequence aSeqSeq
+                auto aSeqSeq = it->second.get<drawing::PointSequenceSequence>();
-                    = it->second.get<drawing::PointSequenceSequence>();
+                auto aPoints(comphelper::sequenceToContainer<std::vector<awt::Point>>(aSeqSeq[0]));
-                std::vector<awt::Point> aPoints(
-                    comphelper::sequenceToContainer<std::vector<awt::Point>>(aSeqSeq[0]));
                 for (auto i = aPoints.begin(); i != aPoints.end(); ++i)
                 {
                     awt::Point& rPoint = *i;

sw/source/filter/ww8/rtfattributeoutput.cxx

@@ -1353,8 +1353,8 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart,
             nVal = 35;
             if (pOutSet)
             {
-                const SvxLanguageItem rlang = pOutSet->Get(RES_CHRATR_CJK_LANGUAGE);
+                const SvxLanguageItem& rLang = pOutSet->Get(RES_CHRATR_CJK_LANGUAGE);
-                if (LANGUAGE_CHINESE_SIMPLIFIED == rlang.GetLanguage())
+                if (rLang.GetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED)
                 {
                     nVal = 39;
                 }

writerfilter/source/rtftok/rtfsdrimport.cxx

@@ -165,8 +165,7 @@ void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame,
             = { "TopBorder", "LeftBorder", "BottomBorder", "RightBorder" };
         for (const char* pBorder : aBorders)
         {
-            table::BorderLine2 aBorderLine
+            auto aBorderLine = xPropertySet->getPropertyValue(OUString::createFromAscii(pBorder))
-                = xPropertySet->getPropertyValue(OUString::createFromAscii(pBorder))
                                    .get<table::BorderLine2>();
             if (rLineColor.hasValue())
                 aBorderLine.Color = rLineColor.get<sal_Int32>();