diff options
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 8 | ||||
| -rw-r--r-- | svx/source/src/errtxt.src | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 577953b62ebc..ea1a7d837b77 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -271,7 +271,6 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) } } - bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -295,9 +294,9 @@ bool SfxErrorHandler::GetErrorString( { ResString aErrorString(aEr.GetResString()); - sal_uInt16 nResFlags = aErrorString.GetFlags(); - if ( nResFlags ) - nFlags = nResFlags; + if (lErrId == ERRCODE_SFXMSG_STYLEREPLACE) + nFlags = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL; + rStr = rStr.replaceAll("$(ERROR)", aErrorString.GetString()); bRet = true; } @@ -318,7 +317,6 @@ bool SfxErrorHandler::GetErrorString( return bRet; } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src index 40ff54676a95..342c8e80b399 100644 --- a/svx/source/src/errtxt.src +++ b/svx/source/src/errtxt.src @@ -340,7 +340,6 @@ Resource RID_ERRHDL }; String ERRCODE_SFXMSG_STYLEREPLACE { - ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; }; String ERRCODE_SFX_NOFILTER |