← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kchart/kdchart/src/KDChartAbstractCoordinatePlane.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
kchart/kdchart/src/KDChartAbstractCoordinatePlane.cpp
21
21
 **
22
22
 **********************************************************************/
23
23
 
 
24
#include "KDChartAbstractCoordinatePlane.h"
 
25
#include "KDChartAbstractCoordinatePlane_p.h"
24
26
 
25
27
#include <QGridLayout>
26
28
#include <QRubberBand>
27
29
#include <QMouseEvent>
28
30
 
29
31
#include "KDChartChart.h"
30
 
#include "KDChartAbstractCoordinatePlane.h"
31
 
#include "KDChartAbstractCoordinatePlane_p.h"
32
32
#include "KDChartGridAttributes.h"
33
33
 
34
34
#include <KDABLibFakes>
90
90
    if( diagram && oldDiagram_ != diagram ){
91
91
        AbstractDiagram* oldDiagram = oldDiagram_;
92
92
        if( d->diagrams.count() ){
93
 
            if( ! oldDiagram )
 
93
            if( ! oldDiagram ){
94
94
                oldDiagram = d->diagrams.first();
 
95
                if( oldDiagram == diagram )
 
96
                    return;
 
97
            }
95
98
            takeDiagram( oldDiagram );
96
99
        }
97
100
        delete oldDiagram;
411
414
    }
412
415
}
413
416
 
414
 
const bool KDChart::AbstractCoordinatePlane::isVisiblePoint( const QPointF& point ) const
 
417
#if QT_VERSION < 0x040400 || defined(Q_COMPILER_MANGLES_RETURN_TYPE)
 
418
const
 
419
#endif
 
420
bool KDChart::AbstractCoordinatePlane::isVisiblePoint( const QPointF& point ) const
415
421
{
416
422
    return d->isVisiblePoint( this, point );
417
423
}