diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
| commit | 258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch) | |
| tree | 812254806beb1a7af7271469e7148b667b2d96de /chart2 | |
| parent | bc212c565cdc252d2a01e5221a75868b3f01d230 (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit aa08e6374f2a8f11105d84c3d651696be34ef78b (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:24 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit eb4914f043304ba7d164733509794104c7ea5b33
Merge: 5ada805 0815e6f
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:00 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 0815e6f3086d4513fb1dfed2a0ff8e83a3589afc (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6)
Merge: 51cfacc 1d0dc69
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:52:56 2010 +0200
CWS-TOOLING: integrate CWS calc58
commit 51cfacc73ee6162c82dbb735448f5321a2a57269
Merge: 1f33e95 8676b47
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:23:46 2010 +0200
calc58: #i113948# office crashes after resizing chart
chart2/source/model/main/ChartModel.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit db48b114e54b6ceaebd4d77fbb0de1d41a0d69ca
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:03:55 2010 +0200
calc58: #i113946# undo does not work for deleting shapes
.../controller/main/ChartController_Tools.cxx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
commit 3fa83707418cb221c94dcbe32864e5555b618159
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Thu Aug 19 17:12:37 2010 +0200
calc58: #i113879# add ScMatrix::CloneIfConst() and regard only temporary matrices created by the interpreter as mutable
sc/inc/scmatrix.hxx | 11 ++++++++++-
sc/source/core/tool/interpr4.cxx | 7 ++++++-
sc/source/core/tool/interpr5.cxx | 21 +++++++++++++--------
sc/source/core/tool/scmatrix.cxx | 5 +++++
4 files changed, 34 insertions(+), 10 deletions(-)
commit baac8ebc6989a5771b5d1903e5e8f4014ecafeac
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 18:56:10 2010 +0200
calc58: #i113739# make N return 0 for all strings again
sc/source/core/tool/interpr1.cxx | 23 +++++++----------------
sc/source/core/tool/interpr4.cxx | 6 ++++++
2 files changed, 13 insertions(+), 16 deletions(-)
commit ac9660fc7e47b2a7eecdb0c749ee46f592a70635
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 16:52:22 2010 +0200
calc58: #i113820# make TEXT treat string results and inline strings identical to referenced cell text
sc/source/core/tool/interpr1.cxx | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
commit 8676b47d16a1670a4d6ebbc610e8a00abd2367f7
Merge: 6423ab8 1f33e95
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 6423ab81e71f7090d61e81b8992878ce7de43f27
Merge: 6e0de89 772dd5e
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 08:28:57 2010 +0200
mib18: Merge
commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 20:18:10 2010 +0200
mib18: adjusted service name to match VBA symbol
sc/source/ui/vba/vbaglobals.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9725c306fd4502fc6de7d4acf5c302427310a20d
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 18:14:58 2010 +0200
mib18: #163259# implementation of global symbol Excel
sc/source/ui/vba/vbaglobals.cxx | 9 +++++++++
sc/source/ui/vba/vbaglobals.hxx | 1 +
2 files changed, 10 insertions(+), 0 deletions(-)
commit ff7c55aff1293fb51c8ab268d0f478480b0c5685
Merge: 80722e0 6e0de89
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:57:47 2010 +0200
heads merged
commit 80722e0f75ad7d3204f39a580df2f48412e001c3
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:55:52 2010 +0200
mib18: #163120# adding the entrypoint for symbol Debug
sc/source/ui/vba/vbaglobals.cxx | 19 +++++++++++++++++++
sc/source/ui/vba/vbaglobals.hxx | 2 +-
2 files changed, 20 insertions(+), 1 deletions(-)
commit 6e0de8945fbfbee500e0fc9bfa26aaa67abeafa4
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 11:52:54 2010 +0200
mib18: #163243# enable regular expressions in VBA symbol Range.Find
sc/source/ui/vba/vbarange.cxx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit d0093c4e1b54648d1e09c16b389519fdf2564f6e
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 10:27:30 2010 +0200
mib18: #163246# add VBA symbol Worksheet.ProtectScenarios
sc/source/ui/vba/vbaworksheet.cxx | 10 ++++++++--
sc/source/ui/vba/vbaworksheet.hxx | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
commit b9876f93ddc6eaa0e5cf4aaf62cd19d3a08776c4
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 06:57:53 2010 +0200
mib18: #163148# creation og basic modules in library Standard during Workbooks.add
sc/source/ui/vba/vbaworkbooks.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 80e4fe02a80b90182180c409d2f4f803562e02b8
Merge: 36f7091 81cec49
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:39:35 2010 +0200
mib18: Merge
commit 81cec496df67c85bb1b64ef7d15c9f73987882a0
Author: Daniel Rentz <dr@openoffice.org>
Date: Thu Aug 5 15:43:06 2010 +0200
mib18: #162503# do not create a new Worksheet object in Workbook.ActiveSheet but return existing object supporting VBA module access
sc/source/ui/vba/vbaworkbook.cxx | 19 +++++++++++--------
sc/source/ui/vba/vbaworksheets.cxx | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
commit 36f709143ffc8056ece58e93e155a6dab9831cd9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 18:13:02 2010 +0200
mib18: #162938# add VBA symbol Worksheet.AutoFilterMode
sc/source/ui/vba/vbaworksheet.cxx | 37 ++++++++++++++++++++++++++++++++++++-
sc/source/ui/vba/vbaworksheet.hxx | 5 +++++
2 files changed, 41 insertions(+), 1 deletions(-)
commit c650f967f769e4da07f669f60e1f7a636d7e9614
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 16:00:21 2010 +0200
mib18: #163200# full rework of VBA symbols Application.Intersect and Application.Union
sc/source/ui/vba/makefile.mk | 92 +++---
sc/source/ui/vba/vbaapplication.cxx | 599 ++++++++++++++---------------------
2 files changed, 281 insertions(+), 410 deletions(-)
commit 5fa3d6e55b2ab5aac185c10293f8c6a1b7264e63
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:59:00 2010 +0200
mib18: #163198# VBA Names collection must return VBA Name objects
sc/source/ui/vba/vbanames.cxx | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
commit 783c57ec2174b11b06ec29ecb1ae6b9b87996bf6
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:58:00 2010 +0200
mib18: #163195# set correct parent for range returned by VBA ActiveCell symbol
sc/source/ui/vba/vbaapplication.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 32876274fc8fae906bdb52e76059ddedadfa8572
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:56:54 2010 +0200
mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters
sc/source/ui/vba/vbarange.cxx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
commit faa445a0730322e8522999ffb30fdde97bb9b9b9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:54:13 2010 +0200
mib18: #162039# clear covered cells when merging via VBA MergeCells symbol
sc/source/ui/vba/vbarange.cxx | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
Notes
split repo tag: calc_OOO_BUILD_3_2_98_1
Diffstat (limited to 'chart2')
734 files changed, 2489 insertions, 2490 deletions
diff --git a/chart2/inc/pch/precompiled_chart2.cxx b/chart2/inc/pch/precompiled_chart2.cxx index a1ea4db5fe99..60c0f69ad2e0 100644 --- a/chart2/inc/pch/precompiled_chart2.cxx +++ b/chart2/inc/pch/precompiled_chart2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index 199564a9f024..06888d38d579 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx index 9028973936e0..823e4198c67d 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OUString SAL_CALL AccStatisticsObject::getAccessibleName() return getToolTipText(); } -OUString SAL_CALL AccStatisticsObject::getImplementationName() +OUString SAL_CALL AccStatisticsObject::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "StatisticsObject" )); diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index da09342cd8b0..ee2392ae8bc2 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 00335eab296e..aba3ad273f08 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 2361cc62c389..db33f36c1f02 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index d74b5d9d11b9..1b42988389da 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index bbf6176641da..d4edfa0fb724 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index a1236b697a69..be73e745763d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 4833991ad7cc..dce38d072559 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 0ba078e82886..25a2c9bb85ce 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index 5014198761f8..63ec07705a7e 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index e70aa58b8df7..629201a9ceea 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder public: AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ); virtual ~AccessibleViewForwarder(); - + // ________ IAccessibleViewforwarder ________ virtual BOOL IsValid() const; virtual Rectangle GetVisibleArea() const; diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx index b2599fec0c74..1c598966395b 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.cxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/accessibility/ChartElementFactory.hxx b/chart2/source/controller/accessibility/ChartElementFactory.hxx index 399ba93c1b55..168350c360f9 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.hxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 2e1636b4406b..c246426586d9 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index ec888d6f8f8d..bcd99d60edbe 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 6d53fb8b01f6..73d6e99d46f7 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ void lcl_AddPropertiesToVector( ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); - + rOutProperties.push_back( Property( C2U( "AutoMax" ), PROP_AXIS_AUTO_MAX, @@ -206,7 +206,7 @@ void lcl_AddPropertiesToVector( PROP_AXIS_CROSSOVER_VALUE, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::MAYBEVOID )); - + rOutProperties.push_back( Property( C2U( "Origin" ), @@ -242,7 +242,7 @@ void lcl_AddPropertiesToVector( PROP_AXIS_MARK_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); - + //Properties for labels: rOutProperties.push_back( @@ -538,7 +538,7 @@ const Sequence< beans::Property >& AxisWrapper::getPropertySequence() const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + aWrappedProperties.push_back( new WrappedTextRotationProperty() ); aWrappedProperties.push_back( new WrappedProperty( C2U( "Marks" ), C2U( "MajorTickmarks" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "HelpMarks" ), C2U( "MinorTickmarks" ) ) ); @@ -568,10 +568,10 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() } WrappedScaleProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + return aWrappedProperties; } diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 86bd52367bbe..c8da648d9d76 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; - + tAxisType m_eType; ::com::sun::star::uno::Any m_aTemporaryHelpStepValue; }; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 1b0d8fb4889c..bf29904ed85e 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -209,7 +209,7 @@ awt::Rectangle Chart2ModelContact::GetDiagramRectangleIncludingAxes() const { awt::Rectangle aRect(0,0,0,0); uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) ); - + if( DiagramPositioningMode_INCLUDING == DiagramHelper::getDiagramPositioningMode( xDiagram ) ) aRect = DiagramHelper::getDiagramRectangleFromModel(m_xChartModel); else diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index e20167e216c2..6f2420f0e0e4 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 062dcc1a129d..a9a1160ce8ff 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -523,7 +523,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); if( !xChartDoc.is() ) return; - + // remember some diagram properties to reset later sal_Bool bStacked = sal_False; sal_Bool bPercent = sal_False; @@ -548,10 +548,10 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) DataSourceHelper::detectRangeSegmentation( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ), aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ); - + if( !bHasCategories && rDataOperator.setsCategories( bUseColumns ) ) bHasCategories = true; - + aRangeString = C2U("all"); uno::Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments( aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index d56397953d79..af101edd205d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index d6487d425657..144fd7249bcf 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1424,7 +1424,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( { if( !m_xShapeFactory.is() && m_xChartView.is() ) { - Reference< lang::XUnoTunnel> xUnoTunnel(m_xChartView,uno::UNO_QUERY); + Reference< lang::XUnoTunnel> xUnoTunnel(m_xChartView,uno::UNO_QUERY); if(xUnoTunnel.is()) { ExplicitValueProvider* pProvider = reinterpret_cast<ExplicitValueProvider*>(xUnoTunnel->getSomething( diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index d69212512ebe..f7eda5e3d588 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -154,10 +154,10 @@ void lcl_AddPropertiesToVector_PointProperties( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } - + void lcl_AddPropertiesToVector_SeriesOnly( ::std::vector< Property > & rOutProperties ) -{ +{ rOutProperties.push_back( Property( C2U( "Axis" ), PROP_SERIES_ATTACHED_AXIS, @@ -195,7 +195,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrappe } WrappedSymbolProperties::addProperties( aProperties ); //for series and points WrappedDataCaptionProperties::addProperties( aProperties ); //for series and points - + ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::LineProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); @@ -489,11 +489,11 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any if( aArguments.getLength() >= 2 ) aArguments[1] >>= m_nPointIndex; } - + if( !m_xDataSeries.is() ) throw uno::Exception( C2U( "DataSeries index invalid" ), static_cast< ::cppu::OWeakObject * >( this )); - + //todo: check upper border of point index if( m_nPointIndex >= 0 ) @@ -660,7 +660,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const :: void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - if( m_eType == DATA_SERIES ) + if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); else { @@ -728,7 +728,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope WrappedSymbolProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact ); WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + //add unnamed fill properties (different inner names here) // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) ); // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillHatch" ), C2U( "HatchName" ) ) ); @@ -736,7 +736,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope //add unnamed line properties (different inner names here) // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "LineDash" ), C2U( "LineDashName" ) ) ); - + aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) ); aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) ); aWrappedProperties.push_back( new WrappedLineColorProperty( this ) ); @@ -745,7 +745,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty( C2U( "LineWidth" ), C2U( "BorderWidth" ), C2U( "LineWidth" ), this ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillStyle" ), C2U( "FillStyle" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparence" ), C2U( "Transparency" ) ) ); - + aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny( drawing::LineJoint_ROUND ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparenceGradientName" ), C2U( "TransparencyGradientName" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillGradientName" ), C2U( "GradientName" ) ) ); @@ -782,7 +782,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& r if( ! (rValue >>= m_bLinesAllowed) ) throw lang::IllegalArgumentException( C2U("Property Lines requires value of type sal_Bool"), 0, 0 ); } - + sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName( C2U("ErrorCategory") ); if( nErrorCategoryHandle == nHandle ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index b7246306959c..26a504feed8e 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace chart namespace wrapper { - + class Chart2ModelContact; class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper4< @@ -145,7 +145,7 @@ private: sal_Int32 m_nPointIndex; sal_Bool m_bLinesAllowed; - + //this should only be used, if the DataSeriesPointWrapper is initialized via the XInitialize interface //because a big change in the chartmodel may leed to an dataseriespointer thats not connected to the model anymore //with the indizes instead we are can aleays get the new dataseries diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index c0be0ddcbf0d..93d1e0201624 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -604,7 +604,7 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" ) , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" ) ) - + ; return g_aChartTypeNameMap; } @@ -750,7 +750,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); @@ -1161,7 +1161,7 @@ void SAL_CALL DiagramWrapper::dispose() // /-- MutexGuard aGuard( GetMutex()); - + DisposeHelper::DisposeAndClear( m_xXAxisTitle ); DisposeHelper::DisposeAndClear( m_xYAxisTitle ); DisposeHelper::DisposeAndClear( m_xZAxisTitle ); @@ -1389,7 +1389,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re StackMode eInnerStackMode; bool bHasDetectableInnerValue = detectInnerValue( eInnerStackMode ); - + if( !bHasDetectableInnerValue ) { m_aOuterValue = rOuterValue; @@ -1400,7 +1400,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re return; if( !bNewValue && eInnerStackMode != m_eStackMode ) return; - + Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) { @@ -1788,8 +1788,8 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) throw lang::IllegalArgumentException( C2U("Property AttributedDataPoints requires value of type uno::Sequence< uno::Sequence< sal_Int32 > >"), 0, 0 ); - - m_aOuterValue = rOuterValue; + + m_aOuterValue = rOuterValue; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); @@ -1811,7 +1811,7 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal { uno::Any aVal; if( i < aNewValue.getLength() ) - aVal <<= aNewValue[i]; + aVal <<= aNewValue[i]; else { //set empty sequence @@ -1983,7 +1983,7 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con throw lang::IllegalArgumentException( C2U("Property AutomaticSize requires value of type boolean"), 0, 0 ); try - { + { if( bNewValue ) { Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) ); @@ -2091,7 +2091,7 @@ const Sequence< beans::Property >& DiagramWrapper::getPropertySequence() const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAxisLabelExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); @@ -2104,7 +2104,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); - + aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED_PERCENT, m_spChart2ModelContact ) ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 111e24bd6a8b..1b4c8135381a 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ class DiagramWrapper : public ::cppu::ImplInheritanceHelper12< WrappedPropertySet , ::com::sun::star::chart::XDiagram , ::com::sun::star::chart::XAxisZSupplier - , ::com::sun::star::chart::XTwoAxisXSupplier // : XAxisXSupplier - , ::com::sun::star::chart::XTwoAxisYSupplier // : XAxisYSupplier + , ::com::sun::star::chart::XTwoAxisXSupplier // : XAxisXSupplier + , ::com::sun::star::chart::XTwoAxisYSupplier // : XAxisYSupplier , ::com::sun::star::chart::XStatisticDisplay , ::com::sun::star::chart::X3DDisplay , ::com::sun::star::chart::X3DDefaultSetter diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index ff36c4cebcc7..a14dbecbdf91 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index c731b6c22666..ee0c149517b3 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 02ffcb942c99..7d207fa6ef8c 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -309,7 +309,7 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 94434a387d4e..0cd481d30245 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index fdfc7c094aaf..c2545e78f059 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ const Sequence< Property > & lcl_GetPropertySequence() { // get properties ::std::vector< ::com::sun::star::beans::Property > aProperties; - + ::chart::LineProperties::AddPropertiesToVector( aProperties ); // ::chart::NamedLineProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); @@ -329,7 +329,7 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const ::rtl:: uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); - + if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 449a1f550860..5794143a47ca 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ class MinMaxLineWrapper : public MutexContainer , ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates - // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + , ::com::sun::star::beans::XMultiPropertyStates + // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx index 085128cddeeb..90db6c3d7658 100644 --- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx +++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 20785faa8b66..f3766873453b 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -250,7 +250,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) if(xPropertySet.is()) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); @@ -327,7 +327,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue { OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); - + Reference< beans::XPropertySet > xProp( getFirstCharacterPropertySet(), uno::UNO_QUERY ); Reference< beans::XFastPropertySet > xFastProp( xProp, uno::UNO_QUERY ); if(xProp.is()) @@ -342,7 +342,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue rValue = xFastProp->getFastPropertyValue( nHandle ); } } - + } void TitleWrapper::setFastCharacterPropertyValue( @@ -532,14 +532,14 @@ const Sequence< beans::Property >& TitleWrapper::getPropertySequence() const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) ); aWrappedProperties.push_back( new WrappedTextRotationProperty( m_eTitleType==TitleHelper::Y_AXIS_TITLE || m_eTitleType==TitleHelper::X_AXIS_TITLE ) ); aWrappedProperties.push_back( new WrappedStackedTextProperty() ); WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + return aWrappedProperties; } diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 63902e452ee3..835c69e2df9d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 338131c4f973..a52570300b85 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ const Sequence< Property > & lcl_GetPropertySequence() { // get properties ::std::vector< ::com::sun::star::beans::Property > aProperties; - + ::chart::LineProperties::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); // ::chart::NamedProperties::AddPropertiesToVector( aProperties ); @@ -294,7 +294,7 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const ::rtl::O { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); - + if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 5b028a6acc66..d978ae7873b1 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ class UpDownBarWrapper : public MutexContainer , ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates - // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + , ::com::sun::star::beans::XMultiPropertyStates + // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: @@ -120,7 +120,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; + ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; rtl::OUString m_aPropertySetName; ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index a43bc610fc0c..f2f662bee4a0 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 44cb241281e3..b70e900f5253 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 8315a22d8ab4..4b64d5c295f7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index e807873c82dc..d905c5df3e63 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 15ae48bc22dd..99afc793f001 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, throw lang::IllegalArgumentException( C2U("Property AutomaticPosition requires value of type boolean"), 0, 0 ); try - { + { if( bNewValue ) { Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 1211f76c8f1f..72ed97d4ce07 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 0c4a98263a04..b6efacc89473 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -314,11 +314,11 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { sal_Bool bHasTitle = sal_False; - + Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); if( xTitle.is() && (TitleHelper::getCompleteString( xTitle ).getLength() != 0) ) bHasTitle = sal_True; - + Any aRet; aRet <<= bHasTitle; return aRet; @@ -343,7 +343,7 @@ public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAxisLabelExistenceProperty(); - + virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx index a02e19d2a67c..f63d7883d79b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 5fca42c2b3ad..322c096c77b7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 34329d6d3a52..ac32feb5399c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index bc91136590cb..7f64d4c9fa8e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ enum sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) { sal_Int32 nCaption=0; - + if( rLabel.ShowNumber ) nCaption |= ::com::sun::star::chart::ChartDataCaption::VALUE; if( rLabel.ShowNumberInPercent ) @@ -84,14 +84,14 @@ sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) nCaption |= ::com::sun::star::chart::ChartDataCaption::TEXT; if( rLabel.ShowLegendSymbol ) nCaption |= ::com::sun::star::chart::ChartDataCaption::SYMBOL; - + return nCaption; } chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) { chart2::DataPointLabel aLabel(false,false,false,false); - + if( nCaption & ::com::sun::star::chart::ChartDataCaption::VALUE ) aLabel.ShowNumber = true; if( nCaption & ::com::sun::star::chart::ChartDataCaption::PERCENT ) @@ -100,7 +100,7 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) aLabel.ShowCategoryName = true; if( nCaption & ::com::sun::star::chart::ChartDataCaption::SYMBOL ) aLabel.ShowLegendSymbol = true; - + return aLabel; } @@ -110,7 +110,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList { //if !spChart2ModelContact.get() is then the created properties do belong to a single series or single datapoint //otherwise they do belong to the whole diagram - + rList.push_back( new WrappedDataCaptionProperty( spChart2ModelContact, ePropertyType ) ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index f805d7e87fa0..889031f98929 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index a5dc9b23feed..711b47a7e6e5 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 1ec7180d5455..871fb5c7ac95 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 7a8d1554df7d..9083e9849f1b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 51e9b253150b..95b1e4a1c9ca 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index b0fc030d0fbf..de404cf24a44 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons bool bSetScaleData = false; chart2::ScaleData aScaleData( xAxis->getScaleData() ); - + sal_Bool bBool = false; switch( eScaleProperty ) { @@ -271,7 +271,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons if( rOuterValue >>= bBool ) { bool bWasLogarithm = AxisHelper::isLogarithmic( aScaleData.Scaling ); - + // safe comparison between sal_Bool and bool if( (!bBool) != (!bWasLogarithm) ) { @@ -312,17 +312,17 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( m_aOuterValue ); - + Reference< chart2::XAxis > xAxis( xInnerPropertySet, uno::UNO_QUERY ); OSL_ENSURE(xAxis.is(),"need an XAxis"); if(!xAxis.is()) return aRet; - + chart2::ScaleData aScaleData( xAxis->getScaleData() ); - + chart2::ExplicitScaleData aExplicitScale; chart2::ExplicitIncrementData aExplicitIncrement; - + switch( eScaleProperty ) { case SCALE_PROP_MAX: @@ -347,7 +347,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const } break; } - + case SCALE_PROP_STEPMAIN: { aRet = aScaleData.IncrementData.Distance; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 4d29bc009777..5f8b8fb6d0aa 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ protected: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; tScaleProperty m_eScaleProperty; - + mutable ::com::sun::star::uno::Any m_aOuterValue; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 5e11a3012cf3..5e08685d707b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") ); - + if( xInnerPropertySet.is() ) { bool bNewValue = false; @@ -108,7 +108,7 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") ); - + Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index 0094e30f7def..734a365856ac 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 68d408ea7147..27ded24a1458 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,12 +85,12 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue ::basegfx::B3DHomMatrix aNewMatrix = aMatrix*aObjectMatrix; aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix); - + WrappedProperty::setPropertyValue( uno::makeAny(aHM), xInnerPropertySet ); return; } } - + WrappedProperty::setPropertyValue( rOuterValue, xInnerPropertySet ); } @@ -105,7 +105,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: { ::basegfx::B3DTuple aRotation( BaseGFXHelper::GetRotationFromMatrix( BaseGFXHelper::HomogenMatrixToB3DHomMatrix( aHM ) ) ); - + ::basegfx::B3DHomMatrix aMatrix; aMatrix.rotate( aRotation.getX(), aRotation.getY(), aRotation.getZ() ); ::basegfx::B3DHomMatrix aObjectMatrix; @@ -116,7 +116,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: return uno::makeAny(aHM); } } - + return WrappedProperty::getPropertyValue( xInnerPropertySet ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 23a186de6406..a166b5083990 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public: class WrappedD3DTransformMatrixProperty : public WrappedProperty { public: - WrappedD3DTransformMatrixProperty( + WrappedD3DTransformMatrixProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedD3DTransformMatrixProperty(); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index 6124e2baf506..fa92e640cd0b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index 6045802f4a5d..9884482055b7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 02ab979163bb..a079cc3316b2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 16ddb1137d4a..a7f0fe578cbd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -268,14 +268,14 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue rOuterValue >>= nOuterValue; chart2::CurveStyle aInnerValue; - + if(1==nOuterValue) aInnerValue = chart2::CurveStyle_CUBIC_SPLINES; else if(2==nOuterValue) aInnerValue = chart2::CurveStyle_B_SPLINES; else aInnerValue = chart2::CurveStyle_LINES; - + return uno::makeAny(aInnerValue); } //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 877d9cbe9a51..5687439cb7c9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 1c7b495bd566..ae27c41dfa8a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -884,7 +884,7 @@ WrappedRegressionCurvesProperty::~WrappedRegressionCurvesProperty() uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY ); if( xRegCnt.is() ) { - aRet = lcl_getRegressionCurveType( + aRet = lcl_getRegressionCurveType( RegressionCurveHelper::getFirstRegressTypeNotMeanValueLine( xRegCnt ) ); } return aRet; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index 973f0fef8ec8..6571d737e3d0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 3ecb23ce84d2..5494b1783628 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( xDiagram, xFactory ); - uno::Reference< chart2::XChartTypeTemplate > xTemplate = + uno::Reference< chart2::XChartTypeTemplate > xTemplate = getNewTemplate( bNewValue, aTemplateAndService.second, xFactory ); if(xTemplate.is()) @@ -191,7 +191,7 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla if(!xFactory.is()) return xTemplate; - + if( bNewValue ) //add volume { if( rCurrentTemplate.equals( C2U( "com.sun.star.chart2.template.StockLowHighClose" ) ) ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index 3693b521b7dc..71d15b4c92bc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 4ca8f7161f6e..3d6f9fc37b9b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 5a175623e441..b163415e90a8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index a5d5afe6debc..efd6da8133c3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index ba0bf8919919..46847b8be56d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 6349a121ff28..8ccc2cf6a1fa 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index 3945090217e0..11f9d3879662 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc index 16bffd0cf86d..232dc4a82a04 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc +++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src index 738c133483e1..8c48d703b808 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.src +++ b/chart2/source/controller/dialogs/Bitmaps_HC.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx index 22886c9b6108..a9102fb1922d 100644 --- a/chart2/source/controller/dialogs/ChangingResource.cxx +++ b/chart2/source/controller/dialogs/ChangingResource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index ed6be33b912e..86b8ec3f4525 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ public: virtual ~ChangingResource(); virtual void setChangeListener( ResourceChangeListener* pListener ); - + protected: ResourceChangeListener* m_pChangeListener; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 5e8bd7336b86..bc4e784b7d12 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,7 +181,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( //not all templates need to support CurveStyle, CurveResolution or SplineOrder ex.Context.is();//to have debug information without compilation warnings } - + try { xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D; @@ -453,7 +453,7 @@ ColumnChartDialogController::~ColumnChartDialogController() } String ColumnChartDialogController::getName() { - return String( SchResId( STR_TYPE_COLUMN )); + return String( SchResId( STR_TYPE_COLUMN )); } Image ColumnChartDialogController::getImage( bool bIsHighContrast ) { @@ -530,7 +530,7 @@ BarChartDialogController::~BarChartDialogController() } String BarChartDialogController::getName() { - return String( SchResId( STR_TYPE_BAR )); + return String( SchResId( STR_TYPE_BAR )); } Image BarChartDialogController::getImage( bool bIsHighContrast ) { @@ -668,7 +668,7 @@ LineChartDialogController::~LineChartDialogController() } String LineChartDialogController::getName() { - return String( SchResId( STR_TYPE_LINE )); + return String( SchResId( STR_TYPE_LINE )); } Image LineChartDialogController::getImage( bool bIsHighContrast ) { @@ -736,7 +736,7 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) ); } } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -780,7 +780,7 @@ void LineChartDialogController::adjustParameterToSubType( ChartTypeParameter& rP rParameter.bLines = false; break; } - + if(!rParameter.b3DLook && rParameter.eStackMode == GlobalStackMode_STACK_Z ) rParameter.eStackMode = GlobalStackMode_NONE; } @@ -801,7 +801,7 @@ XYChartDialogController::~XYChartDialogController() } String XYChartDialogController::getName() { - return String( SchResId( STR_TYPE_XY )); + return String( SchResId( STR_TYPE_XY )); } Image XYChartDialogController::getImage( bool bIsHighContrast ) { @@ -838,7 +838,7 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsH rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) ); rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -888,7 +888,7 @@ AreaChartDialogController::~AreaChartDialogController() } String AreaChartDialogController::getName() { - return String( SchResId( STR_TYPE_AREA )); + return String( SchResId( STR_TYPE_AREA )); } Image AreaChartDialogController::getImage( bool bIsHighContrast ) { @@ -927,7 +927,7 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) ); rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); @@ -971,7 +971,7 @@ NetChartDialogController::~NetChartDialogController() } String NetChartDialogController::getName() { - return String( SchResId( STR_TYPE_NET )); + return String( SchResId( STR_TYPE_NET )); } Image NetChartDialogController::getImage( bool bIsHighContrast ) { @@ -1007,7 +1007,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); - + if( GlobalStackMode_NONE == rParameter.eStackMode ) { rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) ); @@ -1064,7 +1064,7 @@ StockChartDialogController::~StockChartDialogController() } String StockChartDialogController::getName() { - return String( SchResId( STR_TYPE_STOCK )); + return String( SchResId( STR_TYPE_STOCK )); } Image StockChartDialogController::getImage( bool bIsHighContrast ) { @@ -1115,7 +1115,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() } String CombiColumnLineChartDialogController::getName() { - return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); + return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast ) { @@ -1170,7 +1170,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c m_pFT_NumberOfLines->SetPosPixel( Point( rPosition.X(), rPosition.Y()+aDistanceSize.Height()) ); m_pMF_NumberOfLines->SetPosPixel( Point( rPosition.X()+aFTSize.Width()+aDistanceSize.Width(), rPosition.Y()) ); - + m_pFT_NumberOfLines->Show(); m_pMF_NumberOfLines->Show(); } @@ -1255,7 +1255,7 @@ BubbleChartDialogController::~BubbleChartDialogController() } String BubbleChartDialogController::getName() { - return String( SchResId( STR_TYPE_BUBBLE )); + return String( SchResId( STR_TYPE_BUBBLE )); } Image BubbleChartDialogController::getImage( bool bIsHighContrast ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 56ffb93e4a60..d89518baf0ea 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ class ChartTypeParameter public: ChartTypeParameter( sal_Int32 nSubTypeIndex, bool bXAxisWithValues=false , bool b3DLook=false, GlobalStackMode eStackMode=GlobalStackMode_NONE - , bool _bSymbols = true, bool _bLines = true + , bool _bSymbols = true, bool _bLines = true , ::com::sun::star::chart2::CurveStyle eCurveStyle = ::com::sun::star::chart2::CurveStyle_LINES ); ChartTypeParameter(); virtual ~ChartTypeParameter(); @@ -82,7 +82,7 @@ public: bool b3DLook; bool bSymbols; bool bLines; - + GlobalStackMode eStackMode; ::com::sun::star::chart2::CurveStyle eCurveStyle; @@ -102,7 +102,7 @@ class ChartTypeDialogController : public ChangingResource public: ChartTypeDialogController(); virtual ~ChartTypeDialogController(); - + virtual String getName()=0; virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; @@ -122,7 +122,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - + virtual bool isSubType( const rtl::OUString& rServiceName ); virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); @@ -146,10 +146,10 @@ class ColumnOrBarChartDialogController_Base : public ChartTypeDialogController public: ColumnOrBarChartDialogController_Base(); virtual ~ColumnOrBarChartDialogController_Base(); - + virtual bool shouldShow_3DLookControl() const; virtual bool shouldShow_GeometryControl() const; - + virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter ); }; @@ -158,7 +158,7 @@ class ColumnChartDialogController : public ColumnOrBarChartDialogController_Base public: ColumnChartDialogController(); virtual ~ColumnChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -170,7 +170,7 @@ class BarChartDialogController : public ColumnOrBarChartDialogController_Base public: BarChartDialogController(); virtual ~BarChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -182,7 +182,7 @@ class PieChartDialogController : public ChartTypeDialogController public: PieChartDialogController(); virtual ~PieChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -197,14 +197,14 @@ class LineChartDialogController : public ChartTypeDialogController public: LineChartDialogController(); virtual ~LineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; virtual bool shouldShow_DeepStackingControl() const; virtual bool shouldShow_SplineControl() const; @@ -215,13 +215,13 @@ class XYChartDialogController : public ChartTypeDialogController public: XYChartDialogController(); virtual ~XYChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_SplineControl() const; virtual bool shouldShow_SortByXValuesResourceGroup() const; }; @@ -231,14 +231,14 @@ class AreaChartDialogController : public ChartTypeDialogController public: AreaChartDialogController(); virtual ~AreaChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_3DLookControl() const; }; @@ -247,13 +247,13 @@ class NetChartDialogController : public ChartTypeDialogController public: NetChartDialogController(); virtual ~NetChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; }; @@ -262,7 +262,7 @@ class StockChartDialogController : public ChartTypeDialogController public: StockChartDialogController(); virtual ~StockChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -275,7 +275,7 @@ class CombiColumnLineChartDialogController : public ChartTypeDialogController public: CombiColumnLineChartDialogController(); virtual ~CombiColumnLineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -287,10 +287,10 @@ public: virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; - + virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); -private: +private: DECL_LINK( ChangeLineCountHdl, void* ); private: @@ -303,7 +303,7 @@ class BubbleChartDialogController : public ChartTypeDialogController public: BubbleChartDialogController(); virtual ~BubbleChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx index b2790a1678bb..fd9b9fcd83de 100644 --- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx +++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc index 8a3ae8f9f63c..d594420464c1 100644 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ b/chart2/source/controller/dialogs/CommonResources.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 67930fc6f7a7..da92f145af61 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1221,7 +1221,7 @@ void DataBrowser::ColumnResized( USHORT nColId ) SetUpdateMode( bLastUpdateMode ); } -// virtual void MouseMove( const MouseEvent& rEvt ); +// virtual void MouseMove( const MouseEvent& rEvt ); void DataBrowser::EndScroll() { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3583db2770c0..8ba66d264e8d 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,14 +79,14 @@ public: virtual ~DataBrowser(); /** GetCellText returns the text at the given position - @param nRow + @param nRow the number of the row - @param nColId + @param nColId the ID of the column @return the text out of the cell */ - virtual String GetCellText(long nRow, USHORT nColId) const; + virtual String GetCellText(long nRow, USHORT nColId) const; /** returns the number in the given cell. If a cell is empty or contains a string, the result will be Nan @@ -182,7 +182,7 @@ private: /// note: m_aTextEditField must precede this member! ::svt::CellControllerRef m_rTextEditController; - Link m_aCursorMovedHdlLink; + Link m_aCursorMovedHdlLink; Link m_aCellModifiedLink; void clearHeaders(); @@ -201,4 +201,4 @@ private: } // namespace chart -#endif // CHART_DATA_BROWSER_HXX +#endif // CHART_DATA_BROWSER_HXX diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index c0b865536686..1440210ce0c6 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -869,7 +869,7 @@ void DataBrowserModel::updateFromModel() } else if( aRole.equals( C2U( "values-x" ) ) ) nSequenceNumberFormatKey = nXAxisNumberFormat; - + if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end()) { diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index a4378972f70f..2331cd023683 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index f32a882aa1e9..83a22eedb5c9 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index dcca6c716b8d..05263d70aead 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 0836ab9ca93a..d6ee1ce3ff0e 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -197,7 +197,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal , C2U("%CATEGORYVALUE") , ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex ) ); - + aRet = aCategory; } else @@ -338,7 +338,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID { rtl::OUString aRet; - + Reference< XAxis > xAxis( ObjectIdentifier::getObjectPropertySet( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -347,7 +347,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID sal_Int32 nDimensionIndex = 0; sal_Int32 nAxisIndex = 0; AxisHelper::getIndicesForAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ), nCooSysIndex, nDimensionIndex, nAxisIndex ); - + switch(nDimensionIndex) { case 0://x-axis @@ -369,7 +369,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID aRet=String(SchResId(STR_OBJECT_AXIS)); break; } - + return aRet; } @@ -405,7 +405,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) DBG_ERROR("unknown title type"); break; } - + if( !aRet.getLength() ) aRet=String(SchResId(STR_OBJECT_TITLE)); @@ -437,7 +437,7 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { rtl::OUString aRet; - + sal_Int32 nCooSysIndex = -1; sal_Int32 nDimensionIndex = -1; @@ -558,7 +558,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, break; } } - + OUString aReplacement( OUString::valueOf(nSeriesIndex+1) ); aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement ); } diff --git a/chart2/source/controller/dialogs/RangeEdit.cxx b/chart2/source/controller/dialogs/RangeEdit.cxx index 55888156b1b1..733f066a7584 100644 --- a/chart2/source/controller/dialogs/RangeEdit.cxx +++ b/chart2/source/controller/dialogs/RangeEdit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 9b94d7e1752b..a8575dfb6233 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index ccb4979420d1..ccc6468f0b0b 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index a2bb0b7602d6..025782cf4603 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 2ab544c77ab1..4e6f01595b61 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ #define TP_LAYOUT 907 #define TP_OPTIONS 908 #define TP_POLAROPTIONS 909 -#define TP_AXIS_LABEL 920 -#define TP_SCALE 903 +#define TP_AXIS_LABEL 920 +#define TP_SCALE 903 #define TP_AXIS_POSITIONS 904 #define TP_CHARTTYPE 910 #define TP_RANGECHOOSER 911 diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b4cec65426e..6b684d023eed 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ String STR_PAGE_POSITIONING // String STR_PAGE_STATISTICS // { -// Text [ en-US ] = "Statistics" ; +// Text [ en-US ] = "Statistics" ; // }; String STR_PAGE_TRENDLINE_TYPE diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src index f233ddaa7c20..bc658def2a0c 100644 --- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src +++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src index 6c7fc5a752aa..d06612a5afb8 100644 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ b/chart2/source/controller/dialogs/Strings_ChartTypes.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src index e7a3d6c2b1cf..9185552cb90a 100644 --- a/chart2/source/controller/dialogs/Strings_Scale.src +++ b/chart2/source/controller/dialogs/Strings_Scale.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src index f2dc4235f783..7fdd1642ef4e 100644 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ b/chart2/source/controller/dialogs/Strings_Statistic.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 1f445083738f..342495738ce5 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,13 +52,13 @@ //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES // ID's for title rotation tabpage -#define CTR_DIAL 6030 -#define BTN_TXTSTACKED 6031 -#define FT_DEGREES 6032 -#define NF_ORIENT 6033 -#define CTR_DUMMY 6034 -#define FT_DUMMY 6035 -#define FL_ALIGN 6037 +#define CTR_DIAL 6030 +#define BTN_TXTSTACKED 6031 +#define FT_DEGREES 6032 +#define NF_ORIENT 6033 +#define CTR_DUMMY 6034 +#define FT_DUMMY 6035 +#define FL_ALIGN 6037 #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 @@ -82,59 +82,59 @@ //------------ //from old chart tplabel.hrc -//#define TP_AXIS_LABEL 920 +//#define TP_AXIS_LABEL 920 -#define CB_AXIS_LABEL_SCHOW_DESCR 1 +#define CB_AXIS_LABEL_SCHOW_DESCR 1 -//#define FL_AXIS_LABEL_FORMATTING 2 +//#define FL_AXIS_LABEL_FORMATTING 2 -#define FL_AXIS_LABEL_ORIENTATION 3 -#define CT_AXIS_LABEL_DIAL 4 -#define PB_AXIS_LABEL_TEXTSTACKED 5 -#define FT_AXIS_LABEL_DEGREES 6 -#define NF_AXIS_LABEL_ORIENT 7 -#define FT_UNUSED 8 -#define CT_UNUSED 9 +#define FL_AXIS_LABEL_ORIENTATION 3 +#define CT_AXIS_LABEL_DIAL 4 +#define PB_AXIS_LABEL_TEXTSTACKED 5 +#define FT_AXIS_LABEL_DEGREES 6 +#define NF_AXIS_LABEL_ORIENT 7 +#define FT_UNUSED 8 +#define CT_UNUSED 9 -#define FL_AXIS_LABEL_TEXTFLOW 10 -#define CB_AXIS_LABEL_TEXTOVERLAP 11 -#define CB_AXIS_LABEL_TEXTBREAK 12 +#define FL_AXIS_LABEL_TEXTFLOW 10 +#define CB_AXIS_LABEL_TEXTOVERLAP 11 +#define CB_AXIS_LABEL_TEXTBREAK 12 -#define FL_AXIS_LABEL_ORDER 13 -#define RB_AXIS_LABEL_SIDEBYSIDE 14 -#define RB_AXIS_LABEL_UPDOWN 15 -#define RB_AXIS_LABEL_DOWNUP 16 -#define RB_AXIS_LABEL_AUTOORDER 17 +#define FL_AXIS_LABEL_ORDER 13 +#define RB_AXIS_LABEL_SIDEBYSIDE 14 +#define RB_AXIS_LABEL_UPDOWN 15 +#define RB_AXIS_LABEL_DOWNUP 16 +#define RB_AXIS_LABEL_AUTOORDER 17 -#define FL_SEPARATOR 18 +#define FL_SEPARATOR 18 #define FT_AXIS_TEXTDIR 19 #define LB_AXIS_TEXTDIR 20 -//#define TP_SCALE 903 +//#define TP_SCALE 903 -#define FL_SCALE 1 +#define FL_SCALE 1 -#define TXT_MIN 1 -#define TXT_MAX 2 -#define TXT_STEP_MAIN 3 -#define TXT_STEP_HELP 4 -#define TXT_ORIGIN 5 +#define TXT_MIN 1 +#define TXT_MAX 2 +#define TXT_STEP_MAIN 3 +#define TXT_STEP_HELP 4 +#define TXT_ORIGIN 5 -#define CBX_AUTO_MIN 1 -#define CBX_AUTO_MAX 2 -#define CBX_AUTO_STEP_MAIN 3 -#define CBX_AUTO_STEP_HELP 4 -#define CBX_AUTO_ORIGIN 5 -#define CBX_LOGARITHM 6 +#define CBX_AUTO_MIN 1 +#define CBX_AUTO_MAX 2 +#define CBX_AUTO_STEP_MAIN 3 +#define CBX_AUTO_STEP_HELP 4 +#define CBX_AUTO_ORIGIN 5 +#define CBX_LOGARITHM 6 #define CBX_REVERSE 7 -#define EDT_STEP_MAIN 1 -#define EDT_MAX 2 -#define EDT_MIN 3 +#define EDT_STEP_MAIN 1 +#define EDT_MAX 2 +#define EDT_MIN 3 #define EDT_ORIGIN 4 -#define MT_STEPHELP 10 +#define MT_STEPHELP 10 //#define TP_AXIS_POSITIONS 904 @@ -145,24 +145,24 @@ #define FL_GRIDS 5 #define FT_CROSSES_OTHER_AXIS_AT 1 -#define FT_AXIS_LABEL_DISTANCE 2 -#define FT_PLACE_LABELS 3 -#define FT_MAJOR 4 -#define FT_MINOR 5 +#define FT_AXIS_LABEL_DISTANCE 2 +#define FT_PLACE_LABELS 3 +#define FT_MAJOR 4 +#define FT_MINOR 5 #define FT_PLACE_TICKS 6 #define LB_CROSSES_OTHER_AXIS_AT 1 #define LB_PLACE_LABELS 2 #define EDT_CROSSES_OTHER_AXIS_AT 3 #define EDT_CROSSES_OTHER_AXIS_AT_CATEGORY 4 -#define EDT_AXIS_LABEL_DISTANCE 5 +#define EDT_AXIS_LABEL_DISTANCE 5 #define LB_PLACE_TICKS 6 #define CB_AXIS_BETWEEN_CATEGORIES 1 -#define CB_TICKS_INNER 2 -#define CB_TICKS_OUTER 3 -#define CB_MINOR_INNER 4 -#define CB_MINOR_OUTER 5 +#define CB_TICKS_INNER 2 +#define CB_TICKS_OUTER 3 +#define CB_MINOR_INNER 4 +#define CB_MINOR_OUTER 5 #define CB_MAJOR_GRID 6 #define CB_MINOR_GRID 7 diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 23a1b4e806bd..379cf9257ab0 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index f1af209697cc..a5a8df15e565 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 8846b310cde4..d9da20f77ec2 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index f446c52ac0de..192e9652d2da 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent FreeResource(); this->SetText(String(SchResId(STR_PAGE_CHARTTYPE))); - + //don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); m_pChartTypeTabPage->initializePage(); diff --git a/chart2/source/controller/dialogs/dlg_ChartType.hrc b/chart2/source/controller/dialogs/dlg_ChartType.hrc index 0b5c20dae05c..940290bbba8f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.hrc +++ b/chart2/source/controller/dialogs/dlg_ChartType.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src index 5523ad8956db..07a2627be6b2 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.src +++ b/chart2/source/controller/dialogs/dlg_ChartType.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,19 +39,19 @@ ModalDialog DLG_DIAGRAM_TYPE { HelpID = SID_DIAGRAM_TYPE ; - + Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_BUTTONS { Pos = MAP_APPFONT ( 0 , CHART_TYPE_DLG_HEIGHT-24 ) ; Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , 8 ) ; }; - + BUTTONS_OK_CANCEL_HELP( CHART_TYPE_DLG_WIDTH-161 ,CHART_TYPE_DLG_HEIGHT-17 , 53, 0 ) }; diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index aa9db2cdbbe4..b97ec2976a7a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) ChartTypeUnoDlg_BASE::implInitialize(_rValue); } //------------------------------------------------------------------------------ -Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) +Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext.getUNOContext() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 5b82e57f7044..ecc78aca5812 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc index 48fa33484be8..d561215e2022 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.src b/chart2/source/controller/dialogs/dlg_CreationWizard.src index 90fe0e2993ed..ca25f67926b6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.src +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index f9c25f94f7f3..49f062a26bc6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index f1d441921a6a..d63928e37c07 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc index d2675c5bb29e..c8c0536ae72a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc +++ b/chart2/source/controller/dialogs/dlg_DataEditor.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src index dadd1ac3098d..002ff099fa2a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 9469293ae1c5..a970a2464278 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataSource.hrc b/chart2/source/controller/dialogs/dlg_DataSource.hrc index b8c5ff96bb33..fa9cd515e65d 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.hrc +++ b/chart2/source/controller/dialogs/dlg_DataSource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_DataSource.src b/chart2/source/controller/dialogs/dlg_DataSource.src index 08427a4e271b..890e0c76f1ab 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.src +++ b/chart2/source/controller/dialogs/dlg_DataSource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index e97f15898064..9465103e15f0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ SchAxisDlg::SchAxisDlg( Window* pWindow //todo: remove if secondary z axis are possible somewhere { aCbSecondaryZ.Hide(); - + Size aSize( GetSizePixel() ); //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height(); aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() ); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc index d069e893116c..5a3d3673b84a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..2d93de1ee567 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_X_PRIMARY { HelpID = HID_SCH_CB_XAXIS; - + Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -65,7 +65,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Y_PRIMARY { HelpID = HID_SCH_CB_YAXIS; - + Pos = MAP_APPFONT ( 12 , 28 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -74,7 +74,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Z_PRIMARY { HelpID = HID_SCH_CB_ZAXIS; - + Pos = MAP_APPFONT ( 12 , 42 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 2105b0bb2c87..bfe957e35acb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc b/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc index 92f67309d6fc..1b78ca8ff0ef 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src index 8f8a64485778..a34dacde7909 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 9c4438b6f1ca..2182a79a241f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc b/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..8cf0f6b35452 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; +// HelpID = SID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index e722ede09c5a..aea8023fb7b4 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 95a1d5516ab5..4ee97fb3df26 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index bd98774c57a8..7f6910d8902c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc index fc46db129b5b..4dec735d8e2c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ #include "ResourceIds.hrc" - + #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src index f84ff2c6acd7..10a1bfb696c0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx index 58b29b4bdfe3..6dde52bb1ff1 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..56b4697ddc1f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index bf0dedfbc6e8..a3adf3d8eb44 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ NumberFormatDialog::~NumberFormatDialog() //static SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ) { - static const USHORT nWhichPairs[] = + static const USHORT nWhichPairs[] = { SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 96cfb23c1f95..ffa04bf6407f 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 2a41d35313e8..9a0e42950f1c 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -418,7 +418,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); if( aCJKOptions.IsAsianTypographyEnabled() ) AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); - + break; case OBJECTTYPE_AXIS: diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.src b/chart2/source/controller/dialogs/dlg_ObjectProperties.src index 9eae934ce6df..5b0dfa19265f 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.src +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index 280a1adecba2..dfae2910be87 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.src b/chart2/source/controller/dialogs/dlg_ShapeFont.src index 2065bd940988..92466c496083 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.src +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 2f0173fc8408..ea464743ba7a 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src index ff74fc1eef80..be50398dd6fe 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 26a726ac5156..590fa36c7d47 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_View3D.hrc b/chart2/source/controller/dialogs/dlg_View3D.hrc index 59564a97b8b8..197a4052113c 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.hrc +++ b/chart2/source/controller/dialogs/dlg_View3D.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..4c7177b1d7af 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ TabDialog DLG_3D_VIEW OutputSize = TRUE ; Pos = MAP_APPFONT ( 3 , 3 ) ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - }; + }; BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3) }; diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src index 4b006f0f1f93..657c25a8abf2 100644 --- a/chart2/source/controller/dialogs/hidother.src +++ b/chart2/source/controller/dialogs/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index f2c31fe461a9..5a08244064b4 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,11 +65,11 @@ Size BarGeometryResources::GetSizePixel() const long nHeight = m_aLB_Geometry.GetPosPixel().Y() - m_aFT_Geometry.GetPosPixel().Y(); nHeight += m_aLB_Geometry.GetSizePixel().Height(); - + long nWidth = m_aLB_Geometry.GetSizePixel().Width(); if( nWidth < m_aFT_Geometry.GetSizePixel().Width() ) nWidth = m_aFT_Geometry.GetSizePixel().Width(); - + return Size( nHeight, nWidth ); } BarGeometryResources::~BarGeometryResources() diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index db2f71e2f178..e5135e6277dd 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_BarGeometry.src b/chart2/source/controller/dialogs/res_BarGeometry.src index ea481070132d..bda633eddfe2 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.src +++ b/chart2/source/controller/dialogs/res_BarGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 25d279eaad37..b98172979962 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -184,14 +184,14 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt aCBSize.setWidth(nCBXWidth); m_aCBNumber.SetSizePixel( aCBSize ); m_aCBPercent.SetSizePixel( aCBSize ); - + //place and align separator and label placement listboxes Size aSize( m_aFT_LabelPlacement.GetSizePixel() ); aSize.setWidth( m_aFT_LabelPlacement.CalcMinimumSize().getWidth() ); m_aFT_LabelPlacement.SetSizePixel(aSize); long nWantedMinLeftBorder = m_aFT_LabelPlacement.GetPosPixel().X() + aSize.getWidth () + aControlDistance.Width(); - + m_aSeparatorResources.PositionBelowControl(m_aCBSymbol); m_aSeparatorResources.AlignListBoxWidthAndXPos( nWantedMinLeftBorder, -1, m_aLB_LabelPlacement.CalcMinimumSize().getWidth() ); m_aSeparatorResources.Show(true); diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index ef34e004bb07..f15025d72627 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc b/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc index 5251841a2d9b..d70cc8bd2526 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc b/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc index 9501368f537e..72349a5cad47 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ CheckBox CB_VALUE_AS_NUMBER \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~number" ; \ -}; \ +}; \ PushButton PB_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_NUMBERFORMAT; \ @@ -73,7 +73,7 @@ CheckBox CB_VALUE_AS_PERCENTAGE \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~percentage" ; \ -}; \ +}; \ PushButton PB_PERCENT_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_PERCENT_NUMBERFORMAT; \ diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 8b649072538e..7a1c337d21eb 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc index bab1051208f4..7205f225ec5b 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc index 0f4cf70e30c7..db22d24fe5fd 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ StringList [ en-US ] = \ < "Standard Deviation" ; CHART_LB_FUNCTION_STD_DEV ; >; \ < "Variance" ; CHART_LB_FUNCTION_VARIANCE ; >; \ < "Error Margin" ; CHART_LB_FUNCTION_ERROR_MARGIN ; >; \ - }; + }; #define RESOURCE_ERRORBARS(availablewidth, yoffset) \ diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index c9206a5428df..19292ecaaf09 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ void LegendPositionResources::impl_setRadioButtonToggleHdl() m_aRbtLeft.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtTop.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtRight.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); - m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); + m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); } LegendPositionResources::~LegendPositionResources() @@ -156,7 +156,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen if( m_aRbtLeft.IsChecked() ) eNewPos = chart2::LegendPosition_LINE_START; else if( m_aRbtRight.IsChecked() ) - { + { eNewPos = chart2::LegendPosition_LINE_END; } else if( m_aRbtTop.IsChecked() ) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index ee0ac5a7601c..d2c0b155df46 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,10 +75,10 @@ private: CheckBox m_aCbxShow; - RadioButton m_aRbtLeft; - RadioButton m_aRbtTop; - RadioButton m_aRbtRight; - RadioButton m_aRbtBottom; + RadioButton m_aRbtLeft; + RadioButton m_aRbtTop; + RadioButton m_aRbtRight; + RadioButton m_aRbtBottom; Link m_aChangeLink; }; diff --git a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc b/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc index 4dd46e0c9df7..6cf0893b0736 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc index 17f6518eabe4..48867d3012d2 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc index 7e9609e20763..2eed1dc570f5 100644 --- a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 45efd2f5e5b3..45b57a66318a 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx index 4895a442fa0b..949fa87ea5df 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.hxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_TextSeparator.src b/chart2/source/controller/dialogs/res_TextSeparator.src index c0b95ea23c7d..d4b1b5e0c9fa 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.src +++ b/chart2/source/controller/dialogs/res_TextSeparator.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ ListBox LB_TEXT_SEPARATOR Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Space" ; diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 225c8fe8748b..fbbdd80f7cc9 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryXAxis.CalcMinimumSize().Width() ) ; nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryYAxis.CalcMinimumSize().Width() ) ; } - + Size aControlDistance( m_aFT_Main.LogicToPixel( Size(RSC_SP_CTRL_DESC_X,RSC_SP_CTRL_GROUP_Y), MapMode(MAP_APPFONT) ) ); long nEditFieldXPos = m_aFT_Main.GetPosPixel().X() + nMaxTextWidth + aControlDistance.Width(); long nEditFieldWidth = m_aEd_Main.GetPosPixel().X() + m_aEd_Main.GetSizePixel().Width() - nEditFieldXPos; - + if( nEditFieldWidth > 10 ) { Size aFTSize( m_aFT_Main.GetSizePixel() ); @@ -88,7 +88,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aFT_SecondaryXAxis.SetSizePixel(aFTSize); m_aFT_SecondaryYAxis.SetSizePixel(aFTSize); } - + m_aEd_Main.SetPosPixel( Point( nEditFieldXPos, m_aEd_Main.GetPosPixel().Y() ) ); m_aEd_Sub.SetPosPixel( Point( nEditFieldXPos, m_aEd_Sub.GetPosPixel().Y() ) ); m_aEd_XAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_XAxis.GetPosPixel().Y() ) ); @@ -99,7 +99,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryXAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryXAxis.GetPosPixel().Y() ) ); m_aEd_SecondaryYAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryYAxis.GetPosPixel().Y() ) ); } - + Size aEditSize( m_aEd_Main.GetSizePixel() ); aEditSize.Width() = nEditFieldWidth; m_aEd_Main.SetSizePixel( aEditSize ); @@ -113,7 +113,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryYAxis.SetSizePixel( aEditSize ); } } - + m_aFT_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aEd_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aFT_SecondaryYAxis.Show( bShowSecondaryAxesTitle ); diff --git a/chart2/source/controller/dialogs/res_Titles.hrc b/chart2/source/controller/dialogs/res_Titles.hrc index c66aac02014c..b364fdbe38bd 100644 --- a/chart2/source/controller/dialogs/res_Titles.hrc +++ b/chart2/source/controller/dialogs/res_Titles.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx index c79550dd7be1..d3f9b7fd38b6 100644 --- a/chart2/source/controller/dialogs/res_Titles.hxx +++ b/chart2/source/controller/dialogs/res_Titles.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,18 +50,18 @@ public: void ClearModifyFlag(); private: - FixedText m_aFT_Main; - Edit m_aEd_Main; - FixedText m_aFT_Sub; - Edit m_aEd_Sub; + FixedText m_aFT_Main; + Edit m_aEd_Main; + FixedText m_aFT_Sub; + Edit m_aEd_Sub; FixedLine m_aFL_Axes; - FixedText m_aFT_XAxis; - Edit m_aEd_XAxis; - FixedText m_aFT_YAxis; - Edit m_aEd_YAxis; - FixedText m_aFT_ZAxis; - Edit m_aEd_ZAxis; + FixedText m_aFT_XAxis; + Edit m_aEd_XAxis; + FixedText m_aFT_YAxis; + Edit m_aEd_YAxis; + FixedText m_aFT_ZAxis; + Edit m_aEd_ZAxis; FixedLine m_aFL_SecondaryAxes; FixedText m_aFT_SecondaryXAxis; diff --git a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc index c64c71d78c21..4949baa1217c 100644 --- a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index a395d32c2efa..deaad8266295 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 248a677edd21..76b891c108ad 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_Trendline_IDs.hrc b/chart2/source/controller/dialogs/res_Trendline_IDs.hrc index 0e857742af4e..f71786927156 100644 --- a/chart2/source/controller/dialogs/res_Trendline_IDs.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc b/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc index 734384e200d8..311aa90a9516 100644 --- a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 6b3b63495126..f22e2c7dfd2b 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,13 +105,13 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( Window* pWindow , const uno::Reference< frame::XModel > & xChartModel , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) , m_xChartModel ( xChartModel ) , m_aFT_Scheme ( this, SchResId( FT_SCHEME ) ) , m_aLB_Scheme ( this, SchResId( LB_SCHEME ) ) , m_aFL_Seperator ( this, SchResId( FL_SEPERATOR ) ) , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) ) - , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) + , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) ) , m_bUpdateOtherControls( true ) , m_bCommitToModel( true ) @@ -345,14 +345,14 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check if( pCheckBox == &m_aCB_ObjectLines ) { m_aCB_ObjectLines.EnableTriState( FALSE ); - m_bUpdateOtherControls = false; + m_bUpdateOtherControls = false; m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() ); if(!m_aCB_RoundedEdge.IsEnabled()) m_aCB_RoundedEdge.Check(FALSE); m_bUpdateOtherControls = true; } else - m_aCB_RoundedEdge.EnableTriState( FALSE ); + m_aCB_RoundedEdge.EnableTriState( FALSE ); applyRoundedEdgeAndObjectLinesToModel(); updateScheme(); return 0; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc index e01be1c35072..47a761753581 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 252c5c21669b..f5b9d2d17f7e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - FixedText m_aFT_Scheme; - ListBox m_aLB_Scheme; + FixedText m_aFT_Scheme; + ListBox m_aLB_Scheme; - FixedLine m_aFL_Seperator; + FixedLine m_aFL_Seperator; - CheckBox m_aCB_RoundedEdge; - CheckBox m_aCB_Shading; - CheckBox m_aCB_ObjectLines; + CheckBox m_aCB_RoundedEdge; + CheckBox m_aCB_Shading; + CheckBox m_aCB_ObjectLines; bool m_bUpdateOtherControls; bool m_bCommitToModel; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..2f8dad3bced8 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_SCHEME 8 @@ -74,8 +74,8 @@ TabPage TP_3D_SCENEAPPEARANCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPERATOR ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ; - }; - + }; + CheckBox CB_SHADING { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 39175695a48b..06cec912108a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,14 +73,14 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit ) ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) , m_xSceneProperties( xSceneProperties ) , m_aCbxRightAngledAxes( this, SchResId( CBX_RIGHT_ANGLED_AXES ) ) - , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) - , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) - , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) - , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) - , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) + , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) + , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) + , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) + , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) + , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) , m_aMFZRotation ( this, SchResId( MTR_FLD_Z_ROTATION ) ) , m_aCbxPerspective ( this, SchResId( CBX_PERSPECTIVE ) ) , m_aMFPerspective ( this, SchResId( MTR_FLD_PERSPECTIVE ) ) @@ -151,7 +151,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow sal_Bool bRightAngledAxes = false; uno::Reference< chart2::XDiagram > xDiagram( m_xSceneProperties, uno::UNO_QUERY ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; @@ -251,7 +251,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG ) IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG ) { m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); - applyPerspectiveToModel(); + applyPerspectiveToModel(); return 0; } @@ -268,7 +268,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG m_nXRotation = m_aMFXRotation.GetValue(); m_nYRotation = m_aMFYRotation.GetValue(); m_nZRotation = m_aMFZRotation.GetValue(); - + m_aMFXRotation.SetValue(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nXRotation), ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes()))); m_aMFYRotation.SetValue(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nYRotation), ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes()))); m_aMFZRotation.SetEmptyFieldValue(); @@ -287,7 +287,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG } ThreeDHelper::switchRightAngledAxes( m_xSceneProperties, m_aCbxRightAngledAxes.IsChecked(), true /*bRotateLights*/ ); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc index e84bc84012e9..6b46d43efd11 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 95aeb7f6a02a..9208b519bb16 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,19 +80,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; - CheckBox m_aCbxRightAngledAxes; - - FixedText m_aFtXRotation; - MetricField m_aMFXRotation; - - FixedText m_aFtYRotation; - MetricField m_aMFYRotation; + CheckBox m_aCbxRightAngledAxes; - FixedText m_aFtZRotation; - MetricField m_aMFZRotation; + FixedText m_aFtXRotation; + MetricField m_aMFXRotation; + + FixedText m_aFtYRotation; + MetricField m_aMFYRotation; + + FixedText m_aFtZRotation; + MetricField m_aMFZRotation; - CheckBox m_aCbxPerspective; - MetricField m_aMFPerspective; + CheckBox m_aCbxPerspective; + MetricField m_aMFPerspective; //to keep old values when switching to right angled axes sal_Int64 m_nXRotation; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..54a4bcaf929c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_0 (8) @@ -73,7 +73,7 @@ TabPage TP_3D_SCENEGEOMETRY SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + CheckBox CBX_RIGHT_ANGLED_AXES { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0 ) ; @@ -117,7 +117,7 @@ TabPage TP_3D_SCENEGEOMETRY Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; - + CheckBox CBX_PERSPECTIVE { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4 ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 25b379481b7e..2e8abdba2b3c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -289,7 +289,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel , XColorTable* pColorTable ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) , m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) ) , m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 ) , m_aBtn_Light2( this, SchResId( BTN_LIGHT_2 ), 2 ) @@ -333,7 +333,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin m_pLightSourceInfoList[7].pButton = &m_aBtn_Light8; fillControlsFromModel(0); - + m_aBtn_Light1.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light2.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light3.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); @@ -355,7 +355,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - + m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } @@ -452,7 +452,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const Svx3DLightDirection8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue()); applyLightSourcesToModel(); - + return 0; } @@ -464,7 +464,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG ) LightButton* pButton = m_pLightSourceInfoList[nLightNumber].pButton; if(!pButton->IsChecked()) ClickLightSourceButtonHdl(pButton); - + applyLightSourcesToModel(); } return 0; @@ -594,37 +594,37 @@ void ThreeD_SceneIllumination_TabPage::updatePreview() aItemSet.Put(Svx3DLightcolor1Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection1Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[1]; aItemSet.Put(Svx3DLightcolor2Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection2Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[2]; aItemSet.Put(Svx3DLightcolor3Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection3Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[3]; aItemSet.Put(Svx3DLightcolor4Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection4Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[4]; aItemSet.Put(Svx3DLightcolor5Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection5Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[5]; aItemSet.Put(Svx3DLightcolor6Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection6Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[6]; aItemSet.Put(Svx3DLightcolor7Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection7Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[7]; aItemSet.Put(Svx3DLightcolor8Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled)); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc index e2d031955867..40faa9531281 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 8c104187797e..5c22b484d138 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public: // has to be called in case the dialog was closed with OK void commitPendingChanges(); - + private: DECL_LINK( ClickLightSourceButtonHdl, LightButton* ); DECL_LINK( SelectColorHdl, ColorLB* ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src index 57f15a1894d7..4262ad600054 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ TabPage TP_3D_SCENEILLUMINATION SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + FixedText FT_LIGHTSOURCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_HEAD ) ; @@ -114,7 +114,7 @@ TabPage TP_3D_SCENEILLUMINATION { Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ; - Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; + Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; TabStop = TRUE ; DropDown = TRUE ; }; @@ -148,9 +148,9 @@ TabPage TP_3D_SCENEILLUMINATION Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; }; + - - + Control CTL_LIGHT_PREVIEW { Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 3dcaa3092e57..dfb768745528 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) ); - // Make the fixed line separator vertical. + // Make the fixed line separator vertical. aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT); Construct(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 6043b16001ac..f119b38561f5 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ namespace chart class SchAxisLabelTabPage : public SfxTabPage { private: - CheckBox aCbShowDescription; + CheckBox aCbShowDescription; - FixedLine aFlOrder; - RadioButton aRbSideBySide; - RadioButton aRbUpDown; - RadioButton aRbDownUp; - RadioButton aRbAuto; + FixedLine aFlOrder; + RadioButton aRbSideBySide; + RadioButton aRbUpDown; + RadioButton aRbDownUp; + RadioButton aRbAuto; FixedLine aFlSeparator; FixedLine aFlTextFlow; @@ -83,7 +83,7 @@ public: SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); - void Construct(); + void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src index bcba1926c242..a999ab7a4db4 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.src +++ b/chart2/source/controller/dialogs/tp_AxisLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ TabPage TP_AXIS_LABEL { - HelpID = HID_SCH_TP_AXIS_LABEL; - Size = MAP_APPFONT ( 260 , 185 ) ; - Hide = TRUE; + HelpID = HID_SCH_TP_AXIS_LABEL; + Size = MAP_APPFONT ( 260 , 185 ) ; + Hide = TRUE; CheckBox CB_AXIS_LABEL_SCHOW_DESCR { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 248 , 12 ) ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 248 , 12 ) ; Text [ en-US ] = "Sho~w labels"; }; @@ -50,7 +50,7 @@ TabPage TP_AXIS_LABEL }; Control CT_AXIS_LABEL_DIAL { - HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; + HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; Text = "ABCD" ; @@ -93,9 +93,9 @@ TabPage TP_AXIS_LABEL Control CT_UNUSED { //only necessary for constructor of SvxWinOrientation - Hide = TRUE ; - Pos = MAP_APPFONT ( 204 , 133 ) ; - Size = MAP_APPFONT ( 50 , 15 ) ; + Hide = TRUE ; + Pos = MAP_APPFONT ( 204 , 133 ) ; + Size = MAP_APPFONT ( 50 , 15 ) ; }; FixedLine FL_SEPARATOR { @@ -105,8 +105,8 @@ TabPage TP_AXIS_LABEL FixedLine FL_AXIS_LABEL_TEXTFLOW { - Pos = MAP_APPFONT ( 133 , 22 ) ; - Size = MAP_APPFONT ( 121 , 8 ) ; + Pos = MAP_APPFONT ( 133 , 22 ) ; + Size = MAP_APPFONT ( 121 , 8 ) ; Text [ en-US ] = "Text flow" ; }; @@ -114,7 +114,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 33 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "O~verlap" ; }; @@ -122,7 +122,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 47 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "~Break" ; }; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index ab4e36ff1f84..9c541d4217d7 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn , m_aPB_MajorGrid(this,SchResId(PB_MAJOR_GRID)) , m_aCB_MinorGrid(this,SchResId(CB_MINOR_GRID)) , m_aPB_MinorGrid(this,SchResId(PB_MINOR_GRID)) - + , m_pNumFormatter(NULL) , m_bCrossingAxisIsCategoryAxis(false) , m_aCategories() @@ -139,7 +139,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn m_aFT_CrossesAt.SetSizePixel(m_aFT_CrossesAt.CalcMinimumSize()); long nXPos = m_aFT_CrossesAt.GetPosPixel().X() + m_aFT_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aLB_CrossesAt, nXPos ); - + nXPos += m_aLB_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aED_CrossesAt, nXPos ); lcl_newXPos( m_aED_CrossesAtCategory, nXPos ); @@ -176,14 +176,14 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn { long nWidth_1 = ::std::max( m_aCB_TicksInner.CalcMinimumSize().Width(), m_aCB_MinorInner.CalcMinimumSize().Width() ); long nWidth_2 = ::std::max( m_aCB_TicksOuter.CalcMinimumSize().Width(), m_aCB_MinorOuter.CalcMinimumSize().Width() ); - + long nLeftSpace = nDialogWidth - nWidth_0 - nWidth_1 - nWidth_2 - 3*nDistance; if(nLeftSpace>=0) { m_aFT_Major.SetSizePixel(m_aFT_Major.CalcMinimumSize()); m_aFT_Minor.SetSizePixel(m_aFT_Minor.CalcMinimumSize()); - + m_aCB_TicksInner.SetSizePixel( m_aCB_TicksInner.CalcMinimumSize() ); m_aCB_MinorInner.SetSizePixel( m_aCB_MinorInner.CalcMinimumSize() ); @@ -386,7 +386,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Show(false); m_aFT_LabelDistance.Show(false); m_aED_LabelDistance.Show(false); - + m_aFL_Vertical.Show(false); m_aFT_PlaceTicks.Show(false); m_aLB_PlaceTicks.Show(false); @@ -415,7 +415,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Enable(false); m_aFT_LabelDistance.Enable(false); m_aED_LabelDistance.Enable(false); - + m_aFL_Vertical.Enable(false); m_aFT_PlaceTicks.Enable(false); m_aLB_PlaceTicks.Enable(false); @@ -437,7 +437,7 @@ void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) m_pNumFormatter = pFormatter; m_aED_CrossesAt.SetFormatter( m_pNumFormatter ); m_aED_CrossesAt.UseInputStringForFormatting(); - + const SfxPoolItem *pPoolItem = NULL; if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, TRUE, &pPoolItem ) == SFX_ITEM_SET ) { @@ -489,7 +489,7 @@ IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG ) } m_aFT_PlaceTicks.Enable(bEnableTickmarkPlacement); m_aLB_PlaceTicks.Enable(bEnableTickmarkPlacement); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 0784a7854c5e..ea5d2fc9502d 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ private: //member: ListBox m_aLB_CrossesAt; FormattedField m_aED_CrossesAt; ComboBox m_aED_CrossesAtCategory; - CheckBox m_aCB_AxisBetweenCategories; + CheckBox m_aCB_AxisBetweenCategories; FixedLine m_aFL_Labels; FixedText m_aFT_PlaceLabels; @@ -90,14 +90,14 @@ private: //member: FixedLine m_aFL_Vertical; FixedText m_aFT_PlaceTicks; ListBox m_aLB_PlaceTicks; - + FixedLine m_aFL_Grids; CheckBox m_aCB_MajorGrid; PushButton m_aPB_MajorGrid; CheckBox m_aCB_MinorGrid; PushButton m_aPB_MinorGrid; - SvNumberFormatter* m_pNumFormatter; + SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src index 8ce1ba39056a..80a42f55c353 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.src +++ b/chart2/source/controller/dialogs/tp_AxisPositions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Axis line" ; }; - + FixedText FT_CROSSES_OTHER_AXIS_AT { Pos = MAP_APPFONT ( X2 , Y1 ) ; @@ -87,7 +87,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Start" ; @@ -113,7 +113,7 @@ TabPage TP_AXIS_POSITIONS DropDown = TRUE ; TabStop = TRUE ; }; - + CheckBox CB_AXIS_BETWEEN_CATEGORIES { Hide = TRUE; @@ -122,7 +122,7 @@ TabPage TP_AXIS_POSITIONS TabStop = TRUE ; Text [ en-US ] = "Axis ~between categories" ; }; - + FixedLine FL_LABELS { Pos = MAP_APPFONT ( X1 , Y3 ) ; @@ -145,7 +145,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Near axis" ; @@ -154,7 +154,7 @@ TabPage TP_AXIS_POSITIONS "Outside end" ; }; }; - + FixedText FT_AXIS_LABEL_DISTANCE { Hide = TRUE; @@ -171,7 +171,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 89 , 12 ) ; TabStop = TRUE ; }; - + FixedLine FL_TICKS { Pos = MAP_APPFONT ( X1 , Y6 ) ; @@ -196,7 +196,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Outer"; }; - + FixedText FT_MINOR { Pos = MAP_APPFONT ( XTICK_1 , Y8 ) ; @@ -215,7 +215,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "O~uter"; }; - + FixedLine FL_VERTICAL { Hide = TRUE ; @@ -223,7 +223,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 6 , 25 ) ; Vert = TRUE ; }; - + FixedText FT_PLACE_TICKS { Pos = MAP_APPFONT ( X2 , Y9 ); @@ -240,7 +240,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "At labels" ; @@ -248,8 +248,8 @@ TabPage TP_AXIS_POSITIONS "At axis and labels" ; }; }; - - + + FixedLine FL_GRIDS { Hide = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index ec6c1d2a1c10..11a6d7ae88ab 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -472,9 +472,9 @@ private: MetricField m_aMF_SplineOrder; FixedLine m_aFL_DialogButtons; - OKButton m_aBP_OK; - CancelButton m_aBP_Cancel; - HelpButton m_aBP_Help; + OKButton m_aBP_OK; + CancelButton m_aBP_Cancel; + HelpButton m_aBP_Help; }; SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) @@ -507,7 +507,7 @@ void SplinePropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) { adjustControlPositions(); adjustSize(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.hrc b/chart2/source/controller/dialogs/tp_ChartType.hrc index dc017f836dc7..badea77502c5 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hrc +++ b/chart2/source/controller/dialogs/tp_ChartType.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ #define BTN_HELP 1 #define LB_3D_SCHEME 1 -#define LB_CHARTTYPE 2 +#define LB_CHARTTYPE 2 #define CT_CHARTVARIANT 3 #define FL_SPLINE_SEPARATOR 2 #define FL_SPLINE_DIALOGBUTTONS 3 -#define FT_CHARTTYPE 1 -#define FT_SPLINE_ORDER 3 +#define FT_CHARTTYPE 1 +#define FT_SPLINE_ORDER 3 #define FT_SPLINE_RESOLUTION 4 #define CB_X_AXIS_CATEGORIES 1 diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index b40cbb1956db..7e4208e367f1 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,8 +72,8 @@ public: , bool bDoLiveUpdate, bool bHideDescription = false ); virtual ~ChartTypeTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const; @@ -83,7 +83,7 @@ protected: void showAllControls( ChartTypeDialogController& rTypeController ); void fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList=true ); ChartTypeParameter getCurrentParamter() const; - + virtual void stateChanged( ChangingResource* pResource ); void commitToModel( const ChartTypeParameter& rParameter ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index a9bb2a039f3c..639553e53a8a 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( 12 , 14 ) ; Text [ en-US ] = "Properties..." ; }; - + CheckBox CB_XVALUE_SORTING { TabStop = TRUE ; @@ -172,7 +172,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; Text [ en-US ] = "~Sort by X values" ; }; - + }; ModalDialog DLG_SPLINE_PROPERTIES diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 909c263ba83b..a0a34f3f6608 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 25bdf977ef0e..c71e4032fb2b 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src index 615e81c2c550..4907b3d8a5b8 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.src +++ b/chart2/source/controller/dialogs/tp_DataLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 7c5f0fb3967b..ac867040abfe 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry ) } static long lcl_pRoleListBoxTabs[] = - { 3, // Number of Tabs + { 3, // Number of Tabs 0, 0, 75 }; @@ -331,7 +331,7 @@ DataSourceTabPage::DataSourceTabPage( m_aEDT_CATEGORIES.SetModifyHdl( LINK( this, DataSourceTabPage, RangeModifiedHdl )); m_aEDT_RANGE.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); m_aEDT_CATEGORIES.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); - + // #i75179# enable setting the background to a different color m_aEDT_RANGE.SetStyle( m_aEDT_RANGE.GetStyle() | WB_FORCECTRLBACKGROUND ); m_aEDT_CATEGORIES.SetStyle( m_aEDT_CATEGORIES.GetStyle() | WB_FORCECTRLBACKGROUND ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hrc b/chart2/source/controller/dialogs/tp_DataSource.hrc index cf8147d5f775..07bf3b727293 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hrc +++ b/chart2/source/controller/dialogs/tp_DataSource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index e65b503bfcc2..d20dc93d37f0 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ protected: //TabPage virtual void DeactivatePage(); - virtual void initializePage(); + virtual void initializePage(); DECL_LINK( SeriesSelectionChangedHdl, void* ); DECL_LINK( RoleSelectionChangedHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src index 3e1f8a51c68a..da0a98caf44b 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.src +++ b/chart2/source/controller/dialogs/tp_DataSource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index b6f7ad680591..aae2def63232 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index c1ebf512911c..f0d17cbbc15c 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 395c956372ea..1e525f4bf903 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index f6d6779d34a9..ccf77f9a7f79 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..6d8efc0414f9 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ TabPage TP_YERRORBAR { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; +// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_ERRORBARS( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index e3d23366a820..709b3fc0fb1d 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 4c0e7ce545d7..a70ba4ce3456 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class LegendPositionResources; class SchLegendPosTabPage : public SfxTabPage { private: - FixedLine aGrpLegend; + FixedLine aGrpLegend; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..cddd3f830f87 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx index a8a4d1317be8..370a6e9089c3 100644 --- a/chart2/source/controller/dialogs/tp_Location.cxx +++ b/chart2/source/controller/dialogs/tp_Location.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Location.hrc b/chart2/source/controller/dialogs/tp_Location.hrc index 419daa68721f..0879118708e6 100644 --- a/chart2/source/controller/dialogs/tp_Location.hrc +++ b/chart2/source/controller/dialogs/tp_Location.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx index 4b5b2c24727d..2dfa8a560823 100644 --- a/chart2/source/controller/dialogs/tp_Location.hxx +++ b/chart2/source/controller/dialogs/tp_Location.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..4fbac61b42c3 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 661bae6ac326..5dd900e71f05 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index d26ce62732eb..1796219a7bff 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..d136673244f8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 9a193c028e05..8425741cd819 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hrc b/chart2/source/controller/dialogs/tp_PolarOptions.hrc index b60e50fa654e..ee0d2aeac787 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hrc +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 1465790c34bd..8c5791b7133c 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual BOOL FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); - + private: CheckBox m_aCB_Clockwise; FixedLine m_aFL_StartingAngle; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src index 237fa027b55f..f752f9483fd5 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.src +++ b/chart2/source/controller/dialogs/tp_PolarOptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ TabPage TP_POLAROPTIONS }; Control CT_ANGLE_DIAL { - HelpId = HID_SCH_STARTING_ANGLE_DIAL ; + HelpId = HID_SCH_STARTING_ANGLE_DIAL ; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 3ba6ca0f74b2..9dbf77210951 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hrc b/chart2/source/controller/dialogs/tp_RangeChooser.hrc index d7b593fc4f45..a7300a02202a 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hrc +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 4d985669195c..31ca776953a7 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index de07c9763b7d..69d6562cf6f0 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 34fc0702bafe..2f7085215526 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,14 +114,14 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aTxtHelp (this, SchResId (TXT_STEP_HELP)), aMtStepHelp (this, SchResId (MT_STEPHELP)), aCbxAutoStepHelp(this, SchResId(CBX_AUTO_STEP_HELP)), - + aTxtOrigin (this, SchResId (TXT_ORIGIN)), aFmtFldOrigin(this, SchResId(EDT_ORIGIN)), aCbxAutoOrigin(this, SchResId(CBX_AUTO_ORIGIN)), aCbxLogarithm(this, SchResId(CBX_LOGARITHM)), aCbxReverse(this, SchResId(CBX_REVERSE)), - + fMin(0.0), fMax(0.0), fStepMain(0.0), @@ -145,10 +145,10 @@ void ScaleTabPage::StateChanged( StateChangedType nType ) { TabPage::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) AdjustControlPositions(); } - + void ScaleTabPage::AdjustControlPositions() { //optimize position of the controls @@ -167,7 +167,7 @@ void ScaleTabPage::AdjustControlPositions() aCbxAutoStepMain.SetSizePixel( aCbxAutoStepMain.CalcMinimumSize() ); aCbxAutoStepHelp.SetSizePixel( aCbxAutoStepHelp.CalcMinimumSize() ); aCbxAutoOrigin.SetSizePixel( aCbxAutoOrigin.CalcMinimumSize() ); - + //ensure new pos is ok long nWidthOfOtherControls = aCbxAutoMin.GetPosPixel().X() + aCbxAutoMin.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X(); long nDialogWidth = GetSizePixel().Width(); @@ -182,7 +182,7 @@ void ScaleTabPage::AdjustControlPositions() aTxtMain.SetSizePixel(aSize); aTxtHelp.SetSizePixel(aSize); aTxtOrigin.SetSizePixel(aSize); - + lcl_shiftControls( aFmtFldMin, aCbxAutoMin, nNewXPos ); lcl_shiftControls( aFmtFldMax, aCbxAutoMax, nNewXPos ); lcl_shiftControls( aFmtFldStepMain, aCbxAutoStepMain, nNewXPos ); @@ -256,16 +256,16 @@ BOOL ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) { DBG_ASSERT( pNumFormatter, "No NumberFormatter available" ); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,aCbxAutoStepHelp.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,aCbxAutoOrigin.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,aCbxLogarithm.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,aCbxReverse.IsChecked())); - rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); - rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); + rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); + rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp)); - rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); + rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,aCbxAutoStepMain.IsChecked())); rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN)); @@ -386,7 +386,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + //check wich entries need user action // check for entries that cannot be parsed for the current number format @@ -423,7 +423,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + if( ShowWarning( nErrStrId, pEdit ) ) return KEEP_PAGE; @@ -440,7 +440,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.SetFormatter( pNumFormatter ); aFmtFldStepMain.SetFormatter( pNumFormatter ); aFmtFldOrigin.SetFormatter( pNumFormatter ); - + // #101318#, #i6278# allow more decimal places than the output format. As // the numbers shown in the edit fields are used for input, it makes more // sense to display the values in the input format rather than the output @@ -449,7 +449,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.UseInputStringForFormatting(); aFmtFldStepMain.UseInputStringForFormatting(); aFmtFldOrigin.UseInputStringForFormatting(); - + SetNumFormat(); } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 8d0e02186c38..2001b5f336b4 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,46 +62,46 @@ public: virtual void StateChanged( StateChangedType nType ); private: - FixedLine aFlScale; + FixedLine aFlScale; - FixedText aTxtMin; - FormattedField aFmtFldMin; - CheckBox aCbxAutoMin; + FixedText aTxtMin; + FormattedField aFmtFldMin; + CheckBox aCbxAutoMin; - FixedText aTxtMax; - FormattedField aFmtFldMax; - CheckBox aCbxAutoMax; + FixedText aTxtMax; + FormattedField aFmtFldMax; + CheckBox aCbxAutoMax; FixedText aTxtMain; - FormattedField aFmtFldStepMain; - CheckBox aCbxAutoStepMain; + FormattedField aFmtFldStepMain; + CheckBox aCbxAutoStepMain; FixedText aTxtHelp; MetricField aMtStepHelp; - CheckBox aCbxAutoStepHelp; + CheckBox aCbxAutoStepHelp; FixedText aTxtOrigin; - FormattedField aFmtFldOrigin; - CheckBox aCbxAutoOrigin; - - CheckBox aCbxLogarithm; + FormattedField aFmtFldOrigin; + CheckBox aCbxAutoOrigin; + + CheckBox aCbxLogarithm; CheckBox aCbxReverse; - - double fMin; - double fMax; - double fStepMain; + + double fMin; + double fMax; + double fStepMain; sal_Int32 nStepHelp; - double fOrigin; + double fOrigin; int nAxisType; - SvNumberFormatter* pNumFormatter; + SvNumberFormatter* pNumFormatter; bool m_bShowAxisOrigin; - + void AdjustControlPositions(); void EnableControls(); - + DECL_LINK( EnableValueHdl, CheckBox* ); - + /** shows a warning window due to an invalid input. @param nResIdMessage diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..7ff88bfc6158 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Automatic" ; }; - + FixedText TXT_MAX { Pos = MAP_APPFONT ( X2 , Y2 ) ; @@ -148,7 +148,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Aut~omatic" ; }; - + FixedText TXT_ORIGIN { Pos = MAP_APPFONT ( X2 , Y5 ) ; @@ -170,7 +170,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Automat~ic" ; }; - + CheckBox CBX_LOGARITHM { Pos = MAP_APPFONT ( X2 , Y6 ) ; @@ -178,7 +178,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Logarithmic scale" ; }; - + CheckBox CBX_REVERSE { Pos = MAP_APPFONT ( X2 , Y7 ) ; @@ -186,5 +186,5 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Reverse direction" ; }; - + }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index fbe2f4bf1907..97fc327c8d0b 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aCBConnect(this,SchResId(CB_CONNECTOR)), aCBAxisSideBySide(this,SchResId(CB_BARS_SIDE_BY_SIDE)), m_aFL_PlotOptions(this,SchResId(FL_PLOT_OPTIONS)), - m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), + m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), m_aRB_DontPaint(this,SchResId(RB_DONT_PAINT)), m_aRB_AssumeZero(this,SchResId(RB_ASSUME_ZERO)), m_aRB_ContinueLine(this,SchResId(RB_CONTINUE_LINE)), - m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), + m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), m_bProvidesSecondaryYAxis(true), m_bProvidesOverlapAndGapWidth(false) { @@ -158,13 +158,13 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); aMTOverlap.SetValue(nTmp); } - + if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET) { BOOL bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); aCBConnect.Check(bCheck); } - + if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, TRUE, &pPoolItem) == SFX_ITEM_SET) { m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); @@ -194,7 +194,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) m_aRB_DontPaint.Enable(FALSE); m_aRB_AssumeZero.Enable(FALSE); m_aRB_ContinueLine.Enable(FALSE); - + for( sal_Int32 nN =0; nN<aMissingValueTreatments.getLength(); nN++ ) { sal_Int32 nVal = aMissingValueTreatments[nN]; @@ -267,12 +267,12 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility() aMTGap.Show(m_bProvidesOverlapAndGapWidth); aFTGap.Show(m_bProvidesOverlapAndGapWidth); - + aMTOverlap.Show(m_bProvidesOverlapAndGapWidth); aFTOverlap.Show(m_bProvidesOverlapAndGapWidth); aCBConnect.Show(m_bProvidesBarConnectors); - + if( !aMTGap.IsVisible() && !aMTOverlap.IsVisible() ) { aGrpBar.Show(FALSE); @@ -301,7 +301,7 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility() lcl_offsetControl(m_aRB_DontPaint, nXOffset, 0); lcl_offsetControl(m_aRB_AssumeZero, nXOffset, 0); lcl_offsetControl(m_aRB_ContinueLine, nXOffset, 0); - + if( !m_aFT_MissingValues.IsVisible() ) { //for example for stock charts diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc index 814a148a2ef5..52746c452fd3 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,15 +27,15 @@ #include "ResourceIds.hrc" -#define GRP_OPT_AXIS 1 -#define RBT_OPT_AXIS_1 2 -#define RBT_OPT_AXIS_2 3 -#define MT_GAP 4 -#define MT_OVERLAP 5 -#define FT_GAP 6 -#define FT_OVERLAP 7 -#define GB_BAR 8 -#define CB_CONNECTOR 9 +#define GRP_OPT_AXIS 1 +#define RBT_OPT_AXIS_1 2 +#define RBT_OPT_AXIS_2 3 +#define MT_GAP 4 +#define MT_OVERLAP 5 +#define FT_GAP 6 +#define FT_OVERLAP 7 +#define GB_BAR 8 +#define CB_CONNECTOR 9 #define CB_BARS_SIDE_BY_SIDE 10 #define FL_PLOT_OPTIONS 11 #define FT_MISSING_VALUES 12 diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 63caf2885910..afd644d56857 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,16 +59,16 @@ private: //methods void AdaptControlPositionsAndVisibility(); private: //member - FixedLine aGrpAxis; + FixedLine aGrpAxis; RadioButton aRbtAxis1; RadioButton aRbtAxis2; - FixedLine aGrpBar; + FixedLine aGrpBar; FixedText aFTGap; MetricField aMTGap; FixedText aFTOverlap; MetricField aMTOverlap; - CheckBox aCBConnect; + CheckBox aCBConnect; CheckBox aCBAxisSideBySide; FixedLine m_aFL_PlotOptions; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index bc434be7ef07..134df3e9c827 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ TabPage TP_OPTIONS TabStop = TRUE ; Text [ en-US ] = "Show ~bars side by side"; }; - + FixedLine FL_PLOT_OPTIONS { Pos = MAP_APPFONT ( 6 , 113 ) ; @@ -141,31 +141,31 @@ TabPage TP_OPTIONS Size = MAP_APPFONT ( 80 , 8 ) ; Text [ en-US ] = "Plot missing values"; }; - + RadioButton RB_DONT_PAINT { Pos = MAP_APPFONT ( 82 , 127 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Leave gap"; + Text [ en-US ] = "~Leave gap"; }; - + RadioButton RB_ASSUME_ZERO { Pos = MAP_APPFONT ( 82 , 141 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Assume zero"; + Text [ en-US ] = "~Assume zero"; }; - + RadioButton RB_CONTINUE_LINE { Pos = MAP_APPFONT ( 82 , 155 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Continue line"; + Text [ en-US ] = "~Continue line"; }; - + CheckBox CB_INCLUDE_HIDDEN_CELLS { Pos = MAP_APPFONT ( 12 , 172 ) ; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 5b1d5647dc6c..9adbb66b298c 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index e02b0f29078d..1624e70396c4 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src index 2ac0355d39af..ec17cfdae2ac 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.src +++ b/chart2/source/controller/dialogs/tp_TitleRotation.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 31b35b24a5b4..4466c81f206b 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index f1c6eb5609fd..936e4722ea10 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index efa11d3e2d67..16c7eff17f89 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ TabPage TP_TRENDLINE { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; +// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_TRENDLINE( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 03988116854e..8e5c9ed08cde 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc index 44c340139782..da7edf4aea6c 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 1cd9c6162a46..0591ae7e6fe6 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,8 +58,8 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); virtual ~TitlesAndObjectsTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual bool canAdvance() const; protected: @@ -69,7 +69,7 @@ protected: protected: FixedText m_aFT_TitleDescription; FixedLine m_aFL_Vertical; - + ::std::auto_ptr< TitleResources > m_apTitleResources; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index a17f5655e751..41fa87c916a8 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 48c96a715c5f..adba51c46852 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,7 +199,7 @@ void DrawViewWrapper::ReInit() bBordVisible = false; bGridVisible = false; bHlplVisible = false; - + this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object) //this->SetResizeAtCenter(true);//for interactive resize-dragging: keep the object center fix @@ -243,7 +243,7 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const if( pRet ) { //ignore some special shapes - rtl::OUString aShapeName = pRet->GetName(); + rtl::OUString aShapeName = pRet->GetName(); if( aShapeName.match(C2U("PlotAreaIncludingAxes")) || aShapeName.match(C2U("PlotAreaExcludingAxes")) ) { pRet->SetMarkProtect( true ); @@ -316,7 +316,7 @@ SdrObject* DrawViewWrapper::getSelectedObject() const SdrObject* DrawViewWrapper::getTextEditObject() const { SdrObject* pObj = this->getSelectedObject(); - SdrObject* pTextObj = NULL; + SdrObject* pTextObj = NULL; if( pObj && pObj->HasTextEdit()) pTextObj = (SdrTextObj*)pObj; return pTextObj; @@ -392,7 +392,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } E3dView::Notify(rBC, rHint); - + if( pSdrHint != 0 ) { SdrHintKind eKind = pSdrHint->GetKind(); diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 755058050a2d..e89d2f2ea239 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -176,7 +176,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co if( nStandardSymbol >= static_cast<sal_Int32>(pSymbolList->GetObjCount()) ) nStandardSymbol %= pSymbolList->GetObjCount(); SdrObject* pObj = pSymbolList->GetObj(nStandardSymbol); - + VirtualDevice aVDev; aVDev.SetMapMode(MapMode(MAP_100TH_MM)); SdrModel* pModel = new SdrModel(); @@ -221,7 +221,7 @@ FontList* ViewElementListProvider::getFontList() const if(!m_pFontList) { OutputDevice* pRefDev = m_pDrawModelWrapper ? m_pDrawModelWrapper->getReferenceDevice() : NULL; - OutputDevice* pDefaultOut = Application::GetDefaultDevice(); // #67730# + OutputDevice* pDefaultOut = Application::GetDefaultDevice(); // #67730# m_pFontList = new FontList( pRefDev ? pRefDev : pDefaultOut , pRefDev ? pDefaultOut : NULL , FALSE ); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index ea52a29c614b..78d9141d25c1 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 2cc46825a5aa..a0197dbf0c31 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 66ef9338dc09..22cca83f374d 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index 7c8f83452963..6e30e6c7ba24 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ private: ::std::vector< ItemConverter * > m_aConverters; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDoc; diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index d2590c37759c..40dc37f8de81 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index f06c502dfd6c..af38d88f85e1 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > impl_getDrawPage() const throw (::com::sun::star::uno::RuntimeException); - + protected: // ____ chart::XChartDocument ____ @@ -207,7 +207,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xTitle; diff --git a/chart2/source/controller/inc/ChartRenderer.hxx b/chart2/source/controller/inc/ChartRenderer.hxx index c602a6ec6630..4ce2b583dc65 100644 --- a/chart2/source/controller/inc/ChartRenderer.hxx +++ b/chart2/source/controller/inc/ChartRenderer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace chart { //............................................................................. -//#i82893#, #i75867#: charts must be painted resolution dependent!! +//#i82893#, #i75867#: charts must be painted resolution dependent!! class ChartRenderer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XUnoTunnel diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx index 0cc8180b3dd2..01be5921addb 100644 --- a/chart2/source/controller/inc/ConfigurationAccess.hxx +++ b/chart2/source/controller/inc/ConfigurationAccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index d738cf8f6245..72dce1cce8db 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 1dbdf6a85a53..23d69e0ba7fc 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 9dffde68cd5b..1d7f969e7ed1 100755 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index c10e1d4e5b86..2e2af8139cb9 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 1052b7ea962f..244b3d71dfa7 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,14 +75,14 @@ #define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36) #define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37) /* -#define HID_SCH_LAYOUT (HID_SCH_START + 38) +#define HID_SCH_LAYOUT (HID_SCH_START + 38) -#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) +#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) #define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3 -#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) +#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) */ -#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) +#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) #define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44) #define HID_SCH_LB_BAR_GEOMETRY (HID_SCH_START + 45) @@ -176,7 +176,7 @@ // 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein // Define sondern neuerdings ein Enum ist -//#define HID_SCH_VIEWSHELL_DOCUMENT (453) +//#define HID_SCH_VIEWSHELL_DOCUMENT (453) #endif diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 2f52e45f070c..e10e42728464 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index 809df66156e2..fce39728ca67 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index b1b0bcdeea75..4ed8392bb792 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc index 38a09ad35ded..6c899fc78a25 100644 --- a/chart2/source/controller/inc/MenuResIds.hrc +++ b/chart2/source/controller/inc/MenuResIds.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 9b0555ec82e1..bcbb420577e6 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 32c48ca8e7db..de8f785cc75d 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 857b576fe6ef..8c52321ad120 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public: sal_Int32 getIndexInParent( const tOID& rNode ) const; private: - + ::std::auto_ptr< impl::ImplObjectHierarchy > m_apImpl; }; diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 02ecc8f229c8..92c5198ebd88 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType ); - + static rtl::OUString getNameForCID( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 312c92997055..bdbb032e4bfd 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RangeEdit.hxx b/chart2/source/controller/inc/RangeEdit.hxx index cacba52decb5..046205f1b7ee 100755 --- a/chart2/source/controller/inc/RangeEdit.hxx +++ b/chart2/source/controller/inc/RangeEdit.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx index 4aedf9012489..a2b4826f35ca 100644 --- a/chart2/source/controller/inc/RangeSelectionButton.hxx +++ b/chart2/source/controller/inc/RangeSelectionButton.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index cb9e067bd8e2..57c511bdb981 100755 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 3e470c0116f0..d656aaeee52d 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index ab2d29cb5e0d..2c62edbc5e3d 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 5fe5313c8d4a..a149f39d7446 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/SchSlotIds.hxx b/chart2/source/controller/inc/SchSlotIds.hxx index 601e64100bbf..5f3e637dbf08 100644 --- a/chart2/source/controller/inc/SchSlotIds.hxx +++ b/chart2/source/controller/inc/SchSlotIds.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,39 +32,39 @@ // SID_OBJ1_START == 30000 + 512 //not used as slot in old chart -//#define SID_COPYFORMAT SID_OBJ1_START +//#define SID_COPYFORMAT SID_OBJ1_START //not used as slot in old chart -//#define SID_PASTEFORMAT (SID_OBJ1_START + 1) +//#define SID_PASTEFORMAT (SID_OBJ1_START + 1) //still used as help id #define SID_DIAGRAM_DATA (SID_OBJ1_START + 2) //only used as help id -#define SID_INSERT_TITLE (SID_OBJ1_START + 3) +#define SID_INSERT_TITLE (SID_OBJ1_START + 3) //only used as help id -#define SID_INSERT_CHART_LEGEND (SID_OBJ1_START + 4) +#define SID_INSERT_CHART_LEGEND (SID_OBJ1_START + 4) //only used as help id -#define SID_INSERT_DESCRIPTION (SID_OBJ1_START + 5) +#define SID_INSERT_DESCRIPTION (SID_OBJ1_START + 5) //only used as help id -#define SID_INSERT_AXIS (SID_OBJ1_START + 6) +#define SID_INSERT_AXIS (SID_OBJ1_START + 6) //some how used as slot in old chart -//#define SID_DATA_ROW_POINT (SID_OBJ1_START + 7) +//#define SID_DATA_ROW_POINT (SID_OBJ1_START + 7) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_CHART_TITLE (SID_OBJ1_START + 8) +//MENUCHANGE FORMATMENU #define SID_CHART_TITLE (SID_OBJ1_START + 8) //still used as slot id -//MENUCHANGE FORMATMENU #define SID_LEGEND (SID_OBJ1_START + 9) +//MENUCHANGE FORMATMENU #define SID_LEGEND (SID_OBJ1_START + 9) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_DIAGRAM_AXIS (SID_OBJ1_START + 10) +//MENUCHANGE FORMATMENU #define SID_DIAGRAM_AXIS (SID_OBJ1_START + 10) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID (SID_OBJ1_START + 11) +//MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID (SID_OBJ1_START + 11) /* //MENUCHANGE //still used as slot id -#define SID_DIAGRAM_WALL (SID_OBJ1_START + 12) +#define SID_DIAGRAM_WALL (SID_OBJ1_START + 12) //still used as slot id -#define SID_DIAGRAM_FLOOR (SID_OBJ1_START + 13) +#define SID_DIAGRAM_FLOOR (SID_OBJ1_START + 13) //still used as slot id -#define SID_DIAGRAM_AREA (SID_OBJ1_START + 14) +#define SID_DIAGRAM_AREA (SID_OBJ1_START + 14) */ //only used as help id @@ -74,32 +74,32 @@ //used as slot in old chart //#define SID_TOGGLE_TITLE (SID_OBJ1_START + 17) //used as slot in old chart -//#define SID_TOGGLE_LEGEND (SID_OBJ1_START + 18) +//#define SID_TOGGLE_LEGEND (SID_OBJ1_START + 18) //used as slot in old chart -//#define SID_TOGGLE_AXIS_TITLE (SID_OBJ1_START + 19) +//#define SID_TOGGLE_AXIS_TITLE (SID_OBJ1_START + 19) //used as slot in old chart -//#define SID_TOGGLE_AXIS_DESCR (SID_OBJ1_START + 20) // 30532 +//#define SID_TOGGLE_AXIS_DESCR (SID_OBJ1_START + 20) // 30532 //used as slot in old chart -//#define SID_TOGGLE_GRID_HORZ (SID_OBJ1_START + 21) +//#define SID_TOGGLE_GRID_HORZ (SID_OBJ1_START + 21) //used as slot in old chart -//#define SID_TOGGLE_GRID_VERT (SID_OBJ1_START + 22) +//#define SID_TOGGLE_GRID_VERT (SID_OBJ1_START + 22) //used as slot in old chart -//#define SID_DATA_IN_ROWS (SID_OBJ1_START + 23) +//#define SID_DATA_IN_ROWS (SID_OBJ1_START + 23) //used as slot in old chart -//#define SID_DATA_IN_COLUMNS (SID_OBJ1_START + 24) +//#define SID_DATA_IN_COLUMNS (SID_OBJ1_START + 24) //used as slot in old chart -//#define SID_TOOL_SELECT (SID_OBJ1_START + 25) +//#define SID_TOOL_SELECT (SID_OBJ1_START + 25) //some how used as slot in old chart -//#define SID_CONTEXT_TYPE (SID_OBJ1_START + 26) +//#define SID_CONTEXT_TYPE (SID_OBJ1_START + 26) //used as slot in old chart //#define SID_NEW_ARRANGEMENT (SID_OBJ1_START + 27) // 30539 //only used as help id -#define SID_INSERT_GRIDS (SID_OBJ1_START + 28) +#define SID_INSERT_GRIDS (SID_OBJ1_START + 28) //not used as slot in old chart -//#define SID_MAINTITLE (SID_OBJ1_START + 29) +//#define SID_MAINTITLE (SID_OBJ1_START + 29) //not used as slot in old chart -//#define SID_SUBTITLE (SID_OBJ1_START + 30) +//#define SID_SUBTITLE (SID_OBJ1_START + 30) //not used as slot in old chart //#define SID_XAXIS_TITLE (SID_OBJ1_START + 31) //not used as slot in old chart @@ -112,7 +112,7 @@ #ifdef SID_UPDATE #undef SID_UPDATE #endif -#define SID_UPDATE (SID_OBJ1_START + 34) +#define SID_UPDATE (SID_OBJ1_START + 34) */ //not used as slot in old chart @@ -154,24 +154,24 @@ //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_ALL (SID_OBJ1_START + 54) //used as slot in old chart -//#define SID_HAS_X_DESCR (SID_OBJ1_START + 55) +//#define SID_HAS_X_DESCR (SID_OBJ1_START + 55) //used as slot in old chart -//#define SID_HAS_Y_DESCR (SID_OBJ1_START + 56) +//#define SID_HAS_Y_DESCR (SID_OBJ1_START + 56) //used as slot in old chart -//#define SID_HAS_Z_DESCR (SID_OBJ1_START + 57) +//#define SID_HAS_Z_DESCR (SID_OBJ1_START + 57) //#define SID_DIAGRAM_OBJECTS (SID_OBJ1_START + 60) //not used as slot in old chart -//#define SID_HAS_X_TITLE (SID_OBJ1_START + 61) +//#define SID_HAS_X_TITLE (SID_OBJ1_START + 61) //not used as slot in old chart -//#define SID_HAS_Y_TITLE (SID_OBJ1_START + 62) +//#define SID_HAS_Y_TITLE (SID_OBJ1_START + 62) //not used as slot in old chart -//#define SID_HAS_Z_TITLE (SID_OBJ1_START + 63) +//#define SID_HAS_Z_TITLE (SID_OBJ1_START + 63) //not used as slot in old chart -//#define SID_HAS_MAIN_TITLE (SID_OBJ1_START + 64) +//#define SID_HAS_MAIN_TITLE (SID_OBJ1_START + 64) //not used as slot in old chart -//#define SID_HAS_SUB_TITLE (SID_OBJ1_START + 65) +//#define SID_HAS_SUB_TITLE (SID_OBJ1_START + 65) //still used as slot id //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_Y_HELP (SID_OBJ1_START + 66) @@ -181,10 +181,10 @@ //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_Z_HELP (SID_OBJ1_START + 68) //not used as slot in old chart -//#define SID_DIAGRAM_DATA_WIN (SID_OBJ1_START + 70) +//#define SID_DIAGRAM_DATA_WIN (SID_OBJ1_START + 70) //used as slot in old chart -//#define SID_DIAGRAM_ERROR (SID_OBJ1_START + 71) +//#define SID_DIAGRAM_ERROR (SID_OBJ1_START + 71) //used as slot in old chart //#define SID_DIAGRAM_AVERAGEVALUE (SID_OBJ1_START + 72) //used as slot in old chart @@ -213,7 +213,7 @@ //#define SID_ROW_MOREBACK (SID_OBJ1_START + 83) //not used as slot in old chart -//#define SID_TITLE_TEXT (SID_OBJ1_START + 100) +//#define SID_TITLE_TEXT (SID_OBJ1_START + 100) //somehow used as slot in old chart //#define SID_DIAGRAM_STOCK_LINE (SID_OBJ1_START + 101) //used as slot in old chart diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 207a6ab7f0ee..627d0cae9f06 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::XComponentContext> m_xCC; bool m_bAttachToMainAxis; bool m_bSupportingOverlapAndGapWidthProperties; diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc index 6c7b43526d22..baaf28d180bc 100644 --- a/chart2/source/controller/inc/ShapeController.hrc +++ b/chart2/source/controller/inc/ShapeController.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index cb4227185093..1755420c18e0 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index 41e41dbde308..c4348dbd2122 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index 626724289187..469bcf130b36 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 768cca0fe8c6..3b30dda31b3d 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index fadcdad4aab3..fb748a918859 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 535e36226a12..8e5466fa98a4 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx index 61a68d6f8b4c..41eebea43f20 100644 --- a/chart2/source/controller/inc/ViewElementListProvider.hxx +++ b/chart2/source/controller/inc/ViewElementListProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 4144531ed77e..1dcdee9cb0bd 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,12 +53,12 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~ChartTypeDialog(); - + private: FixedLine m_aFL; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ChartTypeTabPage* m_pChartTypeTabPage; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index c8abda3cb19a..f3d621519d67 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const com::sun::star::uno::Any& _rValue); - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); // XTypeProvider virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); @@ -76,7 +76,7 @@ private: ChartTypeUnoDlg(); ChartTypeUnoDlg(const ChartTypeUnoDlg&); // no defined void operator =(const ChartTypeUnoDlg&); // no defined - + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; }; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index e70976ad1a4c..e46475166c9f 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ class DataSourceTabPage; class ChartTypeTemplateProvider; class DialogModel; -class CreationWizard : public +class CreationWizard : public svt::RoadmapWizard , public TabPageNotifiable { public: - CreationWizard( Window* pParent, + CreationWizard( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< @@ -69,9 +69,9 @@ public: virtual void setValidPage( TabPage * pTabPage ); protected: - virtual sal_Bool leaveState( WizardState _nState ); - virtual WizardState determineNextState(WizardState nCurrentState) const; - virtual void enterState(WizardState nState); + virtual sal_Bool leaveState( WizardState _nState ); + virtual WizardState determineNextState(WizardState nCurrentState) const; + virtual void enterState(WizardState nState); virtual String getStateDisplayName( WizardState nState ) const; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 9f546f1a72d6..85606e90a18f 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,11 +72,11 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) - + // XExecutableDialog virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); @@ -87,7 +87,7 @@ public: // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); //XPropertySet diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index e5cd252df69d..a30831bd2ac8 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,4 +118,4 @@ private: } // namespace chart -#endif // _SCH_DGRDATA_HXX +#endif // _SCH_DGRDATA_HXX diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index f94c95b33370..dcbdc6699de0 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,9 +82,9 @@ protected: private: DataSourceTabControl* m_pTabControl; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; RangeChooserTabPage * m_pRangeChooserTabePage; DataSourceTabPage * m_pDataSourceTabPage; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 5ed06d365fa2..da1ac0660417 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,21 +58,21 @@ struct InsertAxisOrGridDialogData class SchAxisDlg : public ModalDialog { protected: - FixedLine aFlPrimary; - FixedLine aFlPrimaryGrid; - CheckBox aCbPrimaryX; - CheckBox aCbPrimaryY; - CheckBox aCbPrimaryZ; + FixedLine aFlPrimary; + FixedLine aFlPrimaryGrid; + CheckBox aCbPrimaryX; + CheckBox aCbPrimaryY; + CheckBox aCbPrimaryZ; - FixedLine aFlSecondary; - FixedLine aFlSecondaryGrid; - CheckBox aCbSecondaryX; - CheckBox aCbSecondaryY; - CheckBox aCbSecondaryZ; + FixedLine aFlSecondary; + FixedLine aFlSecondaryGrid; + CheckBox aCbSecondaryX; + CheckBox aCbSecondaryY; + CheckBox aCbSecondaryZ; - OKButton aPbOK; - CancelButton aPbCancel; - HelpButton aPbHelp; + OKButton aPbOK; + CancelButton aPbCancel; + HelpButton aPbHelp; public: SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, BOOL bAxisDlg=true ); diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index a22333b5bdc8..6de88969720d 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ class DataLabelResources; class DataLabelsDialog : public ModalDialog { private: - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ::std::auto_ptr< DataLabelResources > m_apDataLabelResources; - const SfxItemSet& m_rInAttrs; + const SfxItemSet& m_rInAttrs; void Reset(); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 3554337d9deb..c8bf074f662a 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index 8ab7f285b5a9..49db40bb89c4 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ class SchLegendDlg : public ModalDialog private: ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 41eeac7a1055..c01442f63b6b 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ class SchTitleDlg : public ModalDialog { private: ::std::auto_ptr< TitleResources > m_apTitleResources; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SchTitleDlg( Window* pParent, const TitleDialogData& rInput ); diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx index 34819f6e0e16..a54d5ccdce19 100644 --- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx +++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 8ceabdbe33b7..8f5409e261cc 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ public: ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ); virtual ~ObjectPropertiesDialogParameter(); - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - ObjectType getObjectType() const; + void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + ObjectType getObjectType() const; rtl::OUString getLocalizedName() const; bool HasGeometryProperties() const; @@ -65,16 +65,16 @@ public: bool ShowAxisOrigin() const; bool IsCrossingAxisIsCategoryAxis() const; const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; private: - rtl::OUString m_aObjectCID; - ObjectType m_eObjectType; + rtl::OUString m_aObjectCID; + ObjectType m_eObjectType; bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - rtl::OUString m_aLocalizedName; + rtl::OUString m_aLocalizedName; bool m_bHasGeometryProperties; bool m_bHasStatisticProperties; @@ -111,15 +111,15 @@ class SchAttribTabDlg : public SfxTabDialog private: ObjectType eObjectType; bool bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - USHORT nDlgType; - USHORT nPageType; + USHORT nDlgType; + USHORT nPageType; const ObjectPropertiesDialogParameter * const m_pParameter; - const ViewElementListProvider* const m_pViewElementListProvider; + const ViewElementListProvider* const m_pViewElementListProvider; SvNumberFormatter* m_pNumberFormatter; SfxItemSet* m_pSymbolShapeProperties; - Graphic* m_pAutoSymbolGraphic; + Graphic* m_pAutoSymbolGraphic; double m_fAxisMinorStepWidthForErrorBarDecimals; bool m_bOKPressed; diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index ec1b6553bd64..c576d82cf2da 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index 2bc57bfcffc2..c326e1cb9c24 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 91b16d3512d8..ebfd7a16865e 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ public: private: TabControl m_aTabControl; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ThreeD_SceneGeometry_TabPage* m_pGeometry; ThreeD_SceneAppearance_TabPage* m_pAppearance; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 0b5f33b5c128..f0007199c134 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 8cf07aabad08..a2b35e155852 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ AxisItemConverter::AxisItemConverter( m_pExplicitScale = new chart2::ExplicitScaleData( *pScale ); if( pIncrement ) m_pExplicitIncrement = new chart2::ExplicitIncrementData( *pIncrement ); - + m_aConverters.push_back( new GraphicPropertyItemConverter( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, @@ -324,12 +324,12 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS { //read only item //necessary tp display the crossing value with an appropriate format - + Reference< chart2::XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ) ); Reference< chart2::XAxis > xCrossingMainAxis( AxisHelper::getCrossingMainAxis( m_xAxis, xCooSys ) ); - + sal_Int32 nFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForAxis( xCrossingMainAxis, xCooSys, Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY ) ); @@ -401,9 +401,9 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI { if( !m_xAxis.is() ) return false; - + chart2::ScaleData aScale( m_xAxis->getScaleData() ); - + bool bSetScale = false; bool bChangedOtherwise = false; @@ -489,7 +489,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_REVERSE: { - bool bWasReverse = ( AxisOrientation_REVERSE == aScale.Orientation ); + bool bWasReverse = ( AxisOrientation_REVERSE == aScale.Orientation ); bool bNewReverse = (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ); if( bWasReverse != bNewReverse ) @@ -612,7 +612,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_POSITION: { - ::com::sun::star::chart::ChartAxisPosition eAxisPos = + ::com::sun::star::chart::ChartAxisPosition eAxisPos = (::com::sun::star::chart::ChartAxisPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -684,7 +684,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_LABEL_POSITION: { - ::com::sun::star::chart::ChartAxisLabelPosition ePos = + ::com::sun::star::chart::ChartAxisLabelPosition ePos = (::com::sun::star::chart::ChartAxisLabelPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -722,7 +722,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_MARK_POSITION: { - ::com::sun::star::chart::ChartAxisMarkPosition ePos = + ::com::sun::star::chart::ChartAxisMarkPosition ePos = (::com::sun::star::chart::ChartAxisMarkPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -827,7 +827,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI if( bSetScale ) m_xAxis->setScaleData( aScale ); - + return (bSetScale || bChangedOtherwise); } diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 3382ae1ff085..6183703cc0a4 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -464,7 +464,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( try { if( rItem.QueryValue( aValue, MID_FONTHEIGHT ) ) - { + { bool bSetValue = false; if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix )) bSetValue = true; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 14590b6f6f9c..5cd14a4720dd 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ bool lcl_NumberFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet & if( bOverwriteAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( xPropertySet, uno::UNO_QUERY); - if( aValue != aOldValue || + if( aValue != aOldValue || ::chart::DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, aPropertyName, aOldValue ) ) { ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, aPropertyName, aValue ); @@ -187,7 +187,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet if( bOverwriteAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( xPropertySet, uno::UNO_QUERY); - if( aNewValue != aOldValue || + if( aNewValue != aOldValue || ::chart::DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, aPropertyName, aOldValue ) ) { ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, aPropertyName, aNewValue ); @@ -340,7 +340,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( bOldValue != rValue || + if( bOldValue != rValue || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "Label" ), aOldValue ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny( aLabel ) ); @@ -380,7 +380,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( !aOldValue.equals(aNewValue) || + if( !aOldValue.equals(aNewValue) || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aOldValue ) ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aNewValue ) ); @@ -402,7 +402,7 @@ bool DataPointItemConverter::ApplySpecialItem( case SCHATTR_DATADESCR_PLACEMENT: { - + try { sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -415,7 +415,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( nOld!=nNew || + if( nOld!=nNew || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nOld ) ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nNew ) ); @@ -563,7 +563,7 @@ void DataPointItemConverter::FillSpecialItem( (SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol )); rOutItemSet.Put( SfxBoolItem( nWhichId, bValue )); - + if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { if( DataSeriesHelper::hasAttributedDataPointDifferentValue( diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 0e2e6cdd4644..3a69b6c3ec88 100755 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index c732dfe80ede..837b7504fffc 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -323,7 +323,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( break; case XATTR_GRADIENTSTEPCOUNT: - if( lcl_supportsFillProperties( m_eGraphicObjectType )) + if( lcl_supportsFillProperties( m_eGraphicObjectType )) { ::rtl::OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 5ee167260974..b819ff18a531 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 3af6d9342f33..60ac4c9b86ca 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index e111eb314360..2516fa18d079 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt ) { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); - uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties + uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, *aIt, -1/*nPointIndex*/, ChartModelHelper::findDiagram( xChartModel ) ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index e24be80bb429..c14a41b7f5c3 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 2fee8702e6d8..18e045ce578a 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 6035f21696a9..6ba4be5f2d70 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index f7ddeb42c11e..63bb9c0154cc 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,74 +56,74 @@ const USHORT nTitleWhichPairs[] = const USHORT nAxisWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx CHARACTER_WHICHPAIRS, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432 svx/svxids.hrc - SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx - SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx - SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx - SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx - SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx + SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx + SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx + SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; const USHORT nAllAxisWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx CHARACTER_WHICHPAIRS, - SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx - SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx - SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx - SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx + SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx + SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; const USHORT nGridWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; const USHORT nLegendWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx CHARACTER_WHICHPAIRS, - SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx + SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx 0 }; const USHORT nDataLabelWhichPairs[] = { SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ - SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ - SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR, 0 }; -#define CHART_POINT_WHICHPAIRS \ - XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ - XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ - EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 editeng/eeitem.hxx */ \ +#define CHART_POINT_WHICHPAIRS \ + XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ + XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ + EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 editeng/eeitem.hxx */ \ SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING, \ - SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ + SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ - SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ - SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ SCHATTR_TEXT_DEGREES, SCHATTR_TEXT_DEGREES, \ - SCHATTR_STYLE_START,SCHATTR_STYLE_END, /* 59 - 68 sch/schattr.hxx*/ \ - SCHATTR_SYMBOL_BRUSH,SCHATTR_SYMBOL_BRUSH, /* 94 sch/schattr.hxx*/ \ - SCHATTR_SYMBOL_SIZE,SCHATTR_SYMBOL_SIZE, /* 97 sch/schattr.hxx*/ \ - SDRATTR_3D_FIRST, SDRATTR_3D_LAST /* 1244 - 1334 svx/svddef.hxx */ + SCHATTR_STYLE_START,SCHATTR_STYLE_END, /* 59 - 68 sch/schattr.hxx*/ \ + SCHATTR_SYMBOL_BRUSH,SCHATTR_SYMBOL_BRUSH, /* 94 sch/schattr.hxx*/ \ + SCHATTR_SYMBOL_SIZE,SCHATTR_SYMBOL_SIZE, /* 97 sch/schattr.hxx*/ \ + SDRATTR_3D_FIRST, SDRATTR_3D_LAST /* 1244 - 1334 svx/svddef.hxx */ const USHORT nDataPointWhichPairs[] = { @@ -132,7 +132,7 @@ const USHORT nDataPointWhichPairs[] = }; #define CHART_SERIES_OPTIONS_WHICHPAIRS \ - SCHATTR_AXIS,SCHATTR_AXIS, /* 69 sch/schattr.hxx*/ \ + SCHATTR_AXIS,SCHATTR_AXIS, /* 69 sch/schattr.hxx*/ \ SCHATTR_BAR_OVERLAP,SCHATTR_BAR_CONNECT, /* 98 - 100 (incl. SCHATTR_GAPWIDTH) */ \ SCHATTR_GROUP_BARS_PER_AXIS,SCHATTR_AXIS_FOR_ALL_SERIES, \ SCHATTR_STARTING_ANGLE,SCHATTR_STARTING_ANGLE, \ @@ -156,9 +156,9 @@ const USHORT nRowWhichPairs[] = const USHORT nAreaWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; @@ -166,7 +166,7 @@ const USHORT nTextWhichPairs[] = { CHARACTER_WHICHPAIRS, SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; @@ -174,21 +174,21 @@ const USHORT nTextOrientWhichPairs[] = { CHARACTER_WHICHPAIRS, SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; const USHORT nStatWhichPairs[]= { - SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx + SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 0 }; const USHORT nErrorBarWhichPairs[]= { - SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; @@ -202,22 +202,22 @@ const USHORT nCharacterPropertyWhichPairs[] = const USHORT nLinePropertyWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; const USHORT nFillPropertyWhichPairs[] = { - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; const USHORT nLineAndFillPropertyWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; @@ -234,7 +234,7 @@ const USHORT nChartStyleWhichPairs[] = const USHORT nRegressionCurveWhichPairs[] = { SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; @@ -244,7 +244,7 @@ const USHORT nRegEquationWhichPairs[] = XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx CHARACTER_WHICHPAIRS, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc 0 }; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index b1931d63cfbb..db5ceda4a16c 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -252,7 +252,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte } else if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) m_aBarPositionSequence[nAxisIndex] = rBarPosition; - + xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(m_aBarPositionSequence) ); bChanged = true; } @@ -316,7 +316,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte break; case SCHATTR_CLOCKWISE: - { + { bool bClockwise = (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ); if( m_xCooSys.is() ) diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index f2df5c96dd71..11a6db4c7f06 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index f745dd37e9c3..fa3e71dd9dfb 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index bf8afc65e78f..744727fab528 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,8 +181,8 @@ ChartController::TheModel::~TheModel() void ChartController::TheModel::SetOwnerShip( sal_Bool bGetsOwnership ) { - m_bOwnership = bGetsOwnership; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = bGetsOwnership; + m_bOwnershipIsWellKnown = sal_True; } void ChartController::TheModel::addListener( ChartController* pController ) @@ -234,8 +234,8 @@ void ChartController::TheModel::tryTermination() //so stop listening before trying to terminate or check the source of queryclosing event m_xCloseable->close(sal_True); - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; } catch( util::CloseVetoException& ) { @@ -247,8 +247,8 @@ void ChartController::TheModel::tryTermination() "INFO: a well known owner has catched a CloseVetoException after calling close(true)" ); #endif - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; return; } @@ -365,7 +365,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT throw(uno::RuntimeException) { ::vos::OGuard aGuard( Application::GetSolarMutex()); - + if( impl_isDisposedOrSuspended() ) //@todo? allow attaching the frame while suspended? return; //behave passive if already disposed or suspended @@ -411,7 +411,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT } { awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) ); - + // calls to VCL ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); m_pChartWindow = new ChartWindow(this,pParent,pParent?pParent->GetStyle():0); @@ -557,7 +557,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent aOldModelRef->removeListener( this ); //@todo?? termination correct? -// aOldModelRef->tryTermination(); +// aOldModelRef->tryTermination(); #ifdef TEST_ENABLE_MODIFY_LISTENER uno::Reference< util::XModifyBroadcaster > xMBroadcaster( aOldModelRef->getModel(),uno::UNO_QUERY ); if( xMBroadcaster.is()) @@ -623,7 +623,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XFrame > SAL_CALL ChartController -::getFrame() throw(uno::RuntimeException) +::getFrame() throw(uno::RuntimeException) { //provides access to owner frame of this controller //return the frame containing this controller @@ -632,7 +632,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XModel > SAL_CALL ChartController -::getModel() throw(uno::RuntimeException) +::getModel() throw(uno::RuntimeException) { //provides access to currently attached model //returns the currently attached model @@ -650,7 +650,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent { //provides access to current view status //set of data that can be used to restore the current view status at later time - // by using XController::restoreViewData() + // by using XController::restoreViewData() ::vos::OGuard aGuard( Application::GetSolarMutex()); if( impl_isDisposedOrSuspended() ) @@ -768,7 +768,7 @@ void ChartController::impl_deleteDrawViewController() if( !m_aLifeTimeManager.dispose() ) return; -// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); +// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); this->stopDoubleClickWaiting(); @@ -1070,7 +1070,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) return uno::Reference< frame::XDispatch > (); } - uno::Sequence<uno::Reference<frame::XDispatch > > ChartController + uno::Sequence<uno::Reference<frame::XDispatch > > ChartController ::queryDispatches( const uno::Sequence< frame::DispatchDescriptor>& xDescripts) throw(uno::RuntimeException) @@ -1275,12 +1275,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: add listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); -// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? -// return; //behave passive if already disposed or suspended +// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? +// return; //behave passive if already disposed or suspended -// //--add listener -// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); +// //--add listener +// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); } void SAL_CALL ChartController @@ -1289,12 +1289,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: remove listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// ::vos::OGuard aGuard( Application::GetSolarMutex()); // if( m_aLifeTimeManager.impl_isDisposed() ) -// return; //behave passive if already disposed or suspended +// return; //behave passive if already disposed or suspended -// //--remove listener -// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); +// //--remove listener +// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); } //----------------------------------------------------------------- @@ -1435,7 +1435,7 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) // the source can also be a subobject of the ChartModel // @todo: change the source in ChartModel to always be the model itself ? // if( getModel() == aEvent.Source ) - + //todo? update menu states ? } @@ -1546,7 +1546,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ( C2U("InsertMenuLegend") ) ( C2U("InsertLegend") ) ( C2U("DeleteLegend") ) ( C2U("InsertMenuDataLabels") ) ( C2U("InsertMenuAxes") ) ( C2U("InsertRemoveAxes") ) ( C2U("InsertMenuGrids") ) - ( C2U("InsertSymbol") ) + ( C2U("InsertSymbol") ) ( C2U("InsertTrendlineEquation") ) ( C2U("InsertTrendlineEquationAndR2") ) ( C2U("InsertR2Value") ) ( C2U("DeleteR2Value") ) ( C2U("InsertMenuTrendlines") ) ( C2U("InsertTrendline") ) @@ -1575,7 +1575,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn //context menu - format objects entries ( C2U("FormatWall") ) ( C2U("FormatFloor") ) ( C2U("FormatChartArea") ) ( C2U("FormatLegend") ) - + ( C2U("FormatAxis") ) ( C2U("FormatTitle") ) ( C2U("FormatDataSeries") ) ( C2U("FormatDataPoint") ) ( C2U("ResetAllDataPoints") ) ( C2U("ResetDataPoint") ) diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index f2b64eb7a9c5..c679714d212c 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,16 +139,16 @@ class DrawViewWrapper; class ViewElementListProvider; class ReferenceSizeProvider; -class ChartController : public ::cppu::WeakImplHelper12 < - ::com::sun::star::frame::XController //comprehends XComponent (required interface) - ,::com::sun::star::frame::XDispatchProvider //(required interface) - ,::com::sun::star::view::XSelectionSupplier //(optional interface) - ,::com::sun::star::ui::XContextMenuInterception //(optional interface) - ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) +class ChartController : public ::cppu::WeakImplHelper12 < + ::com::sun::star::frame::XController //comprehends XComponent (required interface) + ,::com::sun::star::frame::XDispatchProvider //(required interface) + ,::com::sun::star::view::XSelectionSupplier //(optional interface) + ,::com::sun::star::ui::XContextMenuInterception //(optional interface) + ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) ,::com::sun::star::lang::XServiceInfo - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::frame::XDispatch ,::com::sun::star::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent ,::com::sun::star::lang::XMultiServiceFactory @@ -188,13 +188,13 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException); + getFrame() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException); + getModel() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException); + getViewData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) @@ -208,7 +208,7 @@ public: // ::com::sun::star::lang::XComponent (base of XController) //----------------------------------------------------------------- virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< @@ -244,7 +244,7 @@ public: select( const ::com::sun::star::uno::Any& rSelection ) throw ( com::sun::star::lang::IllegalArgumentException ); - virtual ::com::sun::star::uno::Any SAL_CALL + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -338,7 +338,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException); + setFocus() throw (::com::sun::star::uno::RuntimeException); //---------------- virtual void SAL_CALL @@ -503,7 +503,7 @@ private: void acquire(); void release(); private: - sal_Int32 volatile m_nRefCount; + sal_Int32 volatile m_nRefCount; }; class TheModel : public RefCountable { @@ -513,24 +513,24 @@ private: virtual ~TheModel(); - void SetOwnerShip( sal_Bool bGetsOwnership ); - void addListener( ChartController* pController ); - void removeListener( ChartController* pController ); - void tryTermination(); + void SetOwnerShip( sal_Bool bGetsOwnership ); + void addListener( ChartController* pController ); + void removeListener( ChartController* pController ); + void tryTermination(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel() { return m_xModel;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; //the ownership between model and controller is not clear at first //each controller might consider himself as owner of the model first - sal_Bool volatile m_bOwnership; + sal_Bool volatile m_bOwnership; //with a XCloseable::close call and during XCloseListener::queryClosing //the ownership can be regulated more explicit, //if so the ownership is considered to be well known - sal_Bool volatile m_bOwnershipIsWellKnown; + sal_Bool volatile m_bOwnershipIsWellKnown; }; class TheModelRef { @@ -543,31 +543,31 @@ private: sal_Bool is() const; TheModel* operator->() const { return m_pTheModel; } private: - TheModel* m_pTheModel; - mutable ::osl::Mutex& m_rModelMutex; + TheModel* m_pTheModel; + mutable ::osl::Mutex& m_rModelMutex; }; private: - mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; + mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; - mutable ::osl::Mutex m_aControllerMutex; - sal_Bool volatile m_bSuspended; - sal_Bool volatile m_bCanClose; + mutable ::osl::Mutex m_aControllerMutex; + sal_Bool volatile m_bSuspended; + sal_Bool volatile m_bCanClose; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; //model - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - mutable ::osl::Mutex m_aModelMutex; - TheModelRef m_aModel; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + mutable ::osl::Mutex m_aModelMutex; + TheModelRef m_aModel; //view ChartWindow* m_pChartWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; - DrawViewWrapper* m_pDrawViewWrapper; + DrawViewWrapper* m_pDrawViewWrapper; Selection m_aSelection; SdrDragMode m_eDragMode; @@ -596,7 +596,7 @@ private: private: //private methods - sal_Bool impl_isDisposedOrSuspended() const; + sal_Bool impl_isDisposedOrSuspended() const; ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider(); void impl_adaptDataSeriesAutoResize(); @@ -708,7 +708,7 @@ private: ::std::set< ::rtl::OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For - parameters see + parameters see The returned object should not be used directly. Instead a proxy object should use this helper to retrieve its children and add them to its own diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 0248732a63a7..6026345080cb 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 0a7a4057ef9a..b5e3cc04bf97 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -297,7 +297,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() ObjectIdentifier::getSeriesParticleFromCID(m_aSelection.getSelectedCID()), aChildParticle ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); return; } @@ -706,7 +706,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_LABEL )))), m_xUndoManager, getModel() ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); @@ -756,7 +756,7 @@ void ChartController::executeDispatch_ResetDataPoint() { sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( m_aSelection.getSelectedCID() ); xSeries->resetDataPoint( nPointIndex ); - } + } aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 619d308ffad2..0779306832d0 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,13 +86,13 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r switch( eRP ) { - case RP_LT: + case RP_LT: break; case RP_MT: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; + nPosX += ( aOriginalSize.Width - nSizX ) / 2; break; case RP_RT: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; break; case RP_LM: nPosY += ( aOriginalSize.Height - nSizY ) / 2; @@ -113,7 +113,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r nPosY += aOriginalSize.Height - nSizY; break; case RP_RB: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; nPosY += aOriginalSize.Height - nSizY; break; default: @@ -157,7 +157,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ); DBG_ASSERT( pDlg, "Couldn't create SchTransformTabDialog" ); - + if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 649b9cb62f9d..227946cd2d66 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -243,7 +243,7 @@ namespace sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, xSeries, nPointIndex, xDiagram ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( xObjectProperties,uno::Reference< util::XNumberFormatsSupplier >(xChartModel, uno::UNO_QUERY)); - + pItemConverter = new wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, xSeries, rDrawModel.GetItemPool(), rDrawModel, pNumberFormatterWrapper, @@ -355,7 +355,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, nTitleType = TitleHelper::SECONDARY_X_AXIS_TITLE; else if( rDispatchCommand.equals("SecondaryYTitle") ) nTitleType = TitleHelper::SECONDARY_Y_AXIS_TITLE; - + uno::Reference< XTitle > xTitle( TitleHelper::getTitle( nTitleType, xChartModel ) ); return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ); } @@ -373,7 +373,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisY")) { - nDimensionIndex=1; bMainAxis=true; + nDimensionIndex=1; bMainAxis=true; } else if( rDispatchCommand.equals("DiagramAxisZ")) { @@ -385,7 +385,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisB")) { - nDimensionIndex=1; bMainAxis=false; + nDimensionIndex=1; bMainAxis=false; } uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); @@ -578,7 +578,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand return rSelectedCID; else return ObjectIdentifier::createDataCurveCID( - ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), + ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } @@ -627,7 +627,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( rSelectedCID, xChartModel ); return ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel ); } - + } //------------------------------------------------------------------------- // minor grid @@ -723,7 +723,7 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin m_xUndoManager, getModel() ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, false ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index a6e82430d8f6..9e1c003abd10 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() //set fixed current font aSet.Put( SfxBoolItem( FN_PARAM_2, TRUE ) ); //maybe not necessary in future - + Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont(); aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index ffe752f43a7a..5ce82dec7e52 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ bool lcl_deleteDataSeries( ::chart::DataSeriesHelper::deleteSeries( xSeries, xChartType ); ::chart::AxisHelper::hideAxisIfNoDataIsAttached( xAxis, xDiagram ); - + bResult = true; aUndoGuard.commitAction(); } @@ -210,7 +210,7 @@ namespace chart awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); return ::std::auto_ptr< ReferenceSizeProvider >( - new ReferenceSizeProvider( aPageSize, + new ReferenceSizeProvider( aPageSize, Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ))); } @@ -247,7 +247,7 @@ void ChartController::executeDispatch_NewArrangement() // 3d rotation ThreeDHelper::set3DSettingsToDefault( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ) ); - + // legend Reference< beans::XPropertyState > xLegendState( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendState.is()) @@ -827,16 +827,14 @@ bool ChartController::executeDispatch_Delete() else { //remove additional shape - uno::Reference< drawing::XShape > xShape( m_aSelection.getSelectedAdditionalShape() ); - if( xShape.is() ) + impl_ClearSelection(); { - impl_ClearSelection(); + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + if ( m_pDrawViewWrapper ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - if( m_pDrawViewWrapper ) - m_pDrawViewWrapper->UnmarkAll(); + m_pDrawViewWrapper->DeleteMarked(); + bReturn = true; } - bReturn = DrawModelWrapper::removeShape( xShape ); } } return bReturn; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 56908ac4ef79..dfc25bd4bad5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ #include <rtl/math.hxx> #include <svtools/acceleratorexecute.hxx> -#define DRGPIX 2 // Drag MinMove in Pixel +#define DRGPIX 2 // Drag MinMove in Pixel using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -336,7 +336,7 @@ const short HITPIX=2; //hit-tolerance in pixel } void SAL_CALL ChartController -::setFocus() throw (uno::RuntimeException) +::setFocus() throw (uno::RuntimeException) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -620,7 +620,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper ) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if ( MOUSE_LEFT == rMEvt.GetButtons() ) { @@ -654,7 +654,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if( isDoubleClick(rMEvt) ) //do not change selection if double click return;//double click is handled further in mousebutton up - + SdrHdl* pHitSelectionHdl = 0; //switch from move to resize if handle is hit on a resizeable object if( m_aSelection.isResizeableObjectSelected() ) @@ -697,7 +697,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) m_aSelection.adaptSelectionToNewPos( aMPos, pDrawViewWrapper , rMEvt.IsRight(), m_bWaitingForDoubleClick ); - + if( !m_aSelection.isRotateableObjectSelected( getModel() ) ) { m_eDragMode = SDRDRAG_MOVE; @@ -766,8 +766,8 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt ) pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); } - //?? pDrawViewWrapper->GetPageView()->DragPoly(); - + //?? pDrawViewWrapper->GetPageView()->DragPoly(); + impl_SetMousePointer( rMEvt ); } void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ ) @@ -790,7 +790,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if(pDrawViewWrapper->IsTextEdit()) { @@ -867,7 +867,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::MOVE); if( !bIsMoveOnly && m_aSelection.isResizeableObjectSelected() ) eActionType = ActionDescriptionProvider::RESIZE; - + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( eActionType, @@ -896,13 +896,13 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) { bool bClickedTwiceOnDragableObject = SelectionHelper::isDragableObjectHitTwice( aMPos, m_aSelection.getSelectedCID(), *pDrawViewWrapper ); bool bIsRotateable = m_aSelection.isRotateableObjectSelected( getModel() ); - + //toggel between move and rotate if( bIsRotateable && bClickedTwiceOnDragableObject && SDRDRAG_MOVE==m_eDragMode ) m_eDragMode=SDRDRAG_ROTATE; else m_eDragMode=SDRDRAG_MOVE; - + pDrawViewWrapper->SetDragMode(m_eDragMode); if( !m_bWaitingForDoubleClick && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() ) @@ -1027,7 +1027,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) else { // todo: the context menu should be specified by an xml file in uiconfig - uno::Reference< awt::XPopupMenu > xPopupMenu( + uno::Reference< awt::XPopupMenu > xPopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY ); @@ -1048,7 +1048,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); uno::Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); Reference< chart2::XRegressionCurve > xTrendline( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xCurveCnt ) ); - bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); + bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) ); bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true ); bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries ); @@ -1126,7 +1126,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ASSERT_EXCEPTION( ex ); } } - + if( bHasDataLabelsAtSeries ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") ); if( xTrendline.is() ) @@ -1175,9 +1175,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) //if( nIdBeforeDelete != nUniqueId ) xPopupMenu->insertSeparator( -1 ); - + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow")); - uno::Reference< awt::XPopupMenu > xArrangePopupMenu( + uno::Reference< awt::XPopupMenu > xArrangePopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY ); @@ -1225,7 +1225,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XTitled > xTitled( xAxis, uno::UNO_QUERY ); if( xTitled.is()) bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0; - + if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") ); if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis ) @@ -1271,12 +1271,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") ); if( !bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); if( bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") ); } //----- - + xPopupMenu->insertSeparator( -1 ); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType")); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges")); @@ -1510,7 +1510,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) aPos.Y = aPageSize.Height - aSize.Height; if( aPos.Y < 0 ) aPos.Y = 0; - + xShape->setPosition( aPos ); } } @@ -1889,7 +1889,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( pHitSelectionHdl ) { - + Pointer aPointer = m_pDrawViewWrapper->GetPreferedPointer( aMousePos, pWindow, nModifier, bLeftDown ); bool bForceArrowPointer = false; @@ -1934,7 +1934,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if ( m_eDrawMode == CHARTDRAW_INSERT && ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) ) { - PointerStyle ePointerStyle = POINTER_DRAW_RECT; + PointerStyle ePointerStyle = POINTER_DRAW_RECT; SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() ); switch ( eKind ) { diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 8749ca1bc062..d000b3071e1e 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index 2de9c0c72663..e9d226bcd1bb 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ private: ChartDropTargetHelper(); bool satisfiesPrerequisites() const; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index cab3816d5033..ecd8f0422d66 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT { //@todo ? need to add as terminate listener to desktop? - uno::Reference< frame::XModel > xModel; + uno::Reference< frame::XModel > xModel; bool bHaveLoadedModel = false; comphelper::MediaDescriptor aMediaDescriptor(rMediaDescriptor); @@ -118,8 +118,8 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } //create the controller(+XWindow) - uno::Reference< frame::XController > xController = NULL; - uno::Reference< awt::XWindow > xComponentWindow = NULL; + uno::Reference< frame::XController > xController = NULL; + uno::Reference< awt::XWindow > xComponentWindow = NULL; { xController = uno::Reference< frame::XController >( m_xCC->getServiceManager()->createInstanceWithContext( diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 8b6e1e0a3225..60ae0423f650 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,15 +43,15 @@ class ChartFrameLoader : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader , ::com::sun::star::lang::XServiceInfo //comprehends XComponent (required interface) - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; - sal_Bool m_bCancelRequired; - ::osl::Condition m_oCancelFinished; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + sal_Bool m_bCancelRequired; + ::osl::Condition m_oCancelFinished; private: sal_Bool impl_checkCancel(); @@ -81,7 +81,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException); + cancel() throw (::com::sun::star::uno::RuntimeException); }; //............................................................................. diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx index 3419f7a53bec..a5fdde5c08a1 100644 --- a/chart2/source/controller/main/ChartRenderer.cxx +++ b/chart2/source/controller/main/ChartRenderer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject // get the chart view Reference< lang::XUnoTunnel > xChartView( xFact->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); - + try { //better performance for big data @@ -121,7 +121,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject return false; ::boost::shared_ptr< DrawViewWrapper > pDrawViewWrapper( new DrawViewWrapper(&pDrawModelWrapper->getSdrModel(),pOutDev,false) ); pDrawViewWrapper->attachParentReferenceDevice( xModel ); - + MapMode aOldMapMode( pOutDev->GetMapMode() ); Point aOldOrigin( aOldMapMode.GetOrigin() ); MapMode aMapMode( aOldMapMode ); @@ -130,7 +130,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject aMapMode.SetOrigin( aOldOriginMM + aObjectTopLeftMM ); aMapMode.SetMapUnit( MAP_100TH_MM ); pOutDev->SetMapMode(aMapMode); - + Rectangle aPaintRect( OutputDevice::LogicToLogic( rLogicObjectRect, aOldMapMode, aMapMode ) ); pDrawViewWrapper->CompleteRedraw(pOutDev, Region(aPaintRect) ); diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 80041d4c3818..1ab1bc2999b0 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index 401f43c6d1ae..667b137abf89 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 240b615cf0f6..1f077b301948 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 2325d6be7803..812dc2438a80 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index bd040fce8fff..d527d7e52ac7 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 08140786ac4e..488cb6edcd39 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index e0d689340760..019d6b8392ba 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ void CommandDispatchContainer::setModel( { // remove all existing dispatcher that base on the old model m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xModel = xModel; } @@ -174,7 +174,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche void CommandDispatchContainer::DisposeAndClear() { m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xChartDispatcher.clear(); m_aChartCommands.clear(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 1c8769e0a6d9..32b136cd8fb2 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index bf0bc6e14eec..60258054762d 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index a01b80bfa22b..c62de3dfe211 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 08d57a0d6cbf..943a3e760fa8 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 11ba7b7b8016..c61339272ac6 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index dfd5cfa20255..e298cb384b88 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 5074147fa9e2..d5f6d1f68ffa 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt) m_fAdditionalOffset = -m_fInitialOffset; else if( m_fAdditionalOffset > (1.0-m_fInitialOffset) ) m_fAdditionalOffset = 1.0 - m_fInitialOffset; - + B2DVector aNewPosVector = m_aStartVector + (m_aDragDirection * m_fAdditionalOffset); Point aNewPos = Point( (long)(aNewPosVector.getX()), (long)(aNewPosVector.getY()) ); if( aNewPos != DragStat().GetNow() ) diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index f63af9be3cc4..5e52749abd8c 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 944b44dd25bf..56d089481021 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_chart2.hxx" #include "DragMethod_RotateDiagram.hxx" @@ -94,11 +94,11 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr { ThreeDHelper::getRotationFromDiagram( xDiagramProperties , m_nInitialHorizontalAngleDegree, m_nInitialVerticalAngleDegree ); - + ThreeDHelper::getRotationAngleFromDiagram( xDiagramProperties , m_fInitialXAngleRad, m_fInitialYAngleRad, m_fInitialZAngleRad ); - - if( ChartTypeHelper::isSupportingRightAngledAxes( + + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) xDiagramProperties->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; if(m_bRightAngledAxes) @@ -213,7 +213,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY ); aCurrentTransform.shearXY(fResultY,-(fResultX)); } - + if(m_aWireframePolyPolygon.count() && m_pScene) { const sdr::contact::ViewContactOfE3dScene& rVCScene = static_cast< sdr::contact::ViewContactOfE3dScene& >(m_pScene->GetViewContact()); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index b16e12fe5359..ba9ed1125f34 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public: DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper , const rtl::OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , RotationDirection eRotationDirection + , RotationDirection eRotationDirection ); virtual ~DragMethod_RotateDiagram(); @@ -67,7 +67,7 @@ private: Rectangle m_aReferenceRect; Point m_aStartPos; basegfx::B3DPolyPolygon m_aWireframePolyPolygon; - + double m_fInitialXAngleRad; double m_fInitialYAngleRad; double m_fInitialZAngleRad; @@ -75,7 +75,7 @@ private: double m_fAdditionalXAngleRad; double m_fAdditionalYAngleRad; double m_fAdditionalZAngleRad; - + sal_Int32 m_nInitialHorizontalAngleDegree; sal_Int32 m_nInitialVerticalAngleDegree; diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index aa28028c4861..cd893672adf4 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -398,7 +398,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen const beans::PropertyValue* pKeyModifier = ::std::find_if( pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) ); sal_Int16 nKeyModifier = 0; - if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) + if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) { if ( eDrawMode == CHARTDRAW_INSERT ) { diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc index 4e31fafaaf63..66a729498d71 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 38c886e29abb..a1e54f01b894 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 3b41fd1b6b66..210a26294aa1 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); aSelectedCID = aSelectedOID.getObjectCID(); } - + Reference< chart2::XChartDocument > xChartDoc( xChartController->getModel(), uno::UNO_QUERY ); ObjectType eType( aSelectedOID.getObjectType() ); bool bAddSelectionToList = false; @@ -318,7 +318,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } // ----------------------------------------------------------------------------- -uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) +uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xItemWindow; diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index d85415d614e2..3110e0ee28bd 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace chart { //............................................................................. - + struct ListBoxEntryData { rtl::OUString UIName; @@ -106,13 +106,13 @@ public: 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(){} private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; }; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 39b4e1d4a171..0dbbc762f15d 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index b3e2a568d3b9..6dd610e0b876 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ protected: the command group of the feature. This is important for configuring the controller UI by the user, see also <type scope="com::sun::star::frame">CommandGroup</type>. */ - void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, + void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, sal_Int16 nGroup = ::com::sun::star::frame::CommandGroup::INTERNAL ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx index 57e8e7315334..c22d54f9cbbe 100644 --- a/chart2/source/controller/main/ImplUndoManager.cxx +++ b/chart2/source/controller/main/ImplUndoManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ImplUndoManager.hxx b/chart2/source/controller/main/ImplUndoManager.hxx index 4dde0bc65719..ad40bf87aeaa 100644 --- a/chart2/source/controller/main/ImplUndoManager.hxx +++ b/chart2/source/controller/main/ImplUndoManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index fe73d15500f5..372b8cfa77e4 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -249,7 +249,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) ); for( sal_Int32 i=0; i<aAxes.getLength(); ++i ) lcl_addAxisTitle( aAxes[i], aTopLevelContainer, xModel ); - + // Diagram aTopLevelContainer.push_back( aDiaOID ); } @@ -339,7 +339,7 @@ void ImplObjectHierarchy::createAxesTree( AxisHelper::getIndicesForAxis( xAxis, xDiagram, nCooSysIndex, nDimensionIndex, nAxisIndex ); if( nAxisIndex>0 && !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, nDimensionIndex ) ) continue; - + if( m_bOrderingForElementSelector ) { // axis diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index f0ce3eaaa04e..b57f1add2018 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 567a36473a5b..1e1e407951de 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ rtl::OUString lcl_getObjectName( SdrObject* pObj ) void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + if(pObjectToSelect) { SelectionHelper aSelectionHelper( pObjectToSelect ); @@ -183,13 +183,13 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* { if( pDrawViewWrapper ) { - //do not toggel multiclick selection if right clicked on the selected object or waiting for double click + //do not toggel multiclick selection if right clicked on the selected object or waiting for double click bool bAllowMultiClickSelectionChange = !bIsRightMouse && !bWaitingForDoubleClick; ObjectIdentifier aLastSelectedObject( m_aSelectedOID ); ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + //bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point) //get object to select: @@ -452,7 +452,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos else if( bGetDiagramInsteadOf_Wall ) { rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model - + if( aRet.equals( aWallCID ) ) { rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); @@ -473,7 +473,7 @@ bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID return false; sal_Int32 nDimensionCount = DiagramHelper::getDimension( ChartModelHelper::findDiagram( xChartModel ) ); - + if( nDimensionCount == 3 ) return true; return false; @@ -558,7 +558,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) { //search wether the object or one of its children is a 3D object //if so, return the accessory 3DScene - + E3dObject* pRotateable = 0; if(pObj) @@ -579,7 +579,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) } } } - + E3dScene* pScene = 0; if(pRotateable) { diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index b3516e2326a4..a6904cf1af3c 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index b6adf9bf7477..61527c2918d3 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index aea01d6c478d..53436802e9d8 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 9c6ed747e1d5..913c1bf6da61 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -191,7 +191,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments // ::com::sun::star::frame::XStatusListener void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) { @@ -234,7 +234,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); Reference< awt::XWindow > xRet; if ( m_pToolbarController.is() ) @@ -259,7 +259,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno ::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { @@ -272,7 +272,7 @@ void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); - + uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 544cac7f9831..a8bfe954809b 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace chart { //............................................................................. -typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, +typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base; typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::star::frame::XToolbarController > TToolbarHelper; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index d80d37eff7da..00cc9a84417e 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index c84f81f83258..93e1f951c97d 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index eb3d00a2723a..bb6034f882fd 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 28fb813f63de..680be0462a52 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 8513b6ba9093..d26e9adb6ed8 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx index 21e27922b1c8..45e6c3e8b37f 100644 --- a/chart2/source/controller/main/UndoManager.cxx +++ b/chart2/source/controller/main/UndoManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index cf8f5525e624..6dd12e6429a2 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/menus/ShapeContextMenu.src b/chart2/source/controller/menus/ShapeContextMenu.src index 79e424707807..281668b3652a 100644 --- a/chart2/source/controller/menus/ShapeContextMenu.src +++ b/chart2/source/controller/menus/ShapeContextMenu.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ Menu RID_CONTEXTMENU_SHAPE Command = ".uno:ArrangeRow"; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -98,7 +98,7 @@ Menu RID_CONTEXTMENU_SHAPE Identifier = COMMAND_ID_SEND_TO_BACK; Command = ".uno:SendToBack"; }; - }; + }; }; }; MenuItem diff --git a/chart2/source/controller/menus/ShapeEditContextMenu.src b/chart2/source/controller/menus/ShapeEditContextMenu.src index 60f5d4eab5af..6206f575d9a1 100644 --- a/chart2/source/controller/menus/ShapeEditContextMenu.src +++ b/chart2/source/controller/menus/ShapeEditContextMenu.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 75e69436a784..aeabb9dae355 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = 0 ); - + static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); @@ -107,7 +107,7 @@ public: SAL_DLLPRIVATE static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties ); static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); static sal_Bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); - + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > getCoordinateSystemByIndex( @@ -197,7 +197,7 @@ public: ::com::sun::star::chart2::XCoordinateSystem >& xCooSys , bool bOnlyVisible = false ); - static ::com::sun::star::uno::Sequence< + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > getAllGrids( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/AxisIndexDefines.hxx b/chart2/source/inc/AxisIndexDefines.hxx index d994f8a85ea4..34a4c9b021b1 100644 --- a/chart2/source/inc/AxisIndexDefines.hxx +++ b/chart2/source/inc/AxisIndexDefines.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 384841261073..ac130e430505 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 2ad418939945..c64b2ffc35e2 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -143,7 +143,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) + virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); // <properties> diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index 0742435e9bfe..7bca5d49ef32 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx index d31267f9cfc4..d4b2fd8ff0e5 100644 --- a/chart2/source/inc/ChartDebugTrace.hxx +++ b/chart2/source/inc/ChartDebugTrace.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index fb087abf15fd..758b4c68369a 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 729cfc86bc52..2a435b811e54 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 772841418e45..18c9e0b00e0e 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index 6747bd614d84..a1158546409c 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index af49918a1154..8feca6e6b16e 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 1ce032b3af69..ae448623872a 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -267,7 +267,7 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); - + OOO_DLLPUBLIC_CHARTTOOLS bool replaceParamterInString( rtl::OUString & rInOutResourceString, const rtl::OUString & rParamToReplace, diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 13435741e63e..1d0f8cf93fba 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 56d13f8971c1..3953e041a39a 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx index 9ddde49908c2..1e60fe592a74 100644 --- a/chart2/source/inc/ConfigItemListener.hxx +++ b/chart2/source/inc/ConfigItemListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index 4c6d10d6b1f0..fdb5cbc9f109 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 69044d4a2b3f..d3101efbe3f9 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 640d5cd70dec..90e54fd099ae 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 3dd6ff72d330..0025151411f4 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 06888fe858d6..79954399f465 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createCachedDataSequence(); - + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createCachedDataSequence( const ::rtl::OUString & rSingleText ); diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index c7cda6189680..b65797a95551 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ public: static StackMode getStackMode( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, - bool& rbFound, bool& rbAmbiguous + bool& rbFound, bool& rbAmbiguous ); /** @param bOnlyAtFirstChartType @@ -123,7 +123,7 @@ public: /** Retrieves the stackmode of the first DataSeries or none. If the series have differing stack modes, rbAmbiguous is set to true. If no series is there rbFound is set to false. - + @param xCorrespondingCoordinateSystem The coordinate system in which the given chart type xChartType is located. (This is needed for determining percent stacking. If diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx index 7e8932f17581..72c854390048 100644 --- a/chart2/source/inc/DisposeHelper.hxx +++ b/chart2/source/inc/DisposeHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index f4d2b457acc4..cbb3d7bffe76 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 79840a2bd2e4..1efba6c07e57 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 18d54eb6e2ad..4601c1a416a6 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index 91c3034ea79c..533d3e714740 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx index d0651d60f923..0739d5d96750 100644 --- a/chart2/source/inc/FastPropertyIdRanges.hxx +++ b/chart2/source/inc/FastPropertyIdRanges.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index f9fa970828a2..66fdb5f9098d 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index a0e69011f77d..6312399d3175 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 6b6590cffdac..314bb2e18b36 100755 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public: ::std::vector< ::rtl::OUString > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; ::std::vector< ::rtl::OUString > getComplexRowLabel( sal_Int32 nRowIndex ) const; - + void swapRowWithNext( sal_Int32 nRowIndex ); void swapColumnWithNext( sal_Int32 nColumnIndex ); diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index f5e12f87f505..ccc35d734c6e 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ public: const ::rtl::OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XComplexDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); @@ -158,7 +158,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); @@ -197,7 +197,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) + virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); private: diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index a5ec1d99307d..73d762f8ef5c 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index 5f8279286b72..460b8e045b2c 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 8e278168259f..7c23a1286f5b 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,84 +47,84 @@ class LifeTimeManager { friend class LifeTimeGuard; protected: - mutable ::osl::Mutex m_aAccessMutex; + mutable ::osl::Mutex m_aAccessMutex; public: -OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); -OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager(); -OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposed( bool bAssert=true ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposed( bool bAssert=true ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); public: - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; protected: - virtual sal_Bool impl_canStartApiCall(); - virtual void impl_apiCallCountReachedNull(){} + virtual sal_Bool impl_canStartApiCall(); + virtual void impl_apiCallCountReachedNull(){} - void impl_registerApiCall(sal_Bool bLongLastingCall); - void impl_unregisterApiCall(sal_Bool bLongLastingCall); + void impl_registerApiCall(sal_Bool bLongLastingCall); + void impl_unregisterApiCall(sal_Bool bLongLastingCall); - void impl_init(); + void impl_init(); protected: - ::com::sun::star::lang::XComponent* m_pComponent; + ::com::sun::star::lang::XComponent* m_pComponent; - ::osl::Condition m_aNoAccessCountCondition; - sal_Int32 volatile m_nAccessCount; + ::osl::Condition m_aNoAccessCountCondition; + sal_Int32 volatile m_nAccessCount; - sal_Bool volatile m_bDisposed; - sal_Bool volatile m_bInDispose; + sal_Bool volatile m_bDisposed; + sal_Bool volatile m_bInDispose; // - sal_Bool m_bLongLastingCallsCancelable; - ::osl::Condition m_aNoLongLastingCallCountCondition; - sal_Int32 volatile m_nLongLastingCallCount; + sal_Bool m_bLongLastingCallsCancelable; + ::osl::Condition m_aNoLongLastingCallCountCondition; + sal_Int32 volatile m_nLongLastingCallCount; }; class CloseableLifeTimeManager : public LifeTimeManager { protected: - ::com::sun::star::util::XCloseable* m_pCloseable; + ::com::sun::star::util::XCloseable* m_pCloseable; - ::osl::Condition m_aEndTryClosingCondition; - sal_Bool volatile m_bClosed; - sal_Bool volatile m_bInTryClose; + ::osl::Condition m_aEndTryClosingCondition; + sal_Bool volatile m_bClosed; + sal_Bool volatile m_bInTryClose; //the ownership between model and controller is not clear at first //each controller might consider him as owner of the model first //at start the model is not considered as owner of itself - sal_Bool volatile m_bOwnership; + sal_Bool volatile m_bOwnership; //with a XCloseable::close call and during XCloseListener::queryClosing //the ownership can be regulated more explicit, //if so the ownership is considered to be well known - sal_Bool volatile m_bOwnershipIsWellKnown; + sal_Bool volatile m_bOwnershipIsWellKnown; public: -OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable +OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable , ::com::sun::star::lang::XComponent* pComponent , sal_Bool bLongLastingCallsCancelable = sal_False ); -OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); -OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) +OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) throw ( ::com::sun::star::uno::Exception ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) throw ( ::com::sun::star::util::CloseVetoException ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) throw(::com::sun::star::uno::RuntimeException); protected: - virtual sal_Bool impl_canStartApiCall(); - virtual void impl_apiCallCountReachedNull(); + virtual sal_Bool impl_canStartApiCall(); + virtual void impl_apiCallCountReachedNull(); - void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); - sal_Bool impl_shouldCloseAtNextChance(); - void impl_doClose(); + void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); + sal_Bool impl_shouldCloseAtNextChance(); + void impl_doClose(); - void impl_init() + void impl_init() { m_bClosed = sal_False; m_bInTryClose = sal_False; @@ -216,9 +216,9 @@ public: private: osl::ClearableMutexGuard m_guard; - LifeTimeManager& m_rManager; - sal_Bool m_bCallRegistered; - sal_Bool m_bLongLastingCallRegistered; + LifeTimeManager& m_rManager; + sal_Bool m_bCallRegistered; + sal_Bool m_bLongLastingCallRegistered; private: // these make no sense diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx index 15cd08654a46..4437a031f8f2 100644 --- a/chart2/source/inc/LineProperties.hxx +++ b/chart2/source/inc/LineProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index faef7bdbe0c8..1aadd77b0bf1 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 4b3a6fa8d0b0..39856e843c16 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 3fc2c6f1c354..806aceb8ffff 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index a41ad1f8c751..461da439487b 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,101 +87,101 @@ public: //@todo define this for debug only, except URL - sal_Bool AsTemplate; //document is a template. - sal_Bool ISSET_AsTemplate; - ::rtl::OUString Author; // - sal_Bool ISSET_Author; - ::rtl::OUString CharacterSet; //identifier of used character set. - sal_Bool ISSET_CharacterSet; - ::rtl::OUString Comment;// - sal_Bool ISSET_Comment; + sal_Bool AsTemplate; //document is a template. + sal_Bool ISSET_AsTemplate; + ::rtl::OUString Author; // + sal_Bool ISSET_Author; + ::rtl::OUString CharacterSet; //identifier of used character set. + sal_Bool ISSET_CharacterSet; + ::rtl::OUString Comment;// + sal_Bool ISSET_Comment; ::com::sun::star::uno::Any ComponentData;// - sal_Bool ISSET_ComponentData; - ::rtl::OUString FileName; //deprecated, same as url - sal_Bool ISSET_FileName; + sal_Bool ISSET_ComponentData; + ::rtl::OUString FileName; //deprecated, same as url + sal_Bool ISSET_FileName; ::com::sun::star::uno::Any FilterData;// - sal_Bool ISSET_FilterData; - ::rtl::OUString FilterName; //internal filter name. - sal_Bool ISSET_FilterName; - ::rtl::OUString FilterFlags;//deprecated, - sal_Bool ISSET_FilterFlags; - ::rtl::OUString FilterOptions;// - sal_Bool ISSET_FilterOptions; + sal_Bool ISSET_FilterData; + ::rtl::OUString FilterName; //internal filter name. + sal_Bool ISSET_FilterName; + ::rtl::OUString FilterFlags;//deprecated, + sal_Bool ISSET_FilterFlags; + ::rtl::OUString FilterOptions;// + sal_Bool ISSET_FilterOptions; //not documented ... @todo remove? - ::rtl::OUString FrameName; //name of target frame. - sal_Bool ISSET_FrameName; - sal_Bool Hidden; //load document, invisible. - sal_Bool ISSET_Hidden; + ::rtl::OUString FrameName; //name of target frame. + sal_Bool ISSET_FrameName; + sal_Bool Hidden; //load document, invisible. + sal_Bool ISSET_Hidden; - ::rtl::OUString HierarchicalDocumentName; - sal_Bool ISSET_HierarchicalDocumentName; + ::rtl::OUString HierarchicalDocumentName; + sal_Bool ISSET_HierarchicalDocumentName; ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OutputStream; //a stream to receive the document data for saving - sal_Bool ISSET_OutputStream; + sal_Bool ISSET_OutputStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > InputStream; //content of document. - sal_Bool ISSET_InputStream; + sal_Bool ISSET_InputStream; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - InteractionHandler; // //::com::sun::star::task::XInteractionHandler - sal_Bool ISSET_InteractionHandler; - - ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. - sal_Bool ISSET_JumpMark; - ::rtl::OUString MediaType; //mime type. - sal_Bool ISSET_MediaType; - ::rtl::OUString OpenFlags; //deprecated - sal_Bool ISSET_OpenFlags; - sal_Bool OpenNewView; //opens a new view for an already loaded document. - sal_Bool ISSET_OpenNewView; - sal_Bool Overwrite; //opens a new view for an already loaded document. - sal_Bool ISSET_Overwrite; - ::rtl::OUString Password; // - sal_Bool ISSET_Password; + InteractionHandler; // //::com::sun::star::task::XInteractionHandler + sal_Bool ISSET_InteractionHandler; + + ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. + sal_Bool ISSET_JumpMark; + ::rtl::OUString MediaType; //mime type. + sal_Bool ISSET_MediaType; + ::rtl::OUString OpenFlags; //deprecated + sal_Bool ISSET_OpenFlags; + sal_Bool OpenNewView; //opens a new view for an already loaded document. + sal_Bool ISSET_OpenNewView; + sal_Bool Overwrite; //opens a new view for an already loaded document. + sal_Bool ISSET_Overwrite; + ::rtl::OUString Password; // + sal_Bool ISSET_Password; //not documented ... @todo remove? ::com::sun::star::awt::Rectangle PosSize; //position and size of document window. - sal_Bool ISSET_PosSize; + sal_Bool ISSET_PosSize; ::com::sun::star::uno::Sequence< sal_Int8 > PostData; //contains the data for HTTP post method as a sequence of bytes. - sal_Bool ISSET_PostData; - ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. - sal_Bool ISSET_PostString; - sal_Bool Preview; //show preview. - sal_Bool ISSET_Preview; - sal_Bool ReadOnly; //open document readonly. - sal_Bool ISSET_ReadOnly; - ::rtl::OUString Referer; //name of document referrer. - sal_Bool ISSET_Referer; + sal_Bool ISSET_PostData; + ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. + sal_Bool ISSET_PostString; + sal_Bool Preview; //show preview. + sal_Bool ISSET_Preview; + sal_Bool ReadOnly; //open document readonly. + sal_Bool ISSET_ReadOnly; + ::rtl::OUString Referer; //name of document referrer. + sal_Bool ISSET_Referer; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > StatusIndicator; // //::com::sun::star::task::XStatusIndicator - sal_Bool ISSET_StatusIndicator; + sal_Bool ISSET_StatusIndicator; //not documented ... @todo remove? - sal_Bool Silent; //prevents dialogs to query for more information. - sal_Bool ISSET_Silent; - ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. - sal_Bool ISSET_TemplateName; - ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. - sal_Bool ISSET_TemplateRegionName; - sal_Bool Unpacked; - sal_Bool ISSET_Unpacked; + sal_Bool Silent; //prevents dialogs to query for more information. + sal_Bool ISSET_Silent; + ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. + sal_Bool ISSET_TemplateName; + ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. + sal_Bool ISSET_TemplateRegionName; + sal_Bool Unpacked; + sal_Bool ISSET_Unpacked; ::rtl::OUString URL;// FileName, URL of the document. - sal_Bool ISSET_URL; - sal_Int16 Version; //storage version. - sal_Bool ISSET_Version; + sal_Bool ISSET_URL; + sal_Int16 Version; //storage version. + sal_Bool ISSET_Version; ::com::sun::star::uno::Any ViewData;// - sal_Bool ISSET_ViewData; - sal_Int16 ViewId; //id of the initial view. - sal_Bool ISSET_ViewId; + sal_Bool ISSET_ViewData; + sal_Int16 ViewId; //id of the initial view. + sal_Bool ISSET_ViewId; // new framework objects ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index 3833806d185e..1f16b86384b1 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack { public: explicit ModifyListenerCallBack( const Link& rCallBack ); - + virtual ~ModifyListenerCallBack(); void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ); diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 262d2078deea..7e75f280194b 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx index 026c53634b12..c58854a49a3d 100644 --- a/chart2/source/inc/MutexContainer.hxx +++ b/chart2/source/inc/MutexContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index f44d3cea490a..ad1f46aa0bd9 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/NamedFillProperties.hxx b/chart2/source/inc/NamedFillProperties.hxx index 325f8960f7fd..acc1bf02d9fb 100644 --- a/chart2/source/inc/NamedFillProperties.hxx +++ b/chart2/source/inc/NamedFillProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/NamedLineProperties.hxx b/chart2/source/inc/NamedLineProperties.hxx index 8f16cd970932..f1365ecfaf2f 100644 --- a/chart2/source/inc/NamedLineProperties.hxx +++ b/chart2/source/inc/NamedLineProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/NamedProperties.hxx b/chart2/source/inc/NamedProperties.hxx index 5f9f5eb94823..3feb521fc5c0 100644 --- a/chart2/source/inc/NamedProperties.hxx +++ b/chart2/source/inc/NamedProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/NoWarningThisInCTOR.hxx b/chart2/source/inc/NoWarningThisInCTOR.hxx index 00167d07636b..fb8bcad8285b 100644 --- a/chart2/source/inc/NoWarningThisInCTOR.hxx +++ b/chart2/source/inc/NoWarningThisInCTOR.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index fa773a6dab00..1ba9ece0b48b 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 0765c9acf94a..96bcda55b8ec 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier //where DragParameterString is any string you like to transport information to your special drag service // only semicolon, colon, equal sign and slash are not allowed characters // also the keywors used in the ObjectIdentifiers are not allowed - + //where ObjectID: Parent-Particle:Particle //e.g. Series=2:Point=22 //where Particle: Type=ParticleID //e.g. Point=22 //where Type: getStringForType( ObjectType eType ) or other string @@ -177,7 +177,7 @@ public: , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" , const rtl::OUString& rDragMethodServiceName = rtl::OUString() , const rtl::OUString& rDragParameterString = rtl::OUString() - ); + ); static bool isCID( const rtl::OUString& rName ); static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier ); diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 5548cf81be87..54f8571727e0 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index eb4fce0360cc..c812d3b74805 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 48719ec2eeda..3a2a275a1eb1 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 35819ba111cb..e22ef82003fd 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 25fda5080409..706e791d4dd0 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 0a8fd0315bb5..8895d4b9b5c9 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -226,7 +226,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > & xCurve ); - static bool hasEquation( + static bool hasEquation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > & xCurve ); diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 1dd0617236ad..574c36bf0a61 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index a5585d9901bc..e8978c9a5a70 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 551f5f0da40d..eecdbd1c3c65 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx index 9204fa106580..33d3580f1eca 100644 --- a/chart2/source/inc/RessourceManager.hxx +++ b/chart2/source/inc/RessourceManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 29fd8e2fb2e0..5bbde9ecfe6b 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index bceef6712106..4cdab9a3be51 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 03913fa22842..04f94741ca29 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ static com::sun::star::uno::Sequence< rtl::OUString > namespace apphelper { -#define APPHELPER_XSERVICEINFO_DECL() \ - virtual ::rtl::OUString SAL_CALL \ +#define APPHELPER_XSERVICEINFO_DECL() \ + virtual ::rtl::OUString SAL_CALL \ getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const ::rtl::OUString& ServiceName ) \ + supportsService( const ::rtl::OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ getSupportedServiceNames() \ @@ -64,9 +64,9 @@ namespace apphelper // //========================================================================= -#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ -::rtl::OUString SAL_CALL Class::getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ) \ +#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ +::rtl::OUString SAL_CALL Class::getImplementationName() \ + throw( ::com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ @@ -77,12 +77,12 @@ namespace apphelper } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const ::rtl::OUString& ServiceName ) \ +Class::supportsService( const ::rtl::OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = \ getSupportedServiceNames(); \ - const ::rtl::OUString* pArray = aSNL.getArray(); \ + const ::rtl::OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -108,14 +108,14 @@ Class::getSupportedServiceNames() \ //and implement OWeakObject //========================================================================= -#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ -static ::com::sun::star::uno::Reference< \ - ::com::sun::star::uno::XInterface > SAL_CALL \ - create( ::com::sun::star::uno::Reference< \ +#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ +static ::com::sun::star::uno::Reference< \ + ::com::sun::star::uno::XInterface > SAL_CALL \ + create( ::com::sun::star::uno::Reference< \ ::com::sun::star::uno::XComponentContext > const & xContext) \ - throw(::com::sun::star::uno::Exception) \ -{ \ - return (::cppu::OWeakObject *)new Class( xContext ); \ + throw(::com::sun::star::uno::Exception) \ +{ \ + return (::cppu::OWeakObject *)new Class( xContext ); \ } /** This macro contains the default implementation for getImplementationId(). diff --git a/chart2/source/inc/StackMode.hxx b/chart2/source/inc/StackMode.hxx index e341205522d4..3e550ca1d03f 100644 --- a/chart2/source/inc/StackMode.hxx +++ b/chart2/source/inc/StackMode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index af05d5f3f0e8..63da21472759 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 47ed75e80a9a..88c3f403e10a 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,18 +35,18 @@ //#define RID_APP_START 30000 ////#define STR_NULL (RID_APP_START + 1) -////#define STR_BASIC_IDE (RID_APP_START + 2) +////#define STR_BASIC_IDE (RID_APP_START + 2) //#define STR_LINES (RID_APP_START + 3) -//#define STR_COLUMNS (RID_APP_START + 4) +//#define STR_COLUMNS (RID_APP_START + 4) //#define STR_BARS (RID_APP_START + 5) //#define STR_AREAS (RID_APP_START + 6) -//#define STR_CIRCLES (RID_APP_START + 7) -//#define STR_DONUT2 (RID_APP_START + 9) +//#define STR_CIRCLES (RID_APP_START + 7) +//#define STR_DONUT2 (RID_APP_START + 9) //#define STR_OFS (RID_APP_START + 14) -//#define STR_XY (RID_APP_START + 16) -//#define STR_XYZ (RID_APP_START + 17) +//#define STR_XY (RID_APP_START + 16) +//#define STR_XYZ (RID_APP_START + 17) //#define STR_ONLY_SYMBOLS (RID_APP_START + 115) -//#define STR_LINESYMB (RID_APP_START + 15) +//#define STR_LINESYMB (RID_APP_START + 15) //#define STR_LINE_SYMBOLS (RID_APP_START + 117) //#define STR_SYMBOL (RID_APP_START + 53) //#define STR_SYMBOL_STACK (RID_APP_START + 54) @@ -55,32 +55,32 @@ //#define STR_SPLINE_CUBIC_SYMBOL (RID_APP_START + 57) //#define STR_SPLINE_B (RID_APP_START + 58) //#define STR_SPLINE_B_SYMBOL (RID_APP_START + 59) -//#define STR_STOCKCHART (RID_APP_START + 142) -//#define STR_SAEULE_3D_1 (RID_APP_START + 149) -//#define STR_SAEULE_3D_2 (RID_APP_START + 150) -//#define STR_SAEULE_3D_3 (RID_APP_START + 151) -//#define STR_SAEULE_3D_4 (RID_APP_START + 152) -//#define STR_ROEHRE_3D_1 (RID_APP_START + 153) -//#define STR_ROEHRE_3D_2 (RID_APP_START + 154) -//#define STR_ROEHRE_3D_3 (RID_APP_START + 155) -//#define STR_ROEHRE_3D_4 (RID_APP_START + 156) -//#define STR_PYRAMID_3D_1 (RID_APP_START + 157) -//#define STR_PYRAMID_3D_2 (RID_APP_START + 158) -//#define STR_PYRAMID_3D_3 (RID_APP_START + 159) -//#define STR_PYRAMID_3D_4 (RID_APP_START + 160) -//#define STR_PYRAMIDQ_3D_1 (RID_APP_START + 161) -//#define STR_PYRAMIDQ_3D_2 (RID_APP_START + 162) -//#define STR_PYRAMIDQ_3D_3 (RID_APP_START + 163) -//#define STR_PYRAMIDQ_3D_4 (RID_APP_START + 164) -//#define STR_KEGEL_3D_1 (RID_APP_START + 165) -//#define STR_KEGEL_3D_2 (RID_APP_START + 166) -//#define STR_KEGEL_3D_3 (RID_APP_START + 167) -//#define STR_KEGEL_3D_4 (RID_APP_START + 168) -//#define STR_KEGELQ_3D_1 (RID_APP_START + 169) -//#define STR_KEGELQ_3D_2 (RID_APP_START + 170) -//#define STR_KEGELQ_3D_3 (RID_APP_START + 171) -//#define STR_KEGELQ_3D_4 (RID_APP_START + 172) -////#define STR_NORMAL_LINES (RID_APP_START + 18) +//#define STR_STOCKCHART (RID_APP_START + 142) +//#define STR_SAEULE_3D_1 (RID_APP_START + 149) +//#define STR_SAEULE_3D_2 (RID_APP_START + 150) +//#define STR_SAEULE_3D_3 (RID_APP_START + 151) +//#define STR_SAEULE_3D_4 (RID_APP_START + 152) +//#define STR_ROEHRE_3D_1 (RID_APP_START + 153) +//#define STR_ROEHRE_3D_2 (RID_APP_START + 154) +//#define STR_ROEHRE_3D_3 (RID_APP_START + 155) +//#define STR_ROEHRE_3D_4 (RID_APP_START + 156) +//#define STR_PYRAMID_3D_1 (RID_APP_START + 157) +//#define STR_PYRAMID_3D_2 (RID_APP_START + 158) +//#define STR_PYRAMID_3D_3 (RID_APP_START + 159) +//#define STR_PYRAMID_3D_4 (RID_APP_START + 160) +//#define STR_PYRAMIDQ_3D_1 (RID_APP_START + 161) +//#define STR_PYRAMIDQ_3D_2 (RID_APP_START + 162) +//#define STR_PYRAMIDQ_3D_3 (RID_APP_START + 163) +//#define STR_PYRAMIDQ_3D_4 (RID_APP_START + 164) +//#define STR_KEGEL_3D_1 (RID_APP_START + 165) +//#define STR_KEGEL_3D_2 (RID_APP_START + 166) +//#define STR_KEGEL_3D_3 (RID_APP_START + 167) +//#define STR_KEGEL_3D_4 (RID_APP_START + 168) +//#define STR_KEGELQ_3D_1 (RID_APP_START + 169) +//#define STR_KEGELQ_3D_2 (RID_APP_START + 170) +//#define STR_KEGELQ_3D_3 (RID_APP_START + 171) +//#define STR_KEGELQ_3D_4 (RID_APP_START + 172) +////#define STR_NORMAL_LINES (RID_APP_START + 18) ////#define STR_SURFACE (RID_APP_START + 19) // #define STR_STEPMAIN_LT_MAXVALUE (RID_APP_START + 103) // #define STR_STEPHELP_LT_STEPMAIN (RID_APP_START + 104) @@ -94,15 +94,15 @@ //see Strings_ChartTypes.src #define STR_NORMAL (RID_APP_START + 10) -#define STR_STACKED (RID_APP_START + 11) -#define STR_PERCENT (RID_APP_START + 12) +#define STR_STACKED (RID_APP_START + 11) +#define STR_PERCENT (RID_APP_START + 12) #define STR_DEEP (RID_APP_START + 13) #define STR_FILLED (RID_APP_START + 285) -#define STR_DONUT (RID_APP_START + 8) +#define STR_DONUT (RID_APP_START + 8) #define STR_TYPE_PIE (RID_APP_START + 187) #define STR_PIE_EXPLODED (RID_APP_START + 188) -#define STR_DONUT_EXPLODED (RID_APP_START + 189) +#define STR_DONUT_EXPLODED (RID_APP_START + 189) #define STR_TYPE_COLUMN (RID_APP_START + 190) #define STR_TYPE_BAR (RID_APP_START + 191) @@ -121,11 +121,11 @@ #define STR_TYPE_NET (RID_APP_START + 52) -#define STR_TYPE_STOCK (RID_APP_START + 126) -#define STR_STOCK_1 (RID_APP_START + 143) -#define STR_STOCK_2 (RID_APP_START + 144) -#define STR_STOCK_3 (RID_APP_START + 145) -#define STR_STOCK_4 (RID_APP_START + 146) +#define STR_TYPE_STOCK (RID_APP_START + 126) +#define STR_STOCK_1 (RID_APP_START + 143) +#define STR_STOCK_2 (RID_APP_START + 144) +#define STR_STOCK_3 (RID_APP_START + 145) +#define STR_STOCK_4 (RID_APP_START + 146) #define STR_TYPE_BUBBLE (RID_APP_START + 282) #define STR_BUBBLE_1 (RID_APP_START + 283) @@ -161,8 +161,8 @@ //for scale tab page //see Strings_Scale.src -#define STR_INVALID_NUMBER (RID_APP_START + 100) -#define STR_STEP_GT_ZERO (RID_APP_START + 102) +#define STR_INVALID_NUMBER (RID_APP_START + 100) +#define STR_STEP_GT_ZERO (RID_APP_START + 102) #define STR_BAD_LOGARITHM (RID_APP_START + 111) #define STR_MIN_GREATER_MAX (RID_APP_START + 101) @@ -202,10 +202,10 @@ #define STR_PAGE_DATA_RANGE (RID_APP_START + 238) #define STR_ACTION_EDIT_CHART_DATA (RID_APP_START + 198) -#define STR_OBJECT_PAGE (RID_APP_START + 30) +#define STR_OBJECT_PAGE (RID_APP_START + 30) #define STR_OBJECT_DIAGRAM (RID_APP_START + 31) -#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) -#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) +#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) +#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) #define STR_OBJECT_LEGEND (RID_APP_START + 48) #define STR_OBJECT_LEGEND_SYMBOL (RID_APP_START + 49) @@ -231,8 +231,8 @@ #define STR_OBJECT_FOR_SERIES (RID_APP_START + 288) #define STR_OBJECT_FOR_ALL_SERIES (RID_APP_START + 289) -#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) -#define STR_OBJECT_ERROR_BARS (RID_APP_START + 175) +#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) +#define STR_OBJECT_ERROR_BARS (RID_APP_START + 175) #define STR_OBJECT_CURVE (RID_APP_START + 176) #define STR_OBJECT_CURVES (RID_APP_START + 130) @@ -241,9 +241,9 @@ #define STR_OBJECT_AXES (RID_APP_START + 209) #define STR_OBJECT_AXIS (RID_APP_START + 210) -#define STR_OBJECT_AXIS_X (RID_APP_START + 211) -#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) -#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) +#define STR_OBJECT_AXIS_X (RID_APP_START + 211) +#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) +#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) #define STR_OBJECT_SECONDARY_X_AXIS (RID_APP_START + 286) #define STR_OBJECT_SECONDARY_Y_AXIS (RID_APP_START + 287) @@ -262,7 +262,7 @@ #define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265) #define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) -#define STR_STATISTICS_IN_LEGEND (RID_APP_START + 180) +#define STR_STATISTICS_IN_LEGEND (RID_APP_START + 180) #define STR_OBJECT_SHAPE (RID_APP_START + 290) @@ -305,7 +305,7 @@ #define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) #define STR_ACTION_EDIT_DATA_RANGES (RID_APP_START + 64) -#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) +#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) #define STR_ACTION_TOGGLE_LEGEND (RID_APP_START + 83) #define STR_ACTION_TOGGLE_GRID_HORZ (RID_APP_START + 86) #define STR_ACTION_SCALE_TEXT (RID_APP_START + 93) @@ -317,14 +317,14 @@ //----------------------------------------------------------------------------- //statusbar strings and balloon help -#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) +#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) #define STR_STATUS_OBJECT_MARKED (RID_APP_START + 51) -#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) -#define STR_TIP_DATASERIES (RID_APP_START + 43) -#define STR_TIP_DATAPOINT (RID_APP_START + 140) -#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) -#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) -#define STR_TIP_CATEGORY_VALUE (RID_APP_START + 139) +#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) +#define STR_TIP_DATASERIES (RID_APP_START + 43) +#define STR_TIP_DATAPOINT (RID_APP_START + 140) +#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) +#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) +#define STR_TIP_CATEGORY_VALUE (RID_APP_START + 139) //----------------------------------------------------------------------------- //warning and info boxes @@ -343,61 +343,61 @@ //----------------------------------------------------------------------------- /* -////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34) -////#define STR_DIAGRAM_Y_AXIS (RID_APP_START + 35) -////#define STR_DIAGRAM_Z_AXIS (RID_APP_START + 36) +////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34) +////#define STR_DIAGRAM_Y_AXIS (RID_APP_START + 35) +////#define STR_DIAGRAM_Z_AXIS (RID_APP_START + 36) ////#define STR_ACTION_DIAGRAM_DATA (RID_APP_START + 63) -////#define STR_UNDO_AUTOFORMAT (RID_APP_START + 79) +////#define STR_UNDO_AUTOFORMAT (RID_APP_START + 79) ////#define STR_DIAGRAM_DESCR_ROW (RID_APP_START + 46) ////#define STR_DIAGRAM_DESCR_COL (RID_APP_START + 47) ////#define STR_LEGEND_SYMBOL_COL (RID_APP_START + 50) ////#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED (RID_APP_START + 110) ////#define STR_QUERY_SORT (RID_APP_START + 113) -////#define STR_CFG_DEFAULT_COLORS (RID_APP_START + 177) -////#define STR_DIAGRAM_DATA_SAFETY_QUERY (RID_APP_START + 181) -////#define STR_UNDO_CUT (RID_APP_START + 60) -////#define STR_UNDO_DELETE (RID_APP_START + 61) -////#define STR_UNDO_DRAGDROP (RID_APP_START + 62) +////#define STR_CFG_DEFAULT_COLORS (RID_APP_START + 177) +////#define STR_DIAGRAM_DATA_SAFETY_QUERY (RID_APP_START + 181) +////#define STR_UNDO_CUT (RID_APP_START + 60) +////#define STR_UNDO_DELETE (RID_APP_START + 61) +////#define STR_UNDO_DRAGDROP (RID_APP_START + 62) ////#define STR_UNDO_INSERT_TITLE (RID_APP_START + 65) ////#define STR_UNDO_INSERT_LEGEND (RID_APP_START + 66) ////#define STR_UNDO_INSERT_DESCR (RID_APP_START + 67) ////#define STR_UNDO_INSERT_AXIS (RID_APP_START + 68) -////#define STR_UNDO_DATA_ROW (RID_APP_START + 69) -////#define STR_UNDO_DATA_POINT (RID_APP_START + 70) -////#define STR_UNDO_TITLE (RID_APP_START + 71) -////#define STR_UNDO_LEGEND (RID_APP_START + 72) +////#define STR_UNDO_DATA_ROW (RID_APP_START + 69) +////#define STR_UNDO_DATA_POINT (RID_APP_START + 70) +////#define STR_UNDO_TITLE (RID_APP_START + 71) +////#define STR_UNDO_LEGEND (RID_APP_START + 72) ////#define STR_UNDO_DIAGRAM_AXIS (RID_APP_START + 73) ////#define STR_UNDO_DIAGRAM_GRID (RID_APP_START + 74) ////#define STR_UNDO_DIAGRAM_WALL (RID_APP_START + 75) ////#define STR_UNDO_DIAGRAM_FLOOR (RID_APP_START + 76) ////#define STR_UNDO_DIAGRAM_AREA (RID_APP_START + 77) -////#define STR_UNDO_LIGHTING (RID_APP_START + 81) +////#define STR_UNDO_LIGHTING (RID_APP_START + 81) ////#define STR_UNDO_TOGGLE_TITLE (RID_APP_START + 82) ////#define STR_UNDO_TOGGLE_AXIS_TITLE (RID_APP_START + 84) ////#define STR_UNDO_TOGGLE_AXIS_DESCR (RID_APP_START + 85) -////#define STR_DEFAULTVIEW (RID_APP_START + 90) +////#define STR_DEFAULTVIEW (RID_APP_START + 90) ////#define STR_UNDO_STATISTICS (RID_APP_START + 91) ////#define STR_UNDO_DIAGRAM_LINE (RID_APP_START + 92) ////#define STR_UNDO_REMOVEPOINTATTRS (RID_APP_START + 94) -////#define STR_UNDO_MOREFRONT (RID_APP_START + 95) -////#define STR_UNDO_MOREBACK (RID_APP_START + 96) -////#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START + 173) -////#define STR_UNDO_INSERT_GRID (RID_APP_START + 178) +////#define STR_UNDO_MOREFRONT (RID_APP_START + 95) +////#define STR_UNDO_MOREBACK (RID_APP_START + 96) +////#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START + 173) +////#define STR_UNDO_INSERT_GRID (RID_APP_START + 178) ////#define STR_UNDO_TRANSFORM (RID_APP_START + 183) ////#define STR_UNDO_MOVE (RID_APP_START + 184) ////#define STR_UNDO_RESIZE (RID_APP_START + 185) ////#define STR_UNDO_ROTATE (RID_APP_START + 186) -////#define STR_UNDO_DIAGRAM_STOCK_LOSS (RID_APP_START + 147) -////#define STR_UNDO_DIAGRAM_STOCK_PLUS (RID_APP_START + 148) -////#define STR_OPEN_DOCUMENT (RID_APP_START + 105) use SID_DOC_LOADING instead -////#define STR_SAVE_DOCUMENT (RID_APP_START + 106) use SID_SAVEDOC instead -////#define STR_GRAPHIC (RID_APP_START + 108) +////#define STR_UNDO_DIAGRAM_STOCK_LOSS (RID_APP_START + 147) +////#define STR_UNDO_DIAGRAM_STOCK_PLUS (RID_APP_START + 148) +////#define STR_OPEN_DOCUMENT (RID_APP_START + 105) use SID_DOC_LOADING instead +////#define STR_SAVE_DOCUMENT (RID_APP_START + 106) use SID_SAVEDOC instead +////#define STR_GRAPHIC (RID_APP_START + 108) ////#define STR_CHART_DOCUMENT (RID_APP_START + 109) ////#define STR_CHART_DOCUMENT_FULLTYPE_40 (RID_APP_START + 114) ////#define STR_CHART_DOCUMENT_FULLTYPE_31 (RID_APP_START + 118) ////#define STR_CHART_DOCUMENT_FULLTYPE_50 (RID_APP_START + 119) -////#define STR_CHART_DOCUMENT_FULLTYPE_60 (RID_APP_START + 182) -////#define STR_INVISIBLE (RID_APP_START + 120) +////#define STR_CHART_DOCUMENT_FULLTYPE_60 (RID_APP_START + 182) +////#define STR_INVISIBLE (RID_APP_START + 120) ////#define STR_SOLID (RID_APP_START + 121) ////#define STR_APPNAME (RID_APP_START + 139) */ diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index d3d31bd38c5d..e334cd8f5b52 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties , double fXAngleRad, double fYAngleRad, double fZAngleRad ); - + static void getRotationFromDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties @@ -105,7 +105,7 @@ public: SAL_DLLPRIVATE static void convertXYZAngleRadToElevationRotationDeg( sal_Int32& rnElevationDeg, sal_Int32& rnRotationDeg , double fXRad, double fYRad, double fZRad ); - + static double getCameraDistance( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties ); @@ -135,7 +135,7 @@ public: ::com::sun::star::beans::XPropertySet >& xSceneProperties ); static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - + static ThreeDLookScheme detectScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); static void setScheme( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 2de0c16266db..d908caf0fb78 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx index 6a3c639df26e..371456a7fdc2 100644 --- a/chart2/source/inc/TrueGuard.hxx +++ b/chart2/source/inc/TrueGuard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard public: explicit TrueGuard( bool& rbTrueDuringGuardedTime ); virtual ~TrueGuard(); - + private: bool& m_rbTrueDuringGuardedTime; }; diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 0b601b06f721..51b759e29331 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/UndoGuard.hxx b/chart2/source/inc/UndoGuard.hxx index 864d5ccff994..6eb7dcae11b6 100644 --- a/chart2/source/inc/UndoGuard.hxx +++ b/chart2/source/inc/UndoGuard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/UndoManager.hxx b/chart2/source/inc/UndoManager.hxx index a28a0d78c470..b97817fa51ac 100644 --- a/chart2/source/inc/UndoManager.hxx +++ b/chart2/source/inc/UndoManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index af616a6f6c22..e794e92a6fe1 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 55f283a94600..d44bd559e5fe 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 78a263c70cdc..cc86ca6e3246 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 1dd5889f0d55..2d061b7d5061 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 1e76bf91ea95..9d3ae6769bbf 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 91a4b40fd2c9..165e88528889 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 03cfea84f502..a9f10104e69c 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,9 +57,9 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState , ::com::sun::star::beans::XMultiPropertyStates - // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: @@ -131,7 +131,7 @@ protected: //member tWrappedPropertyMap* m_pWrappedPropertyMap;//holds all wrapped properties (containing the special mapping from inner to outer properties) //Container for the XProperyChangedListener. The listeners are inserted by handle. - //OMultiTypeInterfaceContainerHelperInt32 m_aBoundListenerContainer; + //OMultiTypeInterfaceContainerHelperInt32 m_aBoundListenerContainer; //Container for the XPropertyVetoableListener. The listeners are inserted by handle. //OMultiTypeInterfaceContainerHelperInt32 m_aVetoableListenerContainer; diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index addc8a351c29..1ff9e59b29b3 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx index 5534f2ca737c..3a5ef9798868 100644 --- a/chart2/source/inc/charttoolsdllapi.hxx +++ b/chart2/source/inc/charttoolsdllapi.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index fbcce70bd1d6..86871a5f22af 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,75 +38,75 @@ // SCHATTR // ============================================================ -#define SCHATTR_START 1 +#define SCHATTR_START 1 -#define SCHATTR_DATADESCR_START SCHATTR_START -#define SCHATTR_DATADESCR_SHOW_NUMBER SCHATTR_DATADESCR_START -#define SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1) -#define SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2) -#define SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3) +#define SCHATTR_DATADESCR_START SCHATTR_START +#define SCHATTR_DATADESCR_SHOW_NUMBER SCHATTR_DATADESCR_START +#define SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1) +#define SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2) +#define SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3) #define SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 4) #define SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 5) #define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 6) #define SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 7) //percentage values should not be offered #define SCHATTR_DATADESCR_END SCHATTR_DATADESCR_NO_PERCENTVALUE -#define SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1) -#define SCHATTR_LEGEND_POS SCHATTR_LEGEND_START -#define SCHATTR_LEGEND_END SCHATTR_LEGEND_POS +#define SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1) +#define SCHATTR_LEGEND_POS SCHATTR_LEGEND_START +#define SCHATTR_LEGEND_END SCHATTR_LEGEND_POS -#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) -// #define SCHATTR_TEXT_ORIENT SCHATTR_TEXT_START +#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) +// #define SCHATTR_TEXT_ORIENT SCHATTR_TEXT_START // name changed: -#define SCHATTR_TEXT_STACKED SCHATTR_TEXT_START -#define SCHATTR_TEXT_ORDER (SCHATTR_TEXT_START + 1) -#define SCHATTR_TEXT_END SCHATTR_TEXT_ORDER - -#define SCHATTR_Y_AXIS_START (SCHATTR_TEXT_END + 1) -#define SCHATTR_Y_AXIS_AUTO_MIN SCHATTR_Y_AXIS_START -#define SCHATTR_Y_AXIS_MIN (SCHATTR_Y_AXIS_START + 1) -#define SCHATTR_Y_AXIS_AUTO_MAX (SCHATTR_Y_AXIS_START + 2) -#define SCHATTR_Y_AXIS_MAX (SCHATTR_Y_AXIS_START + 3) -#define SCHATTR_Y_AXIS_AUTO_STEP_MAIN (SCHATTR_Y_AXIS_START + 4) -#define SCHATTR_Y_AXIS_STEP_MAIN (SCHATTR_Y_AXIS_START + 5) -#define SCHATTR_Y_AXIS_AUTO_STEP_HELP (SCHATTR_Y_AXIS_START + 6) -#define SCHATTR_Y_AXIS_STEP_HELP (SCHATTR_Y_AXIS_START + 7) -#define SCHATTR_Y_AXIS_LOGARITHM (SCHATTR_Y_AXIS_START + 8) -#define SCHATTR_Y_AXIS_AUTO_ORIGIN (SCHATTR_Y_AXIS_START + 9) -#define SCHATTR_Y_AXIS_ORIGIN (SCHATTR_Y_AXIS_START + 10) -#define SCHATTR_Y_AXIS_END SCHATTR_Y_AXIS_ORIGIN - -#define SCHATTR_X_AXIS_START (SCHATTR_Y_AXIS_END + 1) -#define SCHATTR_X_AXIS_AUTO_MIN SCHATTR_X_AXIS_START -#define SCHATTR_X_AXIS_MIN (SCHATTR_X_AXIS_START + 1) -#define SCHATTR_X_AXIS_AUTO_MAX (SCHATTR_X_AXIS_START + 2) -#define SCHATTR_X_AXIS_MAX (SCHATTR_X_AXIS_START + 3) -#define SCHATTR_X_AXIS_AUTO_STEP_MAIN (SCHATTR_X_AXIS_START + 4) -#define SCHATTR_X_AXIS_STEP_MAIN (SCHATTR_X_AXIS_START + 5) -#define SCHATTR_X_AXIS_AUTO_STEP_HELP (SCHATTR_X_AXIS_START + 6) -#define SCHATTR_X_AXIS_STEP_HELP (SCHATTR_X_AXIS_START + 7) -#define SCHATTR_X_AXIS_LOGARITHM (SCHATTR_X_AXIS_START + 8) -#define SCHATTR_X_AXIS_AUTO_ORIGIN (SCHATTR_X_AXIS_START + 9) -#define SCHATTR_X_AXIS_ORIGIN (SCHATTR_X_AXIS_START + 10) -#define SCHATTR_X_AXIS_END SCHATTR_X_AXIS_ORIGIN - -#define SCHATTR_Z_AXIS_START (SCHATTR_X_AXIS_END + 1) -#define SCHATTR_Z_AXIS_AUTO_MIN SCHATTR_Z_AXIS_START -#define SCHATTR_Z_AXIS_MIN (SCHATTR_Z_AXIS_START + 1) -#define SCHATTR_Z_AXIS_AUTO_MAX (SCHATTR_Z_AXIS_START + 2) -#define SCHATTR_Z_AXIS_MAX (SCHATTR_Z_AXIS_START + 3) -#define SCHATTR_Z_AXIS_AUTO_STEP_MAIN (SCHATTR_Z_AXIS_START + 4) -#define SCHATTR_Z_AXIS_STEP_MAIN (SCHATTR_Z_AXIS_START + 5) -#define SCHATTR_Z_AXIS_AUTO_STEP_HELP (SCHATTR_Z_AXIS_START + 6) -#define SCHATTR_Z_AXIS_STEP_HELP (SCHATTR_Z_AXIS_START + 7) -#define SCHATTR_Z_AXIS_LOGARITHM (SCHATTR_Z_AXIS_START + 8) -#define SCHATTR_Z_AXIS_AUTO_ORIGIN (SCHATTR_Z_AXIS_START + 9) -#define SCHATTR_Z_AXIS_ORIGIN (SCHATTR_Z_AXIS_START + 10) -#define SCHATTR_Z_AXIS_END SCHATTR_Z_AXIS_ORIGIN +#define SCHATTR_TEXT_STACKED SCHATTR_TEXT_START +#define SCHATTR_TEXT_ORDER (SCHATTR_TEXT_START + 1) +#define SCHATTR_TEXT_END SCHATTR_TEXT_ORDER + +#define SCHATTR_Y_AXIS_START (SCHATTR_TEXT_END + 1) +#define SCHATTR_Y_AXIS_AUTO_MIN SCHATTR_Y_AXIS_START +#define SCHATTR_Y_AXIS_MIN (SCHATTR_Y_AXIS_START + 1) +#define SCHATTR_Y_AXIS_AUTO_MAX (SCHATTR_Y_AXIS_START + 2) +#define SCHATTR_Y_AXIS_MAX (SCHATTR_Y_AXIS_START + 3) +#define SCHATTR_Y_AXIS_AUTO_STEP_MAIN (SCHATTR_Y_AXIS_START + 4) +#define SCHATTR_Y_AXIS_STEP_MAIN (SCHATTR_Y_AXIS_START + 5) +#define SCHATTR_Y_AXIS_AUTO_STEP_HELP (SCHATTR_Y_AXIS_START + 6) +#define SCHATTR_Y_AXIS_STEP_HELP (SCHATTR_Y_AXIS_START + 7) +#define SCHATTR_Y_AXIS_LOGARITHM (SCHATTR_Y_AXIS_START + 8) +#define SCHATTR_Y_AXIS_AUTO_ORIGIN (SCHATTR_Y_AXIS_START + 9) +#define SCHATTR_Y_AXIS_ORIGIN (SCHATTR_Y_AXIS_START + 10) +#define SCHATTR_Y_AXIS_END SCHATTR_Y_AXIS_ORIGIN + +#define SCHATTR_X_AXIS_START (SCHATTR_Y_AXIS_END + 1) +#define SCHATTR_X_AXIS_AUTO_MIN SCHATTR_X_AXIS_START +#define SCHATTR_X_AXIS_MIN (SCHATTR_X_AXIS_START + 1) +#define SCHATTR_X_AXIS_AUTO_MAX (SCHATTR_X_AXIS_START + 2) +#define SCHATTR_X_AXIS_MAX (SCHATTR_X_AXIS_START + 3) +#define SCHATTR_X_AXIS_AUTO_STEP_MAIN (SCHATTR_X_AXIS_START + 4) +#define SCHATTR_X_AXIS_STEP_MAIN (SCHATTR_X_AXIS_START + 5) +#define SCHATTR_X_AXIS_AUTO_STEP_HELP (SCHATTR_X_AXIS_START + 6) +#define SCHATTR_X_AXIS_STEP_HELP (SCHATTR_X_AXIS_START + 7) +#define SCHATTR_X_AXIS_LOGARITHM (SCHATTR_X_AXIS_START + 8) +#define SCHATTR_X_AXIS_AUTO_ORIGIN (SCHATTR_X_AXIS_START + 9) +#define SCHATTR_X_AXIS_ORIGIN (SCHATTR_X_AXIS_START + 10) +#define SCHATTR_X_AXIS_END SCHATTR_X_AXIS_ORIGIN + +#define SCHATTR_Z_AXIS_START (SCHATTR_X_AXIS_END + 1) +#define SCHATTR_Z_AXIS_AUTO_MIN SCHATTR_Z_AXIS_START +#define SCHATTR_Z_AXIS_MIN (SCHATTR_Z_AXIS_START + 1) +#define SCHATTR_Z_AXIS_AUTO_MAX (SCHATTR_Z_AXIS_START + 2) +#define SCHATTR_Z_AXIS_MAX (SCHATTR_Z_AXIS_START + 3) +#define SCHATTR_Z_AXIS_AUTO_STEP_MAIN (SCHATTR_Z_AXIS_START + 4) +#define SCHATTR_Z_AXIS_STEP_MAIN (SCHATTR_Z_AXIS_START + 5) +#define SCHATTR_Z_AXIS_AUTO_STEP_HELP (SCHATTR_Z_AXIS_START + 6) +#define SCHATTR_Z_AXIS_STEP_HELP (SCHATTR_Z_AXIS_START + 7) +#define SCHATTR_Z_AXIS_LOGARITHM (SCHATTR_Z_AXIS_START + 8) +#define SCHATTR_Z_AXIS_AUTO_ORIGIN (SCHATTR_Z_AXIS_START + 9) +#define SCHATTR_Z_AXIS_ORIGIN (SCHATTR_Z_AXIS_START + 10) +#define SCHATTR_Z_AXIS_END SCHATTR_Z_AXIS_ORIGIN // miscellaneous -#define SCHATTR_AXISTYPE (SCHATTR_Z_AXIS_END + 1) +#define SCHATTR_AXISTYPE (SCHATTR_Z_AXIS_END + 1) #define SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_Z_AXIS_END + 2) #define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_Z_AXIS_END + 3) @@ -147,36 +147,36 @@ // also for data point #define SCHATTR_STYLE_SYMBOL ( SCHATTR_STYLE_START + 8 ) -#define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) +#define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) #define SCHATTR_STYLE_END ( SCHATTR_STYLE_SHAPE ) // -------------------------------------------------------------------------- -#define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. +#define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Ummappen: -#define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) -#define SCHATTR_AXIS_AUTO_MIN SCHATTR_AXIS_START -#define SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 1) -#define SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 2) -#define SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 3) -#define SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 4) -#define SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 5) -#define SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 6) +#define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) +#define SCHATTR_AXIS_AUTO_MIN SCHATTR_AXIS_START +#define SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 1) +#define SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 2) +#define SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 3) +#define SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 4) +#define SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 5) +#define SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 6) // SCHATTR_AXIS_STEP_HELP: type changed from double to sal_Int32 ! -#define SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 7) -#define SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 8) -#define SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 9) -#define SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 10) +#define SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 7) +#define SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 8) +#define SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 9) +#define SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 10) //Neu: -#define SCHATTR_AXIS_TICKS (SCHATTR_AXIS_START + 11) -#define SCHATTR_AXIS_NUMFMT (SCHATTR_AXIS_START + 12) -#define SCHATTR_AXIS_NUMFMTPERCENT (SCHATTR_AXIS_START + 13) -#define SCHATTR_AXIS_SHOWAXIS (SCHATTR_AXIS_START + 14) -#define SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_START + 15) -#define SCHATTR_AXIS_SHOWMAINGRID (SCHATTR_AXIS_START + 16) -#define SCHATTR_AXIS_SHOWHELPGRID (SCHATTR_AXIS_START + 17) -#define SCHATTR_AXIS_TOPDOWN (SCHATTR_AXIS_START + 18) -#define SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_START + 19) +#define SCHATTR_AXIS_TICKS (SCHATTR_AXIS_START + 11) +#define SCHATTR_AXIS_NUMFMT (SCHATTR_AXIS_START + 12) +#define SCHATTR_AXIS_NUMFMTPERCENT (SCHATTR_AXIS_START + 13) +#define SCHATTR_AXIS_SHOWAXIS (SCHATTR_AXIS_START + 14) +#define SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_START + 15) +#define SCHATTR_AXIS_SHOWMAINGRID (SCHATTR_AXIS_START + 16) +#define SCHATTR_AXIS_SHOWHELPGRID (SCHATTR_AXIS_START + 17) +#define SCHATTR_AXIS_TOPDOWN (SCHATTR_AXIS_START + 18) +#define SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_START + 19) #define SCHATTR_AXIS_REVERSE (SCHATTR_AXIS_START + 20) #define SCHATTR_AXIS_POSITION (SCHATTR_AXIS_START + 21) #define SCHATTR_AXIS_POSITION_VALUE (SCHATTR_AXIS_START + 22) @@ -185,18 +185,18 @@ #define SCHATTR_AXIS_MARK_POSITION (SCHATTR_AXIS_START + 25) #define SCHATTR_AXIS_END SCHATTR_AXIS_MARK_POSITION -#define SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1) -#define SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2) -#define SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3) -#define SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4) +#define SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1) +#define SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2) +#define SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3) +#define SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4) // non persistent items (binary format) #define SCHATTR_CHARTTYPE_START (SCHATTR_SYMBOL_SIZE + 1) // new from New Chart -#define SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ) -#define SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1) -#define SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2) +#define SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ) +#define SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1) +#define SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2) #define SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3) #define SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4) #define SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5) @@ -242,19 +242,19 @@ // values for SCHATTR_STYLE_SHAPE items #define CHART_SHAPE3D_IGNORE -2 //intern! (GetChartShapeStyle()!) -#define CHART_SHAPE3D_ANY -1 //undefinierter Typ (GetChartShapeStyle()!) +#define CHART_SHAPE3D_ANY -1 //undefinierter Typ (GetChartShapeStyle()!) #define CHART_SHAPE3D_SQUARE 0 #define CHART_SHAPE3D_CYLINDER 1 #define CHART_SHAPE3D_CONE 2 #define CHART_SHAPE3D_PYRAMID 3 //reserved -#define CHART_SHAPE3D_HANOI 4 +#define CHART_SHAPE3D_HANOI 4 // values for SCHATTR_AXIS items -#define CHART_AXIS_PRIMARY_X 1 -#define CHART_AXIS_PRIMARY_Y 2 -#define CHART_AXIS_PRIMARY_Z 3 -#define CHART_AXIS_SECONDARY_Y 4 -#define CHART_AXIS_SECONDARY_X 5 +#define CHART_AXIS_PRIMARY_X 1 +#define CHART_AXIS_PRIMARY_Y 2 +#define CHART_AXIS_PRIMARY_Z 3 +#define CHART_AXIS_SECONDARY_Y 4 +#define CHART_AXIS_SECONDARY_X 5 // ============================================================ // ============================================================ diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index 4d07791a884f..2d3bd4c3648e 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 5bcf67a8592b..167a616b19a9 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getChartRootShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>& xPage ); - + SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index d10ee8d415fc..5e22c48329c2 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex /*-1 for whole series*/ , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); - + static sal_Int32 getExplicitPercentageNumberFormatKeyForDataLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 9f5f44107997..f65b1090317a 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/chartview/chartviewdllapi.hxx b/chart2/source/inc/chartview/chartviewdllapi.hxx index 39c553a15fe6..ca044c673d41 100644 --- a/chart2/source/inc/chartview/chartviewdllapi.hxx +++ b/chart2/source/inc/chartview/chartviewdllapi.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx index bd52c33f51ec..25ccb77ce656 100644 --- a/chart2/source/inc/chartview/servicenames_charttypes.hxx +++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index ac64e879e9ec..668734ef4829 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index d1af0edb3335..ce2e310b7476 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 60e39bccf09a..c85904add127 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx index 002f75c7ece6..f303d0de662b 100644 --- a/chart2/source/inc/servicenames_coosystems.hxx +++ b/chart2/source/inc/servicenames_coosystems.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/inc/servicenames_dlwrapper.hxx b/chart2/source/inc/servicenames_dlwrapper.hxx index 0b78a8c8227f..41674528ec12 100644 --- a/chart2/source/inc/servicenames_dlwrapper.hxx +++ b/chart2/source/inc/servicenames_dlwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index b66c4bc46102..3a416b89e3b4 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -393,9 +393,9 @@ sal_Int32 XMLFilter::impl_Import( comphelper::PropertyMapEntry aImportInfoMap[] = { // #80365# necessary properties for XML progress bar at load time - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 22346e917453..bcdbf5bdbc89 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 7c9fd075d787..eef79cb0c0d3 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index de721be48142..cd2c25bd7405 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index e05bac782b86..9c56a74ac4f6 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/DataSeriesTree.hxx b/chart2/source/model/inc/DataSeriesTree.hxx index 5c6734dde845..1c8b51ce96a4 100644 --- a/chart2/source/model/inc/DataSeriesTree.hxx +++ b/chart2/source/model/inc/DataSeriesTree.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index fc672e29b24c..364f76e36ad9 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,12 +109,12 @@ protected: virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XDiagram ____ // virtual ::rtl::OUString SAL_CALL getChartTypeTemplateServiceName() @@ -136,8 +136,8 @@ protected: virtual void SAL_CALL setDefaultColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) throw (::com::sun::star::uno::RuntimeException); - - + + // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< @@ -159,7 +159,7 @@ protected: ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index cf82e1cb0871..f04641036ae0 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 7fa98b79964b..416629e66bab 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 69b008bbcb75..668a4ee10262 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,8 +105,8 @@ protected: /** fills the oasis flag only when a filtername was set * - * \param _rMediaDescriptor - * \param _rOutOASIS + * \param _rMediaDescriptor + * \param _rOutOASIS */ virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ); @@ -176,18 +176,18 @@ public: :XMLFilter(_xContext) {} /// establish methods for factory instatiation - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) - { - return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) + { + return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext ); } static ::rtl::OUString getImplementationName_Static() { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.report.XMLFilter" )); } protected: - virtual ::rtl::OUString SAL_CALL - getImplementationName() + virtual ::rtl::OUString SAL_CALL + getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { return getImplementationName_Static(); diff --git a/chart2/source/model/inc/_serviceregistration_charttypes.hxx b/chart2/source/model/inc/_serviceregistration_charttypes.hxx index 481a7064f311..98b52a7761fc 100644 --- a/chart2/source/model/inc/_serviceregistration_charttypes.hxx +++ b/chart2/source/model/inc/_serviceregistration_charttypes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index fd1d78ebe071..90f0a681a0f0 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -425,7 +425,7 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) m_aScaleData = rScaleData; } AllocateSubGrids(); - + //don't keep the mutex locked while calling out if( xOldCategories.is() && xOldCategories != xNewCategories ) { diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 7f72e08b8b69..5aa03be9b6e3 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,12 +95,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XAxis ____ virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 4fa58cff5039..4a0bd372ee59 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index fdaa333b1cb8..13a51cf6391e 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 950169395c95..382ccf6347af 100755 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,7 @@ ChartModel::ChartModel( const ChartModel & rOther ) Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground ); Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager ); Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap ); - + { MutexGuard aGuard( m_aModelMutex ); xListener = this; @@ -166,12 +166,12 @@ ChartModel::ChartModel( const ChartModel & rOther ) m_xChartTypeManager = xChartTypeManager; m_xXMLNamespaceMap = xXMLNamespaceMap; } - + ModifyListenerHelper::addListener( xNewTitle, xListener ); ModifyListenerHelper::addListener( xNewDiagram, xListener ); ModifyListenerHelper::addListener( xNewPageBackground, xListener ); xListener.clear(); - + osl_decrementInterlockedCount(&m_refCount); } @@ -384,11 +384,11 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo //case: current controller is disconnected: if( m_xCurrentController == xController ) m_xCurrentController.clear(); - + DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) { /* suspends some notifications to the controllers which are used for display updates. @@ -576,7 +576,7 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven //----------------------------------------------------------------- // util::XCloseBroadcaster (base of XCloseable) //----------------------------------------------------------------- -void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) +void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) throw(uno::RuntimeException) { m_aLifeTimeManager.g_addCloseListener( xListener ); @@ -1043,6 +1043,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { + ControllerLockGuard aLockGuard( this ); bool bChanged = (m_aVisualAreaSize.Width != aSize.Width || m_aVisualAreaSize.Height != aSize.Height); @@ -1170,7 +1171,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors // aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, // C2U( "GDIMetaFile" ), -// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); +// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, C2U( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); @@ -1367,7 +1368,7 @@ Reference< chart2::XUndoManager > SAL_CALL ChartModel::getUndoManager() uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() throw (uno::RuntimeException) { - Reference< chart2::data::XDataSource > xSource( + Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); if( xSource.is()) return xSource->getDataSequences(); diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 23da02f3f83a..275c611d957c 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,14 +86,14 @@ namespace impl // Note: needed for queryInterface (if it calls the base-class implementation) typedef ::comphelper::WeakImplHelper20< -// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument - ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster - ,::com::sun::star::frame::XStorable2 //(extension of XStorable) -// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2 - ,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface) - // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper +// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument + ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster + ,::com::sun::star::frame::XStorable2 //(extension of XStorable) +// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2 + ,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface) + // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::lang::XServiceInfo ,::com::sun::star::chart2::XChartDocument // derived from XModel ,::com::sun::star::chart2::data::XDataReceiver // public API @@ -119,23 +119,23 @@ class ChartModel : public impl::ChartModel_Base { private: - mutable ::apphelper::CloseableLifeTimeManager m_aLifeTimeManager; + mutable ::apphelper::CloseableLifeTimeManager m_aLifeTimeManager; - mutable ::osl::Mutex m_aModelMutex; - sal_Bool volatile m_bReadOnly; - sal_Bool volatile m_bModified; + mutable ::osl::Mutex m_aModelMutex; + sal_Bool volatile m_bReadOnly; + sal_Bool volatile m_bModified; sal_Int32 m_nInLoad; - sal_Bool volatile m_bUpdateNotificationsPending; + sal_Bool volatile m_bUpdateNotificationsPending; - ::rtl::OUString m_aResource; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; + ::rtl::OUString m_aResource; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties; ::cppu::OInterfaceContainerHelper m_aControllers; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; - sal_uInt16 m_nControllerLockCount; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; + sal_uInt16 m_nControllerLockCount; -// ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrinterOptions; +// ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrinterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg; @@ -184,7 +184,7 @@ private: ::rtl::OUString impl_g_getLocation(); sal_Bool - impl_isControllerConnected( const com::sun::star::uno::Reference< + impl_isControllerConnected( const com::sun::star::uno::Reference< com::sun::star::frame::XController >& xController ); com::sun::star::uno::Reference< com::sun::star::frame::XController > @@ -256,10 +256,10 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException); + getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getArgs() throw (::com::sun::star::uno::RuntimeException); + getArgs() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< @@ -272,7 +272,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException); + lockControllers() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException); @@ -300,7 +300,7 @@ public: // ::com::sun::star::lang::XComponent (base of XModel) //----------------------------------------------------------------- virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< @@ -346,16 +346,16 @@ public: // ::com::sun::star::frame::XStorable (required interface) //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - hasLocation() throw (::com::sun::star::uno::RuntimeException); + hasLocation() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException); + getLocation() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException); + isReadonly() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - store() throw (::com::sun::star::io::IOException + store() throw (::com::sun::star::io::IOException , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -376,7 +376,7 @@ public: // ::com::sun::star::util::XModifiable (required interface) //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - isModified() throw (::com::sun::star::uno::RuntimeException); + isModified() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setModified( sal_Bool bModified ) diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 1868c38e094f..a2cda82ba514 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -608,16 +608,16 @@ void ChartModel::impl_load( { OSL_ENSURE( false, "loadFromStorage cannot create filter" ); } - + if( xStorage.is() ) impl_loadGraphics( xStorage ); setModified( sal_False ); - + // switchToStorage without notifying listeners (which shouldn't exist at // this time, anyway) m_xStorage = xStorage; - + { MutexGuard aGuard( m_aModelMutex ); m_nInLoad--; @@ -629,35 +629,35 @@ void ChartModel::impl_loadGraphics( { try { - const Reference< embed::XStorage >& xGraphicsStorage( - xStorage->openStorageElement( C2U( "Pictures" ), + const Reference< embed::XStorage >& xGraphicsStorage( + xStorage->openStorageElement( C2U( "Pictures" ), embed::ElementModes::READ ) ); - + if( xGraphicsStorage.is() ) - { + { const uno::Sequence< ::rtl::OUString > aElementNames( xGraphicsStorage->getElementNames() ); - + for( int i = 0; i < aElementNames.getLength(); ++i ) { if( xGraphicsStorage->isStreamElement( aElementNames[ i ] ) ) { - uno::Reference< io::XStream > xElementStream( - xGraphicsStorage->openStreamElement( + uno::Reference< io::XStream > xElementStream( + xGraphicsStorage->openStreamElement( aElementNames[ i ], embed::ElementModes::READ ) ); - + if( xElementStream.is() ) { - std::auto_ptr< SvStream > apIStm( - ::utl::UcbStreamHelper::CreateStream( + std::auto_ptr< SvStream > apIStm( + ::utl::UcbStreamHelper::CreateStream( xElementStream, true ) ); if( apIStm.get() ) { Graphic aGraphic; - - if( !GraphicConverter::Import( + + if( !GraphicConverter::Import( *apIStm.get(), aGraphic ) ) { diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 1f3d92e4d94b..6672d23b7bf4 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 1498b8345963..0749b90dd994 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 964f61b128ed..ffc4e626821c 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 5d4d02af36ef..1ed3deaa841f 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 89197aa5ba3f..f78d94ab733f 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -266,7 +266,7 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const if( aFound == aStaticDefaults.end()) throw beans::UnknownPropertyException(); - + return (*aFound).second; // \-- } diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 29a41bd38e14..057e6492a447 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index 6805b80c975b..37730790fe27 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index ff8a0c4030bc..2bfb2cf7a9ba 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 9d38fafd3cf7..8a0158f80b24 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ void SAL_CALL FormattedString::setString( const ::rtl::OUString& String ) } //don't keep the mutex locked while calling out fireModifyEvent(); - + } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 9293d73afa5b..c47354c72493 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,12 +93,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index a8d5be5d1453..a691d88256c8 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 1c0ae0ed849a..28b22c1358e5 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/LayoutContainer.cxx b/chart2/source/model/main/LayoutContainer.cxx index d962113f78c7..ce6edef52a1b 100644 --- a/chart2/source/model/main/LayoutContainer.cxx +++ b/chart2/source/model/main/LayoutContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/LayoutContainer.hxx b/chart2/source/model/main/LayoutContainer.hxx index ea645dcff536..d5e3fdfdbfad 100644 --- a/chart2/source/model/main/LayoutContainer.hxx +++ b/chart2/source/model/main/LayoutContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index c1143ecdf77a..46ec4fca4e0e 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 6b645828f4c1..c3a1a74d51cf 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,12 +90,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XLegend ____ virtual void SAL_CALL registerEntry( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0dbe1d82fcf3..00b6643b0df6 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 9875a76eae2b..fc83630c6039 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,12 +83,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 9022a5e17901..49ca42048f8a 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 9a3c7f8ab623..ecba210ae566 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index d7c5691d160d..8c58abf155ea 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 5889910018b7..724cfd2e1d88 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,12 +88,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 2ad00a4c90ae..8e68dbf70a98 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 8c796b4da432..5a70fe87d3e2 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,12 +81,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index b0a7739008ad..a3f3f19cd4ed 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 003220c87dfb..475234fd3cc1 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 9955d5eb537e..546ca1e92a27 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 5fe21cfb25e0..bcc50306a8d2 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -257,7 +257,7 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index a84a4b645c2a..a9c75328dfe0 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index e877a34007de..dd1dc25555d7 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 884a52e3a228..7b508535e2bb 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 01dc4c253d2b..2235cb54445d 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -217,7 +217,7 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } @@ -320,7 +320,7 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( } } } - + DiagramHelper::setVertical( xDiagram, false ); } diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index fabf7a59826c..4581c5a109b5 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 9922ed4df5fb..173847850f5a 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ namespace chart { BubbleChartType::BubbleChartType( - const uno::Reference< uno::XComponentContext > & xContext ) + const uno::Reference< uno::XComponentContext > & xContext ) : ChartType( xContext ) { } @@ -137,7 +137,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL aScaleData.AxisType = chart2::AxisType::SERIES; else aScaleData.AxisType = chart2::AxisType::REALNUMBER; - + xAxis->setScaleData( aScaleData ); } diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index eea8a0e7a6ee..4d618648e340 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 59b552cc8995..1cf108a80b23 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index 24d35c6acbb7..7413b5def1b3 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 1f26fff907e4..bc256590fc23 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( Reference< data::XLabeledDataSequence > xCategories; bool bHasCategories = HasCategories( aArguments, aData ); - + bool bHasXValues = false; sal_Int32 nDataSeqCount = aData.getLength(); bHasXValues = bHasCategories ? ( (nDataSeqCount-1) > 2 && (nDataSeqCount-1) % 2 != 0 ) :( nDataSeqCount > 2 && nDataSeqCount % 2 != 0 ); - bool bCategoriesUsed = false; + bool bCategoriesUsed = false; bool bNextIsYValues = bHasCategories ? nDataSeqCount>2 : nDataSeqCount>1; for( sal_Int32 nDataIdx = 0; nDataIdx < aData.getLength(); ++nDataIdx ) { diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index 3eb6ebaedbf0..6c3664dbb916 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 22c8e058ea53..e7a69c8d0b86 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index d32c4c455d74..ecbceebe69f4 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 22a744769fc6..48b6a67f3a8b 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -210,7 +210,7 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData for( sal_Int32 nN=0; nN<aOldSeries.getLength(); ++nN ) ModifyListenerHelper::removeListener( aOldSeries[nN], m_xModifyEventForwarder ); m_aDataSeries.clear(); - + for( sal_Int32 i=0; i<aDataSeries.getLength(); ++i ) impl_addDataSeriesWithoutNotification( aDataSeries[i] ); } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 07e72ea2890b..3ca1aee3e89c 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) @@ -138,12 +138,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index d34617ffce1f..44757824934e 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index e3943e9eb45f..c001b03b76a2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -732,7 +732,7 @@ void ChartTypeTemplate::adaptAxes( const Sequence< Reference< XCoordinateSystem > > & rCoordSys ) { //adapt properties of exsisting axes and remove superfluous axes - + if( rCoordSys.getLength() > 0 ) { for( sal_Int32 nCooSysIdx=0; nCooSysIdx < rCoordSys.getLength(); ++nCooSysIdx ) diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 3f43e0ca6038..d50b0bf99334 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ public: APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation -// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) +// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) protected: // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index aa11d77e8995..3c73d4878b88 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3386b6a1cd40..835c2c7b787e 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 663cad4c2fe4..4b9d6233dd50 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -428,7 +428,7 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter { //todo... OSL_ENSURE( false, "number of lines may not be valid anymore in the datainterpreter" ); - + } return m_xDataInterpreter; diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index ce86188e2bb6..0937221c8481 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 18e22f78e86e..0533a7e41528 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index b9b8a62a4097..44cc8229c583 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index b619553ee959..8e9d6a83dbb6 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index a2d6201fc023..70f5fd65daa0 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index d90dc8b9f7c7..fd6418c70320 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 14beee021b34..23b0e2103c90 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index f96d7ed1297d..9da596241b3e 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 1821333a4cdc..0a6e5b259691 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 8d582178a128..34f9c09f33e3 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index faee9715720a..eb243fc61eb6 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ddf001b2a6e4..4452a7ae93f1 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ Reference< XCoordinateSystem > SAL_CALL aScaleData.AxisType = AxisType::REALNUMBER; xAxis->setScaleData( aScaleData ); } - + return xResult; } diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index ba5dc48b6881..a534194a94ce 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index b67817e73997..1e21f448887d 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( //filled net chart?: if( m_bHasFilledArea ) return sal_True; - + // check symbol-style // for a template with symbols it is ok, if there is at least one series // with symbols, otherwise an unknown template is too easy to achieve @@ -209,7 +209,7 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index f66355a3576e..9af0667b38da 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 9c199bb23d70..11011372aaea 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index fccd4e9ee25c..f87412a513a6 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index c16682846d53..474f8eaeec75 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -555,7 +555,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( // line style DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); - + // vary colors by point xProp->setPropertyValue( C2U("VaryColorsByPoint"), uno::makeAny( true )); } diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index 1634e643611f..31ea67831f1c 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 8c4ab0d18415..2577219fd0d4 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -182,7 +182,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL aScaleData.AxisType = chart2::AxisType::SERIES; else aScaleData.AxisType = chart2::AxisType::REALNUMBER; - + xAxis->setScaleData( aScaleData ); } diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index aed0cce2a97f..dcc671d74c87 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index a83d9a8a4ea3..00a85f2b4c4c 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 048cca73a92c..0b50f4b0a2a9 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 00ace6c330ad..4f319607b1e6 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -281,7 +281,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( xProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_SOLID )); } } - + } catch( uno::Exception & ex ) { @@ -373,7 +373,7 @@ void StockChartTypeTemplate::createChartTypes( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW ); aChartTypeVec.push_back( xCT ); - + if( aSeriesSeq.getLength() > nSeriesIndex && aSeriesSeq[nSeriesIndex].getLength() > 0 ) { @@ -395,7 +395,7 @@ void StockChartTypeTemplate::createChartTypes( xCTProp->setPropertyValue( C2U("ShowFirst"), uno::makeAny( bShowFirst )); xCTProp->setPropertyValue( C2U("ShowHighLow"), uno::makeAny( bShowHighLow )); } - + if( aSeriesSeq.getLength() > nSeriesIndex && aSeriesSeq[ nSeriesIndex ].getLength() > 0 ) { diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index c9347ff4e070..f1f0be5c6414 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 0d134516a1bb..bc5debf0cfe0 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index bb9edf48c169..dae6cddf3c0b 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 839c0cbac510..19f24a0cf757 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( Reference< data::XLabeledDataSequence > xCategories; // check for categories. If true, the the categories bet parked in the axis scale, but not used via setting the Axistype to Not CATEGORY bool bHasCategories = HasCategories( aArguments, aData ); - + // parse data bool bCategoriesUsed = false; for( sal_Int32 nDataIdx= 0; nDataIdx < aData.getLength(); ++nDataIdx ) @@ -163,7 +163,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( throw (uno::RuntimeException) { InterpretedData aResult( aInterpretedData ); - + sal_Int32 i=0; Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); const sal_Int32 nCount = aSeries.getLength(); diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index c8ecb4d17778..bd4f0edbda9f 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx index c0ffb8f4825f..b026b910b2d8 100644 --- a/chart2/source/model/template/_serviceregistration_charttypes.cxx +++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 8cdd24e4dc05..551637b570e0 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx index 0ec7df9b7d71..7a41b84504dc 100644 --- a/chart2/source/tools/BaseGFXHelper.cxx +++ b/chart2/source/tools/BaseGFXHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace BaseGFXHelper return aRet; } - + B2IRectangle makeRectangle( const awt::Point& rPos, const awt::Size& rSize ) { return B2IRectangle(rPos.X,rPos.Y,rPos.X+rSize.Width,rPos.Y+rSize.Height); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 678cd8ba8314..3f161d41f3da 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index cca655780a79..4f5611218851 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index 9629138cb2be..fbc3231de9e8 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ void lcl_TraceDataSeriesSeq( const Sequence< Reference< XDataSeries > > & aSerie { Reference< beans::XPropertySet > xProp( aSeries[j], uno::UNO_QUERY ); OUString aId; - + OSL_TRACE( "%*cindex %ld", nIndent, lcl_aSpace, j ); StackingDirection aStDir; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index a49b2abeac98..5a3e55fa7bb5 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -251,7 +251,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un { //the property is optional! } - + xDiagramProperties->setPropertyValue( C2U("IncludeHiddenCells"), aNewValue); } } diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index b851a3864b97..96003f22221c 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -306,7 +306,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const xSeriesProp->getPropertyValue( C2U("StackingDirection") ) >>= eStacking; bStacked = (chart2::StackingDirection_Y_STACKING == eStacking); } - + aRet.realloc( bStacked ? 3 : 6 ); sal_Int32* pSeq = aRet.getArray(); if(!bStacked) @@ -319,7 +319,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const else { *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; + *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; } } *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index 55fbd368426a..b77a23ace65e 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index 762cb436a9a7..17e4670f34d1 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index e9d90248ce84..7281030a6e01 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,8 +129,8 @@ drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMat ::basegfx::B3DPoint Position3DToB3DPoint( const drawing::Position3D& rPosition ) { return ::basegfx::B3DPoint( - rPosition.PositionX , - rPosition.PositionY , + rPosition.PositionX , + rPosition.PositionY , rPosition.PositionZ ); } @@ -199,7 +199,7 @@ void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position drawing::Position3D getPointFromPoly( const drawing::PolyPolygonShape3D& rPolygon, sal_Int32 nPointIndex, sal_Int32 nPolyIndex ) { drawing::Position3D aRet(0.0,0.0,0.0); - + if( nPolyIndex>=0 && nPolyIndex<rPolygon.SequenceX.getLength()) { if(nPointIndex<rPolygon.SequenceX[nPolyIndex].getLength()) @@ -352,7 +352,7 @@ void appendPointSequence( drawing::PointSequenceSequence& rTarget if(!nAddCount) return; sal_Int32 nOldCount = rTarget.getLength(); - + rTarget.realloc(nOldCount+nAddCount); for(sal_Int32 nS=0; nS<nAddCount; nS++ ) rTarget[nOldCount+nS]=rAdd[nS]; diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index fb7106d87096..fb48543ec0fe 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx index 4ef430c5e483..ce40b0c01027 100644 --- a/chart2/source/tools/ControllerLockGuard.cxx +++ b/chart2/source/tools/ControllerLockGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index acff332d4229..cfbff66ac1ca 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index edbf4dfacfeb..e08d78b4e9bb 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 0cc6ef4a4315..0f7aed78ac0d 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -252,7 +252,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x") ) ); if( xXValues.is() ) aResultVector.push_back( xXValues ); - + //add all other sequences now without x-values for( sal_Int32 nN=0; nN<aDataSeqences.getLength(); nN++ ) { diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 36afef60a6d4..56cc2154104a 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -379,7 +379,7 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, b eGlobalStackMode = eLocalStackMode; } } - + return eGlobalStackMode; } @@ -445,7 +445,7 @@ StackMode DiagramHelper::getStackModeFromChartType( sal_Int32 nAxisIndex = 0; if( nSeriesCount ) nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(aSeries[0]); - + Reference< chart2::XAxis > xAxis( xCorrespondingCoordinateSystem->getAxisByDimension( 1,nAxisIndex )); if( xAxis.is()) @@ -1031,7 +1031,7 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories( if(xChartModel.is()) { uno::Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) ); - ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, xChartModel ); + ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, xChartModel ); aRet = aExplicitCategoriesProvider.getSimpleCategories(); } return aRet; @@ -1174,7 +1174,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( else nNewSeriesIndex++; - + if( nNewSeriesIndex >= 0 && nNewSeriesIndex < aSeriesList.getLength() ) { //move series in the same charttype @@ -1317,7 +1317,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference< { uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); - + if( xChartType .is() ) { rtl::OUString aChartType = xChartType->getChartType(); @@ -1414,7 +1414,7 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment( nResult = aAvailableMissingValueTreatments[0]; return nResult; } - + return nResult; } @@ -1471,7 +1471,7 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > aNewPos.Anchor = drawing::Alignment_TOP_LEFT; aNewPos.Primary = double(rPosRect.X)/double(aPageSize.Width); aNewPos.Secondary = double(rPosRect.Y)/double(aPageSize.Height); - + chart2::RelativeSize aNewSize; aNewSize.Primary = double(rPosRect.Width)/double(aPageSize.Width); aNewSize.Secondary = double(rPosRect.Height)/double(aPageSize.Height); @@ -1484,7 +1484,7 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > aNewPos.Primary = 1.0 - aNewSize.Primary; if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - + xDiaProps->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aNewPos) ); xDiaProps->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aNewSize) ); @@ -1515,7 +1515,7 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference awt::Size aAbsSize( aRelSize.Primary * aPageSize.Width, aRelSize.Secondary * aPageSize.Height ); - + awt::Point aAbsPos( static_cast< sal_Int32 >( aRelPos.Primary * aPageSize.Width ), static_cast< sal_Int32 >( aRelPos.Secondary * aPageSize.Height )); @@ -1523,7 +1523,7 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference awt::Point aAbsPosLeftTop = RelativePositionHelper::getUpperLeftCornerOfAnchoredObject( aAbsPos, aAbsSize, aRelPos.Anchor ); aRet = awt::Rectangle(aAbsPosLeftTop.X, aAbsPosLeftTop.Y, aAbsSize.Width, aAbsSize.Height ); - + return aRet; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 7468d8bb7896..6d1658fc9347 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index bd1c1bb79813..7a63ea913f9f 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,14 +70,14 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: if( xChartDoc.is() ) { uno::Reference< data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() ); - + if( xDataProvider.is() ) { OUString aCatgoriesRange( DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) ); const bool bFirstCellAsLabel = false; const bool bHasCategories = false; const uno::Sequence< sal_Int32 > aSequenceMapping; - + uno::Reference< data::XDataSource > xColumnCategoriesSource( xDataProvider->createDataSource( DataSourceHelper::createArguments( aCatgoriesRange, aSequenceMapping, true /*bUseColumns*/ , bFirstCellAsLabel, bHasCategories ) ) ); @@ -175,7 +175,7 @@ uno::Sequence< rtl::OUString > lcl_DataToStringSequence( const uno::Reference< d if( !xDataSequence.is() ) return aStrings; - + uno::Reference< data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY ); if( xTextualDataSequence.is() ) { @@ -234,7 +234,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( , const std::vector<sal_Int32>& rLimitingBorders, bool bCreateSingleCategories ) { std::vector< ComplexCategory > aResult; - + sal_Int32 nMaxCount = rStrings.getLength(); OUString aPrevious; sal_Int32 nCurrentCount=0; @@ -261,7 +261,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( } if( nCurrentCount ) aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); - + return aResult; } @@ -369,7 +369,7 @@ void ExplicitCategoriesProvider::init() { m_aExplicitCategories.realloc(0); m_aComplexCats.clear();//not one per index - + if( m_xOriginalCategories.is() ) { if( !hasComplexCategories() ) diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d7bb86174323..f9ea78812fd1 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index ee23727c321b..c0fe6ae4d705 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index c13c87d45931..9a9dae16ab22 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ Sequence< Reference< chart2::XFormattedString > > return Sequence< Reference< XFormattedString > >( & xFormStr, 1 ); } - + //............................................................................. } //namespace chart //............................................................................. diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index faf1defd20ac..23126472f39a 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 505ab598d7da..c43870f92106 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 65fc97a04b38..28dbd0c58183 100755 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void InternalData::createDefaultData() m_aData.resize( nSize ); for( sal_Int32 i=0; i<nSize; ++i ) m_aData[i] = fDefaultData[i]; - + m_aRowLabels.clear(); m_aRowLabels.reserve( m_nRowCount ); generate_n( back_inserter( m_aRowLabels ), m_nRowCount, @@ -156,7 +156,7 @@ Sequence< Sequence< double > > InternalData::getData() const for( sal_Int32 i=0; i<m_nRowCount; ++i ) aResult[i] = lcl_ValarrayToSequence< tDataType::value_type >( m_aData[ ::std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] ); - + return aResult; } @@ -180,7 +180,7 @@ void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector< double if( nColumnIndex < 0 ) return; enlargeData( nColumnIndex + 1, rNewData.size() ); - + tDataType aSlice = m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ]; for( vector< double >::size_type i = 0; i < rNewData.size(); ++i ) aSlice[i] = rNewData[i]; @@ -272,7 +272,7 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex ) m_aData[nIndex1] = m_aData[nIndex2]; m_aData[nIndex2] = fTemp; } - + vector< OUString > aTemp( m_aColumnLabels[nColumnIndex] ); m_aColumnLabels[nColumnIndex] = m_aColumnLabels[nColumnIndex + 1]; m_aColumnLabels[nColumnIndex + 1] = aTemp; @@ -389,7 +389,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex ) // labels if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size())) m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< OUString> (1)); - + #if OSL_DEBUG_LEVEL > 2 traceData(); #endif diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 4abc51be31af..1bea5314e4e8 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -571,7 +571,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData //don't add the created sequences to the map as they are used temporarily only ... return new DataSource( ContainerHelper::ContainerToSequence(aComplexCategories) ); } - + OSL_ASSERT( aRangeRepresentation.equals( lcl_aCompleteRange )); ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec; @@ -830,7 +830,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( transform( aComplexCategories.begin(), aComplexCategories.end(), aNewStrings.begin(), aComplexCategories.begin(), lcl_setStringAtLevel(nLevel) ); - + if( m_bDataInColumns ) m_aInternalData.setComplexRowLabels( aComplexCategories ); else diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 21ade3aefadc..55c45147ff5c 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 4e778db1a68c..2c699badb874 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::X xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); } - + } return xLegend; } diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 444e894a101d..837550f8594a 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -318,7 +318,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) //this method is called, if the try to close was successfull osl::ResettableGuard< osl::Mutex > aGuard( m_aAccessMutex ); - m_bInTryClose = sal_False; + m_bInTryClose = sal_False; m_aEndTryClosingCondition.set(); //Mutex needs to be acquired exactly ones @@ -330,8 +330,8 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) void CloseableLifeTimeManager ::impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ) { - m_bOwnership = bDeliverOwnership && bMyVeto; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = bDeliverOwnership && bMyVeto; + m_bOwnershipIsWellKnown = sal_True; } sal_Bool CloseableLifeTimeManager ::impl_shouldCloseAtNextChance() @@ -406,7 +406,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) } sal_Bool CloseableLifeTimeManager -::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) +::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) throw(uno::RuntimeException) { osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 95cf95e21a86..359b3a167293 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ void LineProperties::AddPropertiesToVector( ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); - + rOutProperties.push_back( Property( C2U( "LineJoint" ), PROP_LINE_JOINT, diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 7a372cff4f51..f6009732af3f 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index c7c2db60431c..84f293eb4cfe 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 8277a5830b0a..8efd9dfc81f1 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 687bc203a84f..de081c8e2ecc 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,29 +35,29 @@ namespace apphelper { -const short FLAG_DEPRECATED =1; -const short FLAG_MODEL =2; +const short FLAG_DEPRECATED =1; +const short FLAG_MODEL =2; -#define WRITE_PROPERTY( MediaName, nFlags ) \ -if(rProp.Name.equals(::rtl::OUString::createFromAscii(#MediaName))) \ -{ \ - if( rProp.Value >>= MediaName ) \ - ISSET_##MediaName = sal_True; \ - if(nFlags & FLAG_DEPRECATED) \ - { \ +#define WRITE_PROPERTY( MediaName, nFlags ) \ +if(rProp.Name.equals(::rtl::OUString::createFromAscii(#MediaName))) \ +{ \ + if( rProp.Value >>= MediaName ) \ + ISSET_##MediaName = sal_True; \ + if(nFlags & FLAG_DEPRECATED) \ + { \ m_aDeprecatedProperties[nDeprecatedCount]=rProp;\ - nDeprecatedCount++; \ - } \ - else \ - { \ - m_aRegularProperties[nRegularCount]=rProp; \ - nRegularCount++; \ - if( nFlags & FLAG_MODEL) \ - { \ - m_aModelProperties[nModelCount]=rProp; \ - nModelCount++; \ - } \ - } \ + nDeprecatedCount++; \ + } \ + else \ + { \ + m_aRegularProperties[nRegularCount]=rProp; \ + nRegularCount++; \ + if( nFlags & FLAG_MODEL) \ + { \ + m_aModelProperties[nModelCount]=rProp; \ + nModelCount++; \ + } \ + } \ } MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< @@ -149,11 +149,11 @@ void MediaDescriptorHelper::impl_init() ISSET_CharacterSet = sal_False; ISSET_Comment = sal_False; -// ::com::sun::star::uno::Any ComponentData; +// ::com::sun::star::uno::Any ComponentData; ISSET_ComponentData = sal_False; ISSET_FileName = sal_False; -// ::com::sun::star::uno::Any FilterData; +// ::com::sun::star::uno::Any FilterData; ISSET_FilterData = sal_False; ISSET_FilterName = sal_False; ISSET_FilterFlags = sal_False; @@ -175,10 +175,10 @@ void MediaDescriptorHelper::impl_init() ISSET_Overwrite = sal_False; ISSET_Password = sal_False; -// ::com::sun::star::awt::Rectangle PosSize; +// ::com::sun::star::awt::Rectangle PosSize; ISSET_PosSize = sal_False; -// ::com::sun::star::uno::Sequence< sal_Int8 > PostData; +// ::com::sun::star::uno::Sequence< sal_Int8 > PostData; ISSET_PostData = sal_False; ISSET_PostString = sal_False; Preview = sal_False; @@ -197,7 +197,7 @@ void MediaDescriptorHelper::impl_init() Version = 0; ISSET_Version = sal_False; -// ::com::sun::star::uno::Any ViewData; +// ::com::sun::star::uno::Any ViewData; ISSET_ViewData = sal_False; ViewId = 0; ISSET_ViewId = sal_False; diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index ae13b65c39c2..b220cbbb9718 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 7ac5a2786cef..9969fcaac272 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/MutexContainer.cxx b/chart2/source/tools/MutexContainer.cxx index 4fbb14674cdb..6a859f6941fd 100644 --- a/chart2/source/tools/MutexContainer.cxx +++ b/chart2/source/tools/MutexContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 05169c4608f9..82ca8ef92155 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ OUString SAL_CALL NameContainer::getImplementationName() { return m_aImplementationName; } - + sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) { @@ -94,7 +94,7 @@ sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) } return sal_False; } - + Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) { diff --git a/chart2/source/tools/NamedFillProperties.cxx b/chart2/source/tools/NamedFillProperties.cxx index f904c34c1df1..16df852d2435 100644 --- a/chart2/source/tools/NamedFillProperties.cxx +++ b/chart2/source/tools/NamedFillProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/NamedLineProperties.cxx b/chart2/source/tools/NamedLineProperties.cxx index 02680abf690e..c7ef7ed79924 100644 --- a/chart2/source/tools/NamedLineProperties.cxx +++ b/chart2/source/tools/NamedLineProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/NamedProperties.cxx b/chart2/source/tools/NamedProperties.cxx index 4fcb536b3279..44840de1568b 100644 --- a/chart2/source/tools/NamedProperties.cxx +++ b/chart2/source/tools/NamedProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index a1caac803dd7..89dbb4929c9e 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 0599f9317aed..b7721e14ce1b 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType if( aRet.getLength() ) aRet.appendAscii(":"); aRet.append( m_aDragMethodEquals ); - aRet.append( rDragMethodServiceName ); + aRet.append( rDragMethodServiceName ); if( rDragParameterString.getLength() ) { @@ -353,7 +353,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( OUString aDragMethodServiceName; OUString aDragParameterString; - + try { //title @@ -369,7 +369,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( eObjectType, aObjectID, aParentParticle, aDragMethodServiceName, aDragParameterString ); } return aRet; - + } //axis @@ -454,7 +454,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( aRet.appendAscii(":"); } aRet.append(rChildParticle); - + return aRet.makeStringAndClear(); } @@ -474,7 +474,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem( , const Reference< frame::XModel >& xChartModel ) { OUStringBuffer aRet; - + Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( xCooSysContainer.is() ) @@ -503,7 +503,7 @@ OUString ObjectIdentifier::createParticleForAxis( , sal_Int32 nAxisIndex ) { OUStringBuffer aRet(C2U("Axis=")); - + aRet.append( OUString::valueOf( nDimensionIndex ) ); aRet.appendAscii(","); aRet.append( OUString::valueOf( nAxisIndex ) ); @@ -571,7 +571,7 @@ OUString ObjectIdentifier::createParticleForLegend( , const Reference< frame::XModel >& xChartModel ) { OUStringBuffer aRet; - + Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); //todo: if more than one diagram is implemeted, find the correct diagram wich is owner of the given legend @@ -599,7 +599,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent( , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" , const OUString& rDragMethodServiceName , const OUString& rDragParameterString - ) + ) //, bool bIsMultiClickObject ) //e.g. true { //e.g. "MultiClick/Series=2:Point=34" @@ -677,7 +677,7 @@ bool ObjectIdentifier::parsePieSegmentDragParameterString( rMaximumPosition.Y = aValueString.toInt32(); if( nCharacterIndex < 0 ) return false; - + return true; } @@ -1028,7 +1028,7 @@ OUString ObjectIdentifier::createDataCurveCID( { OUString aParticleID( OUString::valueOf( nCurveIndex ) ); ObjectType eType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE; - return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle ); + return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle ); } //static @@ -1044,7 +1044,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID( OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ) { OUStringBuffer aRet(rParticle); - + if( aRet.getLength() && rChildParticle.getLength() ) aRet.appendAscii(":"); if( rChildParticle.getLength() ) @@ -1139,7 +1139,7 @@ OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID ) sal_Int32 nEndPos = rCID.getLength(); aRet = rCID.copy(nStartPos,nEndPos-nStartPos); } - + return aRet; } @@ -1379,7 +1379,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( if( nSeriesIndex >= 0 && nSeriesIndex < aDataSeriesSeq.getLength() ) xSeries.set( aDataSeriesSeq[nSeriesIndex] ); } - + return xSeries; } diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index b1d10424b9a1..48d2de023ba8 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index dd0a1ad6cf2f..ec13538bf2ef 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 1565344923b1..bd241430cab8 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 5a37f4980323..fe59260e081b 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -158,7 +158,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( return; static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - + try { awt::Size aRefSize( getPageSize() ); diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx index df407482b34d..e4690d9372b5 100644 --- a/chart2/source/tools/RegressionCalculationHelper.hxx +++ b/chart2/source/tools/RegressionCalculationHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 68e041e668ca..85e47db4dd26 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index b553dbc2d217..e14d2236f10a 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -516,7 +516,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN { if( !xRegCnt.is()) return NULL; - + try { uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves( @@ -715,7 +715,7 @@ sal_Int32 RegressionCurveHelper::getRegressionCurveIndex( bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCurve > & xCurve ) { - bool bHasEquation = false; + bool bHasEquation = false; if( xCurve.is()) { uno::Reference< beans::XPropertySet > xEquationProp( xCurve->getEquationProperties()); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index cf5be998308e..5b5c436a7416 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 82098a76e45a..3aeb735562fc 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ea16e5b7702a..4ca34a8e3138 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 35dbd828370d..00e85a9f20e4 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index 4d566b1f7f48..368c27983639 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index d3da090ca397..cd10a5b039ef 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 0d6e35974aaa..fe222c7718ac 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/RessourceManager.cxx b/chart2/source/tools/RessourceManager.cxx index a2d43b309019..2836b7bbc600 100644 --- a/chart2/source/tools/RessourceManager.cxx +++ b/chart2/source/tools/RessourceManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index e106f1dcc5e2..d1c1d87183ed 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 21a95d99be7d..261ae63526bc 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 721451c276da..19747b5304c3 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -1,7 +1,7 @@ -/************************************************************************* +/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 44ed73eade43..ac40ff6fb93c 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ bool lcl_isRightAngledAxesSetAndSupported( const Reference< beans::XPropertySet if(bRightAngledAxes) { uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { return true; @@ -167,7 +167,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro return false; uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY ); - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); sal_Int32 nColor = 0; xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ) ) >>= nColor; @@ -192,7 +192,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro xDiagramProps->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; if(!bRightAngledAxes) { - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { ::basegfx::B3DHomMatrix aRotation( lcl_getCompleteRotationMatrix( xDiagramProps ) ); @@ -277,7 +277,7 @@ bool lcl_isSimpleScheme( drawing::ShadeMode aShadeMode return false; if(nObjectLines==0) { - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); return ChartTypeHelper::noBordersForSimpleScheme( xChartType ); } if(nObjectLines!=1) @@ -302,7 +302,7 @@ void lcl_setSimpleScheme( drawing::ShadeMode& rShadeMode rShadeMode = drawing::ShadeMode_FLAT; rnRoundedEdges = 0; - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); rnObjectLines = ChartTypeHelper::noBordersForSimpleScheme( xChartType ) ? 0 : 1; } @@ -439,7 +439,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( double E = F_PI*nElevationDeg/180; //elevation in Rad double R = F_PI*nRotationDeg/180; //rotation in Rad - + if( (nRotationDeg == 0 || nRotationDeg == 180 ) && ( nElevationDeg == 90 || nElevationDeg == 270 ) ) { @@ -526,7 +526,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( x = E; y = R; double f23 = cos(R)*sin(E); - if( (f23 * sin(x)) < 0.0 ) + if( (f23 * sin(x)) < 0.0 ) x *= -1.0; //todo ?? } else if (nRotationDeg == 90 || nRotationDeg == 270) @@ -560,7 +560,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( double cy = cos(R)/cos(z); lcl_ensureIntervalMinus1To1(cy); y = acos(cy); - + //element 12 in 23 double fDenominator = cos(z)*(1.0-pow(sin(y),2)); if(fDenominator==0.0) @@ -618,7 +618,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( double& x = fXRad; double& y = fYRad; double& z = fZRad; - + double f11 = cos(y)*cos(z); if( lcl_isSinZero(y) ) @@ -701,7 +701,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( } else if( lcl_isSinZero(z) ) { - //sinY==0 sinZ==0 sinx!=0 cosx!=0 + //sinY==0 sinZ==0 sinx!=0 cosx!=0 //element 13+11 if( f11 > 0 ) R = 0.0; @@ -801,7 +801,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( //cosY!=0 sinY!=0 sinX=0 sinZ!=0 cosZ!=0 double f13 = cos(x)*cos(z)*sin(y); R = atan( f13/f11 ); - + if( f11<0 ) R+=F_PI; @@ -901,7 +901,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( if(f22<0.0) E+=F_PI; } - + rnElevationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( E ) ); rnRotationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( R ) ); } @@ -1024,7 +1024,7 @@ void ThreeDHelper::setRotationAngleToDiagram( { //remind old rotation for adaption of light directions ::basegfx::B3DHomMatrix aInverseOldRotation( lcl_getInverseRotationMatrix( xSceneProperties ) ); - + ::basegfx::B3DHomMatrix aInverseCameraRotation; { ::basegfx::B3DTuple aR( BaseGFXHelper::GetRotationFromMatrix( @@ -1049,7 +1049,7 @@ void ThreeDHelper::setRotationAngleToDiagram( sal_Bool bRightAngledAxes = sal_False; xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); - if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes( + if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { ::basegfx::B3DHomMatrix aNewRotation; @@ -1414,7 +1414,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( nCurrentRoundedEdges = -1; } } - + if( !bDifferentObjectLines ) { drawing::LineStyle aCurrentLineStyle; diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 828a523245ff..0e57d285408d 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram( else nTitleIndex = bIsVertical ? TitleHelper::Y_AXIS_TITLE : TitleHelper::X_AXIS_TITLE; } - + switch( nTitleIndex ) { @@ -172,7 +172,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( xTitled = lcl_getTitleParent( eTitleType, xModel ); } } - + if(xTitled.is()) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); @@ -281,7 +281,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText rtl::OUStringBuffer aSource(rNewText); bool bBreakIgnored = false; - sal_Int32 nLen = rNewText.getLength(); + sal_Int32 nLen = rNewText.getLength(); for( sal_Int32 nPos = 0; nPos < nLen; ++nPos ) { sal_Unicode aChar = aSource.charAt( nPos ); @@ -357,7 +357,7 @@ bool TitleHelper::getTitleType( eTitleType& rType { if( !xTitle.is() || !xModel.is() ) return false; - + Reference< chart2::XTitle > xCurrentTitle; for( sal_Int32 nTitleType = TITLE_BEGIN; nTitleType < NORMAL_TITLE_END; nTitleType++ ) { diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx index 6992552367ed..c5a6287675c8 100644 --- a/chart2/source/tools/TrueGuard.cxx +++ b/chart2/source/tools/TrueGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 52cc6b9c03b6..524f5f33756a 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 707c48c1a6cc..2d01daecdccf 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index bbb54e20bdce..8efce36efd0a 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 03178d204ef7..aff8b52bfe72 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index 601b6e199d59..60feceda1228 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index aaa6c545a799..aa1915669f00 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index b41d8a331f11..3076609d0486 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState if( xInnerPropertyState.is() ) { aRet = xInnerPropertyState->getPropertyDefault( this->getInnerName() ); - aRet = this->convertInnerToOuterValue( aRet ); + aRet = this->convertInnerToOuterValue( aRet ); } return aRet; } diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 843aeb261a5f..f66d16d0ce54 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -464,7 +464,7 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() for( std::vector< WrappedProperty* >::const_iterator aIt = aPropList.begin(); aIt!=aPropList.end(); ++aIt ) { - WrappedProperty* pProperty = *aIt; + WrappedProperty* pProperty = *aIt; if(pProperty) { sal_Int32 nHandle = getInfoHelper().getHandleByName( pProperty->getOuterName() ); diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index c5d345db0124..ab01787222f5 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 387b87dfab5a..f85e0ac2a923 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index 88f99b493144..2d12e46da6d2 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 890bf87df96e..54d0eefa0d6d 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,7 @@ ScaleData ScaleAutomatism::getScale() const { return m_aSourceScale; } - + // private -------------------------------------------------------------------- void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx index 9e2e2707c035..984e5fe12013 100644 --- a/chart2/source/view/axes/TickmarkHelper.cxx +++ b/chart2/source/view/axes/TickmarkHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -297,7 +297,7 @@ bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex ) if( nTickIndex < m_nCurrentPos ) if( !gotoFirst() ) return false; - + while( nTickIndex > m_nCurrentPos ) if( !gotoNext() ) return false; @@ -551,7 +551,7 @@ double* TickmarkHelper::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth double fDistance = (fAdaptedNextParent - fAdaptedStartParent)/m_rIncrement.SubIncrements[nDepth-1].IntervalCount; m_pfCurrentValues[nDepth] = fAdaptedStartParent + nTick*fDistance; - + //return always the value after scaling if(!bPostEquidistant && m_xInverseScaling.is() ) m_pfCurrentValues[nDepth] = m_rScale.Scaling->doScaling( m_pfCurrentValues[nDepth] ); diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx index 78fc2fe1c502..6cb1c587d0bc 100644 --- a/chart2/source/view/axes/TickmarkHelper.hxx +++ b/chart2/source/view/axes/TickmarkHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -254,7 +254,7 @@ private: //member //labels might be posioned high or low on the border of the diagram far away from the axis //add this vector to go from the axis line to the label line (border of the diagram) ::basegfx::B2DVector m_aAxisLineToLabelLineShift; - + double m_fStrech_LogicToScreen; double m_fOffset_LogicToScreen; }; diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx index 09c0179d3698..99eb87065176 100644 --- a/chart2/source/view/axes/TickmarkProperties.hxx +++ b/chart2/source/view/axes/TickmarkProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 0159fb20cad6..759b5a74e21f 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,7 +177,7 @@ bool VAxisBase::prepareShapeCreation() //----------------------------------------- //create all scaled tickmark values removeTextShapesFromTicks(); - + createAllTickInfos(m_aAllTickInfos); m_bReCreateAllTickInfos = false; } diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index ba7e94b2070c..6d37493f7eb9 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public: virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); void setExrtaLinePositionAtOtherAxis( const double& fCrossingAt ); - + //------------------------------------------------------------------------- //------------------------------------------------------------------------- protected: //methods diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index f2e2e90c1045..753df8d78089 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 35b32b2b1c03..5a1af2df16e7 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 1e3e62894741..98b3e7a079fb 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const { sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/; - + TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) ); aTickmarkProperties.RelativePos = static_cast<sal_Int32>(lcl_getTickOffset(aTickmarkProperties.Length+nTickStartDistanceToAxis,nTickmarkStyle)); @@ -324,7 +324,7 @@ void AxisProperties::init( bool bCartesian ) m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1; else m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1; - + if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos ) m_fLabelDirectionSign = m_fInnerDirectionSign; else if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos ) @@ -333,7 +333,7 @@ void AxisProperties::init( bool bCartesian ) m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1; else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos ) m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1; - + if( m_nDimensionIndex==2 ) m_aLabelAlignment = lcl_getLabelAlignmentForZAxis(*this); else @@ -358,13 +358,13 @@ void AxisProperties::init( bool bCartesian ) //init LineProperties m_aLineProperties.initFromPropertySet( xProp ); - //init display labels + //init display labels xProp->getPropertyValue( C2U( "DisplayLabels" ) ) >>= m_bDisplayLabels; //init categories ScaleData aScaleData = m_xAxisModel->getScaleData(); m_nAxisType = aScaleData.AxisType; - + //init TickmarkProperties xProp->getPropertyValue( C2U( "MajorTickmarks" ) ) >>= m_nMajorTickmarks; xProp->getPropertyValue( C2U( "MinorTickmarks" ) ) >>= m_nMinorTickmarks; diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 5b6bfe98f777..1c5714bb663b 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 8ec895fbd452..f23d73a9f6f1 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ Reference< drawing::XShape > createSingleLabel( , const tNameSequence& rPropNames , const tAnySequence& rPropValues ) -{ +{ if(!rLabel.getLength()) return 0; @@ -104,7 +104,7 @@ Reference< drawing::XShape > createSingleLabel( const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi ); rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); - + Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory) .createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation ); @@ -375,7 +375,7 @@ TickInfo* MaxLabelEquidistantTickIter::nextInfo() gotoIndex( nMaxIndex-1 ); } } - + return EquidistantTickIter::nextInfo(); } @@ -584,7 +584,7 @@ bool VCartesianAxis::createTextShapes( nLimitedSpaceForText = nScreenDistanceBetweenTicks; if( bIsStaggered ) nLimitedSpaceForText *= 2; - + if( nLimitedSpaceForText > 0 ) { //reduce space for a small amount to have a visible distance between the labels: sal_Int32 nReduce = (nLimitedSpaceForText*5)/100; @@ -602,7 +602,7 @@ bool VCartesianAxis::createTextShapes( TickInfo* pPreviousVisibleTickInfo = NULL; TickInfo* pPREPreviousVisibleTickInfo = NULL; TickInfo* pLastVisibleNeighbourTickInfo = NULL; - + //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence aPropNames; @@ -952,12 +952,12 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub double fDeltaX = rEnd.getX() - rStart.getX(); double fDeltaY = rEnd.getY() - rStart.getY(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fMinX, fYOnYPlane, fZOther ) ); aPosList.push_back( getScreenPosAndLogicPos( fMinX, fYOther, fZOnZPlane ) ); - + if( fabs(fDeltaY) > fabs(fDeltaX) ) { m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT; @@ -1006,12 +1006,12 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub double fDeltaX = rEnd.getX() - rStart.getX(); double fDeltaY = rEnd.getY() - rStart.getY(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fXOnXPlane, fMinY, fZOther ) ); aPosList.push_back( getScreenPosAndLogicPos( fXOther, fMinY, fZOnZPlane ) ); - + if( fabs(fDeltaY) > fabs(fDeltaX) ) { m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT; @@ -1085,7 +1085,7 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub rEnd = getScreenPosition( fXEnd, fYEnd, fZEnd ); double fDeltaX = rEnd.getX() - rStart.getX(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fXOther, fYOnYPlane, fMinZ ) ); @@ -1140,13 +1140,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; if( ( fDeltaY<0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaY>0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; } @@ -1158,13 +1158,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; if( ( fDeltaY<0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaY>0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; } @@ -1176,13 +1176,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_TOP : LABEL_ALIGN_BOTTOM; if( ( fDeltaX>0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaX<0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_TOP ) ? LABEL_ALIGN_BOTTOM : LABEL_ALIGN_TOP; } @@ -1201,7 +1201,7 @@ TickmarkHelper_2D* VCartesianAxis::createTickmarkHelper2D() B2DVector aLabelLineStart, aLabelLineEnd; this->get2DAxisMainLine( aLabelLineStart, aLabelLineEnd, this->getLogicValueWhereLabelLineCrossesOtherAxis() ); - + return new TickmarkHelper_2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart ); } @@ -1326,7 +1326,7 @@ void SAL_CALL VCartesianAxis::createLabels() //----------------------------------------- //'hide' tickmarks with identical screen values in aAllTickInfos hideIdenticalScreenValues( m_aAllTickInfos ); - + removeTextShapesFromTicks(); //create tick mark text shapes @@ -1363,7 +1363,7 @@ void SAL_CALL VCartesianAxis::createMaximumLabels() if( !prepareShapeCreation() ) return; - + //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) @@ -1455,7 +1455,7 @@ void SAL_CALL VCartesianAxis::updatePositions() //correctPositionForRotation LabelPositionHelper::correctPositionForRotation( xShape2DText , m_aAxisProperties.m_aLabelAlignment, m_aAxisLabelProperties.fRotationAngleDegree, false ); - } + } } } @@ -1498,7 +1498,7 @@ void SAL_CALL VCartesianAxis::createShapes() { if( !prepareShapeCreation() ) return; - + std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() ); TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get(); if( !pTickmarkHelper2D ) @@ -1559,7 +1559,7 @@ void SAL_CALL VCartesianAxis::createShapes() const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); if(aDepthIter == aDepthEnd)//no tickmarks at all return; - + sal_Int32 nTickmarkPropertiesCount = m_aAxisProperties.m_aTickmarkPropertiesList.size(); for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; aDepthIter++, nDepth++ ) createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickmarkHelper2D, false /*bOnlyAtLabels*/ ); diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 4fbcd2409196..db4e422815c4 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: //------------------------------------------------------------------------- virtual TickmarkHelper* createTickmarkHelper(); - + //------------------------------------------------------------------------- double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index a196397e0e9f..ead4efffad53 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ void VCartesianCoordinateSystem::createVAxisList( return; sal_Int32 nDimensionIndex = 0; - + for( nDimensionIndex = 0; nDimensionIndex < nDimensionCount; nDimensionIndex++ ) { sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex); @@ -157,7 +157,7 @@ void VCartesianCoordinateSystem::createVAxisList( || ( aAxisProperties.m_pExplicitCategoriesProvider && aAxisProperties.m_pExplicitCategoriesProvider->hasComplexCategories() ); } } - + if( nDimensionIndex == 2 ) { aAxisProperties.m_xAxisTextProvider = new TextualDataProvider( m_aSeriesNamesForZAxis ); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index b28400c6f906..6613d20e9d99 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public: virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); - + virtual void createGridShapes(); private: diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 7fe6b9937ca6..d167caba2581 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,7 +135,7 @@ GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_In { if( !bSwapXY ) P0=P1; - else + else P2=P1; } } @@ -221,7 +221,7 @@ void SAL_CALL VCartesianGrid::createShapes() //create named group shape Reference< drawing::XShapes > xGroupShape_Shapes( this->createGroupShape( m_xLogicTarget, m_aCID ) ); - + if(!xGroupShape_Shapes.is()) return; //----------------------------------------- @@ -247,7 +247,7 @@ void SAL_CALL VCartesianGrid::createShapes() if(aDepthIter == aDepthEnd)//no tickmarks at all return; - + sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 274b543900e3..cb130c0adcd0 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index bc908acdf85a..74763b273b0b 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -179,7 +179,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( for( nN = 0 ;nN<aResolution.getLength(); nN++ ) aResolution[nN]=1000; - ::basegfx::B3DTuple aScale( BaseGFXHelper::GetScaleFromMatrix( + ::basegfx::B3DTuple aScale( BaseGFXHelper::GetScaleFromMatrix( BaseGFXHelper::HomogenMatrixToB3DHomMatrix( m_aMatrixSceneToScreen ) ) ); @@ -197,10 +197,10 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( nXResolution = 10; if( nYResolution < 10 ) nYResolution = 10; - + if( this->getPropertySwapXAndYAxis() ) std::swap(nXResolution,nYResolution); - + //2D if( 2 == aResolution.getLength() ) { @@ -215,7 +215,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( for( nN = 0 ;nN<aResolution.getLength(); nN++ ) aResolution[nN]=nMaxResolution; } - + return aResolution; } @@ -277,7 +277,7 @@ Sequence< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32 nD impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex ); - + return aRet; } @@ -296,7 +296,7 @@ ExplicitScaleData VCoordinateSystem::getExplicitScale( sal_Int32 nDimensionIndex ExplicitScaleData aRet; impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); - + if( nAxisIndex == 0) { aRet = m_aExplicitScales[nDimensionIndex]; @@ -431,7 +431,7 @@ VAxisBase* VCoordinateSystem::getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAx tVAxisMap::const_iterator aIt = m_aAxisMap.find( aFullAxisIndex ); if( aIt != m_aAxisMap.end() ) pRet = aIt->second.get(); - + return pRet; } @@ -538,7 +538,7 @@ void VCoordinateSystem::createAxesShapes() m_aExplicitScales[0].Origin ); } } - + pVAxis->createShapes(); } } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 865a7848aa9a..d38a4bfc0348 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames, aPropValues, false ); LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps , rAxisLabelProperties.m_aFontReferenceSize ); - + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) @@ -94,7 +94,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( //TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; - + for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo ; pTickInfo = rTickIter.nextInfo(), nTick++ ) @@ -131,7 +131,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor); double fLogicAngle = pTickInfo->fUnscaledTickValue; - + LabelAlignment eLabelAlignment(LABEL_ALIGN_CENTER); PolarLabelPositionHelper aPolarLabelPositionHelper(m_pPosHelper,nDimensionCount,xTarget,&aShapeFactory); sal_Int32 nScreenValueOffsetInRadiusDirection = m_aAxisLabelProperties.m_aMaximumSpaceForLabels.Height/15; @@ -141,7 +141,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( // #i78696# use mathematically correct rotation now const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); - + uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi ); rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); @@ -211,7 +211,7 @@ void SAL_CALL VPolarAngleAxis::createShapes() { if( !prepareShapeCreation() ) return; - + double fLogicRadius = m_pPosHelper->getOuterLogicRadius(); double fLogicZ = -0.5;//as defined diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index c03cf533e22c..5f84521e3550 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index 23908585ec3a..8730a3abf8d2 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index 8d4c14188258..9bc1b0d3c0d7 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 76e057a2b32d..cde46609a5fc 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ uno::Sequence< sal_Int32 > VPolarCoordinateSystem::getCoordinateSystemResolution aResolution[1]/=2;//radius } } - + return aResolution; } @@ -88,7 +88,7 @@ void VPolarCoordinateSystem::createVAxisList( // bool bSwapXAndY = this->getPropertySwapXAndYAxis(); sal_Int32 nDimensionIndex = 0; - + //create angle axis (dimension index 0) for( nDimensionIndex = 0; nDimensionIndex < nDimensionCount; nDimensionIndex++ ) { @@ -146,7 +146,7 @@ void VPolarCoordinateSystem::initVAxisInList() pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(2==nDimensionCount) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } @@ -174,7 +174,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes() pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(2==nDimensionCount) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index f1ba84c5469e..d047bf6541d3 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 0bd98b642acb..1c29c299cdbe 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ void VPolarGrid::setIncrements( const uno::Sequence< ExplicitIncrementData >& rI void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const { - TickmarkHelper aTickmarkHelper( + TickmarkHelper aTickmarkHelper( m_pPosHelper->getScales()[nDimensionIndex], m_aIncrements[nDimensionIndex] ); aTickmarkHelper.getAllTicks( rAllTickInfos ); } @@ -166,7 +166,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT aPoints[0][1].Y = static_cast<sal_Int32>(aScenePositionEnd.PositionY); appendPointSequence( aAllPoints, aPoints ); } - + Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xMainTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking @@ -230,14 +230,14 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic if(aPoints[0].getLength()) appendPointSequence( aAllPoints, aPoints ); } - + Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); } } - + void SAL_CALL VPolarGrid::createShapes() { DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized"); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 3289d6c88be8..c24e0727ac26 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 2206d4d8f559..3bad7a8c5235 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ void SAL_CALL VPolarRadiusAxis::createShapes() { if( !prepareShapeCreation() ) return; - + const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0]; @@ -153,7 +153,7 @@ void SAL_CALL VPolarRadiusAxis::createShapes() xInverseScaling = rAngleScale.Scaling->getInverseScaling(); AxisProperties aAxisProperties(m_aAxisProperties); - + sal_Int32 nTick = 0; EquidistantTickIter aIter( aAngleTickInfos, rAngleIncrement, 0, 0 ); for( TickInfo* pTickInfo = aIter.firstInfo() diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index b5c5191e4c98..6c1ec85cc24b 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const rtl::OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index fd1aaa81c3a0..8313188b693b 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -263,7 +263,7 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting drawing::DoubleSequence* pOuterSourceX = &rPolyPoly.SequenceX.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterSourceY = &rPolyPoly.SequenceY.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterSourceZ = &rPolyPoly.SequenceZ.getArray()[nPolygonIndex]; - + drawing::DoubleSequence* pOuterTargetX = &aTmp.SequenceX.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterTargetY = &aTmp.SequenceY.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterTargetZ = &aTmp.SequenceZ.getArray()[nPolygonIndex]; @@ -279,11 +279,11 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting double* pSourceX = pOuterSourceX->getArray(); double* pSourceY = pOuterSourceY->getArray(); double* pSourceZ = pOuterSourceZ->getArray(); - + double* pTargetX = pOuterTargetX->getArray(); double* pTargetY = pOuterTargetY->getArray(); double* pTargetZ = pOuterTargetZ->getArray(); - + //copy first point *pTargetX=*pSourceX++; *pTargetY=*pSourceY++; @@ -303,7 +303,7 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting } pSourceX++; pSourceY++; pSourceZ++; } - + //free unused space if( nTargetPointCount<nPointCount ) { @@ -800,7 +800,7 @@ void AreaChart::createShapes() //transformation 3) -> 4) drawing::Position3D aScenePosition( pPosHelper->transformLogicToScene( fLogicX,fLogicY,fLogicZ, false ) ); - //better performance for big data + //better performance for big data FormerPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); if( !pSeries->isAttributedDataPoint(nIndex) @@ -914,7 +914,7 @@ void AreaChart::createShapes() , aScenePosition.PositionZ+this->getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 6924509a62a1..5f5b282cbdc5 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,13 +104,13 @@ private: //methods private: //member PlottingPositionHelper* m_pMainPosHelper; - bool m_bArea;//false -> line or symbol only - bool m_bLine; - bool m_bSymbol; + bool m_bArea;//false -> line or symbol only + bool m_bLine; + bool m_bSymbol; bool m_bIsPolarCooSys;//used e.g. for net chart (the data labels need to be placed different) - bool m_bConnectLastToFirstPoint;//used e.g. for net chart + bool m_bConnectLastToFirstPoint;//used e.g. for net chart bool m_bExpandIfValuesCloseToBorder; // e.g. false for net charts - + sal_Int32 m_nKeepAspectRatio; //0->no 1->yes other value->automatic ::com::sun::star::drawing::Direction3D m_aGivenAspectRatio; //only used if nKeepAspectRatio==1 diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 0d7ef403f87d..3130609fc6d1 100755 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const double fXSlotCount = 1.0; if(!m_aZSlots.empty()) fXSlotCount = m_aZSlots.begin()->size(); - + aRet.DirectionZ = aScale.DirectionZ/(aScale.DirectionX + aScale.DirectionX*(fXSlotCount-1.0)*pPosHelper->getSlotWidth()); } else @@ -207,7 +207,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( bool bReverse = !pPosHelper->isMathematicalOrientationY(); bool bNormalOutside = (!bReverse == !!(fBaseValue < fScaledUpperYValue)); double fDepth = fScaledUpperBarDepth; - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: @@ -319,7 +319,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( break; default: DBG_ERROR("this label alignment is not implemented yet"); - + break; } if(3==m_nDimension) @@ -506,7 +506,7 @@ void BarChart::createShapes() bool bOnlyConnectionLinesForThisPoint = false; adaptOverlapAndGapwidthForGroupBarsPerAxis(); - + //better performance for big data std::map< VDataSeries*, FormerBarPoint > aSeriesFormerPointMap; m_bPointsWereSkipped = false; @@ -530,7 +530,7 @@ void BarChart::createShapes() { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); - + for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++ ) { sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries(); @@ -691,9 +691,9 @@ void BarChart::createShapes() //@todo ... start an iteration over the different breaks of the axis //each subsystem may add an additional shape to form the whole point //create a group shape for this point and add to the series shape: - // uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes) ); - // uno::Reference<drawing::XShape> xPointGroupShape_Shape = - // uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY ); + // uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes) ); + // uno::Reference<drawing::XShape> xPointGroupShape_Shape = + // uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY ); //as long as we do not iterate we do not need to create an additional group for each point uno::Reference< drawing::XShapes > xPointGroupShape_Shapes = xSeriesGroupShape_Shapes; uno::Reference< beans::XPropertySet > xDataPointProperties( (*aSeriesIter)->getPropertiesOfPoint( nCatIndex ) ); @@ -759,7 +759,7 @@ void BarChart::createShapes() fLogicBarDepth*=-1.0; } } - + //better performance for big data FormerBarPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); @@ -860,7 +860,7 @@ void BarChart::createShapes() // if( !aLineProperties.isLineVisible() ) // { // //todo - // //aLineProperties.Color = + // //aLineProperties.Color = // } // xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes @@ -897,7 +897,7 @@ void BarChart::createShapes() LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nCatIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + double fLowerBarDepth = fLogicBarDepth; double fUpperBarDepth = fLogicBarDepth; { diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 403628f7fc43..68c3cf0db250 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index b1735e99de5d..f8526f58a294 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 32899de62aef..9b940f5464b5 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index c5454edcc6fd..1adb7f87aaf3 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -248,7 +248,7 @@ void BubbleChart::createShapes() { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - + aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) { @@ -288,7 +288,7 @@ void BubbleChart::createShapes() if( !m_bShowNegativeValues && fBubbleSize<0.0 ) continue; - + if( ::rtl::math::approxEqual( fBubbleSize, 0.0 ) || ::rtl::math::isNan(fBubbleSize) ) continue; @@ -305,7 +305,7 @@ void BubbleChart::createShapes() //transformation 3) -> 4) drawing::Position3D aScenePosition( pPosHelper->transformLogicToScene( fLogicX,fLogicY,fLogicZ, false ) ); - //better performance for big data + //better performance for big data FormerPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); if( !pSeries->isAttributedDataPoint(nIndex) @@ -348,7 +348,7 @@ void BubbleChart::createShapes() m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); } - + //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) { @@ -358,7 +358,7 @@ void BubbleChart::createShapes() , aScenePosition.PositionZ+this->getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 9c04ce8d3719..0e68841d5e91 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ private: //methods private: //member - bool m_bShowNegativeValues;//input parameter + bool m_bShowNegativeValues;//input parameter bool m_bBubbleSizeAsArea;//input parameter double m_fBubbleSizeScaling;//input parameter diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index ddfe50deed2f..777384aa2ce6 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -269,7 +269,7 @@ void CandleStickChart::createShapes() drawing::Position3D aPosMiddleLast( pPosHelper->transformLogicToScene( fLogicX, fY_Last ,0 ,true ) ); drawing::Position3D aPosMiddleMinimum( pPosHelper->transformLogicToScene( fLogicX, fY_Min ,0 ,true ) ); drawing::Position3D aPosMiddleMaximum( pPosHelper->transformLogicToScene( fLogicX, fY_Max ,0 ,true ) ); - + uno::Reference< drawing::XShapes > xLossGainTarget( xGainTarget ); if(bBlack) xLossGainTarget = xLossTarget; @@ -327,7 +327,7 @@ void CandleStickChart::createShapes() else { drawing::PolyPolygonShape3D aPoly; - + sal_Int32 nLineIndex = 0; if( bShowFirst && pPosHelper->isLogicVisible( fLogicX, fY_First ,0 ) && isValidPosition(aPosLeftFirst) && isValidPosition(aPosMiddleFirst) ) @@ -335,7 +335,7 @@ void CandleStickChart::createShapes() AddPointToPoly( aPoly, aPosLeftFirst, nLineIndex ); AddPointToPoly( aPoly, aPosMiddleFirst, nLineIndex++ ); } - if( pPosHelper->isLogicVisible( fLogicX, fY_Last ,0 ) + if( pPosHelper->isLogicVisible( fLogicX, fY_Last ,0 ) && isValidPosition(aPosMiddleLast) && isValidPosition(aPosRightLast) ) { AddPointToPoly( aPoly, aPosMiddleLast, nLineIndex ); @@ -355,7 +355,7 @@ void CandleStickChart::createShapes() } } } - + //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) { diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 60018dbe8621..ff9487c525f1 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index d43fd0856e02..f32b123f375c 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index 08cb1978faa1..7a420b58cc8a 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index eee13848b11b..f4c76806cfe9 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -383,7 +383,7 @@ void PieChart::createShapes() continue; m_pPosHelper->m_fAngleDegreeOffset = pSeries->getStartingAngle(); - + double fLogicYSum = 0.0; //iterate through all points to get the sum sal_Int32 nPointIndex=0; @@ -484,7 +484,7 @@ void PieChart::createShapes() bool bMovementAllowed = ( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP ); if( bMovementAllowed ) nLabelPlacement = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; - + LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ; if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) @@ -510,7 +510,7 @@ void PieChart::createShapes() aScreenPosition2D.X += aDirection.getX(); aScreenPosition2D.Y += aDirection.getY(); } - + aPieLabelInfo.xTextShape = this->createDataLabel( xTextTarget, *pSeries, nPointIndex , fLogicYValue, fLogicYSum, aScreenPosition2D, eAlignment ); @@ -537,7 +537,7 @@ void PieChart::createShapes() double fMaxDeltaRadius = fUnitCircleOuterRadius-fUnitCircleInnerRadius; drawing::Position3D aOrigin = m_pPosHelper->transformUnitCircleToScene( fAngle, fUnitCircleOuterRadius, fLogicZ ); drawing::Position3D aNewOrigin = m_pPosHelper->transformUnitCircleToScene( fAngle, fUnitCircleOuterRadius + fMaxDeltaRadius, fLogicZ ); - + sal_Int32 nOffsetPercent( static_cast<sal_Int32>(fExplodePercentage * 100.0) ); awt::Point aMinimumPosition( PlottingPositionHelper::transformSceneToScreenPosition( @@ -638,12 +638,12 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c nShift*=-1; awt::Point aOldPos( this->xLabelGroupShape->getPosition() ); basegfx::B2IVector aNewPos = basegfx::B2IVector( aOldPos.X, aOldPos.Y ) + nShift*aTangentialDirection; - + //check whether the new position is ok awt::Point aNewAWTPos( aNewPos.getX(), aNewPos.getY() ); if( !lcl_isInsidePage( aNewAWTPos, this->xLabelGroupShape->getSize(), rPageSize ) ) return false; - + this->xLabelGroupShape->setPosition( aNewAWTPos ); this->bMoved = true; } @@ -661,7 +661,7 @@ void PieChart::resetLabelPositionsToPreviousState() bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) { //returns true when there might be more to do - + //find borders of a group of overlapping labels bool bOverlapFound = false; PieLabelInfo* pStart = &(*(m_aLabelInfoList.rbegin())); @@ -674,7 +674,7 @@ bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) ::basegfx::B2IRectangle aNextOverlap( aPreviousOverlap ); aPreviousOverlap.intersect( lcl_getRect( pCurrent->pPrevious->xLabelGroupShape ) ); aNextOverlap.intersect( lcl_getRect( pCurrent->pNext->xLabelGroupShape ) ); - + bool bPreviousOverlap = !aPreviousOverlap.isEmpty(); bool bNextOverlap = !aNextOverlap.isEmpty(); if( bPreviousOverlap || bNextOverlap ) diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index e6fedb05d52e..958037e062df 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public: virtual void SAL_CALL createShapes(); virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ); - + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 67ecac93b64c..b178c8e913f2 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -457,7 +457,7 @@ void SplineCalculater::CalculateBSplines( rResult.SequenceX.realloc(0); rResult.SequenceY.realloc(0); rResult.SequenceZ.realloc(0); - + sal_Int32 nOuterCount = rInput.SequenceX.getLength(); if( !nOuterCount ) return; // no input @@ -470,22 +470,22 @@ void SplineCalculater::CalculateBSplines( { 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 - + double fCurveparam =0.0; // parameter for the curve // 0<= fCurveparam < fMaxCurveparam double fMaxCurveparam = 2.0+ n - k; if (fMaxCurveparam <= 0.0) return; // not enough control points for desired spline order - + if (nGranularity < 1) return; //need at least 1 line for each part beween the control points const double* pOldX = rInput.SequenceX[nOuter].getConstArray(); const double* pOldY = rInput.SequenceY[nOuter].getConstArray(); const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray(); - + // keep this amount of steps to go well with old version sal_Int32 nNewSectorCount = nGranularity * n; double fCurveStep = fMaxCurveparam/static_cast< double >(nNewSectorCount); @@ -500,7 +500,7 @@ void SplineCalculater::CalculateBSplines( double* pNewX = rResult.SequenceX[nOuter].getArray(); double* pNewY = rResult.SequenceY[nOuter].getArray(); double* pNewZ = rResult.SequenceZ[nOuter].getArray(); - + // variables needed inside loop, when calculating one point of output sal_Int32 nPointIndex =0; //index of given contol points double fX=0.0; @@ -509,10 +509,10 @@ void SplineCalculater::CalculateBSplines( for(sal_Int32 nNewSector=0; nNewSector<nNewSectorCount; nNewSector++) { // in first looping fCurveparam has value 0.0 - + // Calculate the values of the blending functions for actual curve parameter BVector(fCurveparam, n, k, b, t); - + // output point(fCurveparam) = sum over {input point * value of blending function} fX = 0.0; fY = 0.0; @@ -526,7 +526,7 @@ void SplineCalculater::CalculateBSplines( pNewX[nNewSector] = fX; pNewY[nNewSector] = fY; pNewZ[nNewSector] = fZ; - + fCurveparam += fCurveStep; //for next looping } // add last control point to BSpline curve diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index 642522f53ebe..e9a8969d63b5 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 840cbbe3e1e1..541255c5ade7 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -282,7 +282,7 @@ void VSeriesPlotter::releaseShapes() ::std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - + //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ ) { @@ -546,7 +546,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re xProp->setPropertyValue( C2U( "Transformation" ), ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } - + if( xSymbol.is() ) { const awt::Point aOldTextPos( xTextShape->getPosition() ); @@ -554,7 +554,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re awt::Size aSymbolSize( xSymbol->getSize() ); awt::Size aTextSize( xTextShape->getSize() ); - + if( !bMultiLineLabel || nLineCountForSymbolsize <= 0 ) nLineCountForSymbolsize = 1; sal_Int32 nYDiff = aTextSize.Height/nLineCountForSymbolsize; @@ -582,7 +582,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re || LABEL_ALIGN_RIGHT_TOP==eAlignment || LABEL_ALIGN_RIGHT_BOTTOM==eAlignment ) { - aNewTextPos.X += nXDiff; + aNewTextPos.X += nXDiff; } else if(LABEL_ALIGN_TOP==eAlignment || LABEL_ALIGN_BOTTOM==eAlignment @@ -591,10 +591,10 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re aSymbolPosition.X -= nXDiff/2; aNewTextPos.X += nXDiff/2; } - + xSymbol->setSize( aSymbolSize ); xSymbol->setPosition( aSymbolPosition ); - + //set position xTextShape->setPosition( aNewTextPos ); } @@ -795,7 +795,7 @@ void VSeriesPlotter::createErrorBar( drawing::Position3D aUnscaledLogicPosition(rUnscaledLogicPosition); if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION) aUnscaledLogicPosition.PositionY = rVDataSeries.getYMeanValue(); - + bool bCreateNegativeBorder = false;//make a vertical line at the negative end of the error bar bool bCreatePositiveBorder = false;//make a vertical line at the positive end of the error bar drawing::Position3D aMiddle(aUnscaledLogicPosition); @@ -1135,7 +1135,7 @@ double VSeriesPlotter::getMinimumX() if( m_bCategoryXAxis ) { double fRet = 1.0;//first category (index 0) matches with real number 1.0 - if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) + if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) fRet -= 0.5; return fRet; } @@ -1150,7 +1150,7 @@ double VSeriesPlotter::getMaximumX() { //return category count double fRet = getPointCount();//first category (index 0) matches with real number 1.0 - if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) + if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) fRet += 0.5; return fRet; } @@ -1805,12 +1805,12 @@ Sequence< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntries( //todo: respect direction of axis in future } - + if(bReverse) aResult.insert( aResult.begin(), aSeriesEntries.begin(), aSeriesEntries.end() ); else aResult.insert( aResult.end(), aSeriesEntries.begin(), aSeriesEntries.end() ); - } + } } } @@ -1828,7 +1828,7 @@ Sequence< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntries( LegendSymbolStyle VSeriesPlotter::getLegendSymbolStyle() { - return chart2::LegendSymbolStyle_BOX; + return chart2::LegendSymbolStyle_BOX; } @@ -1872,7 +1872,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries( Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( const VDataSeries& rSeries - , sal_Int32 nPointIndex + , sal_Int32 nPointIndex , const Reference< drawing::XShapes >& xTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory ) { @@ -1905,7 +1905,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( if( rSeries.isAttributedDataPoint( nPointIndex ) ) xPointSet.set( rSeries.getPropertiesOfPoint( nPointIndex )); - // if a data point has no own color use a color fom the diagram's color scheme + // if a data point has no own color use a color fom the diagram's color scheme if( ! rSeries.hasPointOwnColor( nPointIndex )) { Reference< util::XCloneable > xCloneable( xPointSet,uno::UNO_QUERY ); @@ -1937,7 +1937,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe ) { std::vector< ViewLegendEntry > aResult; - + if( ! ( xShapeFactory.is() && xTarget.is() && xContext.is() ) ) return aResult; @@ -1965,7 +1965,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe if( xShape.is() ) { aEntry.aSymbol = uno::Reference< drawing::XShape >( xSymbolGroup, uno::UNO_QUERY ); - + OUString aChildParticle( ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_DATA_POINT, nIdx ) ); aChildParticle = ObjectIdentifier::addChildParticle( aChildParticle, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_LEGEND_ENTRY, 0 ) ); OUString aCID = ObjectIdentifier::createClassifiedIdentifierForParticles( rSeries.getSeriesParticle(), aChildParticle ); @@ -2028,7 +2028,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe // symbol uno::Reference< drawing::XShapes > xSymbolGroup( ShapeFactory(xShapeFactory).createGroup2D( xTarget )); - + // create the symbol Reference< drawing::XShape > xShape( VLegendSymbolFactory::createSymbol( xSymbolGroup, chart2::LegendSymbolStyle_DIAGONAL_LINE, xShapeFactory, @@ -2039,7 +2039,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe if( xShape.is()) { aEntry.aSymbol = uno::Reference< drawing::XShape >( xSymbolGroup, uno::UNO_QUERY ); - + bool bAverageLine = false;//@todo find out wether this is an average line or a regression curve ObjectType eObjectType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE; OUString aChildParticle( ObjectIdentifier::createChildParticleWithIndex( eObjectType, i ) ); diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 4174226b6f62..7382be6aa4af 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ VDiagram::VDiagram( { uno::Reference< beans::XPropertySet > xSourceProp( m_xDiagram, uno::UNO_QUERY ); ThreeDHelper::getRotationAngleFromDiagram( xSourceProp, m_fXAnglePi, m_fYAnglePi, m_fZAnglePi ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( m_xDiagram, 0 ) ) ) { if(xSourceProp.is()) @@ -159,7 +159,7 @@ void VDiagram::createShapes( const awt::Point& rPos, const awt::Size& rSize ) //center diagram position m_aCurrentPosWithoutAxes = awt::Point( ShapeFactory::calculateTopLeftPositionToCenterObject( rPos, rAvailableSize, m_aCurrentSizeWithoutAxes ) ); - + } if( m_xWall2D.is() ) @@ -359,7 +359,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) double sy = fabs(sin(m_fYAnglePi)); double cz = fabs(cos(m_fZAnglePi)); double sz = fabs(sin(m_fZAnglePi)); - + if(m_bRightAngledAxes) { //base equations: @@ -523,7 +523,7 @@ void VDiagram::createShapes_3d() "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); ShapeFactory::setShapeName( m_xOuterGroupShape, C2U("PlotAreaExcludingAxes") ); m_xLogicTarget->add(m_xOuterGroupShape); - + uno::Reference< drawing::XShapes > xOuterGroup_Shapes = uno::Reference<drawing::XShapes>( m_xOuterGroupShape, uno::UNO_QUERY ); @@ -602,7 +602,7 @@ void VDiagram::createShapes_3d() aStripe.InvertNormal(true); uno::Reference< drawing::XShape > xShape = - m_pShapeFactory->createStripe(xWallGroup_Shapes, aStripe + m_pShapeFactory->createStripe(xWallGroup_Shapes, aStripe , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture, bFlatNormals ); if( !bAddFloorAndWall ) { @@ -676,9 +676,9 @@ void VDiagram::createShapes_3d() aStripe.InvertNormal(true); uno::Reference< drawing::XShape > xShape = - m_pShapeFactory->createStripe(xOuterGroup_Shapes, aStripe + m_pShapeFactory->createStripe(xOuterGroup_Shapes, aStripe , xFloorProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, 0, bFlatNormals ); - + CuboidPlanePosition eBottomPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBottom( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) ); if( !bAddFloorAndWall || (CuboidPlanePosition_Bottom!=eBottomPos) ) { @@ -763,13 +763,13 @@ void VDiagram::reduceToMimimumSize() ::basegfx::B2IRectangle rAvailableOuterRect( BaseGFXHelper::makeRectangle(m_aAvailablePosIncludingAxes,m_aAvailableSizeIncludingAxes) ); - + sal_Int32 nDeltaWidth = static_cast<sal_Int32>(rAvailableOuterRect.getWidth() - rConsumedOuterRect.getWidth()); sal_Int32 nDeltaHeight = static_cast<sal_Int32>(rAvailableOuterRect.getHeight() - rConsumedOuterRect.getHeight()); if( (aNewSize.Width + nDeltaWidth) < rAvailableOuterRect.getWidth()/3 ) nDeltaWidth = static_cast<sal_Int32>(rAvailableOuterRect.getWidth()/3 - aNewSize.Width); aNewSize.Width += nDeltaWidth; - + if( (aNewSize.Height + nDeltaHeight) < rAvailableOuterRect.getHeight()/3 ) nDeltaHeight = static_cast<sal_Int32>(rAvailableOuterRect.getHeight()/3 - aNewSize.Height); aNewSize.Height += nDeltaHeight; diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index d04a576737bf..29e224a555c5 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ class Clipping */ public: - /** @descr The intersection between an open polygon and a rectangle is + /** @descr The intersection between an open polygon and a rectangle is calculated and the resulting lines are placed into the poly-polygon aResult. - @param rPolygon The polygon is required to be open, ie. it's start and end point + @param rPolygon The polygon is required to be open, ie. it's start and end point have different coordinates and that it is continuous, ie. has no holes. - @param rRectangle The clipping area. - @param aResult The resulting lines that are the parts of the given polygon lying inside + @param rRectangle The clipping area. + @param aResult The resulting lines that are the parts of the given polygon lying inside the clipping area are stored into aResult whose prior content is deleted first. */ static void clipPolygonAtRectangle( diff --git a/chart2/source/view/inc/LabelAlignment.hxx b/chart2/source/view/inc/LabelAlignment.hxx index 26ec703db302..392a5afc8160 100644 --- a/chart2/source/view/inc/LabelAlignment.hxx +++ b/chart2/source/view/inc/LabelAlignment.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index a240736018bc..85e74e92875f 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 14b6cda47870..b0559b3f6088 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 71a728d2dc73..852fb2968a84 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 1e53d5c144c5..772eca027d11 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 63e276b19e44..db1ba090b38d 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const rtl::OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setScales( @@ -110,9 +110,9 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; - //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; rtl::OUString m_aCID; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index a1f16883b779..d067533498d7 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: PlottingPositionHelper(); PlottingPositionHelper( const PlottingPositionHelper& rSource ); virtual ~PlottingPositionHelper(); - + virtual PlottingPositionHelper* clone() const; virtual PlottingPositionHelper* createSecondaryPosHelper( const ::com::sun::star::chart2::ExplicitScaleData& rSecondaryScale ); @@ -84,7 +84,7 @@ public: inline bool clipYRange( double& rMin, double& rMax ) const; inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip=false ) const; - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationScaledLogicToScene() const; @@ -125,8 +125,8 @@ public: protected: //member ::com::sun::star::uno::Sequence< - ::com::sun::star::chart2::ExplicitScaleData > m_aScales; - ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; + ::com::sun::star::chart2::ExplicitScaleData > m_aScales; + ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene mutable ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index b4fd1fdc8483..7fbd1d4b2cc2 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index c0871b94f835..1140ad4e72f4 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 4440ad26ac5a..95ed67928e42 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public: ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const; ::com::sun::star::chart2::ScaleData getScale() const; - + private: /** Fills the passed scale data and increment data for category scaling. */ void calculateExplicitIncrementAndScaleForCategory( @@ -103,7 +103,7 @@ private: private: ::com::sun::star::chart2::ScaleData m_aSourceScale; - + double m_fValueMinimum; /// Minimum of all source values. double m_fValueMaximum; /// Maximum of all source values. sal_Int32 m_nMaximumAutoMainIncrementCount; /// Maximum number of automatic main increments. diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index ef75f3a323af..867336346c2e 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index ca1aaf155d1e..1fc053893575 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index e884af865d6e..c38010c09c8e 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: throw (::com::sun::star::uno::RuntimeException); void setParticle( const rtl::OUString& rCooSysParticle ); - + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen(); @@ -93,13 +93,13 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; // returns a coplete increment set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - + void addMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); void clearMinimumAndMaximumSupplierList(); - + void prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex ); - + void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex , const ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale , const ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ); @@ -124,7 +124,7 @@ public: virtual void createAxesShapes(); virtual void createGridShapes(); - + virtual bool getPropertySwapXAndYAxis() const; sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; @@ -168,7 +168,7 @@ protected: //member rtl::OUString m_aCooSysParticle; typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis - + // ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xLogicTargetForGrids; @@ -177,7 +177,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::drawing::HomogenMatrix m_aMatrixSceneToScreen; CuboidPlanePosition m_eLeftWallPos; @@ -186,7 +186,7 @@ protected: //member // MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose - + ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis; typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap; diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 93aba58dbec4..7d2c0b134d68 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,7 +142,7 @@ public: sal_Int32 getStartingAngle() const; void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ); - + //this is only temporarily here for area chart: ::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; sal_Int32 m_nPolygonIndex; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 5df198c2f539..194a7e41a978 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ private: //members ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; // this is the surrounding shape which contains floor, wall and coordinate diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index a568a9ef4a85..c090eb788b7b 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index f6ec92d38cf8..fc747b447583 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index f3da18ac92b6..c0f968361a3a 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6b6b06437542..3101ee77d002 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ public: */ virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - + /** this enables you to handle series on the same x axis with different y axis the property AttachedAxisIndex at a dataseries indicates which value scale is to use (0==AttachedAxisIndex or a not set AttachedAxisIndex property indicates that this series should be scaled at the main y-axis; @@ -173,11 +173,11 @@ public: nAxisIndex must be greater than 0. nAxisIndex==1 referres to the first secondary axis. ) */ - - virtual void SAL_CALL addSecondaryValueScale( const + + virtual void SAL_CALL addSecondaryValueScale( const ::com::sun::star::chart2::ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); - + //------------------------------------------------------------------------- // MinimumAndMaximumSupplier //------------------------------------------------------------------------- @@ -230,7 +230,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLegendSymbolForPoint( const VDataSeries& rSeries - , sal_Int32 nPointIndex + , sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); @@ -277,15 +277,15 @@ public: ::com::sun::star::chart2::XColorScheme >& xColorScheme ); void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider ); - + //get series names for the z axis labels ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const; void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); - bool PointsWereSkipped() const; - + bool PointsWereSkipped() const; + //return the depth for a logic 1 double getTransformedDepth() const; @@ -424,7 +424,7 @@ protected: //member ::std::vector< ::std::vector< VDataSeriesGroup > > m_aZSlots; - bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values) + bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values) ::std::auto_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper; AxesNumberFormats m_aAxesNumberFormats;//direct numberformats on axes, if empty ask the data series instead diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index 623e46e64fb7..2ee57b3d3dad 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index d8f997d36da9..face4248f39c 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,43 +71,43 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_TEXT_STACKED - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,FALSE); ppPoolDefaults[SCHATTR_TEXT_ORDER - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_TEXT_ORDER); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_Y_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_Y_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_Y_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_Y_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_Y_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_Y_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_X_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_X_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_X_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_X_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_X_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_X_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_Z_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_Z_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_Z_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_Z_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_Z_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_AXISTYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_Y_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_Y_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_Y_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_Y_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_Y_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_Y_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_X_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_X_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_X_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_X_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_X_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_X_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_Z_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_Z_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_Z_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_Z_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_Z_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_AXISTYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); @@ -121,8 +121,8 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String()); ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String()); - ppPoolDefaults[SCHATTR_TEXT_DEGREES - SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0); - ppPoolDefaults[SCHATTR_TEXT_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_OVERLAP,FALSE); + ppPoolDefaults[SCHATTR_TEXT_DEGREES - SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0); + ppPoolDefaults[SCHATTR_TEXT_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_OVERLAP,FALSE); ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0); ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 0); @@ -135,48 +135,48 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STYLE_SYMBOL - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SYMBOL, 0); ppPoolDefaults[SCHATTR_STYLE_SHAPE - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SHAPE, 0); - ppPoolDefaults[SCHATTR_AXIS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!! + ppPoolDefaults[SCHATTR_AXIS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!! - ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN); - ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MAX); - ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP); -// ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN); + ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MAX); + ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP); +// ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_HELP); // type changed from double to sal_Int32 - ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0); - ppPoolDefaults[SCHATTR_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_AXIS_TICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TICKS,CHAXIS_MARK_OUTER); - ppPoolDefaults[SCHATTR_AXIS_NUMFMT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMT,0); - ppPoolDefaults[SCHATTR_AXIS_NUMFMTPERCENT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMTPERCENT,11); - ppPoolDefaults[SCHATTR_AXIS_SHOWAXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWAXIS,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWMAINGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWMAINGRID,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWHELPGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWHELPGRID,0); - ppPoolDefaults[SCHATTR_AXIS_TOPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_TOPDOWN,0); - ppPoolDefaults[SCHATTR_AXIS_HELPTICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELPTICKS,0); - ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0); + ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0); + ppPoolDefaults[SCHATTR_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_AXIS_TICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TICKS,CHAXIS_MARK_OUTER); + ppPoolDefaults[SCHATTR_AXIS_NUMFMT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMT,0); + ppPoolDefaults[SCHATTR_AXIS_NUMFMTPERCENT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMTPERCENT,11); + ppPoolDefaults[SCHATTR_AXIS_SHOWAXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWAXIS,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWMAINGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWMAINGRID,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWHELPGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWHELPGRID,0); + ppPoolDefaults[SCHATTR_AXIS_TOPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_TOPDOWN,0); + ppPoolDefaults[SCHATTR_AXIS_HELPTICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELPTICKS,0); + ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0); ppPoolDefaults[SCHATTR_AXIS_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_POSITION,0); ppPoolDefaults[SCHATTR_AXIS_POSITION_VALUE - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_POSITION_VALUE); - ppPoolDefaults[SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT,0); + ppPoolDefaults[SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT,0); ppPoolDefaults[SCHATTR_AXIS_LABEL_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_LABEL_POSITION,0); ppPoolDefaults[SCHATTR_AXIS_MARK_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MARK_POSITION,0); - ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH); - ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0); - ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0); - ppPoolDefaults[SCHATTR_SYMBOL_SIZE - SCHATTR_START] = new SvxSizeItem(SCHATTR_SYMBOL_SIZE,Size(0,0)); + ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH); + ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0); + ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0); + ppPoolDefaults[SCHATTR_SYMBOL_SIZE - SCHATTR_START] = new SvxSizeItem(SCHATTR_SYMBOL_SIZE,Size(0,0)); // new for New Chart - ppPoolDefaults[SCHATTR_BAR_OVERLAP - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0); - ppPoolDefaults[SCHATTR_BAR_GAPWIDTH - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0); - ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, FALSE); + ppPoolDefaults[SCHATTR_BAR_OVERLAP - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0); + ppPoolDefaults[SCHATTR_BAR_GAPWIDTH - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0); + ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, FALSE); ppPoolDefaults[SCHATTR_NUM_OF_LINES_FOR_BAR - SCHATTR_START] = new SfxInt32Item( SCHATTR_NUM_OF_LINES_FOR_BAR, 0 ); ppPoolDefaults[SCHATTR_SPLINE_ORDER - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 ); ppPoolDefaults[SCHATTR_SPLINE_RESOLUTION - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 ); diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index b8ee9910ce2d..920b334353b9 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ namespace chart class ChartItemPool : public SfxItemPool { private: - SfxPoolItem** ppPoolDefaults; + SfxPoolItem** ppPoolDefaults; SfxItemInfo* pItemInfos; public: diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 2347824664c5..3a556901a240 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -256,7 +256,7 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre return; // creating the graphic exporter - uno::Reference< document::XExporter > xExporter( xFactory->createInstance( + uno::Reference< document::XExporter > xExporter( xFactory->createInstance( C2U("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY); uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY ); @@ -277,8 +277,8 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre aFilterData[1].Value <<= bUseHighContrast; aFilterData[2].Name = C2U("Version"); - const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; - aFilterData[2].Value <<= nVersion; + const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; + aFilterData[2].Value <<= nVersion; aFilterData[3].Name = C2U("CurrentPage"); aFilterData[3].Value <<= uno::Reference< uno::XInterface >( m_xDrawPage, uno::UNO_QUERY ); @@ -322,7 +322,7 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF SvMemoryStream aStream( 1024, 1024 ); utl::OStreamWrapper* pStreamWrapper = new utl::OStreamWrapper( aStream ); - + uno::Reference< io::XOutputStream > xOutStream( pStreamWrapper ); uno::Reference< io::XInputStream > xInStream( pStreamWrapper ); uno::Reference< io::XSeekable > xSeekable( pStreamWrapper ); @@ -330,13 +330,13 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF if( xOutStream.is() ) { this->getMetaFile( xOutStream, bHighContrastMetaFile ); - + if( xInStream.is() && xSeekable.is() ) { xSeekable->seek(0); sal_Int32 nBytesToRead = xInStream->available(); uno::Sequence< sal_Int8 > aSeq( nBytesToRead ); - xInStream->readBytes( aSeq, nBytesToRead); + xInStream->readBytes( aSeq, nBytesToRead); aRet <<= aSeq; xInStream->closeInput(); } @@ -455,7 +455,7 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis typedef std::pair< VCoordinateSystem* , tFullAxisIndex > tFullCoordinateSystem; typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap; - + struct AxisUsage { AxisUsage(); @@ -659,7 +659,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( // - create plotter for charttypes (for each first scale group at each plotter, as they are independent) // - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling) // - add plotter to coordinate systems - + //iterate through all coordinate systems uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); OSL_ASSERT( xCooSysContainer.is()); @@ -695,7 +695,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( pPlotter->setColorScheme( xColorScheme ); pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() ); sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType ); - + if(pVCooSys) pVCooSys->addMinimumAndMaximumSupplier(pPlotter); @@ -911,7 +911,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel { //precondition: need a initialized m_aSeriesPlotterList //precondition: need a initialized m_aAxisUsageList - + ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); @@ -927,7 +927,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel AxisUsage& rAxisUsage = (*aAxisIter).second; ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex); - + for( nC=0; nC < aVCooSysList_X.size(); nC++) aVCooSysList_X[nC]->prepareScaleAutomatismForDimensionAndIndex(rAxisUsage.aScaleAutomatism,0,nAxisIndex); for( nC=0; nC < aVCooSysList_Z.size(); nC++) @@ -956,7 +956,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems(1,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex); - + if(!aVCooSysList_Y.size()) continue; @@ -966,7 +966,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel ExplicitScaleData aExplicitScale; ExplicitIncrementData aExplicitIncrement; rAxisUsage.aScaleAutomatism.calculateExplicitScaleAndIncrement( aExplicitScale, aExplicitIncrement ); - + for( nC=0; nC < aVCooSysList_X.size(); nC++) aVCooSysList_X[nC]->setExplicitScaleAndIncrement( 0, nAxisIndex, aExplicitScale, aExplicitIncrement ); for( nC=0; nC < aVCooSysList_Y.size(); nC++) @@ -993,7 +993,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex ); if( !aVCooSysList_Y.size() ) continue; - + uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if( xDiagram.is() ) { @@ -1004,7 +1004,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); aIter++ ) { - sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); + sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); if( nAxisIndex == nCurrentIndex ) { bSeriesAttachedToThisAxis = true; @@ -1014,7 +1014,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: nAttachedAxisIndex=nCurrentIndex; } } - + if( !bSeriesAttachedToThisAxis && nAttachedAxisIndex >= 0 ) { for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC ) @@ -1033,7 +1033,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType; aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue; - + ScaleData aScale( rAxisUsage.aScaleAutomatism.getScale() ); if( !aScale.Minimum.hasValue() ) { @@ -1044,7 +1044,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( bNewMinOK ) aExplicitScaleDest.Minimum = aExplicitScaleSource.Minimum; } - else + else aExplicitIncrementDest.BaseValue = aExplicitScaleDest.Minimum; if( !aScale.Maximum.hasValue() ) @@ -1054,10 +1054,10 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( aScale.Minimum >>= fMin ) bNewMaxOK = (fMin <= aExplicitScaleSource.Maximum); if( bNewMaxOK ) - aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum; + aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum; } if( !aScale.Origin.hasValue() ) - aExplicitScaleDest.Origin = aExplicitScaleSource.Origin; + aExplicitScaleDest.Origin = aExplicitScaleSource.Origin; if( !aScale.IncrementData.Distance.hasValue() ) aExplicitIncrementDest.Distance = aExplicitIncrementSource.Distance; @@ -1068,7 +1068,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( bAutoMinorInterval ) { if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() ) - aExplicitIncrementDest.SubIncrements[0].IntervalCount = + aExplicitIncrementDest.SubIncrements[0].IntervalCount = aExplicitIncrementSource.SubIncrements[0].IntervalCount; } @@ -1158,7 +1158,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio() fz = fy*aSingleRatio.DirectionZ/aSingleRatio.DirectionY; else fz = aSingleRatio.DirectionZ; - } + } if( fx>0 && fy>0 && fz>0 ) break; @@ -1216,7 +1216,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod if( xPageStyles.is() ) { rtl::OUString aPageStyle; - + uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY ); if( xTextDocument.is() ) { @@ -1275,7 +1275,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod } if( !aPageStyle.getLength() ) { - uno::Reference< text::XText > xText( xTextDocument->getText() ); + uno::Reference< text::XText > xText( xTextDocument->getText() ); if( xText.is() ) { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); @@ -1319,7 +1319,7 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp { sal_Int16 nWritingMode = text::WritingMode2::LR_TB; if( pDrawModelWrapper.get() ) - { + { const SfxPoolItem* pItem = &(pDrawModelWrapper->GetItemPool().GetDefaultItem( EE_PARA_WRITINGDIR )); if( pItem ) nWritingMode = static_cast< sal_Int16 >((static_cast< const SfxInt32Item * >( pItem ))->GetValue()); @@ -1340,7 +1340,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& , const uno::Reference< drawing::XShape>& xDiagram_MarkHandles /*needs to be resized to fit the result*/ ) { - //return the used rectangle + //return the used rectangle awt::Rectangle aUsedOuterRect( rAvailablePos.X, rAvailablePos.Y, 0, 0 ); // sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported @@ -1380,9 +1380,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ); } - + // - prepare list of all axis and how they are used - rSeriesPlotterContainer.initAxisUsageList(); + rSeriesPlotterContainer.initAxisUsageList(); rSeriesPlotterContainer.doAutoScaling( m_xChartModel ); rSeriesPlotterContainer.setScalesFromCooSysToPlotter(); rSeriesPlotterContainer.setNumberFormatsFromAxes(); @@ -1394,7 +1394,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& //aspect ratio drawing::Direction3D aPreferredAspectRatio( rSeriesPlotterContainer.getPreferredAspectRatio() ); - + uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(0); uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(0); VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); @@ -1409,7 +1409,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& uno::Reference< drawing::XShapes > xTextTargetShapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxes_Shapes) ); // - create axis and grids for all coordinate systems - + //init all coordinate systems for( nC=0; nC < rVCooSysList.size(); nC++) { @@ -1426,7 +1426,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY ); ::basegfx::B2IRectangle aConsumedOuterRect; - + //use first coosys only so far; todo: calculate for more than one coosys if we have more in future //todo: this is just a workaround at the moment for pie and donut labels bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); @@ -1434,7 +1434,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& { VCoordinateSystem* pVCooSys = rVCooSysList[0]; pVCooSys->createMaximumAxesLabels(); - + aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) ); ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() ); if( !bUseFixedInnerSize ) @@ -1474,10 +1474,10 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& for( nC=0; nC < rVCooSysList.size(); nC++) { VCoordinateSystem* pVCooSys = rVCooSysList[nC]; - + pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( createTransformationSceneToScreen( aVDiagram.getCurrentRectangle() ) )); - + pVCooSys->createAxesShapes(); pVCooSys->createGridShapes(); } @@ -1525,7 +1525,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() ); if( !bUseFixedInnerSize ) aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect ); - + for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ ) { VSeriesPlotter* pSeriesPlotter = *aPlotterIter; @@ -1536,7 +1536,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ShapeFactory::removeSubShapes( xSeriesTargetInFrontOfAxis ); //xSeriesTargetBehindAxis is a sub shape of xSeriesTargetInFrontOfAxis and will be removed here xSeriesTargetBehindAxis.clear(); ShapeFactory::removeSubShapes( xTextTargetShapes ); - + //set new transformation for( nC=0; nC < rVCooSysList.size(); nC++) { @@ -1653,7 +1653,7 @@ sal_Bool ChartView::getExplicitValuesForAxis( if(!xAxis.is()) return sal_False; - + uno::Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis(xAxis,ChartModelHelper::findDiagram( m_xChartModel ) ) ); const VCoordinateSystem* pVCooSys = findInCooSysList(m_aVCooSysList,xCooSys); if(!pVCooSys) @@ -1690,7 +1690,7 @@ uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() ); - if( pObj ) + if( pObj ) return uno::Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY); return 0; } @@ -1827,7 +1827,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis( bool bNumberFormatKeyFoundViaAttachedData = false; sal_Int32 nAxisIndex = 0; sal_Int32 nDimensionIndex = 1; - + try { Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW ); @@ -1944,7 +1944,7 @@ sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference< util:: { sal_Bool bCreate = sal_True; const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); - Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, + Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, rLocaleDataWrapper.getLocale(), bCreate ); if( aKeySeq.getLength() ) { @@ -1964,9 +1964,9 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( { sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) - return nFormat; + return nFormat; - rtl::OUString aPropName( C2U( "NumberFormat" ) ); + rtl::OUString aPropName( C2U( "NumberFormat" ) ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -2004,7 +2004,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe { sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) - return nFormat; + return nFormat; if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) ) { nFormat = ExplicitValueProvider::getPercentNumberFormat( xNumberFormatsSupplier ); @@ -2182,7 +2182,7 @@ bool getAvailablePosAndSizeForDiagram( bool bPosSizeExcludeAxes = false; if( xProp.is() ) xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes; - + //size: ::com::sun::star::chart2::RelativeSize aRelativeSize; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) @@ -2463,7 +2463,7 @@ void formatPage( if( ! xModelPage.is()) return; - + if( !xShapeFactory.is() ) return; @@ -2627,7 +2627,7 @@ void ChartView::createShapes() { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + //------------ apply fill properties to page // todo: it would be nicer to just pass the page m_xDrawPage and format it, // but the draw page does not support XPropertySet @@ -2650,7 +2650,7 @@ void ChartView::createShapes() ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") ); uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) ); - + //------------ create some titles std::auto_ptr<VTitle> apVTitle(0); bool bAutoPositionDummy = true; @@ -2740,7 +2740,7 @@ void ChartView::createShapes() awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent( aSeriesPlotterContainer , xDiagramPlusAxes_Shapes , aAvailablePosDia ,aAvailableSizeForDiagram, aPageSize, bUseFixedInnerSize, xDiagram_MarkHandles ); - + if( xDiagram_OuterRect.is() ) { xDiagram_OuterRect->setPosition( awt::Point( aUsedOuterRect.X, aUsedOuterRect.Y ) ); @@ -2775,7 +2775,7 @@ void ChartView::createShapes() #if OSL_DEBUG_LEVEL > 0 clock_t nEnd = clock(); double fDuration =(double(nEnd-nStart)*1000.0)/double(CLOCKS_PER_SEC); - + OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< chart view :: createShapes():: needed %f msec", fDuration ); #endif } @@ -2822,7 +2822,7 @@ void ChartView::impl_updateView() m_bViewDirty = false; m_bViewUpdatePending = false; createShapes(); - + if( m_bViewDirty ) { //avoid recursions due to add-in @@ -2926,7 +2926,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) if( ChartView::getSdrPage() != pSdrHint->GetPage() ) bShapeChanged=false; } - + if(!bShapeChanged) return; diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index 476adae03674..1a37be330077 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,9 +75,9 @@ class ChartView : public ::cppu::WeakImplHelper9< , ::com::sun::star::datatransfer::XTransferable ,::com::sun::star::lang::XUnoTunnel //::com::sun::star::lang::XComponent ??? - //::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - //::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - //::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + //::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + //::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + //::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::util::XModifyListener ,::com::sun::star::util::XModeChangeBroadcaster ,::com::sun::star::util::XUpdatable @@ -165,7 +165,7 @@ public: virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory //----------------------------------------------------------------- @@ -237,7 +237,7 @@ private: //member bool volatile m_bViewDirty; //states wether the view needs to be rebuild bool volatile m_bInViewUpdate; bool volatile m_bViewUpdatePending; - bool volatile m_bRefreshAddIn; + bool volatile m_bRefreshAddIn; //better performance for big data ::com::sun::star::awt::Size m_aPageResolution; diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index e61096e5a0ba..6621969d15d4 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using ::basegfx::B2DTuple; //----------------------------------------------------------------------------- namespace{ -/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric +/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric value for an entering (dTE) or leaving (dTL) intersection point with one of the edges bounding the clipping area. For explanation of the parameters please refer to : @@ -61,83 +61,83 @@ namespace{ */ bool lcl_CLIPt(double fDenom,double fNum, double & fTE, double & fTL) { - double fT; - - if (fDenom > 0) // Intersection enters: PE + double fT; + + if (fDenom > 0) // Intersection enters: PE { - fT = fNum / fDenom; // Parametric value at the intersection. - if (fT > fTL) // fTE and fTL crossover - return false; // therefore reject the line. - else if (fT > fTE) // A new fTE has been found. + fT = fNum / fDenom; // Parametric value at the intersection. + if (fT > fTL) // fTE and fTL crossover + return false; // therefore reject the line. + else if (fT > fTE) // A new fTE has been found. fTE = fT; } - else if (fDenom < 0) // Intersection leaves: PL + else if (fDenom < 0) // Intersection leaves: PL { - fT = fNum / fDenom; // Parametric Value at the intersection. - if (fT < fTE) // fTE and fTL crossover - return false; // therefore reject the line. - else if (fT < fTL) // A new fTL has been found. + fT = fNum / fDenom; // Parametric Value at the intersection. + if (fT < fTE) // fTE and fTL crossover + return false; // therefore reject the line. + else if (fT < fTL) // A new fTL has been found. fTL = fT; } else if (fNum > 0) - return false; // Line lies on the outside of the edge. - + return false; // Line lies on the outside of the edge. + return true; } -/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle +/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle rRectangle. If there is at least a part of it visible then TRUE is returned and the endpoints of that part are stored in rP0 and rP1. The points rP0 and rP1 may have the same coordinates. - @param rP0 Start point of the line to clip. Modified to contain a start point inside + @param rP0 Start point of the line to clip. Modified to contain a start point inside the clipping area if possible. - @param rP1 End point of the line to clip. Modified to contain an end point inside + @param rP1 End point of the line to clip. Modified to contain an end point inside the clipping area if possible. - @param rRectangle Clipping area. - @return If the line lies completely or partly inside the clipping area then TRUE + @param rRectangle Clipping area. + @return If the line lies completely or partly inside the clipping area then TRUE is returned. If the line lies completely outside then FALSE is returned and rP0 and rP1 are left unmodified. */ bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRectangle) { - //Direction vector of the line. + //Direction vector of the line. B2DTuple aDirection = rPoint1 - rPoint0; if( aDirection.getX()==0 && aDirection.getY()==0 && rRectangle.isInside(rPoint0) ) { - // Degenerate case of a zero length line. + // Degenerate case of a zero length line. return true; } else { - // Values of the line parameter where the line enters resp. leaves the rectangle. + // Values of the line parameter where the line enters resp. leaves the rectangle. double fTE = 0, fTL = 1; - - // Test wether at least a part lies in the four half-planes with respect to - // the rectangles four edges. + + // Test wether at least a part lies in the four half-planes with respect to + // the rectangles four edges. if( lcl_CLIPt(aDirection.getX(), rRectangle.getMinX() - rPoint0.getX(), fTE, fTL) ) if( lcl_CLIPt(-aDirection.getX(), rPoint0.getX() - rRectangle.getMaxX(), fTE, fTL) ) if( lcl_CLIPt(aDirection.getY(), rRectangle.getMinY() - rPoint0.getY(), fTE, fTL) ) if( lcl_CLIPt(-aDirection.getY(), rPoint0.getY() - rRectangle.getMaxY(), fTE, fTL) ) { - // At least a part is visible. + // At least a part is visible. if (fTL < 1) { - // Compute the new end point. + // Compute the new end point. rPoint1.setX( rPoint0.getX() + fTL * aDirection.getX() ); rPoint1.setY( rPoint0.getY() + fTL * aDirection.getY() ); } if (fTE > 0) { - // Compute the new starting point. + // Compute the new starting point. rPoint0.setX( rPoint0.getX() + fTE * aDirection.getX() ); rPoint0.setY( rPoint0.getY() + fTE * aDirection.getY() ); } return true; } - - // Line is not visible. + + // Line is not visible. return false; } } @@ -220,7 +220,7 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg if(!rPolygon.SequenceX.getLength()) return; - + //need clipping?: { ::basegfx::B3DRange a3DRange( BaseGFXHelper::getBoundVolume( rPolygon ) ); diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index d59a011cd429..baf597dd214b 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( xTarget->add(xGroup); uno::Reference< drawing::XShapes > xGroupShapes = uno::Reference<drawing::XShapes>( xGroup, uno::UNO_QUERY ); - + ShapeFactory aShapeFactory(xShapeFactory); drawing::Position3D aPos(0,0,0); for(sal_Int32 nS=0;nS<ShapeFactory::getSymbolCount();nS++) diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 577f450172b5..8cf9da5ccd47 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 24ec5a285468..d03442b4ca77 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -454,7 +454,7 @@ void LabelPositionHelper::correctPositionForRotation( const uno::Reference< draw lcl_correctRotation_Left( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter ); break; case LABEL_ALIGN_RIGHT: - lcl_correctRotation_Right( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter ); + lcl_correctRotation_Right( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter ); break; case LABEL_ALIGN_TOP: lcl_correctRotation_Top( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter ); diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index 9292ee6eb757..785236873dbf 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx index 4e4cd342506c..6b409290785a 100644 --- a/chart2/source/view/main/NumberFormatterWrapper.cxx +++ b/chart2/source/view/main/NumberFormatterWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 08f43dc7064d..7a715010c28f 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos ) return false; if( ::rtl::math::isInf(rPos.PositionZ) ) return false; - return true; + return true; } //............................................................................. diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index deb390b70a79..c1f7ad4af7bb 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -393,7 +393,7 @@ void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleD double fTranslateY = fTranslate; double fTranslateZ = fTranslate; - double fScaleX = fScale; + double fScaleX = fScale; double fScaleY = fScale; double fScaleZ = fScale; @@ -421,7 +421,7 @@ void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleD aRet.translate(fTranslateX, fTranslateY, fTranslateZ);//x first aRet.scale(fScaleX, fScaleY, fScaleZ);//x first - + aRet = rMatrixScreenToScene * aRet; return aRet; } @@ -451,11 +451,11 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu double fStartAngleDegree = this->transformToAngleDegree( fStartLogicValueOnAngleAxis ); double fEndAngleDegree = this->transformToAngleDegree( fEndLogicValueOnAngleAxis ); double fWidthAngleDegree = fEndAngleDegree - fStartAngleDegree; - + if( ::rtl::math::approxEqual( fStartAngleDegree, fEndAngleDegree ) && !::rtl::math::approxEqual( fStartLogicValueOnAngleAxis, fEndLogicValueOnAngleAxis ) ) fWidthAngleDegree = 360.0; - + while(fWidthAngleDegree<0.0) fWidthAngleDegree+=360.0; while(fWidthAngleDegree>360.0) @@ -524,7 +524,7 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu double fY = m_bSwapXAndY ? getLogicMaxY() : fLogicValueOnRadiusAxis; if(bDoScaling) doLogicScaling( &fX, &fY, 0 ); - + fScaledLogicRadiusValue = m_bSwapXAndY ? fX : fY; bool bMinIsInnerRadius = true; @@ -544,7 +544,7 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu double fMin = m_bSwapXAndY ? MinX : MinY; double fMax = m_bSwapXAndY ? MaxX : MaxY; - + fInnerScaledLogicRadius = bMinIsInnerRadius ? fMin : fMax; fOuterScaledLogicRadius = bMinIsInnerRadius ? fMax : fMin; } @@ -596,7 +596,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou default: //NormalAxis_Z break; } - + //!! applying matrix to vector does ignore translation, so it is important to use a B3DPoint here instead of B3DVector ::basegfx::B3DPoint aPoint(fX,fY,fZ); ::basegfx::B3DPoint aRet = m_aUnitCartesianToScene * aPoint; @@ -606,7 +606,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling ) const { double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); - double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); + double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ, bDoScaling ); } diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 8e5402b48d63..c5be5aae4560 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForLogicV { double fUnitCircleAngleDegree = m_pPosHelper->transformToAngleDegree( fLogicValueOnAngleAxis ); double fUnitCircleRadius = m_pPosHelper->transformToRadius( fLogicValueOnRadiusAxis ); - + return getLabelScreenPositionAndAlignmentForUnitCircleValues( rAlignment, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE , fUnitCircleAngleDegree, 0.0 @@ -82,7 +82,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi { bool bCenter = (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) && (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::INSIDE); - + double fAngleDegree = fUnitCircleStartAngleDegree + fUnitCircleWidthAngleDegree/2.0; double fRadius = 0.0; if( !bCenter ) //e.g. for pure pie chart(one ring only) or for angle axis of polyar coordinate system @@ -92,7 +92,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi awt::Point aRet( this->transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) ); - + if(3==m_nDimensionCount && nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) { //check wether the upper or the downer edge is more distant from the center diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 1979582763fa..4fc2ad83d5b9 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -208,7 +208,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper // ( C2U( "CharEscapement" ), C2U("CharEscapement") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import // ( C2U( "CharEscapementHeight" ), C2U("CharEscapementHeight") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import // ( C2U( "CharFlash" ), C2U("Flashing") ) - + ( C2U( "CharFontFamily" ), C2U("CharFontFamily") ) ( C2U( "CharFontFamilyAsian" ), C2U("CharFontFamilyAsian") ) ( C2U( "CharFontFamilyComplex" ), C2U("CharFontFamilyComplex") ) @@ -224,7 +224,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper ( C2U( "CharFontStyleName" ), C2U("CharFontStyleName") ) ( C2U( "CharFontStyleNameAsian" ), C2U("CharFontStyleNameAsian") ) ( C2U( "CharFontStyleNameComplex" ),C2U("CharFontStyleNameComplex") ) - + ( C2U( "CharHeight" ), C2U("CharHeight") ) ( C2U( "CharHeightAsian" ), C2U("CharHeightAsian") ) ( C2U( "CharHeightComplex" ), C2U("CharHeightComplex") ) @@ -250,7 +250,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper ( C2U( "CharWordMode" ), C2U("CharWordMode") ) ( C2U( "WritingMode" ), C2U("WritingMode") ) - + // ( C2U( "RubyText" ), C2U("RubyText") ) // ( C2U( "RubyAdjust" ), C2U("RubyAdjust") ) // ( C2U( "RubyCharStyleName" ), C2U("RubyStyleName") ) @@ -442,7 +442,7 @@ void PropertyMapper::setMultiProperties( { aPropName = rNames[nN]; aValue = rValues[nN]; - + try { xTarget->setPropertyValue( aPropName, aValue ); diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 721cabd15d83..e4985fdaf5fe 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,7 +192,7 @@ uno::Any createPolyPolygon_Cube( const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0; - const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety + const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety const bool bRoundEdges = fRoundedEdge && fOffset < fWidthH && 2.0 * fOffset < fHeightSign*fHeight; const sal_Int32 nPointCount = bRoundEdges ? 13 : 5; @@ -631,7 +631,7 @@ uno::Reference<drawing::XShape> bool bInvertPolygon = false; bool bInvertNormals = false; - + if(bRotateZ) { //bars @@ -678,7 +678,7 @@ uno::Reference<drawing::XShape> aStripe3 = Stripe( aBottomP3, aTopP3, aTopP4, aBottomP4 ); aStripe4 = Stripe( aBottomP4, aTopP4, aTopP1, aBottomP1 ); } - + Stripe aNormalsStripe1( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP2, aNormalsTopP2 ); Stripe aNormalsStripe2( aNormalsTopP2, aNormalsBottomP2, aNormalsBottomP3, aNormalsTopP3 ); Stripe aNormalsStripe3( aNormalsTopP3, aNormalsBottomP3, aNormalsBottomP4, aNormalsTopP4 ); @@ -691,12 +691,12 @@ uno::Reference<drawing::XShape> aNormalsStripe3 = Stripe( aNormalsTopP4, aNormalsBottomP4, aNormalsBottomP3, aNormalsTopP3 ); aNormalsStripe4 = Stripe( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP4, aNormalsTopP4 ); } - + aStripe1.SetManualNormal( aNormalsStripe1.getNormal() ); aStripe2.SetManualNormal( aNormalsStripe2.getNormal() ); aStripe3.SetManualNormal( aNormalsStripe3.getNormal() ); aStripe4.SetManualNormal( aNormalsStripe4.getNormal() ); - + const bool bFlatNormals = false; ShapeFactory::createStripe( xGroup, aStripe1, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals ); ShapeFactory::createStripe( xGroup, aStripe2, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals ); @@ -731,7 +731,7 @@ uno::Reference<drawing::XShape> m_xShapeFactory->createInstance( C2U( "com.sun.star.drawing.Shape3DLatheObject") ), uno::UNO_QUERY ); xTarget->add(xShape); - + double fWidth = rSize.DirectionX/2.0; //The depth will be corrrected within Matrix double fRadius = fWidth; //!!!!!!!! problem in drawing layer: rotation object calculates wrong needed size -> wrong camera (it's a problem with bounding boxes) double fHeight = rSize.DirectionY; diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index 2df78e2a8e91..749c4b04b99f 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,7 +133,7 @@ uno::Any Stripe::getPolyPolygonShape3D() const drawing::Direction3D Stripe::getNormal() const { drawing::Direction3D aRet(1.0,0.0,0.0); - + if( m_bManualNormalSet ) aRet = m_aManualNormal; else @@ -212,7 +212,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -234,7 +234,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -256,7 +256,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -288,7 +288,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 1.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -310,7 +310,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 1.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 8bb6a11b4baf..44523c05a3d2 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -531,7 +531,7 @@ double VDataSeries::getBubble_Size( sal_Int32 index ) const bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); + rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); bool bHasNumberFormat = false; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); sal_Int32 nNumberFormat = -1; @@ -541,7 +541,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce } sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); + rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); sal_Int32 nNumberFormat = -1; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) @@ -628,7 +628,7 @@ double VDataSeries::getMinimumofAllDifferentYValues( sal_Int32 index ) const double fY_Max = getY_Max( index ); double fY_First = getY_First( index ); double fY_Last = getY_Last( index ); - + if(fMin>fY_First) fMin=fY_First; if(fMin>fY_Last) @@ -664,7 +664,7 @@ double VDataSeries::getMaximumofAllDifferentYValues( sal_Int32 index ) const double fY_Max = getY_Max( index ); double fY_First = getY_First( index ); double fY_Last = getY_Last( index ); - + if(fMax<fY_First) fMax=fY_First; if(fMax<fY_Last) diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 7101a984ee24..528263450e11 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -428,7 +428,7 @@ void lcl_placeLegendEntries( sal_Int32 nLegendWidth = -(nCurrentXPos-nXPadding); rOutLegendSize.Width = nLegendWidth; - awt::Point aPos(0,0); + awt::Point aPos(0,0); for( sal_Int32 nEntry=0; nEntry<nNumberOfEntries; nEntry++ ) { Reference< drawing::XShape > xSymbol( rEntries[ nEntry ].aSymbol ); @@ -757,7 +757,7 @@ void VLegend::createShapes( } bool bSymbolsLeftSide = lcl_shouldSymbolsBePlacedOnTheLeftSide( xLegendProp, m_nDefaultWritingMode ); - + // place entries awt::Size aLegendSize; lcl_placeLegendEntries( aViewEntries, eExpansion, bSymbolsLeftSide diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 9587b50f71e7..08c79404b3bb 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > m_xLegend; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 958a8defe0b6..13200fc2d1e4 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -247,7 +247,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( xResultGroup->add( xLine ); xLine->setSize( awt::Size( 0, 2000 )); xLine->setPosition( awt::Point( 1500, 0 )); - + lcl_setPropetiesToShape( xLegendEntryProperties, xLine, ePropertyType ); // PROP_TYPE_LINE_SERIES ); } } diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index dc8409a6891d..d131023a06c5 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ bool VLineProperties::isLineVisible() const bRet = true; } } - + return bRet; } diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index fd3037316cc6..9d82b289b046 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,18 +60,18 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; - + if( m_aPositionHelper.isSwapXAndY() ) std::swap(fScaledLogicAngle,fScaledLogicRadius); double fAngleDegree = m_aPositionHelper.transformToAngleDegree( fScaledLogicAngle, false ); double fAnglePi = fAngleDegree*F_PI/180.0; - double fRadius = m_aPositionHelper.transformToRadius( fScaledLogicRadius, false); + double fRadius = m_aPositionHelper.transformToRadius( fScaledLogicRadius, false); double fX=fRadius*cos(fAnglePi); double fY=fRadius*sin(fAnglePi); double fZ=rSourceValues[2]; - + //!! applying matrix to vector does ignore translation, so it is important to use a B3DPoint here instead of B3DVector ::basegfx::B3DPoint aPoint(fX,fY,fZ); ::basegfx::B3DPoint aRet = m_aUnitCartesianToScene * aPoint; diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index f62142735b7c..854b78503f77 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -209,7 +209,7 @@ void VTitle::createShapes( xTextCursor->gotoEnd(true); uno::Reference< beans::XPropertySet > xTargetProps( xShape, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xSourceProps( aStringList[0], uno::UNO_QUERY ); - + PropertyMapper::setMappedProperties( xTargetProps, xSourceProps , PropertyMapper::getPropertyNameMapForCharacterProperties() ); diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 8a6e7d6e4f16..f4047e671f1b 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 26f8b9d7cf7e..6f384df19295 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 788dac2fc90b..c609d2daa52b 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -116,7 +116,7 @@ <menu:menuitem menu:id=".uno:DiagramType" menu:helpid="30528" menu:label="" /> <menu:menuitem menu:id=".uno:DataRanges" menu:helpid="30514" menu:label="" /> <menu:menuitem menu:id=".uno:View3D" menu:helpid="30527" menu:label="" /> - + </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ToolsMenu" menu:label="" > diff --git a/chart2/uiconfig/toolbar/arrowshapes.xml b/chart2/uiconfig/toolbar/arrowshapes.xml index 4a53519494ea..17b654bd2b25 100644 --- a/chart2/uiconfig/toolbar/arrowshapes.xml +++ b/chart2/uiconfig/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/chart2/uiconfig/toolbar/basicshapes.xml b/chart2/uiconfig/toolbar/basicshapes.xml index e65778305788..bd4b96708264 100644 --- a/chart2/uiconfig/toolbar/basicshapes.xml +++ b/chart2/uiconfig/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/chart2/uiconfig/toolbar/flowchartshapes.xml b/chart2/uiconfig/toolbar/flowchartshapes.xml index bb1d1099dbd4..556445479b6e 100644 --- a/chart2/uiconfig/toolbar/flowchartshapes.xml +++ b/chart2/uiconfig/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/chart2/uiconfig/toolbar/symbolshapes.xml b/chart2/uiconfig/toolbar/symbolshapes.xml index 0fa6aee313db..272a9dbba702 100644 --- a/chart2/uiconfig/toolbar/symbolshapes.xml +++ b/chart2/uiconfig/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index a986dd9557c7..a7f7783e99f0 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ void * SAL_CALL component_getFactory( return pRet; } -} // extern C +} // extern C // -------------------- @@ -110,7 +110,7 @@ void * SAL_CALL component_getFactory( SampleAddIn::SampleAddIn() { - + } SampleAddIn::~SampleAddIn() @@ -151,7 +151,7 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx if( bVertical ) { aOutPosition.X = aPos.X; - aOutPosition.Y = static_cast<sal_Int32>(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom + aOutPosition.Y = static_cast<sal_Int32>(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom } else { @@ -294,7 +294,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) { uno::Any aColor, aWidth; aColor <<= (sal_Int32)(0xe01010); - aWidth <<= (sal_Int32)(50); // 0.5 mm + aWidth <<= (sal_Int32)(50); // 0.5 mm try { xShapeProp->setPropertyValue( OUString::createFromAscii( "LineColor" ), aColor ); @@ -314,9 +314,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) // change text OUString aText; -// if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE"))) -// aText = OUString::createFromAscii( "Kleines Beispiel" ); -// else +// if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE"))) +// aText = OUString::createFromAscii( "Kleines Beispiel" ); +// else aText = OUString::createFromAscii( "Little Example" ); uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY ); @@ -354,9 +354,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) // get row count == length of each series sal_Int32 nSize = aData.getLength(); sal_Int32 nMiddle = nSize / 2; - // get value for first series - double fMiddleVal = xData->getNotANumber(); // set to NaN - if( aData[ nMiddle ].getLength()) // we have at least one series + // get value for first series + double fMiddleVal = xData->getNotANumber(); // set to NaN + if( aData[ nMiddle ].getLength()) // we have at least one series fMiddleVal = aData[ nMiddle ][ 0 ]; awt::Point aPos; @@ -394,28 +394,28 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) } // set axis scale to 200 -// uno::Reference< beans::XPropertySet > xXAxis( getXAxis(), uno::UNO_QUERY ); -// if( xXAxis.is()) -// { -// uno::Any aAny; -// aAny <<= (sal_Bool)(sal_False); -// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ), -// aAny ); -// aAny <<= (double)(200.0); -// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ), -// aAny ); -// } +// uno::Reference< beans::XPropertySet > xXAxis( getXAxis(), uno::UNO_QUERY ); +// if( xXAxis.is()) +// { +// uno::Any aAny; +// aAny <<= (sal_Bool)(sal_False); +// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ), +// aAny ); +// aAny <<= (double)(200.0); +// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ), +// aAny ); +// } // try setting symbols -// uno::Reference< beans::XPropertySet > xProp = getDataRowProperties( 0 ); -// if( xProp.is()) -// { -// uno::Any aAny; -// aAny <<= (sal_Int32)(-1); -// xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny ); -// aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" ); -// xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny ); -// } +// uno::Reference< beans::XPropertySet > xProp = getDataRowProperties( 0 ); +// if( xProp.is()) +// { +// uno::Any aAny; +// aAny <<= (sal_Int32)(-1); +// xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny ); +// aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" ); +// xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny ); +// } } void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >& ) diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx index 59b1ab32c8f1..91de93f64628 100644 --- a/chart2/workbench/addin/sampleaddin.hxx +++ b/chart2/workbench/addin/sampleaddin.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public: virtual ~SampleAddIn(); // class specific code - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); sal_Bool getLogicalPosition( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xAxis, @@ -158,4 +158,4 @@ public: throw( ::com::sun::star::uno::RuntimeException ); }; -#endif // _SAMPLEADDIN_HXX_ +#endif // _SAMPLEADDIN_HXX_ |