summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /chart2
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx14
-rw-r--r--chart2/source/controller/main/ChartController.cxx8
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx6
-rw-r--r--chart2/source/glew/glew.cxx40
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx2
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx4
-rw-r--r--chart2/source/tools/LifeTime.cxx2
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.cxx4
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx2
9 files changed, 41 insertions, 41 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index dd09bd7a3694..8fa152a4fcc4 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -1074,7 +1074,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
long nYPos = m_nYTopPos;
- //------
+
bool bShow = rTypeController.shouldShow_XAxisTypeControl();
long nXPos = m_pAxisTypeResourceGroup->getPosition().X();
m_pAxisTypeResourceGroup->showControls( bShow );
@@ -1083,7 +1083,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pAxisTypeResourceGroup->setPosition( Point( nXPos, nYPos ) );
nYPos += m_pAxisTypeResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
bShow = rTypeController.shouldShow_3DLookControl();
m_pDim3DLookResourceGroup->showControls( bShow );
if(bShow)
@@ -1091,7 +1091,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pDim3DLookResourceGroup->setPosition( Point( nXPos, nYPos ) );
nYPos += m_pDim3DLookResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
bShow = rTypeController.shouldShow_StackingControl();
m_pStackingResourceGroup->showControls( bShow, rTypeController.shouldShow_DeepStackingControl() );
if(bShow)
@@ -1102,7 +1102,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pStackingResourceGroup->setPosition( Point( nStackingXPos, nYPos ) );
nYPos += m_pStackingResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
bShow = rTypeController.shouldShow_SplineControl();
m_pSplineResourceGroup->showControls( bShow );
if(bShow)
@@ -1110,7 +1110,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pSplineResourceGroup->setPosition( Point( nXPos, nYPos ) );
nYPos += m_pSplineResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
bShow = rTypeController.shouldShow_GeometryControl();
m_pGeometryResourceGroup->showControls( bShow );
if(bShow)
@@ -1118,7 +1118,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pGeometryResourceGroup->setPosition( Point( nXPos+17, nYPos ) );
nYPos += m_pGeometryResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
m_pSortByXValuesResourceGroup->showControls( bShow );
if(bShow)
@@ -1126,7 +1126,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
m_pSortByXValuesResourceGroup->setPosition( Point( nXPos, nYPos ) );
nYPos += m_pSortByXValuesResourceGroup->getHeight() + lcl_getDistance();
}
- //------
+
Size aPageSize( this->GetSizePixel() );
Size aRemainingSize = Size( aPageSize.Width()-nXPos, aPageSize.Height()-nYPos );
rTypeController.showExtraControls( this, Point( nXPos, nYPos ), aRemainingSize );
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b8ceebf2386b..f52c435684f1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -58,17 +58,17 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <com/sun/star/document/XUndoAction.hpp>
-//-------
+
// header for define RET_OK
#include <vcl/msgbox.hxx>
-//-------
-//-------
+
+
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-//-------
+
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index f51dd49efe85..9b75609a020d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1022,7 +1022,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand );
//some commands for dataseries and points:
- //-----
+
if( OBJECTTYPE_DATA_SERIES == eObjectType || OBJECTTYPE_DATA_POINT == eObjectType )
{
bool bIsPoint = ( OBJECTTYPE_DATA_POINT == eObjectType );
@@ -1179,7 +1179,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
//some commands for axes: and grids
- //-----
+
else if( OBJECTTYPE_AXIS == eObjectType || OBJECTTYPE_GRID == eObjectType || OBJECTTYPE_SUBGRID == eObjectType )
{
Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() );
@@ -1247,7 +1247,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasLegend )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteLegend" );
}
- //-----
+
xPopupMenu->insertSeparator( -1 );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramType" );
diff --git a/chart2/source/glew/glew.cxx b/chart2/source/glew/glew.cxx
index d075b5248836..441f3ee2def1 100644
--- a/chart2/source/glew/glew.cxx
+++ b/chart2/source/glew/glew.cxx
@@ -4,24 +4,24 @@
** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
** Copyright (C) 2002, Lev Povalahev
** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
+**
+** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are met:
-**
-** * Redistributions of source code must retain the above copyright notice,
+**
+** * Redistributions of source code must retain the above copyright notice,
** this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright notice,
-** this list of conditions and the following disclaimer in the documentation
+** * Redistributions in binary form must reproduce the above copyright notice,
+** this list of conditions and the following disclaimer in the documentation
** and/or other materials provided with the distribution.
-** * The name of the author may be used to endorse or promote products
+** * The name of the author may be used to endorse or promote products
** derived from this software without specific prior written permission.
**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
@@ -102,7 +102,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
{
static void* image = NULL;
void* addr;
- if (NULL == image)
+ if (NULL == image)
{
#ifdef GLEW_REGAL
image = dlopen("libRegal.dylib", RTLD_LAZY);
@@ -9469,7 +9469,7 @@ static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT)
/* ------------------------------------------------------------------------- */
GLboolean GLEWAPIENTRY glewGetExtension (const char* name)
-{
+{
const GLubyte* start;
const GLubyte* end;
start = (const GLubyte*)glGetString(GL_EXTENSIONS);
@@ -9496,7 +9496,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
dot = _glewStrCLen(s, '.');
if (dot == 0)
return GLEW_ERROR_NO_GL_VERSION;
-
+
major = s[dot-1]-'0';
minor = s[dot+1]-'0';
@@ -9504,7 +9504,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
minor = 0;
if (major<0 || major>9)
return GLEW_ERROR_NO_GL_VERSION;
-
+
if (major == 1 && minor == 0)
{
@@ -9521,12 +9521,12 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
CONST_CAST(GLEW_VERSION_3_2) = GLEW_VERSION_3_3 == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_3_1) = GLEW_VERSION_3_2 == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_3_0) = GLEW_VERSION_3_1 == GL_TRUE || ( major == 3 ) ? GL_TRUE : GL_FALSE;
- CONST_CAST(GLEW_VERSION_2_1) = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+ CONST_CAST(GLEW_VERSION_2_1) = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_2_0) = GLEW_VERSION_2_1 == GL_TRUE || ( major == 2 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_1_5) = GLEW_VERSION_2_0 == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_1_4) = GLEW_VERSION_1_5 == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_1_3) = GLEW_VERSION_1_4 == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
- CONST_CAST(GLEW_VERSION_1_2_1) = GLEW_VERSION_1_3 == GL_TRUE ? GL_TRUE : GL_FALSE;
+ CONST_CAST(GLEW_VERSION_1_2_1) = GLEW_VERSION_1_3 == GL_TRUE ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_1_2) = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
CONST_CAST(GLEW_VERSION_1_1) = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
}
@@ -12099,7 +12099,7 @@ static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL;
static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL;
GLboolean GLEWAPIENTRY wglewGetExtension (const char* name)
-{
+{
const GLubyte* start;
const GLubyte* end;
if (_wglewGetExtensionsStringARB == NULL)
@@ -13164,7 +13164,7 @@ static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
/* ------------------------------------------------------------------------ */
GLboolean glxewGetExtension (const char* name)
-{
+{
const GLubyte* start;
const GLubyte* end;
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 443101d3556e..66f3830ca9af 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -48,7 +48,7 @@ void DataPointProperties::AddPropertiesToVector(
// DataPointProperties
// Common
- // ------
+
rOutProperties.push_back(
Property( "Color",
PROP_DATAPOINT_COLOR,
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 6db8a268f49d..9c7fd8e26452 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -203,7 +203,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
nNumberOfColumns = nNumberOfSeries - nNumberOfLines;
// Columns
- // -------
+
Reference< XChartType > xCT(
xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW );
@@ -223,7 +223,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
}
// Lines
- // -----
+
xCT.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW );
xCTCnt.set( rCoordSys[ 0 ], uno::UNO_QUERY_THROW );
xCTCnt->addChartType( xCT );
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 877718ffdf22..ab47d1a0a134 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -342,7 +342,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
if( m_bDisposed || m_bInDispose )
return; //behave as passive as possible, if disposed or closed already
- //--------
+
m_bClosed = sal_True;
NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex );
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 55a8c8d41bb2..332600ad5485 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -102,10 +102,10 @@ EquidistantTickFactory::EquidistantTickFactory(
fMax = m_fScaledVisibleMax;
}
- //--
+
m_fOuterMajorTickBorderMin = EquidistantTickFactory::getMinimumAtIncrement( fMin, m_rIncrement );
m_fOuterMajorTickBorderMax = EquidistantTickFactory::getMaximumAtIncrement( fMax, m_rIncrement );
- //--
+
m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index da8fe4913743..db67c0140d38 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -124,7 +124,7 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,false);
ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, false );
- //--
+
ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH);
ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,false);
ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,false);