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/activities/interpolation.hxx | |
| 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/activities/interpolation.hxx')
| -rw-r--r-- | slideshow/source/engine/activities/interpolation.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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 ) { |