sccomp/qa/unit/SwarmSolverTest.cxx | 14 +- sccomp/qa/unit/solver.cxx | 6 sccomp/source/solver/CoinMPSolver.cxx | 2 sccomp/source/solver/LpsolveSolver.cxx | 2 sccomp/source/solver/SolverComponent.cxx | 2 sccomp/source/solver/SwarmSolver.cxx | 12 - scripting/source/basprov/basmethnode.cxx | 18 +- scripting/source/basprov/basprov.cxx | 22 +-- scripting/source/basprov/basscript.cxx | 8 - scripting/source/dlgprov/DialogModelProvider.cxx | 4 scripting/source/dlgprov/dlgevtatt.cxx | 28 ++-- scripting/source/dlgprov/dlgprov.cxx | 42 +++--- scripting/source/inc/util/MiscUtils.hxx | 6 scripting/source/protocolhandler/scripthandler.cxx | 12 - scripting/source/provider/ActiveMSPList.cxx | 8 - scripting/source/provider/BrowseNodeFactoryImpl.cxx | 12 - scripting/source/provider/MasterScriptProvider.cxx | 54 ++++---- scripting/source/provider/MasterScriptProviderFactory.cxx | 4 scripting/source/provider/ProviderCache.cxx | 2 scripting/source/provider/URIHelper.cxx | 12 - scripting/source/stringresource/stringresource.cxx | 50 +++---- scripting/source/vbaevents/eventhelper.cxx | 58 ++++---- slideshow/qa/engine/engine.cxx | 2 slideshow/source/engine/animationnodes/animationaudionode.cxx | 8 - slideshow/source/engine/animationnodes/animationbasenode.cxx | 2 slideshow/source/engine/animationnodes/animationcommandnode.cxx | 4 slideshow/source/engine/animationnodes/animationsetnode.cxx | 2 slideshow/source/engine/animationnodes/animationtransformnode.cxx | 10 - slideshow/source/engine/animationnodes/basecontainernode.cxx | 2 slideshow/source/engine/animationnodes/basenode.cxx | 6 slideshow/source/engine/animationnodes/generateevent.cxx | 18 +- slideshow/source/engine/animationnodes/paralleltimecontainer.cxx | 2 slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 6 slideshow/source/engine/effectrewinder.cxx | 10 - slideshow/source/engine/eventmultiplexer.cxx | 10 - slideshow/source/engine/opengl/TransitionImpl.cxx | 20 +-- slideshow/source/engine/opengl/TransitionerImpl.cxx | 8 - slideshow/source/engine/rehearsetimingsactivity.cxx | 4 slideshow/source/engine/shapes/backgroundshape.cxx | 4 slideshow/source/engine/shapes/drawinglayeranimation.cxx | 16 +- slideshow/source/engine/shapes/drawshape.cxx | 2 slideshow/source/engine/shapes/gdimtftools.cxx | 14 +- slideshow/source/engine/shapes/shapeimporter.cxx | 40 +++--- slideshow/source/engine/shapes/viewappletshape.cxx | 2 slideshow/source/engine/shapes/viewmediashape.cxx | 20 +-- slideshow/source/engine/slide/slideimpl.cxx | 4 slideshow/source/engine/slide/targetpropertiescreator.cxx | 2 slideshow/source/engine/slideshowimpl.cxx | 66 +++++----- slideshow/source/engine/slideview.cxx | 4 slideshow/source/engine/soundplayer.cxx | 2 slideshow/source/engine/tools.cxx | 2 slideshow/source/engine/transitions/shapetransitionfactory.cxx | 2 slideshow/source/engine/usereventqueue.cxx | 2 slideshow/source/engine/wakeupevent.cxx | 2 slideshow/source/inc/interruptabledelayevent.hxx | 2 55 files changed, 338 insertions(+), 340 deletions(-)
New commits: commit b6652dae45a469bc0e357ff4755a92992b0856e9 Author: Noel Grandin <[email protected]> AuthorDate: Mon May 13 09:52:26 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon May 13 14:44:04 2024 +0200 loplugin:ostr in slideshow Change-Id: I87b391b95a75a1ddc4e26dcd0bbd557f8bd3b17b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167578 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/slideshow/qa/engine/engine.cxx b/slideshow/qa/engine/engine.cxx index ee7f705713b5..6644ddae0d4c 100644 --- a/slideshow/qa/engine/engine.cxx +++ b/slideshow/qa/engine/engine.cxx @@ -24,7 +24,7 @@ class Test : public UnoApiTest { public: Test() - : UnoApiTest("slideshow/qa/engine/data/") + : UnoApiTest(u"slideshow/qa/engine/data/"_ustr) { } }; diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index a548fd20f97e..6c50d3d03d3c 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -81,7 +81,7 @@ void AnimationAudioNode::activate_st() scheduleDeactivationEvent( makeDelay( [this] () { this->checkPlayingStatus(); }, mpPlayer->getDuration(), - "AnimationAudioNode::check if still playing with delay") ); + u"AnimationAudioNode::check if still playing with delay"_ustr) ); } } else @@ -90,7 +90,7 @@ void AnimationAudioNode::activate_st() auto self(getSelf()); scheduleDeactivationEvent( makeEvent( [self=std::move(self)] () { self->deactivate(); }, - "AnimationAudioNode::deactivate without delay") ); + u"AnimationAudioNode::deactivate without delay"_ustr) ); } } @@ -136,7 +136,7 @@ void AnimationAudioNode::deactivate_st( NodeState /*eDestState*/ ) // notify _after_ state change: getContext().mrEventQueue.addEvent( makeEvent( NotifyAudioStopped(getContext().mrEventMultiplexer, getSelf()), - "AnimationAudioNode::notifyAudioStopped") ); + u"AnimationAudioNode::notifyAudioStopped"_ustr) ); } bool AnimationAudioNode::hasPendingAnimation() const @@ -196,7 +196,7 @@ void AnimationAudioNode::checkPlayingStatus() scheduleDeactivationEvent( makeDelay( [xSelf=std::move(xSelf)] () { xSelf->deactivate(); }, nDuration, - "AnimationAudioNode::deactivate with delay") ); + u"AnimationAudioNode::deactivate with delay"_ustr) ); } } // namespace slideshow::internal diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 1a15bf2de843..cc0a9ac9fac0 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -458,7 +458,7 @@ AnimationBaseNode::fillCommonParameters() const EventSharedPtr pEndEvent; if (pSelf) { pEndEvent = makeEvent( [pSelf] () {pSelf->deactivate(); }, - "AnimationBaseNode::deactivate"); + u"AnimationBaseNode::deactivate"_ustr); } // Calculate the minimum frame count that depends on the duration and diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index 3c3a61450ba9..121989fa246e 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -41,7 +41,7 @@ bool IsTimingRootNode(const uno::Reference<animations::XAnimationNode>& xNode) { uno::Sequence<beans::NamedValue> aUserData = xNode->getUserData(); comphelper::SequenceAsHashMap aMap(aUserData); - auto it = aMap.find("node-type"); + auto it = aMap.find(u"node-type"_ustr); if (it == aMap.end()) { return false; @@ -201,7 +201,7 @@ void AnimationCommandNode::activate_st() std::shared_ptr<BaseNode> self(getSelf()); scheduleDeactivationEvent( makeEvent( [self=std::move(self)] () { self->deactivate(); }, - "AnimationCommandNode::deactivate" ) ); + u"AnimationCommandNode::deactivate"_ustr ) ); } bool AnimationCommandNode::hasPendingAnimation() const diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index 89747901e73c..45a6005c6f48 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -56,7 +56,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const pSelf, "cannot cast getSelf() to my type!" ); aParms.mpEndEvent = makeEvent( [pSelf] () { pSelf->scheduleDeactivationEvent(); }, - "AnimationSetNode::scheduleDeactivationEvent"); + u"AnimationSetNode::scheduleDeactivationEvent"_ustr); } switch (AnimationFactory::classifyAttributeName( attrName )) { diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index cbb68b024316..f246d9da90d8 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -46,8 +46,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const { default: throw css::uno::RuntimeException( - "AnimationTransformNode::createTransformActivity(): " - "Unknown transform type" ); + u"AnimationTransformNode::createTransformActivity(): " + "Unknown transform type"_ustr ); case animations::AnimationTransformType::TRANSLATE: case animations::AnimationTransformType::SCALE: @@ -64,7 +64,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - "Rotate", + u"Rotate"_ustr, rShape, getContext().mpSubsettableShapeManager, getSlideSize(), @@ -75,7 +75,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - "SkewX", + u"SkewX"_ustr, rShape, getContext().mpSubsettableShapeManager, getSlideSize(), @@ -86,7 +86,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - "SkewY", + u"SkewY"_ustr, rShape, getContext().mpSubsettableShapeManager, getSlideSize(), diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 709f5392ac8a..02e97261bbc7 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -172,7 +172,7 @@ bool BaseContainerNode::notifyDeactivatedChild( EventSharedPtr aRepetitionEvent = makeDelay( [this] () { this->repeat(); }, 0.0, - "BaseContainerNode::repeat"); + u"BaseContainerNode::repeat"_ustr); getContext().mrEventQueue.addEvent( aRepetitionEvent ); } else if (isDurationIndefinite()) diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 1da302008138..377520369997 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -245,7 +245,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - "node-type", + u"node-type"_ustr, uno::Any( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); @@ -476,7 +476,7 @@ bool BaseNode::resolve() mpCurrentEvent = makeDelay( [self=std::move(self)] () { self->activate(); }, mnStartDelay, - "AnimationNode::activate with delay"); + u"AnimationNode::activate with delay"_ustr); maContext.mrEventQueue.addEvent( mpCurrentEvent ); } @@ -730,7 +730,7 @@ void BaseNode::showState() const // read shape name OUString aName; - if( xPropSet->getPropertyValue("Name") >>= aName ) + if( xPropSet->getPropertyValue(u"Name"_ustr) >>= aName ) { SAL_INFO("slideshow.verbose", "Node info: n" << debugGetNodeName(this) << diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index 3622c5c70e53..8d6b1519ad30 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -101,7 +101,7 @@ EventSharedPtr generateEvent( if (aEvent.Source >>= xNode) { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, BEGIN_EVENT"); + u"generateEvent, BEGIN_EVENT"_ustr); rContext.mrUserEventQueue.registerAnimationStartEvent( pEvent, xNode ); } @@ -115,7 +115,7 @@ EventSharedPtr generateEvent( if (aEvent.Source >>= xNode) { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, END_EVENT"); + u"generateEvent, END_EVENT"_ustr); rContext.mrUserEventQueue.registerAnimationEndEvent( pEvent, xNode ); } @@ -131,7 +131,7 @@ EventSharedPtr generateEvent( { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_CLICK"); + u"generateEvent, ON_CLICK"_ustr); rContext.mrUserEventQueue.registerShapeClickEvent( pEvent, pShape ); } @@ -147,7 +147,7 @@ EventSharedPtr generateEvent( { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_DBL_CLICK"); + u"generateEvent, ON_DBL_CLICK"_ustr); rContext.mrUserEventQueue.registerShapeDoubleClickEvent( pEvent, pShape ); } @@ -163,7 +163,7 @@ EventSharedPtr generateEvent( { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_MOUSE_ENTER"); + u"generateEvent, ON_MOUSE_ENTER"_ustr); rContext.mrUserEventQueue.registerMouseEnterEvent( pEvent, pShape ); } @@ -179,7 +179,7 @@ EventSharedPtr generateEvent( { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_MOUSE_LEAVE"); + u"generateEvent, ON_MOUSE_LEAVE"_ustr); rContext.mrUserEventQueue.registerMouseLeaveEvent( pEvent, pShape ); } @@ -195,7 +195,7 @@ EventSharedPtr generateEvent( case animations::EventTrigger::ON_NEXT: pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_NEXT"); + u"generateEvent, ON_NEXT"_ustr); rContext.mrUserEventQueue.registerNextEffectEvent( pEvent ); break; case animations::EventTrigger::ON_STOP_AUDIO: @@ -203,7 +203,7 @@ EventSharedPtr generateEvent( if (aEvent.Source >>= xNode) { pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, - "generateEvent, ON_STOP_AUDIO"); + u"generateEvent, ON_STOP_AUDIO"_ustr); rContext.mrUserEventQueue.registerAudioStoppedEvent( pEvent, xNode ); } @@ -224,7 +224,7 @@ EventSharedPtr generateEvent( else if (rEventDescription >>= nDelay1) { pEvent = makeDelay( rFunctor, nDelay1 + nAdditionalDelay, - "generateEvent with delay"); + u"generateEvent with delay"_ustr); // schedule delay event rContext.mrEventQueue.addEvent( pEvent ); } diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx index 43d3f16d1fb3..77c5a19af551 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx @@ -40,7 +40,7 @@ void ParallelTimeContainer::activate_st() auto self(getSelf()); scheduleDeactivationEvent( makeEvent( [self=std::move(self)] () { self->deactivate(); }, - "ParallelTimeContainer::deactivate") ); + u"ParallelTimeContainer::deactivate"_ustr) ); } else { // use default scheduleDeactivationEvent(); diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 5b1eecf79d31..eee8eaf3ed21 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -44,7 +44,7 @@ void SequentialTimeContainer::activate_st() auto self(getSelf()); scheduleDeactivationEvent( makeEvent( [self=std::move(self)] () { self->deactivate(); }, - "SequentialTimeContainer::deactivate") ); + u"SequentialTimeContainer::deactivate"_ustr) ); } else // use default scheduleDeactivationEvent(); @@ -67,7 +67,7 @@ void SequentialTimeContainer::skipEffect( getContext().mrEventQueue.forceEmpty(); getContext().mrEventQueue.addEvent( makeEvent( [pChildNode] () { pChildNode->deactivate(); }, - "SequentialTimeContainer::deactivate, skipEffect with delay") ); + u"SequentialTimeContainer::deactivate, skipEffect with delay"_ustr) ); } else OSL_FAIL( "unknown notifier!" ); @@ -87,7 +87,7 @@ bool SequentialTimeContainer::resolveChild( std::bind( &SequentialTimeContainer::skipEffect, std::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ), - "SequentialTimeContainer::skipEffect, resolveChild"); + u"SequentialTimeContainer::skipEffect, resolveChild"_ustr); // deactivate child node when skip event occurs: getContext().mrUserEventQueue.registerSkipEffectEvent( diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index ceeae5bb25f4..4bfc8990673b 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -165,7 +165,7 @@ void EffectRewinder::setCurrentSlide ( sal_Int32 nChange(0); if( xPropSet.is()) - getPropertyValue( nChange, xPropSet, "Change"); + getPropertyValue( nChange, xPropSet, u"Change"_ustr); mbHasAdvancedTimeSetting = nChange; } @@ -206,7 +206,7 @@ bool EffectRewinder::rewind ( &EffectRewinder::asynchronousRewindToPreviousSlide, this, rPreviousSlideFunctor), - "EffectRewinder::asynchronousRewindToPreviousSlide"); + u"EffectRewinder::asynchronousRewindToPreviousSlide"_ustr); } else { @@ -219,7 +219,7 @@ bool EffectRewinder::rewind ( nSkipCount, true, rSlideRewindFunctor), - "EffectRewinder::asynchronousRewind"); + u"EffectRewinder::asynchronousRewind"_ustr); } if (mpAsynchronousRewindEvent) @@ -246,7 +246,7 @@ void EffectRewinder::skipAllMainSequenceEffects() nTotalMainSequenceEffectCount, false, ::std::function<void ()>()), - "EffectRewinder::asynchronousRewind"); + u"EffectRewinder::asynchronousRewind"_ustr); mrEventQueue.addEvent(mpAsynchronousRewindEvent); } @@ -363,7 +363,7 @@ void EffectRewinder::asynchronousRewind ( nEffectCount, false, rSlideRewindFunctor), - "EffectRewinder::asynchronousRewind"); + u"EffectRewinder::asynchronousRewind"_ustr); mrEventQueue.addEvent(mpAsynchronousRewindEvent); } else diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 441fb71ed184..89faf56853ee 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -393,7 +393,7 @@ void SAL_CALL EventMultiplexerListener::mousePressed( makeEvent( std::bind( &EventMultiplexerImpl::mousePressed, mpEventMultiplexer, e ), - "EventMultiplexerImpl::mousePressed") ); + u"EventMultiplexerImpl::mousePressed"_ustr) ); } void SAL_CALL EventMultiplexerListener::mouseReleased( @@ -408,7 +408,7 @@ void SAL_CALL EventMultiplexerListener::mouseReleased( makeEvent( std::bind( &EventMultiplexerImpl::mouseReleased, mpEventMultiplexer, e ), - "EventMultiplexerImpl::mouseReleased") ); + u"EventMultiplexerImpl::mouseReleased"_ustr) ); } void SAL_CALL EventMultiplexerListener::mouseEntered( @@ -436,7 +436,7 @@ void SAL_CALL EventMultiplexerListener::mouseDragged( makeEvent( std::bind( &EventMultiplexerImpl::mouseDragged, mpEventMultiplexer, e ), - "EventMultiplexerImpl::mouseDragged") ); + u"EventMultiplexerImpl::mouseDragged"_ustr) ); } void SAL_CALL EventMultiplexerListener::mouseMoved( @@ -451,7 +451,7 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( makeEvent( std::bind( &EventMultiplexerImpl::mouseMoved, mpEventMultiplexer, e ), - "EventMultiplexerImpl::mouseMoved") ); + u"EventMultiplexerImpl::mouseMoved"_ustr) ); } @@ -550,7 +550,7 @@ void EventMultiplexerImpl::scheduleTick() EventSharedPtr pEvent( makeDelay( [this] () { this->tick(); }, mnTimeout, - "EventMultiplexerImpl::tick with delay")); + u"EventMultiplexerImpl::tick with delay"_ustr)); // store weak reference to generated event, to notice when // the event queue gets cleansed (we then have to diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 99adca7f7bea..758b4a7d4d73 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -548,7 +548,7 @@ private: GLuint ReflectionTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "reflectionVertexShader", "reflectionFragmentShader" ); + return OpenGLHelper::LoadShaders( u"reflectionVertexShader"_ustr, u"reflectionFragmentShader"_ustr ); } void ReflectionTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, @@ -604,7 +604,7 @@ private: GLuint SimpleTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "basicFragmentShader" ); + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"basicFragmentShader"_ustr ); } void SimpleTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, @@ -1318,7 +1318,7 @@ private: GLuint FadeSmoothlyTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "fadeFragmentShader" ); + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"fadeFragmentShader"_ustr ); } std::shared_ptr<OGLTransitionImpl> @@ -1369,7 +1369,7 @@ private: GLuint FadeThroughColorTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "fadeBlackFragmentShader", + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"fadeBlackFragmentShader"_ustr, useWhite ? "#define use_white" : "", "" ); } @@ -1526,7 +1526,7 @@ private: GLuint StaticNoiseTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "staticFragmentShader" ); + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"staticFragmentShader"_ustr ); } std::shared_ptr<OGLTransitionImpl> @@ -1576,7 +1576,7 @@ private: GLuint DissolveTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "dissolveFragmentShader" ); + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"dissolveFragmentShader"_ustr ); } std::shared_ptr<OGLTransitionImpl> @@ -1665,7 +1665,7 @@ void VortexTransition::finishTransition() GLuint VortexTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "vortexVertexShader", "vortexFragmentShader", "vortexGeometryShader" ); + return OpenGLHelper::LoadShaders( u"vortexVertexShader"_ustr, u"vortexFragmentShader"_ustr, u"vortexGeometryShader"_ustr ); } glm::mat4 lookAt(const glm::vec3& eye, const glm::vec3& center, const glm::vec3& up) { @@ -1887,7 +1887,7 @@ private: GLuint RippleTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "basicVertexShader", "rippleFragmentShader" ); + return OpenGLHelper::LoadShaders( u"basicVertexShader"_ustr, u"rippleFragmentShader"_ustr ); } void RippleTransition::prepareTransition( sal_Int32, sal_Int32, OpenGLContext* ) @@ -1983,7 +1983,7 @@ private: GLuint GlitterTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "glitterVertexShader", "glitterFragmentShader" ); + return OpenGLHelper::LoadShaders( u"glitterVertexShader"_ustr, u"glitterFragmentShader"_ustr ); } struct ThreeFloats @@ -2109,7 +2109,7 @@ void HoneycombTransition::finishTransition() GLuint HoneycombTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "honeycombVertexShader", "honeycombFragmentShader", "honeycombGeometryShader" ); + return OpenGLHelper::LoadShaders( u"honeycombVertexShader"_ustr, u"honeycombFragmentShader"_ustr, u"honeycombGeometryShader"_ustr ); } void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 1f39faf95227..c9e62a6ad1ec 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -301,7 +301,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta return false; #if OSL_DEBUG_LEVEL > 0 - TimerContext aTimerContext("initWindowFromSlideShowView"); + TimerContext aTimerContext(u"initWindowFromSlideShowView"_ustr); #endif /// take the XSlideShowView and extract the parent window from it. see viewmediashape.cxx @@ -984,7 +984,7 @@ void OGLTransitionerImpl::GLInitSlides() return; #if OSL_DEBUG_LEVEL > 0 - TimerContext aTimerContext("texture creation"); + TimerContext aTimerContext(u"texture creation"_ustr); #endif mpContext->makeCurrent(); @@ -1167,11 +1167,11 @@ public: // XServiceInfo virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.presentation.TransitionFactory" }; + return { u"com.sun.star.presentation.TransitionFactory"_ustr }; } virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.presentation.OGLTransitionFactory"; + return u"com.sun.star.comp.presentation.OGLTransitionFactory"_ustr; } virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) override { diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 7afe8bca53f5..0d8295716092 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -56,7 +56,7 @@ public: WakeupEvent( std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitySharedPtr const& rActivity, ActivitiesQueue & rActivityQueue ) : - Event("WakeupEvent"), + Event(u"WakeupEvent"_ustr), maTimer(pTimeBase), mnNextTime(0.0), mpActivity(rActivity), @@ -162,7 +162,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte blackHole->SetMapMode(MapMode(MapUnit::MapPixel)); tools::Rectangle rect; const FontMetric metric( blackHole->GetFontMetric() ); - blackHole->GetTextBoundRect( rect, "XX:XX:XX" ); + blackHole->GetTextBoundRect( rect, u"XX:XX:XX"_ustr ); maSpriteSizePixel.setX( rect.getOpenWidth() * 12 / 10 ); maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 ); mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20)); diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 3028b6f44c85..e3e3fb9ccc88 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -142,8 +142,8 @@ namespace slideshow::internal sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue("Width") >>= nDocWidth; - xPropSet->getPropertyValue("Height") >>= nDocHeight; + xPropSet->getPropertyValue(u"Width"_ustr) >>= nDocWidth; + xPropSet->getPropertyValue(u"Height"_ustr) >>= nDocHeight; mpMtf = xMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index ea765eea9649..6713f3ab95c9 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -769,14 +769,14 @@ ActivityImpl::ActivityImpl( uno::Reference<drawing::XShape> const xShape( mpDrawShape->getXShape() ); uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW ); - getPropertyValue( meAnimKind, xProps, "TextAnimationKind" ); + getPropertyValue( meAnimKind, xProps, u"TextAnimationKind"_ustr ); OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE); mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE); // adopted from in AInfoBlinkText::ImplInit(): sal_Int16 nRepeat(0); - getPropertyValue( nRepeat, xProps, "TextAnimationCount" ); + getPropertyValue( nRepeat, xProps, u"TextAnimationCount"_ustr ); mnRepeat = nRepeat; if(mbAlternate) @@ -788,20 +788,20 @@ ActivityImpl::ActivityImpl( else { getPropertyValue( mbVisibleWhenStarted, xProps, - "TextAnimationStartInside" ); + u"TextAnimationStartInside"_ustr ); } // set visible when stopped getPropertyValue( mbVisibleWhenStopped, xProps, - "TextAnimatiogonStopInside" ); + u"TextAnimatiogonStopInside"_ustr ); // rotation: getPropertyValue( mfRotationAngle, xProps, - "RotateAngle" ); + u"RotateAngle"_ustr ); mfRotationAngle /= -100.0; // (switching direction) // set frequency sal_Int16 nDelay(0); - getPropertyValue( nDelay, xProps, "TextAnimationDelay" ); + getPropertyValue( nDelay, xProps, u"TextAnimationDelay"_ustr ); // set delay if not automatic mnFrequency = (nDelay ? nDelay : // default: @@ -821,10 +821,10 @@ ActivityImpl::ActivityImpl( } // Get animation direction - getPropertyValue( meDirection, xProps, "TextAnimationDirection" ); + getPropertyValue( meDirection, xProps, u"TextAnimationDirection"_ustr ); // Get step width. Negative means pixel, positive logical units - getPropertyValue( mnStepWidth, xProps, "TextAnimationAmount" ); + getPropertyValue( mnStepWidth, xProps, u"TextAnimationAmount"_ustr ); maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( mpListener ); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 644d2c337b58..cdeb03e34f7d 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -380,7 +380,7 @@ namespace slideshow::internal uno::UNO_QUERY ); if( xPropSet.is() ) getPropertyValue( eKind, xPropSet, - "TextAnimationKind" ); + u"TextAnimationKind"_ustr ); mbDrawingLayerAnim = (eKind != drawing::TextAnimationKind_NONE); // must NOT be called from within initializer list, uses diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index d4f55928562f..d2ba02bf6cff 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -177,20 +177,20 @@ GDIMetaFileSharedPtr getMetaFile( const uno::Reference< lang::XComponent >& drawing::GraphicExportFilter::create(rxContext); uno::Sequence< beans::PropertyValue > aFilterData{ - comphelper::makePropertyValue("ScrollText", + comphelper::makePropertyValue(u"ScrollText"_ustr, ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0)), - comphelper::makePropertyValue("ExportOnlyBackground", + comphelper::makePropertyValue(u"ExportOnlyBackground"_ustr, ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0)), - comphelper::makePropertyValue("Version", static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 )), + comphelper::makePropertyValue(u"Version"_ustr, static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 )), comphelper::makePropertyValue( - "CurrentPage", uno::Reference< uno::XInterface >( xContainingPage, + u"CurrentPage"_ustr, uno::Reference< uno::XInterface >( xContainingPage, uno::UNO_QUERY_THROW )) }; uno::Sequence< beans::PropertyValue > aProps{ - comphelper::makePropertyValue("FilterName", OUString("SVM")), - comphelper::makePropertyValue("GraphicRenderer", uno::Reference< graphic::XGraphicRenderer >(xRenderer)), - comphelper::makePropertyValue("FilterData", aFilterData) + comphelper::makePropertyValue(u"FilterName"_ustr, u"SVM"_ustr), + comphelper::makePropertyValue(u"GraphicRenderer"_ustr, uno::Reference< graphic::XGraphicRenderer >(xRenderer)), + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData) }; xExporter->setSourceDocument( xSource ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 9872427046d0..42eed1dc9952 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -57,7 +57,7 @@ std::unique_ptr<GraphicObject> importShapeGraphic(uno::Reference<beans::XPropert std::unique_ptr<GraphicObject> xRet; uno::Reference<graphic::XGraphic> xGraphic; - if (!getPropertyValue(xGraphic, xPropSet, "Graphic") || !xGraphic.is()) + if (!getPropertyValue(xGraphic, xPropSet, u"Graphic"_ustr) || !xGraphic.is()) { // no or empty property - cannot import shape graphic return xRet; @@ -118,7 +118,7 @@ ShapeOfGroup::ShapeOfGroup( ShapeSharedPtr const& pGroupSha mnPrio(nPrio) { // read bound rect - uno::Any const aTmpRect_( xPropSet->getPropertyValue( "BoundRect" )); + uno::Any const aTmpRect_( xPropSet->getPropertyValue( u"BoundRect"_ustr )); awt::Rectangle const aTmpRect( aTmpRect_.get<awt::Rectangle>() ); basegfx::B2DRectangle const groupPosSize( pGroupShape->getBounds() ); maPosOffset = basegfx::B2DPoint( aTmpRect.X - groupPosSize.getMinX(), @@ -223,7 +223,7 @@ ShapeSharedPtr ShapeImporter::createShape( // (Java)Applet shape. This is a special object return createAppletShape( xCurrShape, mnAscendingPrio, - "com.sun.star.comp.sfx2.AppletObject", + u"com.sun.star.comp.sfx2.AppletObject"_ustr, aPropertyValues, SAL_N_ELEMENTS(aPropertyValues), mrContext ); @@ -278,15 +278,15 @@ ShapeSharedPtr ShapeImporter::createShape( sal_Int16 nTransparency(0); sal_Int32 nRotation(0); - getPropertyValue( eColorMode, xPropSet, "GraphicColorMode" ); - getPropertyValue( nLuminance, xPropSet, "AdjustLuminance" ); - getPropertyValue( nContrast, xPropSet, "AdjustContrast" ); - getPropertyValue( nRed, xPropSet, "AdjustRed" ); - getPropertyValue( nGreen, xPropSet, "AdjustGreen" ); - getPropertyValue( nBlue, xPropSet, "AdjustBlue" ); - getPropertyValue( nGamma, xPropSet, "Gamma" ); - getPropertyValue( nTransparency, xPropSet, "Transparency" ); - getPropertyValue( nRotation, xPropSet, "RotateAngle" ); + getPropertyValue( eColorMode, xPropSet, u"GraphicColorMode"_ustr ); + getPropertyValue( nLuminance, xPropSet, u"AdjustLuminance"_ustr ); + getPropertyValue( nContrast, xPropSet, u"AdjustContrast"_ustr ); + getPropertyValue( nRed, xPropSet, u"AdjustRed"_ustr ); + getPropertyValue( nGreen, xPropSet, u"AdjustGreen"_ustr ); + getPropertyValue( nBlue, xPropSet, u"AdjustBlue"_ustr ); + getPropertyValue( nGamma, xPropSet, u"Gamma"_ustr ); + getPropertyValue( nTransparency, xPropSet, u"Transparency"_ustr ); + getPropertyValue( nRotation, xPropSet, u"RotateAngle"_ustr ); GraphicAttr aGraphAttrs; aGraphAttrs.SetDrawMode( static_cast<GraphicDrawMode>(eColorMode) ); @@ -300,7 +300,7 @@ ShapeSharedPtr ShapeImporter::createShape( aGraphAttrs.SetRotation( Degree10(static_cast<sal_Int16>(nRotation*10)) ); text::GraphicCrop aGraphCrop; - if( getPropertyValue( aGraphCrop, xPropSet, "GraphicCrop" )) + if( getPropertyValue( aGraphCrop, xPropSet, u"GraphicCrop"_ustr )) { aGraphAttrs.SetCrop( aGraphCrop.Left, aGraphCrop.Top, @@ -342,13 +342,13 @@ bool ShapeImporter::isSkip( bool bEmpty = false; if( getPropertyValue( bEmpty, xPropSet, - "IsEmptyPresentationObject") && + u"IsEmptyPresentationObject"_ustr) && bEmpty ) { // check object have fill or linestyle, if have, it should be visible drawing::FillStyle aFillStyle{ drawing::FillStyle_NONE }; if (getPropertyValue(aFillStyle, - xPropSet, "FillStyle") && + xPropSet, u"FillStyle"_ustr) && aFillStyle != drawing::FillStyle_NONE) { bEmpty = false; @@ -356,7 +356,7 @@ bool ShapeImporter::isSkip( drawing::LineStyle aLineStyle{ drawing::LineStyle_NONE }; if (bEmpty && getPropertyValue(aLineStyle, - xPropSet, "LineStyle") && + xPropSet, u"LineStyle"_ustr) && aLineStyle != drawing::LineStyle_NONE) { bEmpty = false; @@ -370,7 +370,7 @@ bool ShapeImporter::isSkip( if(xLayer.is()) { OUString layerName; - const uno::Any& a(xLayer->getPropertyValue("Name") ); + const uno::Any& a(xLayer->getPropertyValue(u"Name"_ustr) ); bool const bRet = (a >>= layerName); if(bRet) { @@ -402,9 +402,9 @@ void ShapeImporter::importPolygons(uno::Reference<beans::XPropertySet> const& xP drawing::PointSequenceSequence aRetval; sal_Int32 nLineColor=0; double fLineWidth; - getPropertyValue( aRetval, xPropSet, "PolyPolygon" ); - getPropertyValue( nLineColor, xPropSet, "LineColor" ); - getPropertyValue( fLineWidth, xPropSet, "LineWidth" ); + getPropertyValue( aRetval, xPropSet, u"PolyPolygon"_ustr ); + getPropertyValue( nLineColor, xPropSet, u"LineColor"_ustr ); + getPropertyValue( fLineWidth, xPropSet, u"LineWidth"_ustr ); const drawing::PointSequence* pOuterSequence = aRetval.getArray(); diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 55ca3880fa2d..a3878ed53b36 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -121,7 +121,7 @@ namespace slideshow::internal uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xParentWindow( - xPropSet->getPropertyValue("Window"), + xPropSet->getPropertyValue(u"Window"_ustr), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory> xFactory( diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f91972f8fe40..83acbd7e5207 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -168,7 +168,7 @@ namespace slideshow::internal uno::Reference< beans::XPropertySet > xPropSet( mxShape, uno::UNO_QUERY ); if (xPropSet.is()) { - xPropSet->getPropertyValue("FallbackGraphic") >>= xGraphic; + xPropSet->getPropertyValue(u"FallbackGraphic"_ustr) >>= xGraphic; } Graphic aGraphic(xGraphic); @@ -217,7 +217,7 @@ namespace slideshow::internal if( xPropSet.is() && getPropertyValue( xParentWindow, xPropSet, - "Window") ) + u"Window"_ustr) ) { const awt::Rectangle aRect( xParentWindow->getPosSize() ); @@ -286,13 +286,13 @@ namespace slideshow::internal if (xPropSet.is()) { OUString aURL; - xPropSet->getPropertyValue("MediaMimeType") >>= sMimeType; - if ((xPropSet->getPropertyValue("PrivateTempFileURL") >>= aURL) + xPropSet->getPropertyValue(u"MediaMimeType"_ustr) >>= sMimeType; + if ((xPropSet->getPropertyValue(u"PrivateTempFileURL"_ustr) >>= aURL) && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL, sMimeType ); } - else if (xPropSet->getPropertyValue("MediaURL") >>= aURL) + else if (xPropSet->getPropertyValue(u"MediaURL"_ustr) >>= aURL) { implInitializeMediaPlayer( aURL, sMimeType ); } @@ -337,19 +337,19 @@ namespace slideshow::internal bool bLoop( false ); getPropertyValue( bLoop, rxProps, - "Loop"); + u"Loop"_ustr); mxPlayer->setPlaybackLoop( bLoop ); bool bMute( false ); getPropertyValue( bMute, rxProps, - "Mute"); + u"Mute"_ustr); mxPlayer->setMute( bMute || !mbIsSoundEnabled); sal_Int16 nVolumeDB(0); getPropertyValue( nVolumeDB, rxProps, - "VolumeDB"); + u"VolumeDB"_ustr); mxPlayer->setVolumeDB( nVolumeDB ); if( mxPlayerWindow.is() ) @@ -357,7 +357,7 @@ namespace slideshow::internal media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW); getPropertyValue( eZoom, rxProps, - "Zoom"); + u"Zoom"_ustr); mxPlayerWindow->setZoomLevel( eZoom ); } } @@ -376,7 +376,7 @@ namespace slideshow::internal { if( !rMediaURL.isEmpty() ) { - mxPlayer = avmedia::MediaWindow::createPlayer( rMediaURL, ""/*TODO!*/, &rMimeType ); + mxPlayer = avmedia::MediaWindow::createPlayer( rMediaURL, u""_ustr/*TODO!*/, &rMimeType ); } } catch( uno::RuntimeException& ) diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 4f7cf5654d34..436822f0ae2a 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1076,8 +1076,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue("Width") >>= nDocWidth; - xPropSet->getPropertyValue("Height") >>= nDocHeight; + xPropSet->getPropertyValue(u"Width"_ustr) >>= nDocWidth; + xPropSet->getPropertyValue(u"Height"_ustr) >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 80f41cc4c795..c0d6b38bfef7 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -300,7 +300,7 @@ namespace slideshow::internal 1, beans::NamedValue( //xAnimateNode->getAttributeName(), - "visibility", + u"visibility"_ustr, uno::Any( bVisible ) ) ) ); break; } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 1acc020414db..61f2f6345d1f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -525,7 +525,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, // shape), which would cause a flicker. mrEventQueue.addEventForNextRound( makeEvent( [this] () { this->mrShow.notifySlideAnimationsEnded(); }, - "SlideShowImpl::notifySlideAnimationsEnded")); + u"SlideShowImpl::notifySlideAnimationsEnded"_ustr)); return true; } @@ -610,7 +610,7 @@ SlideShowImpl::SlideShowImpl( // #i82460# try to retrieve special transition factory mxOptionalTransitionFactory.set( xFactory->createInstanceWithContext( - "com.sun.star.presentation.TransitionFactory", + u"com.sun.star.presentation.TransitionFactory"_ustr, mxComponentContext ), uno::UNO_QUERY ); } @@ -692,12 +692,12 @@ void SlideShowImpl::disposing() uno::Sequence< OUString > SAL_CALL SlideShowImpl::getSupportedServiceNames() { - return { "com.sun.star.presentation.SlideShow" }; + return { u"com.sun.star.presentation.SlideShow"_ustr }; } OUString SAL_CALL SlideShowImpl::getImplementationName() { - return "com.sun.star.comp.presentation.SlideShow"; + return u"com.sun.star.comp.presentation.SlideShow"_ustr; } sal_Bool SAL_CALL SlideShowImpl::supportsService(const OUString& aServiceName) @@ -779,7 +779,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int16 nTransitionType(0); if( !getPropertyValue( nTransitionType, xPropSet, - "TransitionType") ) + u"TransitionType"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "Could not extract slide transition type from XDrawPage - assuming no transition" ); @@ -789,7 +789,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int16 nTransitionSubType(0); if( !getPropertyValue( nTransitionSubType, xPropSet, - "TransitionSubtype") ) + u"TransitionSubtype"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "Could not extract slide transition subtype from XDrawPage - assuming no transition" ); @@ -799,7 +799,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( bool bTransitionDirection(false); if( !getPropertyValue( bTransitionDirection, xPropSet, - "TransitionDirection") ) + u"TransitionDirection"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "Could not extract slide transition direction from XDrawPage - assuming default direction" ); @@ -808,7 +808,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int32 aUnoColor(0); if( !getPropertyValue( aUnoColor, xPropSet, - "TransitionFadeColor") ) + u"TransitionFadeColor"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "Could not extract slide transition fade color from XDrawPage - assuming black" ); @@ -819,10 +819,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( uno::Any aSound; bool bLoopSound = false; - if( !getPropertyValue( aSound, xPropSet, "Sound") ) + if( !getPropertyValue( aSound, xPropSet, u"Sound"_ustr) ) SAL_INFO("slideshow", "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" ); - if( !getPropertyValue( bLoopSound, xPropSet, "LoopSound" ) ) + if( !getPropertyValue( bLoopSound, xPropSet, u"LoopSound"_ustr ) ) SAL_INFO("slideshow", "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" ); NumberAnimationSharedPtr pTransition( @@ -848,7 +848,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( double nTransitionDuration(0.0); if( !getPropertyValue( nTransitionDuration, xPropSet, - "TransitionDuration") ) + u"TransitionDuration"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "Could not extract slide transition duration from XDrawPage - assuming no transition" ); @@ -858,7 +858,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int32 nMinFrames(5); if( !getPropertyValue( nMinFrames, xPropSet, - "MinimalFrameNumber") ) + u"MinimalFrameNumber"_ustr) ) { SAL_INFO("slideshow", "createSlideTransition(): " "No minimal number of frames given - assuming 5" ); @@ -870,7 +870,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( maEventQueue.addEvent( makeEvent( [pTransition] () { pTransition->prefetch(); }, - "Animation::prefetch")); + u"Animation::prefetch"_ustr)); return ActivitySharedPtr( ActivitiesFactory::createSimpleActivity( @@ -1147,7 +1147,7 @@ void SlideShowImpl::displaySlide( mpCurrentSlide, makeEvent( [this] () { this->notifySlideTransitionEnded(false); }, - "SlideShowImpl::notifySlideTransitionEnded"))); + u"SlideShowImpl::notifySlideTransitionEnded"_ustr))); if (bSkipSlideTransition) { @@ -1170,7 +1170,7 @@ void SlideShowImpl::displaySlide( maEventQueue.addEvent( makeEvent( [this] () { this->notifySlideTransitionEnded(true); }, - "SlideShowImpl::notifySlideTransitionEnded")); + u"SlideShowImpl::notifySlideTransitionEnded"_ustr)); } } } // finally @@ -1207,7 +1207,7 @@ void SlideShowImpl::redisplayCurrentSlide() // effect start event right away. maEventQueue.addEvent( makeEvent( [this] () { this->notifySlideTransitionEnded(true); }, - "SlideShowImpl::notifySlideTransitionEnded")); + u"SlideShowImpl::notifySlideTransitionEnded"_ustr)); maListenerContainer.forEach( [](uno::Reference<presentation::XSlideShowListener> const& xListener) @@ -1433,30 +1433,30 @@ void lcl_setPropertiesToShape(const drawing::PointSequenceSequence& rPoints, //Give the built PointSequenceSequence. uno::Any aParam; aParam <<= rPoints; - aXPropSet->setPropertyValue("PolyPolygon", aParam); + aXPropSet->setPropertyValue(u"PolyPolygon"_ustr, aParam); //LineStyle : SOLID by default drawing::LineStyle eLS; eLS = drawing::LineStyle_SOLID; - aXPropSet->setPropertyValue("LineStyle", uno::Any(eLS)); + aXPropSet->setPropertyValue(u"LineStyle"_ustr, uno::Any(eLS)); //LineCap : ROUND by default, same as in show mode drawing::LineCap eLC; eLC = drawing::LineCap_ROUND; - aXPropSet->setPropertyValue("LineCap", uno::Any(eLC)); + aXPropSet->setPropertyValue(u"LineCap"_ustr, uno::Any(eLC)); //LineColor sal_uInt32 nLineColor = 0; if (pCanvasPolyPoly) nLineColor = pCanvasPolyPoly->getRGBALineColor(); //Transform polygon color from RRGGBBAA to AARRGGBB - aXPropSet->setPropertyValue("LineColor", uno::Any(RGBAColor2UnoColor(nLineColor))); + aXPropSet->setPropertyValue(u"LineColor"_ustr, uno::Any(RGBAColor2UnoColor(nLineColor))); //LineWidth double fLineWidth = 0; if (pCanvasPolyPoly) fLineWidth = pCanvasPolyPoly->getStrokeWidth(); - aXPropSet->setPropertyValue("LineWidth", uno::Any(static_cast<sal_Int32>(fLineWidth))); + aXPropSet->setPropertyValue(u"LineWidth"_ustr, uno::Any(static_cast<sal_Int32>(fLineWidth))); } void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) @@ -1479,7 +1479,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult // create layer uno::Reference< drawing::XLayer > xDrawnInSlideshow; uno::Any aPropLayer; - OUString sLayerName = "DrawnInSlideshow"; + OUString sLayerName = u"DrawnInSlideshow"_ustr; if (xNameAccess->hasByName(sLayerName)) { xNameAccess->getByName(sLayerName) >>= xDrawnInSlideshow; @@ -1488,16 +1488,16 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { xDrawnInSlideshow = xLayerManager->insertNewByIndex(xLayerManager->getCount()); aPropLayer <<= sLayerName; - xDrawnInSlideshow->setPropertyValue("Name", aPropLayer); + xDrawnInSlideshow->setPropertyValue(u"Name"_ustr, aPropLayer); } // ODF defaults from ctor of SdrLayer are not automatically set on the here // created XLayer. Need to be done explicitly here. aPropLayer <<= true; - xDrawnInSlideshow->setPropertyValue("IsVisible", aPropLayer); - xDrawnInSlideshow->setPropertyValue("IsPrintable", aPropLayer); + xDrawnInSlideshow->setPropertyValue(u"IsVisible"_ustr, aPropLayer); + xDrawnInSlideshow->setPropertyValue(u"IsPrintable"_ustr, aPropLayer); aPropLayer <<= false; - xDrawnInSlideshow->setPropertyValue("IsLocked", aPropLayer); + xDrawnInSlideshow->setPropertyValue(u"IsLocked"_ustr, aPropLayer); //Register polygons for each slide // The polygons are simplified using the Ramer-Douglas-Peucker algorithm. @@ -1550,7 +1550,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult // Put what we have collected to the slide and then start a new pen drawing object //create the PolyLineShape. The points will be in its PolyPolygon property. uno::Reference<uno::XInterface> polyshape( - xDocFactory->createInstance("com.sun.star.drawing.PolyLineShape")); + xDocFactory->createInstance(u"com.sun.star.drawing.PolyLineShape"_ustr)); uno::Reference<drawing::XShape> rPolyShape(polyshape, uno::UNO_QUERY); //Add the shape to the slide Shapes->add(rPolyShape); @@ -1575,7 +1575,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { //create the PolyLineShape. The points will be in its PolyPolygon property. uno::Reference<uno::XInterface> polyshape( - xDocFactory->createInstance("com.sun.star.drawing.PolyLineShape")); + xDocFactory->createInstance(u"com.sun.star.drawing.PolyLineShape"_ustr)); uno::Reference<drawing::XShape> rPolyShape(polyshape, uno::UNO_QUERY); //Add the shape to the slide Shapes->add(rPolyShape); @@ -2278,7 +2278,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD if( !xPropSet.is() || !getPropertyValue( nChange, xPropSet, - "Change") ) + u"Change"_ustr) ) { SAL_INFO("slideshow", "queryAutomaticSlideTransition(): " @@ -2290,7 +2290,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD if( !xPropSet.is() || !getPropertyValue( nAutomaticNextSlideTimeout, xPropSet, - "HighResDuration") ) + u"HighResDuration"_ustr) ) { SAL_INFO("slideshow", "queryAutomaticSlideTransition(): " @@ -2363,7 +2363,7 @@ void SlideShowImpl::notifySlideAnimationsEnded() // timeout involved. aNotificationEvents.mpImmediateEvent = makeEvent( [this] () { this->notifySlideEnded(false); }, - "SlideShowImpl::notifySlideEnded"); + u"SlideShowImpl::notifySlideEnded"_ustr); } } @@ -2427,10 +2427,10 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) if (xPropSet.is()) { xPropSet->setPropertyValue( - "Change", + u"Change"_ustr, uno::Any( static_cast<sal_Int32>(1) ) ); xPropSet->setPropertyValue( - "Duration", + u"Duration"_ustr, uno::Any( static_cast<sal_Int32>(time) ) ); } } diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 2b84a0f75542..0a168a4cda7a 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -1084,7 +1084,7 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ ) mrEventQueue.addEvent( makeEvent( WeakRefWrapper(*this, [] (SlideView & rThis) { rThis.mrEventMultiplexer.notifyViewChanged(rThis.mxView); }), - "EventMultiplexer::notifyViewChanged")); + u"EventMultiplexer::notifyViewChanged"_ustr)); } // XPaintListener @@ -1099,7 +1099,7 @@ void SlideView::windowPaint( const awt::PaintEvent& /*e*/ ) mrEventQueue.addEvent( makeEvent( WeakRefWrapper(*this, [] (SlideView & rThis) { rThis.mrEventMultiplexer.notifyViewClobbered(rThis.mxView); }), - "EventMultiplexer::notifyViewClobbered") ); + u"EventMultiplexer::notifyViewClobbered"_ustr) ); } void SlideView::updateCanvas() diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 96bf9d387e3a..908610fea948 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -102,7 +102,7 @@ namespace slideshow::internal } const INetURLObject aURL( mpMediaTempFile ? mpMediaTempFile->m_TempFileURL : rSoundURL ); mxPlayer = avmedia::MediaWindow::createPlayer( - aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), ""/*TODO!*/ ); + aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), u""_ustr/*TODO!*/ ); } catch( uno::RuntimeException& ) { diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 13cf471a985c..1234b8bae27d 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -721,7 +721,7 @@ namespace slideshow::internal uno::UNO_QUERY_THROW ); // read bound rect awt::Rectangle aTmpRect; - if( !(xPropSet->getPropertyValue("BoundRect") >>= aTmpRect) ) + if( !(xPropSet->getPropertyValue(u"BoundRect"_ustr) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2df1b55a692a..8880e100b893 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -321,7 +321,7 @@ AnimationActivitySharedPtr createShapeTransitionByType( pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, AnimationFactory::createNumberPropertyAnimation( - "Opacity", + u"Opacity"_ustr, rShape, rShapeManager, rSlideSize, diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 6841a3a77f99..cdca145151ba 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -257,7 +257,7 @@ private: return mrEventQueue.addEventWhenQueueIsEmpty( makeEvent( [this] () { this->mrEventMultiplexer.notifyNextEffect(); - }, "EventMultiplexer::notifyNextEffect") ); + }, u"EventMultiplexer::notifyNextEffect"_ustr) ); } else return true; diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx index 9658661dc785..0bbadc894fca 100644 --- a/slideshow/source/engine/wakeupevent.cxx +++ b/slideshow/source/engine/wakeupevent.cxx @@ -29,7 +29,7 @@ namespace slideshow::internal WakeupEvent::WakeupEvent( std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase, ActivitiesQueue& rActivityQueue ) : - Event("WakeupEvent"), + Event(u"WakeupEvent"_ustr), maTimer(pTimeBase), mnNextTime(0.0), mpActivity(), diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index 8d9d9d087c6f..2cbb9d919dff 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -38,7 +38,7 @@ namespace slideshow::internal public: DelayFacade( EventSharedPtr xEvent, double nTimeout ) : - Event("DelayFacade"), + Event(u"DelayFacade"_ustr), mpEvent(std::move( xEvent )), mnTimeout( nTimeout ) { commit 3c76913a5a8fa73f06197dc6b69ba6f4b7a9b33f Author: Noel Grandin <[email protected]> AuthorDate: Mon May 13 09:51:48 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon May 13 14:43:56 2024 +0200 loplugin:ostr in sccomp Change-Id: I45243c0616a70d140293619f57221a609bf473f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167577 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx b/sccomp/qa/unit/SwarmSolverTest.cxx index a0b4203cebf1..f1104fa081a8 100644 --- a/sccomp/qa/unit/SwarmSolverTest.cxx +++ b/sccomp/qa/unit/SwarmSolverTest.cxx @@ -30,7 +30,7 @@ class SwarmSolverTest : public UnoApiTest public: SwarmSolverTest() - : UnoApiTest("sccomp/qa/unit/data") + : UnoApiTest(u"sccomp/qa/unit/data"_ustr) { } @@ -54,7 +54,7 @@ void SwarmSolverTest::testUnconstrained() uno::Reference<sheet::XSolver> xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -97,7 +97,7 @@ void SwarmSolverTest::testVariableBounded() uno::Reference<sheet::XSolver> xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -142,7 +142,7 @@ void SwarmSolverTest::testVariableConstrained() uno::Reference<sheet::XSolver> xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -190,7 +190,7 @@ void SwarmSolverTest::testTwoVariables() uno::Reference<sheet::XSolver> xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 5); @@ -242,11 +242,11 @@ void SwarmSolverTest::testMultipleVariables() uno::Reference<sheet::XSolver> xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropSet(xSolver, uno::UNO_QUERY_THROW); - xPropSet->setPropertyValue("Integer", uno::Any(true)); + xPropSet->setPropertyValue(u"Integer"_ustr, uno::Any(true)); table::CellAddress aObjective(0, 5, 7); diff --git a/sccomp/qa/unit/solver.cxx b/sccomp/qa/unit/solver.cxx index a339eab4db6f..536df7425bb9 100644 --- a/sccomp/qa/unit/solver.cxx +++ b/sccomp/qa/unit/solver.cxx @@ -52,7 +52,7 @@ void LpSolverTest::setUp() test::BootstrapFixture::setUp(); uno::Reference<frame::XDesktop2> xComponentLoader = frame::Desktop::create(m_xContext); uno::Reference<lang::XComponent> xComponent(xComponentLoader->loadComponentFromURL( - "private:factory/scalc", "_blank", 0, + u"private:factory/scalc"_ustr, u"_blank"_ustr, 0, uno::Sequence < css::beans::PropertyValue >())); m_xDocument.set(xComponent, uno::UNO_QUERY_THROW); } @@ -67,14 +67,14 @@ void LpSolverTest::tearDown() #ifdef ENABLE_LPSOLVE void LpSolverTest::testLpSolver() { - testSolver("com.sun.star.comp.Calc.LpsolveSolver"); + testSolver(u"com.sun.star.comp.Calc.LpsolveSolver"_ustr); } #endif #ifdef ENABLE_COINMP void LpSolverTest::testCoinMPSolver() { - testSolver("com.sun.star.comp.Calc.CoinMPSolver"); + testSolver(u"com.sun.star.comp.Calc.CoinMPSolver"_ustr); } #endif diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index 97ed9005be82..53a787e4721c 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -46,7 +46,7 @@ private: virtual void SAL_CALL solve() override; virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.CoinMPSolver"; + return u"com.sun.star.comp.Calc.CoinMPSolver"_ustr; } virtual OUString SAL_CALL getComponentDescription() override { diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index 9a21ea43a2b6..e80bd87e1a41 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -76,7 +76,7 @@ private: virtual void SAL_CALL solve() override; virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.LpsolveSolver"; + return u"com.sun.star.comp.Calc.LpsolveSolver"_ustr; } virtual OUString SAL_CALL getComponentDescription() override { diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index 318a05703944..b7038090e56c 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -247,7 +247,7 @@ sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames() { - return { "com.sun.star.sheet.Solver" }; + return { u"com.sun.star.sheet.Solver"_ustr }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx index 6c847d1e561f..2365bfe337e9 100644 --- a/sccomp/source/solver/SwarmSolver.cxx +++ b/sccomp/source/solver/SwarmSolver.cxx @@ -145,13 +145,13 @@ public: , mbSuccess(false) , mfResultValue(0.0) { - registerProperty("NonNegative", PROP_NONNEGATIVE, 0, &mbNonNegative, + registerProperty(u"NonNegative"_ustr, PROP_NONNEGATIVE, 0, &mbNonNegative, cppu::UnoType<decltype(mbNonNegative)>::get()); - registerProperty("Integer", PROP_INTEGER, 0, &mbInteger, + registerProperty(u"Integer"_ustr, PROP_INTEGER, 0, &mbInteger, cppu::UnoType<decltype(mbInteger)>::get()); - registerProperty("Timeout", PROP_TIMEOUT, 0, &mnTimeout, + registerProperty(u"Timeout"_ustr, PROP_TIMEOUT, 0, &mnTimeout, cppu::UnoType<decltype(mnTimeout)>::get()); - registerProperty("Algorithm", PROP_ALGORITHM, 0, &mnAlgorithm, + registerProperty(u"Algorithm"_ustr, PROP_ALGORITHM, 0, &mnAlgorithm, cppu::UnoType<decltype(mnAlgorithm)>::get()); } @@ -252,7 +252,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.SwarmSolver"; + return u"com.sun.star.comp.Calc.SwarmSolver"_ustr; } sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override @@ -262,7 +262,7 @@ public: uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.sheet.Solver" }; + return { u"com.sun.star.sheet.Solver"_ustr }; } private: commit 5c76b36437625cb533b9e2c28aa0dc2c41630b22 Author: Noel Grandin <[email protected]> AuthorDate: Mon May 13 09:51:32 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon May 13 14:43:49 2024 +0200 loplugin:ostr in scripting Change-Id: Idde1ec2254cebc9acd8aab092e52632b1625877f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167576 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index d4e4f9e79539..d0e1d8d93c54 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -189,7 +189,7 @@ namespace basprov if ( aFunctionName != BASPROV_PROPERTY_EDITABLE ) { throw IllegalArgumentException( - "BasicMethodNodeImpl::invoke: function name not supported!", + u"BasicMethodNodeImpl::invoke: function name not supported!"_ustr, Reference< XInterface >(), 1 ); } @@ -240,13 +240,13 @@ namespace basprov Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create( m_xContext ) ); Sequence < PropertyValue > aArgs{ - comphelper::makePropertyValue("Document", sDocURL), - comphelper::makePropertyValue("LibName", sLibName), - comphelper::makePropertyValue("Name", sModName), - comphelper::makePropertyValue("Type", OUString("Module")), - comphelper::makePropertyValue("Line", static_cast< sal_uInt32 >( nLine1 )) + comphelper::makePropertyValue(u"Document"_ustr, sDocURL), + comphelper::makePropertyValue(u"LibName"_ustr, sLibName), + comphelper::makePropertyValue(u"Name"_ustr, sModName), + comphelper::makePropertyValue(u"Type"_ustr, u"Module"_ustr), + comphelper::makePropertyValue(u"Line"_ustr, static_cast< sal_uInt32 >( nLine1 )) }; - xHelper->executeDispatch( xProv, ".uno:BasicIDEAppear", OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, u".uno:BasicIDEAppear"_ustr, OUString(), 0, aArgs ); } } @@ -258,14 +258,14 @@ namespace basprov void BasicMethodNodeImpl::setValue( const OUString&, const Any& ) { throw UnknownPropertyException( - "BasicMethodNodeImpl::setValue: property name is unknown!" ); + u"BasicMethodNodeImpl::setValue: property name is unknown!"_ustr ); } Any BasicMethodNodeImpl::getValue( const OUString& ) { throw UnknownPropertyException( - "BasicMethodNodeImpl::getValue: property name is unknown!" ); + u"BasicMethodNodeImpl::getValue: property name is unknown!"_ustr ); } diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index cafd4daa76d0..0271ddaab64c 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -146,7 +146,7 @@ namespace basprov // XServiceInfo OUString BasicProviderImpl::getImplementationName( ) { - return "com.sun.star.comp.scripting.ScriptProviderForBasic"; + return u"com.sun.star.comp.scripting.ScriptProviderForBasic"_ustr; } sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) @@ -157,10 +157,10 @@ namespace basprov Sequence< OUString > BasicProviderImpl::getSupportedServiceNames( ) { return { - "com.sun.star.script.provider.ScriptProviderForBasic", - "com.sun.star.script.provider.LanguageScriptProvider", - "com.sun.star.script.provider.ScriptProvider", - "com.sun.star.script.browse.BrowseNode"}; + u"com.sun.star.script.provider.ScriptProviderForBasic"_ustr, + u"com.sun.star.script.provider.LanguageScriptProvider"_ustr, + u"com.sun.star.script.provider.ScriptProvider"_ustr, + u"com.sun.star.script.browse.BrowseNode"_ustr}; } @@ -176,7 +176,7 @@ namespace basprov if ( aArguments.getLength() != 1 ) { throw IllegalArgumentException( - "BasicProviderImpl::initialize: incorrect argument count.", + u"BasicProviderImpl::initialize: incorrect argument count."_ustr, *this, 1 ); @@ -191,7 +191,7 @@ namespace basprov if ( !xModel.is() ) { throw IllegalArgumentException( - "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context.", + u"BasicProviderImpl::initialize: unable to determine the document model from the script invocation context."_ustr, *this, 1 ); @@ -277,13 +277,13 @@ namespace basprov throw provider::ScriptFrameworkErrorException( "BasicProviderImpl::getScript: failed to parse URI: " + scriptURI, Reference< XInterface >(), - scriptURI, "Basic", + scriptURI, u"Basic"_ustr, provider::ScriptFrameworkErrorType::MALFORMED_URL ); } OUString aDescription = sfUri->getName(); - OUString aLocation = sfUri->getParameter( "location" ); + OUString aLocation = sfUri->getParameter( u"location"_ustr ); sal_Int32 nIndex = 0; // In some strange circumstances the Library name can have an @@ -360,7 +360,7 @@ namespace basprov "method: '" + aMethod + "' " "location: '" + aLocation + "' ", Reference< XInterface >(), - scriptURI, "Basic", + scriptURI, u"Basic"_ustr, provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } @@ -373,7 +373,7 @@ namespace basprov OUString BasicProviderImpl::getName( ) { - return "Basic"; + return u"Basic"_ustr; } diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 35eb04f8d29f..5f124d1c3d80 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -194,10 +194,10 @@ constexpr OUString BASSCRIPT_PROPERTY_CALLER = u"Caller"_ustr; if ( nParamsCount < nSbxCount - nSbxOptional ) { throw provider::ScriptFrameworkErrorException( - "wrong number of parameters!", + u"wrong number of parameters!"_ustr, Reference< XInterface >(), m_funcName, - "Basic", + u"Basic"_ustr, provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } @@ -250,7 +250,7 @@ constexpr OUString BASSCRIPT_PROPERTY_CALLER = u"Caller"_ustr; // if it's a document-based script, temporarily reset ThisComponent to the script invocation context Any aOldThisComponent; if ( m_documentBasicManager && m_xDocumentScriptContext.is() ) - m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", Any( m_xDocumentScriptContext ), &aOldThisComponent ); + m_documentBasicManager->SetGlobalUNOConstant( u"ThisComponent"_ustr, Any( m_xDocumentScriptContext ), &aOldThisComponent ); if ( m_caller.hasElements() && m_caller[ 0 ].hasValue() ) { @@ -262,7 +262,7 @@ constexpr OUString BASSCRIPT_PROPERTY_CALLER = u"Caller"_ustr; nErr = m_xMethod->Call( xReturn.get() ); if ( m_documentBasicManager && m_xDocumentScriptContext.is() ) - m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent ); + m_documentBasicManager->SetGlobalUNOConstant( u"ThisComponent"_ustr, aOldThisComponent ); if ( nErr != ERRCODE_NONE ) { diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index ceb46f53c103..7bd62f614fef 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -139,7 +139,7 @@ void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& // com.sun.star.uno.XServiceInfo: OUString SAL_CALL DialogModelProvider::getImplementationName() { - return "com.sun.star.comp.scripting.DialogModelProvider"; + return u"com.sun.star.comp.scripting.DialogModelProvider"_ustr; } sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) @@ -149,7 +149,7 @@ sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceN css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() { - return { "com.sun.star.awt.UnoControlDialogModelProvider" }; + return { u"com.sun.star.awt.UnoControlDialogModelProvider"_ustr }; } } // closing anonymous implementation namespace diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 53c2e5b67406..30cade77c880 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -115,7 +115,7 @@ namespace dlgprov if ( xSMgr.is() ) { args.getArray()[0] <<= xModel; - mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY ); + mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( u"ooo.vba.EventListener"_ustr, args, m_xContext ), UNO_QUERY ); } if ( !rxControl.is() ) return; @@ -123,9 +123,9 @@ namespace dlgprov try { Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW ); - xProps->getPropertyValue("Name") >>= msDialogCodeName; + xProps->getPropertyValue(u"Name"_ustr) >>= msDialogCodeName; xProps.set( mxListener, UNO_QUERY_THROW ); - xProps->setPropertyValue("Model", args[ 0 ] ); + xProps->setPropertyValue(u"Model"_ustr, args[ 0 ] ); } catch( const Exception& ) { @@ -161,26 +161,26 @@ namespace dlgprov // key listeners by protocol when ScriptType = 'Script' // otherwise key is the ScriptType e.g. StarBasic if ( rxRTLListener.is() ) // set up handler for RTL_BASIC - listenersForTypes[ OUString("StarBasic") ] = rxRTLListener; + listenersForTypes[ u"StarBasic"_ustr ] = rxRTLListener; else - listenersForTypes[ OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); + listenersForTypes[ u"StarBasic"_ustr ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); // handler for Script & OUString("vnd.sun.star.UNO:") - listenersForTypes[ OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); - listenersForTypes[ OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); + listenersForTypes[ u"vnd.sun.star.UNO"_ustr ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); + listenersForTypes[ u"vnd.sun.star.script"_ustr ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); // determine the VBA compatibility mode from the Basic library container try { uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW ); uno::Reference< script::vba::XVBACompatibility > xVBACompat( - xModelProps->getPropertyValue("BasicLibraries"), uno::UNO_QUERY_THROW ); + xModelProps->getPropertyValue(u"BasicLibraries"_ustr), uno::UNO_QUERY_THROW ); mbUseFakeVBAEvents = xVBACompat->getVBACompatibilityMode(); } catch( uno::Exception& ) { } if ( mbUseFakeVBAEvents ) - listenersForTypes[ OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); + listenersForTypes[ u"VBAInterop"_ustr ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); } @@ -203,7 +203,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext("ooo.vba.VBAToOOEventDesc", m_xContext ), UNO_QUERY ); + Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext(u"ooo.vba.VBAToOOEventDesc"_ustr, m_xContext ), UNO_QUERY ); if ( xVBAToOOEvtDesc.is() ) xEventsSupplier = xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ); @@ -330,7 +330,7 @@ namespace dlgprov throw RuntimeException(); m_xEventAttacher.set( xSMgr->createInstanceWithContext( - "com.sun.star.script.EventAttacher", m_xContext ), UNO_QUERY ); + u"com.sun.star.script.EventAttacher"_ustr, m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) throw ServiceNotRegisteredException(); @@ -344,7 +344,7 @@ namespace dlgprov Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); try { - xProps->getPropertyValue("Name") >>= sDialogCodeName; + xProps->getPropertyValue(u"Name"_ustr) >>= sDialogCodeName; } catch( Exception& ){} } @@ -464,7 +464,7 @@ namespace dlgprov provider::theMasterScriptProviderFactory::get( m_xContext ); Any aCtx; - aCtx <<= OUString("user"); + aCtx <<= u"user"_ustr; xScriptProvider = xFactory->createScriptProvider( aCtx ); } } @@ -603,7 +603,7 @@ namespace dlgprov else { OUString aRes(SfxResId(STR_ERRUNOEVENTBINDUNG)); - OUString aQuoteChar( "\"" ); + OUString aQuoteChar( u"\""_ustr ); sal_Int32 nIndex = aRes.indexOf( '%' ); diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index bf499982ac7a..eb229770f6a5 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -83,7 +83,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_SET_THROW ); // TODO: Ctor Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext - ( "com.sun.star.resource.StringResourceWithLocation", + ( u"com.sun.star.resource.StringResourceWithLocation"_ustr, i_xContext ), UNO_QUERY ); if( xStringResourceManager.is() ) { @@ -96,7 +96,7 @@ namespace dlgprov Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext) { Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_SET_THROW ); - Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", i_xContext ), UNO_QUERY_THROW ); + Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr, i_xContext ), UNO_QUERY_THROW ); return xControlModel; } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, @@ -108,7 +108,7 @@ namespace dlgprov Reference< container::XNameContainer > xDialogModel( lcl_createControlModel(i_xContext) ); Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); - xDlgPropSet->setPropertyValue( "DialogSourceURL", aDialogSourceURL ); + xDlgPropSet->setPropertyValue( u"DialogSourceURL"_ustr, aDialogSourceURL ); // #TODO we really need to detect the source of the Dialog, is it // the dialog. E.g. if the dialog was created from basic ( then we just @@ -125,7 +125,7 @@ namespace dlgprov Reference< beans::XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY ); Any aStringResourceManagerAny; aStringResourceManagerAny <<= xStringResourceManager; - xDlgPSet->setPropertyValue( "ResourceResolver", aStringResourceManagerAny ); + xDlgPSet->setPropertyValue( u"ResourceResolver"_ustr, aStringResourceManagerAny ); } return xDialogModel; @@ -187,7 +187,7 @@ namespace dlgprov { if (!m_BasicInfo) // shouldn't get here - throw RuntimeException("No information to create dialog" ); + throw RuntimeException(u"No information to create dialog"_ustr ); Reference< resource::XStringResourceManager > xStringResourceManager = getStringResourceFromDialogLibrary( m_BasicInfo->mxDlgLib ); Any aDialogSourceURL((OUString())); @@ -258,7 +258,7 @@ namespace dlgprov if ( nIndex != -1 ) sDlgName = sDescription.getToken( 0, '.', nIndex ); - OUString sLocation = sfUri->getParameter( "location" ); + OUString sLocation = sfUri->getParameter( u"location"_ustr ); // get dialog library container @@ -313,7 +313,7 @@ namespace dlgprov if ( !xLibContainer.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialog: library container not found!", + u"DialogProviderImpl::getDialog: library container not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -331,7 +331,7 @@ namespace dlgprov if ( !xDialogLib.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialogModel: library not found!", + u"DialogProviderImpl::getDialogModel: library not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -345,7 +345,7 @@ namespace dlgprov if ( !xISP.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialogModel: dialog not found!", + u"DialogProviderImpl::getDialogModel: dialog not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -494,7 +494,7 @@ namespace dlgprov OUString DialogProviderImpl::getImplementationName( ) { - return "com.sun.star.comp.scripting.DialogProvider"; + return u"com.sun.star.comp.scripting.DialogProvider"_ustr; } sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) @@ -504,9 +504,9 @@ namespace dlgprov Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) { - return { "com.sun.star.awt.DialogProvider", - "com.sun.star.awt.DialogProvider2", - "com.sun.star.awt.ContainerWindowProvider" }; + return { u"com.sun.star.awt.DialogProvider"_ustr, + u"com.sun.star.awt.DialogProvider2"_ustr, + u"com.sun.star.awt.ContainerWindowProvider"_ustr }; } @@ -523,7 +523,7 @@ namespace dlgprov if ( !m_xModel.is() ) { - throw RuntimeException( "DialogProviderImpl::initialize: invalid argument format!" ); + throw RuntimeException( u"DialogProviderImpl::initialize: invalid argument format!"_ustr ); } } else if ( aArguments.getLength() == 4 ) @@ -543,7 +543,7 @@ namespace dlgprov } else if ( aArguments.getLength() > 4 ) { - throw RuntimeException( "DialogProviderImpl::initialize: invalid number of arguments!" ); + throw RuntimeException( u"DialogProviderImpl::initialize: invalid number of arguments!"_ustr ); } } @@ -600,7 +600,7 @@ namespace dlgprov if( !bDecoration ) { xDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) ); - xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) ); + xDlgModPropSet->setPropertyValue( u"Title"_ustr, Any( OUString() ) ); } } catch( UnknownPropertyException& ) @@ -634,7 +634,7 @@ namespace dlgprov if( !xHandler.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!", + u"DialogProviderImpl::createDialogWithHandler: Invalid xHandler!"_ustr, Reference< XInterface >(), 1 ); } Reference< XWindowPeer > xDummyPeer; @@ -649,9 +649,9 @@ namespace dlgprov ::comphelper::NamedValueCollection aArguments( Arguments ); Reference< XWindowPeer > xParentPeer; - if ( aArguments.has( "ParentWindow" ) ) + if ( aArguments.has( u"ParentWindow"_ustr ) ) { - const Any& aParentWindow( aArguments.get( "ParentWindow" ) ); + const Any& aParentWindow( aArguments.get( u"ParentWindow"_ustr ) ); if ( !( aParentWindow >>= xParentPeer ) ) { const Reference< XControl > xParentControl( aParentWindow, UNO_QUERY ); @@ -660,7 +660,7 @@ namespace dlgprov } } - const Reference< XInterface > xHandler( aArguments.get( "EventHandler" ), UNO_QUERY ); + const Reference< XInterface > xHandler( aArguments.get( u"EventHandler"_ustr ), UNO_QUERY ); Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParentPeer, true ); Reference< XDialog > xDialog( xControl, UNO_QUERY ); @@ -674,7 +674,7 @@ namespace dlgprov if( !xParent.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::createContainerWindow: Invalid xParent!", + u"DialogProviderImpl::createContainerWindow: Invalid xParent!"_ustr, Reference< XInterface >(), 1 ); } Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParent, false ); diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 2ba4492abae3..8c332e5fe98e 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -49,7 +49,7 @@ static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Referenc return result; } css::uno::Reference < css::ucb::XSimpleFileAccess3 > xSFA( css::ucb::SimpleFileAccess::create(xCtx) ); - result = xSFA->getFolderContents( "vnd.sun.star.tdoc:/", true ); + result = xSFA->getFolderContents( u"vnd.sun.star.tdoc:/"_ustr, true ); } catch ( css::uno::Exception& ) { @@ -67,7 +67,7 @@ static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel > try { xDocFac.set(xMCF->createInstanceWithContext( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory", + u"com.sun.star.frame.TransientDocumentsDocumentContentFactory"_ustr, xContext ), css::uno::UNO_QUERY ); } @@ -101,7 +101,7 @@ static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& try { ::ucbhelper::Content root( url, nullptr, comphelper::getProcessComponentContext() ); - result = getUCBProperty( root, "DocumentModel" ); + result = getUCBProperty( root, u"DocumentModel"_ustr ); } catch ( css::ucb::ContentCreationException& ) { diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 54ca264b32f6..f4217b820f13 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -75,7 +75,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( // but usually it's a "real" frame) if ( aArguments.hasElements() && !( aArguments[ 0 ] >>= m_xFrame ) ) { - throw RuntimeException( "ScriptProtocolHandler::initialize: could not extract reference to the frame" ); + throw RuntimeException( u"ScriptProtocolHandler::initialize: could not extract reference to the frame"_ustr ); } ENSURE_OR_THROW( m_xContext.is(), "ScriptProtocolHandler::initialize: No Service Manager available" ); @@ -133,7 +133,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( css::uri::UriReferenceFactory::create(m_xContext)); css::uno::Reference<css::uri::XVndSunStarScriptUrlReference> uri( urifac->parse(aURL.Complete), css::uno::UNO_QUERY_THROW); - auto const loc = uri->getParameter("location"); + auto const loc = uri->getParameter(u"location"_ustr); bool bIsDocumentScript = loc == "document"; if ( bIsDocumentScript ) @@ -247,9 +247,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( } else { - invokeResult <<= OUString( - "ScriptProtocolHandler::dispatchWithNotification failed, ScriptProtocolHandler not initialised" - ); + invokeResult <<= u"ScriptProtocolHandler::dispatchWithNotification failed, ScriptProtocolHandler not initialised"_ustr; } if ( bCaughtException ) @@ -408,7 +406,7 @@ ScriptProtocolHandler::~ScriptProtocolHandler() /* XServiceInfo */ OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) { - return "com.sun.star.comp.ScriptProtocolHandler"; + return u"com.sun.star.comp.ScriptProtocolHandler"_ustr; } /* XServiceInfo */ @@ -420,7 +418,7 @@ sal_Bool SAL_CALL ScriptProtocolHandler::supportsService(const OUString& sServic /* XServiceInfo */ Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() { - return {"com.sun.star.frame.ProtocolHandler"}; + return {u"com.sun.star.frame.ProtocolHandler"_ustr}; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 8ff88be99512..a53aa9a73478 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -52,7 +52,7 @@ ActiveMSPList::createNewMSP( const uno::Any& context ) Reference< provider::XScriptProvider > msp( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.script.provider.MasterScriptProvider", args, m_xContext ), UNO_QUERY ); + u"com.sun.star.script.provider.MasterScriptProvider"_ustr, args, m_xContext ), UNO_QUERY ); return msp; } @@ -128,8 +128,8 @@ Reference< provider::XScriptProvider > if ( !xScripts.is() ) { throw lang::IllegalArgumentException( - "Failed to create MasterScriptProvider for ScriptInvocationContext: " - "Component supporting XEmbeddScripts interface not found.", + u"Failed to create MasterScriptProvider for ScriptInvocationContext: " + "Component supporting XEmbeddScripts interface not found."_ustr, nullptr, 1 ); } @@ -272,7 +272,7 @@ void ActiveMSPList::createNonDocMSPs() { // do creation of user and share MSPs here - OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); + OUString serviceName(u"com.sun.star.script.provider.MasterScriptProvider"_ustr); Sequence< Any > args{ Any(userDirString) }; // should check if provider reference is valid diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 3ea45aeecd7e..003cb999f520 100644 -e ... etc. - the rest is truncated
