diff options
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport4.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 7 |
4 files changed, 13 insertions, 6 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 9dc41e6d88dd..a2886103a04d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -380,6 +380,8 @@ void SvXMLExport::_InitCtor() } } if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) + mpNamespaceMap->Add( + GetXMLToken(XML_NP_DRAW_EXT), GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT); { mpNamespaceMap->Add( GetXMLToken(XML_NP_MATH), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH ); mpNamespaceMap->Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index ce4d4180a24c..8927e922d470 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -641,11 +641,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent GetXMLToken(XML_NP_OFFICE_EXT), GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT); - - _GetNamespaceMap().Add( - GetXMLToken(XML_NP_DRAW_EXT), - GetXMLToken(XML_N_DRAW_EXT), - XML_NAMESPACE_DRAW_EXT); } GetShapeExport()->enableLayerExport(); diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index aa4701d36993..43e75f97e72c 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -329,6 +329,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, rtl::OUString aStr; rtl::OUStringBuffer aStrBuffer; + sal_uInt16 aNamespace = XML_NAMESPACE_DRAW; sal_Int32 i, j, k, l; @@ -413,6 +414,8 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, aStrBuffer.append( (sal_Unicode)'Y' ); nParameter = 1; break; case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break; + case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : + aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2; aNamespace = XML_NAMESPACE_DRAW_EXT; break; default : // ups, seems to be something wrong { @@ -442,7 +445,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, } } aStr = aStrBuffer.makeStringAndClear(); - rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr ); + rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr ); } void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< beans::XPropertySet >& xPropSet ) diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 0736fe30a2be..f8966a1f275f 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -667,6 +667,13 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest nIndex++; } break; + case 'G' : + { + nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO; + nParametersNeeded = 2; + nIndex++; + } + break; case 'W' : { nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; |