summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorElton Chung <elton@layerjet.com>2012-02-18 12:37:04 +0800
committerMichael Meeks <michael.meeks@suse.com>2012-02-18 09:35:43 +0000
commit23af031b09dffe37222517d69f5337db26fdb307 (patch)
treeae1219ec20ccacd0fe9fdc0fc539e5b8f41420d3 /chart2
parent78e9ba6febb7402d4661fbf7934a2526efc8629a (diff)
Fix typos in comments
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx2
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx6
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx6
-rw-r--r--chart2/source/inc/chartview/ExplicitScaleValues.hxx4
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx2
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx2
-rw-r--r--chart2/source/view/charttypes/BarChart.hxx2
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx4
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx2
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx2
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx10
-rw-r--r--chart2/source/view/main/ChartView.hxx2
-rw-r--r--chart2/source/view/main/Clipping.cxx2
-rw-r--r--chart2/source/view/main/PolarLabelPositionHelper.cxx2
-rw-r--r--chart2/source/view/main/VLegend.cxx2
20 files changed, 30 insertions, 30 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index fad41f051074..8a3da3f60436 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -240,7 +240,7 @@ void DrawViewWrapper::MarkObject( SdrObject* pObj )
if( m_pMarkHandleProvider )
bFrameDragSingles = m_pMarkHandleProvider->getFrameDragSingles();
- this->SetFrameDragSingles(bFrameDragSingles);//decide wether each single object should get handles
+ this->SetFrameDragSingles(bFrameDragSingles);//decide whether each single object should get handles
this->SdrView::MarkObj( pObj, this->GetPageView() );
this->showMarkHandles();
}
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 4b285dc640ec..54345303f9f5 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -250,7 +250,7 @@ const short HITPIX=2; //hit-tolerance in pixel
Size aLogicSize = m_pChartWindow->PixelToLogic( Size( Width, Height ), MapMode( MAP_100TH_MM ) );
bool bIsEmbedded = true;
- //todo: for standalone chart: detect wether we are standalone
+ //todo: for standalone chart: detect whether we are standalone
if( bIsEmbedded )
{
//change map mode to fit new size
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 61b4c305b8c7..ad046b5e37d8 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -61,7 +61,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
if( OBJECTTYPE_TITLE==eObjectType )
{
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
chart2::RelativePosition aRelativePosition;
aRelativePosition.Anchor = drawing::Alignment_CENTER;
//the anchor point at the title object is top/middle
@@ -72,7 +72,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
}
else if( OBJECTTYPE_DATA_CURVE_EQUATION==eObjectType )
{
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
chart2::RelativePosition aRelativePosition;
aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
//the anchor point at the title object is top/middle
@@ -113,7 +113,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
}
else if(OBJECTTYPE_DIAGRAM==eObjectType || OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType)
{
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
//set position:
chart2::RelativePosition aRelativePosition;
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 256354a6c3e3..644ab36ff235 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -273,7 +273,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
m_aSelectedOID = ObjectIdentifier( aPageCID );
}
- //check wether the diagram was hit but not selected (e.g. because it has no filling):
+ //check whether the diagram was hit but not selected (e.g. because it has no filling):
rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
@@ -290,7 +290,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
}
}
}
- //check wether the legend was hit but not selected (e.g. because it has no filling):
+ //check whether the legend was hit but not selected (e.g. because it has no filling):
if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) )
{
rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
@@ -560,7 +560,7 @@ SdrObject* SelectionHelper::getObjectToMark()
E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
{
- //search wether the object or one of its children is a 3D object
+ //search whether the object or one of its children is a 3D object
//if so, return the accessory 3DScene
E3dObject* pRotateable = 0;
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index bf43ae788954..08e1bec7f2a9 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -113,13 +113,13 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData
before a scaling is applied, which may lead to non equidistant tickmarks
on the screen.</p>
- <p><member>PostEquidistant</member> rules wether the <member>Distance</member>
+ <p><member>PostEquidistant</member> rules whether the <member>Distance</member>
is meant to be a value before or after scaling.</p>
*/
double Distance;
/**
- <member>PostEquidistant</member> rules wether the member <member>Distance</member>
+ <member>PostEquidistant</member> rules whether the member <member>Distance</member>
describes a distance before or after the scaling is applied.
<p>If <member>PostEquidistant</member> equals <TRUE/> <member>Distance</member>
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0ab069be4d67..d8718825b3df 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -634,7 +634,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
uno::Reference< uno::XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
//the listeners have had no veto
- //check wether we self can close
+ //check whether we self can close
{
util::CloseVetoException aVetoException = util::CloseVetoException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 6e1a9132c9ac..e97e82d00169 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -258,7 +258,7 @@ void SAL_CALL ChartModel::store()
if( aLocation.isEmpty() )
throw io::IOException( C2U( "no location specified" ), static_cast< ::cppu::OWeakObject* >(this));
- //@todo check wether aLocation is something like private:factory...
+ //@todo check whether aLocation is something like private:factory...
if( m_bReadOnly )
throw io::IOException( C2U( "document is read only" ), static_cast< ::cppu::OWeakObject* >(this));
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index c19335435224..4f8162acb37c 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -161,7 +161,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
if( xProp.is() && !( xProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) )
{
bool bFormatSet = false;
- //check wether we have a percent scale -> use percent format
+ //check whether we have a percent scale -> use percent format
if( xNumberFormatsSupplier.is() )
{
ScaleData aData = AxisHelper::getDateCheckedScale( xAxis, Reference< frame::XModel >( xNumberFormatsSupplier, uno::UNO_QUERY ) );
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 9e57ee4b5c65..3cb8de727ed3 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -86,7 +86,7 @@ struct AxisLabelProperties
double fRotationAngleDegree;
sal_Int32 nRhythm; //show only each nth label with n==nRhythm
- bool bRhythmIsFix; //states wether the given rhythm is fix or may be changed
+ bool bRhythmIsFix; //states whether the given rhythm is fix or may be changed
//methods:
void init( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 2beca1158479..b7dc757a6486 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -586,7 +586,7 @@ void BarChart::createShapes()
bDrawConnectionLines = false;
if( bDrawConnectionLines && pSeriesList->size()==1 )
{
- //detect wether we have a stacked chart or not:
+ //detect whether we have a stacked chart or not:
StackingDirection eDirection = pSeries->getStackingDirection();
if( eDirection != StackingDirection_Y_STACKING )
bDrawConnectionLines = false;
diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx
index 93816beb33ae..68a8db8af201 100644
--- a/chart2/source/view/charttypes/BarChart.hxx
+++ b/chart2/source/view/charttypes/BarChart.hxx
@@ -80,7 +80,7 @@ private: //methods
, double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue
, BarPositionHelper* pPosHelper ) const;
- virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates wether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 )
+ virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 )
void adaptOverlapAndGapwidthForGroupBarsPerAxis();
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6af1d3d11445..82cec0cc9bf3 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -447,7 +447,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
m_pShapeFactory->createGroup2D( this->getLabelsGroupShape(rDataSeries, xTarget)
, ObjectIdentifier::createPointCID( rDataSeries.getLabelCID_Stub(),nPointIndex ) ) );
- //check wether the label needs to be created and how:
+ //check whether the label needs to be created and how:
DataPointLabel* pLabel = rDataSeries.getDataPointLabelIfLabel( nPointIndex );
if( !pLabel )
@@ -1113,7 +1113,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
chart2::RelativePosition aRelativePosition;
if( xEquationProperties->getPropertyValue( C2U("RelativePosition")) >>= aRelativePosition )
{
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
double fX = aRelativePosition.Primary*m_aPageReferenceSize.Width;
double fY = aRelativePosition.Secondary*m_aPageReferenceSize.Height;
aScreenPosition2D.X = static_cast< sal_Int32 >( ::rtl::math::round( fX ));
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index f4b5e380d8b0..4efe6288873f 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -165,7 +165,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
+ typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis
//
::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index a7738e7f54f4..55e0a9692172 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -218,7 +218,7 @@ private: //member
::com::sun::star::chart2::StackingDirection m_eStackingDirection;
- sal_Int32 m_nAxisIndex;//indicates wether this is attached to a main or secondary axis
+ sal_Int32 m_nAxisIndex;//indicates whether this is attached to a main or secondary axis
sal_Bool m_bConnectBars;
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 53cabce9ecc4..00996a11a12f 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -407,7 +407,7 @@ protected: //methods
, const tPropertyNameMap& rMap
, tPropertyNameValueMap* pOverwriteMap=0 );
- virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates wether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 )
+ virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 )
VDataSeries* getFirstSeries() const;
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 1750879eaef0..9297cef1b779 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -443,7 +443,7 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem
return 0;
}
-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< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis
typedef std::pair< VCoordinateSystem* , tFullAxisIndex > tFullCoordinateSystem;
typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap;
@@ -1881,7 +1881,7 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
ExplicitValueProvider* pExplicitValueProvider = ExplicitValueProvider::getExplicitValueProvider(xChartView);
if( pExplicitValueProvider )
{
- //detect wether x axis points into x direction or not
+ //detect whether x axis points into x direction or not
if( lcl_getPropertySwapXAndYAxis( ChartModelHelper::findDiagram( xChartModel ) ) )
{
std::swap( xTitle_Height, xTitle_Width );
@@ -1948,7 +1948,7 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
ExplicitValueProvider* pExplicitValueProvider = ExplicitValueProvider::getExplicitValueProvider(xChartView);
if( pExplicitValueProvider )
{
- //detect wether x axis points into x direction or not
+ //detect whether x axis points into x direction or not
if( lcl_getPropertySwapXAndYAxis( ChartModelHelper::findDiagram( xChartModel ) ) )
{
std::swap( xTitle_Height, xTitle_Width );
@@ -2046,7 +2046,7 @@ bool getAvailablePosAndSizeForDiagram(
chart2::RelativePosition aRelativePosition;
if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) )
{
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
//the coordinates re relative to the page
double fX = aRelativePosition.Primary*rPageSize.Width;
@@ -2178,7 +2178,7 @@ std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
{
rbAutoPosition = false;
- //@todo decide wether x is primary or secondary
+ //@todo decide whether x is primary or secondary
double fX = aRelativePosition.Primary*rPageSize.Width;
double fY = aRelativePosition.Secondary*rPageSize.Height;
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index a7aec605e89b..32beb467e791 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -235,7 +235,7 @@ private: //member
::cppu::OMultiTypeInterfaceContainerHelper
m_aListenerContainer;
- bool volatile m_bViewDirty; //states wether the view needs to be rebuild
+ bool volatile m_bViewDirty; //states whether the view needs to be rebuild
bool volatile m_bInViewUpdate;
bool volatile m_bViewUpdatePending;
bool volatile m_bRefreshAddIn;
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index 667e9544a123..d2fc334de1cb 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -113,7 +113,7 @@ bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRecta
double fTE = 0,
fTL = 1;
- // Test wether at least a part lies in the four half-planes with respect to
+ // Test whether 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) )
diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index c62215b2efc2..dbce1afba98d 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -94,7 +94,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
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
+ //check whether the upper or the downer edge is more distant from the center
//take the farest point to put the label to
awt::Point aP0( this->transformSceneToScreenPosition(
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 469ab95f50d0..bd575c284a3d 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -358,7 +358,7 @@ awt::Size lcl_placeLegendEntries(
nCurrentColumn++;
if( nCurrentColumn < nCurrentColumnCount )
{
- //check wether the current column width is sufficient for the new entry
+ //check whether the current column width is sufficient for the new entry
if( aColumnWidths[nCurrentColumn]>=nNewWidth )
{
//all good proceed with next entry