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/source/engine/shapes | |
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/source/engine/shapes')
14 files changed, 50 insertions, 50 deletions
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, |