summaryrefslogtreecommitdiff
path: root/slideshow/source/inc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /slideshow/source/inc
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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/inc')
-rw-r--r--slideshow/source/inc/animationfactory.hxx14
-rw-r--r--slideshow/source/inc/attributemap.hxx2
-rw-r--r--slideshow/source/inc/delayevent.hxx12
-rw-r--r--slideshow/source/inc/event.hxx6
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkarea.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkhandler.hxx2
-rw-r--r--slideshow/source/inc/shapeattributelayer.hxx6
-rw-r--r--slideshow/source/inc/shapeimporter.hxx4
-rw-r--r--slideshow/source/inc/smilfunctionparser.hxx4
-rw-r--r--slideshow/source/inc/soundplayer.hxx4
-rw-r--r--slideshow/source/inc/stringanimation.hxx2
-rw-r--r--slideshow/source/inc/tools.hxx14
13 files changed, 37 insertions, 37 deletions
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;