diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 18 | ||||
| -rw-r--r-- | framework/inc/classes/servicemanager.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/services/logindialog.hxx | 77 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodule.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodule.hxx | 3 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 1 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxbasecontroller.hxx | 3 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 23 | ||||
| -rw-r--r-- | sfx2/source/inc/eventsupplier.hxx | 11 | ||||
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 34 | ||||
| -rw-r--r-- | sw/source/ui/uno/unomodule.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/uno/unomodule.hxx | 3 | ||||
| -rw-r--r-- | unotools/inc/unotools/internaloptions.hxx | 5 |
13 files changed, 90 insertions, 99 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 91c7531ef0e5..c6cb535f6707 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -756,7 +756,7 @@ sal_Bool Desktop::QueryExit() const sal_Char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto"; Reference< ::com::sun::star::frame::XDesktop > - xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), + xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY ); Reference < ::com::sun::star::beans::XPropertySet > xPropertySet( xDesktop, UNO_QUERY ); @@ -764,7 +764,7 @@ sal_Bool Desktop::QueryExit() { Any a; a <<= (sal_Bool)sal_True; - xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); } sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() ); @@ -774,7 +774,7 @@ sal_Bool Desktop::QueryExit() { Any a; a <<= (sal_Bool)sal_False; - xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); } else { @@ -2488,11 +2488,11 @@ void Desktop::OpenClients() try { Reference< XDispatch > xRecovery( - ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.AutoRecovery")) ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.AutoRecovery")) ), ::com::sun::star::uno::UNO_QUERY_THROW ); Reference< XURLTransformer > xParser( - ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), ::com::sun::star::uno::UNO_QUERY_THROW ); css::util::URL aCmd; @@ -2537,7 +2537,7 @@ void Desktop::OpenClients() May be we can check the desktop if some documents are existing there. */ Reference< XFramesSupplier > xTasksSupplier( - ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY_THROW ); Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW ); if ( xList->hasElements() ) @@ -2665,7 +2665,7 @@ void Desktop::OpenClients() // no default document if a document was loaded by recovery or by command line or if soffice is used as server Reference< XFramesSupplier > xTasksSupplier( - ::comphelper::getProcessServiceFactory()->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY_THROW ); Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW ); if ( xList->hasElements() || rArgs.IsServer() ) @@ -2799,7 +2799,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) // find active task - the active task is always a visible task ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier > - xDesktop( xSMGR->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), + xDesktop( xSMGR->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTask = xDesktop->getActiveFrame(); if ( !xTask.is() ) @@ -2925,7 +2925,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > - xDesktop( xSMGR->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), + xDesktop( xSMGR->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY ); // check provider ... we know it's weak reference only diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx index 369cf544427f..e8692a934be4 100644 --- a/framework/inc/classes/servicemanager.hxx +++ b/framework/inc/classes/servicemanager.hxx @@ -55,7 +55,6 @@ namespace framework{ #define REFERENCE ::com::sun::star::uno::Reference #define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define OUSTRING ::rtl::OUString #define MUTEX ::osl::Mutex //_________________________________________________________________________________________________________________ @@ -169,7 +168,7 @@ class ServiceManager @onerror We return a null-reference. *//*-*****************************************************************************************************/ - REFERENCE< XMULTISERVICEFACTORY > getSharedUNOServiceManager( const OUSTRING& sUserRegistryFile ); + REFERENCE< XMULTISERVICEFACTORY > getSharedUNOServiceManager( const ::rtl::OUString& sUserRegistryFile ); /*-****************************************************************************************************//** @short return a reference to a uno servicemanager instance which use your specified user registry file only @@ -190,7 +189,7 @@ class ServiceManager @onerror We return a null-reference. *//*-*****************************************************************************************************/ - REFERENCE< XMULTISERVICEFACTORY > getPrivateUNOServiceManager( const OUSTRING& sUserRegistryFile ); + REFERENCE< XMULTISERVICEFACTORY > getPrivateUNOServiceManager( const ::rtl::OUString& sUserRegistryFile ); //------------------------------------------------------------------------------------------------------------- // protected methods @@ -234,7 +233,7 @@ class ServiceManager @onerror Return a NULL-reference. *//*-*****************************************************************************************************/ - REFERENCE< XMULTISERVICEFACTORY > impl_createManager( const OUSTRING& sRegistryFile ); + REFERENCE< XMULTISERVICEFACTORY > impl_createManager( const ::rtl::OUString& sRegistryFile ); //------------------------------------------------------------------------------------------------------------- // debug methods diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index 50ac0c7d7879..eed512ea22e1 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -81,7 +81,6 @@ namespace framework{ #define IPROPERTYARRAYHELPER ::cppu::IPropertyArrayHelper #define OBROADCASTHELPER ::cppu::OBroadcastHelper #define OPROPERTYSETHELPER ::cppu::OPropertySetHelper -#define OUSTRING ::rtl::OUString #define OWEAKOBJECT ::cppu::OWeakObject #define PROPERTY ::com::sun::star::beans::Property #define REFERENCE ::com::sun::star::uno::Reference @@ -188,34 +187,34 @@ namespace framework{ struct tIMPL_DialogData { - OUSTRING sUserName ; - OUSTRING sPassword ; - SEQUENCE< OUSTRING > seqServerList ; + ::rtl::OUString sUserName ; + ::rtl::OUString sPassword ; + SEQUENCE< ::rtl::OUString > seqServerList ; sal_Int32 nActiveServer ; - OUSTRING sConnectionType ; + ::rtl::OUString sConnectionType ; LOCALE aLanguage ; sal_Int32 nPortHttp ; sal_Int32 nPortHttps ; ANY aParentWindow ; - OUSTRING sSecurityProxy ; - OUSTRING sUseProxy ; - OUSTRING sDialog ; + ::rtl::OUString sSecurityProxy ; + ::rtl::OUString sUseProxy ; + ::rtl::OUString sDialog ; sal_Bool bProxyChanged ; // default ctor to initialize empty structure. tIMPL_DialogData() - : sUserName ( OUSTRING() ) - , sPassword ( OUSTRING() ) - , seqServerList ( SEQUENCE< OUSTRING >() ) + : sUserName ( ::rtl::OUString() ) + , sPassword ( ::rtl::OUString() ) + , seqServerList ( SEQUENCE< ::rtl::OUString >() ) , nActiveServer ( 1 ) - , sConnectionType ( OUSTRING() ) - , aLanguage ( OUSTRING(), OUSTRING(), OUSTRING() ) + , sConnectionType ( ::rtl::OUString() ) + , aLanguage ( ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString() ) , nPortHttp ( 0 ) , nPortHttps ( 0 ) , aParentWindow ( ) - , sSecurityProxy ( OUSTRING() ) - , sUseProxy ( OUSTRING() ) - , sDialog ( OUSTRING() ) + , sSecurityProxy ( ::rtl::OUString() ) + , sUseProxy ( ::rtl::OUString() ) + , sDialog ( ::rtl::OUString() ) , bProxyChanged ( sal_False ) { } @@ -362,7 +361,7 @@ class cIMPL_Dialog : public ModalDialog @onerror - *//*-*****************************************************************************************************/ - void getProxyHostPort( const OUSTRING& aProxyHostPort, OUSTRING& aHost, OUSTRING& aPort ); + void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort ); /*-****************************************************************************************************//** @short get a ressource for given id from right ressource file @@ -419,8 +418,8 @@ class cIMPL_Dialog : public ModalDialog Point m_colOKButtonPos ; Point m_colCancelButtonPos ; Point m_colAdditionalButtonPos ; - OUSTRING m_colButtonAddText ; - OUSTRING m_expButtonAddText ; + ::rtl::OUString m_colButtonAddText ; + ::rtl::OUString m_expButtonAddText ; tIMPL_DialogData m_aDataSet ; }; @@ -531,7 +530,7 @@ class LoginDialog : public XTYPEPROVIDER , @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setTitle( const OUSTRING& sTitle ) throw( RUNTIMEEXCEPTION ); + virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw( RUNTIMEEXCEPTION ); /*-****************************************************************************************************//** @short return the current title of this dialog @@ -545,7 +544,7 @@ class LoginDialog : public XTYPEPROVIDER , @onerror - *//*-*****************************************************************************************************/ - virtual OUSTRING SAL_CALL getTitle() throw( RUNTIMEEXCEPTION ); + virtual ::rtl::OUString SAL_CALL getTitle() throw( RUNTIMEEXCEPTION ); /*-****************************************************************************************************//** @short show the dialog and return user reaction @@ -715,12 +714,12 @@ class LoginDialog : public XTYPEPROVIDER , @onerror - *//*-*****************************************************************************************************/ - sal_Bool impl_tryToChangeProperty( const OUSTRING& sProperty , + sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty , const ANY& aValue , ANY& aOldValue , ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); - sal_Bool impl_tryToChangeProperty( const SEQUENCE< OUSTRING >& seqProperty , + sal_Bool impl_tryToChangeProperty( const SEQUENCE< ::rtl::OUString >& seqProperty, const ANY& aValue , ANY& aOldValue , ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); @@ -794,9 +793,9 @@ class LoginDialog : public XTYPEPROVIDER , @onerror - *//*-*****************************************************************************************************/ - void impl_addServerToHistory( SEQUENCE< OUSTRING >& seqHistory , + void impl_addServerToHistory( SEQUENCE< ::rtl::OUString >& seqHistory, sal_Int32& nActiveServer , - const OUSTRING& sServer ); + const ::rtl::OUString& sServer ); /*-****************************************************************************************************//** @short helper methods to read/write properties from/to ini file @@ -812,27 +811,27 @@ class LoginDialog : public XTYPEPROVIDER , @onerror Assertions are shown. *//*-*****************************************************************************************************/ - void impl_writeUserName ( const OUSTRING& sUserName ); + void impl_writeUserName ( const ::rtl::OUString& sUserName ); void impl_writeActiveServer ( sal_Int32 nActiveServer ); - void impl_writeServerHistory ( const SEQUENCE< OUSTRING >& lHistory ); - void impl_writeConnectionType ( const OUSTRING& sConnectionType ); + void impl_writeServerHistory ( const SEQUENCE< ::rtl::OUString >& lHistory ); + void impl_writeConnectionType ( const ::rtl::OUString& sConnectionType ); void impl_writeLanguage ( const LOCALE& aLanguage ); void impl_writePortHttp ( sal_Int32 nPort ); void impl_writePortHttps ( sal_Int32 nPort ); - void impl_writeSecurityProxy ( const OUSTRING& sSecurityProxy ); - void impl_writeUseProxy ( const OUSTRING& sUseProxy ); - void impl_writeDialog ( const OUSTRING& sDialog ); + void impl_writeSecurityProxy ( const ::rtl::OUString& sSecurityProxy ); + void impl_writeUseProxy ( const ::rtl::OUString& sUseProxy ); + void impl_writeDialog ( const ::rtl::OUString& sDialog ); - OUSTRING impl_readUserName ( ); + ::rtl::OUString impl_readUserName ( ); sal_Int32 impl_readActiveServer ( ); - SEQUENCE< OUSTRING > impl_readServerHistory ( ); - OUSTRING impl_readConnectionType ( ); + SEQUENCE< ::rtl::OUString > impl_readServerHistory ( ); + ::rtl::OUString impl_readConnectionType ( ); LOCALE impl_readLanguage ( ); sal_Int32 impl_readPortHttp ( ); sal_Int32 impl_readPortHttps ( ); - OUSTRING impl_readSecurityProxy ( ); - OUSTRING impl_readUseProxy ( ); - OUSTRING impl_readDialog ( ); + ::rtl::OUString impl_readSecurityProxy ( ); + ::rtl::OUString impl_readUseProxy ( ); + ::rtl::OUString impl_readDialog ( ); //------------------------------------------------------------------------------------------------------------- // debug methods @@ -858,7 +857,7 @@ class LoginDialog : public XTYPEPROVIDER , private: sal_Bool impldbg_checkParameter_LoginDialog ( const REFERENCE< XMULTISERVICEFACTORY >& xFactory ); - sal_Bool impldbg_checkParameter_setTitle ( const OUSTRING& sTitle ); + sal_Bool impldbg_checkParameter_setTitle ( const ::rtl::OUString& sTitle ); #endif // #ifdef ENABLE_ASSERTIONS @@ -870,7 +869,7 @@ class LoginDialog : public XTYPEPROVIDER , private: REFERENCE< XMULTISERVICEFACTORY > m_xFactory ; /// reference to factory, which has created this instance - OUSTRING m_sININame ; /// full qualified path to profile UNC-notation + ::rtl::OUString m_sININame ; /// full qualified path to profile UNC-notation Config* m_pINIManager ; /// manager for full access to ini file sal_Bool m_bInExecuteMode ; /// protection against setting of properties during showing of dialog cIMPL_Dialog* m_pDialog ; /// VCL dialog diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index b2d745033434..76f6bd342939 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -122,7 +122,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SdUnoModule::queryDispatches( const } // XDispatchProvider -REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL, const OUSTRING&, sal_Int32 ) throw( RUNTIMEEXCEPTION ) +REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL, const rtl::OUString&, sal_Int32 ) throw( RUNTIMEEXCEPTION ) { SolarMutexGuard aGuard; SdDLL::Init(); diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 860501f07382..113a0bc5b9f3 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -64,7 +64,6 @@ namespace com #define SEQUENCE ::com::sun::star::uno::Sequence #define XDISPATCH ::com::sun::star::frame::XDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch -#define OUSTRING ::rtl::OUString #define UNOURL ::com::sun::star::util::URL #define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor @@ -88,7 +87,7 @@ public: // XDispatchProvider virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , - const OUSTRING & sTargetFrameName, + const ::rtl::OUString & sTargetFrameName, sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); 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 diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index 10bfbda29521..e9f74f30813f 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -130,7 +130,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SwUnoModule::queryDispatches( // XDispatchProvider REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch( - const UNOURL& aURL, const OUSTRING& /*sTargetFrameName*/, + const UNOURL& aURL, const rtl::OUString& /*sTargetFrameName*/, sal_Int32 /*eSearchFlags*/ ) throw( uno::RuntimeException ) { REFERENCE< XDISPATCH > xReturn; diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx index 84a2b54d6704..71be37c4aae0 100644 --- a/sw/source/ui/uno/unomodule.hxx +++ b/sw/source/ui/uno/unomodule.hxx @@ -64,7 +64,6 @@ namespace com #define SEQUENCE ::com::sun::star::uno::Sequence #define XDISPATCH ::com::sun::star::frame::XDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch -#define OUSTRING ::rtl::OUString #define UNOURL ::com::sun::star::util::URL #define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor @@ -88,7 +87,7 @@ public: // XDispatchProvider virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , - const OUSTRING & sTargetFrameName, + const ::rtl::OUString & sTargetFrameName, sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx index f31d639086eb..8240d94afed2 100644 --- a/unotools/inc/unotools/internaloptions.hxx +++ b/unotools/inc/unotools/internaloptions.hxx @@ -35,7 +35,6 @@ #include <unotools/options.hxx> #define MUTEX ::osl::Mutex -#define OUSTRING ::rtl::OUString /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @@ -101,8 +100,8 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options sal_Bool SlotCFGEnabled () const; sal_Bool MailUIEnabled () const; - OUSTRING GetCurrentTempURL() const; - void SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL ); + ::rtl::OUString GetCurrentTempURL() const; + void SetCurrentTempURL( const ::rtl::OUString& aNewCurrentTempURL ); private: |