[Libreoffice-commits] core.git: include/svl starmath/source sw/source vcl/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Sep 28 12:08:35 UTC 2017
include/svl/grabbagitem.hxx | 2
starmath/source/unofilter.cxx | 2
sw/source/filter/rtf/swparrtf.cxx | 4 -
sw/source/filter/ww8/docxsdrexport.cxx | 4 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 10 ++--
sw/source/filter/ww8/rtfattributeoutput.hxx | 60 ++++++++++++++--------------
sw/source/filter/ww8/rtfexport.cxx | 12 ++---
sw/source/filter/ww8/rtfexport.hxx | 12 ++---
vcl/source/filter/ipdf/pdfread.cxx | 5 --
9 files changed, 54 insertions(+), 57 deletions(-)
New commits:
commit 4b88f3545c9525146327470ea767041d6de4c7ca
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Sep 28 09:15:28 2017 +0200
RTF export: various minor cleanups
Change-Id: I6bdbe246bf65dcfa193289210f7c464769d5e2ad
Reviewed-on: https://gerrit.libreoffice.org/42887
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 26aa0f8b818c..9608a08579d5 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -37,7 +37,7 @@ public:
return m_aMap;
}
- bool operator==(const SfxPoolItem&) const override;
+ bool operator==(const SfxPoolItem& rItem) const override;
SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index c191647e992a..cdb444207464 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -115,7 +115,7 @@ uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames()
return aRet;
}
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext*, uno::Sequence<uno::Any> const&)
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(new MathTypeFilter);
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index cb578d4ebc53..2b8632fad14c 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -40,10 +40,10 @@ using namespace ::com::sun::star;
/// Glue class to call RtfImport as an internal filter, needed by copy&paste support.
class SwRTFReader : public Reader
{
- ErrCode Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override;
+ ErrCode Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, const OUString& rFileName) override;
};
-ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString&)
+ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString& /*rFileName*/)
{
if (!pStrm)
return ERR_SWG_READ_ERROR;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 4509cc0b9bc9..383d598aa7a7 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -977,8 +977,8 @@ OString lcl_ConvertTransparency(const Color& rColor)
sal_Int32 nTransparencyPercent = 100 - float(rColor.GetTransparency()) / 2.55;
return OString::number(nTransparencyPercent * oox::drawingml::PER_PERCENT);
}
- else
- return OString();
+
+ return OString();
}
void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6c471942d80d..3a4b88e8e11c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2525,11 +2525,11 @@ void RtfAttributeOutput::CharWeightCTL(const SvxWeightItem& rWeight)
m_aStyles.append((sal_Int32)0);
}
-void RtfAttributeOutput::CharBidiRTL(const SfxPoolItem&)
+void RtfAttributeOutput::CharBidiRTL(const SfxPoolItem& /*rItem*/)
{
}
-void RtfAttributeOutput::CharIdctHint(const SfxPoolItem&)
+void RtfAttributeOutput::CharIdctHint(const SfxPoolItem& /*rItem*/)
{
}
@@ -2892,12 +2892,12 @@ void RtfAttributeOutput::ParaScriptSpace(const SfxBoolItem& rScriptSpace)
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ASPALPHA);
}
-void RtfAttributeOutput::ParaHangingPunctuation(const SfxBoolItem&)
+void RtfAttributeOutput::ParaHangingPunctuation(const SfxBoolItem& /*rItem*/)
{
SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
-void RtfAttributeOutput::ParaForbiddenRules(const SfxBoolItem&)
+void RtfAttributeOutput::ParaForbiddenRules(const SfxBoolItem& /*rItem*/)
{
SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
@@ -2945,7 +2945,7 @@ void RtfAttributeOutput::FormatFrameSize(const SwFormatFrameSize& rSize)
}
}
-void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem&)
+void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem& /*rItem*/)
{
SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 20f278a615a2..f0fbe732ee3c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -263,7 +263,7 @@ protected:
void CharWeight(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_AUTOKERN
- void CharAutoKern(const SvxAutoKernItem&) override;
+ void CharAutoKern(const SvxAutoKernItem& rAutoKern) override;
/// Sfx item RES_CHRATR_BLINK
void CharAnimatedText(const SvxBlinkItem& rBlink) override;
@@ -302,10 +302,10 @@ protected:
void CharWeightCTL(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_BidiRTL
- void CharBidiRTL(const SfxPoolItem&) override;
+ void CharBidiRTL(const SfxPoolItem& rItem) override;
/// Sfx item RES_CHRATR_IdctHint
- void CharIdctHint(const SfxPoolItem&) override;
+ void CharIdctHint(const SfxPoolItem& rItem) override;
/// Sfx item RES_CHRATR_ROTATE
void CharRotate(const SvxCharRotateItem& rRotate) override;
@@ -326,19 +326,19 @@ protected:
void CharHidden(const SvxCharHiddenItem& rHidden) override;
/// Sfx item RES_CHRATR_BOX
- void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) override;
+ void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, sal_uInt16 nDist, bool bShadow) override;
/// Sfx item RES_CHRATR_HIGHLIGHT
- void CharHighlight(const SvxBrushItem&) override;
+ void CharHighlight(const SvxBrushItem& rBrush) override;
/// Sfx item RES_TXTATR_INETFMT
- void TextINetFormat(const SwFormatINetFormat&) override;
+ void TextINetFormat(const SwFormatINetFormat& rURL) override;
/// Sfx item RES_TXTATR_CHARFMT
- void TextCharFormat(const SwFormatCharFormat&) override;
+ void TextCharFormat(const SwFormatCharFormat& rCharFormat) override;
/// Sfx item RES_TXTATR_FTN
- void TextFootnote_Impl(const SwFormatFootnote&) override;
+ void TextFootnote_Impl(const SwFormatFootnote& rFootnote) override;
/// Sfx item RES_PARATR_LINESPACING
void ParaLineSpacing_Impl(short nSpace, short nMulti) override;
@@ -356,31 +356,31 @@ protected:
void ParaTabStop(const SvxTabStopItem& rTabStop) override;
/// Sfx item RES_PARATR_HYPHENZONE
- void ParaHyphenZone(const SvxHyphenZoneItem&) override;
+ void ParaHyphenZone(const SvxHyphenZoneItem& rHyphenZone) override;
/// Sfx item RES_PARATR_NUMRULE
void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) override;
/// Sfx item RES_PARATR_SCRIPTSPACE
- void ParaScriptSpace(const SfxBoolItem&) override;
+ void ParaScriptSpace(const SfxBoolItem& rScriptSpace) override;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- void ParaHangingPunctuation(const SfxBoolItem&) override;
+ void ParaHangingPunctuation(const SfxBoolItem& rItem) override;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- void ParaForbiddenRules(const SfxBoolItem&) override;
+ void ParaForbiddenRules(const SfxBoolItem& rItem) override;
/// Sfx item RES_PARATR_VERTALIGN
void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) override;
/// Sfx item RES_PARATR_SNAPTOGRID
- void ParaSnapToGrid(const SvxParaGridItem&) override;
+ void ParaSnapToGrid(const SvxParaGridItem& rItem) override;
/// Sfx item RES_FRM_SIZE
- void FormatFrameSize(const SwFormatFrameSize&) override;
+ void FormatFrameSize(const SwFormatFrameSize& rSize) override;
/// Sfx item RES_PAPER_BIN
- void FormatPaperBin(const SvxPaperBinItem&) override;
+ void FormatPaperBin(const SvxPaperBinItem& rItem) override;
/// Sfx item RES_LR_SPACE
void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) override;
@@ -389,52 +389,52 @@ protected:
void FormatULSpace(const SvxULSpaceItem& rULSpace) override;
/// Sfx item RES_SURROUND
- void FormatSurround(const SwFormatSurround&) override;
+ void FormatSurround(const SwFormatSurround& rSurround) override;
/// Sfx item RES_VERT_ORIENT
- void FormatVertOrientation(const SwFormatVertOrient&) override;
+ void FormatVertOrientation(const SwFormatVertOrient& rFlyVert) override;
/// Sfx item RES_HORI_ORIENT
- void FormatHorizOrientation(const SwFormatHoriOrient&) override;
+ void FormatHorizOrientation(const SwFormatHoriOrient& rFlyHori) override;
/// Sfx item RES_ANCHOR
- void FormatAnchor(const SwFormatAnchor&) override;
+ void FormatAnchor(const SwFormatAnchor& rAnchor) override;
/// Sfx item RES_BACKGROUND
- void FormatBackground(const SvxBrushItem&) override;
+ void FormatBackground(const SvxBrushItem& rBrush) override;
/// Sfx item RES_FILL_STYLE
- void FormatFillStyle(const XFillStyleItem&) override;
+ void FormatFillStyle(const XFillStyleItem& rFillStyle) override;
/// Sfx item RES_FILL_GRADIENT
- void FormatFillGradient(const XFillGradientItem&) override;
+ void FormatFillGradient(const XFillGradientItem& rFillGradient) override;
/// Sfx item RES_BOX
- void FormatBox(const SvxBoxItem&) override;
+ void FormatBox(const SvxBoxItem& rBox) override;
/// Sfx item RES_COL
void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) override;
/// Sfx item RES_KEEP
- void FormatKeep(const SvxFormatKeepItem&) override;
+ void FormatKeep(const SvxFormatKeepItem& rItem) override;
/// Sfx item RES_TEXTGRID
- void FormatTextGrid(const SwTextGridItem&) override;
+ void FormatTextGrid(const SwTextGridItem& rItem) override;
/// Sfx item RES_LINENUMBER
- void FormatLineNumbering(const SwFormatLineNumber&) override;
+ void FormatLineNumbering(const SwFormatLineNumber& rNumbering) override;
/// Sfx item RES_FRAMEDIR
- void FormatFrameDirection(const SvxFrameDirectionItem&) override;
+ void FormatFrameDirection(const SvxFrameDirectionItem& rDirection) override;
/// Sfx item RES_PARATR_GRABBAG
- void ParaGrabBag(const SfxGrabBagItem&) override;
+ void ParaGrabBag(const SfxGrabBagItem& rItem) override;
/// Sfx item RES_CHRATR_GRABBAG
- void CharGrabBag(const SfxGrabBagItem&) override;
+ void CharGrabBag(const SfxGrabBagItem& rItem) override;
/// Sfx item RES_PARATR_OUTLINELEVEL
- void ParaOutlineLevel(const SfxUInt16Item&) override;
+ void ParaOutlineLevel(const SfxUInt16Item& rItem) override;
/// Write the expanded field
void WriteExpand(const SwField* pField) override;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 2bc367de642a..6609a6cb129b 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -165,12 +165,12 @@ void RtfExport::AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos
}
//For i120928,to export graphic of bullet for RTF filter
-void RtfExport::ExportGrfBullet(const SwTextNode&)
+void RtfExport::ExportGrfBullet(const SwTextNode& /*rNd*/)
{
// Noop, would be too late, see WriteNumbering() instead.
}
-void RtfExport::WriteChar(sal_Unicode)
+void RtfExport::WriteChar(sal_Unicode /*c*/)
{
/* WriteChar() has nothing to do for rtf. */
}
@@ -342,7 +342,7 @@ void RtfExport::DoFormText(const SwInputField* pField)
m_pAttrOutput->RunText().append(msfilter::rtfutil::OutString(sResult, m_eDefaultEncoding)).append("}}");
}
-sal_uLong RtfExport::ReplaceCr(sal_uInt8)
+sal_uLong RtfExport::ReplaceCr(sal_uInt8 /*nChar*/)
{
// Completely unused for Rtf export... only here for code sharing
// purpose with binary export
@@ -923,17 +923,17 @@ void RtfExport::OutputEndNode(const SwEndNode& rEndNode)
AttrOutput().SectionBreaks(rEndNode);
}
-void RtfExport::OutputGrfNode(const SwGrfNode&)
+void RtfExport::OutputGrfNode(const SwGrfNode& /*rGrfNode*/)
{
/* noop, see RtfAttributeOutput::FlyFrameGraphic */
}
-void RtfExport::OutputOLENode(const SwOLENode&)
+void RtfExport::OutputOLENode(const SwOLENode& /*rOLENode*/)
{
/* noop, see RtfAttributeOutput::FlyFrameOLE */
}
-void RtfExport::OutputLinkedOLE(const OUString&)
+void RtfExport::OutputLinkedOLE(const OUString& /*rLinked*/)
{
}
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 2a28280e0efc..0b58e27392ae 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -94,7 +94,7 @@ public:
{
/* no-op for rtf, most probably should not even be in MSWordExportBase */
}
- void WriteChar(sal_Unicode) override;
+ void WriteChar(sal_Unicode c) override;
/// Write the numbering table.
void WriteNumbering() override;
@@ -140,18 +140,18 @@ protected:
bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) override;
/// Output SwTextNode is depending on outline export mode
- void OutputTextNode(SwTextNode&) override;
+ void OutputTextNode(SwTextNode& rNode) override;
/// Output SwEndNode
- void OutputEndNode(const SwEndNode&) override;
+ void OutputEndNode(const SwEndNode& rEndNode) override;
/// Output SwGrfNode
- void OutputGrfNode(const SwGrfNode&) override;
+ void OutputGrfNode(const SwGrfNode& rGrfNode) override;
/// Output SwOLENode
- void OutputOLENode(const SwOLENode&) override;
+ void OutputOLENode(const SwOLENode& rOLENode) override;
- void OutputLinkedOLE(const OUString&) override;
+ void OutputLinkedOLE(const OUString& rLink) override;
void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) override;
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index fc85066a2b03..254e2adf1cd8 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -128,10 +128,7 @@ bool isCompatible(SvStream& rInStream)
sal_Int32 nMajor = OString(aFirstBytes[5]).toInt32();
sal_Int32 nMinor = OString(aFirstBytes[7]).toInt32();
- if (nMajor > 1 || (nMajor == 1 && nMinor > 4))
- return false;
-
- return true;
+ return !(nMajor > 1 || (nMajor == 1 && nMinor > 4));
}
/// Takes care of transparently downgrading the version of the PDF stream in
More information about the Libreoffice-commits
mailing list