Skip to content

C
core
Kaydet (Commit) 9cde190a authored tarafından Ivan Timofeev's avatar Ivan Timofeev
Dosyalara gözat
Seçenekler

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

üst 5a388e5c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 60 deletions
desktop/source/app/app.cxx
Dosyayı görüntüle @ 9cde190a
...@@ -756,7 +756,7 @@ sal_Bool Desktop::QueryExit() ...@@ -756,7 +756,7 @@ sal_Bool Desktop::QueryExit()
const sal_Char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto"; const sal_Char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto";
Reference< ::com::sun::star::frame::XDesktop > 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 ); UNO_QUERY );
Reference < ::com::sun::star::beans::XPropertySet > xPropertySet( xDesktop, UNO_QUERY ); Reference < ::com::sun::star::beans::XPropertySet > xPropertySet( xDesktop, UNO_QUERY );
...@@ -764,7 +764,7 @@ sal_Bool Desktop::QueryExit() ...@@ -764,7 +764,7 @@ sal_Bool Desktop::QueryExit()
{ {
Any a; Any a;
a <<= (sal_Bool)sal_True; 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() ); sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() );
...@@ -774,7 +774,7 @@ sal_Bool Desktop::QueryExit() ...@@ -774,7 +774,7 @@ sal_Bool Desktop::QueryExit()
{ {
Any a; Any a;
a <<= (sal_Bool)sal_False; a <<= (sal_Bool)sal_False;
xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
} }
else else
{ {
...@@ -2488,11 +2488,11 @@ void Desktop::OpenClients() ...@@ -2488,11 +2488,11 @@ void Desktop::OpenClients()
try try
{ {
Reference< XDispatch > xRecovery( 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 ); ::com::sun::star::uno::UNO_QUERY_THROW );
Reference< XURLTransformer > xParser( 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 ); ::com::sun::star::uno::UNO_QUERY_THROW );
css::util::URL aCmd; css::util::URL aCmd;
...@@ -2537,7 +2537,7 @@ void Desktop::OpenClients() ...@@ -2537,7 +2537,7 @@ void Desktop::OpenClients()
May be we can check the desktop if some documents are existing there. May be we can check the desktop if some documents are existing there.
*/ */
Reference< XFramesSupplier > xTasksSupplier( 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 ); ::com::sun::star::uno::UNO_QUERY_THROW );
Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW ); Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW );
if ( xList->hasElements() ) if ( xList->hasElements() )
...@@ -2665,7 +2665,7 @@ void Desktop::OpenClients() ...@@ -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 // no default document if a document was loaded by recovery or by command line or if soffice is used as server
Reference< XFramesSupplier > xTasksSupplier( 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 ); ::com::sun::star::uno::UNO_QUERY_THROW );
Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW ); Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY_THROW );
if ( xList->hasElements() || rArgs.IsServer() ) if ( xList->hasElements() || rArgs.IsServer() )
...@@ -2799,7 +2799,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) ...@@ -2799,7 +2799,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
// find active task - the active task is always a visible task // find active task - the active task is always a visible task
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier > ::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::UNO_QUERY );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTask = xDesktop->getActiveFrame(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTask = xDesktop->getActiveFrame();
if ( !xTask.is() ) if ( !xTask.is() )
...@@ -2925,7 +2925,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) ...@@ -2925,7 +2925,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > 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 ); ::com::sun::star::uno::UNO_QUERY );
// check provider ... we know it's weak reference only // check provider ... we know it's weak reference only
......
framework/inc/classes/servicemanager.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -55,7 +55,6 @@ namespace framework{ ...@@ -55,7 +55,6 @@ namespace framework{
#define REFERENCE ::com::sun::star::uno::Reference #define REFERENCE ::com::sun::star::uno::Reference
#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory #define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
#define OUSTRING ::rtl::OUString
#define MUTEX ::osl::Mutex #define MUTEX ::osl::Mutex
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
...@@ -169,7 +168,7 @@ class ServiceManager ...@@ -169,7 +168,7 @@ class ServiceManager
@onerror We return a null-reference. @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 @short return a reference to a uno servicemanager instance which use your specified user registry file only
...@@ -190,7 +189,7 @@ class ServiceManager ...@@ -190,7 +189,7 @@ class ServiceManager
@onerror We return a null-reference. @onerror We return a null-reference.
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
REFERENCE< XMULTISERVICEFACTORY > getPrivateUNOServiceManager( const OUSTRING& sUserRegistryFile ); REFERENCE< XMULTISERVICEFACTORY > getPrivateUNOServiceManager( const ::rtl::OUString& sUserRegistryFile );
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
// protected methods // protected methods
...@@ -234,7 +233,7 @@ class ServiceManager ...@@ -234,7 +233,7 @@ class ServiceManager
@onerror Return a NULL-reference. @onerror Return a NULL-reference.
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
REFERENCE< XMULTISERVICEFACTORY > impl_createManager( const OUSTRING& sRegistryFile ); REFERENCE< XMULTISERVICEFACTORY > impl_createManager( const ::rtl::OUString& sRegistryFile );
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
// debug methods // debug methods
......
sd/source/ui/unoidl/unomodule.cxx
Dosyayı görüntüle @ 9cde190a
...@@ -122,7 +122,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SdUnoModule::queryDispatches( const ...@@ -122,7 +122,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SdUnoModule::queryDispatches( const
} }
// XDispatchProvider // 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; SolarMutexGuard aGuard;
SdDLL::Init(); SdDLL::Init();
......
sd/source/ui/unoidl/unomodule.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -64,7 +64,6 @@ namespace com ...@@ -64,7 +64,6 @@ namespace com
#define SEQUENCE ::com::sun::star::uno::Sequence #define SEQUENCE ::com::sun::star::uno::Sequence
#define XDISPATCH ::com::sun::star::frame::XDispatch #define XDISPATCH ::com::sun::star::frame::XDispatch
#define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch
#define OUSTRING ::rtl::OUString
#define UNOURL ::com::sun::star::util::URL #define UNOURL ::com::sun::star::util::URL
#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor #define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
...@@ -88,7 +87,7 @@ public: ...@@ -88,7 +87,7 @@ public:
// XDispatchProvider // XDispatchProvider
virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
const OUSTRING & sTargetFrameName, const ::rtl::OUString & sTargetFrameName,
sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
......
sfx2/inc/sfx2/docfile.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -65,7 +65,6 @@ class Timer; ...@@ -65,7 +65,6 @@ class Timer;
class SfxItemSet; class SfxItemSet;
class DateTime; class DateTime;
#define OUSTRING ::rtl::OUString
#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory #define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo #define XSERVICEINFO ::com::sun::star::lang::XServiceInfo
#define OWEAKOBJECT ::cppu::OWeakObject #define OWEAKOBJECT ::cppu::OWeakObject
......
sfx2/inc/sfx2/sfxbasecontroller.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException #define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
#define UNOTYPE ::com::sun::star::uno::Type #define UNOTYPE ::com::sun::star::uno::Type
#define UNOURL ::com::sun::star::util::URL #define UNOURL ::com::sun::star::util::URL
#define OUSTRING ::rtl::OUString
#define XCONTEXTMENUINTERCEPTOR ::com::sun::star::ui::XContextMenuInterceptor #define XCONTEXTMENUINTERCEPTOR ::com::sun::star::ui::XContextMenuInterceptor
//________________________________________________________________________________________________________ //________________________________________________________________________________________________________
...@@ -286,7 +285,7 @@ public: ...@@ -286,7 +285,7 @@ public:
*/ */
virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
const OUSTRING & sTargetFrameName, const ::rtl::OUString & sTargetFrameName,
FrameSearchFlags eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; FrameSearchFlags eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
/**___________________________________________________________________________________________________ /**___________________________________________________________________________________________________
......
sfx2/inc/sfx2/sfxbasemodel.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -162,7 +162,6 @@ ...@@ -162,7 +162,6 @@
#define PROPERTYVALUE ::com::sun::star::beans::PropertyValue #define PROPERTYVALUE ::com::sun::star::beans::PropertyValue
#define REFERENCE ::com::sun::star::uno::Reference #define REFERENCE ::com::sun::star::uno::Reference
#define MUTEX ::osl::Mutex #define MUTEX ::osl::Mutex
#define OUSTRING ::rtl::OUString
#define UNOTYPE ::com::sun::star::uno::Type #define UNOTYPE ::com::sun::star::uno::Type
#define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier #define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier
#define XINDEXACCESS ::com::sun::star::container::XIndexAccess #define XINDEXACCESS ::com::sun::star::container::XIndexAccess
...@@ -416,21 +415,21 @@ public: ...@@ -416,21 +415,21 @@ public:
/**___________________________________________________________________________________________________ /**___________________________________________________________________________________________________
@seealso XStarBasicAccess @seealso XStarBasicAccess
*/ */
virtual void SAL_CALL createLibrary( const OUSTRING& LibName, const OUSTRING& Password, virtual void SAL_CALL createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password,
const OUSTRING& ExternalSourceURL, const OUSTRING& LinkTargetURL ) const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL )
throw(ELEMENTEXISTEXCEPTION, RUNTIMEEXCEPTION); throw(ELEMENTEXISTEXCEPTION, RUNTIMEEXCEPTION);
/**___________________________________________________________________________________________________ /**___________________________________________________________________________________________________
@seealso XStarBasicAccess @seealso XStarBasicAccess
*/ */
virtual void SAL_CALL addModule( const OUSTRING& LibraryName, const OUSTRING& ModuleName, virtual void SAL_CALL addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName,
const OUSTRING& Language, const OUSTRING& Source ) const ::rtl::OUString& Language, const ::rtl::OUString& Source )
throw( NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION); throw( NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION);
/**___________________________________________________________________________________________________ /**___________________________________________________________________________________________________
@seealso XStarBasicAccess @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 ) const ::com::sun::star::uno::Sequence< sal_Int8 >& Data )
throw(NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION); throw(NOSUCHELEMENTEXCEPTION, RUNTIMEEXCEPTION);
...@@ -579,7 +578,7 @@ public: ...@@ -579,7 +578,7 @@ public:
@onerror - @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 ) const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aArgs )
throw (::com::sun::star::uno::RuntimeException); throw (::com::sun::star::uno::RuntimeException);
...@@ -596,7 +595,7 @@ public: ...@@ -596,7 +595,7 @@ public:
@onerror - @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 - @short -
...@@ -933,7 +932,7 @@ public: ...@@ -933,7 +932,7 @@ public:
@onerror - @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 - @short -
...@@ -978,7 +977,7 @@ public: ...@@ -978,7 +977,7 @@ public:
@onerror - @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 ) const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ;
...@@ -995,7 +994,7 @@ public: ...@@ -995,7 +994,7 @@ public:
@onerror - @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 ) const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
...@@ -1533,7 +1532,7 @@ private: ...@@ -1533,7 +1532,7 @@ private:
SAL_DLLPRIVATE void ListenForStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); 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 ::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 , const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments ,
sal_Bool bSaveTo ) ; sal_Bool bSaveTo ) ;
......
sfx2/source/inc/eventsupplier.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -81,7 +81,6 @@ namespace comphelper ...@@ -81,7 +81,6 @@ namespace comphelper
#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException #define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
#define SEQUENCE ::com::sun::star::uno::Sequence #define SEQUENCE ::com::sun::star::uno::Sequence
#define UNOTYPE ::com::sun::star::uno::Type #define UNOTYPE ::com::sun::star::uno::Type
#define OUSTRING ::rtl::OUString
#define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper #define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper
//-------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------
...@@ -94,7 +93,7 @@ class SvxMacro; ...@@ -94,7 +93,7 @@ class SvxMacro;
class SfxEvents_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameReplace, ::com::sun::star::document::XEventListener > 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; SEQUENCE< ANY > maEventData;
REFERENCE< XEVENTBROADCASTER > mxBroadcaster; REFERENCE< XEVENTBROADCASTER > mxBroadcaster;
::osl::Mutex maMutex; ::osl::Mutex maMutex;
...@@ -108,16 +107,16 @@ public: ...@@ -108,16 +107,16 @@ public:
~SfxEvents_Impl(); ~SfxEvents_Impl();
// --- XNameReplace --- // --- 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, throw( ILLEGALARGUMENTEXCEPTION, NOSUCHELEMENTEXCEPTION,
WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION ); WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION );
// --- XNameAccess ( parent of XNameReplace ) --- // --- XNameAccess ( parent of XNameReplace ) ---
virtual ANY SAL_CALL getByName( const OUSTRING& aName ) virtual ANY SAL_CALL getByName( const ::rtl::OUString& aName )
throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION, throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION,
RUNTIMEEXCEPTION ); RUNTIMEEXCEPTION );
virtual SEQUENCE< OUSTRING > SAL_CALL getElementNames() throw ( RUNTIMEEXCEPTION ); virtual SEQUENCE< ::rtl::OUString > SAL_CALL getElementNames() throw ( RUNTIMEEXCEPTION );
virtual sal_Bool SAL_CALL hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION ); virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw ( RUNTIMEEXCEPTION );
// --- XElementAccess ( parent of XNameAccess ) --- // --- XElementAccess ( parent of XNameAccess ) ---
virtual UNOTYPE SAL_CALL getElementType() throw ( RUNTIMEEXCEPTION ); virtual UNOTYPE SAL_CALL getElementType() throw ( RUNTIMEEXCEPTION );
......
sfx2/source/notify/eventsupplier.cxx
Dosyayı görüntüle @ 9cde190a
...@@ -72,7 +72,7 @@ using ::com::sun::star::beans::PropertyValue; ...@@ -72,7 +72,7 @@ using ::com::sun::star::beans::PropertyValue;
//-------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------
// --- XNameReplace --- // --- 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, throw( ILLEGALARGUMENTEXCEPTION, NOSUCHELEMENTEXCEPTION,
WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION ) WRAPPEDTARGETEXCEPTION, RUNTIMEEXCEPTION )
{ {
...@@ -130,7 +130,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & ...@@ -130,7 +130,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY &
//-------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------
// --- XNameAccess --- // --- XNameAccess ---
//-------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------
ANY SAL_CALL SfxEvents_Impl::getByName( const OUSTRING& aName ) ANY SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName )
throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION, throw( NOSUCHELEMENTEXCEPTION, WRAPPEDTARGETEXCEPTION,
RUNTIMEEXCEPTION ) RUNTIMEEXCEPTION )
{ {
...@@ -150,13 +150,13 @@ ANY SAL_CALL SfxEvents_Impl::getByName( const OUSTRING& aName ) ...@@ -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; 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 ); ::osl::MutexGuard aGuard( maMutex );
...@@ -198,11 +198,11 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg ...@@ -198,11 +198,11 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
SEQUENCE < PROPERTYVALUE > aProperties; SEQUENCE < PROPERTYVALUE > aProperties;
if ( aEventData >>= aProperties ) if ( aEventData >>= aProperties )
{ {
OUSTRING aPrefix = OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) ); rtl::OUString aPrefix = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
OUSTRING aType; rtl::OUString aType;
OUSTRING aScript; rtl::OUString aScript;
OUSTRING aLibrary; rtl::OUString aLibrary;
OUSTRING aMacroName; rtl::OUString aMacroName;
sal_Int32 nCount = aProperties.getLength(); sal_Int32 nCount = aProperties.getLength();
...@@ -304,7 +304,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( ...@@ -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 // 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 nCount = maEventNames.getLength();
long nIndex = 0; long nIndex = 0;
sal_Bool bFound = sal_False; sal_Bool bFound = sal_False;
...@@ -377,10 +377,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p ...@@ -377,10 +377,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
if ( aAny >>= aProperties ) if ( aAny >>= aProperties )
{ {
OUSTRING aType; rtl::OUString aType;
OUSTRING aScriptURL; rtl::OUString aScriptURL;
OUSTRING aLibrary; rtl::OUString aLibrary;
OUSTRING aMacroName; rtl::OUString aMacroName;
long nCount = aProperties.getLength(); long nCount = aProperties.getLength();
long nIndex = 0; long nIndex = 0;
...@@ -468,7 +468,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i ...@@ -468,7 +468,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
sal_Int32 nArgsPos = aScript.indexOf( '(' ); sal_Int32 nArgsPos = aScript.indexOf( '(' );
if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) ) 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("."))) if (aBasMgrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")))
aLibrary = pDoc->GetTitle(); aLibrary = pDoc->GetTitle();
else else
...@@ -485,13 +485,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i ...@@ -485,13 +485,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
} }
else if ( !aMacroName.isEmpty() ) 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")) ) if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
aScript += String('.'); aScript += String('.');
aScript += String('/'); aScript += String('/');
aScript += aMacroName; aScript += aMacroName;
aScript += OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) ); aScript += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) );
} }
else else
// wrong properties // wrong properties
......
sw/source/ui/uno/unomodule.cxx
Dosyayı görüntüle @ 9cde190a
...@@ -130,7 +130,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SwUnoModule::queryDispatches( ...@@ -130,7 +130,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SwUnoModule::queryDispatches(
// XDispatchProvider // XDispatchProvider
REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch( 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 ) sal_Int32 /*eSearchFlags*/ ) throw( uno::RuntimeException )
{ {
REFERENCE< XDISPATCH > xReturn; REFERENCE< XDISPATCH > xReturn;
......
sw/source/ui/uno/unomodule.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -64,7 +64,6 @@ namespace com ...@@ -64,7 +64,6 @@ namespace com
#define SEQUENCE ::com::sun::star::uno::Sequence #define SEQUENCE ::com::sun::star::uno::Sequence
#define XDISPATCH ::com::sun::star::frame::XDispatch #define XDISPATCH ::com::sun::star::frame::XDispatch
#define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch
#define OUSTRING ::rtl::OUString
#define UNOURL ::com::sun::star::util::URL #define UNOURL ::com::sun::star::util::URL
#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor #define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
...@@ -88,7 +87,7 @@ public: ...@@ -88,7 +87,7 @@ public:
// XDispatchProvider // XDispatchProvider
virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
const OUSTRING & sTargetFrameName, const ::rtl::OUString & sTargetFrameName,
sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
......
unotools/inc/unotools/internaloptions.hxx
Dosyayı görüntüle @ 9cde190a
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <unotools/options.hxx> #include <unotools/options.hxx>
#define MUTEX ::osl::Mutex #define MUTEX ::osl::Mutex
#define OUSTRING ::rtl::OUString
/*-************************************************************************************************************//** /*-************************************************************************************************************//**
@short forward declaration to our private date container implementation @short forward declaration to our private date container implementation
...@@ -101,8 +100,8 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options ...@@ -101,8 +100,8 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options
sal_Bool SlotCFGEnabled () const; sal_Bool SlotCFGEnabled () const;
sal_Bool MailUIEnabled () const; sal_Bool MailUIEnabled () const;
OUSTRING GetCurrentTempURL() const; ::rtl::OUString GetCurrentTempURL() const;
void SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL ); void SetCurrentTempURL( const ::rtl::OUString& aNewCurrentTempURL );
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment