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

5 files changed, 34 insertions, 38 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         ) ;
 
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 87e1c54a7c1a..02bc89f147e5 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -81,7 +81,6 @@ namespace comphelper
 #define RUNTIMEEXCEPTION            ::com::sun::star::uno::RuntimeException
 #define SEQUENCE                    ::com::sun::star::uno::Sequence
 #define UNOTYPE                     ::com::sun::star::uno::Type
-#define OUSTRING                    ::rtl::OUString
 #define OINTERFACECONTAINERHELPER   ::cppu::OInterfaceContainerHelper
 
 //--------------------------------------------------------------------------------------------------------
@@ -94,7 +93,7 @@ class SvxMacro;
 
 class SfxEvents_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameReplace, ::com::sun::star::document::XEventListener  >
 {
-    SEQUENCE< OUSTRING >            maEventNames;
+    SEQUENCE< ::rtl::OUString >     maEventNames;
     SEQUENCE< ANY >                 maEventData;
     REFERENCE< XEVENTBROADCASTER >  mxBroadcaster;
     ::osl::Mutex                    maMutex;
@@ -108,16 +107,16 @@ public:
                                ~SfxEvents_Impl();
 
     //  --- XNameReplace ---
-    virtual void SAL_CALL       replaceByName( const OUSTRING & aName, const ANY & aElement )
+    virtual void SAL_CALL       replaceByName( const ::rtl::OUString & aName, const ANY & aElement )
                                     throw( ILLEGALARGUMENTEXCEPTION, NOSUCHELEMENTEXCEPTION,
                                            WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION );
 
     //  --- XNameAccess ( parent of XNameReplace ) ---
-    virtual ANY SAL_CALL        getByName( const OUSTRING& aName )
+    virtual ANY SAL_CALL        getByName( const ::rtl::OUString& aName )
                                     throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION,
                                            RUNTIMEEXCEPTION );
-    virtual SEQUENCE< OUSTRING > SAL_CALL getElementNames() throw ( RUNTIMEEXCEPTION );
-    virtual sal_Bool SAL_CALL   hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION );
+    virtual SEQUENCE< ::rtl::OUString > SAL_CALL getElementNames() throw ( RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL   hasByName( const ::rtl::OUString& aName ) throw ( RUNTIMEEXCEPTION );
 
     //  --- XElementAccess ( parent of XNameAccess ) ---
     virtual UNOTYPE SAL_CALL    getElementType() throw ( RUNTIMEEXCEPTION );
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index fd6506597f3b..e8d369374221 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -72,7 +72,7 @@ using ::com::sun::star::beans::PropertyValue;
 //--------------------------------------------------------------------------------------------------------
     //  --- XNameReplace ---
 //--------------------------------------------------------------------------------------------------------
-void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & rElement )
+void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const ANY & rElement )
                                 throw( ILLEGALARGUMENTEXCEPTION, NOSUCHELEMENTEXCEPTION,
                                        WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION )
 {
@@ -130,7 +130,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY &
 //--------------------------------------------------------------------------------------------------------
 //  --- XNameAccess ---
 //--------------------------------------------------------------------------------------------------------
-ANY SAL_CALL SfxEvents_Impl::getByName( const OUSTRING& aName )
+ANY SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName )
                                 throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION,
                                        RUNTIMEEXCEPTION )
 {
@@ -150,13 +150,13 @@ ANY SAL_CALL SfxEvents_Impl::getByName( const OUSTRING& aName )
 }
 
 //--------------------------------------------------------------------------------------------------------
-SEQUENCE< OUSTRING > SAL_CALL SfxEvents_Impl::getElementNames() throw ( RUNTIMEEXCEPTION )
+SEQUENCE< rtl::OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( RUNTIMEEXCEPTION )
 {
     return maEventNames;
 }
 
 //--------------------------------------------------------------------------------------------------------
-sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION )
+sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const rtl::OUString& aName ) throw ( RUNTIMEEXCEPTION )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -198,11 +198,11 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
     SEQUENCE < PROPERTYVALUE > aProperties;
     if ( aEventData >>= aProperties )
     {
-        OUSTRING        aPrefix = OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
-        OUSTRING        aType;
-        OUSTRING        aScript;
-        OUSTRING        aLibrary;
-        OUSTRING        aMacroName;
+        rtl::OUString aPrefix = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
+        rtl::OUString aType;
+        rtl::OUString aScript;
+        rtl::OUString aLibrary;
+        rtl::OUString aMacroName;
 
         sal_Int32 nCount = aProperties.getLength();
 
@@ -304,7 +304,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw(
 
     // get the event name, find the coresponding data, execute the data
 
-    OUSTRING    aName   = aEvent.EventName;
+    rtl::OUString aName   = aEvent.EventName;
     long        nCount  = maEventNames.getLength();
     long        nIndex  = 0;
     sal_Bool    bFound  = sal_False;
@@ -377,10 +377,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
 
     if ( aAny >>= aProperties )
     {
-        OUSTRING        aType;
-        OUSTRING        aScriptURL;
-        OUSTRING        aLibrary;
-        OUSTRING        aMacroName;
+        rtl::OUString aType;
+        rtl::OUString aScriptURL;
+        rtl::OUString aLibrary;
+        rtl::OUString aMacroName;
 
         long nCount = aProperties.getLength();
         long nIndex = 0;
@@ -468,7 +468,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
                 sal_Int32 nArgsPos = aScript.indexOf( '(' );
                 if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) )
                 {
-                    OUSTRING aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
+                    rtl::OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
                     if (aBasMgrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")))
                         aLibrary = pDoc->GetTitle();
                     else
@@ -485,13 +485,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
         }
         else if ( !aMacroName.isEmpty() )
         {
-            aScript = OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
+            aScript = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
             if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
                 aScript += String('.');
 
             aScript += String('/');
             aScript += aMacroName;
-            aScript += OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) );
+            aScript += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) );
         }
         else
             // wrong properties