diff -cNr old/chart2/source/controller/main/ObjectHierarchy.cxx new/chart2/source/controller/main/ObjectHierarchy.cxx *** old/chart2/source/controller/main/ObjectHierarchy.cxx Wed Aug 22 14:36:06 2007 --- new/chart2/source/controller/main/ObjectHierarchy.cxx Wed Aug 22 15:19:00 2007 *************** *** 282,294 **** bool bHasWall = DiagramHelper::isSupportingFloorAndWall( xDiagram ); if( bSupportsAxesGrids ) { ! Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxisOfDiagram( xDiagram ) ); ! ::std::transform( aAxes.getConstArray(), aAxes.getConstArray() + aAxes.getLength(), ! ::std::back_inserter( rContainer ), ! lcl_ObjectToCID( xChartDoc )); // Grids - Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); for( sal_Int32 nA=0; nA xAxis( aAxes[nA] ); --- 282,315 ---- bool bHasWall = DiagramHelper::isSupportingFloorAndWall( xDiagram ); if( bSupportsAxesGrids ) { ! Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxisOfDiagram( xDiagram ) ); ! Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); ! ! for(sal_Int32 nA = 0; nA xAxis( aAxes[nA] ); ! if( xAxis.is() ) ! { ! try ! { ! Reference< beans::XPropertySet > xAxesProp( xAxis, uno::UNO_QUERY ); ! bool bShow = false; ! if( xAxesProp.is() && ! ( xAxesProp->getPropertyValue( C2U("Show")) >>= bShow ) ! && bShow ) ! { ! rContainer.push_back( ! ObjectIdentifier::createClassifiedIdentifierForAxis( xAxis, xChartModel ) ); ! } ! } ! catch(const uno::Exception & ex) ! { ! ASSERT_EXCEPTION( ex ); ! } ! } ! } // Grids for( sal_Int32 nA=0; nA xAxis( aAxes[nA] ); diff -cNr old/chart2/source/inc/ObjectIdentifier.hxx new/chart2/source/inc/ObjectIdentifier.hxx *** old/chart2/source/inc/ObjectIdentifier.hxx Wed Aug 22 14:36:24 2007 --- new/chart2/source/inc/ObjectIdentifier.hxx Wed Aug 22 15:13:28 2007 *************** *** 151,156 **** --- 151,162 ---- ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc + static rtl::OUString createClassifiedIdentifierForAxis( + const ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XAxis >& xAxis + , const ::com::sun::star::uno::Reference< + ::com::sun::star::frame::XModel >& xChartModel ); + static rtl::OUString createParticleForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram diff -cNr old/chart2/source/tools/ObjectIdentifier.cxx new/chart2/source/tools/ObjectIdentifier.cxx *** old/chart2/source/tools/ObjectIdentifier.cxx Wed Aug 22 14:38:16 2007 --- new/chart2/source/tools/ObjectIdentifier.cxx Wed Aug 22 15:15:08 2007 *************** *** 494,499 **** --- 494,507 ---- return aRet.makeStringAndClear(); } + OUString ObjectIdentifier::createClassifiedIdentifierForAxis( + const Reference< XAxis >& xAxis + , const Reference< frame::XModel >& xChartModel ) + { + rtl::OUString aAxisCID( createClassifiedIdentifierForObject( xAxis,xChartModel ) ); + return aAxisCID; + } + //static OUString ObjectIdentifier::createClassifiedIdentifierForGrid( const Reference< XAxis >& xAxis