summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-11-24 20:09:06 +0100
committerMiklos Vajna <vmiklos@collabora.com>2021-11-25 09:34:42 +0100
commit3134d9c0ff6ff86a797d6b7faa49d71367177d66 (patch)
treeceef6bdff530af138cb65f327eda206692dc481d
parent515682539623c9d61921c4f89302ffa0a4cb8d24 (diff)
vcl: pInputElement is never nullptr in PDFObjectCopier::copyRecursively()
Change it to a reference to make that more obvious. Change-Id: Ie1da9982ee2d54a5d68d393a04643d1684521ef5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125786 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--vcl/inc/pdf/objectcopier.hxx2
-rw-r--r--vcl/source/gdi/pdfobjectcopier.cxx18
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/pdf/objectcopier.hxx b/vcl/inc/pdf/objectcopier.hxx
index 3880d739bb10..f9b05725ce0c 100644
--- a/vcl/inc/pdf/objectcopier.hxx
+++ b/vcl/inc/pdf/objectcopier.hxx
@@ -33,7 +33,7 @@ class PDFObjectCopier
{
PDFObjectContainer& m_rContainer;
- void copyRecursively(OStringBuffer& rLine, filter::PDFElement* pInputElement,
+ void copyRecursively(OStringBuffer& rLine, filter::PDFElement& rInputElement,
SvMemoryStream& rDocBuffer,
std::map<sal_Int32, sal_Int32>& rCopiedResources);
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx b/vcl/source/gdi/pdfobjectcopier.cxx
index 0ab88fc0e3ec..1cb6c209d699 100644
--- a/vcl/source/gdi/pdfobjectcopier.cxx
+++ b/vcl/source/gdi/pdfobjectcopier.cxx
@@ -26,11 +26,11 @@ PDFObjectCopier::PDFObjectCopier(PDFObjectContainer& rContainer)
{
}
-void PDFObjectCopier::copyRecursively(OStringBuffer& rLine, filter::PDFElement* pInputElement,
+void PDFObjectCopier::copyRecursively(OStringBuffer& rLine, filter::PDFElement& rInputElement,
SvMemoryStream& rDocBuffer,
std::map<sal_Int32, sal_Int32>& rCopiedResources)
{
- if (auto pReference = dynamic_cast<filter::PDFReferenceElement*>(pInputElement))
+ if (auto pReference = dynamic_cast<filter::PDFReferenceElement*>(&rInputElement))
{
filter::PDFObjectElement* pReferenced = pReference->LookupObject();
if (pReferenced)
@@ -43,17 +43,17 @@ void PDFObjectCopier::copyRecursively(OStringBuffer& rLine, filter::PDFElement*
rLine.append(" 0 R");
}
}
- else if (auto pInputArray = dynamic_cast<filter::PDFArrayElement*>(pInputElement))
+ else if (auto pInputArray = dynamic_cast<filter::PDFArrayElement*>(&rInputElement))
{
rLine.append("[ ");
for (auto const& pElement : pInputArray->GetElements())
{
- copyRecursively(rLine, pElement, rDocBuffer, rCopiedResources);
+ copyRecursively(rLine, *pElement, rDocBuffer, rCopiedResources);
rLine.append(" ");
}
rLine.append("] ");
}
- else if (auto pInputDictionary = dynamic_cast<filter::PDFDictionaryElement*>(pInputElement))
+ else if (auto pInputDictionary = dynamic_cast<filter::PDFDictionaryElement*>(&rInputElement))
{
rLine.append("<< ");
for (auto const& pPair : pInputDictionary->GetItems())
@@ -61,14 +61,14 @@ void PDFObjectCopier::copyRecursively(OStringBuffer& rLine, filter::PDFElement*
rLine.append("/");
rLine.append(pPair.first);
rLine.append(" ");
- copyRecursively(rLine, pPair.second, rDocBuffer, rCopiedResources);
+ copyRecursively(rLine, *pPair.second, rDocBuffer, rCopiedResources);
rLine.append(" ");
}
rLine.append(">> ");
}
else
{
- pInputElement->writeString(rLine);
+ rInputElement.writeString(rLine);
}
}
@@ -107,7 +107,7 @@ sal_Int32 PDFObjectCopier::copyExternalResource(SvMemoryStream& rDocBuffer,
aLine.append("/");
aLine.append(rPair.first);
aLine.append(" ");
- copyRecursively(aLine, rPair.second, rDocBuffer, rCopiedResources);
+ copyRecursively(aLine, *rPair.second, rDocBuffer, rCopiedResources);
}
aLine.append(" >>\n");
@@ -134,7 +134,7 @@ sal_Int32 PDFObjectCopier::copyExternalResource(SvMemoryStream& rDocBuffer,
bFirst = false;
else
aLine.append(" ");
- copyRecursively(aLine, pElement, rDocBuffer, rCopiedResources);
+ copyRecursively(aLine, *pElement, rDocBuffer, rCopiedResources);
}
aLine.append("]\n");
}