kill RTL_CONSTASCII_USTRINGPARAM in xmlhelp

+ ::rtl:: drop
(only on rebased files)

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

xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx

@@ -31,12 +31,12 @@ namespace xmlsearch {
         {
         public:
 
-            XmlSearchException( const rtl::OUString& message )
+            XmlSearchException( const OUString& message )
                 : _message( message )
             {
             }
 
-            rtl::OUString getMessage() const
+            OUString getMessage() const
             {
                 return _message;
             }
@@ -44,7 +44,7 @@ namespace xmlsearch {
 
         private:
 
-            rtl::OUString _message;
+            OUString _message;
         };
 
 
@@ -53,7 +53,7 @@ namespace xmlsearch {
         {
         public:
 
-            IOException( const rtl::OUString& message )
+            IOException( const OUString& message )
                 : XmlSearchException( message )
             {
             }
@@ -64,7 +64,7 @@ namespace xmlsearch {
             : public virtual XmlSearchException
         {
         public:
-            NoFactoryException( const rtl::OUString& message )
+            NoFactoryException( const OUString& message )
                 : XmlSearchException( message )
             {
             }
@@ -75,7 +75,7 @@ namespace xmlsearch {
             : public virtual XmlSearchException
         {
         public:
-            NoSuchBlock( const rtl::OUString& message )
+            NoSuchBlock( const OUString& message )
                 : XmlSearchException( message )
             {
             }
@@ -86,7 +86,7 @@ namespace xmlsearch {
             : public virtual XmlSearchException
         {
         public:
-            IllegalIndexException( const rtl::OUString& message )
+            IllegalIndexException( const OUString& message )
                 : XmlSearchException( message )
             {
             }

xmlhelp/source/cxxhelp/inc/qe/Query.hxx

@@ -121,14 +121,14 @@ namespace xmlsearch {
         {
         public:
 
-            QueryHitData( double penalty,const rtl::OUString& document, rtl::OUString* terms )
+            QueryHitData( double penalty,const OUString& document, OUString* terms )
                 : penalty_( penalty ),
                   document_( document ),
                   terms_( terms )      { }
 
             ~QueryHitData() { delete[] terms_; }
 
-            rtl::OUString getDocument() const { return document_; }
+            OUString getDocument() const { return document_; }
 
             double getPenalty() const { return penalty_; }
 
@@ -137,9 +137,9 @@ namespace xmlsearch {
 
             double        penalty_;
 
-            const rtl::OUString document_;
+            const OUString document_;
 
-            rtl::OUString* terms_;
+            OUString* terms_;
 
         };  // end class QueryHitData
 
@@ -148,7 +148,7 @@ namespace xmlsearch {
         {
         public:
 
-            static PrefixTranslator* makePrefixTranslator( const rtl::OUString*,sal_Int32 )
+            static PrefixTranslator* makePrefixTranslator( const OUString*,sal_Int32 )
             {
                 return 0;
             }

xmlhelp/source/cxxhelp/provider/content.hxx

@@ -49,8 +49,8 @@ namespace chelp
 
     struct ContentProperties
     {
-        ::rtl::OUString aTitle;         // Title
-        ::rtl::OUString aContentType;   // ContentType
+        OUString aTitle;         // Title
+        OUString aContentType;   // ContentType
         sal_Bool        bIsDocument;    // IsDocument
         sal_Bool        bIsFolder;      // IsFolder
 
@@ -80,11 +80,11 @@ namespace chelp
         XTYPEPROVIDER_DECL()
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL
+        virtual OUString SAL_CALL
         getImplementationName()
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
             throw( ::com::sun::star::uno::RuntimeException );
 
@@ -126,7 +126,7 @@ namespace chelp
         getCommands( const com::sun::star::uno::Reference<
                      com::sun::star::ucb::XCommandEnvironment > & xEnv );
 
-        virtual ::rtl::OUString getParentURL() { return ::rtl::OUString(); }
+        virtual OUString getParentURL() { return OUString(); }
 
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
         getPropertyValues( const ::com::sun::star::uno::Sequence<

xmlhelp/source/cxxhelp/provider/contentcaps.cxx

@@ -48,129 +48,107 @@ uno::Sequence< beans::Property > Content::getProperties(
     sal_Int32 idx = 0;
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+            "ContentType",
             -1,
-            getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            getCppuType( static_cast< const OUString * >( 0 ) ),
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),
+            "IsReadOnly",
             -1,
             getCppuBooleanType(),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsErrorDocument" ) ),
+            "IsErrorDocument",
             -1,
             getCppuBooleanType(),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+            "IsDocument",
             -1,
             getCppuBooleanType(),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+            "IsFolder",
             -1,
             getCppuBooleanType(),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+            "Title",
             -1,
-            getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-            beans::PropertyAttribute::BOUND
-            | beans::PropertyAttribute::READONLY );
+            getCppuType( static_cast< const OUString * >( 0 ) ),
+            beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     if( withMediaType )
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ),
+                "MediaType",
                 -1,
-                getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const OUString * >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     if( isModule )
     {
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) ),
+                "Order",
                 -1,
                 getCppuType( static_cast< sal_Int32* >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeywordList" ) ),
+                "KeywordList",
                 -1,
-                getCppuType(
-                    static_cast< const uno::Sequence< rtl::OUString >* >(
-                        0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const uno::Sequence< OUString >* >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeywordRef" ) ),
+                "KeywordRef",
                 -1,
-                getCppuType(
-                    static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "KeywordTitleForRef" ) ),
+                "KeywordTitleForRef",
                 -1,
-                getCppuType(
-                    static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "KeywordAnchorForRef" ) ),
+                "KeywordAnchorForRef",
                 -1,
-                getCppuType(
-                    static_cast< const uno::Sequence< uno::Sequence< rtl::OUString > >* >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SearchScopes" ) ),
+                "SearchScopes",
                 -1,
-                getCppuType(
-                    static_cast< const uno::Sequence< rtl::OUString >* >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const uno::Sequence< OUString >* >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
     }
 
     if( isFile )
     {
         props[idx++] =
             beans::Property(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AnchorName" ) ),
+                "AnchorName",
                 -1,
-                getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-                beans::PropertyAttribute::BOUND
-                | beans::PropertyAttribute::READONLY );
+                getCppuType( static_cast< const OUString * >( 0 ) ),
+                beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
     }
 
     return props;
@@ -197,35 +175,29 @@ uno::Sequence< star::ucb::CommandInfo > Content::getCommands(
         // Required commands
         ///////////////////////////////////////////////////////////////
         star::ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+            "getCommandInfo",
             -1,
             getCppuVoidType()
         ),
         star::ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+            "getPropertySetInfo",
             -1,
             getCppuVoidType()
         ),
         star::ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+            "getPropertyValues",
             -1,
-            getCppuType(
-                static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+            getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) )
         ),
         star::ucb::CommandInfo(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+            "setPropertyValues",
             -1,
-            getCppuType(
-                static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
+            getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
         ),
         star::ucb::CommandInfo(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+            "open",
             -1,
-            getCppuType(
-                static_cast< star::ucb::OpenCommandArgument2 * >( 0 ) )
+            getCppuType( static_cast< star::ucb::OpenCommandArgument2 * >( 0 ) )
         )
     };
 

xmlhelp/source/cxxhelp/provider/inputstream.hxx

@@ -40,7 +40,7 @@ namespace chelp {
     {
     public:
 
-        XInputStream_impl( const rtl::OUString& aUncPath );
+        XInputStream_impl( const OUString& aUncPath );
 
         virtual ~XInputStream_impl();
 

xmlhelp/source/cxxhelp/provider/provider.hxx

@@ -145,7 +145,7 @@ namespace chelp {
 
         osl::Mutex     m_aMutex;
         bool           isInitialized;
-        rtl::OUString  m_aScheme;
+        OUString  m_aScheme;
         Databases*     m_pDatabases;
         com::sun::star::uno::Reference<com::sun::star::container::XContainer> m_xContainer;
 
@@ -160,7 +160,7 @@ namespace chelp {
         getHierAccess( const ::com::sun::star::uno::Reference<  ::com::sun::star::lang::XMultiServiceFactory >& sProvider,
                        const char* file ) const;
 
-        ::rtl::OUString
+        OUString
         getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
                 const char* key ) const;
 
@@ -170,7 +170,7 @@ namespace chelp {
                     ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
                     const char* key) const;
 
-      void subst( rtl::OUString& instpath ) const;
+      void subst( OUString& instpath ) const;
     };
 
 }

xmlhelp/source/cxxhelp/provider/resultsetbase.hxx

@@ -104,7 +104,7 @@ namespace chelp {
             return m_nWasNull;
         }
 
-        virtual rtl::OUString SAL_CALL
+        virtual OUString SAL_CALL
         getString(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
@@ -113,7 +113,7 @@ namespace chelp {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getString( columnIndex );
             else
-                return rtl::OUString();
+                return OUString();
         }
 
         virtual sal_Bool SAL_CALL
@@ -456,7 +456,7 @@ namespace chelp {
 
         // XContentAccess
 
-        virtual rtl::OUString SAL_CALL
+        virtual OUString SAL_CALL
         queryContentIdentifierString(
             void )
             throw( com::sun::star::uno::RuntimeException );
@@ -485,7 +485,7 @@ namespace chelp {
             throw( com::sun::star::uno::RuntimeException);
 
         virtual void SAL_CALL setPropertyValue(
-            const rtl::OUString& aPropertyName,
+            const OUString& aPropertyName,
             const com::sun::star::uno::Any& aValue )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::beans::PropertyVetoException,
@@ -495,14 +495,14 @@ namespace chelp {
 
         virtual com::sun::star::uno::Any SAL_CALL
         getPropertyValue(
-            const rtl::OUString& PropertyName )
+            const OUString& PropertyName )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
                    com::sun::star::uno::RuntimeException);
 
         virtual void SAL_CALL
         addPropertyChangeListener(
-            const rtl::OUString& aPropertyName,
+            const OUString& aPropertyName,
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
@@ -510,7 +510,7 @@ namespace chelp {
 
         virtual void SAL_CALL
         removePropertyChangeListener(
-            const rtl::OUString& aPropertyName,
+            const OUString& aPropertyName,
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
@@ -518,14 +518,14 @@ namespace chelp {
 
         virtual void SAL_CALL
         addVetoableChangeListener(
-            const rtl::OUString& PropertyName,
+            const OUString& PropertyName,
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
                    com::sun::star::uno::RuntimeException);
 
         virtual void SAL_CALL removeVetoableChangeListener(
-            const rtl::OUString& PropertyName,
+            const OUString& PropertyName,
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
@@ -542,7 +542,7 @@ namespace chelp {
 
         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > >              ItemSet;
-        typedef std::vector< rtl::OUString >                                                             PathSet;
+        typedef std::vector< OUString >                                                             PathSet;
 
         IdentSet                            m_aIdents;
         ItemSet                             m_aItems;

xmlhelp/source/cxxhelp/test/abidebug.hxx

@@ -20,6 +20,6 @@
 #ifndef _RTL_USTRING_
 #include  <rtl/ustring>
 #endif
-ostream& operator<<( ostream& out,const rtl::OUString& bla );
+ostream& operator<<( ostream& out,const OUString& bla );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmlhelp/source/cxxhelp/test/searchdemo.cxx

@@ -50,7 +50,7 @@ extern RandomAccessStream* theFile();
 
 
 
-void print_rtl_OUString( const rtl::OUString bla )
+void print_rtl_OUString( const OUString bla )
 {
     rtl::OString bluber = rtl::OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 );
     char* bluberChr = new char[ 1+bluber.getLength() ];
@@ -76,21 +76,21 @@ int main( int argc,char* argv[] )
 
     try
     {
-        rtl::OUString installDir("//./e|/index/");
+        OUString installDir("//./e|/index/");
         QueryProcessor queryProcessor( installDir );
 
-        std::vector<rtl::OUString> Query(2);
-        Query[0] = rtl::OUString( "text*" );
-        Query[1] = rtl::OUString( "abbildung" );
-        rtl::OUString Scope = rtl::OUString( "headingheading" );
+        std::vector<OUString> Query(2);
+        Query[0] = "text*";
+        Query[1] = "abbildung";
+        OUString Scope = "headingheading";
         int HitCount = 40;
 
          QueryStatement queryStatement( HitCount,Query,Scope );
         queryResults = queryProcessor.processQuery( queryStatement );
 
-        rtl::OUString translations[2];
-        translations[0] = rtl::OUString( "#HLP#" );
-        translations[1] = rtl::OUString( "vnd.sun.star.help://" );
+        OUString translations[2];
+        translations[0] = "#HLP#";
+        translations[1] = "vnd.sun.star.help://";
 
         PrefixTranslator* translator =  PrefixTranslator::makePrefixTranslator( translations,2 );
 

xmlhelp/source/treeview/tvfactory.hxx

@@ -68,17 +68,17 @@ namespace treeview {
 
 
         // XServiceInfo
-        virtual rtl::OUString SAL_CALL
+        virtual OUString SAL_CALL
         getImplementationName(
             void )
             throw( com::sun::star::uno::RuntimeException );
 
         virtual sal_Bool SAL_CALL
         supportsService(
-            const rtl::OUString& ServiceName )
+            const OUString& ServiceName )
             throw(com::sun::star::uno::RuntimeException );
 
-        virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames(
             void )
             throw( com::sun::star::uno::RuntimeException );
@@ -87,26 +87,26 @@ namespace treeview {
 
         virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
         createInstance(
-            const rtl::OUString& aServiceSpecifier )
+            const OUString& aServiceSpecifier )
             throw( com::sun::star::uno::Exception,
                    com::sun::star::uno::RuntimeException );
 
         virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
         createInstanceWithArguments(
-            const rtl::OUString& ServiceSpecifier,
+            const OUString& ServiceSpecifier,
             const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments )
             throw( com::sun::star::uno::Exception,
                    com::sun::star::uno::RuntimeException);
 
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
         getAvailableServiceNames( )
             throw( com::sun::star::uno::RuntimeException );
 
         // Other
 
-        static rtl::OUString SAL_CALL getImplementationName_static();
+        static OUString SAL_CALL getImplementationName_static();
 
-        static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+        static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
 
         static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL
         createServiceFactory(