INTEGRATION: CWS chart2mst3 (1.44.46); FILE MERGED

2007/05/14 19:12:07 bm 1.44.46.6: RESYNC: (1.44-1.45); FILE MERGED
2007/01/29 14:06:54 tl 1.44.46.5: #i55007#, #i73791# automatic update for charts, and update charts for undo-actions
2006/12/12 16:43:13 tl 1.44.46.4: #i71244# update charts in writer
2006/12/11 15:23:38 tl 1.44.46.3: #i71244# update charts in writer
2006/12/07 11:20:47 tl 1.44.46.2: #i71244# update chart in writer
2006/11/10 13:47:53 tl 1.44.46.1: #i71245#, #i69313#; old chart removed, fixed incorrectly shown default chart
This commit is contained in:
Vladimir Glazounov 2007-05-22 15:26:54 +00:00
parent dff770ddb2
commit 90f356b278

View file

@ -4,9 +4,9 @@
*
* $RCSfile: editsh.cxx,v $
*
* $Revision: 1.45 $
* $Revision: 1.46 $
*
* last change: $Author: rt $ $Date: 2007-04-25 09:03:00 $
* last change: $Author: vg $ $Date: 2007-05-22 16:26:54 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -49,9 +49,6 @@
#ifndef _VCL_CMDEVT_HXX //autogen
#include <vcl/cmdevt.hxx>
#endif
#ifndef _SCH_DLL_HXX //autogen
#include <sch/schdll.hxx>
#endif
#ifndef _UNOTOOLS_CHARCLASS_HXX
#include <unotools/charclass.hxx>
#endif
@ -146,6 +143,9 @@
#ifndef _SECTION_HXX
#include <section.hxx>
#endif
#ifndef _UNOCHART_HXX
#include <unochart.hxx>
#endif
using namespace com::sun::star;
@ -563,11 +563,10 @@ const String& SwEditShell::GetChartName( const uno::Reference < embed::XEmbedded
return aEmptyStr;
}
void SwEditShell::UpdateChartData( const String &rName, SchMemChart *&pData )
void SwEditShell::UpdateChartData( const String &rName )
{
//Fuer das Update brauchen wir die SwTable. Also muessen wir ggf. die
//gewuenschte Table anspringen.
String sSelection;
const SwTableNode *pTblNd = IsCrsrInTbl();
if( !pTblNd || rName != pTblNd->GetTable().GetFrmFmt()->GetName() )
{
@ -576,11 +575,9 @@ void SwEditShell::UpdateChartData( const String &rName, SchMemChart *&pData )
pTblNd = IsCrsrInTbl();
Pop( FALSE );
}
else if( IsTableMode() )
sSelection = GetBoxNms();
if( pTblNd )
pData = pTblNd->GetTable().UpdateData( pData, &sSelection );
pTblNd->GetTable().UpdateCharts();
}