From 70346a32723a3f3c1cbfedd2c6096152260ef9f7 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 07:35:04 +0000 Subject: CWS-TOOLING: integrate CWS chart30 --- chart2/source/tools/AxisHelper.cxx | 4 +- chart2/source/tools/CachedDataSequence.cxx | 68 +------- chart2/source/tools/ChartDebugTrace.cxx | 5 +- chart2/source/tools/CommonConverters.cxx | 189 +-------------------- chart2/source/tools/ConfigColorScheme.cxx | 9 +- chart2/source/tools/ContextHelper.cxx | 64 ------- chart2/source/tools/DataSeriesHelper.cxx | 13 +- chart2/source/tools/DataSource.cxx | 28 +--- chart2/source/tools/DataSourceHelper.cxx | 58 +------ chart2/source/tools/DiagramHelper.cxx | 88 +--------- chart2/source/tools/ImplUndoManager.cxx | 7 +- chart2/source/tools/ImplUndoManager.hxx | 3 +- chart2/source/tools/LabeledDataSequence.cxx | 7 +- chart2/source/tools/MediaDescriptorHelper.cxx | 23 +-- chart2/source/tools/ModifyListenerHelper.cxx | 53 +----- chart2/source/tools/OEnumeration.cxx | 67 -------- chart2/source/tools/OIndexContainer.cxx | 183 -------------------- chart2/source/tools/OStyle.cxx | 233 -------------------------- chart2/source/tools/ObjectIdentifier.cxx | 36 +--- chart2/source/tools/RangeHighlighter.cxx | 21 +-- chart2/source/tools/ReferenceSizeProvider.cxx | 44 ++--- chart2/source/tools/RegressionCurveHelper.cxx | 8 +- chart2/source/tools/TitleHelper.cxx | 52 +----- chart2/source/tools/WeakListenerAdapter.cxx | 12 +- chart2/source/tools/makefile.mk | 6 +- 25 files changed, 40 insertions(+), 1241 deletions(-) (limited to 'chart2/source/tools') diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 580b1516a372..c433292fe6ee 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AxisHelper.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * * This file is part of OpenOffice.org. * @@ -134,7 +134,7 @@ Reference< XAxis > AxisHelper::createAxis( // set correct initial AutoScale if( pRefSizeProvider ) - pRefSizeProvider->setValuesAtPropertySet( xProp, ReferenceSizeProvider::REF_DIAGRAM ); + pRefSizeProvider->setValuesAtPropertySet( xProp ); } catch( uno::Exception& e ) { diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 1542b586bc72..68cbcb50caa7 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CachedDataSequence.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.24.1 $ * * This file is part of OpenOffice.org. * @@ -201,24 +201,6 @@ void CachedDataSequence::registerProperties() ::getCppuType( & m_aHiddenValues ) ); } -void CachedDataSequence::PreferMixedData() -{ - if( m_eCurrentDataType != MIXED ) - Impl_setMixedData( Impl_getMixedData() ); -} - -void CachedDataSequence::PreferNumericalData() -{ - if( m_eCurrentDataType != NUMERICAL ) - Impl_setNumericalData( Impl_getNumericalData() ); -} - -void CachedDataSequence::PreferTextualData() -{ - if( m_eCurrentDataType != TEXTUAL ) - Impl_setTextualData( Impl_getTextualData() ); -} - Sequence< double > CachedDataSequence::Impl_getNumericalData() const { if( m_eCurrentDataType == NUMERICAL ) @@ -311,39 +293,6 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const return aResult; } -void CachedDataSequence::Impl_setNumericalData( const Sequence< double > & rSeq ) -{ - if( m_eCurrentDataType != NUMERICAL ) - { - m_aTextualSequence.realloc( 0 ); - m_aMixedSequence.realloc( 0 ); - m_eCurrentDataType = NUMERICAL; - } - m_aNumericalSequence = rSeq; -} - -void CachedDataSequence::Impl_setTextualData( const Sequence< OUString > & rSeq ) -{ - if( m_eCurrentDataType != TEXTUAL ) - { - m_aNumericalSequence.realloc( 0 ); - m_aMixedSequence.realloc( 0 ); - m_eCurrentDataType = TEXTUAL; - } - m_aTextualSequence = rSeq; -} - -void CachedDataSequence::Impl_setMixedData( const Sequence< uno::Any > & rSeq ) -{ - if( m_eCurrentDataType != MIXED ) - { - m_aNumericalSequence.realloc( 0 ); - m_aTextualSequence.realloc( 0 ); - m_eCurrentDataType = MIXED; - } - m_aMixedSequence = rSeq; -} - // ================================================================================ Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static() @@ -403,16 +352,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // \-- } -// void SAL_CALL CachedDataSequence::setNumericalData( const Sequence< double >& aData ) -// throw (uno::RuntimeException) -// { -// // /-- -// MutexGuard aGuard( GetMutex() ); -// Impl_setNumericalData( aData ); -// // \-- -// } - - // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() throw (uno::RuntimeException) @@ -502,11 +441,6 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X } } -void CachedDataSequence::fireModifyEvent() -{ - // note: currently never called, as the data is not mutable - m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); -} // lang::XInitialization: void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception) { diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index 27824a6694c8..9486180ececd 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ChartDebugTrace.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * * This file is part of OpenOffice.org. * @@ -321,6 +321,8 @@ namespace chart namespace debug { +#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL + void ChartDebugTraceDocument( const Reference< XChartDocument > & /*xDoc*/, int /*nIndent*/ ) @@ -412,6 +414,7 @@ void ChartDebugTraceDiagram( */ } +#endif } // namespace debug } // namespace chart diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index 92210445f29d..b85cb717bff6 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CommonConverters.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.44.1 $ * * This file is part of OpenOffice.org. * @@ -129,21 +129,6 @@ drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMat return aHM; } -::basegfx::B2DHomMatrix HomogenMatrix3ToB2DHomMatrix( const drawing::HomogenMatrix3& rHM ) -{ - ::basegfx::B2DHomMatrix aM; - aM.set(0, 0, rHM.Line1.Column1); - aM.set(0, 1, rHM.Line1.Column2); - aM.set(0, 2, rHM.Line1.Column3); - aM.set(1, 0, rHM.Line2.Column1); - aM.set(1, 1, rHM.Line2.Column2); - aM.set(1, 2, rHM.Line2.Column3); - aM.set(2, 0, rHM.Line3.Column1); - aM.set(2, 1, rHM.Line3.Column2); - aM.set(2, 2, rHM.Line3.Column3); - return aM; -} - ::basegfx::B3DPoint Position3DToB3DPoint( const drawing::Position3D& rPosition ) { return ::basegfx::B3DPoint( @@ -161,15 +146,6 @@ drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector ); } -drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rVector) -{ - return drawing::Position3D( - rVector.getX() - , rVector.getY() - , rVector.getZ() - ); -} - drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint) { return drawing::Position3D( @@ -188,39 +164,6 @@ drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint) ); } -drawing::PolyPolygonShape3D MakeLine3D( - const drawing::Position3D & rStart, - const drawing::Position3D & rEnd ) -{ - drawing::PolyPolygonShape3D aPP; - - aPP.SequenceX.realloc(1); - aPP.SequenceY.realloc(1); - aPP.SequenceZ.realloc(1); - - drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray(); - drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray(); - drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray(); - - pOuterSequenceX->realloc(2); - pOuterSequenceY->realloc(2); - pOuterSequenceZ->realloc(2); - - double* pInnerSequenceX = pOuterSequenceX->getArray(); - double* pInnerSequenceY = pOuterSequenceY->getArray(); - double* pInnerSequenceZ = pOuterSequenceZ->getArray(); - - *pInnerSequenceX++ = rStart.PositionX; - *pInnerSequenceY++ = rStart.PositionY; - *pInnerSequenceZ++ = rStart.PositionZ; - - *pInnerSequenceX++ = rEnd.PositionX; - *pInnerSequenceY++ = rEnd.PositionY; - *pInnerSequenceZ++ = rEnd.PositionZ; - - return aPP; -} - void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position3D& rPos, sal_Int32 nPolygonIndex ) { if(nPolygonIndex<0) @@ -467,31 +410,6 @@ drawing::PolyPolygonShape3D BezierToPoly( return aRet; } -drawing::PolyPolygonShape3D PointSequenceToPoly( - const drawing::PointSequenceSequence& rPointSequence ) -{ - drawing::PolyPolygonShape3D aRet; - aRet.SequenceX.realloc( rPointSequence.getLength() ); - aRet.SequenceY.realloc( rPointSequence.getLength() ); - aRet.SequenceZ.realloc( rPointSequence.getLength() ); - - for(sal_Int32 nN = 0; nN < rPointSequence.getLength(); nN++) - { - sal_Int32 nInnerLength = rPointSequence[nN].getLength(); - aRet.SequenceX[nN].realloc( nInnerLength ); - aRet.SequenceY[nN].realloc( nInnerLength ); - aRet.SequenceZ[nN].realloc( nInnerLength ); - - for( sal_Int32 nM = 0; nM < nInnerLength; nM++) - { - aRet.SequenceX[nN][nM] = rPointSequence[nN][nM].X; - aRet.SequenceY[nN][nM] = rPointSequence[nN][nM].Y; - aRet.SequenceZ[nN][nM] = 0.0; - } - } - return aRet; -} - drawing::PointSequenceSequence PolyToPointSequence( const drawing::PolyPolygonShape3D& rPolyPolygon ) { @@ -524,66 +442,6 @@ void appendPointSequence( drawing::PointSequenceSequence& rTarget rTarget[nOldCount+nS]=rAdd[nS]; } -Polygon PolyToToolsPoly( const drawing::PolyPolygonShape3D& rPolyPolygon ) -{ - sal_Int32 nOuterLength = rPolyPolygon.SequenceX.getLength(); - if(!nOuterLength) - return Polygon(); - - sal_Int32 nNewSize = nOuterLength; - sal_Int32 nNewIndex = 0; - Polygon aRet(static_cast(nNewSize)); - - for(sal_Int32 nN = 0; nN < nOuterLength; nN++) - { - sal_Int32 nInnerLength = rPolyPolygon.SequenceX[nN].getLength(); - nNewSize += nInnerLength-1, - aRet.SetSize(static_cast(nNewSize)); - for( sal_Int32 nM = 0; nM < nInnerLength; nM++) - { - aRet.SetPoint( Point( static_cast(rPolyPolygon.SequenceX[nN][nM]) - , static_cast(rPolyPolygon.SequenceY[nN][nM]) - ) - , static_cast(nNewIndex) ); - nNewIndex++; - } - } - return aRet; -} - -drawing::PolyPolygonShape3D ToolsPolyToPoly( const Polygon& rToolsPoly, double zValue ) -{ - sal_Int32 nPointCount = rToolsPoly.GetSize(); - - drawing::PolyPolygonShape3D aPP; - - aPP.SequenceX.realloc(1); - aPP.SequenceY.realloc(1); - aPP.SequenceZ.realloc(1); - - drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray(); - drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray(); - drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray(); - - pOuterSequenceX->realloc(nPointCount); - pOuterSequenceY->realloc(nPointCount); - pOuterSequenceZ->realloc(nPointCount); - - double* pInnerSequenceX = pOuterSequenceX->getArray(); - double* pInnerSequenceY = pOuterSequenceY->getArray(); - double* pInnerSequenceZ = pOuterSequenceZ->getArray(); - - for( sal_Int32 nN = 0; nN(nN) ); - *pInnerSequenceX++ = rPos.X(); - *pInnerSequenceY++ = rPos.Y(); - *pInnerSequenceZ++ = zValue; - } - - return aPP; -} - drawing::Position3D operator+( const drawing::Position3D& rPos , const drawing::Direction3D& rDirection) { @@ -668,18 +526,6 @@ awt::Size Direction3DToAWTSize( const drawing::Direction3D& rDirection ) return aRet; } -::basegfx::B3DPoint SequenceToB3DPoint( const uno::Sequence< double >& rSeq ) -{ - OSL_ENSURE(rSeq.getLength()==3,"The sequence needs to have length 3 for conversion into vector"); - - double x=rSeq.getLength()>0?rSeq[0]:0.0; - double y=rSeq.getLength()>1?rSeq[1]:0.0; - double z=rSeq.getLength()>2?rSeq[2]:0.0; - - ::basegfx::B3DPoint aRet(x,y,z); - return aRet; -} - uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ) { uno::Sequence< double > aRet(3); @@ -709,24 +555,6 @@ uno::Sequence< double > Position3DToSequence( const drawing::Position3D& rPositi return aRet; } -drawing::Direction3D SequenceToDirection3D( const uno::Sequence< double >& rSeq ) -{ - drawing::Direction3D aRet; - aRet.DirectionX = rSeq.getLength()>0?rSeq[0]:0.0; - aRet.DirectionY = rSeq.getLength()>1?rSeq[1]:0.0; - aRet.DirectionZ = rSeq.getLength()>2?rSeq[2]:0.0; - return aRet; -} - -uno::Sequence< double > Direction3DToSequence( const drawing::Direction3D& rDirection ) -{ - uno::Sequence< double > aRet(3); - aRet[0] = rDirection.DirectionX; - aRet[1] = rDirection.DirectionY; - aRet[2] = rDirection.DirectionZ; - return aRet; -} - drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f ) { OSL_ENSURE(f,"a Direction3D is divided by NULL"); @@ -737,21 +565,6 @@ drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f ); } -text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode2 ) -{ - switch(nWritingMode2) - { - case text::WritingMode2::RL_TB: - return text::WritingMode_RL_TB; - case text::WritingMode2::TB_RL: - return text::WritingMode_TB_RL; - case text::WritingMode2::LR_TB: - return text::WritingMode_LR_TB; - default: // TL - return text::WritingMode_TB_RL;//there can no correct conversion be done here - } -} - using namespace ::com::sun::star::chart2; uno::Sequence< double > DataSequenceToDoubleSequence( diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 75964b42ead5..7e418f04ab7b 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ConfigColorScheme.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.44.1 $ * * This file is part of OpenOffice.org. * @@ -65,7 +65,6 @@ public: virtual ~ChartConfigItem(); void addPropertyNotification( const OUString & rPropertyName ); - void removePropertyNotification( const OUString & rPropertyName ); uno::Any getProperty( const OUString & aPropertyName ); @@ -101,12 +100,6 @@ void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName ) EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify )); } -void ChartConfigItem::removePropertyNotification( const OUString & rPropertyName ) -{ - if( m_aPropertiesToNotify.erase( rPropertyName )) - EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify )); -} - uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName ) { Sequence< uno::Any > aValues( diff --git a/chart2/source/tools/ContextHelper.cxx b/chart2/source/tools/ContextHelper.cxx index 541c22950869..e69de29bb2d1 100644 --- a/chart2/source/tools/ContextHelper.cxx +++ b/chart2/source/tools/ContextHelper.cxx @@ -1,64 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ContextHelper.cxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_chart2.hxx" -#include "ContextHelper.hxx" -#include - -#include - -using namespace ::com::sun::star; - -namespace chart -{ - -namespace ContextHelper -{ - -uno::Reference< uno::XComponentContext > - createContext( - const tContextEntryMapType & rMap, - const uno::Reference< uno::XComponentContext > & rDelegateContext ) -{ - ::std::vector< ::cppu::ContextEntry_Init > aVec( rMap.size()); - for( tContextEntryMapType::const_iterator aIt = rMap.begin(); - aIt != rMap.end(); - ++aIt ) - { - aVec.push_back( ::cppu::ContextEntry_Init( (*aIt).first, (*aIt).second) ); - } - - return ::cppu::createComponentContext( & aVec[0], aVec.size(), rDelegateContext ); -} - -} // namespace ContextHelper - -} // namespace chart diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 646410dd28a9..c8dfbffec354 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DataSeriesHelper.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.24.1 $ * * This file is part of OpenOffice.org. * @@ -176,17 +176,6 @@ OUString GetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL return aRet; } -void SetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence, - const ::rtl::OUString& rRole ) -{ - if( xLabeledDataSequence.is() ) - { - Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY ); - if( xProp.is() ) - xProp->setPropertyValue( C2U("Role"), uno::makeAny(rRole) ) ; - } -} - Reference< chart2::data::XLabeledDataSequence > getDataSequenceByRole( const Reference< chart2::data::XDataSource > & xSource, OUString aRole, diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index db69c039070d..5814de4724fa 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DataSource.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * * This file is part of OpenOffice.org. * @@ -61,32 +61,6 @@ DataSource::DataSource( m_aDataSeq( rSequences ) {} -DataSource::DataSource( - const Sequence< Reference< chart2::data::XDataSequence > > & rSequences ) -{ - m_aDataSeq.realloc( rSequences.getLength()); - sal_Int32 i; - for(i=rSequences.getLength(); --i;) - { - m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i] )); - } -} - -DataSource::DataSource( - const Sequence< Reference< chart2::data::XDataSequence > > & rSequences, - const Sequence< Reference< chart2::data::XDataSequence > > & rLabel ) -{ - m_aDataSeq.realloc( rSequences.getLength()); - for( sal_Int32 i=0; i() )); - } -} - DataSource::~DataSource() {} diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 9224a1c98d17..0de52f8a53ea 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DataSourceHelper.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.16.1 $ * * This file is part of OpenOffice.org. * @@ -115,43 +115,6 @@ void lcl_addErrorBarRanges( } } -struct lcl_migrateData : public ::std::unary_function< - Reference< chart2::data::XLabeledDataSequence >, void > -{ - lcl_migrateData( const Reference< chart2::data::XDataProvider > & xDataProvider ) : - m_xDataProvider( xDataProvider ) - {} - - Reference< chart2::data::XDataSequence > migrateData( - const Reference< chart2::data::XDataSequence > & xOldData ) - { - if( ! xOldData.is()) - return xOldData; - - OSL_ASSERT( m_xDataProvider.is()); - Reference< chart2::data::XDataSequence > xNewData( - m_xDataProvider->createDataSequenceByRangeRepresentation( - xOldData->getSourceRangeRepresentation())); - comphelper::copyProperties( - Reference< beans::XPropertySet >( xOldData, uno::UNO_QUERY ), - Reference< beans::XPropertySet >( xNewData, uno::UNO_QUERY )); - return xNewData; - } - - void operator()( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) - { - if( m_xDataProvider.is() && xLSeq.is()) - { - xLSeq->setValues( migrateData( xLSeq->getValues())); - xLSeq->setLabel( migrateData( xLSeq->getLabel())); - } - } - -private: - Reference< chart2::data::XDataProvider > m_xDataProvider; -}; - - } // anonymous namespace uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( @@ -554,25 +517,6 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference< return ContainerHelper::ContainerToSequence( aResult ); } -bool DataSourceHelper::migrateData( - const Reference< chart2::XChartDocument > & xChartDoc, - const Reference< chart2::data::XDataProvider > & xNewDataProvider ) -{ - if( ! ( xChartDoc.is() && xNewDataProvider.is())) - return false; - - bool bCouldMigrate = true; - Reference< chart2::data::XDataSource > xDataSource( - DataSourceHelper::getUsedData( xChartDoc, true /* bIncludeUnusedData */ )); - Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( - xDataSource->getDataSequences()); - ::std::for_each( aLSeq.getArray(), aLSeq.getArray() + aLSeq.getLength(), - lcl_migrateData( xNewDataProvider )); - - return bCouldMigrate; -} - - //............................................................................. } //namespace chart //............................................................................. diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 9a92be9bcfe1..a32655946259 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DiagramHelper.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.18.22.4 $ * * This file is part of OpenOffice.org. * @@ -62,26 +62,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::rtl::OUString; -namespace -{ -bool lcl_ChartTypeIsMemberOfCooSys( - const Reference< chart2::XCoordinateSystem > & xCooSys, - const Reference< chart2::XChartType > & xChartType ) -{ - Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY ); - if( xCTCnt.is()) - { - Sequence< Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes()); - for( sal_Int32 i=0; i & xCorrespondingCoordinateSystem ) { - OSL_ASSERT( !xCorrespondingCoordinateSystem.is() || - lcl_ChartTypeIsMemberOfCooSys( - xCorrespondingCoordinateSystem, - xChartType )); - StackMode eStackMode = StackMode_NONE; rbFound = false; rbAmbiguous = false; @@ -713,44 +688,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( return 0; } -//static -uno::Reference< XCoordinateSystem > DiagramHelper::getCoordinateSystemOfChartType( - const uno::Reference< chart2::XDiagram >& xDiagram - , const uno::Reference< XChartType >& xGivenChartType ) -{ - if( !xGivenChartType.is() ) - return 0; - - //iterate through the model to find the given xChartType - //the found parent indicates the coordinate system - - //iterate through all coordinate systems - uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); - if( !xCooSysContainer.is()) - return 0; - - uno::Sequence< uno::Reference< XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() ); - for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS ) - { - uno::Reference< XCoordinateSystem > xCooSys( aCooSysList[nCS] ); - - //iterate through all chart types in the current coordinate system - uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - OSL_ASSERT( xChartTypeContainer.is()); - if( !xChartTypeContainer.is() ) - continue; - uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); - for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT ) - { - uno::Reference< XChartType > xChartType( aChartTypeList[nT] ); - - if( xGivenChartType==xChartType ) - return xCooSys; - } - } - return 0; -} - // static ::std::vector< Reference< XDataSeries > > DiagramHelper::getDataSeriesFromDiagram( @@ -1362,29 +1299,6 @@ bool DiagramHelper::moveSeries( const Reference< XDiagram >& xDiagram, const Ref return bMoved; } -sal_Int32 DiagramHelper::getIndexOfSeriesWithinChartType( - const Reference< XDataSeries >& xDataSeries, - const Reference< XChartType >& xChartType ) -{ - sal_Int32 nRet = -1; - - uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - if( xDataSeriesContainer.is() ) - { - uno::Sequence< uno::Reference< XDataSeries > > aSeriesList( xDataSeriesContainer->getDataSeries() ); - for( sal_Int32 nS = 0; nS < aSeriesList.getLength(); ++nS ) - { - if( xDataSeries==aSeriesList[nS] ) - { - nRet = nS; - break; - } - } - } - - return nRet; -} - bool DiagramHelper::isSupportingFloorAndWall( const Reference< chart2::XDiagram >& xDiagram ) { diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx index 84da1ea0f534..d5eab1b4b652 100644 --- a/chart2/source/tools/ImplUndoManager.cxx +++ b/chart2/source/tools/ImplUndoManager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ImplUndoManager.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.16.1 $ * * This file is part of OpenOffice.org. * @@ -419,11 +419,6 @@ void UndoStack::limitSize( sal_Int32 nMaxSize ) applyLimitation(); } -sal_Int32 UndoStack::getCurrentLimitation() const -{ - return m_nSizeLimit; -} - void UndoStack::applyLimitation() { if( m_aStack.size() > static_cast< sal_uInt32 >( m_nSizeLimit )) diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx index 842c6ae3dbca..94d04b69a5a4 100644 --- a/chart2/source/tools/ImplUndoManager.hxx +++ b/chart2/source/tools/ImplUndoManager.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ImplUndoManager.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.44.1 $ * * This file is part of OpenOffice.org. * @@ -177,7 +177,6 @@ public: // removes all actions that have been inserted more than nMaxSize steps ago. // The models of those actions are disposed of void limitSize( sal_Int32 nMaxSize ); - sal_Int32 getCurrentLimitation() const; private: void applyLimitation(); diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 65377a19d3a3..83c3a1e5a059 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: LabeledDataSequence.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * * This file is part of OpenOffice.org. * @@ -164,11 +164,6 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } } -void LabeledDataSequence::fireModifyEvent() -{ - m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); -} - // ================================================================================ Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index b27be669532c..d379d2152a38 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MediaDescriptorHelper.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.44.1 $ * * This file is part of OpenOffice.org. * @@ -216,27 +216,6 @@ MediaDescriptorHelper::~MediaDescriptorHelper() } - uno::Sequence< beans::PropertyValue > MediaDescriptorHelper -::getAll() -{ - uno::Sequence< beans::PropertyValue > aAll( m_aRegularProperties ); - //write properties to aAll - if( m_aDeprecatedProperties.getLength() ) - { - sal_Int32 nCount = aAll.getLength(); - aAll.realloc( nCount + m_aDeprecatedProperties.getLength()); - for(sal_Int32 i=0;i MediaDescriptorHelper ::getReducedForModel() { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 8fdc05e38006..42943d192c0f 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModifyListenerHelper.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.44.1 $ * * This file is part of OpenOffice.org. * @@ -212,56 +212,5 @@ void SAL_CALL ModifyEventForwarder::disposing() DisposeAndClear( this ); } -// ================================================================================ - -ModifyListenerOnDemmandRefresh::ModifyListenerOnDemmandRefresh( ::osl::Mutex & rMutex ) - : m_rMutex( rMutex ), - m_bNeedsUpdate( true ) -{ -} - -void ModifyListenerOnDemmandRefresh::listenAtDocument( - const Reference< chart2::XChartDocument > & xModel ) -{ - Reference< util::XModifyBroadcaster > xBroadcaster( xModel, uno::UNO_QUERY ); - if( xBroadcaster.is()) - { - try - { - xBroadcaster->addModifyListener( Reference< util::XModifyListener >( this )); - } - catch( const uno::Exception & ex ) - { - ASSERT_EXCEPTION( ex ); - } - } -} - -void ModifyListenerOnDemmandRefresh::update() -{ - m_bNeedsUpdate = false; -} - -bool ModifyListenerOnDemmandRefresh::needsUpdate() const -{ - return m_bNeedsUpdate; -} - -// ____ XModifyListener ____ -void SAL_CALL ModifyListenerOnDemmandRefresh::modified( - const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) -{ - m_bNeedsUpdate = true; -} - -// ____ XEventListener (base of XModifyListener) ____ -void SAL_CALL ModifyListenerOnDemmandRefresh::disposing( - const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) -{ - m_bNeedsUpdate = true; -} - } // namespace ModifyListenerHelper } // namespace chart diff --git a/chart2/source/tools/OEnumeration.cxx b/chart2/source/tools/OEnumeration.cxx index 4db2487b9266..e69de29bb2d1 100644 --- a/chart2/source/tools/OEnumeration.cxx +++ b/chart2/source/tools/OEnumeration.cxx @@ -1,67 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: OEnumeration.cxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_chart2.hxx" -#include "OEnumeration.hxx" - -using namespace ::com::sun::star; - -namespace comphelper -{ - -OEnumeration::OEnumeration( - const ::std::vector< uno::Any > & rContainer ) : - m_aContainer( rContainer ), - m_aIter( m_aContainer.begin() ) -{} - -OEnumeration::~OEnumeration() -{} - -sal_Bool SAL_CALL OEnumeration::hasMoreElements() - throw (uno::RuntimeException) -{ - return ! m_aContainer.empty(); -} - -uno::Any SAL_CALL OEnumeration::nextElement() - throw (container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException) -{ - if( m_aIter == m_aContainer.end()) - throw container::NoSuchElementException(); - - return *m_aIter++; -} - - -} // namespace comphelper diff --git a/chart2/source/tools/OIndexContainer.cxx b/chart2/source/tools/OIndexContainer.cxx index cce7ca539f80..e69de29bb2d1 100644 --- a/chart2/source/tools/OIndexContainer.cxx +++ b/chart2/source/tools/OIndexContainer.cxx @@ -1,183 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: OIndexContainer.cxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_chart2.hxx" -#include "OIndexContainer.hxx" -#include - -using namespace ::com::sun::star; -using ::osl::MutexGuard; - -namespace comphelper -{ - -OIndexContainer::OIndexContainer( ::osl::Mutex & rMutex ) : - m_rMutex( rMutex ) -{ -} - -OIndexContainer::~OIndexContainer() -{ -} - -::osl::Mutex & OIndexContainer::GetMutex() -{ - return m_rMutex; -} - -// ____ XInterface ____ -uno::Any SAL_CALL OIndexContainer::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) -{ - return ::cppu::queryInterface( - aType, - static_cast< container::XIndexContainer * >( this ), - static_cast< container::XIndexReplace * >( this ), - static_cast< container::XIndexAccess * >( this ), - static_cast< container::XElementAccess * >( this ) ); -} - -// ____ XIndexContainer ____ -void SAL_CALL OIndexContainer::insertByIndex( sal_Int32 Index, const uno::Any& Element ) - throw (lang::IllegalArgumentException, - lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException) -{ - // valid range [0..size] - size_t nIndex( Index ); - - // /-- - MutexGuard aGuard( GetMutex()); - - if( Index < 0 || - nIndex > m_aContainer.size() ) - throw lang::IndexOutOfBoundsException(); - - if( getElementType().isAssignableFrom( Element.getValueType()) ) - throw lang::IllegalArgumentException(); - - if( nIndex == m_aContainer.size()) - m_aContainer.push_back( Element ); - else - { - m_aContainer.insert( m_aContainer.begin() + nIndex, Element ); - } - // \-- -} - -void SAL_CALL OIndexContainer::removeByIndex( sal_Int32 Index ) - throw (lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException) -{ - // valid range [0..size-1] - size_t nIndex( Index ); - - // /-- - MutexGuard aGuard( GetMutex()); - - if( Index < 0 || - nIndex > m_aContainer.size() ) - throw lang::IndexOutOfBoundsException(); - - m_aContainer.erase( m_aContainer.begin() + nIndex ); - // \-- -} - - -// ____ XIndexReplace ____ -void SAL_CALL OIndexContainer::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw (lang::IllegalArgumentException, - lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException) -{ - // valid range [0..size-1] - size_t nIndex( Index ); - - // /-- - MutexGuard aGuard( GetMutex()); - - if( Index < 0 || - nIndex > m_aContainer.size() ) - throw lang::IndexOutOfBoundsException(); - - if( getElementType().isAssignableFrom( Element.getValueType()) ) - throw lang::IllegalArgumentException(); - - m_aContainer[ nIndex ] = Element; - // \-- -} - - -// ____ XIndexAccess ____ -sal_Int32 SAL_CALL OIndexContainer::getCount() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex()); - - return m_aContainer.size(); - // \-- -} - -uno::Any SAL_CALL OIndexContainer::getByIndex( sal_Int32 Index ) - throw (lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException) -{ - // valid range [0..size-1] - size_t nIndex( Index ); - - // /-- - MutexGuard aGuard( GetMutex()); - - if( Index < 0 || - nIndex > m_aContainer.size() ) - throw lang::IndexOutOfBoundsException(); - - return m_aContainer.at( nIndex ); - // \-- -} - -sal_Bool SAL_CALL OIndexContainer::hasElements() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex()); - - return ! m_aContainer.empty(); - // \-- -} - - -} // namespace comphelper diff --git a/chart2/source/tools/OStyle.cxx b/chart2/source/tools/OStyle.cxx index 76b2b7036668..e69de29bb2d1 100644 --- a/chart2/source/tools/OStyle.cxx +++ b/chart2/source/tools/OStyle.cxx @@ -1,233 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: OStyle.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_chart2.hxx" -#include "OStyle.hxx" -#include "macros.hxx" -#include -#include -#include "com/sun/star/uno/RuntimeException.hpp" - -using namespace ::com::sun::star; - -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::osl::MutexGuard; - -namespace property -{ - -OStyle::OStyle( const Reference< container::XNameAccess > & xStyleFamily, - ::osl::Mutex & par_rMutex ) : - OPropertySet( par_rMutex ), - m_xStyleFamily( xStyleFamily ), - m_bUserDefined( false ), - m_rMutex( par_rMutex ) -{} - -OStyle::~OStyle() -{} - -::osl::Mutex & OStyle::GetMutex() -{ - return m_rMutex; -} - -// ____ XStyle ____ -sal_Bool SAL_CALL OStyle::isUserDefined() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - return m_bUserDefined; - // \-- -} - -sal_Bool SAL_CALL OStyle::isInUse() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - - // aBoundLC is a member of cppuhelper::OPropertySetHelper - // it is assumed that a style is in use whenever some component is - // registered here as listener - return ( aBoundLC.getContainedTypes().getLength() > 0 ); - // \-- -} - -OUString SAL_CALL OStyle::getParentStyle() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - return m_aParentStyleName; - // \-- -} - -void SAL_CALL OStyle::setParentStyle( const OUString& aParentStyle ) - throw (container::NoSuchElementException, - uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - m_aParentStyleName = aParentStyle; - // \-- -} - -// ____ XNamed (base of XStyle) ____ - -OUString SAL_CALL OStyle::getName() - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - return m_aName; - // \-- -} - -void SAL_CALL OStyle::setName( const ::rtl::OUString& aName ) - throw (uno::RuntimeException) -{ - // /-- - MutexGuard aGuard( GetMutex() ); - OSL_ASSERT( m_xStyleFamily.is() ); - - // note: RuntimeException is not very apropriate for this, but I have no - // other choice - if( m_xStyleFamily->hasByName( aName )) - { - OSL_ENSURE( false, "Style name already exists!" ); - throw uno::RuntimeException( - C2U( "Style name already exists: " ) + aName, - static_cast< style::XStyle * >( this )); - } - else - { - // ToDo: Change the name in the container (XStyleFamiliy) - m_aName = aName; - } - // \-- -} - -// ____ XInterface ____ -uno::Any SAL_CALL OStyle::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) -{ - uno::Any aResult = OPropertySet::queryInterface( aType ); - - if( ! aResult.hasValue()) - { - return ::cppu::queryInterface( - aType, - static_cast< style::XStyle * >( this )); - } - - return aResult; -} - -// void SAL_CALL OStyle::acquire() throw () -// { -// OPropertySet::acquire(); -// } - -// void SAL_CALL OStyle::release() throw () -// { -// OPropertySet::release(); -// } - - - -// ____ XServiceInfo ____ -// OUString SAL_CALL -// OStyle::getImplementationName() -// throw (uno::RuntimeException) -// { -// return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OStyle" )); -// } - -// sal_Bool SAL_CALL -// OStyle::supportsService( const OUString& ServiceName ) -// throw (uno::RuntimeException) -// { -// Sequence< OUString > aServices( getSupportedServiceNames() ); - -// sal_Int32 nI = aServices.getLength() - 1; -// for( ; nI >= 0; --nI ) -// { -// if( aServices[ nI ].equals( ServiceName )) -// return sal_True; -// } -// return sal_False; -// } - -// Sequence< OUString > SAL_CALL -// OStyle::getSupportedServiceNames() -// throw (uno::RuntimeException) -// { -// Sequence< OUString > aServiceNames( 2 ); -// // from base OPropertySet -// aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertySet" )); -// // new service -// aServiceNames[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.Style" )); -// return aServiceNames; -// } - - -// ____ XTypeProvider ____ -// Sequence< uno::Type > SAL_CALL -// OStyle::getTypes() -// throw (uno::RuntimeException) -// { -// Sequence< uno::Type > aResult( OPropertySet::getTypes() ); -// aResult.realloc( aResult.getLength() + 1 ); -// aResult[ aResult.getLength() - 1 ] = -// ::getCppuType( reinterpret_cast< const Reference< style::XStyle > *>(0)); - -// return aResult; -// } - -// Sequence< sal_Int8 > SAL_CALL -// OStyle::getImplementationId() -// throw (uno::RuntimeException) -// { -// static uno::Sequence< sal_Int8 > aId; -// if( aId.getLength() == 0 ) -// { -// aId.realloc( 16 ); -// rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); -// } -// return aId; -// } - - -} // namespace property diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index db5dd56e59be..57c8ef01d5d6 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ObjectIdentifier.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.24.2 $ * * This file is part of OpenOffice.org. * @@ -254,11 +254,6 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID } //anonymous namespace -ObjectIdentifier::ObjectIdentifier() -{ -} - - //static OUString ObjectIdentifier::createClassifiedIdentifierForObject( const Reference< uno::XInterface >& xObject @@ -416,35 +411,6 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem( return aRet.makeStringAndClear(); } -//static -OUString ObjectIdentifier::createParticleForChartType( - const Reference< XChartType >& xChartType - , const Reference< frame::XModel >& xChartModel ) -{ - OUStringBuffer aRet; - - Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - Reference< XCoordinateSystem > xCooSys( DiagramHelper::getCoordinateSystemOfChartType( xDiagram, xChartType ) ); - Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - if( xChartTypeContainer.is() ) - { - uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); - for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT ) - { - uno::Reference< XChartType > xCurrentChartType( aChartTypeList[nT] ); - if( xChartType == xCurrentChartType ) - { - aRet = ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ); - aRet.appendAscii(":CT="); - aRet.append( OUString::valueOf( nT ) ); - break; - } - } - } - - return aRet.makeStringAndClear(); -} - //static OUString ObjectIdentifier::createParticleForAxis( sal_Int32 nDimensionIndex diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index fc5e637ce5bb..780a5ba373d9 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RangeHighlighter.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.44.1 $ * * This file is part of OpenOffice.org. * @@ -69,23 +69,6 @@ void lcl_fillRanges( } } -sal_Int32 lcl_getColor( const Reference< beans::XPropertySet > & xProp ) -{ - sal_Int32 nResult = PREFERED_DEFAULT_COLOR; - - try - { - if( xProp.is()) - xProp->getPropertyValue( C2U("Color")) >>= nResult; - } - catch( const uno::Exception & ex ) - { - ASSERT_EXCEPTION( ex ); - } - - return nResult; -} - } // anonymous namespace namespace chart @@ -216,7 +199,6 @@ void RangeHighlighter::fillRangesForDiagram( const Reference< chart2::XDiagram > void RangeHighlighter::fillRangesForDataSeries( const uno::Reference< chart2::XDataSeries > & xSeries ) { sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR; -// lcl_getColor( Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY )); Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY ); if( xSource.is()) lcl_fillRanges( m_aSelectedRanges, @@ -270,7 +252,6 @@ void RangeHighlighter::fillRangesForCategories( const Reference< chart2::XAxis > void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface > & xDataSeries, sal_Int32 nIndex ) { sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR; -// lcl_getColor( Reference< beans::XPropertySet >( xDataPoint, uno::UNO_QUERY )); if( xDataSeries.is()) { Reference< chart2::data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY ); diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 2f1e9bed1c73..93ba4b43cfc3 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReferenceSizeProvider.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.44.1 $ * * This file is part of OpenOffice.org. * @@ -37,6 +37,7 @@ #include "DiagramHelper.hxx" #include "macros.hxx" #include "AxisHelper.hxx" +#include "DataSeriesHelper.hxx" #include #include @@ -58,10 +59,8 @@ namespace chart ReferenceSizeProvider::ReferenceSizeProvider( awt::Size aPageSize, - awt::Size aDiagramSize, const Reference< XChartDocument > & xChartDoc ) : m_aPageSize( aPageSize ), - m_aDiagramSize( aDiagramSize ), m_xChartDoc( xChartDoc ), m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES ) {} @@ -71,11 +70,6 @@ awt::Size ReferenceSizeProvider::getPageSize() const return m_aPageSize; } -awt::Size ReferenceSizeProvider::getDiagramSize() const -{ - return m_aDiagramSize; -} - bool ReferenceSizeProvider::useAutoScale() const { return m_bUseAutoScale; @@ -115,7 +109,7 @@ void ReferenceSizeProvider::setValuesAtTitle( } } - setValuesAtPropertySet( xTitleProp, REF_PAGE, /* bAdaptFontSizes = */ false ); + setValuesAtPropertySet( xTitleProp, /* bAdaptFontSizes = */ false ); } catch( const uno::Exception & ex ) { @@ -145,7 +139,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() { for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i ) setValuesAtPropertySet( - (*aIt)->getDataPointByIndex( aPointIndexes[i] ), REF_DIAGRAM ); + (*aIt)->getDataPointByIndex( aPointIndexes[i] ) ); } } catch( const uno::Exception & ex ) @@ -154,26 +148,23 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() } //it is important to correct the datapoint properties first as they do reference the series properties - setValuesAtPropertySet( xSeriesProp, REF_DIAGRAM ); + setValuesAtPropertySet( xSeriesProp ); } } } void ReferenceSizeProvider::setValuesAtPropertySet( const Reference< beans::XPropertySet > & xProp, - ReferenceSizeProvider::ReferenceSizeType eType, bool bAdaptFontSizes /* = true */ ) { if( ! xProp.is()) return; - static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - static const OUString aDiaRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize")); + static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); try { - OUString aRefSizeName( (eType == REF_PAGE) ? aPageRefStr : aDiaRefStr ); - awt::Size aRefSize( (eType == REF_PAGE) ? getPageSize() : getDiagramSize() ); + awt::Size aRefSize( getPageSize() ); awt::Size aOldRefSize; bool bHasOldRefSize( xProp->getPropertyValue( aRefSizeName ) >>= aOldRefSize ); @@ -202,18 +193,16 @@ void ReferenceSizeProvider::setValuesAtPropertySet( void ReferenceSizeProvider::getAutoResizeFromPropSet( const Reference< beans::XPropertySet > & xProp, - ReferenceSizeProvider::ReferenceSizeType eType, ReferenceSizeProvider::AutoResizeState & rInOutState ) { - static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - static const OUString aDiaRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize")); + static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); AutoResizeState eSingleState = AUTO_RESIZE_UNKNOWN; if( xProp.is()) { try { - if( xProp->getPropertyValue((eType == REF_PAGE) ? aPageRefStr : aDiaRefStr ).hasValue()) + if( xProp->getPropertyValue( aRefSizeName ).hasValue()) eSingleState = AUTO_RESIZE_YES; else eSingleState = AUTO_RESIZE_NO; @@ -243,7 +232,7 @@ void ReferenceSizeProvider::getAutoResizeFromTitle( { Reference< beans::XPropertySet > xProp( xTitle, uno::UNO_QUERY ); if( xProp.is()) - getAutoResizeFromPropSet( xProp, REF_PAGE, rInOutState ); + getAutoResizeFromPropSet( xProp, rInOutState ); } void ReferenceSizeProvider::impl_getAutoResizeFromTitled( @@ -298,7 +287,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState // Legend Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendProp.is()) - getAutoResizeFromPropSet( xLegendProp, REF_PAGE, eResult ); + getAutoResizeFromPropSet( xLegendProp, eResult ); if( eResult == AUTO_RESIZE_AMBIGUOUS ) return eResult; @@ -308,7 +297,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState { Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY ); if( xProp.is()) - getAutoResizeFromPropSet( xProp, REF_DIAGRAM, eResult ); + getAutoResizeFromPropSet( xProp, eResult ); Reference< XTitled > xTitled( aAxes[i], uno::UNO_QUERY ); if( xTitled.is()) { @@ -328,7 +317,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY ); if( xSeriesProp.is()) { - getAutoResizeFromPropSet( xSeriesProp, REF_DIAGRAM, eResult ); + getAutoResizeFromPropSet( xSeriesProp, eResult ); if( eResult == AUTO_RESIZE_AMBIGUOUS ) return eResult; @@ -341,8 +330,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i ) { getAutoResizeFromPropSet( - (*aIt)->getDataPointByIndex( aPointIndexes[i] ), - REF_DIAGRAM, eResult ); + (*aIt)->getDataPointByIndex( aPointIndexes[i] ), eResult ); if( eResult == AUTO_RESIZE_AMBIGUOUS ) return eResult; } @@ -385,7 +373,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz // Legend Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendProp.is()) - setValuesAtPropertySet( xLegendProp, REF_PAGE ); + setValuesAtPropertySet( xLegendProp ); // Axes (incl. Axis Titles) Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) ); @@ -393,7 +381,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz { Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY ); if( xProp.is()) - setValuesAtPropertySet( xProp, REF_DIAGRAM ); + setValuesAtPropertySet( xProp ); impl_setValuesAtTitled( Reference< XTitled >( aAxes[i], uno::UNO_QUERY )); } diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 9372bee0d14a..7686b2c7009d 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RegressionCurveHelper.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.16.1 $ * * This file is part of OpenOffice.org. * @@ -137,12 +137,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ // ------------------------------------------------------------ -// static -Reference< XRegressionCurveCalculator > RegressionCurveHelper::createMeanValueLineCalculator() -{ - return Reference< XRegressionCurveCalculator >( new MeanValueRegressionCurveCalculator()); -} - // static Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( ::rtl::OUString aServiceName ) diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 48a33bf00b6d..24e55ccfc90e 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TitleHelper.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.44.1 $ * * This file is part of OpenOffice.org. * @@ -46,56 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -namespace -{ - -rtl::OUString lcl_getIdentifierForTitle( TitleHelper::eTitleType nTitleIndex ) -{ - switch( nTitleIndex ) - { - case TitleHelper::MAIN_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@main-title" ) ); - return m_aIdentifier; - } - case TitleHelper::SUB_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@sub-title" ) ); - return m_aIdentifier; - } - case TitleHelper::X_AXIS_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@xaxis-title" ) ); - return m_aIdentifier; - } - case TitleHelper::Y_AXIS_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@yaxis-title" ) ); - return m_aIdentifier; - } - case TitleHelper::Z_AXIS_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@zaxis-title" ) ); - return m_aIdentifier; - } - case TitleHelper::SECONDARY_X_AXIS_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@secondaryxaxis-title" ) ); - return m_aIdentifier; - } - case TitleHelper::SECONDARY_Y_AXIS_TITLE: - { - static rtl::OUString m_aIdentifier( C2U( "@secondaryyaxis-title" ) ); - return m_aIdentifier; - } - default: - OSL_ENSURE( false, "Unsupported Title-Type requested" ); - return ::rtl::OUString(); - } -} - -} //anonymous namespace - uno::Reference< XTitled > lcl_getTitleParentFromDiagram( TitleHelper::eTitleType nTitleIndex , const uno::Reference< XDiagram >& xDiagram ) diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 37906d77b6a0..8f3d732ec877 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: WeakListenerAdapter.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.44.1 $ * * This file is part of OpenOffice.org. * @@ -42,11 +42,6 @@ using ::rtl::OUString; namespace chart { -WeakModifyListenerAdapter::WeakModifyListenerAdapter( - const Reference< util::XModifyListener > & xListener ) : - WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener ) -{} - WeakModifyListenerAdapter::WeakModifyListenerAdapter( const uno::WeakReference< util::XModifyListener > & xListener ) : WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener ) @@ -70,11 +65,6 @@ WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter( WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener ) {} -WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter( - const uno::WeakReference< view::XSelectionChangeListener > & xListener ) : - WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener ) -{} - WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk index ef78453194c8..a6e05c8e9a68 100644 --- a/chart2/source/tools/makefile.mk +++ b/chart2/source/tools/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.28 $ +# $Revision: 1.28.42.2 $ # # This file is part of OpenOffice.org. # @@ -59,7 +59,6 @@ SLOFILES= \ $(SLO)$/ObjectIdentifier.obj \ $(SLO)$/CachedDataSequence.obj \ $(SLO)$/CommonConverters.obj \ - $(SLO)$/ContextHelper.obj \ $(SLO)$/DataSeriesHelper.obj \ $(SLO)$/DataSource.obj \ $(SLO)$/DataSourceHelper.obj \ @@ -71,15 +70,12 @@ SLOFILES= \ $(SLO)$/LinearRegressionCurveCalculator.obj \ $(SLO)$/LogarithmicRegressionCurveCalculator.obj \ $(SLO)$/MeanValueRegressionCurveCalculator.obj \ - $(SLO)$/OEnumeration.obj \ - $(SLO)$/OIndexContainer.obj \ $(SLO)$/OPropertySet.obj \ $(SLO)$/WrappedPropertySet.obj \ $(SLO)$/WrappedProperty.obj \ $(SLO)$/WrappedIgnoreProperty.obj \ $(SLO)$/WrappedDefaultProperty.obj \ $(SLO)$/WrappedDirectStateProperty.obj \ - $(SLO)$/OStyle.obj \ $(SLO)$/PotentialRegressionCurveCalculator.obj \ $(SLO)$/RegressionCurveHelper.obj \ $(SLO)$/RegressionCurveModel.obj \ -- cgit v1.2.3