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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 8abcf7c64416..a34a47cf1847 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1371,7 +1371,7 @@ void EscherPropertyContainer::CreateEmbeddedBitmapProperties( if (!xGraphic.is()) return; const Graphic aGraphic(xGraphic); - if (!aGraphic) + if (aGraphic.IsNone()) return; const GraphicObject aGraphicObject(aGraphic); if (aGraphicObject.GetType() == GraphicType::NONE) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 82a1abc20407..4caf50622d7f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6588,7 +6588,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool // size to the size of this record. sal_uInt64 maxSize = pGrStream == &rBLIPStream ? nLength : 0; Graphic aGraphic = rGF.ImportUnloadedGraphic(*pGrStream, maxSize); - if (aGraphic) + if (!aGraphic.IsNone()) { rData = aGraphic; nRes = ERRCODE_NONE; |