diff options
37 files changed, 77 insertions, 82 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 806ce96a88a2..4f2918dcc6d9 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -791,11 +791,11 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) case SID_BASICIDE_MANAGE_LANG: { - auto pRequest = std::make_shared<SfxRequest>(rReq); + auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more auto xDlg = std::make_shared<ManageLanguageDialog>(pCurWin ? pCurWin->GetFrameWeld() : nullptr, m_pCurLocalizationMgr); - weld::DialogController::runAsync(xDlg, [pRequest](sal_Int32 /*nResult*/){ - pRequest->Done(); + weld::DialogController::runAsync(xDlg, [xRequest=std::move(xRequest)](sal_Int32 /*nResult*/){ + xRequest->Done(); }); } break; diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 7ef19597e303..36e9f9818f7f 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -579,8 +579,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aResStr, rLocale ); } - OUString aPropIdStr = aEsc + aPureIdStr; - pIdStrings[i] = aPropIdStr; + pIdStrings[i] = aEsc + aPureIdStr; } xPropertySet->setPropertyValue( aPropName, Any(aIdStrings) ); } diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 124db4133cff..a41e3d4a4437 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -83,8 +83,9 @@ namespace drawinglayer::primitive2d aTransform.translate(aDestRange.getMinX(), aDestRange.getMinY()); // add transform primitive - Primitive2DReference aScaled(new TransformPrimitive2D(aTransform, std::move(xRetval))); - xRetval = Primitive2DContainer { aScaled }; + xRetval = Primitive2DContainer { + Primitive2DReference(new TransformPrimitive2D(aTransform, std::move(xRetval))) // Scaled + }; } } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index e4f396221d95..c1a24e598615 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -868,11 +868,11 @@ Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElem sal_Int32 n = 0; for (auto const& elem : aUIElementInfoCollection) { - Sequence< PropertyValue > aUIElementInfo{ + aElementInfoSeq[n++] = + { comphelper::makePropertyValue("ResourceURL", elem.second.aResourceURL), comphelper::makePropertyValue(m_aPropUIName, elem.second.aUIName) }; - aElementInfoSeq[n++] = aUIElementInfo; } return comphelper::containerToSequence(aElementInfoSeq); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 9ba295f30932..729bd717da21 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -210,10 +210,11 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key OUString aSpinfieldText = m_pSpinfieldControl->get_entry_text(); // Add key modifier to argument list - auto aArgs0 = comphelper::makePropertyValue("KeyModifier", KeyModifier); - auto aArgs1 = comphelper::makePropertyValue("Value", m_bFloat ? Any(aSpinfieldText.toDouble()) - : Any(aSpinfieldText.toInt32())); - return { aArgs0, aArgs1 }; + return { + comphelper::makePropertyValue("KeyModifier", KeyModifier), + comphelper::makePropertyValue("Value", m_bFloat ? Any(aSpinfieldText.toDouble()) + : Any(aSpinfieldText.toInt32())) + }; } void SpinfieldToolbarController::Modify() diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index ea3e3af8ddc1..b8c74c938f29 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -377,8 +377,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM cTerm = sTerm; break; } - OUString aAlt( cTerm + catst); - pStr[i] = aAlt; + pStr[i] = OUString( cTerm + catst); } rtl::Reference<Meaning> pMn = new Meaning(aRTerm); OUString dTerm(pe->defn,strlen(pe->defn),eEnc ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 6bbd4c2e18aa..83e3c74cf216 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -166,14 +166,13 @@ void XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, Exc XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl ); pStrm->Ignore( 1 ); // - sheet name, always separated from URL - OUString aTabName( pStrm->ReadUniString() ); + rExtInfo.maTabName = pStrm->ReadUniString(); pStrm->Ignore( 1 ); rExtInfo.mbExternal = true; ScExternalRefManager* pRefMgr = GetDoc().GetExternalRefManager(); pRefMgr->convertToAbsName(aUrl); rExtInfo.mnFileId = pRefMgr->getExternalFileId(aUrl); - rExtInfo.maTabName = aTabName; rFirstTab = rLastTab = 0; } } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 4de5b1950183..e86ec2f13577 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1858,9 +1858,10 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller, VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg(GetActiveDialogParent(), *pStyleSheet, true)); - auto pRequest = std::make_shared<SfxRequest>(rReq); + auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more - pDlg->StartExecuteAsync([this, pDlg, pRequest, pStyleSheet, aOldData, aOldName, &rStyleSet, nCurTab, &rCaller, bUndo](sal_Int32 nResult){ + pDlg->StartExecuteAsync([this, pDlg, xRequest=std::move(xRequest), pStyleSheet, aOldData, + aOldName, &rStyleSet, nCurTab, &rCaller, bUndo](sal_Int32 nResult) { if ( nResult == RET_OK ) { const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); @@ -1896,7 +1897,7 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller, } PageStyleModified( aNewName, false ); - pRequest->Done(); + xRequest->Done(); } pDlg->disposeOnce(); }); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 679378bbafb8..21e6cb736b7a 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -476,7 +476,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq ) const SdrObject* pObj = nullptr; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - std::shared_ptr<SfxRequest> pRequest = std::make_shared<SfxRequest>(rReq); + std::shared_ptr<SfxRequest> xRequest = std::make_shared<SfxRequest>(rReq); if( rMarkList.GetMarkCount() == 1 ) pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -492,7 +492,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq ) pObj, bHasMarked)); - pDlg->StartExecuteAsync([pDlg, pRequest, pView, bHasMarked](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, xRequest=std::move(xRequest), pView, bHasMarked](sal_Int32 nResult){ if ( nResult == RET_OK ) { if( bHasMarked ) @@ -501,7 +501,7 @@ void ScDrawShell::ExecuteLineDlg( const SfxRequest& rReq ) pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false ); pView->InvalidateAttribs(); - pRequest->Done(); + xRequest->Done(); } pDlg->disposeOnce(); }); @@ -512,7 +512,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq ) ScDrawView* pView = rViewData.GetScDrawView(); bool bHasMarked = pView->AreObjectsMarked(); - std::shared_ptr<SfxRequest> pRequest = std::make_shared<SfxRequest>(rReq); + std::shared_ptr<SfxRequest> xRequest = std::make_shared<SfxRequest>(rReq); SfxItemSet aNewAttr( pView->GetDefaultAttr() ); if( bHasMarked ) @@ -524,7 +524,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq ) pWin, &aNewAttr, rViewData.GetDocument().GetDrawLayer(), true, false)); - pDlg->StartExecuteAsync([pDlg, pRequest, pView, bHasMarked](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, xRequest=std::move(xRequest), pView, bHasMarked](sal_Int32 nResult){ if ( nResult == RET_OK ) { if( bHasMarked ) @@ -533,7 +533,7 @@ void ScDrawShell::ExecuteAreaDlg( const SfxRequest& rReq ) pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false ); pView->InvalidateAttribs(); - pRequest->Done(); + xRequest->Done(); } pDlg->disposeOnce(); }); diff --git a/sd/source/console/PresenterScrollBar.cxx b/sd/source/console/PresenterScrollBar.cxx index 3a0891ec5d3c..687c1b66c008 100644 --- a/sd/source/console/PresenterScrollBar.cxx +++ b/sd/source/console/PresenterScrollBar.cxx @@ -749,10 +749,10 @@ void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Ar Execute(); // Schedule repeated executions. - auto pThis(shared_from_this()); + auto xSelf(shared_from_this()); mnMousePressRepeaterTaskId = PresenterTimer::ScheduleRepeatedTask ( mpScrollBar->GetComponentContext(), - [pThis] (TimeValue const&) { return pThis->Callback(); }, + [xSelf=std::move(xSelf)] (TimeValue const&) { return xSelf->Callback(); }, 500000000, 250000000); } diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 361c55f05aa3..f6a1d680034b 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -383,7 +383,7 @@ void PageObjectRun::RestartAnimation() auto sharedThis(shared_from_this()); mnAnimationId = mrAnimatorAccess.GetAnimator()->AddAnimation( [this] (double const val) { (*this)(val); }, - [sharedThis] () { sharedThis->mrAnimatorAccess.RemoveRun(sharedThis); } + [sharedThis=std::move(sharedThis)] () { sharedThis->mrAnimatorAccess.RemoveRun(sharedThis); } ); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 2a3b778531c1..a4e375890014 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -307,7 +307,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) VclPtr<AbstractHeaderFooterDialog> pDlg(pFact->CreateHeaderFooterDialog(this, pWin ? pWin->GetFrameWeld() : nullptr, GetDoc(), mpActualPage)); auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more - pDlg->StartExecuteAsync([this, pDlg, xRequest](sal_Int32 /*nResult*/){ + pDlg->StartExecuteAsync([this, pDlg, xRequest=std::move(xRequest)](sal_Int32 /*nResult*/){ GetActiveWindow()->Invalidate(); UpdatePreview( mpActualPage ); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 88b7cc016e3e..54efe2c95d2e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -501,8 +501,7 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMast n == SFX_SPLITWINDOWS_RIGHT ? SfxChildAlignment::RIGHT : n == SFX_SPLITWINDOWS_TOP ? SfxChildAlignment::TOP : SfxChildAlignment::BOTTOM ); - VclPtr<SfxSplitWindow> pSplitWin = VclPtr<SfxSplitWindow>::Create(pWorkWin, eAlign, this, true ); - pSplit[n] = pSplitWin; + pSplit[n] = VclPtr<SfxSplitWindow>::Create(pWorkWin, eAlign, this, true ); } nOrigMode = SfxVisibilityFlags::Standard; diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index 1dcd4cf7181b..a548fd20f97e 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -89,7 +89,7 @@ void AnimationAudioNode::activate_st() // deactivate ASAP: auto self(getSelf()); scheduleDeactivationEvent( - makeEvent( [self] () { self->deactivate(); }, + makeEvent( [self=std::move(self)] () { self->deactivate(); }, "AnimationAudioNode::deactivate without delay") ); } } @@ -188,13 +188,13 @@ bool AnimationAudioNode::handleAnimationEvent( void AnimationAudioNode::checkPlayingStatus() { - auto self(getSelf()); + auto xSelf(getSelf()); double nDuration = mpPlayer->getDuration(); if (!mpPlayer->isPlaying() || nDuration < 0.0) nDuration = 0.0; scheduleDeactivationEvent( - makeDelay( [self] () { self->deactivate(); }, + makeDelay( [xSelf=std::move(xSelf)] () { xSelf->deactivate(); }, nDuration, "AnimationAudioNode::deactivate with delay") ); } diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 9e812ecfc794..1da302008138 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -462,7 +462,7 @@ bool BaseNode::resolve() if (aBegin.hasValue()) { auto self(mpSelf); mpCurrentEvent = generateEvent( - aBegin, [self] () { self->activate(); }, + aBegin, [self=std::move(self)] () { self->activate(); }, maContext, mnStartDelay ); } else { @@ -474,7 +474,7 @@ bool BaseNode::resolve() // timeout into account auto self(mpSelf); mpCurrentEvent = makeDelay( - [self] () { self->activate(); }, + [self=std::move(self)] () { self->activate(); }, mnStartDelay, "AnimationNode::activate with delay"); maContext.mrEventQueue.addEvent( mpCurrentEvent ); diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 3f928593c846..5b1eecf79d31 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -43,7 +43,7 @@ void SequentialTimeContainer::activate_st() // deactivate ASAP: auto self(getSelf()); scheduleDeactivationEvent( - makeEvent( [self] () { self->deactivate(); }, + makeEvent( [self=std::move(self)] () { self->deactivate(); }, "SequentialTimeContainer::deactivate") ); } else // use default diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index deacb3aa7c35..0994b4a38197 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -659,8 +659,7 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const if(0.0 != aAnimationList.getDuration()) { // create content sequence - Primitive2DReference xRefA(pNew); - Primitive2DContainer aContent { xRefA }; + Primitive2DContainer aContent { Primitive2DReference(pNew) }; // create and add animated switch primitive return Primitive2DReference(new AnimatedBlinkPrimitive2D(aAnimationList, std::move(aContent))); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 1bad74cebb70..a0eddbbb6204 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -352,8 +352,7 @@ namespace if(rInfo.mbEndOfBullet) { // embed in TextHierarchyBulletPrimitive2D - drawinglayer::primitive2d::Primitive2DReference aNewReference(pNewPrimitive); - drawinglayer::primitive2d::Primitive2DContainer aNewSequence { aNewReference } ; + drawinglayer::primitive2d::Primitive2DContainer aNewSequence { pNewPrimitive }; pNewPrimitive = new drawinglayer::primitive2d::TextHierarchyBulletPrimitive2D(std::move(aNewSequence)); } diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 87df4f059d0d..736c70f20d79 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -608,7 +608,7 @@ void SwTableShell::Execute(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( &rSh.GetView()) != nullptr ); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); - std::shared_ptr<SwTableRep> pTableRep(::lcl_TableParamToItemSet(aCoreSet, rSh)); + std::shared_ptr<SwTableRep> xTableRep(::lcl_TableParamToItemSet(aCoreSet, rSh)); aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell()))); rSh.GetTableAttr(aCoreSet); @@ -627,13 +627,14 @@ void SwTableShell::Execute(SfxRequest &rReq) if (pItem) pDlg->SetCurPageId(static_cast<const SfxStringItem *>(pItem)->GetValue()); - auto pRequest = std::make_shared<SfxRequest>(rReq); + auto xRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more const bool bTableMode = rSh.IsTableMode(); SwPaM* pCursor = bTableMode ? rSh.GetTableCrs() : rSh.GetCursor(); // tdf#142165 use table cursor if in table mode auto vCursors = CopyPaMRing(*pCursor); // tdf#135636 make a copy to use at later apply - pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, &rBindings, &rSh, vCursors, bTableMode](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, xRequest=std::move(xRequest), xTableRep=std::move(xTableRep), + &rBindings, &rSh, vCursors=std::move(vCursors), bTableMode](sal_Int32 nResult){ if (RET_OK == nResult) { if (!bTableMode && rSh.IsTableMode()) // tdf#140977 drop current table-cursor if setting a replacement @@ -650,8 +651,8 @@ void SwTableShell::Execute(SfxRequest &rReq) const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); //to record FN_INSERT_TABLE correctly - pRequest->SetSlot(FN_FORMAT_TABLE_DLG); - pRequest->Done(*pOutSet); + xRequest->SetSlot(FN_FORMAT_TABLE_DLG); + xRequest->Done(*pOutSet); ItemSetToTableParam(*pOutSet, rSh); } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 6ace06179507..168902f36427 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -188,10 +188,8 @@ css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions( ) for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ ) { // Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId> - OUString aDescr = "*;*;" + GetPrinter()->GetPaperBinName( n ) + ";" + - OUString::number(n) + ";*;*"; - - aDescriptions.getArray()[n] = aDescr; + aDescriptions.getArray()[n] = "*;*;" + GetPrinter()->GetPaperBinName( n ) + ";" + + OUString::number(n) + ";*;*"; } return aDescriptions; } diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 55183d95558f..d407443d0700 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -161,9 +161,9 @@ public: virtual void sendFullUpdate(bool bForce = false); void sendClose(); void sendUpdate(VclPtr<vcl::Window> pWindow, bool bForce = false); - virtual void sendAction(VclPtr<vcl::Window> pWindow, + virtual void sendAction(const VclPtr<vcl::Window>& pWindow, std::unique_ptr<jsdialog::ActionDataMap> pData); - virtual void sendPopup(VclPtr<vcl::Window> pWindow, const OUString& rParentId, + virtual void sendPopup(const VclPtr<vcl::Window>& pWindow, const OUString& rParentId, const OUString& rCloseId); virtual void sendClosePopup(vcl::LOKWindowId nWindowId); void flush() { mpIdleNotify->Invoke(); } diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 7b3b304bf82b..97e7a400dfa6 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -363,7 +363,7 @@ void JSDialogSender::sendUpdate(VclPtr<vcl::Window> pWindow, bool bForce) mpIdleNotify->Start(); } -void JSDialogSender::sendAction(VclPtr<vcl::Window> pWindow, +void JSDialogSender::sendAction(const VclPtr<vcl::Window>& pWindow, std::unique_ptr<jsdialog::ActionDataMap> pData) { if (!mpIdleNotify) @@ -373,7 +373,7 @@ void JSDialogSender::sendAction(VclPtr<vcl::Window> pWindow, mpIdleNotify->Start(); } -void JSDialogSender::sendPopup(VclPtr<vcl::Window> pWindow, const OUString& rParentId, +void JSDialogSender::sendPopup(const VclPtr<vcl::Window>& pWindow, const OUString& rParentId, const OUString& rCloseId) { if (!mpIdleNotify) diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 6824b6039360..5b8d2a74f462 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -389,17 +389,6 @@ public: { rDev.SetClipRegion( vcl::Region(r) ); - const unsigned char pTextUTF8[] = { - 0xd9, 0x88, 0xd8, 0xa7, 0xd8, 0xad, 0xd9, 0x90, - 0xd8, 0xaf, 0xd9, 0x92, 0x20, 0xd8, 0xa5, 0xd8, - 0xab, 0xd9, 0x8d, 0xd9, 0x86, 0xd9, 0x8a, 0xd9, - 0x86, 0x20, 0xd8, 0xab, 0xd9, 0x84, 0xd8, 0xa7, - 0xd8, 0xab, 0xd8, 0xa9, 0xd9, 0x8c, 0x00 - }; - OUString aArabicText( reinterpret_cast<char const *>(pTextUTF8), - SAL_N_ELEMENTS( pTextUTF8 ) - 1, - RTL_TEXTENCODING_UTF8 ); - OUString aText; // To have more text displayed one after the other (overlapping, and in different colours), then @@ -407,7 +396,18 @@ public: const int nPrintNumCopies=1; if (bArabicText) - aText = aArabicText; + { + const unsigned char pTextUTF8[] = { + 0xd9, 0x88, 0xd8, 0xa7, 0xd8, 0xad, 0xd9, 0x90, + 0xd8, 0xaf, 0xd9, 0x92, 0x20, 0xd8, 0xa5, 0xd8, + 0xab, 0xd9, 0x8d, 0xd9, 0x86, 0xd9, 0x8a, 0xd9, + 0x86, 0x20, 0xd8, 0xab, 0xd9, 0x84, 0xd8, 0xa7, + 0xd8, 0xab, 0xd8, 0xa9, 0xd9, 0x8c, 0x00 + }; + aText = OUString(reinterpret_cast<char const *>(pTextUTF8), + SAL_N_ELEMENTS( pTextUTF8 ) - 1, + RTL_TEXTENCODING_UTF8); + } else aText = "Click any rect to zoom!!!!"; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index b7511dc4675b..0c9720071068 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3591,7 +3591,7 @@ void DomainMapper::processDeferredCharacterProperties( } } -void DomainMapper::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) +void DomainMapper::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) { ref->resolve(*this); } diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index ffcde49ef982..a5110a7cc921 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -173,7 +173,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; void ResetStyleProperties(); void finishParagraph(const bool bRemove = false, const bool bNoNumbering = false); diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 964470e24d60..c64276585a5d 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -150,7 +150,7 @@ void FontTable::resolveSprm(Sprm & r_Sprm) pProperties->resolve(*this); } -void FontTable::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) +void FontTable::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) { //create a new font entry SAL_WARN_IF( m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current entry has to be NULL here" ); diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 41c1f8dbd02c..092affebe871 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -62,7 +62,7 @@ class FontTable : public LoggedProperties, public LoggedTable void resolveSprm(Sprm & r_sprm); // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; // Stream virtual void lcl_startSectionGroup() override; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 3a7c5454b66c..2661d6ee58f4 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1712,7 +1712,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) } } -void GraphicImport::lcl_entry(writerfilter::Reference<Properties>::Pointer_t /*ref*/) +void GraphicImport::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& /*ref*/) { } diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 932c09f4a958..dae19ce85c03 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -108,7 +108,7 @@ public: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; // Stream virtual void lcl_startSectionGroup() override; diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index 0b41a22f43df..c0927c9130c4 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -135,7 +135,7 @@ public: void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override; protected: - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) = 0; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) = 0; private: #ifdef DBG_UTIL diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index a3b3883d2dc7..ec8e1be07c7f 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1099,7 +1099,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) } } -void ListsManager::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref ) +void ListsManager::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) { if( m_rDMapper.IsOOXMLImport() || m_rDMapper.IsRTFImport() ) { diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 58ab49d21a08..64156ba60ceb 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -228,7 +228,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; public: diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 43ef02f68134..c7b18413e0db 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -428,7 +428,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) } } -void SettingsTable::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) +void SettingsTable::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) { ref->resolve(*this); } diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index a0af31bed6bb..346fbb522089 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -103,7 +103,7 @@ private: virtual void lcl_sprm(Sprm& sprm) override; // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; }; typedef tools::SvRef<SettingsTable> SettingsTablePtr; } diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index ea6ddae6d562..1b5633b009fd 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -800,7 +800,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) } -void StyleSheetTable::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) +void StyleSheetTable::lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) { //create a new style entry OSL_ENSURE( !m_pImpl->m_pCurrentEntry, "current entry has to be NULL here"); diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 5cffd7d9d2a5..2308257a32b2 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -117,7 +117,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref) override; + virtual void lcl_entry(const writerfilter::Reference<Properties>::Pointer_t& ref) override; void applyDefaults(bool bParaProperties); diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 40899a4fda84..272457c956f9 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -495,8 +495,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( const Reference< XFastAtt } } - SvXMLImportContextRef xThis( this ); - return new XMLProxyContext( GetImport(), xThis ); + return new XMLProxyContext( GetImport(), SvXMLImportContextRef(this) ); } SvXMLImportContextRef XMLTableImportContext::ImportCell( sal_Int32 nElement, const Reference< XFastAttributeList >& xAttrList ) |