diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-07 13:03:58 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-06-08 01:29:32 +0200 |
| commit | 5708534b942c1d0ce384f6a8473da6bb569410e7 (patch) | |
| tree | 2ec4fe87624541c15bf89c8b839e8f8dba8a89f4 /vcl | |
| parent | 1e55a47e89a9d9d6cf9cb3993484022aaf2c097b (diff) | |
look for unnecessary calls to Reference::is() after an UNO_QUERY_THROW
Since the previous call would throw if there was nothing to be assigned
to the value.
Idea from tml.
Used the following script to find places:
git grep -A3 -n UNO_QUERY_THROW | grep -B3 -F 'is()'
Change-Id: I36ba7b00bcd014bdf16c0455ab91056f82194969
Reviewed-on: https://gerrit.libreoffice.org/55417
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/vectorgraphicdata.cxx | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index eab36e467ac5..40f6c3d7258b 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -102,11 +102,7 @@ void loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx& rBitmapEx, if (xBitmap.is()) { const css::uno::Reference<css::rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); - - if (xIntBmp.is()) - { - rBitmapEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp); - } + rBitmapEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp); } } diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx index 24aea9c34ffc..434736526294 100644 --- a/vcl/source/gdi/vectorgraphicdata.cxx +++ b/vcl/source/gdi/vectorgraphicdata.cxx @@ -73,11 +73,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx( if(xBitmap.is()) { const uno::Reference< rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); - - if(xIntBmp.is()) - { - aRetval = vcl::unotools::bitmapExFromXBitmap(xIntBmp); - } + aRetval = vcl::unotools::bitmapExFromXBitmap(xIntBmp); } } catch (const uno::Exception& e) |