diff options
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index da9fe7f0e438..056c3ce98267 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1439,8 +1439,9 @@ void XMLShapeExport::ExportGraphicDefaults() { aStEx->exportDefaultStyle( xDefaults, XML_STYLE_FAMILY_SD_GRAPHICS_NAME, xPropertySetMapper ); - // write graphic family styles + // write graphic styles (family name differs depending on the module) aStEx->exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XmlStyleFamily::SD_GRAPHICS_ID); + aStEx->exportStyleFamily("GraphicStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XmlStyleFamily::SD_GRAPHICS_ID); } } catch(const lang::ServiceNotRegisteredException&) diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 266135bad479..22f9d7ddb0a1 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -671,7 +671,11 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) else { // get graphics family - xFamilies->getByName("graphics") >>= xFamily; + if (xFamilies->hasByName("graphics")) + xFamilies->getByName("graphics") >>= xFamily; + else + xFamilies->getByName("GraphicStyles") >>= xFamily; + aStyleName = GetImport().GetStyleDisplayName( XmlStyleFamily::SD_GRAPHICS_ID, aStyleName ); |