svtools/source/misc/ehdl.cxx | 2 +-
sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt |binary
vcl/source/window/errinf.cxx | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e090b4272b8fa12d2032ff0c0ea4bfb24c0d2d2
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Aug 24 21:20:25 2017 +0200
tdf#111934: add document for filters-tests
Thanks to infostu...@gmail.com for the document; unfortunately git
tells me that i can't set the commit author to just an email address.
Change-Id: I844e725d06cfa2a56adcd93aaa0a222fbb14028f
diff --git a/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt
new file mode 100644
index 000000000000..7d823df75213
Binary files /dev/null and
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt differ
commit 4ebcb4009e2185961fe3d716bd07ef2013ecd070
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Aug 24 21:03:58 2017 +0200
svtools: fix checking of ErrCodeArea so error dialogs are shown again
Previously SfxErrorHandler::CreateString() compared the entire error
code so >=/<= worked but now only the ErrCodeArea is compared,
so only </> works.
(regression from 158595543053c158a9bcb95f679e7b8a3c2e4e89)
Change-Id: I8ac46de154f93a7109ec29d899c71bfb470d008c
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 2941c80397d7..effe4ecb5860 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -159,7 +159,7 @@ bool SfxErrorHandler::CreateString(const ErrorInfo *pErr,
OUString &rStr) const
{
ErrCode nErrCode(sal_uInt32(pErr->GetErrorCode()) & ERRCODE_ERROR_MASK);
- if( pErr->GetErrorCode().GetArea() > lEnd ||
pErr->GetErrorCode().GetArea() <= lStart )
+ if (pErr->GetErrorCode().GetArea() < lStart || lEnd <
pErr->GetErrorCode().GetArea())
return false;
if(GetErrorString(nErrCode, rStr))
{
commit 41fb6822cbc2f82333ea54db816f60616f827e49
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Aug 24 17:14:45 2017 +0200
vcl: fix double-free of ErrorInfo
The only value that ErrorHandler::GetErrorString() adds over
ErrorStringFactory::CreateString() is that it will delete the pInfo a
2nd time, because the ErrorInfo::GetErrorInfo() returns the same object
twice.
This may fix it, but it's generally hard to tell what this
brain damaged error handling code will do.
(regression from 1167df7df59e37fddef0c40c4d27cb2e82e10922)
Change-Id: I22f446bee669cae8c5288bcc2f1e1d0299f5b384
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 0eb4c0160e8c..40849ca916e1 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -148,7 +148,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
DialogMask nFlags)
}
OUString aErr;
- if (ErrorHandler::GetErrorString(nErrCodeId, aErr))
+ if (ErrorStringFactory::CreateString(pInfo, aErr))
{
if(!rData.pDsp)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
