diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/vba/vbacontentcontrol.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uno/loktxdoc.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uno/unoatxt.cxx | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d84549d43066..10db254a711f 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -929,9 +929,8 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const uno::Sequence<beans::Property aPropertyValue.Value >>= aGrabBag; for (const auto& rProp : std::as_const(aGrabBag)) { - OUString sValue = rProp.Value.get<OUString>(); if (rProp.Name == "ooxml:CT_SdtPlaceholder_docPart_val") - m_aPlaceHolderDocPart = sValue; + m_aPlaceHolderDocPart = rProp.Value.get<OUString>(); } } else if (aPropertyValue.Name == "ooxml:CT_SdtPr_color") @@ -940,9 +939,8 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const uno::Sequence<beans::Property aPropertyValue.Value >>= aGrabBag; for (const auto& rProp : std::as_const(aGrabBag)) { - OUString sValue = rProp.Value.get<OUString>(); if (rProp.Name == "ooxml:CT_SdtColor_val") - m_aColor = sValue; + m_aColor = rProp.Value.get<OUString>(); } } else if (aPropertyValue.Name == "ooxml:CT_SdtPr_appearance") diff --git a/sw/source/ui/vba/vbacontentcontrol.cxx b/sw/source/ui/vba/vbacontentcontrol.cxx index dc4e4afc236a..9cbf097090ee 100644 --- a/sw/source/ui/vba/vbacontentcontrol.cxx +++ b/sw/source/ui/vba/vbacontentcontrol.cxx @@ -37,7 +37,7 @@ SwVbaContentControl::SwVbaContentControl(const uno::Reference<XHelperInterface>& std::shared_ptr<SwContentControl> pContentControl) : SwVbaContentControl_BASE(rParent, rContext) , mxTextDocument(xTextDocument) - , m_pCC(pContentControl) + , m_pCC(std::move(pContentControl)) { assert(m_pCC && "SwVbaContentControl created without a shared_ptr. Why would you do that?"); } diff --git a/sw/source/uibase/uno/loktxdoc.cxx b/sw/source/uibase/uno/loktxdoc.cxx index 4843af4cf443..47527605f69a 100644 --- a/sw/source/uibase/uno/loktxdoc.cxx +++ b/sw/source/uibase/uno/loktxdoc.cxx @@ -450,9 +450,7 @@ void SwXTextDocument::getCommandValues(tools::JsonWriter& rJsonWriter, std::stri else aValue = aToken; } while (nIndex >= 0); - OUString aDecodedValue - = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset); - aMap[aKey] = aDecodedValue; + aMap[aKey] = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset); } while (nParamIndex >= 0); if (o3tl::starts_with(rCommand, aTextFormFields)) diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 7ea3d9db4e40..22de9f34a175 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -961,8 +961,7 @@ void SwAutoTextEventDescriptor::getByName( // return empty macro, unless macro is found OUString sEmptyStr; - SvxMacro aEmptyMacro(sEmptyStr, sEmptyStr); - rMacro = aEmptyMacro; + rMacro = SvxMacro(sEmptyStr, sEmptyStr); if ( !pBlocks || pBlocks->GetError()) return; |