diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /scripting | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'scripting')
39 files changed, 885 insertions, 886 deletions
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx index 4d970483d56b..783c53ecc0d0 100644 --- a/scripting/source/basprov/baslibnode.cxx +++ b/scripting/source/basprov/baslibnode.cxx @@ -42,8 +42,8 @@ namespace basprov // ============================================================================= BasicLibraryNodeImpl::BasicLibraryNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, BasicManager* pBasicManager, - const Reference< script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& sLibName, bool isAppScript ) + const OUString& sScriptingContext, BasicManager* pBasicManager, + const Reference< script::XLibraryContainer >& xLibContainer, const OUString& sLibName, bool isAppScript ) :m_xContext( rxContext ) ,m_sScriptingContext( sScriptingContext ) ,m_pBasicManager( pBasicManager ) @@ -68,7 +68,7 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException) + OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -91,9 +91,9 @@ namespace basprov StarBASIC* pBasic = m_pBasicManager->GetLib( m_sLibName ); if ( pBasic && m_xLibrary.is() ) { - Sequence< ::rtl::OUString > aNames = m_xLibrary->getElementNames(); + Sequence< OUString > aNames = m_xLibrary->getElementNames(); sal_Int32 nCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); aChildNodes.realloc( nCount ); Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray(); diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index 842c4fa94b84..561d4b88ede8 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -46,23 +46,23 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; BasicManager* m_pBasicManager; ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLibrary; - ::rtl::OUString m_sLibName; + OUString m_sLibName; bool m_bIsAppScript; public: BasicLibraryNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, BasicManager* pBasicManager, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, - const ::rtl::OUString& sLibName, bool isAppScript=true ); + const OUString& sLibName, bool isAppScript=true ); virtual ~BasicLibraryNodeImpl(); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 5b826cd8510f..c8bdba5691e3 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -43,8 +43,8 @@ using namespace ::sf_misc; #define BASPROV_PROPERTY_ID_URI 1 #define BASPROV_PROPERTY_ID_EDITABLE 2 -#define BASPROV_PROPERTY_URI ::rtl::OUString( "URI" ) -#define BASPROV_PROPERTY_EDITABLE ::rtl::OUString( "Editable" ) +#define BASPROV_PROPERTY_URI OUString( "URI" ) +#define BASPROV_PROPERTY_EDITABLE OUString( "Editable" ) #define BASPROV_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY @@ -59,7 +59,7 @@ namespace basprov // ============================================================================= BasicMethodNodeImpl::BasicMethodNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) + const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xContext( rxContext ) @@ -76,17 +76,17 @@ namespace basprov StarBASIC* pBasic = static_cast< StarBASIC* >( pModule->GetParent() ); if ( pBasic ) { - m_sURI = ::rtl::OUString("vnd.sun.star.script:"); + m_sURI = OUString("vnd.sun.star.script:"); m_sURI += pBasic->GetName(); - m_sURI += ::rtl::OUString("."); + m_sURI += OUString("."); m_sURI += pModule->GetName(); - m_sURI += ::rtl::OUString("."); + m_sURI += OUString("."); m_sURI += m_pMethod->GetName(); - m_sURI += ::rtl::OUString("?language=Basic&location="); + m_sURI += OUString("?language=Basic&location="); if ( m_bIsAppScript ) - m_sURI += ::rtl::OUString("application"); + m_sURI += OUString("application"); else - m_sURI += ::rtl::OUString("document"); + m_sURI += OUString("document"); } } } @@ -117,11 +117,11 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException) + OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sMethodName; + OUString sMethodName; if ( m_pMethod ) sMethodName = m_pMethod->GetName(); @@ -196,7 +196,7 @@ namespace basprov // ----------------------------------------------------------------------------- - Any BasicMethodNodeImpl::invoke( const ::rtl::OUString& aFunctionName, const Sequence< Any >& aParams, + Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, RuntimeException) @@ -207,7 +207,7 @@ namespace basprov if ( aFunctionName == BASPROV_PROPERTY_EDITABLE ) { - ::rtl::OUString sDocURL, sLibName, sModName; + OUString sDocURL, sLibName, sModName; sal_uInt16 nLine1 = 0, nLine2; if ( !m_bIsAppScript ) @@ -259,24 +259,24 @@ namespace basprov Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create( m_xContext ) ); Sequence < PropertyValue > aArgs(7); - aArgs[0].Name = ::rtl::OUString("Document"); + aArgs[0].Name = OUString("Document"); aArgs[0].Value <<= sDocURL; - aArgs[1].Name = ::rtl::OUString("LibName"); + aArgs[1].Name = OUString("LibName"); aArgs[1].Value <<= sLibName; - aArgs[2].Name = ::rtl::OUString("Name"); + aArgs[2].Name = OUString("Name"); aArgs[2].Value <<= sModName; - aArgs[3].Name = ::rtl::OUString("Type"); - aArgs[3].Value <<= ::rtl::OUString("Module"); - aArgs[4].Name = ::rtl::OUString("Line"); + aArgs[3].Name = OUString("Type"); + aArgs[3].Value <<= OUString("Module"); + aArgs[4].Name = OUString("Line"); aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 ); - xHelper->executeDispatch( xProv, ::rtl::OUString(".uno:BasicIDEAppear"), ::rtl::OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, OUString(".uno:BasicIDEAppear"), OUString(), 0, aArgs ); } } } else { throw IllegalArgumentException( - ::rtl::OUString( "BasicMethodNodeImpl::invoke: function name not supported!" ), + OUString( "BasicMethodNodeImpl::invoke: function name not supported!" ), Reference< XInterface >(), 1 ); } @@ -285,7 +285,7 @@ namespace basprov // ----------------------------------------------------------------------------- - void BasicMethodNodeImpl::setValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) + void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, RuntimeException) { @@ -293,24 +293,24 @@ namespace basprov (void)aValue; throw UnknownPropertyException( - ::rtl::OUString( "BasicMethodNodeImpl::setValue: property name is unknown!" ), + OUString( "BasicMethodNodeImpl::setValue: property name is unknown!" ), Reference< XInterface >() ); } // ----------------------------------------------------------------------------- - Any BasicMethodNodeImpl::getValue( const ::rtl::OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) { (void)aPropertyName; throw UnknownPropertyException( - ::rtl::OUString( "BasicMethodNodeImpl::getValue: property name is unknown!" ), + OUString( "BasicMethodNodeImpl::getValue: property name is unknown!" ), Reference< XInterface >() ); } // ----------------------------------------------------------------------------- - sal_Bool BasicMethodNodeImpl::hasMethod( const ::rtl::OUString& aName ) throw (RuntimeException) + sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException) { sal_Bool bReturn = sal_False; if ( aName == BASPROV_PROPERTY_EDITABLE ) @@ -321,7 +321,7 @@ namespace basprov // ----------------------------------------------------------------------------- - sal_Bool BasicMethodNodeImpl::hasProperty( const ::rtl::OUString& aName ) throw (RuntimeException) + sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException) { (void)aName; diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 65e4d4120a1b..b2cd2461b469 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -55,12 +55,12 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; SbMethod* m_pMethod; bool m_bIsAppScript; // properties - ::rtl::OUString m_sURI; + OUString m_sURI; bool m_bEditable; protected: @@ -72,7 +72,7 @@ namespace basprov public: BasicMethodNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript = true ); virtual ~BasicMethodNodeImpl(); @@ -83,7 +83,7 @@ namespace basprov DECLARE_XTYPEPROVIDER() // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); @@ -100,20 +100,20 @@ namespace basprov virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL invoke( - const ::rtl::OUString& aFunctionName, + const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index e63d4d8188a8..13981b5c6e20 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -44,7 +44,7 @@ namespace basprov // ============================================================================= BasicModuleNodeImpl::BasicModuleNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, SbModule* pModule, bool isAppScript ) + const OUString& sScriptingContext, SbModule* pModule, bool isAppScript ) :m_xContext( rxContext ) ,m_sScriptingContext( sScriptingContext ) ,m_pModule( pModule ) @@ -62,11 +62,11 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException) + OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sModuleName; + OUString sModuleName; if ( m_pModule ) sModuleName = m_pModule->GetName(); diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 6f4cd2f333fd..75b330fec634 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -45,18 +45,18 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; SbModule* m_pModule; bool m_bIsAppScript; public: BasicModuleNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, SbModule* pModule, bool isAppScript = true ); virtual ~BasicModuleNodeImpl(); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 1804e3e61b6e..ed0c1f996ad7 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -67,15 +67,15 @@ namespace basprov // component operations // ============================================================================= - static ::rtl::OUString getImplementationName_BasicProviderImpl() + static OUString getImplementationName_BasicProviderImpl() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.scripting.ScriptProviderForBasic" ); + static OUString aImplName( "com.sun.star.comp.scripting.ScriptProviderForBasic" ); pImplName = &aImplName; } } @@ -84,19 +84,19 @@ namespace basprov // ----------------------------------------------------------------------------- - static Sequence< ::rtl::OUString > getSupportedServiceNames_BasicProviderImpl() + static Sequence< OUString > getSupportedServiceNames_BasicProviderImpl() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(4); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProviderForBasic" ); - aNames.getArray()[1] = ::rtl::OUString( "com.sun.star.script.provider.LanguageScriptProvider" ); - aNames.getArray()[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); - aNames.getArray()[3] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); + static Sequence< OUString > aNames(4); + aNames.getArray()[0] = OUString( "com.sun.star.script.provider.ScriptProviderForBasic" ); + aNames.getArray()[1] = OUString( "com.sun.star.script.provider.LanguageScriptProvider" ); + aNames.getArray()[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); + aNames.getArray()[3] = OUString( "com.sun.star.script.browse.BrowseNode" ); pNames = &aNames; } } @@ -126,34 +126,34 @@ namespace basprov // ----------------------------------------------------------------------------- - bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const ::rtl::OUString& rLibName ) + bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const OUString& rLibName ) { bool bIsShared = false; Reference< script::XLibraryContainer2 > xLibContainer( rxLibContainer, UNO_QUERY ); if ( xLibContainer.is() && xLibContainer->hasByName( rLibName ) && xLibContainer->isLibraryLink( rLibName ) ) { - ::rtl::OUString aFileURL; + OUString aFileURL; if ( m_xContext.is() ) { Reference< uri::XUriReferenceFactory > xUriFac( uri::UriReferenceFactory::create( m_xContext ) ); - ::rtl::OUString aLinkURL( xLibContainer->getLibraryLinkURL( rLibName ) ); + OUString aLinkURL( xLibContainer->getLibraryLinkURL( rLibName ) ); Reference< uri::XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_QUERY ); if ( xUriRef.is() ) { - ::rtl::OUString aScheme = xUriRef->getScheme(); + OUString aScheme = xUriRef->getScheme(); if ( aScheme.equalsIgnoreAsciiCase("file") ) { aFileURL = aLinkURL; } else if ( aScheme.equalsIgnoreAsciiCase("vnd.sun.star.pkg") ) { - ::rtl::OUString aAuthority = xUriRef->getAuthority(); + OUString aAuthority = xUriRef->getAuthority(); if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) ) { - ::rtl::OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); + OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); Reference<util::XMacroExpander> xMacroExpander = util::theMacroExpander::get(m_xContext); @@ -169,10 +169,10 @@ namespace basprov osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL ); OSL_VERIFY( osl::DirectoryItem::get( aFileURL, aFileItem ) == osl::FileBase::E_None ); OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None ); - ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() ); + OUString aCanonicalFileURL( aFileStatus.getFileURL() ); - ::rtl::OUString aSearchURL1( "share/basic" ); - ::rtl::OUString aSearchURL2( "share/uno_packages" ); + OUString aSearchURL1( "share/basic" ); + OUString aSearchURL2( "share/uno_packages" ); if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ) bIsShared = true; } @@ -185,18 +185,18 @@ namespace basprov // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString BasicProviderImpl::getImplementationName( ) throw (RuntimeException) + OUString BasicProviderImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_BasicProviderImpl(); } // ----------------------------------------------------------------------------- - sal_Bool BasicProviderImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -205,7 +205,7 @@ namespace basprov // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > BasicProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_BasicProviderImpl(); } @@ -223,7 +223,7 @@ namespace basprov if ( aArguments.getLength() != 1 ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument count." ), + OUString( "BasicProviderImpl::initialize: incorrect argument count." ), *this, 1 ); @@ -238,7 +238,7 @@ namespace basprov if ( !xModel.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context." ), + OUString( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context." ), *this, 1 ); @@ -249,13 +249,13 @@ namespace basprov if ( !( aArguments[0] >>= m_sScriptingContext ) ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument type " ).concat( aArguments[0].getValueTypeName() ), + OUString( "BasicProviderImpl::initialize: incorrect argument type " ).concat( aArguments[0].getValueTypeName() ), *this, 1 ); } - ::rtl::OUString sDoc = "vnd.sun.star.tdoc"; + OUString sDoc = "vnd.sun.star.tdoc"; if ( m_sScriptingContext.indexOf( sDoc ) == 0 ) { xModel = MiscUtils::tDocUrlToModel( m_sScriptingContext ); @@ -287,7 +287,7 @@ namespace basprov { /* throw RuntimeException( - ::rtl::OUString( "BasicProviderImpl::initialize: no scripting context!" ), + OUString( "BasicProviderImpl::initialize: no scripting context!" ), Reference< XInterface >() ); */ } @@ -306,7 +306,7 @@ namespace basprov // XScriptProvider // ----------------------------------------------------------------------------- - Reference < provider::XScript > BasicProviderImpl::getScript( const ::rtl::OUString& scriptURI ) + Reference < provider::XScript > BasicProviderImpl::getScript( const OUString& scriptURI ) throw ( provider::ScriptFrameworkErrorException, RuntimeException) { // TODO @@ -323,7 +323,7 @@ namespace basprov if ( !uriRef.is() || !sfUri.is() ) { - ::rtl::OUString errorMsg("BasicProviderImpl::getScript: failed to parse URI: "); + OUString errorMsg("BasicProviderImpl::getScript: failed to parse URI: "); errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -332,9 +332,9 @@ namespace basprov } - ::rtl::OUString aDescription = sfUri->getName(); - ::rtl::OUString aLocation = sfUri->getParameter( - ::rtl::OUString("location") ); + OUString aDescription = sfUri->getName(); + OUString aLocation = sfUri->getParameter( + OUString("location") ); sal_Int32 nIndex = 0; // In some strange circumstances the Library name can have an @@ -349,25 +349,25 @@ namespace basprov { pBasicMgr = m_pAppBasicManager; } - rtl::OUString sProjectName; + OUString sProjectName; if ( pBasicMgr ) sProjectName = pBasicMgr->GetName(); - ::rtl::OUString aLibrary; + OUString aLibrary; if ( !sProjectName.isEmpty() && aDescription.match( sProjectName ) ) { OSL_TRACE("LibraryName %s is part of the url %s", - rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( aDescription, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aDescription, RTL_TEXTENCODING_UTF8 ).getStr() ); aLibrary = sProjectName; nIndex = sProjectName.getLength() + 1; } else aLibrary = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString aModule; + OUString aModule; if ( nIndex != -1 ) aModule = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString aMethod; + OUString aMethod; if ( nIndex != -1 ) aMethod = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); @@ -410,7 +410,7 @@ namespace basprov if ( !xScript.is() ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "The following Basic script could not be found:\n" ); aMessage.appendAscii( "library: '" ).append( aLibrary ).appendAscii( "'\n" ); aMessage.appendAscii( "module: '" ).append( aModule ).appendAscii( "'\n" ); @@ -430,13 +430,13 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicProviderImpl::getName( ) throw (RuntimeException) + OUString BasicProviderImpl::getName( ) throw (RuntimeException) { // TODO SolarMutexGuard aGuard; - return ::rtl::OUString("Basic"); + return OUString("Basic"); } // ----------------------------------------------------------------------------- @@ -463,9 +463,9 @@ namespace basprov if ( pBasicManager && xLibContainer.is() ) { - Sequence< ::rtl::OUString > aLibNames = xLibContainer->getElementNames(); + Sequence< OUString > aLibNames = xLibContainer->getElementNames(); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); aChildNodes.realloc( nLibCount ); Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray(); sal_Int32 childrenFound = 0; diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index 2bafb1eb4289..fcb72bcf9afc 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -58,14 +58,14 @@ namespace basprov ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainerDoc; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext > m_xInvocationContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; bool m_bIsAppScriptCtx; bool m_bIsUserCtx; - ::rtl::OUString m_sCtxLocation; + OUString m_sCtxLocation; bool isLibraryShared( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& rxLibContainer, - const ::rtl::OUString& rLibName ); + const OUString& rLibName ); public: BasicProviderImpl( @@ -73,11 +73,11 @@ namespace basprov virtual ~BasicProviderImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -86,11 +86,11 @@ namespace basprov // XScriptProvider virtual ::com::sun::star::uno::Reference < ::com::sun::star::script::provider::XScript > SAL_CALL getScript( - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( ::com::sun::star::script::provider::ScriptFrameworkErrorException, ::com::sun::star::uno::RuntimeException); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index b4e5de641a92..5a85b303fba7 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -47,7 +47,7 @@ namespace basprov { //......................................................................... #define BASSCRIPT_PROPERTY_ID_CALLER 1 -#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( "Caller" ) +#define BASSCRIPT_PROPERTY_CALLER OUString( "Caller" ) #define BASSCRIPT_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT @@ -59,7 +59,7 @@ namespace basprov // ----------------------------------------------------------------------------- - BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod ) + BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xMethod( xMethod ) @@ -72,7 +72,7 @@ namespace basprov // ----------------------------------------------------------------------------- - BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod, + BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod, BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xMethod( xMethod ) @@ -191,11 +191,11 @@ namespace basprov if ( nParamsCount < nSbxCount - nSbxOptional ) { throw provider::ScriptFrameworkErrorException( - ::rtl::OUString( + OUString( "wrong number of parameters!" ), Reference< XInterface >(), m_funcName, - ::rtl::OUString( "Basic" ), + OUString( "Basic" ), provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index 72ade2ceaea2..50cbc28e0980 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -52,7 +52,7 @@ namespace basprov { private: SbMethodRef m_xMethod; - ::rtl::OUString m_funcName; + OUString m_funcName; BasicManager* m_documentBasicManager; ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext > m_xDocumentScriptContext; @@ -69,11 +69,11 @@ namespace basprov public: BasicScriptImpl( - const ::rtl::OUString& funcName, + const OUString& funcName, SbMethodRef xMethod ); BasicScriptImpl( - const ::rtl::OUString& funcName, + const OUString& funcName, SbMethodRef xMethod, BasicManager& documentBasicManager, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >& documentScriptContext diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index 8567d88fe51a..aee0a9a16ec5 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -35,8 +35,8 @@ using namespace beans; // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -63,7 +63,7 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any { if ( aArguments.getLength() == 1 ) { - ::rtl::OUString sURL; + OUString sURL; if ( !( aArguments[ 0 ] >>= sURL )) throw css::lang::IllegalArgumentException(); // Try any other URL with SimpleFileAccess @@ -102,34 +102,34 @@ uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::Runtim } // container::XNameAccess: -uno::Any SAL_CALL DialogModelProvider::getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { return m_xDialogModel->getByName(aName); } -css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException) { return m_xDialogModel->getElementNames(); } -::sal_Bool SAL_CALL DialogModelProvider::hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException) { return m_xDialogModel->hasByName(aName); } // container::XNameReplace: -void SAL_CALL DialogModelProvider::replaceByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { m_xDialogModel->replaceByName(aName,aElement); } // container::XNameContainer: -void SAL_CALL DialogModelProvider::insertByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException) { m_xDialogModel->insertByName(aName,aElement); } -void SAL_CALL DialogModelProvider::removeByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { m_xDialogModel->removeByName(aName); } @@ -137,35 +137,35 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPrope { return m_xDialogModelProp->getPropertySetInfo(); } -void SAL_CALL DialogModelProvider::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } -uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_xDialogModelProp->getPropertyValue(PropertyName); } -void SAL_CALL DialogModelProvider::addPropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::removePropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::addVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const ::rtl::OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException) { return comp_DialogModelProvider::_getImplementationName(); } -::sal_Bool SAL_CALL DialogModelProvider::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_DialogModelProvider::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_DialogModelProvider::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -173,7 +173,7 @@ void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const ::rtl::OU return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_DialogModelProvider::_getSupportedServiceNames(); } diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index 9ce8518a1784..4d9256a35f14 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -45,29 +45,29 @@ private: virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); // ::com::sun::star::container::XNameAccess: - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException); // ::com::sun::star::container::XNameReplace: - virtual void SAL_CALL replaceByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual void SAL_CALL replaceByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException); // ::com::sun::star::container::XNameContainer: - virtual void SAL_CALL insertByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException); - virtual void SAL_CALL removeByName(const ::rtl::OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual void SAL_CALL insertByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException); + virtual void SAL_CALL removeByName(const OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: DialogModelProvider(const DialogModelProvider &); // not defined diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 1d87b50a7569..c6b19691cf0f 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -96,31 +96,31 @@ namespace dlgprov class DialogVBAScriptListenerImpl : public DialogScriptListenerImpl { protected: - rtl::OUString msDialogCodeName; - rtl::OUString msDialogLibName; + OUString msDialogCodeName; + OUString msDialogLibName; Reference< script::XScriptListener > mxListener; virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ); public: - DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ); + DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ); }; - DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName ) + DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName ) { Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); Sequence< Any > args(1); if ( xSMgr.is() ) { args[0] <<= xModel; - mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( "ooo.vba.EventListener" ), args, m_xContext ), UNO_QUERY ); + mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( OUString( "ooo.vba.EventListener" ), args, m_xContext ), UNO_QUERY ); } if ( rxControl.is() ) { try { Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString("Name" ) ) >>= msDialogCodeName; + xProps->getPropertyValue( OUString("Name" ) ) >>= msDialogCodeName; xProps.set( mxListener, UNO_QUERY_THROW ); - xProps->setPropertyValue( rtl::OUString("Model" ), args[ 0 ] ); + xProps->setPropertyValue( OUString("Model" ), args[ 0 ] ); } catch( const Exception& ) { @@ -135,7 +135,7 @@ namespace dlgprov if ( aScriptEvent.ScriptType == "VBAInterop" && mxListener.is() ) { ScriptEvent aScriptEventCopy( aScriptEvent ); - aScriptEventCopy.ScriptCode = msDialogLibName.concat( rtl::OUString( "." ) ).concat( msDialogCodeName ); + aScriptEventCopy.ScriptCode = msDialogLibName.concat( OUString( "." ) ).concat( msDialogCodeName ); try { mxListener->firing( aScriptEventCopy ); @@ -153,32 +153,32 @@ namespace dlgprov // DialogEventsAttacherImpl // ============================================================================= - DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const rtl::OUString& sDialogLibName ) + DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const OUString& sDialogLibName ) :mbUseFakeVBAEvents( false ), m_xContext( rxContext ) { // key listeners by protocol when ScriptType = 'Script' // otherwise key is the ScriptType e.g. StarBasic if ( rxRTLListener.is() ) // set up handler for RTL_BASIC - listernersForTypes[ rtl::OUString("StarBasic") ] = rxRTLListener; + listernersForTypes[ OUString("StarBasic") ] = rxRTLListener; else - listernersForTypes[ rtl::OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); - // handler for Script & ::rtl::OUString("vnd.sun.star.UNO:") - listernersForTypes[ rtl::OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); - listernersForTypes[ rtl::OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); + listernersForTypes[ OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); + // handler for Script & OUString("vnd.sun.star.UNO:") + listernersForTypes[ OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); + listernersForTypes[ OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); // determine the VBA compatibility mode from the Basic library container try { uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW ); uno::Reference< script::vba::XVBACompatibility > xVBACompat( - xModelProps->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + xModelProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); mbUseFakeVBAEvents = xVBACompat->getVBACompatibilityMode(); } catch( uno::Exception& ) { } if ( mbUseFakeVBAEvents ) - listernersForTypes[ rtl::OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); + listernersForTypes[ OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); } // ----------------------------------------------------------------------------- @@ -189,20 +189,20 @@ namespace dlgprov // ----------------------------------------------------------------------------- Reference< script::XScriptListener > - DialogEventsAttacherImpl::getScriptListenerForKey( const rtl::OUString& sKey ) throw ( RuntimeException ) + DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) throw ( RuntimeException ) { ListenerHash::iterator it = listernersForTypes.find( sKey ); if ( it == listernersForTypes.end() ) throw RuntimeException(); // more text info here please return it->second; } - Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, rtl::OUString& sControlName ) + Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, OUString& sControlName ) { Reference< XScriptEventsSupplier > xEventsSupplier; Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( "ooo.vba.VBAToOOEventDesc" ), m_xContext ), UNO_QUERY ); + Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( OUString( "ooo.vba.VBAToOOEventDesc" ), m_xContext ), UNO_QUERY ); if ( xVBAToOOEvtDesc.is() ) xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY ); @@ -219,12 +219,12 @@ namespace dlgprov Reference< XControlModel > xControlModel = xControl->getModel(); Reference< XPropertySet > xProps( xControlModel, uno::UNO_QUERY ); - rtl::OUString sName; - xProps->getPropertyValue( rtl::OUString("Name") ) >>= sName; + OUString sName; + xProps->getPropertyValue( OUString("Name") ) >>= sName; if ( xEventCont.is() ) { - Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xEventCont->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nNameCount = aNames.getLength(); for ( sal_Int32 j = 0; j < nNameCount; ++j ) @@ -233,7 +233,7 @@ namespace dlgprov Any aElement = xEventCont->getByName( pNames[ j ] ); aElement >>= aDesc; - rtl::OUString sKey = aDesc.ScriptType; + OUString sKey = aDesc.ScriptType; if ( aDesc.ScriptType == "Script" || aDesc.ScriptType == "UNO" ) { sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' ); @@ -278,7 +278,7 @@ namespace dlgprov } - void DialogEventsAttacherImpl::nestedAttachEvents( const Sequence< Reference< XInterface > >& Objects, const Any& Helper, rtl::OUString& sDialogCodeName ) + void DialogEventsAttacherImpl::nestedAttachEvents( const Sequence< Reference< XInterface > >& Objects, const Any& Helper, OUString& sDialogCodeName ) { const Reference< XInterface >* pObjects = Objects.getConstArray(); sal_Int32 nObjCount = Objects.getLength(); @@ -342,7 +342,7 @@ namespace dlgprov if ( xSMgr.is() ) { m_xEventAttacher = Reference< XEventAttacher >( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.script.EventAttacher" ), m_xContext ), UNO_QUERY ); + OUString( "com.sun.star.script.EventAttacher" ), m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) throw ServiceNotRegisteredException(); @@ -354,7 +354,7 @@ namespace dlgprov } } - rtl::OUString sDialogCodeName; + OUString sDialogCodeName; sal_Int32 nObjCount = Objects.getLength(); Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog if ( xDlgControl.is() ) @@ -362,7 +362,7 @@ namespace dlgprov Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); try { - xProps->getPropertyValue( rtl::OUString("Name" ) ) >>= sDialogCodeName; + xProps->getPropertyValue( OUString("Name" ) ) >>= sDialogCodeName; } catch( Exception& ){} } @@ -376,7 +376,7 @@ namespace dlgprov // ============================================================================= DialogAllListenerImpl::DialogAllListenerImpl( const Reference< XScriptListener >& rxListener, - const ::rtl::OUString& rScriptType, const ::rtl::OUString& rScriptCode ) + const OUString& rScriptType, const OUString& rScriptCode ) :m_xScriptListener( rxListener ) ,m_sScriptType( rScriptType ) ,m_sScriptCode( rScriptCode ) @@ -489,7 +489,7 @@ namespace dlgprov provider::theMasterScriptProviderFactory::get( m_xContext ); Any aCtx; - aCtx <<= ::rtl::OUString("user"); + aCtx <<= OUString("user"); xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } } @@ -524,8 +524,8 @@ namespace dlgprov void DialogLegacyScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet ) { - ::rtl::OUString sScriptURL; - ::rtl::OUString sScriptCode( aScriptEvent.ScriptCode ); + OUString sScriptURL; + OUString sScriptCode( aScriptEvent.ScriptCode ); if ( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 ) { @@ -533,9 +533,9 @@ namespace dlgprov sal_Int32 nIndex = sScriptCode.indexOf( ':' ); if ( nIndex >= 0 && nIndex < sScriptCode.getLength() ) { - sScriptURL = ::rtl::OUString("vnd.sun.star.script:"); + sScriptURL = OUString("vnd.sun.star.script:"); sScriptURL += sScriptCode.copy( nIndex + 1 ); - sScriptURL += ::rtl::OUString("?language=Basic&location="); + sScriptURL += OUString("?language=Basic&location="); sScriptURL += sScriptCode.copy( 0, nIndex ); } ScriptEvent aSFScriptEvent( aScriptEvent ); @@ -546,9 +546,9 @@ namespace dlgprov void DialogUnoScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet ) { - static ::rtl::OUString sUnoURLScheme("vnd.sun.star.UNO:"); + static OUString sUnoURLScheme("vnd.sun.star.UNO:"); - ::rtl::OUString aMethodName = aScriptEvent.ScriptCode.copy( sUnoURLScheme.getLength() ); + OUString aMethodName = aScriptEvent.ScriptCode.copy( sUnoURLScheme.getLength() ); const Any* pArguments = aScriptEvent.Arguments.getConstArray(); Any aEventObject = pArguments[0]; @@ -634,12 +634,12 @@ namespace dlgprov if( pResMgr ) { String aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) ); - ::rtl::OUString aQuoteChar( "\"" ); + OUString aQuoteChar( "\"" ); - ::rtl::OUString aOURes = aRes; + OUString aOURes = aRes; sal_Int32 nIndex = aOURes.indexOf( '%' ); - ::rtl::OUString aOUFinal; + OUString aOUFinal; aOUFinal += aOURes.copy( 0, nIndex ); aOUFinal += aQuoteChar; aOUFinal += aMethodName; diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index 8d0aa4f150e0..c1d4cb801792 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -42,10 +42,10 @@ namespace dlgprov // ============================================================================= // class DialogEventsAttacherImpl // ============================================================================= - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ListenerHash; + OUStringHash, + ::std::equal_to< OUString > > ListenerHash; typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE; @@ -58,9 +58,9 @@ namespace dlgprov ListenerHash listernersForTypes; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName ); - void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, rtl::OUString& sDialogCodeName ); + ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, OUString& sCodeName ); + void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, OUString& sDialogCodeName ); void SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper ); public: DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, @@ -69,7 +69,7 @@ namespace dlgprov const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& xIntrospect, bool bProviderMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const rtl::OUString& sDialogLibName ); + const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const OUString& sDialogLibName ); virtual ~DialogEventsAttacherImpl(); // XScriptEventsAttacher @@ -97,14 +97,14 @@ namespace dlgprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > m_xScriptListener; - ::rtl::OUString m_sScriptType; - ::rtl::OUString m_sScriptCode; + OUString m_sScriptType; + OUString m_sScriptCode; virtual void firing_impl( const ::com::sun::star::script::AllEventObject& Event, ::com::sun::star::uno::Any* pRet ); public: DialogAllListenerImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& rxListener, - const ::rtl::OUString& rScriptType, const ::rtl::OUString& rScriptCode ); + const OUString& rScriptType, const OUString& rScriptCode ); virtual ~DialogAllListenerImpl(); // XEventListener diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 9ea9735c9d44..2be567db31c8 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -64,15 +64,15 @@ using namespace ::sf_misc; namespace comp_DialogModelProvider { - ::rtl::OUString SAL_CALL _getImplementationName() + OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.scripting.DialogModelProvider"); + return OUString("com.sun.star.comp.scripting.DialogModelProvider"); } - uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString("com.sun.star.awt.UnoControlDialogModelProvider"); + uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.awt.UnoControlDialogModelProvider"); return s; } @@ -86,17 +86,17 @@ namespace dlgprov { //......................................................................... -static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); +static OUString aResourceResolverPropName("ResourceResolver"); - Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL) + Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const OUString& i_sURL) { INetURLObject aInetObj( i_sURL ); - ::rtl::OUString aDlgName = aInetObj.GetBase(); + OUString aDlgName = aInetObj.GetBase(); aInetObj.removeSegment(); - ::rtl::OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); bool bReadOnly = true; ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - ::rtl::OUString aComment; + OUString aComment; Sequence<Any> aArgs( 6 ); aArgs[0] <<= aDlgLocation; @@ -110,7 +110,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); // TODO: Ctor Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext - ( ::rtl::OUString("com.sun.star.resource.StringResourceWithLocation"), + ( OUString("com.sun.star.resource.StringResourceWithLocation"), i_xContext ), UNO_QUERY ); if( xStringResourceManager.is() ) { @@ -123,7 +123,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext) { Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( ::rtl::OUString( "com.sun.star.awt.UnoControlDialogModel" ), i_xContext ), UNO_QUERY_THROW ); + Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( OUString( "com.sun.star.awt.UnoControlDialogModel" ), i_xContext ), UNO_QUERY_THROW ); return xControlModel; } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, @@ -134,7 +134,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); { Reference< container::XNameContainer > xDialogModel( lcl_createControlModel(i_xContext) ); - ::rtl::OUString aDlgSrcUrlPropName( "DialogSourceURL" ); + OUString aDlgSrcUrlPropName( "DialogSourceURL" ); Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL ); @@ -162,15 +162,15 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // component operations // ============================================================================= - static ::rtl::OUString getImplementationName_DialogProviderImpl() + static OUString getImplementationName_DialogProviderImpl() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.scripting.DialogProvider" ); + static OUString aImplName( "com.sun.star.comp.scripting.DialogProvider" ); pImplName = &aImplName; } } @@ -179,18 +179,18 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // ----------------------------------------------------------------------------- - static Sequence< ::rtl::OUString > getSupportedServiceNames_DialogProviderImpl() + static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(3); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.awt.DialogProvider" ); - aNames.getArray()[1] = ::rtl::OUString( "com.sun.star.awt.DialogProvider2" ); - aNames.getArray()[2] = ::rtl::OUString( "com.sun.star.awt.ContainerWindowProvider" ); + static Sequence< OUString > aNames(3); + aNames.getArray()[0] = OUString( "com.sun.star.awt.DialogProvider" ); + aNames.getArray()[1] = OUString( "com.sun.star.awt.DialogProvider2" ); + aNames.getArray()[2] = OUString( "com.sun.star.awt.ContainerWindowProvider" ); pNames = &aNames; } } @@ -267,20 +267,20 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); { if ( !m_BasicInfo.get() ) // shouln't get here - throw RuntimeException( ::rtl::OUString( "No information to create dialog" ), Reference< XInterface >() ); + throw RuntimeException( OUString( "No information to create dialog" ), Reference< XInterface >() ); Reference< resource::XStringResourceManager > xStringResourceManager = getStringResourceFromDialogLibrary( m_BasicInfo->mxDlgLib ); - rtl::OUString aURL("" ); + OUString aURL("" ); Any aDialogSourceURL; aDialogSourceURL <<= aURL; Reference< XControlModel > xCtrlModel( createDialogModel( m_BasicInfo->mxInput, xStringResourceManager, aDialogSourceURL ), UNO_QUERY_THROW ); return xCtrlModel; } - Reference< XControlModel > DialogProviderImpl::createDialogModel( const ::rtl::OUString& sURL ) + Reference< XControlModel > DialogProviderImpl::createDialogModel( const OUString& sURL ) { - ::rtl::OUString aURL( sURL ); + OUString aURL( sURL ); // parse URL // TODO: use URL parsing class @@ -304,7 +304,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); uriRef = Reference< uri::XUriReference >( xFac->parse( aURL ), UNO_QUERY ); if ( !uriRef.is() ) { - ::rtl::OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: "); + OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: "); errorMsg += aURL; throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 ); @@ -333,17 +333,17 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } else { - ::rtl::OUString sDescription = sfUri->getName(); + OUString sDescription = sfUri->getName(); sal_Int32 nIndex = 0; - ::rtl::OUString sLibName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString sDlgName; + OUString sLibName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); + OUString sDlgName; if ( nIndex != -1 ) sDlgName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString sLocation = sfUri->getParameter( - ::rtl::OUString("location") ); + OUString sLocation = sfUri->getParameter( + OUString("location") ); // get dialog library container @@ -366,9 +366,9 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } else { - Sequence< ::rtl::OUString > aOpenDocsTdocURLs( MiscUtils::allOpenTDocUrls( m_xContext ) ); - const ::rtl::OUString* pTdocURL = aOpenDocsTdocURLs.getConstArray(); - const ::rtl::OUString* pTdocURLEnd = aOpenDocsTdocURLs.getConstArray() + aOpenDocsTdocURLs.getLength(); + Sequence< OUString > aOpenDocsTdocURLs( MiscUtils::allOpenTDocUrls( m_xContext ) ); + const OUString* pTdocURL = aOpenDocsTdocURLs.getConstArray(); + const OUString* pTdocURLEnd = aOpenDocsTdocURLs.getConstArray() + aOpenDocsTdocURLs.getLength(); for ( ; pTdocURL != pTdocURLEnd; ++pTdocURL ) { Reference< frame::XModel > xModel( MiscUtils::tDocUrlToModel( *pTdocURL ) ); @@ -376,7 +376,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !xModel.is() ) continue; - ::rtl::OUString sDocURL = xModel->getURL(); + OUString sDocURL = xModel->getURL(); if ( sDocURL.isEmpty() ) { ::comphelper::NamedValueCollection aModelArgs( xModel->getArgs() ); @@ -423,21 +423,21 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !xISP.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialogModel: dialog not found!" ), + OUString( "DialogProviderImpl::getDialogModel: dialog not found!" ), Reference< XInterface >(), 1 ); } } else { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialogModel: library not found!" ), + OUString( "DialogProviderImpl::getDialogModel: library not found!" ), Reference< XInterface >(), 1 ); } } else { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialog: library container not found!" ), + OUString( "DialogProviderImpl::getDialog: library container not found!" ), Reference< XInterface >(), 1 ); } @@ -486,7 +486,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( xSMgr.is() ) { xDialogControl = Reference< XControl >( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.awt.UnoControlDialog" ), m_xContext ), UNO_QUERY ); + OUString( "com.sun.star.awt.UnoControlDialog" ), m_xContext ), UNO_QUERY ); if ( xDialogControl.is() ) { @@ -597,18 +597,18 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString DialogProviderImpl::getImplementationName( ) throw (RuntimeException) + OUString DialogProviderImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_DialogProviderImpl(); } // ----------------------------------------------------------------------------- - sal_Bool DialogProviderImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -617,7 +617,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > DialogProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_DialogProviderImpl(); } @@ -637,7 +637,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !m_xModel.is() ) { throw RuntimeException( - ::rtl::OUString( "DialogProviderImpl::initialize: invalid argument format!" ), + OUString( "DialogProviderImpl::initialize: invalid argument format!" ), Reference< XInterface >() ); } } @@ -659,7 +659,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); else if ( aArguments.getLength() > 4 ) { throw RuntimeException( - ::rtl::OUString( "DialogProviderImpl::initialize: invalid number of arguments!" ), + OUString( "DialogProviderImpl::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } } @@ -668,11 +668,11 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // XDialogProvider // ----------------------------------------------------------------------------- - static ::rtl::OUString aDecorationPropName("Decoration"); - static ::rtl::OUString aTitlePropName("Title"); + static OUString aDecorationPropName("Decoration"); + static OUString aTitlePropName("Title"); Reference < XControl > DialogProviderImpl::createDialogImpl( - const ::rtl::OUString& URL, const Reference< XInterface >& xHandler, + const OUString& URL, const Reference< XInterface >& xHandler, const Reference< XWindowPeer >& xParent, bool bDialogProviderMode ) throw (IllegalArgumentException, RuntimeException) { @@ -701,7 +701,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); catch ( const Exception& ) { const Any aError( ::cppu::getCaughtException() ); - throw WrappedTargetRuntimeException( ::rtl::OUString(), *this, aError ); + throw WrappedTargetRuntimeException( OUString(), *this, aError ); } if ( xCtrlMod.is() ) { @@ -719,7 +719,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if( !bDecoration ) { xDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) ); - xDlgModPropSet->setPropertyValue( aTitlePropName, makeAny( ::rtl::OUString() ) ); + xDlgModPropSet->setPropertyValue( aTitlePropName, makeAny( OUString() ) ); } } catch( UnknownPropertyException& ) @@ -739,7 +739,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); return xCtrl; } - Reference < XDialog > DialogProviderImpl::createDialog( const ::rtl::OUString& URL ) + Reference < XDialog > DialogProviderImpl::createDialog( const OUString& URL ) throw (IllegalArgumentException, RuntimeException) { Reference< XInterface > xDummyHandler; @@ -750,13 +750,13 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference < XDialog > DialogProviderImpl::createDialogWithHandler( - const ::rtl::OUString& URL, const Reference< XInterface >& xHandler ) + const OUString& URL, const Reference< XInterface >& xHandler ) throw (IllegalArgumentException, RuntimeException) { if( !xHandler.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!" ), + OUString( "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!" ), Reference< XInterface >(), 1 ); } Reference< XWindowPeer > xDummyPeer; @@ -766,7 +766,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference < XDialog > DialogProviderImpl::createDialogWithArguments( - const ::rtl::OUString& URL, const Sequence< NamedValue >& Arguments ) + const OUString& URL, const Sequence< NamedValue >& Arguments ) throw (IllegalArgumentException, RuntimeException) { ::comphelper::NamedValueCollection aArguments( Arguments ); @@ -791,7 +791,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference< XWindow > DialogProviderImpl::createContainerWindow( - const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, + const OUString& URL, const OUString& WindowType, const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler ) throw (lang::IllegalArgumentException, RuntimeException) { @@ -799,7 +799,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if( !xParent.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::createContainerWindow: Invalid xParent!" ), + OUString( "DialogProviderImpl::createContainerWindow: Invalid xParent!" ), Reference< XInterface >(), 1 ); } Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParent, false ); diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 4788fdecd5d8..651edfa32cb0 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -54,7 +54,7 @@ namespace dlgprov // class DialogProviderImpl // ============================================================================= ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext); - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL); + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const OUString& i_sURL); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput, @@ -81,8 +81,8 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - rtl::OUString msDialogLibName; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL ); + OUString msDialogLibName; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const OUString& sURL ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel, @@ -103,7 +103,7 @@ namespace dlgprov // XDialogProvider / XDialogProvider2 impl method virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, bool bDialogProviderMode ) @@ -115,11 +115,11 @@ namespace dlgprov virtual ~DialogProviderImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -128,22 +128,22 @@ namespace dlgprov // XDialogProvider virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialog( - const ::rtl::OUString& URL ) + const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XDialogProvider2 virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithHandler( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow( - const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, + const OUString& URL, const OUString& WindowType, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 5c7218e8f100..ccb44f895678 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -45,9 +45,9 @@ namespace sf_misc class MiscUtils { public: - static css::uno::Sequence< ::rtl::OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) + static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) { - css::uno::Sequence< ::rtl::OUString > result; + css::uno::Sequence< OUString > result; try { if ( !xCtx.is() ) @@ -63,7 +63,7 @@ public: return result; } - static ::rtl::OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, + static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { css::uno::Reference< css::lang::XMultiComponentFactory > xMCF( @@ -76,7 +76,7 @@ public: css::uno::Reference< css::frame::XTransientDocumentsDocumentContentFactory >( xMCF->createInstanceWithContext( - rtl::OUString( + OUString( "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ), xContext ), css::uno::UNO_QUERY ); @@ -101,16 +101,16 @@ public: } OSL_FAIL( "Unable to obtain URL for document model!" ); - return rtl::OUString(); + return OUString(); } - static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const ::rtl::OUString& url ) + static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& url ) { css::uno::Any result; try { ::ucbhelper::Content root( url, NULL, comphelper::getProcessComponentContext() ); - ::rtl::OUString propName = "DocumentModel"; + OUString propName = "DocumentModel"; result = getUCBProperty( root, propName ); } catch ( css::ucb::ContentCreationException& ) @@ -129,7 +129,7 @@ public: } - static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, ::rtl::OUString& prop ) + static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, OUString& prop ) { css::uno::Any result; try @@ -143,11 +143,11 @@ public: } private: -static ::rtl::OUString parseLocationName( const ::rtl::OUString& location ) +static OUString parseLocationName( const OUString& location ) { // strip out the last leaf of location name // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; + OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx index 47889dc095b8..8fcf16577473 100644 --- a/scripting/source/inc/util/scriptingconstants.hxx +++ b/scripting/source/inc/util/scriptingconstants.hxx @@ -25,12 +25,12 @@ namespace scripting_constants class ScriptingConstantsPool { public: - const ::rtl::OUString DOC_REF; - const ::rtl::OUString DOC_STORAGE_ID; - const ::rtl::OUString DOC_URI; - const ::rtl::OUString RESOLVED_STORAGE_ID; - const ::rtl::OUString SCRIPT_INFO; - const ::rtl::OUString SCRIPTSTORAGEMANAGER_SERVICE; + const OUString DOC_REF; + const OUString DOC_STORAGE_ID; + const OUString DOC_URI; + const OUString RESOLVED_STORAGE_ID; + const OUString SCRIPT_INFO; + const OUString SCRIPTSTORAGEMANAGER_SERVICE; const sal_Int32 SHARED_STORAGE_ID; const sal_Int32 USER_STORAGE_ID; const sal_Int32 DOC_STORAGE_ID_NOT_SET; diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 4e19fe7a7cac..43128f2a82ad 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -84,7 +84,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( if ( aArguments.getLength() && sal_False == ( aArguments[ 0 ] >>= m_xFrame ) ) { - ::rtl::OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame"; + OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame"; throw RuntimeException( temp, Reference< XInterface >() ); } @@ -93,7 +93,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( } Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( - const URL& aURL, const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) + const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) { (void)sTargetFrameName; @@ -107,7 +107,7 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( xFac->parse( aURL.Complete ), UNO_QUERY ); if ( uriRef.is() ) { - if ( uriRef->getScheme().equals( ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSCHEME ) ) ) + if ( uriRef->getScheme().equals( OUString::createFromAscii( ::scripting_protocolhandler::MYSCHEME ) ) ) { xDispatcher = this; } @@ -232,7 +232,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( { aException = ::cppu::getCaughtException(); - ::rtl::OUString reason = ::rtl::OUString( "ScriptProtocolHandler::dispatch: caught " ); + OUString reason = OUString( "ScriptProtocolHandler::dispatch: caught " ); invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message ); @@ -241,7 +241,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( } else { - ::rtl::OUString reason( + OUString reason( "ScriptProtocolHandler::dispatchWithNotification failed, ScriptProtocolHandler not initialised" ); invokeResult <<= reason; @@ -290,7 +290,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( OSL_TRACE( "ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException" "while dispatchFinished %s", - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } } @@ -390,12 +390,12 @@ void ScriptProtocolHandler::createScriptProvider() } catch ( const RuntimeException & e ) { - ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; + OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } catch ( const Exception & e ) { - ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider: "; + OUString temp = "ScriptProtocolHandler::createScriptProvider: "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } } @@ -410,7 +410,7 @@ ScriptProtocolHandler::~ScriptProtocolHandler() } /* XServiceInfo */ -::rtl::OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) +OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) throw( RuntimeException ) { return impl_getStaticImplementationName(); @@ -418,11 +418,11 @@ throw( RuntimeException ) /* XServiceInfo */ sal_Bool SAL_CALL ScriptProtocolHandler::supportsService( -const ::rtl::OUString& sServiceName ) +const OUString& sServiceName ) throw( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); + Sequence< OUString > seqServiceNames = getSupportedServiceNames(); + const OUString* pArray = seqServiceNames.getConstArray(); for ( sal_Int32 nCounter = 0; nCounter < seqServiceNames.getLength(); nCounter++ ) { if ( pArray[ nCounter ] == sServiceName ) @@ -435,26 +435,26 @@ throw( RuntimeException ) } /* XServiceInfo */ -Sequence< ::rtl::OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() +Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -Sequence< ::rtl::OUString > ScriptProtocolHandler::impl_getStaticSupportedServiceNames() +Sequence< OUString > ScriptProtocolHandler::impl_getStaticSupportedServiceNames() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - Sequence< ::rtl::OUString > seqServiceNames( 1 ); + Sequence< OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [ 0 ] = - ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ); + OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ); return seqServiceNames ; } /* Helper for XServiceInfo */ -::rtl::OUString ScriptProtocolHandler::impl_getStaticImplementationName() +OUString ScriptProtocolHandler::impl_getStaticImplementationName() { - return ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYIMPLNAME ); + return OUString::createFromAscii( ::scripting_protocolhandler::MYIMPLNAME ); } /* Helper for registry */ @@ -504,7 +504,7 @@ extern "C" ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ) ; if ( ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::scripting_protocolhandler::ScriptProtocolHandler::impl_createFactory( xServiceManager ); } diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx index 1cf2811beb0a..23868483180d 100644 --- a/scripting/source/protocolhandler/scripthandler.hxx +++ b/scripting/source/protocolhandler/scripthandler.hxx @@ -83,16 +83,16 @@ public: virtual ~ScriptProtocolHandler(); /* XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence < ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); /* Helper for XServiceInfo */ - static css::uno::Sequence < ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); /* Helper for registry */ static css::uno::Reference < css::uno::XInterface > SAL_CALL @@ -104,7 +104,7 @@ public: /* Implementation for XDispatchProvider */ virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL - queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, + queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ; virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 1edc4e97e0a2..448294cda2bd 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -46,9 +46,9 @@ namespace func_provider ActiveMSPList::ActiveMSPList( const Reference< XComponentContext > & xContext ) : m_xContext( xContext ) { - userDirString = ::rtl::OUString("user"); - shareDirString = ::rtl::OUString("share"); - bundledDirString = ::rtl::OUString("bundled"); + userDirString = OUString("user"); + shareDirString = OUString("share"); + bundledDirString = OUString("bundled"); } ActiveMSPList::~ActiveMSPList() @@ -58,7 +58,7 @@ ActiveMSPList::~ActiveMSPList() Reference< provider::XScriptProvider > ActiveMSPList::createNewMSP( const uno::Any& context ) { - ::rtl::OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); + OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); Sequence< Any > args( &context, 1 ); Reference< provider::XScriptProvider > msp( @@ -72,7 +72,7 @@ ActiveMSPList::getMSPFromAnyContext( const Any& aContext ) SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; - ::rtl::OUString sContext; + OUString sContext; if ( aContext >>= sContext ) { msp = getMSPFromStringContext( sContext ); @@ -122,7 +122,7 @@ Reference< provider::XScriptProvider > xScripts.set( xContext->getScriptContainer() ); if ( !xScripts.is() ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "Failed to create MasterScriptProvider for ScriptInvocationContext: " ); buf.appendAscii( "Component supporting XEmbeddScripts interface not found." ); throw lang::IllegalArgumentException( buf.makeStringAndClear(), NULL, 1 ); @@ -147,7 +147,7 @@ Reference< provider::XScriptProvider > } Reference< provider::XScriptProvider > - ActiveMSPList::getMSPFromStringContext( const ::rtl::OUString& context ) + ActiveMSPList::getMSPFromStringContext( const OUString& context ) SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; @@ -161,7 +161,7 @@ Reference< provider::XScriptProvider > Reference< document::XScriptInvocationContext > xScriptsContext( xModel, UNO_QUERY ); if ( !xScripts.is() && !xScriptsContext.is() ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "Failed to create MasterScriptProvider for '" ); buf.append ( context ); buf.appendAscii( "': Either XEmbeddScripts or XScriptInvocationContext need to be supported by the document." ); @@ -207,7 +207,7 @@ Reference< provider::XScriptProvider > } catch( const Exception& ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "Failed to create MasterScriptProvider for context '" ); aMessage.append ( context ); aMessage.appendAscii( "'." ); @@ -285,7 +285,7 @@ ActiveMSPList::createNonDocMSPs() return; } // do creation of user and share MSPs here - ::rtl::OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); + OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); Sequence< Any > args(1); args[ 0 ] <<= userDirString; diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 37fd8d6ab349..3705660ef64d 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -48,10 +48,10 @@ typedef ::std::map < css::uno::Reference< css::uno::XInterface > , ::comphelper::OInterfaceCompare< css::uno::XInterface > > ScriptComponent_map; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, css::uno::Reference< css::script::provider::XScriptProvider >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > Msp_hash; + OUStringHash, + ::std::equal_to< OUString > > Msp_hash; class ActiveMSPList : public ::cppu::WeakImplHelper1< css::lang::XEventListener > { @@ -63,7 +63,7 @@ public: ~ActiveMSPList(); css::uno::Reference< css::script::provider::XScriptProvider > - getMSPFromStringContext( const ::rtl::OUString& context ) + getMSPFromStringContext( const OUString& context ) SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); css::uno::Reference< css::script::provider::XScriptProvider > @@ -86,7 +86,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > createNewMSP( const css::uno::Any& context ); css::uno::Reference< css::script::provider::XScriptProvider > - createNewMSP( const ::rtl::OUString& context ) + createNewMSP( const OUString& context ) { return createNewMSP( css::uno::makeAny( context ) ); } @@ -95,9 +95,9 @@ private: Msp_hash m_hMsps; ScriptComponent_map m_mScriptComponents; osl::Mutex m_mutex; - ::rtl::OUString userDirString; - ::rtl::OUString shareDirString; - ::rtl::OUString bundledDirString; + OUString userDirString; + OUString shareDirString; + OUString bundledDirString; css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // func_provider diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index efcea19cfc52..5b50526d29f6 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -53,7 +53,7 @@ class BrowseNodeAggregator : public ::cppu::WeakImplHelper1< browse::XBrowseNode > { private: - ::rtl::OUString m_Name; + OUString m_Name; Sequence< Reference< browse::XBrowseNode > > m_Nodes; public: @@ -77,7 +77,7 @@ public: m_Nodes[ index ] = node; } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -158,16 +158,16 @@ public: }; -//typedef ::std::map< ::rtl::OUString, Reference< browse::XBrowseNode > > -typedef ::boost::unordered_map< ::rtl::OUString, Reference< browse::XBrowseNode >, - ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > +//typedef ::std::map< OUString, Reference< browse::XBrowseNode > > +typedef ::boost::unordered_map< OUString, Reference< browse::XBrowseNode >, + OUStringHash, ::std::equal_to< OUString > > BrowseNodeAggregatorHash; -typedef ::std::vector< ::rtl::OUString > vString; +typedef ::std::vector< OUString > vString; struct alphaSort { - bool operator()( const ::rtl::OUString& a, const ::rtl::OUString& b ) + bool operator()( const OUString& a, const OUString& b ) { return a.compareTo( b ) < 0; } @@ -178,7 +178,7 @@ class LocationBrowseNode : private: BrowseNodeAggregatorHash* m_hBNA; vString m_vStr; - ::rtl::OUString m_sNodeName; + OUString m_sNodeName; Reference< browse::XBrowseNode > m_origNode; public: @@ -202,7 +202,7 @@ public: // XBrowseNode // ------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { return m_sNodeName; @@ -297,7 +297,7 @@ namespace Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< XComponentContext >& xCtx ) { - Sequence< ::rtl::OUString > openDocs = + Sequence< OUString > openDocs = MiscUtils::allOpenTDocUrls( xCtx ); Reference< provider::XScriptProviderFactory > xFac; @@ -309,15 +309,15 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< { xFac = provider::theMasterScriptProviderFactory::get( xCtx ); - locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("user") ) ), UNO_QUERY_THROW ); - locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("share") ) ), UNO_QUERY_THROW ); + locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("user") ) ), UNO_QUERY_THROW ); + locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("share") ) ), UNO_QUERY_THROW ); } // TODO proper exception handling, should throw catch( const Exception& e ) { (void)e; OSL_TRACE("Caught Exception %s", - ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); locnBNs.realloc( mspIndex ); return locnBNs; } @@ -469,7 +469,7 @@ public: return m_xWrappedBrowseNode->getType(); } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -537,7 +537,7 @@ class DefaultRootBrowseNode : private: vXBrowseNodes m_vNodes; - ::rtl::OUString m_Name; + OUString m_Name; DefaultRootBrowseNode(); public: @@ -550,7 +550,7 @@ public: { m_vNodes.push_back( new DefaultBrowseNode( xCtx, nodes[ i ] ) ); } - m_Name = ::rtl::OUString("Root"); + m_Name = OUString("Root"); } ~DefaultRootBrowseNode() @@ -578,7 +578,7 @@ public: return browse::BrowseNodeTypes::ROOT; } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -615,10 +615,10 @@ public: { } - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { - return ::rtl::OUString("Root"); + return OUString("Root"); } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL @@ -712,21 +712,21 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() // Namespace global methods for setting up BrowseNodeFactory service //############################################################################ -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString str_name( + OUString str_name( "com.sun.star.script.browse.BrowseNodeFactory"); - return Sequence< ::rtl::OUString >( &str_name, 1 ); + return Sequence< OUString >( &str_name, 1 ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL bnf_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.browse.BrowseNodeFactory" ); } @@ -742,14 +742,14 @@ bnf_create( Reference< XComponentContext > const & xComponentContext ) // Implementation of XServiceInfo //############################################################################ -::rtl::OUString SAL_CALL +OUString SAL_CALL BrowseNodeFactoryImpl::getImplementationName() throw (RuntimeException) { return bnf_getImplementationName(); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL BrowseNodeFactoryImpl::getSupportedServiceNames() throw (RuntimeException) { @@ -757,15 +757,15 @@ BrowseNodeFactoryImpl::getSupportedServiceNames() } sal_Bool BrowseNodeFactoryImpl::supportsService( - ::rtl::OUString const & serviceName ) + OUString const & serviceName ) throw (RuntimeException) { // check(); - Sequence< ::rtl::OUString > supported_services( + Sequence< OUString > supported_services( getSupportedServiceNames() ); - ::rtl::OUString const * ar = supported_services.getConstArray(); + OUString const * ar = supported_services.getConstArray(); for ( sal_Int32 pos = supported_services.getLength(); pos--; ) { diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index 0953a9f26f18..cf224d46477c 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -49,14 +49,14 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( ::rtl::OUString const & serviceName ) + supportsService( OUString const & serviceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index b6fff3354357..3e41477361cf 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -59,13 +59,13 @@ namespace func_provider // Definitions for MasterScriptProviderFactory global methods. //************************************************************************* -::rtl::OUString SAL_CALL mspf_getImplementationName() ; +OUString SAL_CALL mspf_getImplementationName() ; Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext > const & xComponentContext ); -Sequence< ::rtl::OUString > SAL_CALL mspf_getSupportedServiceNames(); +Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames(); -bool endsWith( const ::rtl::OUString& target, - const ::rtl::OUString& item ) +bool endsWith( const OUString& target, + const OUString& item ) { sal_Int32 index = 0; if ( ( index = target.indexOf( item ) ) != -1 && @@ -154,7 +154,7 @@ throw ( Exception, RuntimeException ) if ( !xScripts.is() ) { throw lang::IllegalArgumentException( - ::rtl::OUString( "The given document does not support embedding scripts into it, and cannot be associated with such a document." + OUString( "The given document does not support embedding scripts into it, and cannot be associated with such a document." ), *this, 1 @@ -169,7 +169,7 @@ throw ( Exception, RuntimeException ) { Any aError( ::cppu::getCaughtException() ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "MasterScriptProvider::initialize: caught " ); buf.append ( aError.getValueTypeName() ); buf.appendAscii( ":" ); @@ -185,7 +185,7 @@ throw ( Exception, RuntimeException ) invokeArgs[ 0 ] <<= m_sCtxString; } - ::rtl::OUString pkgSpec = "uno_packages"; + OUString pkgSpec = "uno_packages"; sal_Int32 indexOfPkgSpec = m_sCtxString.lastIndexOf( pkgSpec ); // if contex string ends with "uno_packages" @@ -221,7 +221,7 @@ void MasterScriptProvider::createPkgProvider() try { Any location; - ::rtl::OUString sPkgCtx = m_sCtxString.concat( ":uno_packages" ); + OUString sPkgCtx = m_sCtxString.concat( ":uno_packages" ); location <<= sPkgCtx; Reference< provider::XScriptProviderFactory > xFac = @@ -235,16 +235,16 @@ void MasterScriptProvider::createPkgProvider() { (void)e; OSL_TRACE("Exception creating MasterScriptProvider for uno_packages in context %s: %s", - ::rtl::OUStringToOString( m_sCtxString, + OUStringToOString( m_sCtxString, RTL_TEXTENCODING_ASCII_US ).pData->buffer, - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } } //************************************************************************* Reference< provider::XScript > -MasterScriptProvider::getScript( const ::rtl::OUString& scriptURI ) +MasterScriptProvider::getScript( const OUString& scriptURI ) throw ( provider::ScriptFrameworkErrorException, RuntimeException ) { @@ -267,7 +267,7 @@ throw ( provider::ScriptFrameworkErrorException, if ( !uriRef.is() || !sfUri.is() ) { - ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; + OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -275,14 +275,14 @@ throw ( provider::ScriptFrameworkErrorException, provider::ScriptFrameworkErrorType::UNKNOWN ); } - ::rtl::OUString langKey("language"); - ::rtl::OUString locKey("location"); + OUString langKey("language"); + OUString locKey("location"); if ( sfUri->hasParameter( langKey ) == sal_False || sfUri->hasParameter( locKey ) == sal_False || ( sfUri->getName().isEmpty() ) ) { - ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; + OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -290,12 +290,12 @@ throw ( provider::ScriptFrameworkErrorException, provider::ScriptFrameworkErrorType::UNKNOWN ); } - ::rtl::OUString language = sfUri->getParameter( langKey ); - ::rtl::OUString location = sfUri->getParameter( locKey ); + OUString language = sfUri->getParameter( langKey ); + OUString location = sfUri->getParameter( locKey ); // if script us located in uno pkg sal_Int32 index = -1; - ::rtl::OUString pkgTag(":uno_packages"); + OUString pkgTag(":uno_packages"); // for languages other than basic, scripts located in uno packages // are merged into the user/share location context. // For other languages the location attribute in script url has the form @@ -329,10 +329,10 @@ throw ( provider::ScriptFrameworkErrorException, ) { Reference< provider::XScriptProvider > xScriptProvider; - ::rtl::OUStringBuffer buf( 80 ); + OUStringBuffer buf( 80 ); buf.appendAscii( "com.sun.star.script.provider.ScriptProviderFor"); buf.append( language ); - ::rtl::OUString serviceName = buf.makeStringAndClear(); + OUString serviceName = buf.makeStringAndClear(); if ( providerCache() ) { try @@ -387,8 +387,8 @@ MasterScriptProvider::providerCache() ::osl::MutexGuard aGuard( m_mutex ); if ( !m_pPCache ) { - ::rtl::OUString serviceName1 = "com.sun.star.script.provider.ScriptProviderForBasic"; - Sequence< ::rtl::OUString > blacklist(1); + OUString serviceName1 = "com.sun.star.script.provider.ScriptProviderForBasic"; + Sequence< OUString > blacklist(1); blacklist[ 0 ] = serviceName1; if ( !m_bIsPkgMSP ) @@ -406,13 +406,13 @@ MasterScriptProvider::providerCache() //************************************************************************* -::rtl::OUString SAL_CALL +OUString SAL_CALL MasterScriptProvider::getName() throw ( css::uno::RuntimeException ) { if ( !isPkgProvider() ) { - ::rtl::OUString sCtx = getContextString(); + OUString sCtx = getContextString(); if ( sCtx.indexOf( "vnd.sun.star.tdoc" ) == 0 ) { Reference< frame::XModel > xModel = m_xModel; @@ -483,12 +483,12 @@ MasterScriptProvider::getType() //************************************************************************* -::rtl::OUString -MasterScriptProvider::parseLocationName( const ::rtl::OUString& location ) +OUString +MasterScriptProvider::parseLocationName( const OUString& location ) { // strip out the last leaf of location name // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; + OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -498,7 +498,7 @@ MasterScriptProvider::parseLocationName( const ::rtl::OUString& location ) //************************************************************************* // Register Package void SAL_CALL -MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException) +MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException) { if ( !m_bIsPkgMSP ) { @@ -567,7 +567,7 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = "Failed to register package for "; + OUString message = "Failed to register package for "; message = message.concat( aName ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 2 ); @@ -578,7 +578,7 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl //************************************************************************* // Revoke Package void SAL_CALL -MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { if ( !m_bIsPkgMSP ) { @@ -641,7 +641,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = "Failed to revoke package for "; + OUString message = "Failed to revoke package for "; message = message.concat( Name ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 1 ); @@ -652,7 +652,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai //************************************************************************* void SAL_CALL -MasterScriptProvider::replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { (void)aName; (void)aElement; @@ -666,7 +666,7 @@ MasterScriptProvider::replaceByName( const ::rtl::OUString& aName, const Any& aE } //************************************************************************* Any SAL_CALL -MasterScriptProvider::getByName( const ::rtl::OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { (void)aName; @@ -681,7 +681,7 @@ MasterScriptProvider::getByName( const ::rtl::OUString& aName ) throw ( containe } //************************************************************************* sal_Bool SAL_CALL -MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException) { sal_Bool result = sal_False; if ( !m_bIsPkgMSP ) @@ -751,11 +751,11 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx } //************************************************************************* -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL MasterScriptProvider::getElementNames( ) throw ( RuntimeException) { // TODO needs implementing - Sequence< ::rtl::OUString > names; + Sequence< OUString > names; if ( true ) { throw RuntimeException( "getElementNames not implemented!!!!" , @@ -793,7 +793,7 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) } else { - ::rtl::OUString errorMsg( + OUString errorMsg( "MasterScriptProvider::getAllProviders, cache not initialised"); throw RuntimeException( errorMsg.concat( errorMsg ), Reference< XInterface >() ); @@ -802,18 +802,18 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) //************************************************************************* -::rtl::OUString SAL_CALL MasterScriptProvider::getImplementationName( ) +OUString SAL_CALL MasterScriptProvider::getImplementationName( ) throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } //************************************************************************* -sal_Bool SAL_CALL MasterScriptProvider::supportsService( const ::rtl::OUString& serviceName ) +sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& serviceName ) throw( RuntimeException ) { - Sequence< ::rtl::OUString > serviceNames( getSupportedServiceNames() ); - ::rtl::OUString const * pNames = serviceNames.getConstArray(); + Sequence< OUString > serviceNames( getSupportedServiceNames() ); + OUString const * pNames = serviceNames.getConstArray(); for ( sal_Int32 nPos = serviceNames.getLength(); nPos--; ) { if ( serviceName.equals( pNames[ nPos ] ) ) @@ -825,16 +825,16 @@ throw( RuntimeException ) } //************************************************************************* -Sequence< ::rtl::OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) throw( RuntimeException ) { - ::rtl::OUString names[3]; + OUString names[3]; - names[0] = ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); + names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); - return Sequence< ::rtl::OUString >( names, 3 ); + return Sequence< OUString >( names, 3 ); } } // namespace func_provider @@ -842,9 +842,9 @@ throw( RuntimeException ) namespace browsenodefactory { -::rtl::OUString SAL_CALL bnf_getImplementationName() ; +OUString SAL_CALL bnf_getImplementationName() ; Reference< XInterface > SAL_CALL bnf_create( Reference< XComponentContext > const & xComponentContext ); -Sequence< ::rtl::OUString > SAL_CALL bnf_getSupportedServiceNames(); +Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames(); } namespace scripting_runtimemgr @@ -857,23 +857,23 @@ Reference< XInterface > SAL_CALL sp_create( } //************************************************************************* -Sequence< ::rtl::OUString > sp_getSupportedServiceNames( ) +Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString names[3]; + OUString names[3]; - names[0] = ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); + names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); - return Sequence< ::rtl::OUString >( names, 3 ); + return Sequence< OUString >( names, 3 ); } //************************************************************************* -::rtl::OUString sp_getImplementationName( ) +OUString sp_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } // ***** registration or ScriptingFrameworkURIHelper @@ -884,23 +884,23 @@ Reference< XInterface > SAL_CALL urihelper_create( new ::func_provider::ScriptingFrameworkURIHelper( xCompC ); } -Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( ) +Sequence< OUString > urihelper_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString serviceNameList[] = { - ::rtl::OUString( + OUString serviceNameList[] = { + OUString( "com.sun.star.script.provider.ScriptURIHelper" ) }; - Sequence< ::rtl::OUString > serviceNames = Sequence < - ::rtl::OUString > ( serviceNameList, 1 ); + Sequence< OUString > serviceNames = Sequence < + OUString > ( serviceNameList, 1 ); return serviceNames; } -::rtl::OUString urihelper_getImplementationName( ) +OUString urihelper_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.provider.ScriptURIHelper"); } diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 3299fcfe35e3..7c5ab87d4040 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -55,11 +55,11 @@ public: ~MasterScriptProvider(); // XServiceInfo implementation - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw( css::uno::RuntimeException ); // XBrowseNode implementation - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() throw ( css::uno::RuntimeException ); @@ -68,34 +68,34 @@ public: virtual sal_Int16 SAL_CALL getType() throw ( css::uno::RuntimeException ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw ( css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( css::uno::RuntimeException ); // XScriptProvider implementation virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL - getScript( const ::rtl::OUString& scriptURI ) + getScript( const OUString& scriptURI ) throw( css::script::provider::ScriptFrameworkErrorException, css::uno::RuntimeException ); /** * XInitialise implementation * - * @param args expected to contain a single ::rtl::OUString + * @param args expected to contain a single OUString * containing the URI */ virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) @@ -109,14 +109,14 @@ public: bool isPkgProvider() { return m_bIsPkgMSP; } css::uno::Reference< css::script::provider::XScriptProvider > getPkgProvider() { return m_xMSPPkg; } // returns context string for this provider, eg - ::rtl::OUString getContextString() { return m_sCtxString; } + OUString getContextString() { return m_sCtxString; } private: - ::rtl::OUString parseLocationName( const ::rtl::OUString& location ); + OUString parseLocationName( const OUString& location ); void createPkgProvider(); bool isValid(); - ::rtl::OUString getURLForModel(); - const css::uno::Sequence< ::rtl::OUString >& getProviderNames(); + OUString getURLForModel(); + const css::uno::Sequence< OUString >& getProviderNames(); ProviderCache* providerCache(); /* to obtain other services if needed */ @@ -125,7 +125,7 @@ private: css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::document::XScriptInvocationContext > m_xInvocationContext; css::uno::Sequence< css::uno::Any > m_sAargs; - ::rtl::OUString m_sNodeName; + OUString m_sNodeName; // This component supports XInitialization, it can be created // using createInstanceXXX() or createInstanceWithArgumentsXXX using @@ -141,7 +141,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > m_xMSPPkg; ProviderCache* m_pPCache; osl::Mutex m_mutex; - ::rtl::OUString m_sCtxString; + OUString m_sCtxString; }; } // namespace func_provider #endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_ diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index 3da69d48d13d..aac8b34bceb7 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -77,21 +77,21 @@ MasterScriptProviderFactory::getActiveMSPList() const // Namespace global methods for setting up MasterScriptProviderFactory service //############################################################################ -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString str_name( + OUString str_name( "com.sun.star.script.provider.MasterScriptProviderFactory"); - return Sequence< ::rtl::OUString >( &str_name, 1 ); + return Sequence< OUString >( &str_name, 1 ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL mspf_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.provider.MasterScriptProviderFactory"); } @@ -107,14 +107,14 @@ mspf_create( Reference< XComponentContext > const & xComponentContext ) // Implementation of XServiceInfo //############################################################################ -::rtl::OUString SAL_CALL +OUString SAL_CALL MasterScriptProviderFactory::getImplementationName() throw (RuntimeException) { return mspf_getImplementationName(); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL MasterScriptProviderFactory::getSupportedServiceNames() throw (RuntimeException) { @@ -122,15 +122,15 @@ MasterScriptProviderFactory::getSupportedServiceNames() } sal_Bool MasterScriptProviderFactory::supportsService( - ::rtl::OUString const & serviceName ) + OUString const & serviceName ) throw (RuntimeException) { // check(); - Sequence< ::rtl::OUString > supported_services( + Sequence< OUString > supported_services( getSupportedServiceNames() ); - ::rtl::OUString const * ar = supported_services.getConstArray(); + OUString const * ar = supported_services.getConstArray(); for ( sal_Int32 pos = supported_services.getLength(); pos--; ) { diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index f07a03b3df32..b7a04940dd94 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -54,14 +54,14 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( ::rtl::OUString const & serviceName ) + supportsService( OUString const & serviceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 510597adeaf5..30060a38b5bf 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -46,7 +46,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co } -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< ::rtl::OUString >& blackList ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) throw ( RuntimeException ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) { @@ -63,7 +63,7 @@ ProviderCache::~ProviderCache() } Reference< provider::XScriptProvider > -ProviderCache::getProvider( const ::rtl::OUString& providerName ) +ProviderCache::getProvider( const OUString& providerName ) { ::osl::Guard< osl::Mutex > aGuard( m_mutex ); Reference< provider::XScriptProvider > provider; @@ -137,11 +137,11 @@ void ProviderCache::populateCache() throw ( RuntimeException ) { // wrong name in services.rdb - ::rtl::OUString serviceName; + OUString serviceName; ::osl::Guard< osl::Mutex > aGuard( m_mutex ); try { - ::rtl::OUString languageProviderName( "com.sun.star.script.provider.LanguageScriptProvider" ); + OUString languageProviderName( "com.sun.star.script.provider.LanguageScriptProvider" ); Reference< container::XContentEnumerationAccess > xEnumAccess = Reference< container::XContentEnumerationAccess >( m_xMgr, UNO_QUERY_THROW ); Reference< container::XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -152,11 +152,11 @@ ProviderCache::populateCache() throw ( RuntimeException ) Reference< lang::XSingleComponentFactory > factory( xEnum->nextElement(), UNO_QUERY_THROW ); Reference< lang::XServiceInfo > xServiceInfo( factory, UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); + Sequence< OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); if ( serviceNames.getLength() > 0 ) { - ::rtl::OUString searchString( "com.sun.star.script.provider.ScriptProviderFor" ); + OUString searchString( "com.sun.star.script.provider.ScriptProviderFor" ); for ( sal_Int32 index = 0; index < serviceNames.getLength(); index++ ) { @@ -191,7 +191,7 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti } catch ( const Exception& e ) { - ::rtl::OUString temp("ProviderCache::createProvider() Error creating provider from factory!!!\n"); + OUString temp("ProviderCache::createProvider() Error creating provider from factory!!!\n"); throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 2021baa08e2b..398214d8eff6 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -47,8 +47,8 @@ struct ProviderDetails css::uno::Reference< css::lang::XSingleComponentFactory > factory; css::uno::Reference< css::script::provider::XScriptProvider > provider; }; -typedef ::boost::unordered_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash; +typedef ::boost::unordered_map < OUString, ProviderDetails , OUStringHash, + ::std::equal_to< OUString > > ProviderDetails_hash; class ProviderCache @@ -58,11 +58,11 @@ public: ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ) throw ( css::uno::RuntimeException ); ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext, - const css::uno::Sequence< ::rtl::OUString >& blackList ) + const css::uno::Sequence< OUString >& blackList ) throw ( css::uno::RuntimeException ); ~ProviderCache(); css::uno::Reference< css::script::provider::XScriptProvider > - getProvider( const ::rtl::OUString& providerName ); + getProvider( const OUString& providerName ); css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > > getAllProviders() throw ( css::uno::RuntimeException ); private: @@ -71,7 +71,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException ); - bool isInBlackList( const ::rtl::OUString& serviceName ) + bool isInBlackList( const OUString& serviceName ) { if ( m_sBlackList.getLength() > 0 ) { @@ -85,7 +85,7 @@ private: } return false; } - css::uno::Sequence< ::rtl::OUString > m_sBlackList; + css::uno::Sequence< OUString > m_sBlackList; ProviderDetails_hash m_hProviderDetailsCache; osl::Mutex m_mutex; css::uno::Sequence< css::uno::Any > m_Sctx; diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx index 2059a86cb9ea..5ca950916fe6 100644 --- a/scripting/source/provider/ScriptImpl.cxx +++ b/scripting/source/provider/ScriptImpl.cxx @@ -35,7 +35,7 @@ namespace func_provider ScriptImpl::ScriptImpl( const Reference< beans::XPropertySet > & scriptingContext, const Reference< runtime::XScriptInvocation > & runtimeMgr, - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( RuntimeException ) : m_XScriptingContext( scriptingContext, UNO_SET_THROW ), m_RunTimeManager( runtimeMgr, UNO_SET_THROW ), @@ -69,14 +69,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const lang::IllegalArgumentException & iae ) { - ::rtl::OUString temp = "ScriptImpl::invoke IllegalArgumentException : "; + OUString temp = "ScriptImpl::invoke IllegalArgumentException : "; throw lang::IllegalArgumentException( temp.concat( iae.Message ), Reference< XInterface > (), iae.ArgumentPosition ); } catch ( const script::CannotConvertException & cce ) { - ::rtl::OUString temp = "ScriptImpl::invoke CannotConvertException : "; + OUString temp = "ScriptImpl::invoke CannotConvertException : "; throw script::CannotConvertException( temp.concat( cce.Message ), Reference< XInterface > (), cce.DestinationTypeClass, @@ -85,14 +85,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const reflection::InvocationTargetException & ite ) { - ::rtl::OUString temp = "ScriptImpl::invoke InvocationTargetException : "; + OUString temp = "ScriptImpl::invoke InvocationTargetException : "; throw reflection::InvocationTargetException( temp.concat( ite.Message ), Reference< XInterface > (), ite.TargetException ); } catch ( const RuntimeException & re ) { - ::rtl::OUString temp = "ScriptImpl::invoke RuntimeException : "; + OUString temp = "ScriptImpl::invoke RuntimeException : "; throw RuntimeException( temp.concat( re.Message ), Reference< XInterface > () ); } diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx index f6f1f6bfce4e..04c1e677f013 100644 --- a/scripting/source/provider/ScriptImpl.hxx +++ b/scripting/source/provider/ScriptImpl.hxx @@ -48,7 +48,7 @@ public: ScriptImpl( const css::uno::Reference< css::beans::XPropertySet > & scriptingContext, const css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > & runtimeMgr, - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( css::uno::RuntimeException ); /************************************************************* @@ -90,7 +90,7 @@ public: private: css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext; css::uno::Reference < ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > m_RunTimeManager; - ::rtl::OUString m_ScriptURI; + OUString m_ScriptURI; /* copy ctor disabled, i.e. not defined */ ScriptImpl( const ScriptImpl& ); diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx index e5595f6314e0..2527becce868 100644 --- a/scripting/source/provider/ScriptingContext.cxx +++ b/scripting/source/provider/ScriptingContext.cxx @@ -55,7 +55,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont scripting_constants::ScriptingConstantsPool::instance(); registerPropertyNoMember( scriptingConstantsPool.DOC_REF, DOC_REF_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(),::getCppuType( (const Reference< css::frame::XModel >* ) NULL ), NULL ) ; registerPropertyNoMember( scriptingConstantsPool.DOC_STORAGE_ID, DOC_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ) ; - registerPropertyNoMember( scriptingConstantsPool.DOC_URI, DOC_URI_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const ::rtl::OUString* ) NULL ), NULL ) ; + registerPropertyNoMember( scriptingConstantsPool.DOC_URI, DOC_URI_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const OUString* ) NULL ), NULL ) ; registerPropertyNoMember( scriptingConstantsPool.RESOLVED_STORAGE_ID, RESOLVED_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ); registerPropertyNoMember( scriptingConstantsPool.SCRIPT_INFO, SCRIPT_INFO_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ); } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 6aebc6d9269d..e0f42336b335 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -26,7 +26,6 @@ namespace func_provider { -using ::rtl::OUString; namespace uno = ::com::sun::star::uno; namespace ucb = ::com::sun::star::ucb; namespace lang = ::com::sun::star::lang; @@ -215,7 +214,7 @@ OUString SAL_CALL ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - ::rtl::OUStringBuffer buf(120); + OUStringBuffer buf(120); buf.appendAscii("vnd.sun.star.script:"); buf.append(getLanguagePart(rStorageURI)); @@ -245,7 +244,7 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) uno::Reference< uno::XInterface >(), 1 ); } - ::rtl::OUStringBuffer buf(120); + OUStringBuffer buf(120); buf.append(m_sBaseURI); buf.append(OUString("/")); buf.append(getLanguagePath(sLanguagePart)); @@ -284,16 +283,16 @@ ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName ) return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ScriptingFrameworkURIHelper::getSupportedServiceNames() throw( uno::RuntimeException ) { - ::rtl::OUString serviceNameList[] = { - ::rtl::OUString( + OUString serviceNameList[] = { + OUString( "com.sun.star.script.provider.ScriptURIHelper" ) }; - uno::Sequence< ::rtl::OUString > serviceNames = uno::Sequence < - ::rtl::OUString > ( serviceNameList, 1 ); + uno::Sequence< OUString > serviceNames = uno::Sequence < + OUString > ( serviceNameList, 1 ); return serviceNames; } diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index 2ceb3d875fb7..17096d8ae9ae 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -45,15 +45,15 @@ private: css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSimpleFileAccess; css::uno::Reference<css::uri::XUriReferenceFactory> m_xUriReferenceFactory; - ::rtl::OUString m_sLanguage; - ::rtl::OUString m_sLocation; - ::rtl::OUString m_sBaseURI; + OUString m_sLanguage; + OUString m_sLocation; + OUString m_sBaseURI; - ::rtl::OUString SCRIPTS_PART; + OUString SCRIPTS_PART; bool initBaseURI(); - ::rtl::OUString getLanguagePart(const ::rtl::OUString& rStorageURI); - ::rtl::OUString getLanguagePath(const ::rtl::OUString& rLanguagePart); + OUString getLanguagePart(const OUString& rStorageURI); + OUString getLanguagePath(const OUString& rLanguagePart); public: @@ -67,29 +67,29 @@ public: initialize( const css::uno::Sequence < css::uno::Any > & args ) throw ( css::uno::Exception, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getRootStorageURI() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL - getScriptURI( const ::rtl::OUString& rStorageURI ) + virtual OUString SAL_CALL + getScriptURI( const OUString& rStorageURI ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL - getStorageURI( const ::rtl::OUString& rScriptURI ) + virtual OUString SAL_CALL + getStorageURI( const OUString& rScriptURI ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); }; diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index abd83a0526b8..5bc28424252a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -76,16 +76,16 @@ namespace stringresource // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResource" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResource" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceImpl() +static OUString getImplementationName_StringResourceImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResource" ); + return OUString( "com.sun.star.comp.scripting.StringResource" ); } static Reference< XInterface > SAL_CALL create_StringResourceImpl( @@ -131,23 +131,23 @@ StringResourceImpl::~StringResourceImpl() // ============================================================================= // XServiceInfo -::rtl::OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceImpl(); } -sal_Bool StringResourceImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; return pNames != pEnd; } -Sequence< ::rtl::OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceImpl(); } @@ -182,11 +182,11 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener // ============================================================================= // XStringResourceResolver -::rtl::OUString StringResourceImpl::implResolveString - ( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +OUString StringResourceImpl::implResolveString + ( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException) { - ::rtl::OUString aRetStr; + OUString aRetStr; bool bSuccess = false; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) { @@ -199,21 +199,21 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener } if( !bSuccess ) { - ::rtl::OUString errorMsg("StringResourceImpl: No entry for ResourceID: "); + OUString errorMsg("StringResourceImpl: No entry for ResourceID: "); errorMsg = errorMsg.concat( ResourceID ); throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() ); } return aRetStr; } -::rtl::OUString StringResourceImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return implResolveString( ResourceID, m_pCurrentLocaleItem ); } -::rtl::OUString StringResourceImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -221,7 +221,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener return implResolveString( ResourceID, pLocaleItem ); } -sal_Bool StringResourceImpl::implHasEntryForId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +sal_Bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ) { bool bSuccess = false; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -233,14 +233,14 @@ sal_Bool StringResourceImpl::implHasEntryForId( const ::rtl::OUString& ResourceI return bSuccess; } -sal_Bool StringResourceImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return implHasEntryForId( ResourceID, m_pCurrentLocaleItem ); } -sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { @@ -249,21 +249,21 @@ sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& Reso return implHasEntryForId( ResourceID, pLocaleItem ); } -Sequence< ::rtl::OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocaleItem ) +Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocaleItem ) { - Sequence< ::rtl::OUString > aIDSeq( 0 ); + Sequence< OUString > aIDSeq( 0 ); if( pLocaleItem && loadLocale( pLocaleItem ) ) { const IdToStringMap& rHashMap = pLocaleItem->m_aIdToStringMap; sal_Int32 nResourceIDCount = rHashMap.size(); aIDSeq.realloc( nResourceIDCount ); - ::rtl::OUString* pStrings = aIDSeq.getArray(); + OUString* pStrings = aIDSeq.getArray(); IdToStringMap::const_iterator it; int iTarget = 0; for( it = rHashMap.begin(); it != rHashMap.end(); ++it ) { - ::rtl::OUString aStr = (*it).first; + OUString aStr = (*it).first; pStrings[iTarget] = aStr; iTarget++; } @@ -271,7 +271,7 @@ Sequence< ::rtl::OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* return aIDSeq; } -Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -279,7 +279,7 @@ Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDsForLocale return implGetResourceIDs( pLocaleItem ); } -Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDs( ) +Sequence< OUString > StringResourceImpl::getResourceIDs( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -335,7 +335,7 @@ void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) { if( m_bReadOnly ) { - ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( pExceptionMsg ); + OUString errorMsg = OUString::createFromAscii( pExceptionMsg ); throw NoSupportException( errorMsg, Reference< XInterface >() ); } } @@ -399,8 +399,8 @@ void StringResourceImpl::setDefaultLocale( const Locale& locale ) } } -void StringResourceImpl::implSetString( const ::rtl::OUString& ResourceID, - const ::rtl::OUString& Str, LocaleItem* pLocaleItem ) +void StringResourceImpl::implSetString( const OUString& ResourceID, + const OUString& Str, LocaleItem* pLocaleItem ) { if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) { @@ -420,7 +420,7 @@ void StringResourceImpl::implSetString( const ::rtl::OUString& ResourceID, } } -void StringResourceImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -429,7 +429,7 @@ void StringResourceImpl::setString( const ::rtl::OUString& ResourceID, const ::r } void StringResourceImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -438,7 +438,7 @@ void StringResourceImpl::setStringForLocale implSetString( ResourceID, Str, pLocaleItem ); } -void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException) { if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -447,7 +447,7 @@ void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, Locale IdToStringMap::iterator it = rHashMap.find( ResourceID ); if( it == rHashMap.end() ) { - ::rtl::OUString errorMsg("StringResourceImpl: No entries for ResourceID: "); + OUString errorMsg("StringResourceImpl: No entries for ResourceID: "); errorMsg = errorMsg.concat( ResourceID ); throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() ); } @@ -457,7 +457,7 @@ void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, Locale } } -void StringResourceImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -465,7 +465,7 @@ void StringResourceImpl::removeId( const ::rtl::OUString& ResourceID ) implRemoveId( ResourceID, m_pCurrentLocaleItem ); } -void StringResourceImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -482,7 +482,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) if( getItemForLocale( locale, false ) != NULL ) { - ::rtl::OUString errorMsg("StringResourceImpl: locale already exists"); + OUString errorMsg("StringResourceImpl: locale already exists"); throw ElementExistException( errorMsg, Reference< XInterface >() ); } @@ -505,8 +505,8 @@ void StringResourceImpl::newLocale( const Locale& locale ) IdToStringMap::const_iterator it; for( it = rSourceMap.begin(); it != rSourceMap.end(); ++it ) { - ::rtl::OUString aId = (*it).first; - ::rtl::OUString aStr = (*it).second; + OUString aId = (*it).first; + OUString aStr = (*it).second; rTargetMap[ aId ] = aStr; } @@ -515,7 +515,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) IdToIndexMap::const_iterator it_index; for( it_index = rSourceIndexMap.begin(); it_index != rSourceIndexMap.end(); ++it_index ) { - ::rtl::OUString aId = (*it_index).first; + OUString aId = (*it_index).first; sal_Int32 nIndex = (*it_index).second; rTargetIndexMap[ aId ] = nIndex; } @@ -535,7 +535,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) } else { - ::rtl::OUString errorMsg("StringResourceImpl: Invalid locale"); + OUString errorMsg("StringResourceImpl: Invalid locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } } @@ -607,7 +607,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) } } -void StringResourceImpl::implScanIdForNumber( const ::rtl::OUString& ResourceID ) +void StringResourceImpl::implScanIdForNumber( const OUString& ResourceID ) { const sal_Unicode* pSrc = ResourceID.getStr(); sal_Int32 nLen = ResourceID.getLength(); @@ -640,7 +640,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) if( m_nNextUniqueNumericId < UNIQUE_NUMBER_NEEDS_INITIALISATION ) { - ::rtl::OUString errorMsg("getUniqueNumericId: Extended sal_Int32 range"); + OUString errorMsg("getUniqueNumericId: Extended sal_Int32 range"); throw NoSupportException( errorMsg, Reference< XInterface >() ); } return m_nNextUniqueNumericId; @@ -675,7 +675,7 @@ LocaleItem* StringResourceImpl::getItemForLocale if( pRetItem == NULL && bException ) { - ::rtl::OUString errorMsg("StringResourceImpl: Invalid locale"); + OUString errorMsg("StringResourceImpl: Invalid locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } return pRetItem; @@ -766,7 +766,7 @@ Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory if( !xSMgr.is() ) { throw RuntimeException( - ::rtl::OUString( "StringResourceImpl::getMultiComponentFactory: Couldn't instantiate MultiComponentFactory" ), + OUString( "StringResourceImpl::getMultiComponentFactory: Couldn't instantiate MultiComponentFactory" ), Reference< XInterface >() ); } m_xMCF = xSMgr; @@ -794,15 +794,15 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourcePersistenceImpl::getImplementationName( ) +OUString StringResourcePersistenceImpl::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); + return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); } // ----------------------------------------------------------------------------- -sal_Bool StringResourcePersistenceImpl::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return StringResourceImpl::supportsService( rServiceName ); @@ -810,7 +810,7 @@ sal_Bool StringResourcePersistenceImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) +Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) throw (RuntimeException) { return StringResourceImpl::getSupportedServiceNames(); @@ -820,7 +820,7 @@ Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getSupportedServiceNa // XInitialization base functionality for derived classes // ----------------------------------------------------------------------------- -static ::rtl::OUString aNameBaseDefaultStr("strings"); +static OUString aNameBaseDefaultStr("strings"); void StringResourcePersistenceImpl::implInitializeCommonParameters ( const Sequence< Any >& aArguments ) @@ -829,7 +829,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly); if( !bReadOnlyOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected ReadOnly flag"); + OUString errorMsg("XInitialization::initialize: Expected ReadOnly flag"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 ); } @@ -837,14 +837,14 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bLocaleOk = (aArguments[2] >>= aCurrentLocale); if( !bLocaleOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected Locale"); + OUString errorMsg("XInitialization::initialize: Expected Locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 2 ); } bool bNameBaseOk = (aArguments[3] >>= m_aNameBase); if( !bNameBaseOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected NameBase string"); + OUString errorMsg("XInitialization::initialize: Expected NameBase string"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 3 ); } if( m_aNameBase.isEmpty() ) @@ -853,7 +853,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bCommentOk = (aArguments[4] >>= m_aComment); if( !bCommentOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected Comment string"); + OUString errorMsg("XInitialization::initialize: Expected Comment string"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 4 ); } @@ -880,22 +880,22 @@ void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModi } // XStringResourceResolver -::rtl::OUString StringResourcePersistenceImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourcePersistenceImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourcePersistenceImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourcePersistenceImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { @@ -933,33 +933,33 @@ void StringResourcePersistenceImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getResourceIDs( ) +Sequence< OUString > StringResourcePersistenceImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -void StringResourcePersistenceImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourcePersistenceImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourcePersistenceImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getResourceIDsForLocale +Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); } -void StringResourcePersistenceImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourcePersistenceImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourcePersistenceImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -996,14 +996,14 @@ sal_Bool StringResourcePersistenceImpl::isModified( ) return m_bModified; } -void StringResourcePersistenceImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourcePersistenceImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { m_aComment = Comment; } void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1015,8 +1015,8 @@ void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& void StringResourcePersistenceImpl::implStoreAtStorage ( - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& aNameBase, + const OUString& aComment, const Reference< ::com::sun::star::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll @@ -1032,8 +1032,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString(".properties"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString(".properties"); try { @@ -1054,14 +1054,14 @@ void StringResourcePersistenceImpl::implStoreAtStorage if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) && loadLocale( pLocaleItem ) ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); - aStreamName += ::rtl::OUString(".properties"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); + aStreamName += OUString(".properties"); Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); - ::rtl::OUString aPropName("MediaType"); - ::rtl::OUString aMime("text/plain"); + OUString aPropName("MediaType"); + OUString aMime("text/plain"); uno::Reference< beans::XPropertySet > xProps( xElementStream, uno::UNO_QUERY ); OSL_ENSURE( xProps.is(), "The StorageStream must implement XPropertySet interface!\n" ); @@ -1069,7 +1069,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage { xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); - aPropName = ::rtl::OUString("UseCommonStoragePasswordEncryption"); + aPropName = OUString("UseCommonStoragePasswordEncryption"); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) ); } @@ -1092,8 +1092,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString(".default"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString(".default"); try { @@ -1111,8 +1111,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage // Default locale if( m_pDefaultLocaleItem != NULL && (bStoreAll || m_bDefaultModified) ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ); - aStreamName += ::rtl::OUString(".default"); + OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ); + aStreamName += OUString(".default"); Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); @@ -1126,8 +1126,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage } } -void StringResourcePersistenceImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourcePersistenceImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -1145,8 +1145,8 @@ void StringResourcePersistenceImpl::storeToURL( const ::rtl::OUString& URL, void StringResourcePersistenceImpl::implKillRemovedLocaleFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (Exception, RuntimeException) @@ -1158,7 +1158,7 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1171,8 +1171,8 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles void StringResourcePersistenceImpl::implKillChangedDefaultFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (Exception, RuntimeException) @@ -1184,7 +1184,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location, true ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1197,9 +1197,9 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles void StringResourcePersistenceImpl::implStoreAtLocation ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& Location, + const OUString& aNameBase, + const OUString& aComment, const Reference< ucb::XSimpleFileAccess3 >& xFileAccess, bool bUsedForStore, bool bStoreAll, @@ -1217,7 +1217,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation if( pLocaleItem != NULL && (bStoreAll || bKillAll || pLocaleItem->m_bModified) && loadLocale( pLocaleItem ) ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1244,7 +1244,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation // Default locale if( m_pDefaultLocaleItem != NULL && (bStoreAll || bKillAll || m_bDefaultModified) ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( m_pDefaultLocaleItem, aNameBase, Location, true ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1290,7 +1290,7 @@ public: void writeUnicodeChar( sal_Unicode n ) { write16BitInt( n ); } void writeInt32( sal_Int32 n ); - void writeString( const ::rtl::OUString& aStr ); + void writeString( const OUString& aStr ); }; BinaryOutput::BinaryOutput( Reference< XMultiComponentFactory > xMCF, @@ -1335,7 +1335,7 @@ void BinaryOutput::writeInt32( sal_Int32 n ) m_xOutputStream->writeBytes( aSeq ); } -void BinaryOutput::writeString( const ::rtl::OUString& aStr ) +void BinaryOutput::writeString( const OUString& aStr ) { sal_Int32 nLen = aStr.getLength(); const sal_Unicode* pStr = aStr.getStr(); @@ -1505,7 +1505,7 @@ public: sal_Int16 readInt16( void ); sal_Int32 readInt32( void ); sal_Unicode readUnicodeChar( void ); - ::rtl::OUString readString( void ); + OUString readString( void ); }; BinaryInput::BinaryInput( Sequence< ::sal_Int8 > aData, Reference< XMultiComponentFactory > xMCF, @@ -1596,9 +1596,9 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) return cRet; } -::rtl::OUString BinaryInput::readString( void ) +OUString BinaryInput::readString( void ) { - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Unicode c; do { @@ -1608,7 +1608,7 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) } while( c != 0 ); - ::rtl::OUString aRetStr = aBuf.makeStringAndClear(); + OUString aRetStr = aBuf.makeStringAndClear(); return aRetStr; } @@ -1678,7 +1678,7 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& // ============================================================================= // Private helper methods -bool checkNamingSceme( const ::rtl::OUString& aName, const ::rtl::OUString& aNameBase, +bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, Locale& aLocale ) { bool bSuccess = false; @@ -1726,18 +1726,18 @@ void StringResourcePersistenceImpl::implLoadAllLocales( void ) } // Scan locale properties files helper -void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl::OUString >& aContentSeq ) +void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< OUString >& aContentSeq ) { Locale aDefaultLocale; bool bDefaultFound = false; sal_Int32 nCount = aContentSeq.getLength(); - const ::rtl::OUString* pFiles = aContentSeq.getConstArray(); + const OUString* pFiles = aContentSeq.getConstArray(); for( int i = 0 ; i < nCount ; i++ ) { - ::rtl::OUString aCompleteName = pFiles[i]; - rtl::OUString aPureName; - rtl::OUString aExtension; + OUString aCompleteName = pFiles[i]; + OUString aPureName; + OUString aExtension; sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); if( iDot != -1 ) @@ -1749,7 +1749,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl:: if ( aExtension == "properties" ) { - //rtl::OUString aName = aInetObj.getBase(); + //OUString aName = aInetObj.getBase(); Locale aLocale; if( checkNamingSceme( aPureName, m_aNameBase, aLocale ) ) @@ -1769,7 +1769,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl:: } else if( !bDefaultFound && aExtension == "default" ) { - //rtl::OUString aName = aInetObj.getBase(); + //OUString aName = aInetObj.getBase(); Locale aLocale; if( checkNamingSceme( aPureName, m_aNameBase, aDefaultLocale ) ) @@ -1821,25 +1821,25 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return false; } -::rtl::OUString implGetNameScemeForLocaleItem( const LocaleItem* pLocaleItem ) +OUString implGetNameScemeForLocaleItem( const LocaleItem* pLocaleItem ) { - static ::rtl::OUString aUnder("_"); + static OUString aUnder("_"); OSL_ENSURE( pLocaleItem, "StringResourcePersistenceImpl::implGetNameScemeForLocaleItem(): pLocaleItem == NULL" ); Locale aLocale = pLocaleItem->m_locale; - ::rtl::OUString aRetStr = aUnder; + OUString aRetStr = aUnder; aRetStr += aLocale.Language; - ::rtl::OUString aCountry = aLocale.Country; + OUString aCountry = aLocale.Country; if( !aCountry.isEmpty() ) { aRetStr += aUnder; aRetStr += aCountry; } - ::rtl::OUString aVariant = aLocale.Variant; + OUString aVariant = aLocale.Variant; if( !aVariant.isEmpty() ) { aRetStr += aUnder; @@ -1848,10 +1848,10 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return aRetStr; } -::rtl::OUString StringResourcePersistenceImpl::implGetFileNameForLocaleItem - ( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase ) +OUString StringResourcePersistenceImpl::implGetFileNameForLocaleItem + ( LocaleItem* pLocaleItem, const OUString& aNameBase ) { - ::rtl::OUString aFileName = aNameBase; + OUString aFileName = aNameBase; if( aFileName.isEmpty() ) aFileName = aNameBaseDefaultStr; @@ -1859,18 +1859,18 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return aFileName; } -::rtl::OUString StringResourcePersistenceImpl::implGetPathForLocaleItem - ( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aLocation, bool bDefaultFile ) +OUString StringResourcePersistenceImpl::implGetPathForLocaleItem + ( LocaleItem* pLocaleItem, const OUString& aNameBase, + const OUString& aLocation, bool bDefaultFile ) { - ::rtl::OUString aFileName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); + OUString aFileName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); INetURLObject aInetObj( aLocation ); aInetObj.insertName( aFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL ); if( bDefaultFile ) - aInetObj.setExtension( ::rtl::OUString( "default" ) ); + aInetObj.setExtension( OUString( "default" ) ); else - aInetObj.setExtension( ::rtl::OUString( "properties" ) ); - ::rtl::OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + aInetObj.setExtension( OUString( "properties" ) ); + OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); return aCompleteFileName; } @@ -1966,7 +1966,7 @@ sal_Unicode getEscapeChar( const sal_Unicode* pBuf, sal_Int32 nLen, sal_Int32& r } void CheckContinueInNextLine( Reference< io::XTextInputStream2 > xTextInputStream, - ::rtl::OUString& aLine, bool& bEscapePending, const sal_Unicode*& pBuf, + OUString& aLine, bool& bEscapePending, const sal_Unicode*& pBuf, sal_Int32& nLen, sal_Int32& i ) { if( i == nLen && bEscapePending ) @@ -1998,11 +1998,11 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile xTextInputStream->setInputStream( xInputStream ); - ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii + OUString aEncodingStr = OUString::createFromAscii ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); xTextInputStream->setEncoding( aEncodingStr ); - ::rtl::OUString aLine; + OUString aLine; while( !xTextInputStream->isEOF() ) { aLine = xTextInputStream->readLine(); @@ -2011,7 +2011,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile if( 0 == nLen ) continue; const sal_Unicode* pBuf = aLine.getStr(); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Unicode c = 0; sal_Int32 i = 0; @@ -2025,7 +2025,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile continue; // Scan key - ::rtl::OUString aResourceID; + OUString aResourceID; bool bEscapePending = false; bool bStrComplete = false; while( i < nLen && !bStrComplete ) @@ -2067,7 +2067,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile // Scan value skipWhites( pBuf, nLen, i ); - ::rtl::OUString aValueStr; + OUString aValueStr; bEscapePending = false; bStrComplete = false; while( i < nLen && !bStrComplete ) @@ -2116,7 +2116,7 @@ inline sal_Unicode getHexCharForDigit( sal_uInt16 nDigitVal ) return cRet; } -void implWriteCharToBuffer( ::rtl::OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) +void implWriteCharToBuffer( OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) { if( cu == '\\' ) { @@ -2170,7 +2170,7 @@ void implWriteCharToBuffer( ::rtl::OUStringBuffer& aBuf, sal_Unicode cu, bool bK } } -void implWriteStringWithEncoding( const ::rtl::OUString& aStr, +void implWriteStringWithEncoding( const OUString& aStr, Reference< io::XTextOutputStream2 > xTextOutputStream, bool bKey ) { static sal_Unicode cLineFeed = 0xa; @@ -2178,7 +2178,7 @@ void implWriteStringWithEncoding( const ::rtl::OUString& aStr, (void)aStr; (void)xTextOutputStream; - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Int32 nLen = aStr.getLength(); const sal_Unicode* pSrc = aStr.getStr(); for( sal_Int32 i = 0 ; i < nLen ; i++ ) @@ -2190,15 +2190,15 @@ void implWriteStringWithEncoding( const ::rtl::OUString& aStr, if( !bKey ) aBuf.append( cLineFeed ); - ::rtl::OUString aWriteStr = aBuf.makeStringAndClear(); + OUString aWriteStr = aBuf.makeStringAndClear(); xTextOutputStream->writeString( aWriteStr ); } bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocaleItem, - const Reference< io::XOutputStream >& xOutputStream, const ::rtl::OUString& aComment ) + const Reference< io::XOutputStream >& xOutputStream, const OUString& aComment ) { - static ::rtl::OUString aAssignmentStr("="); - static ::rtl::OUString aLineFeedStr("\n"); + static OUString aAssignmentStr("="); + static OUString aLineFeedStr("\n"); if( !xOutputStream.is() || pLocaleItem == NULL ) return false; @@ -2208,7 +2208,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale xTextOutputStream->setOutputStream( xOutputStream ); - ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii + OUString aEncodingStr = OUString::createFromAscii ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); xTextOutputStream->setEncoding( aEncodingStr ); @@ -2236,7 +2236,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale sal_Int32 nTabSize = nMaxIndex - nMinIndex + 1; // Create sorted array of pointers to the id strings - const ::rtl::OUString** pIdPtrs = new const ::rtl::OUString*[nTabSize]; + const OUString** pIdPtrs = new const OUString*[nTabSize]; for(sal_Int32 i = 0 ; i < nTabSize ; i++ ) pIdPtrs[i] = NULL; for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index ) @@ -2248,16 +2248,16 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale // Write lines in correct order for(sal_Int32 i = 0 ; i < nTabSize ; i++ ) { - const ::rtl::OUString* pStr = pIdPtrs[i]; + const OUString* pStr = pIdPtrs[i]; if( pStr != NULL ) { - ::rtl::OUString aResourceID = *pStr; + OUString aResourceID = *pStr; IdToStringMap::const_iterator it = rHashMap.find( aResourceID ); if( !( it == rHashMap.end() ) ) { implWriteStringWithEncoding( aResourceID, xTextOutputStream, true ); xTextOutputStream->writeString( aAssignmentStr ); - ::rtl::OUString aValStr = (*it).second; + OUString aValStr = (*it).second; implWriteStringWithEncoding( aValStr, xTextOutputStream, false ); } } @@ -2277,16 +2277,16 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceWithStorageImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceWithStorageImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResourceWithStorage" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResourceWithStorage" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceWithStorageImpl() +static OUString getImplementationName_StringResourceWithStorageImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" ); + return OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" ); } static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( @@ -2314,18 +2314,18 @@ StringResourceWithStorageImpl::~StringResourceWithStorageImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceWithStorageImpl(); } // ----------------------------------------------------------------------------- -sal_Bool StringResourceWithStorageImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -2334,7 +2334,7 @@ sal_Bool StringResourceWithStorageImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceWithStorageImpl(); } @@ -2351,7 +2351,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument if ( aArguments.getLength() != 5 ) { throw RuntimeException( - ::rtl::OUString( "StringResourceWithStorageImpl::initialize: invalid number of arguments!" ), + OUString( "StringResourceWithStorageImpl::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } @@ -2361,7 +2361,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument if( !bOk ) { - ::rtl::OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid storage"); + OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid storage"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2384,33 +2384,33 @@ void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModi } // XStringResourceResolver -::rtl::OUString StringResourceWithStorageImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourceWithStorageImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourceWithStorageImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceWithStorageImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getResourceIDs( ) +Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); @@ -2447,23 +2447,23 @@ void StringResourceWithStorageImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -void StringResourceWithStorageImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceWithStorageImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithStorageImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -void StringResourceWithStorageImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceWithStorageImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourceWithStorageImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -2506,19 +2506,19 @@ sal_Bool StringResourceWithStorageImpl::isModified( ) { return StringResourcePersistenceImpl::isModified(); } -void StringResourceWithStorageImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourceWithStorageImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } -void StringResourceWithStorageImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourceWithStorageImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -2552,7 +2552,7 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto if( !Storage.is() ) { - ::rtl::OUString errorMsg( "StringResourceWithStorageImpl::setStorage: invalid storage" ); + OUString errorMsg( "StringResourceWithStorageImpl::setStorage: invalid storage" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2573,7 +2573,7 @@ void StringResourceWithStorageImpl::implScanLocales( void ) Reference< container::XNameAccess > xNameAccess( m_xStorage, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aContentSeq = xNameAccess->getElementNames(); + Sequence< OUString > aContentSeq = xNameAccess->getElementNames(); implScanLocaleNames( aContentSeq ); } @@ -2586,8 +2586,8 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) bool bSuccess = false; try { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString( ".properties" ); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString( ".properties" ); Reference< io::XStream > xElementStream = m_xStorage->openStreamElement( aStreamName, ElementModes::READ ); @@ -2614,16 +2614,16 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceWithLocationImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceWithLocationImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResourceWithLocation" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResourceWithLocation" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceWithLocationImpl() +static OUString getImplementationName_StringResourceWithLocationImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" ); + return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" ); } static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( @@ -2651,18 +2651,18 @@ StringResourceWithLocationImpl::~StringResourceWithLocationImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceWithLocationImpl(); } // ----------------------------------------------------------------------------- -sal_Bool StringResourceWithLocationImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -2671,7 +2671,7 @@ sal_Bool StringResourceWithLocationImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceWithLocationImpl(); } @@ -2688,7 +2688,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen if ( aArguments.getLength() != 6 ) { throw RuntimeException( - ::rtl::OUString( "XInitialization::initialize: invalid number of arguments!" ), + OUString( "XInitialization::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } @@ -2701,12 +2701,12 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen else { if( m_aLocation.getStr()[nLen - 1] != '/' ) - m_aLocation += ::rtl::OUString("/"); + m_aLocation += OUString("/"); } if( !bOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: invalid URL"); + OUString errorMsg("XInitialization::initialize: invalid URL"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2714,7 +2714,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen bOk = (aArguments[5] >>= m_xInteractionHandler); if( !bOk ) { - ::rtl::OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid type"); + OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid type"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 5 ); } @@ -2737,33 +2737,33 @@ void StringResourceWithLocationImpl::removeModifyListener( const Reference< XMod } // XStringResourceResolver -::rtl::OUString StringResourceWithLocationImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourceWithLocationImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourceWithLocationImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceWithLocationImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getResourceIDs( ) +Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); @@ -2800,23 +2800,23 @@ void StringResourceWithLocationImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -void StringResourceWithLocationImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceWithLocationImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithLocationImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -void StringResourceWithLocationImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceWithLocationImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourceWithLocationImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -2861,19 +2861,19 @@ sal_Bool StringResourceWithLocationImpl::isModified( ) { return StringResourcePersistenceImpl::isModified(); } -void StringResourceWithLocationImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourceWithLocationImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } -void StringResourceWithLocationImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourceWithLocationImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -2894,14 +2894,14 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithLocation // XStringResourceWithLocation -void StringResourceWithLocationImpl::storeAsURL( const ::rtl::OUString& URL ) +void StringResourceWithLocationImpl::storeAsURL( const OUString& URL ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { setURL( URL ); store(); } -void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL ) +void StringResourceWithLocationImpl::setURL( const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2910,7 +2910,7 @@ void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL ) sal_Int32 nLen = URL.getLength(); if( nLen == 0 ) { - ::rtl::OUString errorMsg( "StringResourceWithLocationImpl::setURL: invalid URL" ); + OUString errorMsg( "StringResourceWithLocationImpl::setURL: invalid URL" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2938,7 +2938,7 @@ void StringResourceWithLocationImpl::implScanLocales( void ) const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() && xFileAccess->isFolder( m_aLocation ) ) { - Sequence< ::rtl::OUString > aContentSeq = xFileAccess->getFolderContents( m_aLocation, false ); + Sequence< OUString > aContentSeq = xFileAccess->getFolderContents( m_aLocation, false ); implScanLocaleNames( aContentSeq ); } } @@ -2951,7 +2951,7 @@ bool StringResourceWithLocationImpl::implLoadLocale( LocaleItem* pLocaleItem ) const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, m_aNameBase, m_aLocation ); Reference< io::XInputStream > xInputStream; diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 90f9a8dc8a9b..d8e2968f44d2 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -55,7 +55,7 @@ namespace stringresource // Hashtable to map string ids to string struct hashName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -63,7 +63,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -71,8 +71,8 @@ struct eqName_Impl typedef boost::unordered_map < - ::rtl::OUString, - ::rtl::OUString, + OUString, + OUString, hashName_Impl, eqName_Impl > @@ -80,7 +80,7 @@ IdToStringMap; typedef boost::unordered_map < - ::rtl::OUString, + OUString, sal_Int32, hashName_Impl, eqName_Impl @@ -135,7 +135,7 @@ protected: sal_Int32 m_nNextUniqueNumericId; // Scans ResourceID to start with number and adapt m_nNextUniqueNumericId - void implScanIdForNumber( const ::rtl::OUString& ResourceID ); + void implScanIdForNumber( const OUString& ResourceID ); const static sal_Int32 UNIQUE_NUMBER_NEEDS_INITIALISATION = -1; // Checks read only status and throws exception if it's true @@ -162,13 +162,13 @@ protected: void implNotifyListeners( void ); //=== Impl methods for ...ForLocale methods === - ::rtl::OUString SAL_CALL implResolveString( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) + OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); - ::sal_Bool implHasEntryForId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); - void implSetString( const ::rtl::OUString& ResourceID, - const ::rtl::OUString& Str, LocaleItem* pLocaleItem ); - void implRemoveId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) + ::sal_Bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); + ::com::sun::star::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); + void implSetString( const OUString& ResourceID, + const OUString& Str, LocaleItem* pLocaleItem ); + void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); // Method to load a locale if necessary, returns true if loading was @@ -183,11 +183,11 @@ public: virtual ~StringResourceImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifyBroadcaster @@ -197,20 +197,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -228,15 +228,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -260,8 +260,8 @@ class BinaryOutput; class StringResourcePersistenceImpl : public StringResourcePersistenceImpl_BASE { protected: - ::rtl::OUString m_aNameBase; - ::rtl::OUString m_aComment; + OUString m_aNameBase; + OUString m_aComment; void SAL_CALL implInitializeCommonParameters ( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) @@ -278,23 +278,23 @@ protected: virtual void implLoadAllLocales( void ); - void implScanLocaleNames( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContentSeq ); - ::rtl::OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase ); - ::rtl::OUString implGetPathForLocaleItem( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aLocation, bool bDefaultFile=false ); + void implScanLocaleNames( const ::com::sun::star::uno::Sequence< OUString >& aContentSeq ); + OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase ); + OUString implGetPathForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase, + const OUString& aLocation, bool bDefaultFile=false ); bool implReadPropertiesFile( LocaleItem* pLocaleItem, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput ); bool implWritePropertiesFile( LocaleItem* pLocaleItem, const ::com::sun::star::uno::Reference - < ::com::sun::star::io::XOutputStream >& xOutputStream, const ::rtl::OUString& aComment ); + < ::com::sun::star::io::XOutputStream >& xOutputStream, const OUString& aComment ); void implWriteLocaleBinary( LocaleItem* pLocaleItem, BinaryOutput& rOut ); void implStoreAtStorage ( - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& aNameBase, + const OUString& aComment, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll @@ -303,25 +303,25 @@ protected: void implKillRemovedLocaleFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); void implKillChangedDefaultFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); void implStoreAtLocation ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& Location, + const OUString& aNameBase, + const OUString& aComment, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess, bool bUsedForStore, bool bStoreAll, @@ -335,11 +335,11 @@ public: virtual ~StringResourcePersistenceImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifyBroadcaster @@ -349,20 +349,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -380,15 +380,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -409,14 +409,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -445,11 +445,11 @@ public: virtual ~StringResourceWithStorageImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -463,20 +463,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -494,15 +494,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -523,14 +523,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -555,7 +555,7 @@ typedef ::cppu::ImplInheritanceHelper2< class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BASE { - ::rtl::OUString m_aLocation; + OUString m_aLocation; bool m_bLocationChanged; com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFI; com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; @@ -571,11 +571,11 @@ public: virtual ~StringResourceWithLocationImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -589,20 +589,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -620,15 +620,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -649,14 +649,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -665,9 +665,9 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XStringResourceWithLocation - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& URL ) + virtual void SAL_CALL storeAsURL( const OUString& URL ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setURL( const ::rtl::OUString& URL ) + virtual void SAL_CALL setURL( const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index a7b3e7584c1d..97fc38d6cb52 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -94,11 +94,11 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -#define MAP_CHAR_LEN(x) ::rtl::OUString(x) +#define MAP_CHAR_LEN(x) OUString(x) #define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0); // Some constants -const static rtl::OUString DELIM("::"); +const static OUString DELIM("::"); const static sal_Int32 DELIMLEN = DELIM.getLength(); bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params ) @@ -191,22 +191,22 @@ typedef Sequence< Any > (*Translator)(const Sequence< Any >&); //expand the "TranslateInfo" struct to support more kinds of events struct TranslateInfo { - rtl::OUString sVBAName; //vba event name + OUString sVBAName; //vba event name Translator toVBA; //the method to convert OO event parameters to VBA event parameters bool (*ApproveRule)(const ScriptEvent& evt, void* pPara); //this method is used to determine which types of controls should execute the event void *pPara; //Parameters for the above approve method }; -typedef boost::unordered_map< rtl::OUString, +typedef boost::unordered_map< OUString, std::list< TranslateInfo >, -::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > EventInfoHash; +OUStringHash, +::std::equal_to< OUString > > EventInfoHash; struct TranslatePropMap { - rtl::OUString sEventInfo; //OO event name + OUString sEventInfo; //OO event name TranslateInfo aTransInfo; }; @@ -288,7 +288,7 @@ EventInfoHash& getEventTransInfo() static EventInfoHash eventTransInfo; if ( !initialised ) { - rtl::OUString sEventInfo = MAP_CHAR_LEN(""); + OUString sEventInfo = MAP_CHAR_LEN(""); TranslatePropMap* pTransProp = aTranslatePropMap_Impl; int nCount = sizeof(aTranslatePropMap_Impl) / sizeof(aTranslatePropMap_Impl[0]); @@ -317,22 +317,22 @@ class ScriptEventHelper { public: ScriptEventHelper( const Reference< XInterface >& xControl ); - Sequence< ScriptEventDescriptor > createEvents( const rtl::OUString& sCodeName ); - Sequence< rtl::OUString > getEventListeners(); + Sequence< ScriptEventDescriptor > createEvents( const OUString& sCodeName ); + Sequence< OUString > getEventListeners(); private: Reference< XComponentContext > m_xCtx; Reference< XInterface > m_xControl; }; bool -eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const ::rtl::OUString& sCodeName ) +eventMethodToDescriptor( const OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const OUString& sCodeName ) { // format of ControlListener is TypeName::methodname e.g. // "com.sun.star.awt.XActionListener::actionPerformed" or // "XActionListener::actionPerformed - ::rtl::OUString sMethodName; - ::rtl::OUString sTypeName; + OUString sMethodName; + OUString sTypeName; sal_Int32 nDelimPos = rEventMethod.indexOf( DELIM ); if ( nDelimPos == -1 ) { @@ -358,7 +358,7 @@ eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescrip // set this it VBAInterop, ensures that it doesn't // get persisted or shown in property editors - evtDesc.ScriptType = rtl::OUString( + evtDesc.ScriptType = OUString( "VBAInterop" ); return true; } @@ -371,10 +371,10 @@ ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ): m_xControl( xControl ) {} -Sequence< rtl::OUString > +Sequence< OUString > ScriptEventHelper::getEventListeners() { - std::list< rtl::OUString > eventMethods; + std::list< OUString > eventMethods; Reference< beans::XIntrospection > xIntrospection = beans::Introspection::create( m_xCtx ); @@ -386,22 +386,22 @@ ScriptEventHelper::getEventListeners() for ( sal_Int32 i = 0; i< nLength; ++i ) { Type& listType = aControlListeners[ i ]; - rtl::OUString sFullTypeName = listType.getTypeName(); - Sequence< ::rtl::OUString > sMeths = + OUString sFullTypeName = listType.getTypeName(); + Sequence< OUString > sMeths = comphelper::getEventMethodsForType( listType ); sal_Int32 sMethLen = sMeths.getLength(); for ( sal_Int32 j=0 ; j < sMethLen; ++j ) { - rtl::OUString sEventMethod = sFullTypeName; + OUString sEventMethod = sFullTypeName; sEventMethod += DELIM; sEventMethod += sMeths[ j ]; eventMethods.push_back( sEventMethod ); } } - Sequence< rtl::OUString > sEventMethodNames( eventMethods.size() ); - std::list< rtl::OUString >::const_iterator it = eventMethods.begin(); - rtl::OUString* pDest = sEventMethodNames.getArray(); + Sequence< OUString > sEventMethodNames( eventMethods.size() ); + std::list< OUString >::const_iterator it = eventMethods.begin(); + OUString* pDest = sEventMethodNames.getArray(); for ( ; it != eventMethods.end(); ++it, ++pDest ) *pDest = *it; @@ -410,10 +410,10 @@ ScriptEventHelper::getEventListeners() } Sequence< ScriptEventDescriptor > -ScriptEventHelper::createEvents( const rtl::OUString& sCodeName ) +ScriptEventHelper::createEvents( const OUString& sCodeName ) { - Sequence< rtl::OUString > aControlListeners = getEventListeners(); - rtl::OUString* pSrc = aControlListeners.getArray(); + Sequence< OUString > aControlListeners = getEventListeners(); + OUString* pSrc = aControlListeners.getArray(); sal_Int32 nLength = aControlListeners.getLength(); Sequence< ScriptEventDescriptor > aDest( nLength ); @@ -445,47 +445,47 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > NameContainer_BASE; class ReadOnlyEventsNameContainer : public NameContainer_BASE { public: - ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ); + ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL insertByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } - virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByName( const OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } // XNameAccess - virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException); + virtual Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException); // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException) - { return getCppuType(static_cast< const rtl::OUString * >(0) ); } + { return getCppuType(static_cast< const OUString * >(0) ); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: -typedef boost::unordered_map< rtl::OUString, Any, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > EventSupplierHash; +typedef boost::unordered_map< OUString, Any, OUStringHash, +::std::equal_to< OUString > > EventSupplierHash; EventSupplierHash m_hEvents; }; -ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ) +ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ) { - const rtl::OUString* pSrc = eventMethods.getConstArray(); + const OUString* pSrc = eventMethods.getConstArray(); sal_Int32 nLen = eventMethods.getLength(); for ( sal_Int32 index = 0; index < nLen; ++index, ++pSrc ) { @@ -500,18 +500,18 @@ ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::O } Any SAL_CALL -ReadOnlyEventsNameContainer::getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){ +ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){ EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) throw container::NoSuchElementException(); return it->second; } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > names(m_hEvents.size()); - rtl::OUString* pDest = names.getArray(); + Sequence< OUString > names(m_hEvents.size()); + OUString* pDest = names.getArray(); EventSupplierHash::const_iterator it = m_hEvents.begin(); EventSupplierHash::const_iterator it_end = m_hEvents.end(); for ( sal_Int32 index = 0; it != it_end; ++index, ++pDest, ++it ) @@ -520,7 +520,7 @@ ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException) } sal_Bool SAL_CALL -ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) throw (RuntimeException) { EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) @@ -533,7 +533,7 @@ typedef ::cppu::WeakImplHelper1< XScriptEventsSupplier > EventsSupplier_BASE; class ReadOnlyEventsSupplier : public EventsSupplier_BASE { public: - ReadOnlyEventsSupplier( const Sequence< ::rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ) + ReadOnlyEventsSupplier( const Sequence< OUString >& eventMethods, const OUString& sCodeName ) { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); } // XScriptEventSupplier @@ -545,7 +545,7 @@ private: typedef ::cppu::WeakImplHelper3< XScriptListener, util::XCloseListener, lang::XInitialization > EventListener_BASE; #define EVENTLSTNR_PROPERTY_ID_MODEL 1 -#define EVENTLSTNR_PROPERTY_MODEL ::rtl::OUString( "Model" ) +#define EVENTLSTNR_PROPERTY_MODEL OUString( "Model" ) class EventListener : public EventListener_BASE ,public ::comphelper::OMutexAndBroadcastHelper @@ -619,7 +619,7 @@ private: Reference< frame::XModel > m_xModel; bool m_bDocClosed; SfxObjectShell* mpShell; - rtl::OUString msProject; + OUString msProject; }; EventListener::EventListener( const Reference< XComponentContext >& rxContext ) : @@ -627,7 +627,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed( { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); - msProject = rtl::OUString("Standard"); + msProject = OUString("Standard"); } void @@ -649,7 +649,7 @@ EventListener::setShellFromModel() try { uno::Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW ); - uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); msProject = xVBAMode->getProjectName(); } catch ( uno::Exception& ) {} @@ -834,18 +834,18 @@ void EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException) { OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )"); - static const ::rtl::OUString vbaInterOp = - ::rtl::OUString("VBAInterop"); + static const OUString vbaInterOp = + OUString("VBAInterop"); // let default handlers deal with non vba stuff if ( !evt.ScriptType.equals( vbaInterOp ) ) return; lang::EventObject aEvent; evt.Arguments[ 0 ] >>= aEvent; - OSL_TRACE("evt.MethodName is %s", rtl::OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() ); - OSL_TRACE("Argument[0] is %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("evt.MethodName is %s", OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Argument[0] is %s", OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() ); OSL_TRACE("Getting Control"); - rtl::OUString sName = rtl::OUString( "UserForm" ); + OUString sName = OUString( "UserForm" ); OSL_TRACE("Getting Name"); uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY ); @@ -877,7 +877,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce uno::Reference< beans::XPropertySet > xProps; OSL_TRACE("Getting properties"); xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString( "Name" ) ) >>= sName; + xProps->getPropertyValue( OUString( "Name" ) ) >>= sName; } } //dumpEvent( evt ); @@ -887,7 +887,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce if ( eventInfo_it == it_end ) { OSL_TRACE("Bogus event for %s", - rtl::OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() ); return; } @@ -904,13 +904,13 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end(); BasicManager* pBasicManager = mpShell->GetBasicManager(); - rtl::OUString sProject; - rtl::OUString sScriptCode( evt.ScriptCode ); + OUString sProject; + OUString sScriptCode( evt.ScriptCode ); // dialogs pass their own library, presence of Dot determines that if ( sScriptCode.indexOf( '.' ) == -1 ) { //'Project' is a better default but I want to force failures - //rtl::OUString sMacroLoc("Project"); + //OUString sMacroLoc("Project"); sProject = "Standard"; if (!pBasicManager->GetName().isEmpty()) @@ -924,11 +924,11 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce sProject = sScriptCode.copy( 0, nIndex ); sScriptCode = sScriptCode.copy( nIndex + 1 ); } - rtl::OUString sMacroLoc = sProject; - sMacroLoc = sMacroLoc.concat( rtl::OUString(".") ); - sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString(".") ); + OUString sMacroLoc = sProject; + sMacroLoc = sMacroLoc.concat( OUString(".") ); + sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( OUString(".") ); - OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("sMacroLoc is %s", OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() ); for ( ; txInfo != txInfo_end; ++txInfo ) { // If the document is closed, we should not execute macro. @@ -937,13 +937,13 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce break; } - rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); + OUString sTemp = sName.concat( (*txInfo).sVBAName ); // see if we have a match for the handlerextension // where ScriptCode is methodname_handlerextension - rtl::OUString sToResolve = sMacroLoc.concat( sTemp ); + OUString sToResolve = sMacroLoc.concat( sTemp ); OSL_TRACE("*** trying to invoke %s ", - rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() ); ooo::vba::MacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); if ( aMacroResolvedInfo.mbFound ) { @@ -968,14 +968,14 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce // call basic event handlers for event // create script url - rtl::OUString url = aMacroResolvedInfo.msResolvedMacro; + OUString url = aMacroResolvedInfo.msResolvedMacro; OSL_TRACE("resolved script = %s", - rtl::OUStringToOString( url, + OUStringToOString( url, RTL_TEXTENCODING_UTF8 ).getStr() ); try { - uno::Any aDummyCaller = uno::makeAny( rtl::OUString("Error") ); + uno::Any aDummyCaller = uno::makeAny( OUString("Error") ); if ( pRet ) { ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller ); @@ -988,7 +988,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce } catch ( uno::Exception& e ) { - OSL_TRACE("event script raised %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("event script raised %s", OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } } @@ -1005,8 +1005,8 @@ public: VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ); // XVBAToOOEventDescGen - virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const rtl::OUString& sCodeName ) throw (RuntimeException); - virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException); + virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const OUString& sCodeName ) throw (RuntimeException); + virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException); private: Reference< XComponentContext > m_xContext; @@ -1015,14 +1015,14 @@ private: VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {} Sequence< ScriptEventDescriptor > SAL_CALL -VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (RuntimeException) +VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (RuntimeException) { ScriptEventHelper evntHelper( xControl ); return evntHelper.createEvents( sCodeName ); } Reference< XScriptEventsSupplier > SAL_CALL -VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) +VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) { ScriptEventHelper evntHelper( xControl ); Reference< XScriptEventsSupplier > xSupplier = @@ -1035,15 +1035,15 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, namespace evtlstner { - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "ooo.vba.EventListener" ); + static OUString aImplName( "ooo.vba.EventListener" ); pImplName = &aImplName; } } @@ -1057,23 +1057,23 @@ namespace evtlstner return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) ); } - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + Sequence< OUString > SAL_CALL getSupportedServiceNames() { - const ::rtl::OUString strName( ::evtlstner::getImplementationName() ); - return Sequence< ::rtl::OUString >( &strName, 1 ); + const OUString strName( ::evtlstner::getImplementationName() ); + return Sequence< OUString >( &strName, 1 ); } } namespace ooevtdescgen { - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "ooo.vba.VBAToOOEventDesc" ); + static OUString aImplName( "ooo.vba.VBAToOOEventDesc" ); pImplName = &aImplName; } } @@ -1087,10 +1087,10 @@ namespace ooevtdescgen return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) ); } - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + Sequence< OUString > SAL_CALL getSupportedServiceNames() { - const ::rtl::OUString strName( ::ooevtdescgen::getImplementationName() ); - return Sequence< ::rtl::OUString >( &strName, 1 ); + const OUString strName( ::ooevtdescgen::getImplementationName() ); + return Sequence< OUString >( &strName, 1 ); } } diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 11b51d0189dd..07a7f19277fd 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -39,9 +39,9 @@ namespace evtlstner // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); + Sequence< OUString > SAL_CALL getSupportedServiceNames(); Reference<XInterface> SAL_CALL create( Sequence<Any> const &, Reference<XComponentContext> const & ); @@ -59,9 +59,9 @@ namespace ooevtdescgen // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); + Sequence< OUString > SAL_CALL getSupportedServiceNames(); Reference<XInterface> SAL_CALL create( Sequence<Any> const &, Reference<XComponentContext> const & ); |