diff options
Diffstat (limited to 'framework/source/services')
-rw-r--r-- | framework/source/services/autorecovery.cxx | 23 | ||||
-rw-r--r-- | framework/source/services/dispatchhelper.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/license.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/sessionlistener.cxx | 6 | ||||
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 8 | ||||
-rw-r--r-- | framework/source/services/urltransformer.cxx | 2 |
6 files changed, 21 insertions, 22 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 78b7df626479..d628c1c18dd5 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -370,7 +370,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) //----------------------------------------------- void DispatchParams::forget() { - m_sSavePath = OUString(); + m_sSavePath = ""; m_nWorkingEntryID = -1; m_xProgress.clear(); m_xHoldRefForAsyncOpAlive.clear(); @@ -1047,7 +1047,7 @@ void AutoRecovery::implts_readConfig() continue; AutoRecovery::TDocumentInfo aInfo; - aInfo.NewTempURL = OUString(); + aInfo.NewTempURL = ""; aInfo.Document = css::uno::Reference< css::frame::XModel >(); xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ; xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ; @@ -1140,16 +1140,15 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume css::uno::Sequence< OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< OUString >()); if (lExtensions.getLength()) { - rInfo.Extension = OUString("."); - rInfo.Extension += lExtensions[0]; + rInfo.Extension = lExtensions[0]; } else - rInfo.Extension = OUString(".unknown"); + rInfo.Extension = ".unknown"; } catch(const css::uno::Exception&) { - rInfo.DefaultFilter = OUString(); - rInfo.Extension = OUString(); + rInfo.DefaultFilter = ""; + rInfo.Extension = ""; } } @@ -1900,8 +1899,8 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr OUString sRemoveURL1 = rInfo.OldTempURL; OUString sRemoveURL2 = rInfo.NewTempURL; - rInfo.OldTempURL = OUString(); - rInfo.NewTempURL = OUString(); + rInfo.OldTempURL = ""; + rInfo.NewTempURL = ""; ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); @@ -2394,7 +2393,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& else { // safe the state about error ... - rInfo.NewTempURL = OUString(); + rInfo.NewTempURL = ""; rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE; rInfo.DocumentState |= AutoRecovery::E_HANDLED; rInfo.DocumentState |= AutoRecovery::E_INCOMPLETE; @@ -2407,8 +2406,8 @@ void AutoRecovery::implts_saveOneDoc(const OUString& // Ignore any error here. We have a new temp file, which is up to date. // The only thing is: we fill the disk with temp files, if we cant remove old ones :-) OUString sRemoveFile = rInfo.OldTempURL; - rInfo.OldTempURL = rInfo.NewTempURL; - rInfo.NewTempURL = OUString(); + rInfo.OldTempURL = rInfo.NewTempURL; + rInfo.NewTempURL = ""; implts_flushConfigItem(rInfo); diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 7da823d00493..f3aeaf66c146 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -120,7 +120,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments ); sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); - aArguments[ nLength ].Name = OUString("SynchronMode"); + aArguments[ nLength ].Name = "SynchronMode"; aArguments[ nLength ].Value <<= (sal_Bool) sal_True; css::uno::Any aResult; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index b0ee90814b43..e26591c98676 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -236,7 +236,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na Reference< XMultiServiceFactory > theConfigProvider = theDefaultProvider::get( m_xContext ); Sequence< Any > theArgs(1); NamedValue v; - v.Name = OUString("NodePath"); + v.Name = "NodePath"; v.Value <<= OUString("org.openoffice.Setup/Office"); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index d85ba149bfd5..bb8be519ad3d 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -116,7 +116,7 @@ void SessionListener::StoreSession( sal_Bool bAsync ) css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext ); css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext ); URL aURL; - aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionSave"); + aURL.Complete = "vnd.sun.star.autorecovery:/doSessionSave"; xURLTransformer->parseStrict(aURL); // in case of asynchronous call the notification will trigger saveDone() @@ -148,7 +148,7 @@ void SessionListener::QuitSessionQuietly() css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext ); css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext ); URL aURL; - aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionQuietQuit"); + aURL.Complete = "vnd.sun.star.autorecovery:/doSessionQuietQuit"; xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args(1); @@ -229,7 +229,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext ); URL aURL; - aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionRestore"); + aURL.Complete = "vnd.sun.star.autorecovery:/doSessionRestore"; css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(m_xContext)); xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 93520030b5e0..d114a4c75205 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -240,7 +240,7 @@ SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyL // Enable notification mechanism // We need it to get information about changes outside these class on our configuration branch Sequence< OUString > aNotifySeq( 1 ); - aNotifySeq[0] = OUString( "SharePoints" ); + aNotifySeq[0] = "SharePoints"; EnableNotification( aNotifySeq, sal_True ); } @@ -347,7 +347,7 @@ const OUString& SubstitutePathVariables_Impl::GetDNSDomainName() if ( nIndex >= 0 && aTemp.getLength() > nIndex+1 ) m_aDNSDomain = aTemp.copy( nIndex+1 ).toAsciiLowerCase(); else - m_aDNSDomain = OUString(); + m_aDNSDomain = ""; m_bDNSDomainRetrieved = sal_True; } @@ -524,7 +524,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( aEnvUsePropNameTemplate += m_aLevelSep; for ( sal_Int32 nProperty = 0; nProperty < aEnvironmentVariable.getLength(); nProperty++ ) - aEnvUsedPropertySeq[nProperty] = OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] ); + aEnvUsedPropertySeq[nProperty] = aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty]; Sequence< Any > aEnvUsedValueSeq; aEnvUsedValueSeq = GetProperties( aEnvUsedPropertySeq ); @@ -1113,7 +1113,7 @@ throw ( NoSuchElementException, RuntimeException ) void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables ) { - aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = OUString("$BRAND_BASE_DIR"); + aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = "$BRAND_BASE_DIR"; rtl::Bootstrap::expandMacros( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 13e42d977696..b9c27a8d13d8 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -311,7 +311,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL if ( !bWithPassword && !aTestURL.Password.isEmpty() ) { // Exchange password text with other placeholder string - aTestURL.Password = OUString("<******>"); + aTestURL.Password = "<******>"; assemble( aTestURL ); } |