diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-17 16:02:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-18 08:51:07 +0200 |
commit | 7477ab139142c55da6a7d4fb10903dcb464ee97b (patch) | |
tree | 7761955992cff3a8070c4e2860d9524ea7315c04 /xmloff/source/draw | |
parent | 281fa6ac6a7df48dd65f5019d5a74148a096e253 (diff) |
loplugin:inlineablemethods in xmloff
Change-Id: I22202f85c65a862ccdafe1d521e2945e3d99252a
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/animationexport.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp_impl.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/xexptran.cxx | 18 |
5 files changed, 5 insertions, 27 deletions
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 9dcfa584d7f2..88ba4da34785 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -518,7 +518,6 @@ public: static void convertPath( OUStringBuffer& sTmp, const Any& rPath ); void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const; void convertTiming( OUStringBuffer& sTmp, const Any& rTiming ) const; - void convertSource( OUStringBuffer& sTmp, const Any& rSource ) const; void convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const; void prepareValue( const Any& rValue ); @@ -1564,7 +1563,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa { if( pEvent->Source.hasValue() ) { - convertSource( sTmp, pEvent->Source ); + convertTarget( sTmp, pEvent->Source ); sTmp.append( '.' ); } @@ -1589,11 +1588,6 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa } } -void AnimationsExporterImpl::convertSource( OUStringBuffer& sTmp, const Any& rSource ) const -{ - convertTarget( sTmp, rSource ); -} - void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const { if( !rTarget.hasValue() ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index fa523c29b1cd..92d40d4643e9 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -641,7 +641,7 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName, uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentProperties> const xDocProps( - (IsStylesOnlyMode()) ? nullptr : xDPS->getDocumentProperties()); + !mbLoadDoc ? nullptr : xDPS->getDocumentProperties()); pContext = new SvXMLMetaDocumentContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xDocProps); diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 1fc6e3efec80..06fe67013a75 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -218,8 +218,6 @@ public: // Styles and AutoStyles contexts - bool IsStylesOnlyMode() const { return !mbLoadDoc; } - const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); const SvXMLTokenMap& GetStylesElemTokenMap(); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 504c4b90f03d..0fd26d7927ef 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -704,7 +704,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } // export layer information - if( IsLayerExportEnabled() ) + if( mbExportLayer ) { // check for group or scene shape and not export layer if this is one uno::Reference< drawing::XShapes > xShapes( xShape, uno::UNO_QUERY ); diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index f87f33d54714..925d7966958d 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -224,13 +224,6 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase : ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {} }; -// delete all entries in list - -void SdXMLImExTransform2D::EmptyList() -{ - maList.clear(); -} - // add members void SdXMLImExTransform2D::AddRotate(double fNew) @@ -357,7 +350,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv) { msString = rNew; - EmptyList(); + maList.clear(); if(!msString.isEmpty()) { @@ -602,13 +595,6 @@ struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase : ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {} }; -// delete all entries in list - -void SdXMLImExTransform3D::EmptyList() -{ - maList.clear(); -} - // add members void SdXMLImExTransform3D::AddMatrix(const ::basegfx::B3DHomMatrix& rNew) @@ -777,7 +763,7 @@ SdXMLImExTransform3D::SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnit void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv) { msString = rNew; - EmptyList(); + maList.clear(); if(!msString.isEmpty()) { |