diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-07 17:06:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-07 19:27:29 +0100 |
| commit | 1eb67b0d7ea8e428a576184156b8be3ad0f2b752 (patch) | |
| tree | bb835ddae0ad76f7eacc57475afd6dbbc1671957 /sw | |
| parent | 105ebb9c0adcf421b0b89600216aa18041c179e3 (diff) | |
ww8 export: indentation fixes
Change-Id: I0416b782ff04e060a03b4e0494513f16bda14d6b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 27 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 4 |
2 files changed, 15 insertions, 16 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 6b191ea6b4ce..16770aecb975 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4285,19 +4285,19 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& r */ void DocxAttributeOutput::WritePostponedChart() { - if(m_postponedChart == NULL) - return; - uno::Reference< chart2::XChartDocument > xChartDoc; - uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(m_postponedChart)->getUnoShape(), uno::UNO_QUERY ); - if( xShape.is() ) - { - uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); - if( xPropSet.is() ) - xChartDoc.set( xPropSet->getPropertyValue( "Model" ), uno::UNO_QUERY ); - } + if(m_postponedChart == NULL) + return; + uno::Reference< chart2::XChartDocument > xChartDoc; + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(m_postponedChart)->getUnoShape(), uno::UNO_QUERY ); + if( xShape.is() ) + { + uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); + if( xPropSet.is() ) + xChartDoc.set( xPropSet->getPropertyValue( "Model" ), uno::UNO_QUERY ); + } - if( xChartDoc.is() ) - { + if( xChartDoc.is() ) + { OSL_TRACE("DocxAttributeOutput::WriteOLE2Obj: export chart "); m_pSerializer->startElementNS( XML_w, XML_drawing, FSEND ); @@ -4360,8 +4360,7 @@ void DocxAttributeOutput::WritePostponedChart() m_pSerializer->endElementNS( XML_w, XML_drawing ); } - m_postponedChart = NULL; - return; + m_postponedChart = NULL; } bool DocxAttributeOutput::WriteOLEMath( const SdrObject*, const SwOLENode& rOLENode, const Size& ) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 574215e6b16b..49fb11177c30 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -259,8 +259,8 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRec EscherPropSortStruct aSegments; if (rProps.GetOpt(ESCHER_Prop_pVertices, aVertices) && - rProps.GetOpt(ESCHER_Prop_pSegmentInfo, aSegments) && - aVertices.nPropSize >= 6 && aSegments.nPropSize >= 6) + rProps.GetOpt(ESCHER_Prop_pSegmentInfo, aSegments) && + aVertices.nPropSize >= 6 && aSegments.nPropSize >= 6) { const sal_uInt8* pVerticesIt = aVertices.pBuf + 6; sal_Size nVerticesPos = 6; |