diff options
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 4 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfac.cxx | 7 | ||||
-rw-r--r-- | chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 3 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.cxx | 3 | ||||
-rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 6 | ||||
-rw-r--r-- | include/avmedia/mediawindow.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/commandpopup/CommandPopup.cxx | 3 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
9 files changed, 13 insertions, 23 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 27397fcbcf7a..c034eb98ec5e 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -303,7 +303,7 @@ void MediaWindow::executeFormatErrorBox(weld::Window* pParent) xBox->run(); } -bool MediaWindow::isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep, rtl::Reference<PlayerListener> xPreferredPixelSizeListener) +bool MediaWindow::isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep, const rtl::Reference<PlayerListener>& xPreferredPixelSizeListener) { const INetURLObject aURL( rURL ); @@ -416,7 +416,7 @@ MediaWindow::grabFrame(const uno::Reference<media::XPlayer>& xPlayer, uno::Reference< graphic::XGraphic > MediaWindow::grabFrame(const OUString& rURL, const OUString& rReferer, const OUString& sMimeType, - rtl::Reference<PlayerListener> xPreferredPixelSizeListener) + const rtl::Reference<PlayerListener>& xPreferredPixelSizeListener) { uno::Reference<media::XPlayer> xPlayer(createPlayer(rURL, rReferer, &sMimeType)); diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index eed140560534..65e29654914d 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -51,11 +51,8 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, rtl::Referenc uno::Reference<lang::XMultiServiceFactory> xFact; uno::Reference< uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext(); uno::Reference< container::XNameContainer > xC( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.UnoControlDialogModel", xContext ), uno::UNO_QUERY ); - if( xC.is() ) - { - uno::Reference< lang::XMultiServiceFactory > xModFact( xC, uno::UNO_QUERY ); - xFact = xModFact; - } + if (xC.is()) + xFact.set(xC, uno::UNO_QUERY); return xFact; }(); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index e3ace3e9d4e2..e5278bb5da49 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -144,8 +144,7 @@ void lcl_ConvertRangeFromXML( lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY ); if( xConverter.is()) { - OUString aResult = xConverter->convertRangeFromXML( rInOutRange ); - rInOutRange = aResult; + rInOutRange = xConverter->convertRangeFromXML( rInOutRange ); } } } diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 71483c209949..dfe94a1c0ac9 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -557,8 +557,7 @@ bool SVGFilter::filterImpressOrDraw( const Sequence< PropertyValue >& rDescripto sal_Int32 i = 0; for (auto const& masterPageTarget : aMasterPageTargetSet) { - uno::Reference< drawing::XDrawPage > xMasterPage( masterPageTarget, uno::UNO_QUERY ); - mMasterPageTargets[i++] = xMasterPage; + mMasterPageTargets[i++].set(masterPageTarget, uno::UNO_QUERY); } bRet = implExport( rDescriptor ); diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index c6f253f6b9bb..31de75b8fa65 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -2774,10 +2774,8 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp ::std::vector< ::std::vector< OUString > > aListFallbacks( rList.size()); size_t i = 0; for (auto const& elem : rList) - { - ::std::vector< OUString > aTmp( LanguageTag(elem).getFallbackStrings( true)); - aListFallbacks[i++] = aTmp; - } + aListFallbacks[i++] = LanguageTag(elem).getFallbackStrings(true); + for (auto const& rfb : aFallbacks) { size_t nPosFb = 0; diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index e2938b608a24..087054c2244b 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -129,7 +129,7 @@ namespace avmedia static bool executeMediaURLDialog(weld::Window* pParent, OUString& rURL, bool *const o_pbLink); static void executeFormatErrorBox(weld::Window* pParent); static bool isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep = false, - rtl::Reference<PlayerListener> xPreferredPixelSizeListener = nullptr); + const rtl::Reference<PlayerListener>& xPreferredPixelSizeListener = nullptr); static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = nullptr ); @@ -138,7 +138,7 @@ namespace avmedia const css::uno::Reference<css::graphic::XGraphic>& rGraphic = nullptr); static css::uno::Reference< css::graphic::XGraphic > grabFrame(const OUString& rURL, const OUString& rReferer, - const OUString& sMimeType, rtl::Reference<PlayerListener> xPreferredPixelSizeListener); + const OUString& sMimeType, const rtl::Reference<PlayerListener>& xPreferredPixelSizeListener); static void dispatchInsertAVMedia(const css::uno::Reference<css::frame::XDispatchProvider>&, const css::awt::Size& rSize, const OUString& rURL, bool bLink); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 59274bd45a5b..9da5da65b7e6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4530,8 +4530,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) assert(!sBaseCellAddress.isEmpty()); AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress); - OUString sSymbol = rxEntry.second->GetSymbol(pDoc->GetStorageGrammar()); - OUString sTempSymbol(sSymbol); + OUString sTempSymbol(rxEntry.second->GetSymbol(pDoc->GetStorageGrammar())); ScRange aRange; if (rxEntry.second->IsReference(aRange)) { diff --git a/sfx2/source/commandpopup/CommandPopup.cxx b/sfx2/source/commandpopup/CommandPopup.cxx index 0d948a4e84e6..3cc7b350dd12 100644 --- a/sfx2/source/commandpopup/CommandPopup.cxx +++ b/sfx2/source/commandpopup/CommandPopup.cxx @@ -82,8 +82,7 @@ void MenuContentHandler::gatherMenuContent( auto aCommandProperties = vcl::CommandInfoProvider::GetCommandProperties( aNewContent.m_aCommandURL, m_sModuleLongName); - OUString aLabel = vcl::CommandInfoProvider::GetLabelForCommand(aCommandProperties); - aNewContent.m_aMenuLabel = aLabel; + aNewContent.m_aMenuLabel = vcl::CommandInfoProvider::GetLabelForCommand(aCommandProperties); if (!rMenuContent.m_aFullLabelWithPath.isEmpty()) aNewContent.m_aFullLabelWithPath diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index e9d57ea34cef..57a9f3bc5223 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -6780,8 +6780,7 @@ void DomainMapper_Impl::handleToc // init [xTOCMarkerCursor] uno::Reference< text::XText > xText = xTextAppend->getText(); - uno::Reference< text::XTextCursor > xCrsr = xText->createTextCursor(); - m_xTOCMarkerCursor = xCrsr; + m_xTOCMarkerCursor = xText->createTextCursor(); // create header of the TOC with the TOC title inside createSectionForRange(m_xSdtEntryStart, xTextRangeEndOfTocHeader, "com.sun.star.text.IndexHeaderSection", true); |