diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-12-29 10:42:17 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-01-19 06:42:16 +0100 |
| commit | 97dfcf4d7d5bf9249926a05d9e69720921159f43 (patch) | |
| tree | 8b32fd94dc76ddb43f6e359f02de62820e40ad42 /vcl/source/filter/graphicfilter.cxx | |
| parent | e49dbc6c7ebae0162b6e1d7c5d0bdf3152c1814e (diff) | |
vcl: remove or rename too long methods names in VectorGraphicData
Change-Id: I8a64d27927b608afdc7996e0b0bbc59a58fde90f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108443
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/filter/graphicfilter.cxx')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 7f7af5239cad..51ba7859f7ac 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2002,9 +2002,8 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r // VectorGraphicDataType::Wmf means WMF or EMF, allow direct write in the WMF case // only. if (rVectorGraphicDataPtr - && rVectorGraphicDataPtr->getVectorGraphicDataArrayLength() - && VectorGraphicDataType::Wmf - == rVectorGraphicDataPtr->getVectorGraphicDataType() + && rVectorGraphicDataPtr->getType() == VectorGraphicDataType::Wmf + && !rVectorGraphicDataPtr->getBinaryDataContainer().isEmpty() && !bIsEMF) { auto & aDataContainer = rVectorGraphicDataPtr->getBinaryDataContainer(); @@ -2038,8 +2037,8 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r auto const & rVectorGraphicDataPtr(rGraphic.getVectorGraphicData()); if (rVectorGraphicDataPtr - && rVectorGraphicDataPtr->getVectorGraphicDataArrayLength() - && VectorGraphicDataType::Emf == rVectorGraphicDataPtr->getVectorGraphicDataType()) + && rVectorGraphicDataPtr->getType() == VectorGraphicDataType::Emf + && !rVectorGraphicDataPtr->getBinaryDataContainer().isEmpty()) { auto & aDataContainer = rVectorGraphicDataPtr->getBinaryDataContainer(); rOStm.WriteBytes(aDataContainer.getData(), aDataContainer.getSize()); @@ -2133,8 +2132,8 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r auto const & rVectorGraphicDataPtr(rGraphic.getVectorGraphicData()); if (rVectorGraphicDataPtr - && rVectorGraphicDataPtr->getVectorGraphicDataArrayLength() - && VectorGraphicDataType::Svg == rVectorGraphicDataPtr->getVectorGraphicDataType()) + && rVectorGraphicDataPtr->getType() == VectorGraphicDataType::Svg + && !rVectorGraphicDataPtr->getBinaryDataContainer().isEmpty()) { auto & aDataContainer = rVectorGraphicDataPtr->getBinaryDataContainer(); rOStm.WriteBytes(aDataContainer.getData(), aDataContainer.getSize()); |