canvas/workben/canvasdemo.cxx | 5 -----
xmloff/source/draw/QRCodeContext.cxx | 4 +++-
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 2babe56a83613db6167a42a3284cf0f4f92a1b52
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 24 20:57:08 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 25 11:29:26 2019 +0200
cid#1251600 Uncaught exception
we don't need this hunk of code for the demo anyway
Change-Id: I45e30d9ae190b443d15fa0933241fb75c0fbb8b1
Reviewed-on: https://gerrit.libreoffice.org/78071
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index f94e259e0fc4..3e768f5ef118 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -624,11 +624,6 @@ int DemoApp::Main()
return 1;
}
- // Create UCB (for backwards compatibility, in case some code still uses
- // plain createInstance w/o args directly to obtain an instance):
- ::ucb::UniversalContentBroker::create(
- comphelper::getProcessComponentContext() );
-
ScopedVclPtr<TestWindow> aWindow = VclPtr<TestWindow>::Create();
aWindow->Show();
commit 78d3041776d02b9a816414a899b350f27f3a699f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 24 20:17:07 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 25 11:28:45 2019 +0200
cid#1452763 Unchecked return value
Change-Id: Ib2fa604f7c7635892221db4efa4c44f4f542b622
Reviewed-on: https://gerrit.libreoffice.org/78067
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmloff/source/draw/QRCodeContext.cxx
b/xmloff/source/draw/QRCodeContext.cxx
index bf0f4c0469d2..5e4271377f9a 100644
--- a/xmloff/source/draw/QRCodeContext.cxx
+++ b/xmloff/source/draw/QRCodeContext.cxx
@@ -78,7 +78,9 @@ QRCodeContext::QRCodeContext(SvXMLImport& rImport, sal_uInt16
nPrfx, const OUStr
if (IsXMLToken(aLocalName, XML_QRCODE_BORDER))
{
- sax::Converter::convertNumber(aQRCode.Border, sValue, 0);
+ sal_Int32 nAttrVal;
+ if (sax::Converter::convertNumber(nAttrVal, sValue, 0))
+ aQRCode.Border = nAttrVal;
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
