chart2/source/controller/sidebar/ChartAreaPanel.cxx | 2 +- chart2/source/controller/sidebar/ChartAreaPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2 +- chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartElementsPanel.cxx | 2 +- chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 2 +- chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartLinePanel.cxx | 2 +- chart2/source/controller/sidebar/ChartLinePanel.hxx | 2 +- chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 +- chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2 +- chart2/source/controller/sidebar/ChartTypePanel.cxx | 2 +- chart2/source/controller/sidebar/ChartTypePanel.hxx | 2 +- dbaccess/source/ui/misc/DExport.cxx | 4 ++-- helpcompiler/source/HelpLinker.cxx | 3 +-- sc/source/ui/miscdlgs/dataproviderdlg.cxx | 4 +--- sc/source/ui/unoobj/viewuno.cxx | 3 +-- sfx2/source/inet/inettbc.cxx | 9 ++++----- stoc/source/inspect/introspection.cxx | 3 +-- svx/source/accessibility/svxrectctaccessiblecontext.cxx | 6 ++---- svx/source/customshapes/EnhancedCustomShape2d.cxx | 5 +---- sw/source/uibase/shells/tabsh.cxx | 3 +-- ucb/source/cacher/contentresultsetwrapper.cxx | 3 +-- vcl/inc/pdf/pdfwriter_impl.hxx | 2 +- writerfilter/source/dmapper/TableData.hxx | 4 ++-- writerfilter/source/dmapper/TableManager.hxx | 4 ++-- 27 files changed, 34 insertions(+), 47 deletions(-)
New commits: commit 4d01186dcef85b0515e51478bf7340268e0b147a Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 7 09:30:04 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 8 09:33:59 2023 +0100 cid#1546472 COPY_INSTEAD_OF_MOVE and cid#1546459 COPY_INSTEAD_OF_MOVE cid#1546452 COPY_INSTEAD_OF_MOVE cid#1546403 COPY_INSTEAD_OF_MOVE cid#1546396 COPY_INSTEAD_OF_MOVE cid#1546394 COPY_INSTEAD_OF_MOVE cid#1546338 COPY_INSTEAD_OF_MOVE cid#1546324 COPY_INSTEAD_OF_MOVE Change-Id: If61457cfaf1d7ce4a069bcecdc0cc657aeb43c68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index fdc6bc4b3d26..a1e02b8745be 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -661,10 +661,10 @@ void ODatabaseExport::createRowSet() bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont) { bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty(); - OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); + const OUString& rTableName(bHaveDefaultTable ? m_sDefaultTableName : _rTableName); OCopyTableWizard aWizard( nullptr, - sTableName, + rTableName, bHaveDefaultTable ? CopyTableOperation::AppendData : CopyTableOperation::CopyDefinitionAndData, ODatabaseExport::TColumns(m_aDestColumns), m_vDestVector, diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index 83d46d57c5bb..16a6c446647b 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -913,9 +913,7 @@ IMPL_LINK_NOARG(ScDataProviderDlg, TransformationSelectHdl, weld::ComboBox&, voi sc::ExternalDataSource ScDataProviderDlg::getDataSource(ScDocument* pDoc) { - OUString aURL = mxEditURL->get_text(); - OUString aProvider = mxProviderList->get_active_text(); - sc::ExternalDataSource aSource(aURL, aProvider, pDoc); + sc::ExternalDataSource aSource(mxEditURL->get_text(), mxProviderList->get_active_text(), pDoc); OUString aID = mxEditID->get_text(); aSource.setID(aID); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 9304d72471d9..2d066bcfc26b 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -552,8 +552,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved ) { sheet::ActivationEvent aEvent; uno::Reference< sheet::XSpreadsheetView > xView(this); - uno::Reference< uno::XInterface > xSource(xView, uno::UNO_QUERY); - aEvent.Source = xSource; + aEvent.Source.set(xView, uno::UNO_QUERY); aEvent.ActiveSheet = new ScTableSheetObj(pDocSh, rViewData.GetTabNo()); // Listener's handler may remove it from the listeners list for (size_t i = aActivationListeners.size(); i > 0; --i) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index be39b568002e..eb06b6656830 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -1774,8 +1774,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( // Enter in own property array Property& rProp = rAllPropArray[ rPropCount ]; - OUString aFieldName = xField->getName(); - rProp.Name = aFieldName; + rProp.Name = xField->getName(); rProp.Handle = rPropCount; Type aFieldType( xPropType->getTypeClass(), xPropType->getName() ); rProp.Type = aFieldType; diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 916c4c839485..87df4f059d0d 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -708,11 +708,10 @@ void SwTableShell::Execute(SfxRequest &rReq) aBoxSet.Get( RES_BOXATR_FORMAT ).GetValue() )); - OUString sCurText( rSh.GetTableBoxText() ); pCoreSet->Put( SvxNumberInfoItem( pFormatter, aBoxSet.Get( RES_BOXATR_VALUE).GetValue(), - sCurText, SID_ATTR_NUMBERFORMAT_INFO )); + rSh.GetTableBoxText(), SID_ATTR_NUMBERFORMAT_INFO )); SwWrtShell* pSh = &rSh; SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 72388222f12d..d4b32024b9a2 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -56,8 +56,7 @@ void ContentResultSetWrapper::impl_init_xRowOrigin(std::unique_lock<std::mutex>& if(m_xRowOrigin.is()) return; - Reference< XRow > xOrgig( m_xResultSetOrigin, UNO_QUERY ); - m_xRowOrigin = xOrgig; + m_xRowOrigin.set(m_xResultSetOrigin, UNO_QUERY); OSL_ENSURE( m_xRowOrigin.is(), "interface XRow is required" ); } diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index ae8754e6cc1a..090f3e090c35 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -325,7 +325,7 @@ public: return m_aColorBitmap; } - void setOutline(basegfx::B2DPolyPolygon aOutline) { m_aOutline = aOutline; } + void setOutline(const basegfx::B2DPolyPolygon& rOutline) { m_aOutline = rOutline; } const basegfx::B2DPolyPolygon& getOutline() const { return m_aOutline; } void addCode( sal_Ucs i_cCode ) diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index 558fb6946bde..53b99ed7c7fd 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -208,7 +208,7 @@ public: /** Add properties to the last cell of the row. */ - void insertCellProperties(TablePropertyMapPtr pProps) + void insertCellProperties(const TablePropertyMapPtr& pProps) { if (!mCells.empty()) mCells.back()->insertProperties(pProps); @@ -376,7 +376,7 @@ public: @param pProps the properties to add */ - void insertCellProperties(TablePropertyMapPtr pProps) + void insertCellProperties(const TablePropertyMapPtr& pProps) { mpRow->insertCellProperties(pProps); } commit 6c91e703354c545e3885a162b47139ade4caae6c Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 7 09:27:38 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 8 09:33:52 2023 +0100 cid#1546475 std::swap COPY_INSTEAD_OF_MOVE Change-Id: Ic5325a85deb370db2091e5ce5209b6408a8652bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160444 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index bb99bf2ae40a..082e22b96807 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1195,10 +1195,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r { if ( m_aLogicRect.GetHeight() > m_aLogicRect.GetWidth() ) { - css::drawing::EnhancedCustomShapeParameter aFirst = aHandle.aPosition.First; - css::drawing::EnhancedCustomShapeParameter aSecond = aHandle.aPosition.Second; - aHandle.aPosition.First = aSecond; - aHandle.aPosition.Second = aFirst; + std::swap(aHandle.aPosition.First, aHandle.aPosition.Second); } } if (m_bOOXMLShape) commit 950d8b640aa078a8c8fe615b919be809e5da6ee0 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 7 09:12:15 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 8 09:33:45 2023 +0100 cid#1546501 COPY_INSTEAD_OF_MOVE and cid#1546486 COPY_INSTEAD_OF_MOVE cid#1546485 COPY_INSTEAD_OF_MOVE cid#1546484 COPY_INSTEAD_OF_MOVE cid#1546482 COPY_INSTEAD_OF_MOVE Change-Id: I53cc622f16afc0f57ffd72e3e0a6f18e390fbb83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160443 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index b8bd8198b9bc..cb660661c140 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -512,7 +512,7 @@ void ChartAreaPanel::selectionChanged(bool bCorrectType) updateData(); } -void ChartAreaPanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartAreaPanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx index 75caf8d0d30a..e1edd3d832e8 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx @@ -73,7 +73,7 @@ private: rtl::Reference<ChartSidebarSelectionListener> mxSelectionListener; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); bool mbUpdate; bool mbModelValid; diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index f44264a1bb47..48a4620684b3 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -300,7 +300,7 @@ void ChartAxisPanel::modelInvalid() mbModelValid = false; } -void ChartAxisPanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartAxisPanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 32f3c0b3331e..e5ed4b5ebcc6 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -81,7 +81,7 @@ private: bool mbModelValid; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(ListBoxHdl, weld::ComboBox&, void); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 4f856355ba9c..b4452e38da2e 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -557,7 +557,7 @@ void ChartElementsPanel::modelInvalid() mbModelValid = false; } -void ChartElementsPanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartElementsPanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 07c7ee19c3db..2e0dee28b68f 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -102,7 +102,7 @@ private: OUString maTextSubTitle; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible); diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 66563e4586a9..c9430791b3c9 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -369,7 +369,7 @@ void ChartErrorBarPanel::modelInvalid() mbModelValid = false; } -void ChartErrorBarPanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartErrorBarPanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index 1613006b7ea5..92f7afb0ad53 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -79,7 +79,7 @@ private: bool mbModelValid; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); DECL_LINK(RadioBtnHdl, weld::Toggleable&, void); DECL_LINK(ListBoxHdl, weld::ComboBox&, void); diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 128718ff6694..453c573e5198 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -196,7 +196,7 @@ void ChartLinePanel::selectionChanged(bool bCorrectType) updateData(); } -void ChartLinePanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartLinePanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx b/chart2/source/controller/sidebar/ChartLinePanel.hxx index 10bfd5a4cf0d..002ca51cc139 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.hxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx @@ -74,7 +74,7 @@ private: rtl::Reference<ChartSidebarSelectionListener> mxSelectionListener; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); bool mbUpdate; bool mbModelValid; diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 8ec05b73d656..48eaa5a3f297 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -400,7 +400,7 @@ void ChartSeriesPanel::modelInvalid() mbModelValid = false; } -void ChartSeriesPanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartSeriesPanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index b457667ec257..5b69cc3b959f 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -98,7 +98,7 @@ private: bool mbModelValid; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(RadioBtnHdl, weld::Toggleable&, void); diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index ead59f7feaa1..69409a8d673b 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -261,7 +261,7 @@ void ChartTypePanel::HandleContextChange(const vcl::EnumContext& rContext) void ChartTypePanel::modelInvalid() { mbModelValid = false; } -void ChartTypePanel::doUpdateModel(rtl::Reference<::chart::ChartModel> xModel) +void ChartTypePanel::doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel) { if (mbModelValid) { diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx index 5555eba2f464..8df0020431db 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.hxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx @@ -94,7 +94,7 @@ private: bool mbModelValid; void Initialize(); - void doUpdateModel(rtl::Reference<::chart::ChartModel> xModel); + void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel); std::unique_ptr<Dim3DLookResourceGroup> m_pDim3DLookResourceGroup; std::unique_ptr<StackingResourceGroup> m_pStackingResourceGroup; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index f585a4d33d6a..b99061d0dd7f 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -821,12 +821,11 @@ static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlErr static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) #endif { - std::string aErrorMsg = error->message; std::string aXMLParsingFile; if( error->file != nullptr ) aXMLParsingFile = error->file; int nXMLParsingLine = error->line; - GpXMLParsingException = new HelpProcessingException( aErrorMsg, aXMLParsingFile, nXMLParsingLine ); + GpXMLParsingException = new HelpProcessingException(error->message, aXMLParsingFile, nXMLParsingLine); // Reset error handler xmlSetStructuredErrorFunc( nullptr, nullptr ); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 165dd2eeb596..3206ac2f2763 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -145,15 +145,14 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const if ( !xDispatch.is() ) return; - Sequence< PropertyValue > aArgs{ + SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo; + pExecuteInfo->xDispatch = xDispatch; + pExecuteInfo->aTargetURL = aTargetURL; + pExecuteInfo->aArgs = { comphelper::makePropertyValue("Referer", OUString( "private:user" )), comphelper::makePropertyValue("FileName", aName) }; - SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo; - pExecuteInfo->xDispatch = xDispatch; - pExecuteInfo->aTargetURL = aTargetURL; - pExecuteInfo->aArgs = aArgs; Application::PostUserEvent( LINK( nullptr, SfxURLToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo ); } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 84d66aa33c0b..45360e6c862f 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -148,13 +148,11 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil if (!xChild.is() && mpRepr) { const ChildIndexToPointData* p = IndexToPoint( nIndex ); - OUString aName(SvxResId(p->pResIdName)); - OUString aDescr(SvxResId(p->pResIdDescr)); tools::Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) ); - rtl::Reference<SvxRectCtlChildAccessibleContext> pChild = new SvxRectCtlChildAccessibleContext(this, aName, - aDescr, aFocusRect, nIndex ); + rtl::Reference<SvxRectCtlChildAccessibleContext> pChild = new SvxRectCtlChildAccessibleContext(this, + SvxResId(p->pResIdName), SvxResId(p->pResIdDescr), aFocusRect, nIndex ); mvChildren[ nIndex ] = pChild; xChild = pChild; diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 0707e04d5ec3..fbace0cfe10b 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -121,7 +121,7 @@ class TableManager : public virtual SvRefBase mpCellProps.clear(); } - void setCellProps(TablePropertyMapPtr pProps) + void setCellProps(const TablePropertyMapPtr& pProps) { mpCellProps = pProps; } @@ -150,7 +150,7 @@ class TableManager : public virtual SvRefBase return mpRowProps; } - void setTableExceptionProps(TablePropertyMapPtr pProps) + void setTableExceptionProps(const TablePropertyMapPtr& pProps) { mpTableExceptionProps = pProps; // set table exception properties of the first cell
