diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:44:02 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:44:02 +0000 |
commit | f4b03a606f8698f3556f694105727031b9626620 (patch) | |
tree | 66ce93322660bf8818b3a70cd0a73072e79beee4 | |
parent | e0e66ef4339e00853031347ce9f9e6ddb2af3aa1 (diff) |
INTEGRATION: CWS calc26 (1.26.86); FILE MERGED
2004/12/02 13:07:29 nn 1.26.86.2: RESYNC: (1.26-1.27); FILE MERGED
2004/12/01 19:28:46 nn 1.26.86.1: #i37941# TransferDrawPage: check IsValid before adjusting chart source data
-rw-r--r-- | sc/source/core/data/documen9.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 98a202bf8b59..9d3b664cd792 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen9.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 09:20:02 $ + * last change: $Author: vg $ $Date: 2004-12-23 10:44:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ #include <com/sun/star/uno/Reference.hxx> #endif @@ -238,7 +237,8 @@ void ScDocument::TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDes { ScChartArray aArray( this, *pChartData ); // parses range description ScRangeListRef xRanges = aArray.GetRangeList(); - if ( xRanges.Is() ) + // #i37941# have to check IsValid, to skip a chart with its own data + if ( aArray.IsValid() && xRanges.Is() ) { ScRangeListRef xNewRanges = new ScRangeList( *xRanges ); if ( lcl_AdjustRanges( *xNewRanges, |