ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cid#1545177 COPY_INSTEAD_OF_MOVE

Browse Source 
and

cid#1545179 COPY_INSTEAD_OF_MOVE
cid#1545187 COPY_INSTEAD_OF_MOVE
cid#1545188 COPY_INSTEAD_OF_MOVE
cid#1545189 COPY_INSTEAD_OF_MOVE
cid#1545196 COPY_INSTEAD_OF_MOVE
cid#1545197 COPY_INSTEAD_OF_MOVE
cid#1545204 COPY_INSTEAD_OF_MOVE
cid#1545223 COPY_INSTEAD_OF_MOVE
cid#1545236 COPY_INSTEAD_OF_MOVE
cid#1545239 COPY_INSTEAD_OF_MOVE
cid#1545253 COPY_INSTEAD_OF_MOVE
cid#1545274 COPY_INSTEAD_OF_MOVE
cid#1545286 COPY_INSTEAD_OF_MOVE
cid#1545309 COPY_INSTEAD_OF_MOVE
cid#1545311 COPY_INSTEAD_OF_MOVE
cid#1545345 COPY_INSTEAD_OF_MOVE
cid#1545358 COPY_INSTEAD_OF_MOVE
cid#1545361 COPY_INSTEAD_OF_MOVE
cid#1545365 COPY_INSTEAD_OF_MOVE
cid#1545367 COPY_INSTEAD_OF_MOVE
cid#1545372 COPY_INSTEAD_OF_MOVE
cid#1545373 COPY_INSTEAD_OF_MOVE
cid#1545377 COPY_INSTEAD_OF_MOVE
cid#1545392 COPY_INSTEAD_OF_MOVE
cid#1545399 COPY_INSTEAD_OF_MOVE
cid#1545404 COPY_INSTEAD_OF_MOVE
cid#1545408 COPY_INSTEAD_OF_MOVE
cid#1545430 COPY_INSTEAD_OF_MOVE
cid#1545439 COPY_INSTEAD_OF_MOVE
cid#1545449 COPY_INSTEAD_OF_MOVE

