diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /slideshow | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'slideshow')
63 files changed, 214 insertions, 214 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 61e89896176c..3c12fee17ad4 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -113,7 +113,7 @@ typedef cppu::WeakComponentImplHelper1<presentation::XTransition> OGLTransitione class TimerContext { public: - explicit TimerContext(rtl::OUString const& rWhat) + explicit TimerContext(OUString const& rWhat) : m_aWhat(rWhat) , m_aStartTime(microsec_clock::local_time()) { @@ -124,7 +124,7 @@ public: SAL_INFO("slideshow.opengl", m_aWhat << " took: " << aDuration); } private: - rtl::OUString const m_aWhat; + OUString const m_aWhat; ptime const m_aStartTime; }; #endif @@ -643,7 +643,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta uno::Sequence< uno::Any > aDeviceParams; ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ); - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; sal_Int64 aVal = 0; diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx index f14af9ac918c..36a96cba97cb 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx @@ -553,7 +553,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta uno::Sequence< uno::Any > aDeviceParams; ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ); - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; sal_Int64 aVal = 0; diff --git a/slideshow/source/engine/activities/accumulation.hxx b/slideshow/source/engine/activities/accumulation.hxx index 5ef4ebead50a..92e4f1564421 100644 --- a/slideshow/source/engine/activities/accumulation.hxx +++ b/slideshow/source/engine/activities/accumulation.hxx @@ -61,9 +61,9 @@ namespace slideshow } /// Specialization for non-addable strings - template<> ::rtl::OUString accumulate< ::rtl::OUString >( const ::rtl::OUString&, + template<> OUString accumulate< OUString >( const OUString&, sal_uInt32, - const ::rtl::OUString& rCurrValue ) + const OUString& rCurrValue ) { // always return rCurrValue, it's impossible to add strings... return rCurrValue; diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 18afdf7e1b6d..2354e51d9b0a 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -691,7 +691,7 @@ AnimationActivitySharedPtr createActivity( rParms.mbAutoReverse ); // is a formula given? - const ::rtl::OUString& rFormulaString( xNode->getFormula() ); + const OUString& rFormulaString( xNode->getFormula() ); if( !rFormulaString.isEmpty() ) { // yep, parse and pass to ActivityParameters diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index e5232653ec56..cd4255d40548 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -52,11 +52,11 @@ namespace basegfx } /// Specialization also for string, although this code should not be called - template<> ::rtl::OUString lerp< ::rtl::OUString >( const ::rtl::OUString&, - const ::rtl::OUString& rTo, + template<> OUString lerp< OUString >( const OUString&, + const OUString& rTo, double ) { - OSL_FAIL( "lerp<::rtl::OUString> called" ); + OSL_FAIL( "lerp<OUString> called" ); return rTo; } @@ -151,9 +151,9 @@ namespace slideshow } /// Specialization for non-interpolatable strings - template<> ::rtl::OUString lerp< ::rtl::OUString >( const Interpolator< ::rtl::OUString >& /*rInterpolator*/, - const ::rtl::OUString& rFrom, - const ::rtl::OUString& rTo, + template<> OUString lerp< OUString >( const Interpolator< OUString >& /*rInterpolator*/, + const OUString& rFrom, + const OUString& rTo, sal_uInt32 nFrame, ::std::size_t nTotalFrames ) { diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index ba50b7d02a64..7a3c215a4738 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -63,7 +63,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -131,7 +131,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 072f2b47586a..8f443059e3b1 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -208,7 +208,7 @@ namespace slideshow class PathAnimation : public NumberAnimation { public: - PathAnimation( const ::rtl::OUString& rSVGDPath, + PathAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -656,7 +656,7 @@ namespace slideshow uno::Any getShapeDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { uno::Reference< drawing::XShape > xShape( rShape->getXShape() ); @@ -675,7 +675,7 @@ namespace slideshow } template< typename ValueType > ValueType getDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); @@ -684,7 +684,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot get requested shape property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -696,7 +696,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot extract requested shape property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -706,7 +706,7 @@ namespace slideshow } template<> RGBColor getDefault< RGBColor >( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); @@ -715,7 +715,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot get requested shape color property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -727,7 +727,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot extract requested shape color property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -739,7 +739,7 @@ namespace slideshow } } - AnimationFactory::AttributeClass AnimationFactory::classifyAttributeName( const ::rtl::OUString& rAttrName ) + AnimationFactory::AttributeClass AnimationFactory::classifyAttributeName( const OUString& rAttrName ) { // ATTENTION: When changing this map, also the create*PropertyAnimation() methods must // be checked and possibly adapted in their switch statements @@ -804,7 +804,7 @@ namespace slideshow } } - NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -968,7 +968,7 @@ namespace slideshow return NumberAnimationSharedPtr(); } - EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1064,7 +1064,7 @@ namespace slideshow return EnumAnimationSharedPtr(); } - ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1216,7 +1216,7 @@ namespace slideshow return PairAnimationSharedPtr(); } - StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1282,7 +1282,7 @@ namespace slideshow return makeGenericAnimation<StringAnimation>( rShapeManager, nFlags, &ShapeAttributeLayer::isFontFamilyValid, - getDefault< ::rtl::OUString >( rShape, rAttrName ), + getDefault< OUString >( rShape, rAttrName ), &ShapeAttributeLayer::getFontFamily, &ShapeAttributeLayer::setFontFamily ); } @@ -1290,7 +1290,7 @@ namespace slideshow return StringAnimationSharedPtr(); } - BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& /*rShape*/, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1365,7 +1365,7 @@ namespace slideshow return BoolAnimationSharedPtr(); } - NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const AnimatableShapeSharedPtr& /*rShape*/, const ShapeManagerSharedPtr& rShapeManager, diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index fe130d7f1f0d..76723968ad4f 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -56,7 +56,7 @@ private: private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudioNode; - ::rtl::OUString maSoundURL; + OUString maSoundURL; mutable SoundPlayerSharedPtr mpPlayer; void createPlayer() const; diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 83db50909500..fe0c804e4925 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -212,7 +212,7 @@ bool AnimationBaseNode::init_st() mpActivity = createActivity(); } catch (uno::Exception const&) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8).getStr() ); // catch and ignore. We later handle empty activities, but for diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index c43547f086d0..8d77a9be9a90 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -36,7 +36,7 @@ void AnimationPathMotionNode::dispose() AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const { - rtl::OUString aString; + OUString aString; ENSURE_OR_THROW( (mxPathMotionNode->getPath() >>= aString), "no string-based SVG:d path found" ); diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index bf4c474b6c8f..2b1230a6e649 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -44,7 +44,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); uno::Reference<animations::XAnimate> const xAnimateNode = getXAnimateNode(); - rtl::OUString const attrName( xAnimateNode->getAttributeName() ); + OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); // make deactivation a two-step procedure. Normally, we diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 4ea1d9b8c220..966ce7fbdfaf 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -69,7 +69,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("Rotate"), + OUString("Rotate"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -79,7 +79,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("SkewX"), + OUString("SkewX"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -89,7 +89,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("SkewY"), + OUString("SkewY"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index b803b441a39f..570401b04818 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -249,7 +249,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - rtl::OUString( "node-type" ), + OUString( "node-type" ), uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); @@ -717,13 +717,13 @@ void BaseNode::showState() const uno::UNO_QUERY ); // read shape name - ::rtl::OUString aName; + OUString aName; if( (xPropSet->getPropertyValue( - ::rtl::OUString("Name") ) + OUString("Name") ) >>= aName) ) { - const ::rtl::OString& rAsciiName( - ::rtl::OUStringToOString( aName, + const OString& rAsciiName( + OUStringToOString( aName, RTL_TEXTENCODING_ASCII_US ) ); VERBOSE_TRACE( "Node info: n0x%X, name \"%s\"", diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index 05e6dc2343f9..c589d73eb080 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -35,7 +35,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const // Create AnimationActivity from common XAnimate parameters: ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); uno::Reference<animations::XAnimate> const& xAnimateNode =getXAnimateNode(); - rtl::OUString const attrName( xAnimateNode->getAttributeName() ); + OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); switch (AnimationFactory::classifyAttributeName( attrName )) { diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index fa8bdeb3c955..9bcf37d3d7ae 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -32,7 +32,7 @@ namespace slideshow { typedef ::canvas::tools::ValueMap< AttributeType > AnimateAttributeMap; - AttributeType mapAttributeName( const ::rtl::OUString& rAttrName ) + AttributeType mapAttributeName( const OUString& rAttrName ) { /** Maps attribute name to AttributeType enum. @@ -80,7 +80,7 @@ namespace slideshow eAttributeType ) ) { OSL_TRACE( "mapAttributeName(): attribute name %s not found in map.", - ::rtl::OUStringToOString( rAttrName, + OUStringToOString( rAttrName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ATTRIBUTE_INVALID; } diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index d97290c4253a..67625937317b 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -1235,7 +1235,7 @@ bool EventMultiplexer::notifyViewClobbered( } bool EventMultiplexer::notifyHyperlinkClicked( - rtl::OUString const& hyperLink ) + OUString const& hyperLink ) { return mpImpl->maHyperlinkHandlers.apply( boost::bind(&HyperlinkHandler::handleHyperlink, diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 0967d29c1e28..59efda2c9001 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -78,7 +78,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -244,7 +244,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 76efb42046c4..44e03051fd00 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -184,7 +184,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity() } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -424,7 +424,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) // build timer string: const sal_Int32 nTimeSecs = static_cast<sal_Int32>(maElapsedTime.getElapsedTime()); - rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 n = (nTimeSecs / 3600); if (n < 10) buf.append( static_cast<sal_Unicode>('0') ); @@ -439,7 +439,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) if (n < 10) buf.append( static_cast<sal_Unicode>('0') ); buf.append( n ); - const rtl::OUString time = buf.makeStringAndClear(); + const OUString time = buf.makeStringAndClear(); // create the MetaFile: GDIMetaFile metaFile; diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index fe2073540093..8352d5a74551 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -727,7 +727,7 @@ namespace slideshow return mbFontFamilyValid ? true : haveChild() ? mpChild->isFontFamilyValid() : false; } - ::rtl::OUString ShapeAttributeLayer::getFontFamily() const + OUString ShapeAttributeLayer::getFontFamily() const { // mnAdditiveMode is ignored, cannot combine strings in // any sensible way @@ -736,10 +736,10 @@ namespace slideshow else if( haveChild() ) return mpChild->getFontFamily(); else - return ::rtl::OUString(); + return OUString(); } - void ShapeAttributeLayer::setFontFamily( const ::rtl::OUString& rName ) + void ShapeAttributeLayer::setFontFamily( const OUString& rName ) { maFontFamily = rName; mbFontFamilyValid = true; diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index fbd3befccea7..57506f1da921 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -74,7 +74,7 @@ namespace slideshow AppletShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -102,7 +102,7 @@ namespace slideshow virtual bool implIsIntrinsicAnimationPlaying() const; virtual void implSetIntrinsicAnimationTime(double); - const ::rtl::OUString maServiceName; + const OUString maServiceName; const char** mpPropCopyTable; const sal_Size mnNumPropEntries; @@ -114,7 +114,7 @@ namespace slideshow AppletShape::AppletShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ) : @@ -301,7 +301,7 @@ namespace slideshow boost::shared_ptr<Shape> createAppletShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ) diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index fe9117b8c109..6001f07c5368 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -42,7 +42,7 @@ namespace slideshow const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 355892abf130..1fe56fc68625 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -154,8 +154,8 @@ namespace slideshow sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; mpMtf = pMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 1d8ef74dcd1b..044e81cd22c1 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -958,7 +958,7 @@ boost::shared_ptr<Activity> createDrawingLayerAnimActivity( catch( uno::Exception& ) { // translate any error into empty factory product. - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 79c6d4ab672c..ace22211aefd 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -621,7 +621,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -940,7 +940,7 @@ namespace slideshow maHyperlinkRegions.push_back( HyperlinkRegion( basegfx::B2DRectangle(), - rtl::OUString( + OUString( reinterpret_cast<sal_Unicode const*>( pAct->GetData()), pAct->GetDataSize() / sizeof(sal_Unicode) ) diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 59a22b1fb75f..ddb5ee46397d 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -81,7 +81,7 @@ namespace slideshow // skip comment if not a special XTEXT... comment if( pAct->GetComment().matchIgnoreAsciiCase( - rtl::OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), + OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), 0) ) { // fill classification vector with NOOPs, @@ -161,7 +161,7 @@ namespace slideshow { MetaTextAction* pText = static_cast<MetaTextAction*>(pCurrAct); VERBOSE_TRACE( "Shape text \"%s\" at action #%d", - rtl::OUStringToOString(pText->GetText(), + OUStringToOString(pText->GetText(), RTL_TEXTENCODING_ISO_8859_1).getStr(), nActionIndex ); } diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 136fc46a8a99..d6375a9e1cdf 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -112,7 +112,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 83eff701e6eb..9850f3e3a546 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -451,7 +451,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, static_cast<MetaCommentAction *>(pCurrAct); // skip comment if not a special XTEXT... comment if( pAct->GetComment().matchIgnoreAsciiCase( - rtl::OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), + OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), 0) ) { if (pAct->GetComment().equalsIgnoreAsciiCaseL( diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 1aef0501601a..a24d18e4b4b5 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -77,7 +77,7 @@ bool importShapeGraphic( GraphicObject & o_rGraphic, uno::Reference<beans::XPropertySet> const& xPropSet ) { - rtl::OUString aURL; + OUString aURL; if( !getPropertyValue( aURL, xPropSet, "GraphicURL") || aURL.isEmpty() ) { @@ -85,7 +85,7 @@ bool importShapeGraphic( return false; } - rtl::OUString const aVndUrl( + OUString const aVndUrl( "vnd.sun.star.GraphicObject:" ); sal_Int32 nIndex( aURL.indexOf( aVndUrl ) ); @@ -103,7 +103,7 @@ bool importShapeGraphic( // unique ID string found in URL, extract // to separate string - rtl::OUString const aUniqueId( + OUString const aUniqueId( aURL.copy( nIndex, aURL.getLength() - nIndex ) ); // TODO(T2): Creating a GraphicObject is not @@ -111,7 +111,7 @@ bool importShapeGraphic( // unguarded internal singleton mpGlobalMgr) // fetch already loaded graphic from graphic manager. - rtl::OString const aOldString(rtl::OUStringToOString(aUniqueId, + OString const aOldString(OUStringToOString(aUniqueId, RTL_TEXTENCODING_UTF8)); o_rGraphic = GraphicObject( aOldString ); @@ -280,7 +280,7 @@ bool ShapeOfGroup::isBackgroundDetached() const ShapeSharedPtr ShapeImporter::createShape( uno::Reference<drawing::XShape> const& xCurrShape, uno::Reference<beans::XPropertySet> const& xPropSet, - rtl::OUString const& shapeType ) const + OUString const& shapeType ) const { if( shapeType == "com.sun.star.drawing.MediaShape" || shapeType == "com.sun.star.presentation.MediaShape" ) { @@ -302,7 +302,7 @@ ShapeSharedPtr ShapeImporter::createShape( // (Netscape)Plugin shape. This is a special object return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( "com.sun.star.comp.sfx2.PluginObject" ), + OUString( "com.sun.star.comp.sfx2.PluginObject" ), aPropertyValues, SAL_N_ELEMENTS(aPropertyValues), mrContext ); @@ -322,7 +322,7 @@ ShapeSharedPtr ShapeImporter::createShape( // (Java)Applet shape. This is a special object return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( "com.sun.star.comp.sfx2.AppletObject" ), + OUString( "com.sun.star.comp.sfx2.AppletObject" ), aPropertyValues, SAL_N_ELEMENTS(aPropertyValues), mrContext ); @@ -436,7 +436,7 @@ ShapeSharedPtr ShapeImporter::createShape( bool ShapeImporter::isSkip( uno::Reference<beans::XPropertySet> const& xPropSet, - rtl::OUString const& shapeType, + OUString const& shapeType, uno::Reference< drawing::XLayer> const& xLayer ) { // skip empty presentation objects: @@ -452,10 +452,10 @@ bool ShapeImporter::isSkip( //skip shapes which corresponds to annotations if(xLayer.is()) { - rtl::OUString layerName; + OUString layerName; uno::Reference<beans::XPropertySet> xPropLayerSet( xLayer, uno::UNO_QUERY ); - const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString("Name")) ); + const uno::Any& a(xPropLayerSet->getPropertyValue(OUString("Name")) ); bool const bRet = (a >>= layerName); if(bRet) { @@ -574,7 +574,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) xDrawnInSlideshow = xLayerManager->getLayerForShape(xCurrShape); } - rtl::OUString const shapeType( xCurrShape->getShapeType()); + OUString const shapeType( xCurrShape->getShapeType()); // is this shape presentation-invisible? if( !isSkip(xPropSet, shapeType, xDrawnInSlideshow) ) diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index d4ee1d2b64d7..0d6dbe0f1109 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -62,7 +62,7 @@ namespace slideshow { ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, const uno::Reference< drawing::XShape >& rxShape, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const uno::Reference< uno::XComponentContext >& rxContext ) : @@ -90,10 +90,10 @@ namespace slideshow uno::UNO_QUERY_THROW ); // copy shape properties to applet viewer - ::rtl::OUString aPropName; + OUString aPropName; for( sal_Size i=0; i<nNumPropEntries; ++i ) { - aPropName = ::rtl::OUString::createFromAscii( pPropCopyTable[i] ); + aPropName = OUString::createFromAscii( pPropCopyTable[i] ); mxViewerPropSet->setPropertyValue( aPropName, xShapePropSet->getPropertyValue( aPropName )); @@ -110,7 +110,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -139,7 +139,7 @@ namespace slideshow uno::Reference< awt::XWindow2 > xParentWindow( xPropSet->getPropertyValue( - ::rtl::OUString("Window" )), + OUString("Window" )), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory> xFactory( @@ -153,7 +153,7 @@ namespace slideshow uno::Reference< awt::XToolkit2 > xToolkit = awt::Toolkit::create(mxComponentContext); awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_SIMPLE, - ::rtl::OUString(), + OUString(), uno::Reference< awt::XWindowPeer >(xParentWindow, uno::UNO_QUERY_THROW), 0, @@ -172,7 +172,7 @@ namespace slideshow mxFrame.set( xFactory->createInstanceWithContext( - ::rtl::OUString("com.sun.star.frame.Frame" ), + OUString("com.sun.star.frame.Frame" ), mxComponentContext ), uno::UNO_QUERY_THROW ); diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 9712243406be..92514d942f36 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -75,7 +75,7 @@ namespace slideshow ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const ::com::sun::star::uno::Reference< diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 90562778bc3e..51e3fc3373d6 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -187,7 +187,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 1f8fbacebd94..bf3d6ad66f7e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -99,7 +99,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -212,7 +212,7 @@ namespace slideshow if( xPropSet.is() && getPropertyValue( xParentWindow, xPropSet, - ::rtl::OUString("Window" )) ) + OUString("Window" )) ) { const awt::Rectangle aRect( xParentWindow->getPosSize() ); @@ -268,7 +268,7 @@ namespace slideshow if( xCanvas.is() ) { uno::Reference< beans::XPropertySet > xPropSet; - ::rtl::OUString aURL; + OUString aURL; try { @@ -278,13 +278,13 @@ namespace slideshow if (xPropSet.is()) { if ((xPropSet->getPropertyValue( - ::rtl::OUString( "PrivateTempFileURL")) >>= aURL) + OUString( "PrivateTempFileURL")) >>= aURL) && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL ); } else if (xPropSet->getPropertyValue( - ::rtl::OUString( "MediaURL")) >>= aURL) + OUString( "MediaURL")) >>= aURL) { implInitializeMediaPlayer( aURL ); } @@ -295,7 +295,7 @@ namespace slideshow if( ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 ) { - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; @@ -323,7 +323,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -346,19 +346,19 @@ namespace slideshow sal_Bool bLoop( false ); getPropertyValue( bLoop, rxProps, - ::rtl::OUString( "Loop" )); + OUString( "Loop" )); mxPlayer->setPlaybackLoop( bLoop ); sal_Bool bMute( false ); getPropertyValue( bMute, rxProps, - ::rtl::OUString( "Mute" )); + OUString( "Mute" )); mxPlayer->setMute( bMute || !mbIsSoundEnabled); sal_Int16 nVolumeDB(0); getPropertyValue( nVolumeDB, rxProps, - ::rtl::OUString( "VolumeDB" )); + OUString( "VolumeDB" )); mxPlayer->setVolumeDB( nVolumeDB ); if( mxPlayerWindow.is() ) @@ -366,7 +366,7 @@ namespace slideshow media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW); getPropertyValue( eZoom, rxProps, - ::rtl::OUString( "Zoom" )); + OUString( "Zoom" )); mxPlayerWindow->setZoomLevel( eZoom ); } } @@ -375,7 +375,7 @@ namespace slideshow // --------------------------------------------------------------------- - void ViewMediaShape::implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ) + void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL ) { if( !mxPlayer.is() ) { @@ -394,7 +394,7 @@ namespace slideshow catch( const uno::Exception& ) { throw lang::NoSupportException( - rtl::OUString( "No video support for " ) + rMediaURL, + OUString( "No video support for " ) + rMediaURL, uno::Reference<uno::XInterface>() ); } } @@ -472,7 +472,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -530,7 +530,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index c3dc61f98412..3bf4997d16ef 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -140,7 +140,7 @@ namespace slideshow bool implInitialize( const ::basegfx::B2DRectangle& rBounds ); void implSetMediaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxProps ); - void implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ); + void implInitializeMediaPlayer( const OUString& rMediaURL ); bool implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams ); bool implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index da2815936b50..50e1b2522243 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -82,7 +82,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index d206a6e9279d..91bdb7bb81ac 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -689,7 +689,7 @@ namespace slideshow { // TODO(E1): Might be superfluous. Nowadays, // addViewLayer swallows all errors, anyway. - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index eb72a582213d..a8d324838bcf 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -137,7 +137,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) // first check for hyperlinks, because these have // highest prio: - rtl::OUString const hyperlink( checkForHyperlink(aPosition) ); + OUString const hyperlink( checkForHyperlink(aPosition) ); if( !hyperlink.isEmpty() ) { mrMultiplexer.notifyHyperlinkClicked(hyperlink); @@ -400,7 +400,7 @@ bool ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& x return true; } -rtl::OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitPos ) const +OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitPos ) const { // find matching region (scan reversely, to coarsely match // paint order): set is ordered by priority @@ -421,7 +421,7 @@ rtl::OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitP } } - return rtl::OUString(); + return OUString(); } void ShapeManagerImpl::addIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 6851c1eb8437..b52ab564a847 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -168,7 +168,7 @@ private: sal_Int16 nCursor ); - ::rtl::OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; + OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; typedef std::map<ShapeSharedPtr, diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 8660ef8d1d44..f2a1be5665b8 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -56,7 +56,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index f8b930710584..43b041126760 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -782,7 +782,7 @@ namespace public: MainSequenceSearcher() { - maSearchKey.Name = ::rtl::OUString( "node-type" ); + maSearchKey.Name = OUString( "node-type" ); maSearchKey.Value <<= presentation::EffectNodeType::MAIN_SEQUENCE; } @@ -863,7 +863,7 @@ bool SlideImpl::implPrefetchShow() catch( uno::Exception& ) { OSL_FAIL( - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8).getStr() ); // TODO(E2): Error handling. For now, bail out @@ -978,7 +978,7 @@ bool SlideImpl::applyInitialShapeAttributes( xPropsCreator.set( xFac->createInstanceWithContext( - ::rtl::OUString( + OUString( "com.sun.star.animations.TargetPropertiesCreator"), maContext.mxComponentContext ), uno::UNO_QUERY_THROW ); @@ -990,7 +990,7 @@ bool SlideImpl::applyInitialShapeAttributes( catch( uno::Exception& ) { OSL_FAIL( - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8).getStr() ); @@ -1170,7 +1170,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1212,7 +1212,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1231,8 +1231,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index dd85891474b1..86341488107f 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -528,7 +528,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 80ca2c8dd71e..998f4d1c764b 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -86,7 +86,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index c1d0b2a4a765..5ce6a9ba913f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -269,7 +269,7 @@ public: /** Notification from eventmultiplexer that a hyperlink has been clicked. */ - bool notifyHyperLinkClicked( rtl::OUString const& hyperLink ); + bool notifyHyperLinkClicked( OUString const& hyperLink ); /** Notification from eventmultiplexer that an animation event has occoured. This will be forewarded to all registered XSlideShowListener @@ -545,7 +545,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, } // HyperlinkHandler - virtual bool handleHyperlink( ::rtl::OUString const& rLink ) + virtual bool handleHyperlink( OUString const& rLink ) { return mrShow.notifyHyperLinkClicked(rLink); } @@ -614,7 +614,7 @@ SlideShowImpl::SlideShowImpl( // #i82460# try to retrieve special transition factory mxOptionalTransitionFactory.set( xFactory->createInstanceWithContext( - ::rtl::OUString("com.sun.star.presentation.TransitionFactory" ), + OUString("com.sun.star.presentation.TransitionFactory" ), mxComponentContext ), uno::UNO_QUERY ); } @@ -707,7 +707,7 @@ void SlideShowImpl::stopSlideTransitionSound() SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& rSound, bool bLoopSound ) { sal_Bool bStopSound = sal_False; - rtl::OUString url; + OUString url; if( !(rSound >>= bStopSound) ) bStopSound = sal_False; @@ -1055,7 +1055,7 @@ public: } else { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1446,17 +1446,17 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY); //Layer Name which enables to catch annotations - rtl::OUString layerName = rtl::OUString("DrawnInSlideshow"); + OUString layerName = OUString("DrawnInSlideshow"); uno::Any aPropLayer; aPropLayer <<= layerName; - xLayerPropSet->setPropertyValue(rtl::OUString("Name"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("Name"), aPropLayer); aPropLayer <<= true; - xLayerPropSet->setPropertyValue(rtl::OUString("IsVisible"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("IsVisible"), aPropLayer); aPropLayer <<= false; - xLayerPropSet->setPropertyValue(rtl::OUString("IsLocked"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("IsLocked"), aPropLayer); PolygonMap::iterator aIter=maPolygons.begin(); @@ -1488,7 +1488,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { //create the PolyLineShape uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance( - rtl::OUString("com.sun.star.drawing.PolyLineShape") ) ); + OUString("com.sun.star.drawing.PolyLineShape") ) ); uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY); //Add the shape to the slide @@ -1518,27 +1518,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult //Give the built PointSequenceSequence. uno::Any aParam; aParam <<= aRetval; - aXPropSet->setPropertyValue( rtl::OUString("PolyPolygon"), aParam ); + aXPropSet->setPropertyValue( OUString("PolyPolygon"), aParam ); //LineStyle : SOLID by default uno::Any aAny; drawing::LineStyle eLS; eLS = drawing::LineStyle_SOLID; aAny <<= eLS; - aXPropSet->setPropertyValue( rtl::OUString("LineStyle"), aAny ); + aXPropSet->setPropertyValue( OUString("LineStyle"), aAny ); //LineColor sal_uInt32 nLineColor; nLineColor = pPolyPoly->getRGBALineColor(); //Transform polygon color from RRGGBBAA to AARRGGBB aAny <<= RGBAColor2UnoColor(nLineColor); - aXPropSet->setPropertyValue( rtl::OUString("LineColor"), aAny ); + aXPropSet->setPropertyValue( OUString("LineColor"), aAny ); //LineWidth double fLineWidth; fLineWidth = pPolyPoly->getStrokeWidth(); aAny <<= (sal_Int32)fLineWidth; - aXPropSet->setPropertyValue( rtl::OUString("LineWidth"), aAny ); + aXPropSet->setPropertyValue( OUString("LineWidth"), aAny ); // make polygons special xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow); @@ -2113,7 +2113,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -2162,7 +2162,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD if( !xPropSet.is() || !getPropertyValue( nChange, xPropSet, - ::rtl::OUString( + OUString( "Change")) ) { OSL_TRACE( @@ -2175,7 +2175,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD if( !xPropSet.is() || !getPropertyValue( nAutomaticNextSlideTimeout, xPropSet, - ::rtl::OUString( + OUString( "HighResDuration")) ) { OSL_TRACE( @@ -2338,7 +2338,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) sal_Bool(bReverse))); } -bool SlideShowImpl::notifyHyperLinkClicked( rtl::OUString const& hyperLink ) +bool SlideShowImpl::notifyHyperLinkClicked( OUString const& hyperLink ) { osl::MutexGuard const guard( m_aMutex ); diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 446ca70118e2..b466a1ac4d41 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -532,14 +532,14 @@ namespace slideshow #endif } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const ::rtl::OUString& rSmilValue, + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const OUString& rSmilValue, const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilValue( - rtl::OUStringToOString( rSmilValue, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiSmilValue( + OUStringToOString( rSmilValue, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilValue.getStr() ); StringIteratorT aEnd( rAsciiSmilValue.getStr()+rAsciiSmilValue.getLength() ); @@ -578,14 +578,14 @@ namespace slideshow return pContext->maOperandStack.top(); } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const ::rtl::OUString& rSmilFunction, + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const OUString& rSmilFunction, const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilFunction( - rtl::OUStringToOString( rSmilFunction, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiSmilFunction( + OUStringToOString( rSmilFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilFunction.getStr() ); StringIteratorT aEnd( rAsciiSmilFunction.getStr()+rAsciiSmilFunction.getLength() ); diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 00b716b13efd..4f0eb6fb2b99 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -48,7 +48,7 @@ namespace slideshow boost::shared_ptr<SoundPlayer> SoundPlayer::create( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const uno::Reference< uno::XComponentContext>& rComponentContext ) { boost::shared_ptr<SoundPlayer> pPlayer( @@ -86,7 +86,7 @@ namespace slideshow SoundPlayer::SoundPlayer( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const uno::Reference< uno::XComponentContext>& rComponentContext ) : mrEventMultiplexer(rEventMultiplexer), mThis(), @@ -112,7 +112,7 @@ namespace slideshow if( !mxPlayer.is() ) throw lang::NoSupportException( - rtl::OUString( + OUString( "No sound support for ") + rSoundURL, uno::Reference<uno::XInterface>() ); } @@ -124,7 +124,7 @@ namespace slideshow dispose(); } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 5d3c1c01b468..fac4bed6e1f5 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -61,7 +61,7 @@ namespace slideshow class NamedValueStringComparator { public: - NamedValueStringComparator( const ::rtl::OUString& rSearchString ) : + NamedValueStringComparator( const OUString& rSearchString ) : mrSearchString( rSearchString ) { } @@ -72,7 +72,7 @@ namespace slideshow } private: - const ::rtl::OUString& mrSearchString; + const OUString& mrSearchString; }; class NamedValueComparator @@ -164,7 +164,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -323,7 +323,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -373,7 +373,7 @@ namespace slideshow } /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, + bool extractValue( OUString& o_rValue, const uno::Any& rSourceAny, const ShapeSharedPtr& /*rShape*/, const ::basegfx::B2DVector& /*rSlideBounds*/ ) @@ -402,7 +402,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -745,7 +745,7 @@ namespace slideshow // read bound rect awt::Rectangle aTmpRect; if( !(xPropSet->getPropertyValue( - ::rtl::OUString("BoundRect") ) >>= aTmpRect) ) + OUString("BoundRect") ) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); @@ -767,7 +767,7 @@ namespace slideshow // read prio sal_Int32 nPrio(0); if( !(xPropSet->getPropertyValue( - ::rtl::OUString("ZOrder") ) >>= nPrio) ) + OUString("ZOrder") ) >>= nPrio) ) { ENSURE_OR_THROW( false, "getAPIShapePrio(): Could not get \"ZOrder\" property from shape" ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2db843b47390..3eed4b7d7aa2 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -112,7 +112,7 @@ ClippingAnimation::~ClippingAnimation() } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -354,7 +354,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("Opacity"), + OUString("Opacity"), rShape, rShapeManager, rSlideSize ), diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 0ded7aa435f1..3155738399e7 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -676,7 +676,7 @@ UserEventQueue::~UserEventQueue() clear(); } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 78eb9d418f6e..01ce9dbf0def 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -137,7 +137,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index ee564d1e33ef..aab3cf98d23f 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -77,7 +77,7 @@ namespace slideshow CLASS_BOOL_PROPERTY }; - static AttributeClass classifyAttributeName( const ::rtl::OUString& rAttrName ); + static AttributeClass classifyAttributeName( const OUString& rAttrName ); /// Collection of flags common to all factory methods enum FactoryFlags @@ -89,19 +89,19 @@ namespace slideshow FLAG_NO_SPRITE = 1 }; - static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + static NumberAnimationSharedPtr createNumberPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + static EnumAnimationSharedPtr createEnumPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + static ColorAnimationSharedPtr createColorPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -120,19 +120,19 @@ namespace slideshow sal_Int16 nTransformType, int nFlags=0 ); - static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + static StringAnimationSharedPtr createStringPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + static BoolAnimationSharedPtr createBoolPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + static NumberAnimationSharedPtr createPathMotionAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, diff --git a/slideshow/source/inc/attributemap.hxx b/slideshow/source/inc/attributemap.hxx index cdad4a24cba7..4bb401acf1ab 100644 --- a/slideshow/source/inc/attributemap.hxx +++ b/slideshow/source/inc/attributemap.hxx @@ -65,7 +65,7 @@ namespace slideshow @returns ATTRIBUTE_INVALID, if name was not found in the mapping table. */ - AttributeType mapAttributeName( const ::rtl::OUString& rAttrName ); + AttributeType mapAttributeName( const OUString& rAttrName ); } } diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index ba7ac03b904a..00c30df9c727 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -37,13 +37,13 @@ public: template <typename FuncT> Delay( FuncT const& func, double nTimeout - , const ::rtl::OUString& rsDescription + , const OUString& rsDescription ) : Event(rsDescription), mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} Delay( const boost::function0<void>& func, double nTimeout - , const ::rtl::OUString& rsDescription + , const OUString& rsDescription ) : Event(rsDescription), mnTimeout(nTimeout), maFunc(func), @@ -75,7 +75,7 @@ private: @return generated delay event */ template <typename FuncT> -inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, rtl::OUString const& rsDescription ) +inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, OUString const& rsDescription ) { return EventSharedPtr( new Delay( func, nTimeout, rsDescription ) ); } @@ -88,7 +88,7 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, rtl::OUStr @return generated immediate event. */ template <typename FuncT> -inline EventSharedPtr makeEvent_( FuncT const& func, rtl::OUString const& rsDescription) +inline EventSharedPtr makeEvent_( FuncT const& func, OUString const& rsDescription) { return EventSharedPtr( new Delay( func, 0.0, rsDescription ) ); } @@ -104,7 +104,7 @@ public: template <typename FuncT> Delay_( FuncT const& func, double nTimeout, char const* from_function, char const* from_file, int from_line, - const ::rtl::OUString& rsDescription) + const OUString& rsDescription) : Delay(func, nTimeout, rsDescription), FROM_FUNCTION(from_function), FROM_FILE(from_file), FROM_LINE(from_line) {} @@ -118,7 +118,7 @@ template <typename FuncT> inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, char const* from_function, char const* from_file, int from_line, - const ::rtl::OUString& rsDescription) + const OUString& rsDescription) { return EventSharedPtr( new Delay_( func, nTimeout, from_function, from_file, from_line, rsDescription) ); diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 44b5bd8d7507..be5db455c7c7 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -32,7 +32,7 @@ namespace internal { class Event : public Disposable { public: - Event (const ::rtl::OUString& rsDescription) : msDescription(rsDescription) {} + Event (const OUString& rsDescription) : msDescription(rsDescription) {} /** Execute the event. @@ -64,10 +64,10 @@ public: */ virtual double getActivationTime( double nCurrentTime ) const = 0; - const ::rtl::OUString& GetDescription (void) const { return msDescription; } + const OUString& GetDescription (void) const { return msDescription; } private: - const ::rtl::OUString msDescription; + const OUString msDescription; }; typedef ::boost::shared_ptr< Event > EventSharedPtr; diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 394c0d2c92fc..cb75b37f9898 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -630,7 +630,7 @@ public: anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ - bool notifyHyperlinkClicked( ::rtl::OUString const& hyperLink ); + bool notifyHyperlinkClicked( OUString const& hyperLink ); private: boost::scoped_ptr<EventMultiplexerImpl> mpImpl; diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx index f1f0f36b95a4..acd8d89024f9 100644 --- a/slideshow/source/inc/hyperlinkarea.hxx +++ b/slideshow/source/inc/hyperlinkarea.hxx @@ -46,7 +46,7 @@ namespace slideshow { public: typedef std::pair< ::basegfx::B2DRange, - ::rtl::OUString > HyperlinkRegion; + OUString > HyperlinkRegion; typedef std::vector<HyperlinkRegion> HyperlinkRegions; diff --git a/slideshow/source/inc/hyperlinkhandler.hxx b/slideshow/source/inc/hyperlinkhandler.hxx index 3971a909788f..25fca7450859 100644 --- a/slideshow/source/inc/hyperlinkhandler.hxx +++ b/slideshow/source/inc/hyperlinkhandler.hxx @@ -49,7 +49,7 @@ namespace slideshow possibly other, less prioritized handlers are called, too. */ - virtual bool handleHyperlink( ::rtl::OUString const& rLink ) = 0; + virtual bool handleHyperlink( OUString const& rLink ) = 0; protected: ~HyperlinkHandler() {} diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index d725255919d7..ac4bf3de9bf7 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -414,10 +414,10 @@ namespace slideshow If there is no unique font family, the font family of the first text of the shape is returned. */ - ::rtl::OUString getFontFamily() const; + OUString getFontFamily() const; /** Set the text font family name globally for the whole shape */ - void setFontFamily( const ::rtl::OUString& rName ); + void setFontFamily( const OUString& rName ); /** Query whether the italic mode attribute is valid */ @@ -481,7 +481,7 @@ namespace slideshow ::basegfx::B2DPoint maPosition; ::basegfx::B2DPolyPolygon maClip; - ::rtl::OUString maFontFamily; + OUString maFontFamily; double mnRotationAngle; double mnShearXAngle; diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 08de7138d39d..c3ad90f4ddaf 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -99,7 +99,7 @@ public: private: bool isSkip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& shapeType, + OUString const& shapeType, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> const& xLayer); @@ -108,7 +108,7 @@ private: ::com::sun::star::drawing::XShape> const& xCurrShape, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& shapeType ) const; + OUString const& shapeType ) const; void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ; diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 1b4973cfa2b0..b29e80513e92 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -97,7 +97,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, + static ExpressionNodeSharedPtr parseSmilValue( const OUString& rSmilValue, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError /** Parse a string containing a SMIL function. @@ -145,7 +145,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, + static ExpressionNodeSharedPtr parseSmilFunction( const OUString& rSmilFunction, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError private: diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index 6ac359b7349b..8f534f489435 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -63,7 +63,7 @@ namespace slideshow */ static ::boost::shared_ptr<SoundPlayer> create( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); @@ -92,7 +92,7 @@ namespace slideshow private: SoundPlayer( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx index 9a1e7d9a498d..fb1701875ddd 100644 --- a/slideshow/source/inc/stringanimation.hxx +++ b/slideshow/source/inc/stringanimation.hxx @@ -39,7 +39,7 @@ namespace slideshow class StringAnimation : public Animation { public: - typedef ::rtl::OUString ValueType; + typedef OUString ValueType; /** Set the animation to value rStr diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 9aefb98857b8..d0ee0b751e2f 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -149,7 +149,7 @@ namespace slideshow const basegfx::B2DVector& rSlideBounds ); /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, + bool extractValue( OUString& o_rValue, const ::com::sun::star::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); @@ -310,7 +310,7 @@ namespace slideshow ValueType & rValue, com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> const & xPropSet, - rtl::OUString const & propName ) + OUString const & propName ) { try { const com::sun::star::uno::Any& a( @@ -319,10 +319,10 @@ namespace slideshow #if OSL_DEBUG_LEVEL > 0 if( !bRet ) OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s\n", - ::rtl::OUStringToOString( propName, + OUStringToOString( propName, RTL_TEXTENCODING_ASCII_US ).getStr(), BOOST_CURRENT_FUNCTION, - ::rtl::OUStringToOString( a.getValueTypeRef()->pTypeName, + OUStringToOString( a.getValueTypeRef()->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif return bRet; @@ -342,7 +342,7 @@ namespace slideshow com::sun::star::uno::Reference< ValueType >& rIfc, com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> const & xPropSet, - rtl::OUString const & propName ) + OUString const & propName ) { try { @@ -355,10 +355,10 @@ namespace slideshow #if OSL_DEBUG_LEVEL > 0 if( !bRet ) OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s to interface\n", - ::rtl::OUStringToOString( propName, + OUStringToOString( propName, RTL_TEXTENCODING_ASCII_US ).getStr(), BOOST_CURRENT_FUNCTION, - ::rtl::OUStringToOString( a.getValueTypeRef()->pTypeName, + OUStringToOString( a.getValueTypeRef()->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif return bRet; diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 11ce065702ff..e7385123df83 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -245,12 +245,12 @@ private: return uno::Reference< beans::XPropertySetInfo >(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL setPropertyValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { typedef ::canvas::tools::ValueMap< sal_Int16 > PropMapT; @@ -276,22 +276,22 @@ private: return uno::makeAny(aRes); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } @@ -357,7 +357,7 @@ void ChildWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -371,7 +371,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ ) catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -410,7 +410,7 @@ DemoWindow::DemoWindow() : maUpdateTimer(), mbSlideDisplayed( false ) { - SetText( rtl::OUString("Slideshow Demo" ) ); + SetText( OUString("Slideshow Demo" ) ); SetSizePixel( Size( 640, 480 ) ); EnablePaint( true ); @@ -449,7 +449,7 @@ void DemoWindow::init() uno::Reference< animations::XAnimationNode >(), uno::Sequence< beans::PropertyValue >() ); mxShow->setProperty( beans::PropertyValue( - rtl::OUString("RehearseTimings"), + OUString("RehearseTimings"), 0, uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE )); @@ -459,7 +459,7 @@ void DemoWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -503,7 +503,7 @@ void DemoApp::Main() for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - ::rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam == "--help" || aParam == "-h" ) bHelp = true; @@ -531,7 +531,7 @@ void DemoApp::Main() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index b25ce129939b..153aa7065014 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -83,10 +83,10 @@ private: } // XShape - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (uno::RuntimeException) + virtual OUString SAL_CALL getShapeType( ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TestShape::getShapeType: unexpected method call", false ); - return ::rtl::OUString(); + return OUString(); } virtual awt::Point SAL_CALL getPosition( ) throw (uno::RuntimeException) |