chartpositioning: #i100778# correct ODF behaviour

7 files changed, 14 insertions, 14 deletions

diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 065b268b3b46..7168b2b811a8 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -69,8 +69,8 @@ enum SchXMLChartElemTokenMap
 
 enum SchXMLPlotAreaElemTokenMap
 {
-    XML_TOK_PA_EXCLUDING_POSITION_EXT,
-    XML_TOK_PA_EXCLUDING_POSITION,
+    XML_TOK_PA_COORDINATE_REGION_EXT,
+    XML_TOK_PA_COORDINATE_REGION,
     XML_TOK_PA_AXIS,
     XML_TOK_PA_SERIES,
     XML_TOK_PA_WALL,
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 681aaaeff82e..60e8d054ac8e 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -3098,8 +3098,8 @@ namespace xmloff { namespace token {
         //chart
         XML_NP_CHART_EXT,
         XML_N_CHART_EXT,
-        XML_EXCLUDING_POSITION,
-        XML_PREFER_EXCLUDING_POSITION,
+        XML_COORDINATE_REGION,
+        XML_PREFER_COORDINATE_REGION,
 
         XML_TOKEN_END
     };
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index cc281c165cb3..9f0653cd44d9 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2104,9 +2104,9 @@ void SchXMLExportHelper_Impl::exportExcludingPosition( const uno::Reference< cha
     rtl::OUStringBuffer sStringBuffer;
     SvXMLUnitConverter::convertBool( sStringBuffer, bPreferExcludingPositioning );
     String aString( sStringBuffer.makeStringAndClear() );
-    mrExport.AddAttribute( XML_NAMESPACE_CHART_EXT, XML_PREFER_EXCLUDING_POSITION, aString );//todo: change to chart namespace in future - dependent on fileformat
+    mrExport.AddAttribute( XML_NAMESPACE_CHART_EXT, XML_PREFER_COORDINATE_REGION, aString );//todo: change to chart namespace in future - dependent on fileformat
 
-    SvXMLElementExport aExcludingPosition( mrExport, XML_NAMESPACE_CHART_EXT, XML_EXCLUDING_POSITION, sal_True, sal_True );//todo: change to chart namespace in future - dependent on fileformat
+    SvXMLElementExport aExcludingPosition( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, sal_True, sal_True );//todo: change to chart namespace in future - dependent on fileformat
 }
 
 void SchXMLExportHelper_Impl::exportAxes(
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 501f92953663..587070202c9c 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -281,8 +281,8 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
     {
         static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
 {
-    { XML_NAMESPACE_CHART_EXT,  XML_EXCLUDING_POSITION,     XML_TOK_PA_EXCLUDING_POSITION_EXT },
-    { XML_NAMESPACE_CHART,  XML_EXCLUDING_POSITION,     XML_TOK_PA_EXCLUDING_POSITION },
+    { XML_NAMESPACE_CHART_EXT,  XML_COORDINATE_REGION,      XML_TOK_PA_COORDINATE_REGION_EXT },
+    { XML_NAMESPACE_CHART,  XML_COORDINATE_REGION,      XML_TOK_PA_COORDINATE_REGION },
     { XML_NAMESPACE_CHART,  XML_AXIS,                   XML_TOK_PA_AXIS             },
     { XML_NAMESPACE_CHART,  XML_SERIES,                 XML_TOK_PA_SERIES           },
     { XML_NAMESPACE_CHART,  XML_WALL,                   XML_TOK_PA_WALL             },
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 3792deefebbd..75fc4b2b5cdb 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -520,8 +520,8 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
 
     switch( rTokenMap.Get( nPrefix, rLocalName ))
     {
-        case XML_TOK_PA_EXCLUDING_POSITION_EXT:
-        case XML_TOK_PA_EXCLUDING_POSITION:
+        case XML_TOK_PA_COORDINATE_REGION_EXT:
+        case XML_TOK_PA_COORDINATE_REGION:
         {
             pContext = new SchXMLExcludingPositionContext( GetImport(), nPrefix, rLocalName, m_aInnerPositioning );
         }
@@ -1744,7 +1744,7 @@ bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix
         else
             bReturn = false;
     }
-    else if( IsXMLToken( rLocalName, XML_PREFER_EXCLUDING_POSITION ) )
+    else if( IsXMLToken( rLocalName, XML_PREFER_COORDINATE_REGION ) )
     {
         sal_Bool bPreferExcludingPosition = false;
         m_rImport.GetMM100UnitConverter().convertBool( bPreferExcludingPosition, rValue );
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 4456fbec7cb1..f6e33a946acd 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -716,7 +716,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame:
             if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/300m") ) ) != -1 )
             {
                 sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( lcl_getGeneratorFromModel(xChartModel) );
-                if( nBuilId>0 && nBuilId<9488 ) //9488 is build id of dev300m75
+                if( nBuilId>0 && nBuilId<9491 ) //9491 is build id of dev300m76
                     bResult= true;
             }
             else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/310m") ) ) != -1 )
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 2fb65535964c..2ee9176bb080 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3098,8 +3098,8 @@ namespace xmloff { namespace token {
 
         TOKEN( "chartooo", XML_NP_CHART_EXT ),
         TOKEN( "http://openoffice.org/2010/chart", XML_N_CHART_EXT ),
-        TOKEN( "excluding-position",    XML_EXCLUDING_POSITION ),
-        TOKEN( "prefer-excluding-position",    XML_PREFER_EXCLUDING_POSITION ),
+        TOKEN( "coordinate-region",    XML_COORDINATE_REGION ),
+        TOKEN( "prefer-coordinate-region",    XML_PREFER_COORDINATE_REGION ),
 
 #if OSL_DEBUG_LEVEL > 0
         { 0, NULL, NULL,                       XML_TOKEN_END }