summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-10-04 17:13:24 +0200
committerMichael Stahl <mstahl@redhat.com>2012-10-09 21:15:07 +0000
commit58528348fad0609c4d7af7943bc76df4261b8508 (patch)
treedbb99737098ec6315b97ee82e28df198e6c5c23d /uui
parent227d385fcdaf30ef4bd294d99b088ef533372d58 (diff)
String->OUString in tools::ErrorContext
Change-Id: Ibd0cd3e8d7281b5abde420df5cc1d51e9354069c Reviewed-on: https://gerrit.libreoffice.org/769 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'uui')
-rw-r--r--uui/source/iahndl-errorhandler.cxx2
-rw-r--r--uui/source/iahndl.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 10ae5276d243..ae4f2bc80743 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -258,7 +258,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
ErrorContext * pContext = ErrorContext::GetContext();
if (pContext)
{
- UniString aContextString;
+ OUString aContextString;
if (pContext->GetString(nErrorCode, aContextString))
aContext = aContextString;
}
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 09f904cf2971..60e49e41878a 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1243,7 +1243,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
bHasErrorString = isInformationalErrorMessageRequest(rContinuations);
if (bHasErrorString)
{
- String aErrorString;
+ OUString aErrorString;
ErrorHandler::GetErrorString(nErrorCode, aErrorString);
rErrorString = aErrorString;
}
@@ -1264,7 +1264,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
|| nError == ERRCODE_SFX_INCOMPLETE_ENCRYPTION )
{
// the security warning box needs a special title
- String aErrorString;
+ OUString aErrorString;
ErrorHandler::GetErrorString( nErrorCode, aErrorString );
boost::scoped_ptr< ResMgr > xManager(