From d47d1d921570c8055491c4ed8894b371f1a0e6ee Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 17 May 2017 20:54:04 +0100
Subject: FwkResId and FwlResId are the same

and FWK_RESSTR/.toString can be removed now

Change-Id: I7d2d56681fc9be31948bbb4dae737a75cc59d065
---
 framework/source/services/autorecovery.cxx | 4 ++--
 framework/source/services/desktop.cxx      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/source/services')

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 827e045629ff..48cb5bad7861 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -4157,8 +4157,8 @@ bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 
 void AutoRecovery::impl_showFullDiscError()
 {
-    OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
-    OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
+    OUString sBtn(FwkResId(STR_FULL_DISC_RETRY_BUTTON));
+    OUString sMsg(FwkResId(STR_FULL_DISC_MSG));
 
     OUString sBackupURL(SvtPathOptions().GetBackupPath());
     INetURLObject aConverter(sBackupURL);
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index ab5bb5b42c8c..1791e857f4ec 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -116,7 +116,7 @@ void Desktop::constructorInit()
     m_xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
 
     OUStringBuffer sUntitledPrefix (256);
-    sUntitledPrefix.append      (FWK_RESSTR(STR_UNTITLED_DOCUMENT));
+    sUntitledPrefix.append      (FwkResId(STR_UNTITLED_DOCUMENT));
     sUntitledPrefix.append (" ");
 
     ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection ();
-- 
cgit