Change-Id: I3afe836a0bbc8bd70937035e60eb020435e413d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160539
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2023-12-10 17:41:18 +01:00
parent 7cfd3da36b
commit 283aa103b9
29 changed files with 58 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppuhelper/source/component.cxx
+1 -3
View File
@@ -150,10 +150,8 @@ void OComponentHelper::dispose()
{
try
{
Reference<XInterface > xSource(
Reference<XInterface >::query( static_cast<XComponent *>(this) ) );
EventObject aEvt;
aEvt.Source = xSource;
aEvt.Source = Reference<XInterface >::query( static_cast<XComponent *>(this) );
// inform all listeners to release this object
// The listener container are automatically cleared
rBHelper.aLC.disposeAndClear( aEvt );
cui/source/dialogs/scriptdlg.cxx
+2 -4
View File
@@ -814,8 +814,7 @@ void SvxScriptOrgDialog::createEntry(const weld::TreeIter& rEntry)
try
{
Any aResult = xInv->invoke( "Creatable", args, outIndex, outArgs );
Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
aChildNode = newNode;
aChildNode.set(aResult, UNO_QUERY);
}
catch( Exception const & )
@@ -895,8 +894,7 @@ void SvxScriptOrgDialog::renameEntry(const weld::TreeIter& rEntry)
try
{
Any aResult = xInv->invoke( "Renamable", args, outIndex, outArgs );
Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
aChildNode = newNode;
aChildNode.set(aResult, UNO_QUERY);
}
catch( Exception const & )
dbaccess/source/ui/querydesign/QueryDesignView.cxx
+1 -4
View File
@@ -921,10 +921,7 @@ namespace
}
}
{
OUString sTemp(comphelper::string::stripEnd(aWorkStr, ','));
aWorkStr = sTemp;
}
aWorkStr = comphelper::string::stripEnd(aWorkStr, ',');
if ( !aWorkStr.isEmpty() )
{
hwpfilter/source/hwpreader.cxx
+1 -2
View File
@@ -4757,8 +4757,7 @@ HwpImportFilter::HwpImportFilter(const Reference< XComponentContext >& rxContext
rtl::Reference<HwpReader> p = new HwpReader;
p->setDocumentHandler( xHandler );
Reference< XImporter > xImporter( xHandler, UNO_QUERY );
rImporter = xImporter;
rImporter.set(xHandler, UNO_QUERY);
rFilter = p;
}
catch( Exception & )
include/basegfx/color/bcolormodifier.hxx
+1 -1
View File
@@ -250,7 +250,7 @@ namespace basegfx
public:
BColorModifier_matrix(std::vector<double> aVector)
: maVector(aVector)
: maVector(std::move(aVector))
{
}
include/oox/ppt/pptimport.hxx
+1 -1
View File
@@ -66,7 +66,7 @@ public:
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
const SlidePersistPtr& getActualSlidePersist() const { return mpActualSlidePersist; };
void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; };
void setActualSlidePersist(const SlidePersistPtr& pActualSlidePersist) { mpActualSlidePersist = pActualSlidePersist; };
std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; };
std::vector< SlidePersistPtr >& getDrawPages(){ return maDrawPages; };
std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; };
include/oox/ppt/slidepersist.hxx
+1 -1
View File
@@ -74,7 +74,7 @@ public:
static css::uno::WeakReference< css::drawing::XDrawPage > mxDebugPage;
#endif
void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
void setMasterPersist(const SlidePersistPtr& pMasterPersistPtr) { mpMasterPagePtr = pMasterPersistPtr; }
const SlidePersistPtr& getMasterPersist() const { return mpMasterPagePtr; }
void setPath( const OUString& rPath ) { maPath = rPath; }
include/sfx2/viewsh.hxx
+1 -1
View File
@@ -475,7 +475,7 @@ public:
void setBlockedCommandList(const char* blockedCommandList);
bool isBlockedCommand(OUString command);
void SetStoringHelper(std::shared_ptr<SfxStoringHelper> xHelper) { m_xHelper = xHelper; }
void SetStoringHelper(const std::shared_ptr<SfxStoringHelper>& xHelper) { m_xHelper = xHelper; }
StylesHighlighterColorMap& GetStylesHighlighterParaColorMap() { return ParaStylesColorMap; }
StylesHighlighterColorMap& GetStylesHighlighterCharColorMap() { return CharStylesColorMap; }
oox/source/ppt/timetargetelementcontext.cxx
+1 -2
View File
@@ -149,8 +149,7 @@ namespace oox::ppt {
case PPT_TOKEN( spTgt ):
{
mpTarget->mnType = XML_spTgt;
OUString aId = rAttribs.getStringDefaulted( XML_spid);
mpTarget->msValue = aId;
mpTarget->msValue = rAttribs.getStringDefaulted(XML_spid);
return new ShapeTargetElementContext( *this, mpTarget->maShapeTarget );
}
default:
sax/source/tools/CachedOutputStream.hxx
+1 -1
View File
@@ -58,7 +58,7 @@ public:
mxOutputStream = xOutputStream;
}
void setOutput( std::shared_ptr< ForMergeBase > pForMerge )
void setOutput(const std::shared_ptr<ForMergeBase>& pForMerge)
{
flush();
mbWriteToOutStream = false;
sc/source/filter/inc/xichart.hxx
+1 -1
View File
@@ -721,7 +721,7 @@ public:
/** Reads the CHSERTRENDLINE record. */
void ReadChSerTrendLine( XclImpStream& rStrm );
/** Sets formatting information for the trend line. */
void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; }
void SetDataFormat(const XclImpChDataFormatRef& xDataFmt) { mxDataFmt = xDataFmt; }
void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }
sc/source/ui/view/output.cxx
+4 -5
View File
@@ -2594,17 +2594,16 @@ void ScOutputData::AddPDFNotes()
tools::Rectangle aNoteRect( nMarkX, nPosY, nMarkX+nNoteWidth*nLayoutSign, nPosY+nNoteHeight );
const ScPostIt* pNote = mpDoc->GetNote(nMergeX, nMergeY, nTab);
vcl::PDFNote aNote;
// Note title is the cell address (as on printed note pages)
ScAddress aAddress( nMergeX, nMergeY, nTab );
OUString aTitle(aAddress.Format(ScRefFlags::VALID, mpDoc, mpDoc->GetAddressConvention()));
aNote.Title = aAddress.Format(ScRefFlags::VALID, mpDoc, mpDoc->GetAddressConvention());
// Content has to be a simple string without line breaks
OUString aContent = pNote->GetText();
aContent = aContent.replaceAll("\n", " ");
aNote.Contents = aContent.replaceAll("\n", " ");
vcl::PDFNote aNote;
aNote.Title = aTitle;
aNote.Contents = aContent;
pPDFData->CreateNote( aNoteRect, aNote );
}
}
sd/source/ui/dlg/TemplateScanner.cxx
+1 -2
View File
@@ -234,12 +234,11 @@ TemplateScanner::State TemplateScanner::GatherFolderList()
if (xRow.is())
{
OUString sTargetDir (xRow->getString (2));
OUString aId = xContentAccess->queryContentIdentifierString();
mpFolderDescriptors->insert(
FolderDescriptor(
Classify(sTargetDir),
aId,
xContentAccess->queryContentIdentifierString(),
mxFolderEnvironment));
}
}
sfx2/source/control/listview.cxx
+1 -2
View File
@@ -70,7 +70,6 @@ void ListView::AppendItem(const OUString& rId, const OUString& rTitle, const OUS
const OUString& rPath, bool bDefault)
{
INetURLObject aUrl(rPath, INetProtocol::File);
OUString sPath = aUrl.getFSysPath(FSysStyle::Detect);
std::unique_ptr<ListViewItem> pItem(new ListViewItem);
pItem->maId = rId;
@@ -83,7 +82,7 @@ void ListView::AppendItem(const OUString& rId, const OUString& rTitle, const OUS
pItem->mnSize = getFileSize(rPath);
pItem->maDisplayModify = getDisplayFileModifyTime(rPath);
pItem->maDisplaySize = getDisplayFileSize(rPath);
pItem->maDisplayPath = sPath;
pItem->maDisplayPath = aUrl.getFSysPath(FSysStyle::Detect);
OUString sImage("");
if (pItem->mbDefault)
sfx2/source/doc/doctempl.cxx
+1 -2
View File
@@ -1570,8 +1570,7 @@ bool SfxDocTemplate_Impl::Construct( )
uno::Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< XPersist > xInfo( document::DocumentProperties::create(xContext), UNO_QUERY );
mxInfo = xInfo;
mxInfo.set(document::DocumentProperties::create(xContext), UNO_QUERY);
mxTemplates = frame::DocumentTemplates::create(xContext);
starmath/source/document.cxx
+3 -6
View File
@@ -775,8 +775,7 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
if( mpTree )
ArrangeFormula();
Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
SmXMLExportWrapper aEquation(GetModel());
aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium);
}
@@ -797,15 +796,13 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
const OUString& rFltName = pFlt->GetFilterName();
if(rFltName == STAROFFICE_XML)
{
Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
SmXMLExportWrapper aEquation(GetModel());
aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium);
}
else if(rFltName == MATHML_XML)
{
Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
SmXMLExportWrapper aEquation(GetModel());
aEquation.SetFlat(true);
aEquation.SetUseHTMLMLEntities(true);
bRet = aEquation.Export(rMedium);
svtools/source/control/tabbar.cxx
+1 -3
View File
@@ -2295,10 +2295,8 @@ bool TabBar::StartDrag(const CommandEvent& rCEvt, vcl::Region& rRegion)
}
mbInSelect = false;
vcl::Region aRegion;
// assign region
rRegion = aRegion;
rRegion = vcl::Region();
return true;
}
sw/source/core/access/accmap.cxx
+1 -2
View File
@@ -2196,8 +2196,7 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
mpShapeMap->find( aFrameOrObj.GetDrawObject() );
if( aIter != mpShapeMap->end() )
{
rtl::Reference < ::accessibility::AccessibleShape > xAcc( (*aIter).second );
xShapeAccImpl = xAcc;
xShapeAccImpl = aIter->second;
}
}
if( pObj && GetShell()->ActionPend() &&
sw/source/core/unocore/unostyle.cxx
+1 -2
View File
@@ -1739,8 +1739,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_NUM_RULES>(const SfxItemPropertyMapEntry&
{
const auto pFontListItem(static_cast<const SvxFontListItem*>(m_pDoc->GetDocShell()->GetItem(SID_ATTR_CHAR_FONTLIST)));
const auto pList(pFontListItem->GetFontList());
FontMetric aFontInfo(pList->Get(rBulletName, WEIGHT_NORMAL, ITALIC_NONE));
vcl::Font aFont(aFontInfo);
vcl::Font aFont(pList->Get(rBulletName, WEIGHT_NORMAL, ITALIC_NONE));
aFormat.SetBulletFont(&aFont);
}
aSetRule.Set(i, &aFormat);
sw/source/ui/vba/vbacontentcontrollistentries.cxx
+4 -4
View File
@@ -22,7 +22,7 @@ class ContentControlListEntriesEnumWrapper : public EnumerationHelper_BASE
public:
explicit ContentControlListEntriesEnumWrapper(
uno::Reference<container::XIndexAccess> xIndexAccess)
: mxIndexAccess(xIndexAccess)
: mxIndexAccess(std::move(xIndexAccess))
, mnIndex(0)
{
}
@@ -55,9 +55,9 @@ public:
ContentControlListEntryCollectionHelper(uno::Reference<ov::XHelperInterface> xParent,
uno::Reference<uno::XComponentContext> xContext,
std::shared_ptr<SwContentControl> pCC)
: mxParent(xParent)
, mxContext(xContext)
, m_pCC(pCC)
: mxParent(std::move(xParent))
, mxContext(std::move(xContext))
, m_pCC(std::move(pCC))
{
}
sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
+2 -2
View File
@@ -60,8 +60,8 @@ public:
ListEntryCollectionHelper(uno::Reference<ov::XHelperInterface> xParent,
uno::Reference<uno::XComponentContext> xContext,
sw::mark::IDropdownFieldmark& rFormField)
: mxParent(xParent)
, mxContext(xContext)
: mxParent(std::move(xParent))
, mxContext(std::move(xContext))
, m_rDropDown(rFormField)
{
}
sw/source/uibase/uno/unotxdoc.cxx
+1 -2
View File
@@ -4313,8 +4313,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames()
OUString* pResArr = aRet.getArray();
for (size_t i = 0; i < nOutlineCount; ++i)
{
OUString sEntry = lcl_CreateOutlineString(i, pDoc) + "|outline";
pResArr[i] = sEntry;
pResArr[i] = lcl_CreateOutlineString(i, pDoc) + "|outline";
}
}
else if (m_sLinkSuffix == "|drawingobject")
testtools/source/bridgetest/bridgetest.cxx
+5 -4
View File
@@ -720,10 +720,11 @@ static bool performTest(
static_cast< sal_Int32 >(0x80000000), 1, 0x7FFFFFFF };
sal_Int32 _aInt = 0xBABEBABE;
float _aFloat = 3.14f;
Any _any1(true);
Any _any2(&_aInt, cppu::UnoType<sal_Int32>::get());
Any _any3(&_aFloat, cppu::UnoType<float>::get());
Any _arAny[] = { _any1, _any2, _any3 };
Any _arAny[] = {
Any(true),
Any(&_aInt, cppu::UnoType<sal_Int32>::get()),
Any(&_aFloat, cppu::UnoType<float>::get())
};
Reference< XInterface > _arObj[3];
_arObj[0] = new OWeakObject();
_arObj[1] = new OWeakObject();
toolkit/source/controls/eventcontainer.cxx
+7 -7
View File
@@ -82,20 +82,20 @@ void ScriptEventContainer::replaceByName( const OUString& aName, const Any& aEle
{
throw NoSuchElementException();
}
ContainerEvent aEvent;
aEvent.Source = *this;
aEvent.Accessor <<= aName;
aEvent.Element = aElement;
sal_Int32 iHashResult = (*aIt).second;
Any aOldElement = mValues[ iHashResult ];
aEvent.ReplacedElement = mValues[ iHashResult ];
mValues[ iHashResult ] = aElement;
// Fire event
ContainerEvent aEvent;
aEvent.Source = *this;
aEvent.Element = aElement;
aEvent.ReplacedElement = aOldElement;
aEvent.Accessor <<= aName;
maContainerListeners.elementReplaced( aEvent );
}
// Methods XNameContainer
void ScriptEventContainer::insertByName( const OUString& aName, const Any& aElement )
{
ucb/source/cacher/contentresultsetwrapper.cxx
+1 -5
View File
@@ -50,7 +50,6 @@ ContentResultSetWrapper::ContentResultSetWrapper(
//!! call impl_init() at the end of constructor of derived class
};
void ContentResultSetWrapper::impl_init_xRowOrigin(std::unique_lock<std::mutex>&)
{
if(m_xRowOrigin.is())
@@ -65,13 +64,10 @@ void ContentResultSetWrapper::impl_init_xContentAccessOrigin(std::unique_lock<st
if(m_xContentAccessOrigin.is())
return;
Reference< XContentAccess > xOrgig( m_xResultSetOrigin, UNO_QUERY );
m_xContentAccessOrigin = xOrgig;
m_xContentAccessOrigin.set(m_xResultSetOrigin, UNO_QUERY);
OSL_ENSURE( m_xContentAccessOrigin.is(), "interface XContentAccess is required" );
}
void ContentResultSetWrapper::impl_init_xPropertySetOrigin(std::unique_lock<std::mutex>&)
{
if( m_xPropertySetOrigin.is() )
vcl/inc/jsdialog/jsdialogbuilder.hxx
+7 -4
View File
@@ -163,7 +163,8 @@ public:
void sendUpdate(VclPtr<vcl::Window> pWindow, bool bForce = false);
virtual void sendAction(VclPtr<vcl::Window> pWindow,
std::unique_ptr<jsdialog::ActionDataMap> pData);
virtual void sendPopup(VclPtr<vcl::Window> pWindow, OUString sParentId, OUString sCloseId);
virtual void sendPopup(VclPtr<vcl::Window> pWindow, const OUString& rParentId,
const OUString& rCloseId);
virtual void sendClosePopup(vcl::LOKWindowId nWindowId);
void flush() { mpIdleNotify->Invoke(); }
@@ -347,7 +348,8 @@ public:
virtual void sendAction(std::unique_ptr<jsdialog::ActionDataMap> pData) = 0;
virtual void sendPopup(vcl::Window* pPopup, OUString sParentId, OUString sCloseId) = 0;
virtual void sendPopup(vcl::Window* pPopup, const OUString& rParentId, const OUString& rCloseId)
= 0;
virtual void sendClosePopup(vcl::LOKWindowId nWindowId) = 0;
};
@@ -476,10 +478,11 @@ public:
m_pSender->sendAction(BaseInstanceClass::m_xWidget, std::move(pData));
}
virtual void sendPopup(vcl::Window* pPopup, OUString sParentId, OUString sCloseId) override
virtual void sendPopup(vcl::Window* pPopup, const OUString& rParentId,
const OUString& rCloseId) override
{
if (!m_bIsFreezed && m_pSender)
m_pSender->sendPopup(pPopup, sParentId, sCloseId);
m_pSender->sendPopup(pPopup, rParentId, rCloseId);
}
virtual void sendClosePopup(vcl::LOKWindowId nWindowId) override
vcl/jsdialog/jsdialogbuilder.cxx
+4 -3
View File
@@ -373,14 +373,15 @@ void JSDialogSender::sendAction(VclPtr<vcl::Window> pWindow,
mpIdleNotify->Start();
}
void JSDialogSender::sendPopup(VclPtr<vcl::Window> pWindow, OUString sParentId, OUString sCloseId)
void JSDialogSender::sendPopup(VclPtr<vcl::Window> pWindow, const OUString& rParentId,
const OUString& rCloseId)
{
if (!mpIdleNotify)
return;
std::unique_ptr<jsdialog::ActionDataMap> pData = std::make_unique<jsdialog::ActionDataMap>();
(*pData)[PARENT_ID ""_ostr] = sParentId;
(*pData)[CLOSE_ID ""_ostr] = sCloseId;
(*pData)[PARENT_ID ""_ostr] = rParentId;
(*pData)[CLOSE_ID ""_ostr] = rCloseId;
mpIdleNotify->sendMessage(jsdialog::MessageType::Popup, pWindow, std::move(pData));
mpIdleNotify->Start();
}
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+1 -2
View File
@@ -383,9 +383,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
{
// First get the style properties, then the table ones
PropertyMapPtr pTableProps( m_aTableProperties.get() );
TablePropertyMapPtr pEmptyProps( new TablePropertyMap );
m_aTableProperties = pEmptyProps;
m_aTableProperties = TablePropertyMapPtr(new TablePropertyMap);
PropertyMapPtr pMergedProperties = pStyleSheet->GetMergedInheritedProperties(pStyleSheetTable);
writerperfect/source/writer/exp/xmlimp.cxx
+1 -2
View File
@@ -184,8 +184,7 @@ void FindXMPMetadata(const uno::Reference<uno::XComponentContext>& xContext,
return;
xml::sax::InputSource aInputSource;
uno::Reference<io::XInputStream> xStream(new utl::OStreamWrapper(aStream));
aInputSource.aInputStream = xStream;
aInputSource.aInputStream.set(new utl::OStreamWrapper(aStream));
uno::Reference<xml::sax::XParser> xParser = xml::sax::Parser::create(xContext);
rtl::Reference<XMPParser> xXMP(new XMPParser(rMetaData));
xParser->setDocumentHandler(xXMP);