From 4573ccfffda4c2bea55d1da2ac1357bcde91e67a Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- chart2/source/controller/main/ElementSelector.hxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'chart2/source/controller/main/ElementSelector.hxx') diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 3992745c9f02..96606b520ca2 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ElementSelector.hxx,v $ - * $Revision: 1.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify -- cgit v1.2.3 From 1333cd2250ff8b1d648062a5767203ea1a051dd2 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 16:56:44 +0100 Subject: changefileheader2: #i10000#: convert files with CR/LF characters to CR only --- chart2/source/controller/main/ElementSelector.hxx | 26 ++++++++++----------- chart2/source/model/main/ChartData.cxx | 8 +++---- chart2/source/model/main/ImplChartModel.cxx | 2 +- chart2/source/view/charttypes/Splines.cxx | 28 +++++++++++------------ chart2/workbench/addin/sampleaddin.def | 14 ++++++------ sc/source/core/tool/formulaparserpool.cxx | 2 +- sc/source/ui/unoobj/shapeuno.cxx | 4 ++-- 7 files changed, 42 insertions(+), 42 deletions(-) (limited to 'chart2/source/controller/main/ElementSelector.hxx') 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 diff --git a/chart2/workbench/addin/sampleaddin.def b/chart2/workbench/addin/sampleaddin.def index 7cb9c12e2f73..78cb684a92f3 100644 --- a/chart2/workbench/addin/sampleaddin.def +++ b/chart2/workbench/addin/sampleaddin.def @@ -1,7 +1,7 @@ -LIBRARY sampleaddin -DESCRIPTION 'Sample Chart AddIn' -HEAPSIZE 0 -EXPORTS -component_getImplementationEnvironment -component_writeInfo -component_getFactory +LIBRARY sampleaddin +DESCRIPTION 'Sample Chart AddIn' +HEAPSIZE 0 +EXPORTS +component_getImplementationEnvironment +component_writeInfo +component_getFactory diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 921fabcb755f..75d1c874eba8 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -158,7 +158,7 @@ Reference< XFormulaParser > ScFormulaParserPool::getFormulaParser( const OUStrin ScParserFactoryMap& rFactoryMap = ScParserFactorySingleton::get(); rxParser = rFactoryMap.createFormulaParser( xComponent, rNamespace ); } - catch( Exception& ) + catch( Exception& ) { } return rxParser; diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 4bf1c4892252..54e18c957fff 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -159,12 +159,12 @@ uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType ) void SAL_CALL ScShapeObj::acquire() throw() { - OWeakObject::acquire(); + OWeakObject::acquire(); } void SAL_CALL ScShapeObj::release() throw() { - OWeakObject::release(); + OWeakObject::release(); } void ScShapeObj::GetShapePropertySet() -- cgit v1.2.3