[Libreoffice-commits] core.git: framework/source

[Mike Kaganski (via logerrit)]

 framework/source/services/autorecovery.cxx |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 8362ec6646df330629b1c6c2e28b634487d55612
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 16 22:04:37 2023 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jul 17 18:40:16 2023 +0200

    Small simplification
    
    Change-Id: I36bbdb48f0fa0d81e7ba294e9ac01b0d187e4800
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154462
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index a0ef83d3a9da..07ea3184476f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1801,7 +1801,6 @@ void AutoRecovery::implts_readConfig()
 
     css::uno::Reference<css::container::XNameAccess> xRecoveryList(
             officecfg::Office::Recovery::RecoveryList::get());
-    const OUString 
sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
     const css::uno::Sequence< OUString > lItems = 
xRecoveryList->getElementNames();
     const OUString*                      pItems = lItems.getConstArray();
     sal_Int32                            c      = lItems.getLength();
@@ -1833,9 +1832,9 @@ void AutoRecovery::implts_readConfig()
         implts_specifyAppModuleAndFactory(aInfo);
         implts_specifyDefaultFilterAndExtension(aInfo);
 
-        if (pItems[i].startsWith(sRECOVERY_ITEM_BASE_IDENTIFIER))
+        if (pItems[i].startsWith(RECOVERY_ITEM_BASE_IDENTIFIER))
         {
-            std::u16string_view sID = 
pItems[i].subView(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength());
+            std::u16string_view sID = 
pItems[i].subView(RECOVERY_ITEM_BASE_IDENTIFIER.getLength());
             aInfo.ID = o3tl::toInt32(sID);
             /* SAFE */ {
             osl::MutexGuard 
g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -1935,8 +1934,8 @@ void 
AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo
         rInfo.AppModule = xManager->identify(rInfo.Document);
 
     ::comphelper::SequenceAsHashMap 
lModuleDescription(xManager->getByName(rInfo.AppModule));
-    lModuleDescription[OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= 
rInfo.FactoryURL;
-    lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= 
rInfo.FactoryService;
+    lModuleDescription[CFG_ENTRY_PROP_EMPTYDOCUMENTURL] >>= rInfo.FactoryURL;
+    lModuleDescription[CFG_ENTRY_PROP_FACTORYSERVICE] >>= rInfo.FactoryService;
 }
 
 void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& 
i_rInfo )
@@ -3590,15 +3589,15 @@ css::frame::FeatureStateEvent 
AutoRecovery::implst_createFeatureStateEvent(
     {
         // pack rInfo for transport via UNO
         ::comphelper::NamedValueCollection aInfo;
-        aInfo.put( OUString(CFG_ENTRY_PROP_ID), pInfo->ID );
-        aInfo.put( OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL );
-        aInfo.put( OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
-        aInfo.put( OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
-        aInfo.put( OUString(CFG_ENTRY_PROP_TEMPURL), 
pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
-        aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule);
-        aInfo.put( OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
-        aInfo.put( OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
-        aInfo.put( OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), 
sal_Int32(pInfo->DocumentState));
+        aInfo.put( CFG_ENTRY_PROP_ID, pInfo->ID );
+        aInfo.put( CFG_ENTRY_PROP_ORIGINALURL, pInfo->OrgURL );
+        aInfo.put( CFG_ENTRY_PROP_FACTORYURL, pInfo->FactoryURL );
+        aInfo.put( CFG_ENTRY_PROP_TEMPLATEURL, pInfo->TemplateURL );
+        aInfo.put( CFG_ENTRY_PROP_TEMPURL, pInfo->OldTempURL.isEmpty() ? 
pInfo->NewTempURL : pInfo->OldTempURL );
+        aInfo.put( CFG_ENTRY_PROP_MODULE, pInfo->AppModule);
+        aInfo.put( CFG_ENTRY_PROP_TITLE, pInfo->Title);
+        aInfo.put( CFG_ENTRY_PROP_VIEWNAMES, pInfo->ViewNames);
+        aInfo.put( CFG_ENTRY_PROP_DOCUMENTSTATE, 
sal_Int32(pInfo->DocumentState));
 
         aEvent.State <<= aInfo.getPropertyValues();
     }