summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-07-13 07:04:39 +0000
committerRüdiger Timm <rt@openoffice.org>2004-07-13 07:04:39 +0000
commit4908e28420b5e85c58da6e03219d3cd8288089fb (patch)
tree527ac838b6b20becda36745aff6f6039e4464024
parent7ca374c789ab795e470f3436b2e02fb14e5532e7 (diff)
INTEGRATION: CWS oasis (1.5.274); FILE MERGED
2004/05/07 11:59:52 mib 1.5.274.3: - #i20153#: encode/decode style names (ooo2oasis missing) 2004/04/21 07:27:19 mib 1.5.274.2: - separated attribute lists for <*-properties> elements on import (#i20153#) - replaced "style:text-backgroubnd-color" with "fo:background-color" 2004/04/07 11:49:52 mib 1.5.274.1: splitted <properties>
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx37
1 files changed, 26 insertions, 11 deletions
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 9cd9f53b5a4c..4cefa1f454c9 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLChartStyleContext.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: bm $ $Date: 2001-08-14 11:47:26 $
+ * last change: $Author: rt $ $Date: 2004-07-13 08:04:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -78,6 +78,10 @@
using namespace com::sun::star;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_DATA_STYLE_NAME;
+using ::xmloff::token::XML_TEXT_PROPERTIES;
+using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
+using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
+using ::xmloff::token::XML_CHART_PROPERTIES;
TYPEINIT1( XMLChartStyleContext, XMLPropStyleContext );
@@ -91,7 +95,7 @@ void XMLChartStyleContext::SetAttribute(
{
if( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) )
{
- msDataStyleName = rValue;
+ msDataStyleName =rValue;
}
else
{
@@ -142,15 +146,26 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext(
{
SvXMLImportContext* pContext = NULL;
- if( XML_NAMESPACE_STYLE == nPrefix &&
- IsXMLToken( rLocalName, ::xmloff::token::XML_PROPERTIES ) )
+ if( XML_NAMESPACE_STYLE == nPrefix )
{
- UniReference < SvXMLImportPropertyMapper > xImpPrMap =
- GetStyles()->GetImportPropertyMapper( GetFamily() );
- if( xImpPrMap.is() )
- pContext = new XMLChartPropertyContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
- GetProperties(), xImpPrMap );
+ sal_uInt32 nFamily = 0;
+ if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) )
+ nFamily = XML_TYPE_PROP_TEXT;
+ else if( IsXMLToken( rLocalName, XML_PARAGRAPH_PROPERTIES ) )
+ nFamily = XML_TYPE_PROP_PARAGRAPH;
+ else if( IsXMLToken( rLocalName, XML_GRAPHIC_PROPERTIES ) )
+ nFamily = XML_TYPE_PROP_GRAPHIC;
+ else if( IsXMLToken( rLocalName, XML_CHART_PROPERTIES ) )
+ nFamily = XML_TYPE_PROP_CHART;
+ if( nFamily )
+ {
+ UniReference < SvXMLImportPropertyMapper > xImpPrMap =
+ GetStyles()->GetImportPropertyMapper( GetFamily() );
+ if( xImpPrMap.is() )
+ pContext = new XMLChartPropertyContext(
+ GetImport(), nPrefix, rLocalName, xAttrList, nFamily,
+ GetProperties(), xImpPrMap );
+ }
}
if( !pContext )