[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/plugins/chartshape
From:       Björn Breitmeyer <bjoern.breitmeyer () kdab ! com>
Date:       2010-11-03 15:22:56
Message-ID: 20101103152256.3A417AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192625 by breitmeyer:

fixed not correctly set category axes, if the selection is not set
correctly, and this should make no difference, if the plotarea
proxymodel gets a category data set it should be set in any case


 M  +6 -0      Axis.cpp  
 M  +4 -0      ChartProxyModel.cpp  


--- trunk/koffice/plugins/chartshape/Axis.cpp #1192624:1192625
@@ -1452,6 +1452,12 @@
     bodyWriter.addAttributePt( "svg:y", d->title->position().y() );
     bodyWriter.addAttributePt( "svg:width", d->title->size().width() );
     bodyWriter.addAttributePt( "svg:height", d->title->size().height() );
+    if ( plotArea()->proxyModel()->categoryDataRegion().isValid() )
+    {
+        bodyWriter.startElement( "chart:categories" );
+          bodyWriter.addAttribute( "table:cell-range-address", \
plotArea()->proxyModel()->categoryDataRegion().toString() ); +        \
bodyWriter.endElement(); +    }
 
     bodyWriter.startElement( "text:p" );
     bodyWriter.addTextNode( d->titleData->document()->toPlainText() );
--- trunk/koffice/plugins/chartshape/ChartProxyModel.cpp #1192624:1192625
@@ -507,6 +507,10 @@
                 dataSet = new DataSet( d->dataSets.size() );
             }
             d->dataSets.append( dataSet );
+            if ( d->categoryDataRegion.isValid() )
+            {
+                dataSet->setCategoryDataRegion( d->categoryDataRegion );
+            }
             dataSet->loadOdf( n, context );
             if ( penLoaded )
                 dataSet->setPen( p );


[prev in list] [next in list] [prev in thread] [next in thread]