diff options
| author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2021-06-29 11:10:41 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-07-01 11:00:53 +0200 |
| commit | f63c56f87294d87275b409f6b39b7fcdc0b2be92 (patch) | |
| tree | 93870cff60359008573b83dabd04e0da6aebdf65 /oox | |
| parent | 5398a6e36489bd68ba31e834833d39fa7de1cbad (diff) | |
address style concerns and better practices for pptx footer export
Change-Id: I9954141fb24022487983f2f6ed37e3df2a98c482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118072
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textcharacterpropertiescontext.cxx | 6 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 12 | ||||
| -rw-r--r-- | oox/source/export/shapes.cxx | 3 |
3 files changed, 12 insertions, 9 deletions
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 9363a69673bb..ce2ac6a4a119 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -50,11 +50,13 @@ TextCharacterPropertiesContext::TextCharacterPropertiesContext( int nVisualTokenAmount = sax_fastparser::castToFastAttributeList( rAttribs.getFastAttributeList() ).getFastAttributeTokens().size(); - if ( rAttribs.hasAttribute( XML_lang ) ){ + if ( rAttribs.hasAttribute( XML_lang ) ) + { mrTextCharacterProperties.moLang = rAttribs.getString( XML_lang ); --nVisualTokenAmount; // Not a visual attribute } - if ( rAttribs.hasAttribute( XML_altLang )){ + if ( rAttribs.hasAttribute( XML_altLang )) + { --nVisualTokenAmount; // Not a visual attribute } if ( rAttribs.hasAttribute( XML_sz ) ) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 72d7b6d67a37..455e50159612 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2938,20 +2938,20 @@ void DrawingML::WriteLstStyles(const css::uno::Reference<css::text::XTextContent bool& rbOverridingCharHeight, sal_Int32& rnCharHeight, const css::uno::Reference<css::beans::XPropertySet>& rXShapePropSet) { - Reference<XEnumerationAccess> access(rParagraph, UNO_QUERY); - if (!access.is()) + Reference<XEnumerationAccess> xAccess(rParagraph, UNO_QUERY); + if (!xAccess.is()) return; - Reference<XEnumeration> enumeration(access->createEnumeration()); - if (!enumeration.is()) + Reference<XEnumeration> xEnumeration(xAccess->createEnumeration()); + if (!xEnumeration.is()) return; Reference<XTextRange> rRun; - if (enumeration->hasMoreElements()) + if (xEnumeration->hasMoreElements()) { - Any aAny(enumeration->nextElement()); + Any aAny(xEnumeration->nextElement()); if (aAny >>= rRun) { float fFirstCharHeight = rnCharHeight / 1000.; diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 32732178bef5..795c864bc600 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1590,7 +1590,8 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference< XInterface >& xIface, s pFS->startElementNS(nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx)); - WriteText( xIface, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX), true, 0, bWritePropertiesAsLstStyles ); + WriteText(xIface, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX), /*bText=*/true, + /*nXmlNamespace=*/0, /*bWritePropertiesAsLstStyles=*/bWritePropertiesAsLstStyles); pFS->endElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx) ); if (GetDocumentType() == DOCUMENT_DOCX) WriteText( xIface, /*bBodyPr=*/true, /*bText=*/false, /*nXmlNamespace=*/nXmlNamespace ); |