cppuhelper/source/component.cxx | 4 +---
cui/source/dialogs/scriptdlg.cxx | 6 ++----
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 5 +----
hwpfilter/source/hwpreader.cxx | 3 +--
include/basegfx/color/bcolormodifier.hxx | 2 +-
include/oox/ppt/pptimport.hxx | 2 +-
include/oox/ppt/slidepersist.hxx | 2 +-
include/sfx2/viewsh.hxx | 2 +-
oox/source/ppt/timetargetelementcontext.cxx | 3 +--
sax/source/tools/CachedOutputStream.hxx | 2 +-
sc/source/filter/inc/xichart.hxx | 2 +-
sc/source/ui/view/output.cxx | 9 ++++-----
sd/source/ui/dlg/TemplateScanner.cxx | 3 +--
sfx2/source/control/listview.cxx | 3 +--
sfx2/source/doc/doctempl.cxx | 3 +--
starmath/source/document.cxx | 9 +++------
svtools/source/control/tabbar.cxx | 4 +---
sw/source/core/access/accmap.cxx | 3 +--
sw/source/core/unocore/unostyle.cxx | 3 +--
sw/source/ui/vba/vbacontentcontrollistentries.cxx | 8 ++++----
sw/source/ui/vba/vbaformfielddropdownlistentries.cxx | 4 ++--
sw/source/uibase/uno/unotxdoc.cxx | 3 +--
testtools/source/bridgetest/bridgetest.cxx | 9 +++++----
toolkit/source/controls/eventcontainer.cxx | 14 +++++++-------
ucb/source/cacher/contentresultsetwrapper.cxx | 6 +-----
vcl/inc/jsdialog/jsdialogbuilder.hxx | 11 +++++++----
vcl/jsdialog/jsdialogbuilder.cxx | 7 ++++---
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 3 +--
writerperfect/source/writer/exp/xmlimp.cxx | 3 +--
29 files changed, 58 insertions(+), 80 deletions(-)
New commits:
commit 283aa103b9aa40ef96b022420fdea69a6fdfe41c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 10 12:50:43 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 10 17:41:18 2023 +0100
cid#1545177 COPY_INSTEAD_OF_MOVE
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.mcnam...@collabora.com>
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 369e2ead7be5..5c7226f93a1a 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -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 );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3f1cb9fd33e4..54cdc56d26e1 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -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 & )
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9d3adc7f8b41..abdc597eb615 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -921,10 +921,7 @@ namespace
}
}
- {
- OUString sTemp(comphelper::string::stripEnd(aWorkStr, ','));
- aWorkStr = sTemp;
- }
+ aWorkStr = comphelper::string::stripEnd(aWorkStr, ',');
if ( !aWorkStr.isEmpty() )
{
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 972ebcdcd9d5..90083bd724a7 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -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 & )
diff --git a/include/basegfx/color/bcolormodifier.hxx
b/include/basegfx/color/bcolormodifier.hxx
index 1c2c4c776a52..b1d4620b6e6d 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -250,7 +250,7 @@ namespace basegfx
public:
BColorModifier_matrix(std::vector<double> aVector)
- : maVector(aVector)
+ : maVector(std::move(aVector))
{
}
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 2d7367c4c63e..fb718ddc70af 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -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; };
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 05ecb0094856..0112a67913e7 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -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; }
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 14d9ca94881c..fff558ba28a4 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -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; }
diff --git a/oox/source/ppt/timetargetelementcontext.cxx
b/oox/source/ppt/timetargetelementcontext.cxx
index a4003ee1ad37..b2dee6101735 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -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:
diff --git a/sax/source/tools/CachedOutputStream.hxx
b/sax/source/tools/CachedOutputStream.hxx
index 7d9e514c345c..c66231140fbb 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -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;
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 8feb17470b11..05f1e6b3b9ea 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -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; }
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9d0fe1430550..1696df328404 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -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 );
}
}
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx
b/sd/source/ui/dlg/TemplateScanner.cxx
index e1291eaa9688..ad84317f0bed 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -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));
}
}
diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx
index 579e7463611e..b0bb29c509bf 100644
--- a/sfx2/source/control/listview.cxx
+++ b/sfx2/source/control/listview.cxx
@@ -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)
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 63d83f12985c..2ce8a823f326 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -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);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index fc2481f3d2ab..d269f2aeaa1c 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -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);
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 02a23b8aea33..73ddf396eb25 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -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;
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 0df41e3a2814..f0193175972d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -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() &&
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 94219281b562..c3128421b809 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -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);
diff --git a/sw/source/ui/vba/vbacontentcontrollistentries.cxx
b/sw/source/ui/vba/vbacontentcontrollistentries.cxx
index 552397e156b7..c2e6e7e5f91b 100644
--- a/sw/source/ui/vba/vbacontentcontrollistentries.cxx
+++ b/sw/source/ui/vba/vbacontentcontrollistentries.cxx
@@ -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))
{
}
diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
index c167e16d7855..a54898f649ad 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
@@ -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)
{
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 66a05836fa38..fdbb3f28b7d0 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -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")
diff --git a/testtools/source/bridgetest/bridgetest.cxx
b/testtools/source/bridgetest/bridgetest.cxx
index 9d2a6b1832e7..f0b5e9de557b 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -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();
diff --git a/toolkit/source/controls/eventcontainer.cxx
b/toolkit/source/controls/eventcontainer.cxx
index 1b57e984d761..d47e6aa23bce 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -82,20 +82,20 @@ void ScriptEventContainer::replaceByName( const OUString&
aName, const Any& aEle
{
throw NoSuchElementException();
}
- sal_Int32 iHashResult = (*aIt).second;
- Any aOldElement = mValues[ iHashResult ];
- mValues[ iHashResult ] = aElement;
- // Fire event
ContainerEvent aEvent;
aEvent.Source = *this;
- aEvent.Element = aElement;
- aEvent.ReplacedElement = aOldElement;
aEvent.Accessor <<= aName;
+ aEvent.Element = aElement;
+
+ sal_Int32 iHashResult = (*aIt).second;
+ aEvent.ReplacedElement = mValues[ iHashResult ];
+ mValues[ iHashResult ] = aElement;
+
+ // Fire event
maContainerListeners.elementReplaced( aEvent );
}
-
// Methods XNameContainer
void ScriptEventContainer::insertByName( const OUString& aName, const Any&
aElement )
{
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx
b/ucb/source/cacher/contentresultsetwrapper.cxx
index b5a9907129d9..cb14a7845d88 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -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() )
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 4e764edf8c56..f553e7e96bd8 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -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
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 48946baa15f9..060d75e58807 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -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();
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 2092ba4096ae..490dd921ced3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -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);
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx
b/writerperfect/source/writer/exp/xmlimp.cxx
index 3790a4318ab1..f640e32813a3 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -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);
