OUString cleanup in animations

Change-Id: Ib858f9fa709d72539f71a6473a4ecb519d68e98e
Reviewed-on: https://gerrit.libreoffice.org/584
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>

3 files changed, 22 insertions, 23 deletions

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index f372bbb6d595..a194dcc53eb5 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -55,7 +55,6 @@
 
 using ::osl::Mutex;
 using ::osl::Guard;
-using ::rtl::OUString;
 using ::cppu::OInterfaceContainerHelper;
 using ::cppu::OInterfaceIteratorHelper;
 using ::com::sun::star::uno::Any;
@@ -515,12 +514,12 @@ Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponent
 }\
 OUString getImplementationName_##N()\
 {\
-    return OUString( RTL_CONSTASCII_USTRINGPARAM ( IN ) );\
+    return OUString( IN );\
 }\
 Sequence<OUString> getSupportedServiceNames_##N(void)\
 {\
     Sequence<OUString> aRet(1);\
-    aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SN ));\
+    aRet.getArray()[0] = SN;\
     return aRet;\
 }
 
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
index 09b7a36517ed..a809c068223f 100644
--- a/animations/source/animcore/factreg.hxx
+++ b/animations/source/animcore/factreg.hxx
@@ -24,8 +24,8 @@ extern rtl_StandardModuleCount g_moduleCount;
 
 #define DECL_NODE_FACTORY(N)\
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\
-extern ::rtl::OUString getImplementationName_##N();\
-extern ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_##N(void)
+extern OUString getImplementationName_##N();\
+extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_##N(void)
 
 DECL_NODE_FACTORY( PAR );
 DECL_NODE_FACTORY( SEQ );
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 128b5f17fdcc..4ecdce47bd42 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -70,12 +70,12 @@ namespace animcore
         virtual uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode ) throw (uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException );
-        virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException );
+        virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( uno::RuntimeException );
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException);
 
     protected:
         ~TargetPropertiesCreator(); // we're a ref-counted UNO class. _We_ destroy ourselves.
@@ -95,15 +95,15 @@ namespace animcore
         return TargetPropertiesCreator::createInstance( rSMgr );
     }
 
-    ::rtl::OUString getImplementationName_TargetPropertiesCreator()
+    OUString getImplementationName_TargetPropertiesCreator()
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+        return OUString( IMPLEMENTATION_NAME );
     }
 
-    uno::Sequence< ::rtl::OUString > getSupportedServiceNames_TargetPropertiesCreator(void)
+    uno::Sequence< OUString > getSupportedServiceNames_TargetPropertiesCreator(void)
     {
-        uno::Sequence< ::rtl::OUString > aRet(1);
-        aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+        uno::Sequence< OUString > aRet(1);
+        aRet.getArray()[0] = SERVICE_NAME;
         return aRet;
     }
 
@@ -342,7 +342,7 @@ namespace animcore
                             if( !(aAny >>= bVisible) )
                             {
                                 // try to extract string
-                                ::rtl::OUString aString;
+                                OUString aString;
                                 if( (aAny >>= aString) )
                                 {
                                     // we also take the strings "true" and "false",
@@ -461,28 +461,28 @@ namespace animcore
     }
 
     // XServiceInfo
-    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException )
+    OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException )
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+        return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
     {
         return ServiceName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(SERVICE_NAME));
     }
 
-    uno::Sequence< ::rtl::OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames()  throw( uno::RuntimeException )
+    uno::Sequence< OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames()  throw( uno::RuntimeException )
     {
-        uno::Sequence< ::rtl::OUString > aRet(1);
-        aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+        uno::Sequence< OUString > aRet(1);
+        aRet[0] = SERVICE_NAME;
 
         return aRet;
     }
 
     // XServiceName
-    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getServiceName(  ) throw (uno::RuntimeException)
+    OUString SAL_CALL TargetPropertiesCreator::getServiceName(  ) throw (uno::RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+        return OUString( SERVICE_NAME );
     }
 
 } // namespace animcore