diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 10:19:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 11:53:58 +0100 |
| commit | 004cc81168ce4e9f9b2f8fddf3361f8c23323673 (patch) | |
| tree | 16c7009a3fac88766214ff073cab5562555a2f3a /drawinglayer | |
| parent | 2429c626b4ae5efcd2edf47dabf4add6a7384dff (diff) | |
loplugin:collapseif in dbaccess..lotuswordpro
Change-Id: Ia2a0d25c3833dfde0cd28337361f3cbd2aa29662
Reviewed-on: https://gerrit.libreoffice.org/62934
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/dumper/XShapeDumper.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index e610d9b2d77d..1a97e57f6642 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -1812,13 +1812,10 @@ void dumpXShape(const uno::Reference< drawing::XShape >& xShape, xmlTextWriterPt if(xInfo->hasPropertyByName("Name")) { uno::Any aAny = xPropSet->getPropertyValue("Name"); - if (aAny >>= aName) + if ((aAny >>= aName) && !aName.isEmpty()) { - if (!aName.isEmpty()) - { - xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); - m_bNameDumped = true; - } + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); + m_bNameDumped = true; } } |