Remove RTL_CONSTASCII_(U)STRINGPARAM in odk

Change-Id: I97e5e650b7966d1ac3c6f9e45b495c21b529b768

3 files changed, 7 insertions, 7 deletions

diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index 54c5b8a7cdc9..dfcd295ac516 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -142,7 +142,7 @@ class WriterDispatch : public BaseDispatch
 public:
     WriterDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, OUString( "com.sun.star.text.TextDocument" ) )
     {}
 };
 
@@ -151,7 +151,7 @@ class CalcDispatch : public BaseDispatch
 public:
     CalcDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadSheetDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, OUString( "com.sun.star.sheet.SpreadSheetDocument" ) )
     {}
 };
 
diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx
index f8b32f28e56b..572d9c1be730 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -117,7 +117,7 @@ public:
 OUString SAL_CALL MyCounterImpl::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) );
+    return OUString( IMPLNAME );
 }
 
 //*************************************************************************
@@ -142,7 +142,7 @@ Sequence<OUString> SAL_CALL MyCounterImpl::getSupportedServiceNames(  )
 //*************************************************************************
 Sequence<OUString> SAL_CALL MyCounterImpl::getSupportedServiceNames_Static(  )
 {
-    OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+    OUString aName( SERVICENAME );
     return Sequence< OUString >( &aName, 1 );
 }
 
@@ -216,7 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_C
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ),
+            OUString( IMPLNAME ),
             MyCounterImpl_create,
             MyCounterImpl::getSupportedServiceNames_Static() ) );
 
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index 279cfeb8ad0c..ac7bdfae7acc 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -1527,7 +1527,7 @@ class UnoObjectDefinition{
         public String getPropertyValueGetterSourceCode(String _sPropertyName, String _sReturnVariableName, String _sIncomingObjectName, TypeClass _aTypeClass, String _sTypeName){
             String sFirstLine = "\t";
             String sReturnVariableName = _sReturnVariableName;
-            // e.g. uno::Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) );
+            // e.g. uno::Any a = xPropSet->getPropertyValue( rtl::OUString( "DefaultContext" ) );
             String[] sVarDefinition = _sReturnVariableName.split("=");
             if (sVarDefinition.length > 0){
                 String sVariable = sVarDefinition[0];
@@ -1560,7 +1560,7 @@ class UnoObjectDefinition{
 
         public String getStringValue(String _sValue){
             bIncludeStringHeader = true;
-            return "OUString(RTL_CONSTASCII_USTRINGPARAM(\"" + _sValue + "\"))";
+            return "OUString(\"" + _sValue + "\")";
         }