diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-29 15:50:02 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-30 04:57:21 +0200 |
| commit | 7334034ae93b49fc93b5859a3c047a319d138282 (patch) | |
| tree | 6216d895de7ede63bd946a0e75913a3b07e4c2b6 /svx/source/unodraw/unoshap2.cxx | |
| parent | c0ff8a24365456383900ed7958c8fb9ea68043e9 (diff) | |
drop Graphic::operator bool
which tends to interact in very weird ways with other code, for example
it makes Graphic appear to have an operator<
Change-Id: I335fe8f3644b710bc61291e625cbca7334a37716
Reviewed-on: https://gerrit.libreoffice.org/71532
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx/source/unodraw/unoshap2.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 9e9fe4071a59..760b6eb4da6a 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1273,7 +1273,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte if (rValue >>= aURL) { Graphic aGraphic = vcl::graphic::loadFromURL(aURL); - if (aGraphic) + if (!aGraphic.IsNone()) { static_cast<SdrGrafObj*>(GetSdrObject())->SetGraphic(aGraphic); bOk = true; @@ -1285,7 +1285,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte if (xGraphic.is()) { Graphic aGraphic = xGraphic; - if (aGraphic) + if (!aGraphic.IsNone()) { static_cast<SdrGrafObj*>(GetSdrObject())->SetGraphic(aGraphic); bOk = true; |