summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
commit258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch)
tree812254806beb1a7af7271469e7148b667b2d96de /chart2/source/view/axes
parentbc212c565cdc252d2a01e5221a75868b3f01d230 (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/source/view/axes')
-rw-r--r--chart2/source/view/axes/MinimumAndMaximumSupplier.cxx2
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx4
-rw-r--r--chart2/source/view/axes/TickmarkHelper.cxx6
-rw-r--r--chart2/source/view/axes/TickmarkHelper.hxx4
-rw-r--r--chart2/source/view/axes/TickmarkProperties.hxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx4
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx4
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.hxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx12
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx46
-rw-r--r--chart2/source/view/axes/VCartesianAxis.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx6
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx8
-rw-r--r--chart2/source/view/axes/VCartesianGrid.hxx2
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx18
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx12
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.cxx10
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.hxx2
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx10
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx6
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx4
28 files changed, 92 insertions, 92 deletions
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 );