chart2/source/view/diagram/VDiagram.cxx | 8
configmgr/source/xcuparser.cxx | 2
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 90
++++------
cui/source/tabpages/tplneend.cxx | 8
editeng/source/xml/xmltxtexp.cxx | 6
framework/source/uielement/menubarmanager.cxx | 5
sax/source/expatwrap/sax_expat.cxx | 3
sd/source/ui/unoidl/unomodel.cxx | 1
sd/source/ui/unoidl/unowcntr.cxx | 8
sfx2/source/doc/sfxbasemodel.cxx | 5
svx/source/svdraw/svdobj.cxx | 10 -
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unostyle.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 3
sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx | 2
sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx | 2
sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx | 2
toolkit/source/awt/vclxgraphics.cxx | 6
toolkit/source/awt/vclxprinter.cxx | 5
19 files changed, 74 insertions(+), 96 deletions(-)
New commits:
commit 393fec98820534613a351c17f7eb410045eaeb4f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Oct 8 09:04:25 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Oct 8 13:16:15 2024 +0200
cid#1620559 silence Using invalid iterator
Change-Id: Iccfd99bf517630947abf76464b7e19f274377082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2943b99c8775..565b01c82ad1 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -727,6 +727,7 @@ void AnimationsExporter::exportNodeImpl(const
Reference<XAnimationNode>& xNode)
mrWriter.put("id", sId);
sal_Int16 nNodeType = xNode->getType();
auto iterator = constAnimationNodeTypeToString.find(nNodeType);
+ assert(iterator != constAnimationNodeTypeToString.end() && "must be
previously checked with isValidNode");
mrWriter.put("nodeName", iterator->second);
// common properties
commit 0a5ce68dc34d3e14a7abe9625f8f6c88c0f5581c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Oct 8 08:35:21 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Oct 8 13:16:08 2024 +0200
cid#1632259 COPY_INSTEAD_OF_MOVE
and
cid#1632258 COPY_INSTEAD_OF_MOVE
cid#1632257 COPY_INSTEAD_OF_MOVE
cid#1632256 COPY_INSTEAD_OF_MOVE
cid#1632255 COPY_INSTEAD_OF_MOVE
cid#1632254 COPY_INSTEAD_OF_MOVE
cid#1632253 COPY_INSTEAD_OF_MOVE
cid#1632252 COPY_INSTEAD_OF_MOVE
cid#1632251 COPY_INSTEAD_OF_MOVE
cid#1632250 COPY_INSTEAD_OF_MOVE
cid#1632249 COPY_INSTEAD_OF_MOVE
cid#1632248 COPY_INSTEAD_OF_MOVE
cid#1632247 COPY_INSTEAD_OF_MOVE
cid#1632246 COPY_INSTEAD_OF_MOVE
cid#1632245 COPY_INSTEAD_OF_MOVE
cid#1632244 COPY_INSTEAD_OF_MOVE
cid#1632243 COPY_INSTEAD_OF_MOVE
cid#1632242 COPY_INSTEAD_OF_MOVE
cid#1632241 COPY_INSTEAD_OF_MOVE
cid#1632240 COPY_INSTEAD_OF_MOVE
cid#1632239 COPY_INSTEAD_OF_MOVE
cid#1632238 COPY_INSTEAD_OF_MOVE
cid#1632237 COPY_INSTEAD_OF_MOVE
cid#1632236 COPY_INSTEAD_OF_MOVE
cid#1632235 COPY_INSTEAD_OF_MOVE
cid#1632234 COPY_INSTEAD_OF_MOVE
cid#1632233 COPY_INSTEAD_OF_MOVE
cid#1632232 COPY_INSTEAD_OF_MOVE
cid#1632231 COPY_INSTEAD_OF_MOVE
cid#1558073 COPY_INSTEAD_OF_MOVE
cid#1557945 COPY_INSTEAD_OF_MOVE
cid#1557916 COPY_INSTEAD_OF_MOVE
cid#1557898 COPY_INSTEAD_OF_MOVE
cid#1557808 COPY_INSTEAD_OF_MOVE
Change-Id: Ibf417c154255fe3b0598127df5b5805ed543c8d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174660
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/chart2/source/view/diagram/VDiagram.cxx
b/chart2/source/view/diagram/VDiagram.cxx
index df804f4c42ff..a7e1dfc997b1 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -438,10 +438,12 @@ void VDiagram::createShapes_3d()
rtl::Reference<SvxShapeGroupAnyD> xOuterGroup_Shapes = m_xOuterGroupShape;
//create additional group to manipulate the aspect ratio of the whole
diagram:
- rtl::Reference<Svx3DSceneObject> xAdditionalGroup =
ShapeFactory::createGroup3D( xOuterGroup_Shapes );
- xOuterGroup_Shapes = xAdditionalGroup;
+ {
+ rtl::Reference<Svx3DSceneObject> xAdditionalGroup =
ShapeFactory::createGroup3D( xOuterGroup_Shapes );
+ xOuterGroup_Shapes = xAdditionalGroup;
- m_xAspectRatio3D = xAdditionalGroup;
+ m_xAspectRatio3D = std::move(xAdditionalGroup);
+ }
bool bAddFloorAndWall = m_xDiagram->isSupportingFloorAndWall();
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index b54e7aa95f01..6b38219eacde 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -188,7 +188,7 @@ void XcuParser::endElement(xmlreader::XmlReader const &) {
state_.pop();
if (insert.is()) {
assert(!state_.empty() && state_.top().node.is());
- state_.top().node->getMembers()[name] = insert;
+ state_.top().node->getMembers()[name] = std::move(insert);
}
if (pop && !path_.empty()) {
path_.pop_back();
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index ea3e70d73646..0e490e3b66ad 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -476,128 +476,110 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( )
void ODatabaseMetaDataResultSet::setProceduresMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setProceduresMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setProceduresMap();
}
void ODatabaseMetaDataResultSet::setCatalogsMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setCatalogsMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setCatalogsMap();
}
void ODatabaseMetaDataResultSet::setSchemasMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setSchemasMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setSchemasMap();
}
void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setColumnPrivilegesMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setColumnPrivilegesMap();
}
void ODatabaseMetaDataResultSet::setColumnsMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setColumnsMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setColumnsMap();
}
void ODatabaseMetaDataResultSet::setTablesMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setTablesMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setTablesMap();
}
void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setProcedureColumnsMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setProcedureColumnsMap();
}
void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setPrimaryKeysMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setPrimaryKeysMap();
}
void ODatabaseMetaDataResultSet::setIndexInfoMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setIndexInfoMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setIndexInfoMap();
}
void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setTablePrivilegesMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setTablePrivilegesMap();
}
void ODatabaseMetaDataResultSet::setCrossReferenceMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setCrossReferenceMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setCrossReferenceMap();
}
void ODatabaseMetaDataResultSet::setVersionColumnsMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setVersionColumnsMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setVersionColumnsMap();
}
void ODatabaseMetaDataResultSet::setBestRowIdentifierMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setBestRowIdentifierMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setBestRowIdentifierMap();
}
void ODatabaseMetaDataResultSet::setTypeInfoMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setTypeInfoMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setTypeInfoMap();
}
void ODatabaseMetaDataResultSet::setUDTsMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setUDTsMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setUDTsMap();
}
void ODatabaseMetaDataResultSet::setTableTypes()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setTableTypes();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setTableTypes();
}
void ODatabaseMetaDataResultSet::setExportedKeysMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setExportedKeysMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setExportedKeysMap();
}
void ODatabaseMetaDataResultSet::setImportedKeysMap()
{
- rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new
ODatabaseMetaDataResultSetMetaData();
- pMetaData->setImportedKeysMap();
- m_xMetaData = pMetaData;
+ m_xMetaData = new ODatabaseMetaDataResultSetMetaData();
+ m_xMetaData->setImportedKeysMap();
}
Reference< css::beans::XPropertySetInfo > SAL_CALL
ODatabaseMetaDataResultSet::getPropertySetInfo( )
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index d2a137c17306..428b8aa04a00 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -514,14 +514,14 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl,
weld::Button&, void)
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
- XLineEndListRef pLeList = XPropertyList::AsLineEndList(
+ XLineEndListRef xLeList = XPropertyList::AsLineEndList(
XPropertyList::CreatePropertyList(
XPropertyListType::LineEnd,
aPathURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
u""_ustr));
- pLeList->SetName( aURL.getName() );
- if( pLeList->Load() )
+ xLeList->SetName( aURL.getName() );
+ if( xLeList->Load() )
{
- pLineEndList = pLeList;
+ pLineEndList = std::move(xLeList);
static_cast<SvxLineTabDialog*>(GetDialogController())->SetNewLineEndList(
pLineEndList );
m_xLbLineEnds->clear();
m_xLbLineEnds->Fill( pLineEndList );
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 461924192c3e..083e868bd34d 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -280,10 +280,8 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
};
static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet(
SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
- rtl::Reference<SvxUnoText> pUnoText = new SvxUnoText( &aEditSource,
&aSvxXMLTextExportComponentPropertySet, mxText );
- pUnoText->SetSelection( rSel );
- mxText = pUnoText;
-
+ mxText = new SvxUnoText( &aEditSource,
&aSvxXMLTextExportComponentPropertySet, mxText );
+ mxText->SetSelection(rSel);
}
void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const
ESelection& rSel )
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index f86a17afd77f..56c2507b0ec2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1088,10 +1088,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
// Check if we have to create a popup menu for a uno based
popup menu controller.
// We have to set an empty popup menu into our menu structure
so the controller also
// works with inplace OLE.
- rtl::Reference<VCLXPopupMenu> pVCLXPopupMenu = new
VCLXPopupMenu;
- PopupMenu* pPopupMenu = static_cast<PopupMenu
*>(pVCLXPopupMenu->GetMenu());
+ pItemHandler->xPopupMenu = new VCLXPopupMenu;
+ PopupMenu* pPopupMenu =
static_cast<PopupMenu*>(pItemHandler->xPopupMenu->GetMenu());
pMenu->SetPopupMenu( pItemHandler->nItemId, pPopupMenu );
- pItemHandler->xPopupMenu = pVCLXPopupMenu;
if ( bAccessibilityEnabled && CreatePopupMenuController(
pItemHandler.get(), m_xDispatchProvider, m_aModuleIdentifier ) )
{
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index d1eae3997514..f6e6cdb90f55 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -354,8 +354,7 @@ SaxExpatParser::SaxExpatParser( )
{
m_pImpl.reset( new SaxExpatParser_Impl );
- rtl::Reference<LocatorImpl> pLoc = new LocatorImpl( m_pImpl.get() );
- m_pImpl->rDocumentLocator = pLoc;
+ m_pImpl->rDocumentLocator = new LocatorImpl( m_pImpl.get() );
// Performance-improvement; handing out the same object with every call of
// the startElement callback is allowed (see sax-specification):
diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx
index b7522e6560af..7cc43c906c9d 100644
--- a/sd/source/ui/unoidl/unowcntr.cxx
+++ b/sd/source/ui/unoidl/unowcntr.cxx
@@ -64,17 +64,17 @@ bool SvUnoWeakContainer::findRef(
for ( auto it = maVector.begin(); it != maVector.end(); )
{
unotools::WeakReference< SdLayer > & itRef = *it;
- rtl::Reference< SdLayer > pSdLayer( itRef );
- if ( !pSdLayer.is() )
+ rtl::Reference< SdLayer > xSdLayer( itRef );
+ if ( !xSdLayer.is() )
{
it = maVector.erase( it );
}
else
{
- SdrLayer* pSdrLayer = pSdLayer->GetSdrLayer ();
+ SdrLayer* pSdrLayer = xSdLayer->GetSdrLayer ();
if (pSdrLayer == pSearchData)
{
- rRef = pSdLayer;
+ rRef = std::move(xSdLayer);
return true;
}
++it;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index d57fdb8a68f7..b26931ca08af 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4573,8 +4573,7 @@ SfxBaseModel::loadMetadataFromStorage(
m_pData->m_xDocumentMetadata = xDMA;
throw;
}
- m_pData->m_xDocumentMetadata = xDMA;
-
+ m_pData->m_xDocumentMetadata = std::move(xDMA);
}
void SAL_CALL
@@ -4612,7 +4611,7 @@ SfxBaseModel::loadMetadataFromMedium(
m_pData->m_xDocumentMetadata = xDMA;
throw;
}
- m_pData->m_xDocumentMetadata = xDMA;
+ m_pData->m_xDocumentMetadata = std::move(xDMA);
}
void SAL_CALL
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c3c143c5d634..5b90f222c412 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2530,7 +2530,7 @@ rtl::Reference<SdrObject>
SdrObject::ImpConvertToContourObj(bool bForceLineDash)
// do we need a group?
if(bBuildGroup || bAddOriginalGeometry)
{
- rtl::Reference<SdrObject> pGroup = new
SdrObjGroup(getSdrModelFromSdrObject());
+ rtl::Reference<SdrObject> xGroup = new
SdrObjGroup(getSdrModelFromSdrObject());
if(bAddOriginalGeometry)
{
@@ -2543,20 +2543,20 @@ rtl::Reference<SdrObject>
SdrObject::ImpConvertToContourObj(bool bForceLineDash)
rtl::Reference<SdrObject>
pClone(CloneSdrObject(getSdrModelFromSdrObject()));
pClone->SetMergedItemSet(aSet);
- pGroup->GetSubList()->NbcInsertObject(pClone.get());
+ xGroup->GetSubList()->NbcInsertObject(pClone.get());
}
if(aLinePolygonPart)
{
-
pGroup->GetSubList()->NbcInsertObject(aLinePolygonPart.get());
+
xGroup->GetSubList()->NbcInsertObject(aLinePolygonPart.get());
}
if(aLineHairlinePart)
{
-
pGroup->GetSubList()->NbcInsertObject(aLineHairlinePart.get());
+
xGroup->GetSubList()->NbcInsertObject(aLineHairlinePart.get());
}
- pRetval = pGroup;
+ pRetval = std::move(xGroup);
}
else
{
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index 8697b3a09235..d7078e09f30b 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -975,7 +975,7 @@ lcl_ExportHints(
{
pUnoCursor->Normalize(false);
pUnoCursor->DeleteMark();
- pPortion = xTmp;
+ pPortion = std::move(xTmp);
}
else // just insert it
{
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 3380f6aa4b7d..e4d1628f33ef 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4433,7 +4433,7 @@ void SwXTextTableStyle::UpdateCellStylesMapping()
xCellStyle.set(new SwXTextCellStyle(m_pDocShell, pBoxFormat,
m_pTableAutoFormat->GetName()));
pBoxFormat->SetXObject(xCellStyle);
}
- m_aCellStyles[i] = xCellStyle;
+ m_aCellStyles[i] = std::move(xCellStyle);
}
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 2880505e7db6..e1d9aea18593 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -436,9 +436,8 @@ void SwXTextDocument::GetNumberFormatter()
{
if ( m_pDocShell->GetDoc() )
{
- rtl::Reference<SvNumberFormatsSupplierObj> pNumFormat = new
SvNumberFormatsSupplierObj(
+ m_xNumFormatAgg = new SvNumberFormatsSupplierObj(
m_pDocShell->GetDoc()->GetNumberFormatter());
- m_xNumFormatAgg = pNumFormat;
}
if(m_xNumFormatAgg.is())
m_xNumFormatAgg->setDelegator(getXWeak());
diff --git a/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
index e0dcfc2ad939..2b43069cde96 100644
--- a/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -209,7 +209,7 @@ public:
virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
- virtual void setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage) = 0;
+ virtual void setDrawPage(const rtl::Reference<SwFmDrawPage>& xDrawPage) =
0;
virtual rtl::Reference<SwFmDrawPage> getDrawPage() = 0;
virtual css::uno::Reference<css::io::XInputStream>
getInputStreamForId(const OUString & rId) = 0;
virtual void setXNoteId(const sal_Int32 nId) = 0;
diff --git a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
index 45ee7e19156e..086230b0d941 100644
--- a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
@@ -825,7 +825,7 @@ uno::Reference<frame::XModel> OOXMLDocumentImpl::getModel()
return mxModel;
}
-void OOXMLDocumentImpl::setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage)
+void OOXMLDocumentImpl::setDrawPage(const rtl::Reference<SwFmDrawPage>&
xDrawPage)
{
mxDrawPage = xDrawPage;
}
diff --git a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
index 1e86bc06763c..602432ddcf51 100644
--- a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
@@ -131,7 +131,7 @@ public:
virtual void setModel(css::uno::Reference<css::frame::XModel> xModel)
override;
virtual css::uno::Reference<css::frame::XModel> getModel() override;
- virtual void setDrawPage(rtl::Reference<SwFmDrawPage> xDrawPage) override;
+ virtual void setDrawPage(const rtl::Reference<SwFmDrawPage>& xDrawPage)
override;
virtual rtl::Reference<SwFmDrawPage> getDrawPage() override;
virtual css::uno::Reference<css::io::XInputStream>
getInputStreamForId(const OUString & rId) override;
virtual void setXNoteId(const sal_Int32 nId) override;
diff --git a/toolkit/source/awt/vclxgraphics.cxx
b/toolkit/source/awt/vclxgraphics.cxx
index c84acb24b9a2..6925fccb9fa5 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -126,9 +126,9 @@ uno::Reference< awt::XDevice > VCLXGraphics::getDevice()
if( !mxDevice.is() && mpOutputDevice )
{
- rtl::Reference<VCLXDevice> pDev = new VCLXDevice;
- pDev->SetOutputDevice( mpOutputDevice );
- mxDevice = pDev;
+ rtl::Reference<VCLXDevice> xDev = new VCLXDevice;
+ xDev->SetOutputDevice( mpOutputDevice );
+ mxDevice = std::move(xDev);
}
return mxDevice;
}
diff --git a/toolkit/source/awt/vclxprinter.cxx
b/toolkit/source/awt/vclxprinter.cxx
index 892873048931..187218cd252c 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -66,9 +66,8 @@ rtl::Reference< VCLXDevice > const &
VCLXPrinterPropertySet::GetDevice()
{
if ( !mxPrnDevice.is() )
{
- rtl::Reference<VCLXDevice> pDev = new VCLXDevice;
- pDev->SetOutputDevice( GetPrinter() );
- mxPrnDevice = pDev;
+ mxPrnDevice = new VCLXDevice;
+ mxPrnDevice->SetOutputDevice(GetPrinter());
}
return mxPrnDevice;
}
