Skip to content

C
core
Kaydet (Commit) 58528348 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl
Dosyalara gözat
Seçenekler

String->OUString in tools::ErrorContext 

Change-Id: Ibd0cd3e8d7281b5abde420df5cc1d51e9354069c
Reviewed-on: https://gerrit.libreoffice.org/769Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 227d385f
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 79 deletions
sd/source/filter/html/htmlex.cxx
Dosyayı görüntüle @ 58528348
......@@ -3316,16 +3316,16 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin)
// =====================================================================
sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr )
sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr )
{
DBG_ASSERT( mnResId != 0, "No error context set" );
if( mnResId == 0 )
return false;
rCtxStr = String( SdResId( mnResId ) );
rCtxStr = SdResId( mnResId );
rCtxStr.SearchAndReplace( rtl::OUString("$(URL1)"), maURL1 );
rCtxStr.SearchAndReplace( rtl::OUString("$(URL2)"), maURL2 );
rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL1)"), maURL1 );
rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL2)"), maURL2 );
return true;
}
......
sd/source/filter/html/htmlex.hxx
Dosyayı görüntüle @ 58528348
......@@ -81,7 +81,7 @@ public:
HtmlErrorContext(Window *pWin=0);
~HtmlErrorContext() {};
virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr );
virtual sal_Bool GetString( sal_uLong nErrId, OUString& rCtxStr );
void SetContext( sal_uInt16 nResId, const String& rURL );
void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 );
......
svtools/inc/svtools/ehdl.hxx
Dosyayı görüntüle @ 58528348
......@@ -38,7 +38,7 @@ public:
SfxErrorContext(
sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0,
sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0);
virtual sal_Bool GetString(sal_uLong nErrId, String &rStr);
virtual sal_Bool GetString(sal_uLong nErrId, OUString &rStr);
private:
sal_uInt16 nCtxId;
......@@ -54,8 +54,8 @@ public:
~SfxErrorHandler();
protected:
virtual sal_Bool GetErrorString(sal_uLong lErrId, String &, sal_uInt16&) const;
virtual sal_Bool GetMessageString(sal_uLong lErrId, String &, sal_uInt16&) const;
virtual sal_Bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const;
virtual sal_Bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const;
private:
......@@ -67,7 +67,7 @@ private:
SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, String &) const;
virtual sal_Bool CreateString(
const ErrorInfo *, String &, sal_uInt16 &) const;
const ErrorInfo *, OUString &, sal_uInt16 &) const;
};
#endif
......
svtools/source/misc/ehdl.cxx
Dosyayı görüntüle @ 58528348
......@@ -42,8 +42,8 @@
static sal_uInt16 aWndFunc(
Window *pWin, // Parent des Dialoges
sal_uInt16 nFlags,
const String &rErr, // Fehlertext
const String &rAction) // Actiontext
const OUString &rErr, // Fehlertext
const OUString &rAction) // Actiontext
/* [Beschreibung]
......@@ -175,7 +175,7 @@ SfxErrorHandler::~SfxErrorHandler()
//-------------------------------------------------------------------------
sal_Bool SfxErrorHandler::CreateString(
const ErrorInfo *pErr, String &rStr, sal_uInt16& nFlags) const
const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const
/* [Beschreibung]
......@@ -192,13 +192,12 @@ sal_Bool SfxErrorHandler::CreateString(
{
if(GetMessageString(nErrCode, rStr, nFlags))
{
for (xub_StrLen i = 0; i < rStr.Len();)
for (xub_StrLen i = 0; i < rStr.getLength();)
{
i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"),
pMsgInfo->GetMessageArg(), i);
if (i == STRING_NOTFOUND)
if( rStr.indexOf(OUString("$(ARG1)"), i) == -1 )
break;
i = i + pMsgInfo->GetMessageArg().Len();
rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg(), i);
i = i + pMsgInfo->GetMessageArg().getLength();
}
return sal_True;
}
......@@ -207,32 +206,32 @@ sal_Bool SfxErrorHandler::CreateString(
{
StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr);
if(pStringInfo)
for (xub_StrLen i = 0; i < rStr.Len();)
for (xub_StrLen i = 0; i < rStr.getLength();)
{
i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"),
pStringInfo->GetErrorString(), i);
if (i == STRING_NOTFOUND)
if( rStr.indexOf("$(ARG1)", i) == -1 )
break;
i = i + pStringInfo->GetErrorString().Len();
rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"),
pStringInfo->GetErrorString(), i);
i = i + pStringInfo->GetErrorString().getLength();
}
else
{
TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo,
pErr);
if (pTwoStringInfo)
for (sal_uInt16 i = 0; i < rStr.Len();)
for (sal_uInt16 i = 0; i < rStr.getLength();)
{
sal_uInt16 nArg1Pos = rStr.Search(rtl::OUString("$(ARG1)"), i);
sal_uInt16 nArg2Pos = rStr.Search(rtl::OUString("$(ARG2)"), i);
sal_uInt16 nArg1Pos = rStr.indexOf(rtl::OUString("$(ARG1)"), i);
sal_uInt16 nArg2Pos = rStr.indexOf(rtl::OUString("$(ARG2)"), i);
if (nArg1Pos < nArg2Pos)
{
rStr.Replace(nArg1Pos, 7, pTwoStringInfo->GetArg1());
i = nArg1Pos + pTwoStringInfo->GetArg1().Len();
rStr = rStr.replaceAt(nArg1Pos, 7, pTwoStringInfo->GetArg1());
i = nArg1Pos + pTwoStringInfo->GetArg1().getLength();
}
else if (nArg2Pos < nArg1Pos)
{
rStr.Replace(nArg2Pos, 7, pTwoStringInfo->GetArg2());
i = nArg2Pos + pTwoStringInfo->GetArg2().Len();
rStr = rStr.replaceAt(nArg2Pos, 7, pTwoStringInfo->GetArg2());
i = nArg2Pos + pTwoStringInfo->GetArg2().getLength();
}
else break;
}
......@@ -329,7 +328,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const
//-------------------------------------------------------------------------
sal_Bool SfxErrorHandler::GetMessageString(
sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const
sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
/* [Beschreibung]
......@@ -359,7 +358,7 @@ sal_Bool SfxErrorHandler::GetMessageString(
//-------------------------------------------------------------------------
sal_Bool SfxErrorHandler::GetErrorString(
sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const
sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
/* [Beschreibung]
Erzeugt den Fehlerstring fuer den eigentlichen Fehler ohne
......@@ -383,7 +382,7 @@ sal_Bool SfxErrorHandler::GetErrorString(
sal_uInt16 nResFlags = aErrorString.GetFlags();
if ( nResFlags )
nFlags = nResFlags;
rStr.SearchAndReplace(rtl::OUString("$(ERROR)"), aErrorString.GetString());
rStr = rStr.replaceAll(rtl::OUString("$(ERROR)"), aErrorString.GetString());
bRet = sal_True;
}
else
......@@ -397,7 +396,7 @@ sal_Bool SfxErrorHandler::GetErrorString(
aErrStr);
if(aErrStr.Len())
aErrStr += rtl::OUString(".\n");
rStr.SearchAndReplace(rtl::OUString("$(CLASS)"),aErrStr);
rStr = rStr.replaceAll(rtl::OUString("$(CLASS)"),aErrStr);
}
return bRet;
......@@ -427,7 +426,7 @@ SfxErrorContext::SfxErrorContext(
//-------------------------------------------------------------------------
sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
/* [Beschreibung]
......@@ -452,7 +451,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
if ( aTestEr )
{
rStr = ( (ResString)aTestEr ).GetString();
rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), aArg1 );
rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), aArg1 );
bRet = true;
}
else
......@@ -466,7 +465,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR;
ResId aSfxResId( RID_ERRCTX, *pMgr );
ErrorResource_Impl aEr( aSfxResId, nId );
rStr.SearchAndReplace( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() );
rStr = rStr.replaceAll( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() );
}
}
......
test/source/bootstrapfixture.cxx
Dosyayı görüntüle @ 58528348
......@@ -47,7 +47,7 @@
using namespace ::com::sun::star;
static void aBasicErrorFunc( const String &rErr, const String &rAction )
static void aBasicErrorFunc( const OUString &rErr, const OUString &rAction )
{
OStringBuffer aErr( "Unexpected dialog: " );
aErr.append( OUStringToOString( rAction, RTL_TEXTENCODING_ASCII_US ) );
......
tools/inc/tools/errinf.hxx
Dosyayı görüntüle @ 58528348
......@@ -69,48 +69,50 @@ public:
class TOOLS_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo
{
private:
String aString;
OUString aString;
public:
TYPEINFO();
StringErrorInfo( sal_uIntPtr lUserId,
const String& aStringP,
const OUString& aStringP,
sal_uInt16 nFlags = 0);
const String& GetErrorString() const { return aString; }
const OUString& GetErrorString() const { return aString; }
};
class TOOLS_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo
{
private:
String aArg1;
String aArg2;
OUString aArg1;
OUString aArg2;
public:
TYPEINFO();
TwoStringErrorInfo(sal_uIntPtr nUserID, const String & rTheArg1,
const String & rTheArg2, sal_uInt16 nFlags = 0):
DynamicErrorInfo(nUserID, nFlags), aArg1(rTheArg1), aArg2(rTheArg2) {}
TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1,
const OUString & rTheArg2, sal_uInt16 nFlags = 0):
DynamicErrorInfo(nUserID, nFlags), aArg1(rTheArg1), aArg2(rTheArg2) {}
virtual ~TwoStringErrorInfo() {}
String GetArg1() const { return aArg1; }
String GetArg2() const { return aArg2; }
const OUString& GetArg1() const { return aArg1; }
const OUString& GetArg2() const { return aArg2; }
};
class TOOLS_DLLPUBLIC MessageInfo : public DynamicErrorInfo
{
public:
TYPEINFO();
MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) :
DynamicErrorInfo(UserId, nFlags){}
MessageInfo(sal_uIntPtr UserId, const String &rArg,
sal_uInt16 nFlags = 0 ) :
DynamicErrorInfo(UserId, nFlags), aArg(rArg) {}
const String& GetMessageArg() const { return aArg; }
TYPEINFO();
MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) :
DynamicErrorInfo(UserId, nFlags) {}
MessageInfo(sal_uIntPtr UserId, const OUString &rArg, sal_uInt16 nFlags = 0 ) :
DynamicErrorInfo(UserId, nFlags), aArg(rArg) {}
const OUString& GetMessageArg() const { return aArg; }
private:
String aArg;
OUString aArg;
};
class TOOLS_DLLPUBLIC ErrorContext
......@@ -125,17 +127,17 @@ public:
ErrorContext(Window *pWin=0);
virtual ~ErrorContext();
virtual sal_Bool GetString( sal_uIntPtr nErrId, String& rCtxStr ) = 0;
virtual sal_Bool GetString( sal_uIntPtr nErrId, OUString& rCtxStr ) = 0;
Window* GetParent() { return pWin; }
static ErrorContext* GetContext();
};
typedef sal_uInt16 WindowDisplayErrorFunc(
Window *, sal_uInt16 nMask, const String &rErr, const String &rAction);
Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction);
typedef void BasicDisplayErrorFunc(
const String &rErr, const String &rAction);
const OUString &rErr, const OUString &rAction);
class TOOLS_DLLPUBLIC ErrorHandler
{
......@@ -144,20 +146,20 @@ class TOOLS_DLLPUBLIC ErrorHandler
private:
ErrHdl_Impl* pImpl;
static sal_uInt16 HandleError_Impl( sal_uIntPtr lId,
sal_uInt16 nFlags,
sal_Bool bJustCreateString,
String & rError);
static sal_uInt16 HandleError_Impl( sal_uIntPtr lId,
sal_uInt16 nFlags,
sal_Bool bJustCreateString,
OUString & rError);
protected:
virtual sal_Bool CreateString( const ErrorInfo *,
String &, sal_uInt16& nMask ) const = 0;
virtual sal_Bool CreateString( const ErrorInfo *,
OUString &, sal_uInt16& nMask ) const = 0;
public:
ErrorHandler();
virtual ~ErrorHandler();
static sal_uInt16 HandleError ( sal_uIntPtr lId, sal_uInt16 nMask = USHRT_MAX );
static sal_Bool GetErrorString( sal_uIntPtr lId, String& rStr );
static sal_Bool GetErrorString( sal_uIntPtr lId, OUString& rStr );
static void RegisterDisplay( BasicDisplayErrorFunc* );
static void RegisterDisplay( WindowDisplayErrorFunc* );
......@@ -166,7 +168,7 @@ public:
class TOOLS_DLLPUBLIC SimpleErrorHandler : private ErrorHandler
{
protected:
virtual sal_Bool CreateString( const ErrorInfo*, String &,
virtual sal_Bool CreateString( const ErrorInfo*, OUString &,
sal_uInt16 &nMask ) const;
public:
......
tools/source/ref/errinf.cxx
Dosyayı görüntüle @ 58528348
......@@ -162,7 +162,7 @@ sal_uInt16 DynamicErrorInfo::GetDialogMask() const
}
StringErrorInfo::StringErrorInfo(
sal_uIntPtr UserId, const String& aStringP, sal_uInt16 nFlags)
sal_uIntPtr UserId, const OUString& aStringP, sal_uInt16 nFlags)
: DynamicErrorInfo(UserId, nFlags), aString(aStringP)
{
}
......@@ -172,10 +172,10 @@ class ErrHdl_Impl
public:
ErrorHandler *pNext;
static sal_Bool CreateString(const ErrorHandler *pStart,
const ErrorInfo*, String&, sal_uInt16&);
const ErrorInfo*, OUString&, sal_uInt16&);
};
static void aDspFunc(const String &rErr, const String &rAction)
static void aDspFunc(const OUString &rErr, const OUString &rAction)
{
rtl::OStringBuffer aErr(RTL_CONSTASCII_STRINGPARAM("Aktion: "));
aErr.append(rtl::OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US));
......@@ -261,10 +261,10 @@ void ErrorHandler::RegisterDisplay(BasicDisplayErrorFunc *aDsp)
@return ???
*/
sal_uInt16 ErrorHandler::HandleError_Impl(
sal_uIntPtr lId, sal_uInt16 nFlags, sal_Bool bJustCreateString, String & rError)
sal_uIntPtr lId, sal_uInt16 nFlags, sal_Bool bJustCreateString, OUString & rError)
{
String aErr;
String aAction;
OUString aErr;
OUString aAction;
if(!lId || lId == ERRCODE_ABORT)
return 0;
EDcrData *pData=EDcrData::GetData();
......@@ -346,7 +346,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
}
// static
sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, String& rStr)
sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, OUString& rStr)
{
return (sal_Bool)HandleError_Impl( lId, USHRT_MAX, sal_True, rStr );
}
......@@ -357,12 +357,12 @@ sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, String& rStr)
*/
sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags)
{
String aDummy;
OUString aDummy;
return HandleError_Impl( lId, nFlags, sal_False, aDummy );
}
sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart,
const ErrorInfo* pInfo, String& pStr,
const ErrorInfo* pInfo, OUString& pStr,
sal_uInt16 &rFlags)
{
for(const ErrorHandler *pHdl=pStart;pHdl;pHdl=pHdl->pImpl->pNext)
......@@ -374,7 +374,7 @@ sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart,
}
sal_Bool SimpleErrorHandler::CreateString(
const ErrorInfo *pInfo, String &rStr, sal_uInt16 &) const
const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const
{
sal_uIntPtr nId = pInfo->GetErrorCode();
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Id "));
......
uui/source/iahndl-errorhandler.cxx
Dosyayı görüntüle @ 58528348
......@@ -258,7 +258,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
ErrorContext * pContext = ErrorContext::GetContext();
if (pContext)
{
UniString aContextString;
OUString aContextString;
if (pContext->GetString(nErrorCode, aContextString))
aContext = aContextString;
}
......
uui/source/iahndl.cxx
Dosyayı görüntüle @ 58528348
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment