diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 17:13:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 17:13:11 +0000 |
| commit | 69009541ffc0f8499ef93c6cda577c78eb6c0a5d (patch) | |
| tree | d2f03c78fccaf208d458fcc1601f93979aab5c2a /svx | |
| parent | b88528343f7a1164635a6da4d1334b7680f0913b (diff) | |
INTEGRATION: CWS presentationengine01 (1.40.116); FILE MERGED
2004/11/17 14:08:03 thb 1.40.116.4: RESYNC: (1.44-1.46); FILE MERGED
2004/08/23 13:46:56 thb 1.40.116.3: RESYNC: (1.43-1.44); FILE MERGED
2004/07/06 17:07:45 thb 1.40.116.2: RESYNC: (1.40-1.43); FILE MERGED
2004/06/29 11:32:30 sj 1.40.116.1: GetShapeId is now public
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/msfilter/escherex.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx index 75076ca7a631..5cbb0c962cd7 100644 --- a/svx/source/msfilter/escherex.cxx +++ b/svx/source/msfilter/escherex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: escherex.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: rt $ $Date: 2004-11-26 14:28:12 $ + * last change: $Author: rt $ $Date: 2004-11-26 18:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -4069,10 +4069,10 @@ void EscherSolverContainer::AddConnector( const ::com::sun::star::uno::Reference maConnectorList.Insert( new EscherConnectorListEntry( rConnector, rPA, rConA, rPB, rConB ), LIST_APPEND ); } -sal_uInt32 EscherSolverContainer::ImplGetId( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) +sal_uInt32 EscherSolverContainer::GetShapeId( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) const { - for ( EscherShapeListEntry* pPtr = (EscherShapeListEntry*)maShapeList.First(); - pPtr; pPtr = (EscherShapeListEntry*)maShapeList.Next() ) + for ( EscherShapeListEntry* pPtr = (EscherShapeListEntry*)((List&)maShapeList).First(); + pPtr; pPtr = (EscherShapeListEntry*)((List&)maShapeList).Next() ) { if ( rXShape == pPtr->aXShape ) return ( pPtr->n_EscherId ); @@ -4098,9 +4098,9 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) pPtr; pPtr = (EscherConnectorListEntry*)maConnectorList.Next() ) { aConnectorRule.ncptiA = aConnectorRule.ncptiB = 0xffffffff; - aConnectorRule.nShapeC = ImplGetId( pPtr->mXConnector ); - aConnectorRule.nShapeA = ImplGetId( pPtr->mXConnectToA ); - aConnectorRule.nShapeB = ImplGetId( pPtr->mXConnectToB ); + aConnectorRule.nShapeC = GetShapeId( pPtr->mXConnector ); + aConnectorRule.nShapeA = GetShapeId( pPtr->mXConnectToA ); + aConnectorRule.nShapeB = GetShapeId( pPtr->mXConnectToB ); if ( aConnectorRule.nShapeC ) { |