desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 3 +--
filter/source/config/cache/filterfactory.cxx | 3 +--
sw/source/core/docnode/retrievedinputstreamdata.cxx | 3 +--
xmloff/source/chart/SchXMLChartContext.cxx | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 427d8f61d7bc4087a9408ba7f0b8a718943f4240
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 30 11:59:45 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 30 16:23:05 2023 +0100
cid#1546349 COPY_INSTEAD_OF_MOVE
and
cid#1546236 COPY_INSTEAD_OF_MOVE
cid#1546126 COPY_INSTEAD_OF_MOVE
cid#1546042 COPY_INSTEAD_OF_MOVE
Change-Id: I24b60d855f564ba8551501fc1dc614b24d5505c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161440
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 553952917748..ba49544f0fec 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -349,9 +349,8 @@ Reference<XComponentContext> connectToOffice(
bool verbose )
{
OUString pipeId( ::dp_misc::generateRandomPipeId() );
- OUString acceptArg = "--accept=pipe,name=" + pipeId + ";urp;";
- Sequence<OUString> args { "--nologo", "--nodefault", acceptArg };
+ Sequence<OUString> args { "--nologo", "--nodefault", "--accept=pipe,name="
+ pipeId + ";urp;" };
OUString appURL( getExecutableDir() + "/soffice" );
if (verbose)
diff --git a/filter/source/config/cache/filterfactory.cxx
b/filter/source/config/cache/filterfactory.cxx
index 1c6fadca6c86..9b0793b94e1e 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -152,8 +152,7 @@ css::uno::Reference< css::container::XEnumeration >
SAL_CALL FilterFactory::crea
if (pos != -1)
{
OSL_FAIL("DEPRECATED!
Please use new query format: 'matchByDocumentService=...'");
- OUString sPatchedQuery(OUString::Concat("matchByDocumentService=") +
sNewQuery.subView(7));
- sNewQuery = sPatchedQuery;
+ sNewQuery = OUString::Concat("matchByDocumentService=") +
sNewQuery.subView(7);
}
// analyze query and split it into its tokens
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx
b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 311be07ca719..607f14c21359 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -38,8 +38,7 @@ SwRetrievedInputStreamDataManager::tDataKey
SwRetrievedInputStreamDataManager::R
// create empty data container for given thread Consumer
tDataKey nDataKey( snNextKeyValue );
- tData aNewEntry( pThreadConsumer );
- maInputStreamData[ nDataKey ] = aNewEntry;
+ maInputStreamData[nDataKey] = tData(pThreadConsumer);
// prepare next data key value
if ( snNextKeyValue < SAL_MAX_UINT64 )
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx
b/xmloff/source/chart/SchXMLChartContext.cxx
index dc3e4266be03..a6420f79e7f2 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1051,9 +1051,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
SchXMLChartContext::cr
{
xProp->setPropertyValue("HasMainTitle", uno::Any(true) );
}
- uno::Reference< drawing::XShape > xTitleShape =
xDoc->getTitle();
pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
- maMainTitle, xTitleShape );
+ maMainTitle,
xDoc->getTitle() );
}
break;
case XML_ELEMENT(CHART, XML_SUBTITLE):
