diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-04 11:55:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-11 11:21:23 +0200 |
commit | 22435a0777d6048757855f7f30b04fb8e5523fb2 (patch) | |
tree | 2a8e66dbfca50cfee05739cf799f94b00774340d | |
parent | 957f8e02c29bc4df2f37f2a933957490cdf831f6 (diff) |
remove unnecessary use of OUString constructor in EXTENSIONS module
Change-Id: Idf73eb831f52d4d74e6fbb6ea27f59ebbfd13a8c
23 files changed, 55 insertions, 55 deletions
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index db24269e2cf5..66ec18151dcf 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -67,8 +67,8 @@ namespace abp try { // the service name of the administration dialog - const static OUString s_sAdministrationServiceName = OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); - const static OUString s_sDataSourceTypeChangeDialog = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); + const static OUString s_sAdministrationServiceName = "com.sun.star.sdb.DatasourceAdministrationDialog"; + const static OUString s_sDataSourceTypeChangeDialog = "com.sun.star.sdb.DataSourceTypeChangeDialog"; // the parameters for the call Sequence< Any > aArguments(3); diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index faa79d095305..1acd41f16bf4 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -124,7 +124,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + aSupported[0] = "com.sun.star.ui.dialogs.AddressBookSourcePilot"; return aSupported; } @@ -180,7 +180,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = OUString("Deactivate"); + lProtocol[0].Name = "Deactivate"; lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 2e516e176565..768ac8285e70 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -216,7 +216,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sSer // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< OUString > lNames(1); - lNames[0] = OUString("com.sun.star.frame.Bibliography"); + lNames[0] = "com.sun.star.frame.Bibliography"; return lNames; } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index fd595f347b70..e6d4eb8616a7 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -227,7 +227,7 @@ OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) { uno::Sequence<OUString> aServices(1) ; - aServices[0] = OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; + aServices[0] = "com.sun.star.configuration.backend.LdapUserProfileBe"; return aServices ; } diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index c9cd98be6672..abb0dcd94496 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -66,7 +66,7 @@ namespace dbp Sequence< OUString > OGroupBoxSI::getServiceNames() const { Sequence< OUString > aReturn(1); - aReturn[0] = OUString("com.sun.star.sdb.GroupBoxAutoPilot"); + aReturn[0] = "com.sun.star.sdb.GroupBoxAutoPilot"; return aReturn; } @@ -83,7 +83,7 @@ namespace dbp Sequence< OUString > OListComboSI::getServiceNames() const { Sequence< OUString > aReturn(1); - aReturn[0] = OUString("com.sun.star.sdb.ListComboBoxAutoPilot"); + aReturn[0] = "com.sun.star.sdb.ListComboBoxAutoPilot"; return aReturn; } @@ -100,7 +100,7 @@ namespace dbp Sequence< OUString > OGridSI::getServiceNames() const { Sequence< OUString > aReturn(1); - aReturn[0] = OUString("com.sun.star.sdb.GridControlAutoPilot"); + aReturn[0] = "com.sun.star.sdb.GridControlAutoPilot"; return aReturn; } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 8acd74b655eb..7ab18bfd0081 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -103,13 +103,13 @@ namespace logging //= private helpers namespace { - const sal_Unicode quote_char = OUString("\"").toChar(); - const sal_Unicode comma_char = OUString(",").toChar(); - const OUString dos_newline = OUString("\r\n"); + const sal_Unicode quote_char = '"'; + const sal_Unicode comma_char = ','; + const OUString dos_newline = "\r\n"; inline bool needsQuoting(const OUString& str) { - static const OUString quote_trigger_chars = OUString( "\",\n\r"); + static const OUString quote_trigger_chars = "\",\n\r"; sal_Int32 len = str.getLength(); for(sal_Int32 i=0; i<len; i++) if(quote_trigger_chars.indexOf(str[i])!=-1) @@ -146,7 +146,7 @@ namespace ::com::sun::star::uno::Sequence< OUString> initialColumns() { com::sun::star::uno::Sequence< OUString> result = ::com::sun::star::uno::Sequence< OUString>(1); - result[0] = OUString("message"); + result[0] = "message"; return result; }; } @@ -335,7 +335,7 @@ namespace logging Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "com.sun.star.logging.CsvFormatter" ); + aServiceNames[0] = "com.sun.star.logging.CsvFormatter"; return aServiceNames; } diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index febc7aebac80..1ffe18e8f497 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -224,11 +224,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // prepare to load document debug_fprintf(NSP_LOG_APPEND, "try to load document\n"); Sequence< ::com::sun::star::beans::PropertyValue > setPropValues(3); - setPropValues[0].Name = OUString("ViewOnly"); + setPropValues[0].Name = "ViewOnly"; setPropValues[0].Value <<= sal_True; - setPropValues[1].Name = OUString("ReadOnly"); + setPropValues[1].Name = "ReadOnly"; setPropValues[1].Value <<= sal_True; - setPropValues[2].Name = OUString("InputStream"); + setPropValues[2].Name = "InputStream"; setPropValues[2].Value <<= xInputStream; /* setPropValues[ 3 ].Name = "FilterName"; @@ -240,11 +240,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // load document Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3); - setPropValues2[0].Name = OUString("ViewOnly"); + setPropValues2[0].Name = "ViewOnly"; setPropValues2[0].Value <<= sal_True; - setPropValues2[1].Name = OUString("ReadOnly"); + setPropValues2[1].Name = "ReadOnly"; setPropValues2[1].Value <<= sal_True; - setPropValues2[2].Name = OUString("AsTemplate"); + setPropValues2[2].Name = "AsTemplate"; setPropValues2[2].Value <<= sal_False; m_xComponent = xLoader->loadComponentFromURL( m_sURL, @@ -281,7 +281,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) //try to enable toolbar and tool windows Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); - propertyValue[0].Name = OUString("FunctionBarVisible"); + propertyValue[0].Name = "FunctionBarVisible"; propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, OUString(".uno:FunctionBarVisible"), diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index ad2e2e9b7d77..f5415a618a75 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -486,7 +486,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( pInfo && m_sTypeName.getLength() == 0 ) { - m_sTypeName = OUString("IDispatch"); + m_sTypeName = "IDispatch"; CComBSTR sName; if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 3a245957b536..680a485e84ea 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -152,7 +152,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = OUString("Referer"); + aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -227,10 +227,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = OUString("Referer"); + aValues[0].Name = "Referer"; aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = OUString("PostString"); + aValues[1].Name = "PostString"; aValues[1].Value <<= OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = @@ -307,7 +307,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = OUString("Referer"); + aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index d415405029f7..770da5ad37cc 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -133,7 +133,7 @@ Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginManager"); + aSNS[0] = "com.sun.star.plugin.PluginManager"; return aSNS; } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 6942c39c956a..5628c92197bc 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -56,7 +56,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) Sequence< OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginModel"); + aSNS[0] = "com.sun.star.plugin.PluginModel"; return aSNS; } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index db14cb4b76dd..712f41d4a48c 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -77,7 +77,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.form.MasterDetailLinkDialog"); + aSupported[0] = "com.sun.star.form.MasterDetailLinkDialog"; return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 87246f779cd4..ff6c2985a200 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.form.ControlFontDialog"); + aSupported[0] = "com.sun.star.form.ControlFontDialog"; return aSupported; } @@ -109,7 +109,7 @@ namespace pcr if (aArguments.getLength() == 1 && (aArguments[0] >>= xGridModel)) { PropertyValue aArg; - aArg.Name = OUString("IntrospectedObject"); + aArg.Name = "IntrospectedObject"; aArg.Value <<= xGridModel; Sequence< Any > aNewArguments(1); aNewArguments[0] <<= aArg; diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0b0abf35f459..3169ea678234 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -94,7 +94,7 @@ namespace pcr Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); + aSupported[0] = "com.sun.star.form.inspection.DefaultFormComponentInspectorModel"; return aSupported; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 72ddb86a8fd7..f9257ddf95fe 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -81,7 +81,7 @@ namespace pcr Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.inspection.DefaultHelpProvider"); + aSupported[0] = "com.sun.star.inspection.DefaultHelpProvider"; return aSupported; } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 9388665d518c..8d826f8d384d 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -283,7 +283,7 @@ namespace pcr aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear(); // also, this new-style spec requires the script code to be "Script" instead of "StarBasic" - aScriptEvent.ScriptType = OUString( "Script" ); + aScriptEvent.ScriptType = "Script"; } return aScriptEvent; } @@ -437,9 +437,9 @@ namespace pcr Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = OUString("EventType"); + aScriptDescriptor[0].Name = "EventType"; aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = OUString("Script"); + aScriptDescriptor[1].Name = "Script"; aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); @@ -539,7 +539,7 @@ namespace pcr Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.EventHandler" ); + aSupported[0] = "com.sun.star.form.inspection.EventHandler"; return aSupported; } @@ -871,7 +871,7 @@ namespace pcr aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; - aDescriptor.Category = OUString( "Events" ); + aDescriptor.Category = "Events"; return aDescriptor; } diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 3a9c9ba19534..797542509d59 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -123,7 +123,7 @@ namespace pcr { Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.inspection.ObjectInspector" ); + aSupported[ aSupported.getLength() - 1 ] = "com.sun.star.inspection.ObjectInspector"; return aSupported; } @@ -137,7 +137,7 @@ namespace pcr Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.form.PropertyBrowserController"); + aSupported[0] = "com.sun.star.form.PropertyBrowserController"; return aSupported; } @@ -265,7 +265,7 @@ namespace pcr Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.awt.PropertyBrowserController"); + aSupported[0] = "com.sun.star.awt.PropertyBrowserController"; return aSupported; } diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 4af7ef6426ed..fbac84b0bed3 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -283,14 +283,14 @@ namespace pcr void UrlClickHandler::impl_dispatch_throw( const OUString& _rURL ) { Reference< XURLTransformer > xTransformer( URLTransformer::create(m_xContext) ); - URL aURL; aURL.Complete = OUString( ".uno:OpenHyperlink" ); + URL aURL; aURL.Complete = ".uno:OpenHyperlink"; xTransformer->parseStrict( aURL ); Reference< XDesktop2 > xDispProv = Desktop::create( m_xContext ); Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW ); Sequence< PropertyValue > aDispatchArgs(1); - aDispatchArgs[0].Name = OUString("URL"); + aDispatchArgs[0].Name = "URL"; aDispatchArgs[0].Value <<= _rURL; xDispatch->dispatch( aURL, aDispatchArgs ); @@ -347,7 +347,7 @@ namespace pcr Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + aSupported[0] = "com.sun.star.inspection.GenericPropertyHandler"; return aSupported; } @@ -667,7 +667,7 @@ namespace pcr if ( !aDescriptor.Control.is() ) PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory ); - aDescriptor.Category = OUString( "General" ); + aDescriptor.Category = "General"; return aDescriptor; } diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 460ed2a060f5..099278184fa4 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -584,7 +584,7 @@ namespace pcr Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.inspection.ObjectInspector"); + aSupported[0] = "com.sun.star.inspection.ObjectInspector"; return aSupported; } @@ -651,7 +651,7 @@ namespace pcr return; OUString sOldSelection = m_sPageSelection; - m_sPageSelection = OUString(); + m_sPageSelection = ""; const sal_uInt16 nCurrentPage = m_pView->getActivaPage(); if ( (sal_uInt16)-1 != nCurrentPage ) @@ -1422,7 +1422,7 @@ namespace pcr OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } - m_sCommittingProperty = OUString(); + m_sCommittingProperty = ""; } //-------------------------------------------------------------------- diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 93d06b2744aa..86e15861ae74 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -125,8 +125,8 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( ) if( aResult.getLength() == 0) { aResult.realloc(2); - aResult[0] = OUString("String"); - aResult[1] = OUString("StringList"); + aResult[0] = "String"; + aResult[1] = "StringList"; } return aResult; } diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 52bafe842473..95134df24eb3 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -172,7 +172,7 @@ void Sane::Init() pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { - sSaneLibName = OUString("libsane" SAL_DLLEXTENSION ".1" ); + sSaneLibName = "libsane" SAL_DLLEXTENSION ".1"; pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } // try reasonable places that might not be in the library search path diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index d6d7615d93cc..93ec06b3a531 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -256,8 +256,8 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { Sequence< ScannerContext > aRet(1); - aRet.getArray()[0].ScannerName = OUString("SANE"); - aRet.getArray()[0].InternalData = 0; + aRet[0].ScannerName = "SANE"; + aRet[0].InternalData = 0; return aRet; } diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 9b167cbf7a8e..9d1e53517836 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -307,7 +307,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = OUString("URL"); + aMediaProps[0].Name = "URL"; aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); |