summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/core/xmlfilterbase.cxx6
-rw-r--r--oox/source/drawingml/fillproperties.cxx2
-rw-r--r--oox/source/drawingml/fontworkhelpers.cxx2
-rw-r--r--oox/source/drawingml/shape.cxx6
-rw-r--r--oox/source/drawingml/textbody.cxx4
-rw-r--r--oox/source/export/ThemeExport.cxx4
-rw-r--r--oox/source/export/drawingml.cxx4
-rw-r--r--oox/source/export/shapes.cxx2
8 files changed, 14 insertions, 16 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index ac00c12d2b8f..2f5c7a84d72a 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -1212,8 +1212,8 @@ void XmlFilterBase::exportCustomFragments()
// Expect customXmlDomPropslist.getLength() == customXmlDomlist.getLength().
for (sal_Int32 j = 0; j < customXmlDomlist.getLength(); j++)
{
- uno::Reference<xml::dom::XDocument> customXmlDom = customXmlDomlist[j];
- uno::Reference<xml::dom::XDocument> customXmlDomProps = customXmlDomPropslist[j];
+ const uno::Reference<xml::dom::XDocument>& customXmlDom = customXmlDomlist[j];
+ const uno::Reference<xml::dom::XDocument>& customXmlDomProps = customXmlDomPropslist[j];
const OUString fragmentPath = "customXml/item" + OUString::number(j+1) + ".xml";
if (customXmlDom.is())
{
@@ -1246,7 +1246,7 @@ void XmlFilterBase::exportCustomFragments()
for (sal_Int32 j = 0; j < customFragments.getLength(); j++)
{
addRelation(customFragmentTypes[j], customFragmentTargets[j]);
- const OUString aFilename = customFragmentTargets[j];
+ const OUString& aFilename = customFragmentTargets[j];
Reference<XOutputStream> xOutStream = openOutputStream(aFilename);
if (xOutStream.is())
{
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 49a0c9e50bdc..ec2a10da02fe 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -208,7 +208,7 @@ Reference<XGraphic> lclApplyBlackWhiteEffect(const BlipFillProperties& aBlipProp
::Graphic aReturnGraphic;
BitmapEx aBitmapEx(aGraphic.GetBitmapEx());
- AlphaMask aMask(aBitmapEx.GetAlphaMask());
+ const AlphaMask& aMask(aBitmapEx.GetAlphaMask());
BitmapEx aTmpBmpEx(aBitmapEx.GetBitmap());
BitmapFilter::Filter(aTmpBmpEx, BitmapMonochromeFilter{ nThreshold });
diff --git a/oox/source/drawingml/fontworkhelpers.cxx b/oox/source/drawingml/fontworkhelpers.cxx
index d9fa4fb8d4d6..565f6b6c7b88 100644
--- a/oox/source/drawingml/fontworkhelpers.cxx
+++ b/oox/source/drawingml/fontworkhelpers.cxx
@@ -1079,7 +1079,7 @@ OUString lcl_getWMarkupStringForThemeColor(const model::ComplexColor& rComplexCo
bool lcl_getThemeColorTransformationValue(const model::ComplexColor& rComplexColor,
const model::TransformationType& rType, sal_Int16& rValue)
{
- const std::vector<model::Transformation> aTransVec(rComplexColor.getTransformations());
+ const std::vector<model::Transformation>& aTransVec(rComplexColor.getTransformations());
auto bItemFound
= [rType](const model::Transformation& rTrans) { return rType == rTrans.meType; };
auto pIt = std::find_if(aTransVec.begin(), aTransVec.end(), bItemFound);
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8bc71abeb3c7..409b67b58ba2 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -655,7 +655,7 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
});
if (aParaIt != rParagraphs.cend())
{
- std::shared_ptr<TextParagraph> pParagraph = *aParaIt;
+ const std::shared_ptr<TextParagraph>& pParagraph = *aParaIt;
const TextRunVector& rRuns = pParagraph->getRuns();
auto aRunIt = std::find_if_not(rRuns.cbegin(), rRuns.cend(),
[](const std::shared_ptr<TextRun> pRun)
@@ -666,14 +666,14 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
});
if (aRunIt != rRuns.cend())
{
- std::shared_ptr<TextRun> pRun = *aRunIt;
+ const std::shared_ptr<TextRun>& pRun = *aRunIt;
TextCharacterProperties& rCharProps = pRun->getTextCharacterProperties();
// set language
if (rCharProps.moLang.has_value() && !rCharProps.moLang.value().isEmpty())
{
LanguageTag aTag(rCharProps.moLang.value());
- css::lang::Locale aLocale(aTag.getLocale(false));
+ const css::lang::Locale& aLocale(aTag.getLocale(false));
switch (MsLangId::getScriptType(aTag.getLanguageType()))
{
case css::i18n::ScriptType::LATIN:
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index 9d0d2c8d2aac..1d9e45f505f5 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -57,14 +57,12 @@ void TextBody::insertAt(
const TextCharacterProperties& rTextStyleProperties,
const TextListStylePtr& pMasterTextListStylePtr ) const
{
- TextListStyle aMasterTextStyle(*pMasterTextListStylePtr);
-
Reference<css::beans::XPropertySet> xPropertySet(xAt, UNO_QUERY);
float nCharHeight = xPropertySet->getPropertyValue(u"CharHeight"_ustr).get<float>();
size_t nIndex = 0;
for (auto const& paragraph : maParagraphs)
{
- paragraph->insertAt(rFilterBase, xText, xAt, rTextStyleProperties, aMasterTextStyle,
+ paragraph->insertAt(rFilterBase, xText, xAt, rTextStyleProperties, *pMasterTextListStylePtr,
maTextListStyle, (nIndex == 0), nCharHeight);
++nIndex;
}
diff --git a/oox/source/export/ThemeExport.cxx b/oox/source/export/ThemeExport.cxx
index 533471d9bf9d..400e9a09db39 100644
--- a/oox/source/export/ThemeExport.cxx
+++ b/oox/source/export/ThemeExport.cxx
@@ -57,7 +57,7 @@ void ThemeExport::write(OUString const& rPath, model::Theme const& rTheme)
mpFS->startElementNS(XML_a, XML_themeElements);
- const auto pColorSet = rTheme.getColorSet();
+ const auto& pColorSet = rTheme.getColorSet();
mpFS->startElementNS(XML_a, XML_clrScheme, XML_name, pColorSet->getName());
writeColorSet(rTheme);
@@ -877,7 +877,7 @@ bool ThemeExport::writeColorSet(model::Theme const& rTheme)
= { XML_dk1, XML_lt1, XML_dk2, XML_lt2, XML_accent1, XML_accent2,
XML_accent3, XML_accent4, XML_accent5, XML_accent6, XML_hlink, XML_folHlink };
- const auto pColorSet = rTheme.getColorSet();
+ const auto& pColorSet = rTheme.getColorSet();
if (!pColorSet)
return false;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 9136faa8d609..18334ad0516a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1799,7 +1799,7 @@ void DrawingML::WriteXGraphicBlip(uno::Reference<beans::XPropertySet> const & rX
mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
- auto pVectorGraphicDataPtr = aGraphic.getVectorGraphicData();
+ const auto& pVectorGraphicDataPtr = aGraphic.getVectorGraphicData();
if (pVectorGraphicDataPtr && pVectorGraphicDataPtr->getType() == VectorGraphicDataType::Svg)
{
@@ -6567,7 +6567,7 @@ void DrawingML::writeDiagramRels(const uno::Sequence<uno::Sequence<uno::Any>>& x
// diagramDataRelTuple[0] => RID,
// diagramDataRelTuple[1] => xInputStream
// diagramDataRelTuple[2] => extension
- uno::Sequence<uno::Any> diagramDataRelTuple = xRelSeq[j];
+ const uno::Sequence<uno::Any>& diagramDataRelTuple = xRelSeq[j];
OUString sRelId;
OUString sExtension;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a2cac3d42710..38c76ef59952 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1918,7 +1918,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape
tools::PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon(xShape);
if (aPolyPolygon.Count() > 0)
{
- tools::Polygon aPoly = aPolyPolygon.GetObject(0);
+ const tools::Polygon& aPoly = aPolyPolygon.GetObject(0);
lcl_GetConnectorAdjustValue(xShape, aPoly, eConnectorType, aAdjustValueList);
nAngle = lcl_GetAngle(aPoly);
lcl_FlipHFlipV(aPoly, nAngle, bFlipH, bFlipV);