strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loplugin:ostr in slideshow

Browse source 
Change-Id: I87b391b95a75a1ddc4e26dcd0bbd557f8bd3b17b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167578
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-05-13 09:52:26 +02:00
parent 3c76913a5a
commit b6652dae45
33 changed files with 150 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
slideshow/qa/engine/engine.cxx
View file

@ -24,7 +24,7 @@ class Test : public UnoApiTest
{
public:
Test()
: UnoApiTest("slideshow/qa/engine/data/")
: UnoApiTest(u"slideshow/qa/engine/data/"_ustr)
{
}
};

8
slideshow/source/engine/animationnodes/animationaudionode.cxx
View file

@ -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

2
slideshow/source/engine/animationnodes/animationbasenode.cxx
View file

@ -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

4
slideshow/source/engine/animationnodes/animationcommandnode.cxx
View file

@ -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

2
slideshow/source/engine/animationnodes/animationsetnode.cxx
View file

@ -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 )) {

10
slideshow/source/engine/animationnodes/animationtransformnode.cxx
View file

@ -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(),

2
slideshow/source/engine/animationnodes/basecontainernode.cxx
View file

@ -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())

6
slideshow/source/engine/animationnodes/basenode.cxx
View file

@ -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) <<

18
slideshow/source/engine/animationnodes/generateevent.cxx
View file

@ -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 );
}

2
slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
View file

@ -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();

6
slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
View file

@ -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(

10
slideshow/source/engine/effectrewinder.cxx
View file

@ -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

10
slideshow/source/engine/eventmultiplexer.cxx
View file

@ -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

20
slideshow/source/engine/opengl/TransitionImpl.cxx
View file

@ -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 )

8
slideshow/source/engine/opengl/TransitionerImpl.cxx
View file

@ -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
{

4
slideshow/source/engine/rehearsetimingsactivity.cxx
View file

@ -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));

4
slideshow/source/engine/shapes/backgroundshape.cxx
View file

@ -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 );

16
slideshow/source/engine/shapes/drawinglayeranimation.cxx
View file

@ -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 );

2
slideshow/source/engine/shapes/drawshape.cxx
View file

@ -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

14
slideshow/source/engine/shapes/gdimtftools.cxx
View file

@ -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 );

40
slideshow/source/engine/shapes/shapeimporter.cxx
View file

@ -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();

2
slideshow/source/engine/shapes/viewappletshape.cxx
View file

@ -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(

20
slideshow/source/engine/shapes/viewmediashape.cxx
View file

@ -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& )

4
slideshow/source/engine/slide/slideimpl.cxx
View file

@ -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 );
}

2
slideshow/source/engine/slide/targetpropertiescreator.cxx
View file

@ -300,7 +300,7 @@ namespace slideshow::internal
1,
beans::NamedValue(
//xAnimateNode->getAttributeName(),
"visibility",
u"visibility"_ustr,
uno::Any( bVisible ) ) ) );
break;
}

66
slideshow/source/engine/slideshowimpl.cxx
View file

@ -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) ) );
}
}

4
slideshow/source/engine/slideview.cxx
View file

@ -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()

2
slideshow/source/engine/soundplayer.cxx
View file

@ -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& )
{

2
slideshow/source/engine/tools.cxx
View file

@ -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" );

2
slideshow/source/engine/transitions/shapetransitionfactory.cxx
View file

@ -321,7 +321,7 @@ AnimationActivitySharedPtr createShapeTransitionByType(
pGeneratedActivity = ActivitiesFactory::createSimpleActivity(
rParms,
AnimationFactory::createNumberPropertyAnimation(
"Opacity",
u"Opacity"_ustr,
rShape,
rShapeManager,
rSlideSize,

2
slideshow/source/engine/usereventqueue.cxx
View file

@ -257,7 +257,7 @@ private:
return mrEventQueue.addEventWhenQueueIsEmpty(
makeEvent( [this] () {
this->mrEventMultiplexer.notifyNextEffect();
}, "EventMultiplexer::notifyNextEffect") );
}, u"EventMultiplexer::notifyNextEffect"_ustr) );
}
else
return true;

2
slideshow/source/engine/wakeupevent.cxx
View file

@ -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(),

2
slideshow/source/inc/interruptabledelayevent.hxx
View file

@ -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 )
{