mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move the extra data of ERRCODE_SFXMSG_STYLEREPLACE out of the .src

Browse Source 
Change-Id: I5c39d785d1f2a78e1fcfcd763deac60f047a5e4b
This commit is contained in:
Caolán McNamara
2017-02-08 10:58:47 +00:00
parent 12b865c028
commit 9192e85076
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svtools/source/misc/ehdl.cxx
View File

@@ -271,7 +271,6 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr)
} }
} }
bool SfxErrorHandler::GetErrorString( bool SfxErrorHandler::GetErrorString(
sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
@@ -295,9 +294,9 @@ bool SfxErrorHandler::GetErrorString(
{ {
ResString aErrorString(aEr.GetResString()); ResString aErrorString(aEr.GetResString());
sal_uInt16 nResFlags = aErrorString.GetFlags(); if (lErrId == ERRCODE_SFXMSG_STYLEREPLACE)
if ( nResFlags ) nFlags = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL;
nFlags = nResFlags;
rStr = rStr.replaceAll("$(ERROR)", aErrorString.GetString()); rStr = rStr.replaceAll("$(ERROR)", aErrorString.GetString());
bRet = true; bRet = true;
} }
@@ -318,7 +317,6 @@ bool SfxErrorHandler::GetErrorString(
return bRet; return bRet;
} }
SfxErrorContext::SfxErrorContext( SfxErrorContext::SfxErrorContext(
sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP)
: ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP)

1
svx/source/src/errtxt.src
View File

@@ -340,7 +340,6 @@ Resource RID_ERRHDL
}; };
String ERRCODE_SFXMSG_STYLEREPLACE String ERRCODE_SFXMSG_STYLEREPLACE
{ {
ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ;
Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ;
}; };
String ERRCODE_SFX_NOFILTER String ERRCODE_SFX_NOFILTER