summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-01-13 23:09:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-16 10:21:55 +0000
commit1aec590757962088358bdc7de175766a671c873b (patch)
tree4cb9f00b1d828c7f5bfa01b181436b34e94b0712 /framework
parent54cf331a96429212c1ed0041c003840a760d75fa (diff)
convert low hanging Strings to OUString
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/autorecovery.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 689cae95a67d..b464c1c6a02e 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2794,9 +2794,9 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
// TODO: Must we strip some illegal signes - if we use the title?
- String sName (sUniqueName.makeStringAndClear());
- String sExtension(rInfo.Extension );
- String sPath (sBackupPath );
+ rtl::OUString sName(sUniqueName.makeStringAndClear());
+ String sExtension(rInfo.Extension);
+ String sPath(sBackupPath);
::utl::TempFile aTempFile(sName, &sExtension, &sPath);
rInfo.NewTempURL = aTempFile.GetURL();
@@ -3483,16 +3483,16 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
//-----------------------------------------------
void AutoRecovery::impl_showFullDiscError()
{
- static String PLACEHOLDER_PATH = String::CreateFromAscii("%PATH");
+ rtl::OUString PLACEHOLDER_PATH(RTL_CONSTASCII_USTRINGPARAM("%PATH"));
- String sBtn(FwkResId(STR_FULL_DISC_RETRY_BUTTON));
- String sMsg(FwkResId(STR_FULL_DISC_MSG ));
+ rtl::OUString sBtn(ResId::toString(FwkResId(STR_FULL_DISC_RETRY_BUTTON)));
+ String sMsg(ResId::toString(FwkResId(STR_FULL_DISC_MSG)));
- String sBackupURL(SvtPathOptions().GetBackupPath());
+ rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath());
INetURLObject aConverter(sBackupURL);
sal_Unicode aDelimiter;
- String sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
- if (sBackupPath.Len()<1)
+ rtl::OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
+ if (sBackupPath.getLength() < 1)
sBackupPath = sBackupURL;
sMsg.SearchAndReplace(PLACEHOLDER_PATH, sBackupPath);