diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
commit | 1333cd2250ff8b1d648062a5767203ea1a051dd2 (patch) | |
tree | 3607700febb1b83e32c9ebf580d9138f31dc7307 /chart2/source | |
parent | 98830d0c79642a9e81ff7036221515151e4b6cca (diff) |
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'chart2/source')
-rw-r--r-- | chart2/source/controller/main/ElementSelector.hxx | 26 | ||||
-rw-r--r-- | chart2/source/model/main/ChartData.cxx | 8 | ||||
-rw-r--r-- | chart2/source/model/main/ImplChartModel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/Splines.cxx | 28 |
4 files changed, 32 insertions, 32 deletions
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 96606b520ca2..6f51c1df0ce6 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -94,22 +94,22 @@ public: APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ElementSelectorToolbarController) - // XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
-
- // XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- // XStatusListener
- virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
- // XToolbarController
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
+ // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); + + // XInitialization + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + // XToolbarController + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); private: //no default constructor - ElementSelectorToolbarController(){}
-
+ ElementSelectorToolbarController(){} + private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; diff --git a/chart2/source/model/main/ChartData.cxx b/chart2/source/model/main/ChartData.cxx index 1e6e5bc0d3d7..866d4c67e885 100644 --- a/chart2/source/model/main/ChartData.cxx +++ b/chart2/source/model/main/ChartData.cxx @@ -88,12 +88,12 @@ bool ChartData::createDefaultData() throw() { if( hasInternalData() ) { - uno::Reference< lang::XInitialization > xIni(m_xInternalDataProvider,uno::UNO_QUERY);
+ uno::Reference< lang::XInitialization > xIni(m_xInternalDataProvider,uno::UNO_QUERY); if ( xIni.is() ) { - uno::Sequence< uno::Any > aArgs(1);
- beans::NamedValue aParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDefaultData")),uno::makeAny(sal_True));
- aArgs[0] <<= aParam;
+ uno::Sequence< uno::Any > aArgs(1); + beans::NamedValue aParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDefaultData")),uno::makeAny(sal_True)); + aArgs[0] <<= aParam; xIni->initialize(aArgs); return true; } diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx index 8666be2b12ba..2e84d2b4508f 100644 --- a/chart2/source/model/main/ImplChartModel.cxx +++ b/chart2/source/model/main/ImplChartModel.cxx @@ -366,7 +366,7 @@ void ImplChartModel::CreateDefaultChart() xLegendProperties->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 xLegendProperties->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 - if( bIsRTL )
+ if( bIsRTL ) xLegendProperties->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( chart2::LegendPosition_LINE_START )); } if(xDiagram.is()) diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 2cf3477ca763..67ecac93b64c 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -320,17 +320,17 @@ void SplineCalculater::CalculateCubicSplines( rResult.SequenceY.realloc(0); rResult.SequenceZ.realloc(0); - sal_Int32 nOuterCount = rInput.SequenceX.getLength();
- if( !nOuterCount )
+ sal_Int32 nOuterCount = rInput.SequenceX.getLength(); + if( !nOuterCount ) return; - rResult.SequenceX.realloc(nOuterCount);
- rResult.SequenceY.realloc(nOuterCount);
+ rResult.SequenceX.realloc(nOuterCount); + rResult.SequenceY.realloc(nOuterCount); rResult.SequenceZ.realloc(nOuterCount); - for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
- {
- if( rInput.SequenceX[nOuter].getLength() <= 1 )
+ for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter ) + { + if( rInput.SequenceX[nOuter].getLength() <= 1 ) continue; //we need at least two points sal_Int32 nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1 @@ -458,17 +458,17 @@ void SplineCalculater::CalculateBSplines( rResult.SequenceY.realloc(0); rResult.SequenceZ.realloc(0); - sal_Int32 nOuterCount = rInput.SequenceX.getLength();
- if( !nOuterCount )
+ sal_Int32 nOuterCount = rInput.SequenceX.getLength(); + if( !nOuterCount ) return; // no input - rResult.SequenceX.realloc(nOuterCount);
- rResult.SequenceY.realloc(nOuterCount);
+ rResult.SequenceX.realloc(nOuterCount); + rResult.SequenceY.realloc(nOuterCount); rResult.SequenceZ.realloc(nOuterCount); - for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
- {
- if( rInput.SequenceX[nOuter].getLength() <= 1 )
+ for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter ) + { + if( rInput.SequenceX[nOuter].getLength() <= 1 ) continue; // need at least 2 control points sal_Int32 n = rInput.SequenceX[nOuter].getLength()-1; // maximum index of control points |