forms/source/xforms/datatypes.cxx | 8 +++----- svx/source/fmcomp/fmgridif.cxx | 9 ++++----- sw/inc/doc.hxx | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit 3871cca6122701135b42dc8687364835ed14fdf5 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 6 11:29:08 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 6 19:48:32 2024 +0100 cid#1545576 COPY_INSTEAD_OF_MOVE Change-Id: I085cc6802ba72c2334398dd34be9eecdab2ea575 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161709 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ea95cef85636..6372bb8ca585 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1373,7 +1373,7 @@ public: /** in case during copying of embedded object a new shell is created, it should be set here and cleaned later */ - void SetTmpDocShell( SfxObjectShellLock rLock ) { mxTmpDocShell = rLock; } + void SetTmpDocShell(const SfxObjectShellLock& rLock) { mxTmpDocShell = rLock; } const SfxObjectShellLock& GetTmpDocShell() const { return mxTmpDocShell; } // For Autotexts? (text modules) They have only one SVPersist at their disposal. commit f7327527d423f0ceb43520c9daab4d0682d48748 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 6 11:14:47 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 6 19:48:25 2024 +0100 cid#1560053 Missing move assignment operator and cid#1560054 Missing move assignment operator Change-Id: I438699b24ca7aa7726dbce3af310d80327b9a717 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161708 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index e2ad59e17700..382c5c80fdd0 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -574,14 +574,12 @@ namespace xforms return sInfo.makeStringAndClear(); } - OAnyURIType::OAnyURIType( const OUString& _rName, sal_Int16 _nTypeClass ) - :OAnyURIType_Base( _rName, _nTypeClass ) + : OAnyURIType_Base(_rName, _nTypeClass) + , m_xURLTransformer(css::util::URLTransformer::create(::comphelper::getProcessComponentContext())) { - m_xURLTransformer = css::util::URLTransformer::create(::comphelper::getProcessComponentContext()); } - void OAnyURIType::registerProperties() { OAnyURIType_Base::registerProperties(); @@ -596,11 +594,11 @@ namespace xforms &m_aMaxLength, cppu::UnoType<sal_Int32>::get() ); } - rtl::Reference<OXSDDataType> OAnyURIType::createClone( const OUString& _rName ) const { return new OAnyURIType( _rName, getTypeClass() ); } + void OAnyURIType::initializeClone( const OXSDDataType& _rCloneSource ) { OAnyURIType_Base::initializeClone( _rCloneSource ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 46bb09029ddd..c15d67a57ee6 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1189,8 +1189,6 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY); DbGridColumn* pCol; - Reference< css::sdb::XColumn > xFieldContent; - Reference< XPropertySet > xCurrentColumn; for (sal_Int32 i=0; i<nColumns; ++i) { if (bRequestedAsAny) @@ -1206,12 +1204,14 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType pCol = aColumns[ nModelPos ].get(); const DbGridRowRef xRow = pGrid->GetSeekRow(); - xFieldContent = (xRow.is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< css::sdb::XColumn > (); + Reference<css::sdb::XColumn> xFieldContent = + (xRow.is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< css::sdb::XColumn > (); if (!xFieldContent.is()) // can't supply anything without a field content // FS - 07.12.99 - 54391 continue; + Reference<XPropertySet> xCurrentColumn; xColumns->getByIndex(nModelPos) >>= xCurrentColumn; if (!::comphelper::hasProperty(FM_PROP_CLASSID, xCurrentColumn)) continue; @@ -1258,7 +1258,6 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type Any* pReturnArray = aReturnSequence.getArray(); bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY); - Reference< css::sdb::XColumn > xFieldContent; for (sal_Int32 i=0; i < nColumnCount; ++i) { sal_uInt16 nModelPos = pGrid->GetModelColumnPos(pGrid->GetColumnIdFromViewPos(static_cast<sal_uInt16>(i))); @@ -1267,7 +1266,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type // don't use GetCurrentFieldValue to determine the field content as this isn't affected by the above SeekRow // FS - 30.09.99 - 68644 DbGridColumn* pCol = aColumns[ nModelPos ].get(); - xFieldContent = xPaintRow->HasField( pCol->GetFieldPos() ) + Reference<css::sdb::XColumn> xFieldContent = xPaintRow->HasField(pCol->GetFieldPos()) ? xPaintRow->GetField( pCol->GetFieldPos() ).getColumn() : Reference< XColumn > ();
