sw/source/ui/vba/vbaformfielddropdownlistentries.cxx | 2 +-
toolkit/source/awt/vclxcontainer.cxx | 3 +--
vcl/source/outdev/font.cxx | 5 +----
writerfilter/inc/ooxml/OOXMLDocument.hxx | 2 +-
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 2 +-
writerfilter/source/dmapper/NumberingManager.hxx | 2 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 27a24fc1eb486956956a5b5cf64e5152ded82ace
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 11 10:12:07 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Dec 11 14:06:54 2023 +0100
cid#1545577 COPY_INSTEAD_OF_MOVE
and
cid#1545679 COPY_INSTEAD_OF_MOVE
cid#1545691 COPY_INSTEAD_OF_MOVE
cid#1545697 COPY_INSTEAD_OF_MOVE
cid#1545711 COPY_INSTEAD_OF_MOVE
cid#1545730 COPY_INSTEAD_OF_MOVE
Change-Id: Ic0777a8ba532b00b021ffed81243505fbb7250f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160568
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
index a54898f649ad..aba385aef820 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
@@ -30,7 +30,7 @@ class ListEntriesEnumWrapper : public EnumerationHelper_BASE
public:
explicit ListEntriesEnumWrapper(uno::Reference<container::XIndexAccess>
xIndexAccess)
- : mxIndexAccess(xIndexAccess)
+ : mxIndexAccess(std::move(xIndexAccess))
, mnIndex(0)
{
}
diff --git a/toolkit/source/awt/vclxcontainer.cxx
b/toolkit/source/awt/vclxcontainer.cxx
index de7518d418c9..ba0a62c716eb 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -77,8 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XWindow >
> VCLXContainer::ge
{
vcl::Window* pChild = pWindow->GetChild( n );
css::uno::Reference< css::awt::XWindowPeer > xWP =
pChild->GetComponentInterface();
- css::uno::Reference< css::awt::XWindow > xW( xWP,
css::uno::UNO_QUERY );
- pChildRefs[n] = xW;
+ pChildRefs[n].set(xWP, css::uno::UNO_QUERY);
}
}
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 2086db7f6341..bec0016b1648 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -238,10 +238,7 @@ bool OutputDevice::GetFontCharMap( FontCharMapRef&
rxFontCharMap ) const
FontCharMapRef xFontCharMap ( mpGraphics->GetFontCharMap() );
if (!xFontCharMap.is())
- {
- FontCharMapRef xDefaultMap( new FontCharMap() );
- rxFontCharMap = xDefaultMap;
- }
+ rxFontCharMap = FontCharMapRef(new FontCharMap());
else
rxFontCharMap = xFontCharMap;
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 6b47ab752177..91a4aeec5a3f 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -214,7 +214,7 @@ public:
virtual sal_Int32 getXNoteId() const = 0;
virtual const OUString & getTarget() const = 0;
virtual rtl::Reference<oox::shape::ShapeContextHandler> getShapeContext( )
= 0;
- virtual void setShapeContext(
rtl::Reference<oox::shape::ShapeContextHandler> xContext ) = 0;
+ virtual void setShapeContext(const
rtl::Reference<oox::shape::ShapeContextHandler>& xContext) = 0;
virtual const oox::drawingml::ThemePtr & getTheme() const = 0;
/// Push context of drawingML shapes, so nested shapes are handled
separately.
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index a2e492936b96..6b5cee85743f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -77,7 +77,7 @@ public:
// use this method to avoid adding the properties for the table
// but in the provided properties map.
- void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps =
pProperties; };
+ void SetStyleProperties(const PropertyMapPtr& pProperties) { m_pStyleProps
= pProperties; };
virtual bool sprm(Sprm & rSprm) override;
bool attribute(Id nName, Value const & val);
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index fc3c2f05b72f..58ab49d21a08 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -184,7 +184,7 @@ public:
virtual ~ListDef( ) override;
// Accessors
- void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) {
m_pAbstractDef = pAbstract; };
+ void SetAbstractDefinition(const AbstractListDef::Pointer& pAbstract) {
m_pAbstractDef = pAbstract; };
const AbstractListDef::Pointer& GetAbstractDefinition( ) const { return
m_pAbstractDef; };
// Mapping functions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index d9900ea7e4fc..e51b13247884 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -838,7 +838,7 @@ const uno::Sequence<beans::PropertyValue>&
OOXMLDocumentImpl::getMediaDescriptor
return maMediaDescriptor;
}
-void OOXMLDocumentImpl::setShapeContext(
rtl::Reference<oox::shape::ShapeContextHandler> xContext )
+void OOXMLDocumentImpl::setShapeContext(const
rtl::Reference<oox::shape::ShapeContextHandler>& xContext)
{
if (!maShapeContexts.empty())
maShapeContexts.top() = xContext;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 1983ed2583a5..87aae13ab94f 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -136,7 +136,7 @@ public:
virtual sal_Int32 getXNoteId() const override;
virtual const OUString & getTarget() const override;
virtual rtl::Reference<oox::shape::ShapeContextHandler> getShapeContext( )
override;
- virtual void setShapeContext(
rtl::Reference<oox::shape::ShapeContextHandler> xContext ) override;
+ virtual void setShapeContext(const
rtl::Reference<oox::shape::ShapeContextHandler>& xContext) override;
virtual const oox::drawingml::ThemePtr & getTheme() const override
{
return mpTheme;
