mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw, writerfilter: various small cleanups

Browse Source 
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>
This commit is contained in:
Miklos Vajna 2018-07-12 22:09:50 +02:00
parent 41e2cbc157
commit 23793a08b7
8 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/vcl/pdfread.hxx
View File

@ -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,
const double fResolutionDPI = 96.);
sal_uInt64 nSize = STREAM_SEEK_TO_END, double fResolutionDPI = 96.);
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic,
const double fResolutionDPI = 96.);
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic, double fResolutionDPI = 96.);
VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector<Bitmap>& rBitmaps,
css::uno::Sequence<sal_Int8>& rPdfData,
const double fResolutionDPI = 96.);
css::uno::Sequence<sal_Int8>& rPdfData, double fResolutionDPI = 96.);
}
#endif // INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX

2
svl/source/items/grabbagitem.cxx
View File

@ -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;

2
sw/source/filter/html/htmlreqifreader.cxx
View File

@ -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;

2
sw/source/filter/html/htmlreqifreader.hxx
View File

@ -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.

2
sw/source/filter/rtf/swparrtf.cxx
View File

@ -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);

8
sw/source/filter/ww8/docxsdrexport.cxx
View File

@ -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
= it->second.get<drawing::PointSequenceSequence>();
std::vector<awt::Point> aPoints(
comphelper::sequenceToContainer<std::vector<awt::Point>>(aSeqSeq[0]));
auto aSeqSeq = it->second.get<drawing::PointSequenceSequence>();
auto aPoints(comphelper::sequenceToContainer<std::vector<awt::Point>>(aSeqSeq[0]));
for (auto i = aPoints.begin(); i != aPoints.end(); ++i)
{
awt::Point& rPoint = *i;

4
sw/source/filter/ww8/rtfattributeoutput.cxx
View File

@ -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);
if (LANGUAGE_CHINESE_SIMPLIFIED == rlang.GetLanguage())
const SvxLanguageItem& rLang = pOutSet->Get(RES_CHRATR_CJK_LANGUAGE);
if (rLang.GetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED)
{
nVal = 39;
}

3
writerfilter/source/rtftok/rtfsdrimport.cxx
View File

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