Skip to content

C
core
Kaydet (Commit) 7d603d97 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

loplugin:defaultparams 

Change-Id: Id2c0a8dbfe7110f816360ca9eb2bbca8e2f55a30
üst 788638af
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
oox/source/export/shapes.cxx
Dosyayı görüntüle @ 7d603d97
...@@ -576,7 +576,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape ) ...@@ -576,7 +576,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
// visual shape properties // visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
WriteShapeTransformation( xShape, XML_a, false, false); WriteShapeTransformation( xShape, XML_a );
WritePresetShape( "ellipse" ); WritePresetShape( "ellipse" );
Reference< XPropertySet > xProps( xShape, UNO_QUERY ); Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() ) if( xProps.is() )
...@@ -684,7 +684,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const ...@@ -684,7 +684,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
// visual shape properties // visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
WriteShapeTransformation( xShape, XML_a, false, false); WriteShapeTransformation( xShape, XML_a );
WritePresetShape( "rect" ); WritePresetShape( "rect" );
// graphic object can come with the frame (bnc#654525) // graphic object can come with the frame (bnc#654525)
WriteOutline( xShapeProps ); WriteOutline( xShapeProps );
...@@ -899,7 +899,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape ) ...@@ -899,7 +899,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
// visual shape properties // visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
WriteShapeTransformation( xShape, XML_a, false, false); WriteShapeTransformation( xShape, XML_a );
WritePresetShape( nRadius == 0 ? "rect" : "roundRect" ); WritePresetShape( nRadius == 0 ? "rect" : "roundRect" );
Reference< XPropertySet > xProps( xShape, UNO_QUERY ); Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() ) if( xProps.is() )
...@@ -998,7 +998,7 @@ ShapeExport& ShapeExport::WriteTextBox( Reference< XInterface > xIface, sal_Int3 ...@@ -998,7 +998,7 @@ ShapeExport& ShapeExport::WriteTextBox( Reference< XInterface > xIface, sal_Int3
FSHelperPtr pFS = GetFS(); FSHelperPtr pFS = GetFS();
pFS->startElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx), FSEND ); pFS->startElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx), FSEND );
WriteText( xIface, m_presetWarp, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX), /*bText=*/true ); WriteText( xIface, m_presetWarp, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX) );
pFS->endElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx) ); pFS->endElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_txBody : XML_txbx) );
if (GetDocumentType() == DOCUMENT_DOCX) if (GetDocumentType() == DOCUMENT_DOCX)
WriteText( xIface, m_presetWarp, /*bBodyPr=*/true, /*bText=*/false, /*nXmlNamespace=*/nXmlNamespace ); WriteText( xIface, m_presetWarp, /*bBodyPr=*/true, /*bText=*/false, /*nXmlNamespace=*/nXmlNamespace );
...@@ -1311,7 +1311,7 @@ ShapeExport& ShapeExport::WriteTableShape( Reference< XShape > xShape ) ...@@ -1311,7 +1311,7 @@ ShapeExport& ShapeExport::WriteTableShape( Reference< XShape > xShape )
FSEND ); FSEND );
pFS->endElementNS( mnXmlNamespace, XML_nvGraphicFramePr ); pFS->endElementNS( mnXmlNamespace, XML_nvGraphicFramePr );
WriteShapeTransformation( xShape, mnXmlNamespace, false); WriteShapeTransformation( xShape, mnXmlNamespace );
WriteTable( xShape ); WriteTable( xShape );
pFS->endElementNS( mnXmlNamespace, XML_graphicFrame ); pFS->endElementNS( mnXmlNamespace, XML_graphicFrame );
...@@ -1340,7 +1340,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape ) ...@@ -1340,7 +1340,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
// visual shape properties // visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
WriteShapeTransformation( xShape, XML_a, false, false); WriteShapeTransformation( xShape, XML_a );
WritePresetShape( "rect" ); WritePresetShape( "rect" );
uno::Reference<beans::XPropertySet> xPropertySet(xShape, UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(xShape, UNO_QUERY);
WriteBlipOrNormalFill(xPropertySet, "GraphicURL"); WriteBlipOrNormalFill(xPropertySet, "GraphicURL");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment