String->OUString in svl urifilter and restrictedpaths

Change-Id: If11b8752c3aa21554c3ee06de07d63639695e284

3 files changed, 15 insertions, 18 deletions

diff --git a/svl/inc/svl/adrparse.hxx b/svl/inc/svl/adrparse.hxx
index f788b03300fb..063ba11a95a9 100644
--- a/svl/inc/svl/adrparse.hxx
+++ b/svl/inc/svl/adrparse.hxx
@@ -21,21 +21,20 @@
 #define _ADRPARSE_HXX
 
 #include "svl/svldllapi.h"
-#include <tools/string.hxx>
 #include <vector>
 
 //============================================================================
 struct SvAddressEntry_Impl
 {
-    rtl::OUString m_aAddrSpec;
-    rtl::OUString m_aRealName;
+    OUString m_aAddrSpec;
+    OUString m_aRealName;
 
     SvAddressEntry_Impl()
     {
     }
 
-    SvAddressEntry_Impl(const rtl::OUString& rTheAddrSpec,
-                        const rtl::OUString& rTheRealName)
+    SvAddressEntry_Impl(const OUString& rTheAddrSpec,
+                        const OUString& rTheRealName)
         : m_aAddrSpec(rTheAddrSpec)
         , m_aRealName(rTheRealName)
     {
@@ -55,19 +54,19 @@ class SVL_DLLPUBLIC SvAddressParser
     bool m_bHasFirst;
 
 public:
-    SvAddressParser(const rtl::OUString& rInput);
+    SvAddressParser(const OUString& rInput);
 
     ~SvAddressParser();
 
     sal_Int32 Count() const { return m_bHasFirst ? m_aRest.size() + 1 : 0; }
 
-    const rtl::OUString& GetEmailAddress(sal_Int32 nIndex) const
+    const OUString& GetEmailAddress(sal_Int32 nIndex) const
     {
         return nIndex == 0 ? m_aFirst.m_aAddrSpec :
                              m_aRest[ nIndex - 1 ]->m_aAddrSpec;
     }
 
-    const rtl::OUString& GetRealName(sal_Int32 nIndex) const
+    const OUString& GetRealName(sal_Int32 nIndex) const
     {
         return nIndex == 0 ? m_aFirst.m_aRealName :
                              m_aRest[ nIndex - 1 ]->m_aRealName;
diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 92ece853aa1e..85326a569654 100644
--- a/svl/inc/svl/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
@@ -22,7 +22,6 @@
 
 #include <svl/urlfilter.hxx>
 #include <svl/svldllapi.h>
-#include <tools/string.hxx>
 
 #include <vector>
 
@@ -31,7 +30,7 @@ namespace svt
     class SVL_DLLPUBLIC RestrictedPaths : public IUrlFilter
     {
     private:
-        ::std::vector< String >     m_aUnrestrictedURLs;
+        ::std::vector< OUString >     m_aUnrestrictedURLs;
         bool                        m_bFilterIsEnabled;
 
     public:
@@ -39,7 +38,7 @@ namespace svt
         virtual ~RestrictedPaths();
 
         inline bool hasFilter() const { return !m_aUnrestrictedURLs.empty(); }
-        inline const ::std::vector< String >& getFilter() const { return m_aUnrestrictedURLs; }
+        inline const ::std::vector< OUString >& getFilter() const { return m_aUnrestrictedURLs; }
 
         inline void enableFilter( bool _bEnable ) { m_bFilterIsEnabled = _bEnable; }
         inline bool isFilterEnabled() const { return m_bFilterIsEnabled; }
@@ -53,7 +52,7 @@ namespace svt
 
             <p>If no "access restriction" is effective, this method always returns <TRUE/>.</p>
         */
-        virtual bool                isUrlAllowed( const String& _rURL ) const;
+        virtual bool                isUrlAllowed( const OUString& _rURL ) const;
 
         /** checks URL access permissions
 
@@ -66,7 +65,7 @@ namespace svt
 
             <p>If no "access restriction" is effective, this method always returns <TRUE/>.</p>
         */
-        bool                        isUrlAllowed( const String& _rURL, bool allowParents ) const;
+        bool                        isUrlAllowed( const OUString& _rURL, bool allowParents ) const;
     };
 
 }   // namespace svt
diff --git a/svl/inc/svl/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index 9e13d4393c66..abcf0fd07091 100644
--- a/svl/inc/svl/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.hxx
@@ -20,7 +20,6 @@
 #ifndef SVTOOLS_URL_FILTER_HXX
 #define SVTOOLS_URL_FILTER_HXX
 
-#include <tools/string.hxx>
 #include <tools/wldcrd.hxx>
 #include <functional>
 #include <vector>
@@ -29,7 +28,7 @@
 class IUrlFilter
 {
 public:
-    virtual bool isUrlAllowed( const String& _rURL ) const = 0;
+    virtual bool isUrlAllowed( const OUString& _rURL ) const = 0;
 
 protected:
     virtual inline ~IUrlFilter() = 0;
@@ -40,16 +39,16 @@ inline IUrlFilter::~IUrlFilter() {}
 struct FilterMatch : public ::std::unary_function< bool, WildCard >
 {
 private:
-    const String&   m_rCompareString;
+    const OUString&   m_rCompareString;
 public:
-    FilterMatch( const String& _rCompareString ) : m_rCompareString( _rCompareString ) { }
+    FilterMatch( const OUString& _rCompareString ) : m_rCompareString( _rCompareString ) { }
 
     bool operator()( const WildCard& _rMatcher )
     {
         return _rMatcher.Matches( m_rCompareString ) ? true : false;
     }
 
-    static void createWildCardFilterList(const String& _rFilterList,::std::vector< WildCard >& _rFilters);
+    static void createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters);
 };
 
 #endif // SVTOOLS_URL_FILTER_HXX