remove '#define OUSTRING ::rtl::OUString'

3 files changed, 12 insertions, 15 deletions

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index b07b97e7b721..ac25f43c20f2 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -65,7 +65,6 @@ class Timer;
 class SfxItemSet;
 class DateTime;
 
-#define OUSTRING                    ::rtl::OUString
 #define XMULTISERVICEFACTORY        ::com::sun::star::lang::XMultiServiceFactory
 #define XSERVICEINFO                ::com::sun::star::lang::XServiceInfo
 #define OWEAKOBJECT                 ::cppu::OWeakObject
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index b1553f1e06be..c8f84fa38b77 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -76,7 +76,6 @@
 #define RUNTIMEEXCEPTION        ::com::sun::star::uno::RuntimeException
 #define UNOTYPE                 ::com::sun::star::uno::Type
 #define UNOURL                  ::com::sun::star::util::URL
-#define OUSTRING                ::rtl::OUString
 #define XCONTEXTMENUINTERCEPTOR ::com::sun::star::ui::XContextMenuInterceptor
 
 //________________________________________________________________________________________________________
@@ -286,7 +285,7 @@ public:
     */
 
     virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch(  const   UNOURL &            aURL            ,
-                                                            const   OUSTRING &          sTargetFrameName,
+                                                            const   ::rtl::OUString &   sTargetFrameName,
                                                                     FrameSearchFlags    eSearchFlags    ) throw( RUNTIMEEXCEPTION ) ;
 
     /**___________________________________________________________________________________________________
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index a0cf50414daa..25c5312548bb 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -162,7 +162,6 @@
 #define PROPERTYVALUE           ::com::sun::star::beans::PropertyValue
 #define REFERENCE               ::com::sun::star::uno::Reference
 #define MUTEX                   ::osl::Mutex
-#define OUSTRING                ::rtl::OUString
 #define UNOTYPE                 ::com::sun::star::uno::Type
 #define XVIEWDATASUPPLIER       ::com::sun::star::document::XViewDataSupplier
 #define XINDEXACCESS            ::com::sun::star::container::XIndexAccess
@@ -416,21 +415,21 @@ public:
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
-    virtual void SAL_CALL createLibrary( const OUSTRING& LibName, const OUSTRING& Password,
-        const OUSTRING& ExternalSourceURL, const OUSTRING& LinkTargetURL )
+    virtual void SAL_CALL createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password,
+        const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL )
             throw(ELEMENTEXISTEXCEPTION, RUNTIMEEXCEPTION);
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
-    virtual void SAL_CALL addModule( const OUSTRING& LibraryName, const OUSTRING& ModuleName,
-        const OUSTRING& Language, const OUSTRING& Source )
+    virtual void SAL_CALL addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName,
+        const ::rtl::OUString& Language, const ::rtl::OUString& Source )
             throw( NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION);
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
-    virtual void SAL_CALL addDialog( const OUSTRING& LibraryName, const OUSTRING& DialogName,
+    virtual void SAL_CALL addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName,
         const ::com::sun::star::uno::Sequence< sal_Int8 >& Data )
             throw(NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION);
 
@@ -579,7 +578,7 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL attachResource(   const   OUSTRING&                   sURL    ,
+    virtual sal_Bool SAL_CALL attachResource(   const   ::rtl::OUString& sURL,
                                                 const   ::com::sun::star::uno::Sequence< PROPERTYVALUE >&   aArgs   )
         throw (::com::sun::star::uno::RuntimeException);
 
@@ -596,7 +595,7 @@ public:
         @onerror    -
     */
 
-    virtual OUSTRING SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
         @short      -
@@ -933,7 +932,7 @@ public:
         @onerror    -
     */
 
-    virtual OUSTRING SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
         @short      -
@@ -978,7 +977,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL storeAsURL(   const   OUSTRING&                   sURL            ,
+    virtual void SAL_CALL storeAsURL(   const   ::rtl::OUString& sURL,
                                         const   ::com::sun::star::uno::Sequence< PROPERTYVALUE >&   seqArguments    )
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ;
 
@@ -995,7 +994,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL storeToURL(   const   OUSTRING&                   sURL            ,
+    virtual void SAL_CALL storeToURL(   const   ::rtl::OUString& sURL,
                                         const   ::com::sun::star::uno::Sequence< PROPERTYVALUE >&   seqArguments    )
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
@@ -1533,7 +1532,7 @@ private:
     SAL_DLLPRIVATE void ListenForStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
     SAL_DLLPRIVATE ::rtl::OUString GetMediumFilterName_Impl();
 
-    SAL_DLLPRIVATE void impl_store( const   OUSTRING&                   sURL            ,
+    SAL_DLLPRIVATE void impl_store( const ::rtl::OUString& sURL,
                         const   ::com::sun::star::uno::Sequence< PROPERTYVALUE >&   seqArguments    ,
                                 sal_Bool                    bSaveTo         ) ;