diff options
Diffstat (limited to 'scripting/source/dlgprov')
| -rw-r--r-- | scripting/source/dlgprov/DialogModelProvider.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgevtatt.cxx | 28 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 42 |
3 files changed, 37 insertions, 37 deletions
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index ceb46f53c103..7bd62f614fef 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -139,7 +139,7 @@ void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& // com.sun.star.uno.XServiceInfo: OUString SAL_CALL DialogModelProvider::getImplementationName() { - return "com.sun.star.comp.scripting.DialogModelProvider"; + return u"com.sun.star.comp.scripting.DialogModelProvider"_ustr; } sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) @@ -149,7 +149,7 @@ sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceN css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() { - return { "com.sun.star.awt.UnoControlDialogModelProvider" }; + return { u"com.sun.star.awt.UnoControlDialogModelProvider"_ustr }; } } // closing anonymous implementation namespace diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 53c2e5b67406..30cade77c880 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -115,7 +115,7 @@ namespace dlgprov if ( xSMgr.is() ) { args.getArray()[0] <<= xModel; - mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY ); + mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( u"ooo.vba.EventListener"_ustr, args, m_xContext ), UNO_QUERY ); } if ( !rxControl.is() ) return; @@ -123,9 +123,9 @@ namespace dlgprov try { Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW ); - xProps->getPropertyValue("Name") >>= msDialogCodeName; + xProps->getPropertyValue(u"Name"_ustr) >>= msDialogCodeName; xProps.set( mxListener, UNO_QUERY_THROW ); - xProps->setPropertyValue("Model", args[ 0 ] ); + xProps->setPropertyValue(u"Model"_ustr, args[ 0 ] ); } catch( const Exception& ) { @@ -161,26 +161,26 @@ namespace dlgprov // key listeners by protocol when ScriptType = 'Script' // otherwise key is the ScriptType e.g. StarBasic if ( rxRTLListener.is() ) // set up handler for RTL_BASIC - listenersForTypes[ OUString("StarBasic") ] = rxRTLListener; + listenersForTypes[ u"StarBasic"_ustr ] = rxRTLListener; else - listenersForTypes[ OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); + listenersForTypes[ u"StarBasic"_ustr ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); // handler for Script & OUString("vnd.sun.star.UNO:") - listenersForTypes[ OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); - listenersForTypes[ OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); + listenersForTypes[ u"vnd.sun.star.UNO"_ustr ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); + listenersForTypes[ u"vnd.sun.star.script"_ustr ] = 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("BasicLibraries"), uno::UNO_QUERY_THROW ); + xModelProps->getPropertyValue(u"BasicLibraries"_ustr), uno::UNO_QUERY_THROW ); mbUseFakeVBAEvents = xVBACompat->getVBACompatibilityMode(); } catch( uno::Exception& ) { } if ( mbUseFakeVBAEvents ) - listenersForTypes[ OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); + listenersForTypes[ u"VBAInterop"_ustr ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); } @@ -203,7 +203,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext("ooo.vba.VBAToOOEventDesc", m_xContext ), UNO_QUERY ); + Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext(u"ooo.vba.VBAToOOEventDesc"_ustr, m_xContext ), UNO_QUERY ); if ( xVBAToOOEvtDesc.is() ) xEventsSupplier = xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ); @@ -330,7 +330,7 @@ namespace dlgprov throw RuntimeException(); m_xEventAttacher.set( xSMgr->createInstanceWithContext( - "com.sun.star.script.EventAttacher", m_xContext ), UNO_QUERY ); + u"com.sun.star.script.EventAttacher"_ustr, m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) throw ServiceNotRegisteredException(); @@ -344,7 +344,7 @@ namespace dlgprov Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); try { - xProps->getPropertyValue("Name") >>= sDialogCodeName; + xProps->getPropertyValue(u"Name"_ustr) >>= sDialogCodeName; } catch( Exception& ){} } @@ -464,7 +464,7 @@ namespace dlgprov provider::theMasterScriptProviderFactory::get( m_xContext ); Any aCtx; - aCtx <<= OUString("user"); + aCtx <<= u"user"_ustr; xScriptProvider = xFactory->createScriptProvider( aCtx ); } } @@ -603,7 +603,7 @@ namespace dlgprov else { OUString aRes(SfxResId(STR_ERRUNOEVENTBINDUNG)); - OUString aQuoteChar( "\"" ); + OUString aQuoteChar( u"\""_ustr ); sal_Int32 nIndex = aRes.indexOf( '%' ); diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index bf499982ac7a..eb229770f6a5 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -83,7 +83,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_SET_THROW ); // TODO: Ctor Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext - ( "com.sun.star.resource.StringResourceWithLocation", + ( u"com.sun.star.resource.StringResourceWithLocation"_ustr, i_xContext ), UNO_QUERY ); if( xStringResourceManager.is() ) { @@ -96,7 +96,7 @@ namespace dlgprov Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext) { Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_SET_THROW ); - Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", i_xContext ), UNO_QUERY_THROW ); + Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr, i_xContext ), UNO_QUERY_THROW ); return xControlModel; } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, @@ -108,7 +108,7 @@ namespace dlgprov Reference< container::XNameContainer > xDialogModel( lcl_createControlModel(i_xContext) ); Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); - xDlgPropSet->setPropertyValue( "DialogSourceURL", aDialogSourceURL ); + xDlgPropSet->setPropertyValue( u"DialogSourceURL"_ustr, aDialogSourceURL ); // #TODO we really need to detect the source of the Dialog, is it // the dialog. E.g. if the dialog was created from basic ( then we just @@ -125,7 +125,7 @@ namespace dlgprov Reference< beans::XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY ); Any aStringResourceManagerAny; aStringResourceManagerAny <<= xStringResourceManager; - xDlgPSet->setPropertyValue( "ResourceResolver", aStringResourceManagerAny ); + xDlgPSet->setPropertyValue( u"ResourceResolver"_ustr, aStringResourceManagerAny ); } return xDialogModel; @@ -187,7 +187,7 @@ namespace dlgprov { if (!m_BasicInfo) // shouldn't get here - throw RuntimeException("No information to create dialog" ); + throw RuntimeException(u"No information to create dialog"_ustr ); Reference< resource::XStringResourceManager > xStringResourceManager = getStringResourceFromDialogLibrary( m_BasicInfo->mxDlgLib ); Any aDialogSourceURL((OUString())); @@ -258,7 +258,7 @@ namespace dlgprov if ( nIndex != -1 ) sDlgName = sDescription.getToken( 0, '.', nIndex ); - OUString sLocation = sfUri->getParameter( "location" ); + OUString sLocation = sfUri->getParameter( u"location"_ustr ); // get dialog library container @@ -313,7 +313,7 @@ namespace dlgprov if ( !xLibContainer.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialog: library container not found!", + u"DialogProviderImpl::getDialog: library container not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -331,7 +331,7 @@ namespace dlgprov if ( !xDialogLib.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialogModel: library not found!", + u"DialogProviderImpl::getDialogModel: library not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -345,7 +345,7 @@ namespace dlgprov if ( !xISP.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::getDialogModel: dialog not found!", + u"DialogProviderImpl::getDialogModel: dialog not found!"_ustr, Reference< XInterface >(), 1 ); } @@ -494,7 +494,7 @@ namespace dlgprov OUString DialogProviderImpl::getImplementationName( ) { - return "com.sun.star.comp.scripting.DialogProvider"; + return u"com.sun.star.comp.scripting.DialogProvider"_ustr; } sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) @@ -504,9 +504,9 @@ namespace dlgprov Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) { - return { "com.sun.star.awt.DialogProvider", - "com.sun.star.awt.DialogProvider2", - "com.sun.star.awt.ContainerWindowProvider" }; + return { u"com.sun.star.awt.DialogProvider"_ustr, + u"com.sun.star.awt.DialogProvider2"_ustr, + u"com.sun.star.awt.ContainerWindowProvider"_ustr }; } @@ -523,7 +523,7 @@ namespace dlgprov if ( !m_xModel.is() ) { - throw RuntimeException( "DialogProviderImpl::initialize: invalid argument format!" ); + throw RuntimeException( u"DialogProviderImpl::initialize: invalid argument format!"_ustr ); } } else if ( aArguments.getLength() == 4 ) @@ -543,7 +543,7 @@ namespace dlgprov } else if ( aArguments.getLength() > 4 ) { - throw RuntimeException( "DialogProviderImpl::initialize: invalid number of arguments!" ); + throw RuntimeException( u"DialogProviderImpl::initialize: invalid number of arguments!"_ustr ); } } @@ -600,7 +600,7 @@ namespace dlgprov if( !bDecoration ) { xDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) ); - xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) ); + xDlgModPropSet->setPropertyValue( u"Title"_ustr, Any( OUString() ) ); } } catch( UnknownPropertyException& ) @@ -634,7 +634,7 @@ namespace dlgprov if( !xHandler.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!", + u"DialogProviderImpl::createDialogWithHandler: Invalid xHandler!"_ustr, Reference< XInterface >(), 1 ); } Reference< XWindowPeer > xDummyPeer; @@ -649,9 +649,9 @@ namespace dlgprov ::comphelper::NamedValueCollection aArguments( Arguments ); Reference< XWindowPeer > xParentPeer; - if ( aArguments.has( "ParentWindow" ) ) + if ( aArguments.has( u"ParentWindow"_ustr ) ) { - const Any& aParentWindow( aArguments.get( "ParentWindow" ) ); + const Any& aParentWindow( aArguments.get( u"ParentWindow"_ustr ) ); if ( !( aParentWindow >>= xParentPeer ) ) { const Reference< XControl > xParentControl( aParentWindow, UNO_QUERY ); @@ -660,7 +660,7 @@ namespace dlgprov } } - const Reference< XInterface > xHandler( aArguments.get( "EventHandler" ), UNO_QUERY ); + const Reference< XInterface > xHandler( aArguments.get( u"EventHandler"_ustr ), UNO_QUERY ); Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParentPeer, true ); Reference< XDialog > xDialog( xControl, UNO_QUERY ); @@ -674,7 +674,7 @@ namespace dlgprov if( !xParent.is() ) { throw IllegalArgumentException( - "DialogProviderImpl::createContainerWindow: Invalid xParent!", + u"DialogProviderImpl::createContainerWindow: Invalid xParent!"_ustr, Reference< XInterface >(), 1 ); } Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParent, false ); |