1 files changed, 17 insertions, 20 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 6a498446c620..9005de240c48 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -41,57 +41,57 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
     static const beans::Property aPropsInfoTable[] =
     {
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+            rtl::OUString( "ContentType" ),
             -1,
             getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+            rtl::OUString( "IsDocument" ),
             -1,
             getCppuBooleanType(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+            rtl::OUString( "IsFolder" ),
             -1,
             getCppuBooleanType(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+            rtl::OUString( "Title" ),
             -1,
             getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
             beans::PropertyAttribute::BOUND
             //  | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ),
+            rtl::OUString( "Size" ),
             -1,
             getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ),
+            rtl::OUString( "DateCreated" ),
             -1,
             getCppuType( static_cast< util::DateTime * >( 0 ) ),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),
+            rtl::OUString( "IsReadOnly" ),
             -1,
             getCppuBooleanType(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "CreatableContentsInfo" ) ),
+            rtl::OUString(
+                "CreatableContentsInfo" ),
             -1,
             getCppuType(
                 static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -124,49 +124,46 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
         // Required commands
         ///////////////////////////////////////////////////////////////
         ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+            rtl::OUString( "getCommandInfo" ),
             -1,
             getCppuVoidType()
         ),
         ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+            rtl::OUString( "getPropertySetInfo" ),
             -1,
             getCppuVoidType()
         ),
         ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+            rtl::OUString( "getPropertyValues" ),
             -1,
             getCppuType(
                 static_cast< uno::Sequence< beans::Property > * >( 0 ) )
         ),
         ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+            rtl::OUString( "setPropertyValues" ),
             -1,
             getCppuType(
                 static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
         ),
         ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+            rtl::OUString( "open" ),
             -1,
             getCppuType(
                 static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
         ),
         ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ),
+            rtl::OUString( "insert" ),
             -1,
             getCppuType(
                 static_cast< ucb::InsertCommandArgument * >( 0 ) )
         ),
         ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ),
+            rtl::OUString( "delete" ),
             -1,
             getCppuBooleanType()
         ),
         ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ),
+            rtl::OUString( "createNewContent" ),
             -1,
             getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
         )