basctl/source/basicide/moduldlg.cxx | 3 +--
connectivity/source/parse/sqlnode.cxx | 6 +++---
include/connectivity/sqlnode.hxx | 2 +-
sc/source/core/tool/charthelper.cxx | 3 +--
sc/source/ui/pagedlg/areasdlg.cxx | 4 ++--
ucb/source/ucp/cmis/cmis_content.cxx | 4 +---
xmloff/source/draw/shapeexport.cxx | 3 +--
7 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit fe25701ae9bdf3b762967f084d5e78166f681e54
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 30 19:02:14 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 30 22:07:47 2023 +0100
cid#1545421 COPY_INSTEAD_OF_MOVE
and
cid#1545403 COPY_INSTEAD_OF_MOVE
cid#1545397 COPY_INSTEAD_OF_MOVE
cid#1545376 COPY_INSTEAD_OF_MOVE
cid#1545339 COPY_INSTEAD_OF_MOVE
cid#1545288 COPY_INSTEAD_OF_MOVE
Change-Id: I0e24a3fc7148d0b7ff8126debe3cddbb4fbdd713
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161453
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index 4b67e320b5ac..dcdac9fbd645 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -193,8 +193,7 @@ void OrganizeDialog::SetCurrentEntry(const
css::uno::Reference<css::frame::XFram
Reference<css::frame::XModel> xModel(xController->getModel());
if (!xModel)
return;
- ScriptDocument aScriptDocument(xModel);
- EntryDescriptor aDesc(aScriptDocument, LIBRARY_LOCATION_DOCUMENT,
OUString(), OUString(), OUString(), OBJ_TYPE_DOCUMENT);
+ EntryDescriptor aDesc(ScriptDocument(xModel), LIBRARY_LOCATION_DOCUMENT,
OUString(), OUString(), OUString(), OBJ_TYPE_DOCUMENT);
m_xModulePage->SetCurrentEntry(aDesc);
m_xDialogPage->SetCurrentEntry(aDesc);
}
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 45030592cf65..ad8f6c9edeff 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -244,7 +244,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
parseNodeToStr(
rString, _rxConnection, nullptr, nullptr, OUString(),
pContext ? pContext->getPreferredLocale() :
OParseContext::getDefaultLocale(),
- pContext, _bIntl, _bQuote, OUString("."), false );
+ pContext, _bIntl, _bQuote, ".", false );
}
@@ -287,7 +287,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
const IParseContext* pContext,
bool _bIntl,
bool _bQuote,
- OUString _sDecSep,
+ const OUString& _rDecSep,
bool _bPredicate) const
{
OSL_ENSURE( _rxConnection.is(), "OSQLParseNode::parseNodeToStr: invalid
connection!" );
@@ -301,7 +301,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
OSQLParseNode::impl_parseNodeToString_throw( sBuffer,
SQLParseNodeParameter(
_rxConnection, xFormatter, _xField, _sPredicateTableAlias,
rIntl, pContext,
- _bIntl, _bQuote, _sDecSep, _bPredicate, false
+ _bIntl, _bQuote, _rDecSep, _bPredicate, false
) );
}
catch( const SQLException& )
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 6724090392a4..7e8de4b51ec2 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -408,7 +408,7 @@ namespace connectivity
const IParseContext* pContext,
bool _bIntl,
bool _bQuote,
- OUString _sDecSep,
+ const OUString& _rDecSep,
bool _bPredicate) const;
private:
diff --git a/sc/source/core/tool/charthelper.cxx
b/sc/source/core/tool/charthelper.cxx
index 82e11c055077..df6c825a31d3 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -393,8 +393,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify(
ScDocument& rDoc, co
ScChartListenerCollection* pCollection =
rDoc.GetChartListenerCollection();
if (pCollection &&
!pCollection->findByName(aChartName))
{
- ScRangeList aRangeList( rRangesVector[
nRangeList++ ] );
- ScRangeListRef rRangeList( new
ScRangeList( aRangeList ) );
+ ScRangeListRef rRangeList(new
ScRangeList(rRangesVector[nRangeList++]));
ScChartListener* pChartListener = new
ScChartListener( aChartName, rDoc, rRangeList );
pCollection->insert( pChartListener );
pChartListener->StartListeningTo();
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index b90a3a664ba2..2e5b9f844a0e 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -64,7 +64,7 @@ namespace
// global functions (->at the end of the file):
static bool lcl_CheckRepeatString( std::u16string_view aStr, const ScDocument&
rDoc, bool bIsRow, ScRange* pRange );
-static void lcl_GetRepeatRangeString( std::optional<ScRange> oRange, const
ScDocument& rDoc, bool bIsRow, OUString& rStr );
+static void lcl_GetRepeatRangeString( const std::optional<ScRange>& oRange,
const ScDocument& rDoc, bool bIsRow, OUString& rStr );
#if 0
// this method is useful when debugging address flags.
@@ -763,7 +763,7 @@ static bool lcl_CheckRepeatString( std::u16string_view
aStr, const ScDocument& r
return true;
}
-static void lcl_GetRepeatRangeString( std::optional<ScRange> oRange, const
ScDocument& rDoc, bool bIsRow, OUString& rStr )
+static void lcl_GetRepeatRangeString( const std::optional<ScRange>& oRange,
const ScDocument& rDoc, bool bIsRow, OUString& rStr )
{
rStr.clear();
if (!oRange)
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index d07e389d2b05..7b77607ef49a 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1547,9 +1547,7 @@ namespace cmis
if (!document)
return false;
- boost::shared_ptr< std::istream > aIn =
document->getContentStream( );
-
- uno::Reference< io::XInputStream > xIn = new StdInputStream( aIn );
+ uno::Reference< io::XInputStream > xIn = new
StdInputStream(document->getContentStream());
if( !xIn.is( ) )
return false;
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index cbb027829713..2d195b5b4761 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -470,8 +470,7 @@ void XMLShapeExport::collectShapeAutoStyles(const
uno::Reference< drawing::XShap
// as member, thus saving time.
DBG_ASSERT(-1 != nIndex,
"XMLShapeExport::collectShapeAutoStyles: could not obtain the index for the
ParaAdjust context id!");
- uno::Any aParaAdjustValue =
xPropSet->getPropertyValue( "ParaAdjust" );
- XMLPropertyState aAlignDefaultState( nIndex,
aParaAdjustValue );
+ XMLPropertyState aAlignDefaultState(nIndex,
xPropSet->getPropertyValue("ParaAdjust"));
aPropStates.push_back( aAlignDefaultState );
}
