translated and spell corrected a few comments in the view code
This commit is contained in:
parent
6ba10b3d12
commit
f138f887f6
4 changed files with 22 additions and 22 deletions
|
@ -132,11 +132,11 @@ ChartItemPool::ChartItemPool():
|
||||||
ppPoolDefaults[SCHATTR_STYLE_LINES - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_LINES, 0);
|
ppPoolDefaults[SCHATTR_STYLE_LINES - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_LINES, 0);
|
||||||
ppPoolDefaults[SCHATTR_STYLE_PERCENT - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_PERCENT, 0);
|
ppPoolDefaults[SCHATTR_STYLE_PERCENT - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_PERCENT, 0);
|
||||||
ppPoolDefaults[SCHATTR_STYLE_STACKED - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_STACKED, 0);
|
ppPoolDefaults[SCHATTR_STYLE_STACKED - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_STACKED, 0);
|
||||||
ppPoolDefaults[SCHATTR_STYLE_SPLINES - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SPLINES, 0); //Bug: war Bool! ->Fileformat testen (betrifft nur 5er)
|
ppPoolDefaults[SCHATTR_STYLE_SPLINES - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SPLINES, 0); //Bug: was Bool! test ->Fileformat (touches only 5's)
|
||||||
ppPoolDefaults[SCHATTR_STYLE_SYMBOL - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SYMBOL, 0);
|
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_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-Axis!!!
|
||||||
|
|
||||||
ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN);
|
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_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN);
|
||||||
|
|
|
@ -622,7 +622,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
|
||||||
const uno::Reference< frame::XModel >& xChartModel )
|
const uno::Reference< frame::XModel >& xChartModel )
|
||||||
{
|
{
|
||||||
//------------ get model series from model
|
//------------ get model series from model
|
||||||
sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported
|
sal_Int32 nDiagramIndex = 0;//todo if more than one diagram is supported
|
||||||
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
|
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
|
||||||
if( !xDiagram.is())
|
if( !xDiagram.is())
|
||||||
return;
|
return;
|
||||||
|
@ -700,7 +700,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
|
||||||
if(pVCooSys)
|
if(pVCooSys)
|
||||||
pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
|
pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
|
||||||
|
|
||||||
//------------ add series to plotter and thus prepare him for providing minimum and maximum values
|
//------------ add series to plotter and thus prepare him(it) for providing minimum and maximum values
|
||||||
uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
|
uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
|
||||||
OSL_ASSERT( xDataSeriesContainer.is());
|
OSL_ASSERT( xDataSeriesContainer.is());
|
||||||
if( !xDataSeriesContainer.is() )
|
if( !xDataSeriesContainer.is() )
|
||||||
|
@ -861,7 +861,7 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
|
||||||
|
|
||||||
void SeriesPlotterContainer::setNumberFormatsFromAxes()
|
void SeriesPlotterContainer::setNumberFormatsFromAxes()
|
||||||
{
|
{
|
||||||
//set numberfarmats to plotter to enable them to display the data labels in the numberfromat of teh axis
|
//set numberformats to plotter to enable them to display the data labels in the numberformat of the axis
|
||||||
|
|
||||||
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
|
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
|
||||||
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
|
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
|
||||||
|
@ -1852,7 +1852,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
|
||||||
|
|
||||||
if( nDimensionIndex == 1 )
|
if( nDimensionIndex == 1 )
|
||||||
{
|
{
|
||||||
//only take those series into accoutn that are attached to this axis
|
//only take those series into account that are attached to this axis
|
||||||
sal_Int32 nAttachedAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
|
sal_Int32 nAttachedAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
|
||||||
if( nAttachedAxisIndex != nAxisIndex )
|
if( nAttachedAxisIndex != nAxisIndex )
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -176,22 +176,22 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//set some properties from service style::CharacterProperties:
|
//set some properties from service style::CharacterProperties:
|
||||||
//-------- tabpage: Zeichen -----------
|
//-------- tabpage: Characters -----------
|
||||||
//Schriftart z.B. Albany UNO_NAME_EDIT_CHAR_FONTNAME == UNO_NAME_EDIT_CHAR_FONTSTYLENAME //UNO_NAME_CHAR_FONT
|
//FontType eg. Albany UNO_NAME_EDIT_CHAR_FONTNAME == UNO_NAME_EDIT_CHAR_FONTSTYLENAME //UNO_NAME_CHAR_FONT
|
||||||
//Schriftschnitt z.B. kursiv UNO_NAME_EDIT_CHAR_POSTURE UNO_NAME_CHAR_POSTURE awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
|
//FontStyle eg. italic UNO_NAME_EDIT_CHAR_POSTURE UNO_NAME_CHAR_POSTURE awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
|
||||||
//Schriftgrad (Punktgrösse z.B. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
|
//Fontsize (Pointsize eg. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
|
||||||
//? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
|
//? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
|
||||||
//Sprache UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
|
//Language UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
|
||||||
|
|
||||||
//-------- tabpage: Schrifteffekt -----------
|
//-------- tabpage: Font Effect -----------
|
||||||
//Unterstreichung UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE _SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
|
//Underline UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE _SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
|
||||||
//Unterstreichung-farbe ??? 'CharUnderlineColor' + CharUnderlineHasColor
|
//Underline-color ??? 'CharUnderlineColor' + CharUnderlineHasColor
|
||||||
//Durchstreichung z.B. doppelt "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE _DOUBLE ...
|
//Strikeout eg. double "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE _DOUBLE ...
|
||||||
//wortweise-Durchstreichung ja/nein "CharWordMode" bool
|
//Strikeout by word yes/no "CharWordMode" bool
|
||||||
//Schriftfarbe UNO_NAME_EDIT_CHAR_COLOR sal_Int32 UNO_NAME_CHAR_COLOR
|
//Fontcolor UNO_NAME_EDIT_CHAR_COLOR sal_Int32 UNO_NAME_CHAR_COLOR
|
||||||
//ReliefArt ohne/erhaben/tief "CharRelief" sal_Int16 text::FontRelief_NONE FontRelief_EMBOSSED FontRelief_ENGRAVED
|
//ReliefType without/graved/emboss "CharRelief" sal_Int16 text::FontRelief_NONE FontRelief_EMBOSSED FontRelief_ENGRAVED
|
||||||
//Kontur "CharContoured" bool
|
//Outline "CharContoured" bool
|
||||||
//Schatten UNO_NAME_CHAR_SHADOWED bool
|
//Shadows UNO_NAME_CHAR_SHADOWED bool
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//static
|
//static
|
||||||
|
|
|
@ -299,7 +299,7 @@ void VDataSeries::doSortByXValues()
|
||||||
{
|
{
|
||||||
if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() )
|
if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() )
|
||||||
{
|
{
|
||||||
//prepare a vector vor sorting
|
//prepare a vector for sorting
|
||||||
std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of athe point
|
std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of athe point
|
||||||
double fNan;
|
double fNan;
|
||||||
::rtl::math::setNan( & fNan );
|
::rtl::math::setNan( & fNan );
|
||||||
|
@ -315,7 +315,7 @@ void VDataSeries::doSortByXValues()
|
||||||
//do sort
|
//do sort
|
||||||
std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
|
std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
|
||||||
|
|
||||||
//fill the sorted points back to the mambers
|
//fill the sorted points back to the members
|
||||||
m_aValues_X.Doubles.realloc( m_nPointCount );
|
m_aValues_X.Doubles.realloc( m_nPointCount );
|
||||||
m_aValues_Y.Doubles.realloc( m_nPointCount );
|
m_aValues_Y.Doubles.realloc( m_nPointCount );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue