1 files changed, 19 insertions, 20 deletions

diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index e6557cc4cb26..f6037a2325ea 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -24,65 +24,64 @@
 #include "osl/mutex.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-
-namespace rtl { class OUStringBuffer; }
+#include "rtl/ustrbuf.hxx"
 
 namespace stoc { namespace uriproc {
 
 class UriReference {
 public:
     UriReference(
-        rtl::OUString const & scheme, bool isHierarchical, bool hasAuthority,
-        rtl::OUString const & authority, rtl::OUString const & path,
-        bool hasQuery, rtl::OUString const & query);
+        OUString const & scheme, bool isHierarchical, bool hasAuthority,
+        OUString const & authority, OUString const & path,
+        bool hasQuery, OUString const & query);
 
     ~UriReference();
 
-    rtl::OUString getUriReference()
+    OUString getUriReference()
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool isAbsolute() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getScheme() throw (com::sun::star::uno::RuntimeException);
+    OUString getScheme() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getSchemeSpecificPart()
+    OUString getSchemeSpecificPart()
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool isHierarchical() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasAuthority() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getAuthority() throw (com::sun::star::uno::RuntimeException);
+    OUString getAuthority() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getPath() throw (com::sun::star::uno::RuntimeException);
+    OUString getPath() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasRelativePath() throw (com::sun::star::uno::RuntimeException);
 
     sal_Int32 getPathSegmentCount()
         throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getPathSegment(sal_Int32 index)
+    OUString getPathSegment(sal_Int32 index)
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasQuery() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getQuery() throw (com::sun::star::uno::RuntimeException);
+    OUString getQuery() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasFragment() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getFragment() throw (com::sun::star::uno::RuntimeException);
+    OUString getFragment() throw (com::sun::star::uno::RuntimeException);
 
-    void setFragment(rtl::OUString const & fragment)
+    void setFragment(OUString const & fragment)
         throw (com::sun::star::uno::RuntimeException);
 
     void clearFragment() throw (com::sun::star::uno::RuntimeException);
 
     osl::Mutex m_mutex;
-    rtl::OUString m_scheme;
-    rtl::OUString m_authority;
-    rtl::OUString m_path;
-    rtl::OUString m_query;
-    rtl::OUString m_fragment;
+    OUString m_scheme;
+    OUString m_authority;
+    OUString m_path;
+    OUString m_query;
+    OUString m_fragment;
     bool m_isHierarchical;
     bool m_hasAuthority;
     bool m_hasQuery;
@@ -92,7 +91,7 @@ private:
     UriReference(UriReference &); // not implemented
     void operator =(UriReference); // not implemented
 
-    void appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const;
+    void appendSchemeSpecificPart(OUStringBuffer & buffer) const;
 };
 
 } }