Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


hi' Libre Office mailing list,

I've looked through the calc's chart2 source and translated and spell
corrected a few
comments in the view code

in the ChartItemPool I've added the use of SAL_N_ELEMENTS(array) too

greetings
René Kjellerup
(aka Katana Steel)
-- 
-- as life grows older, I gain experience.
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index face424..f3b6205 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -131,11 +131,11 @@ ChartItemPool::ChartItemPool():
     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_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_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_MIN                            - SCHATTR_START] = new 
SvxDoubleItem(0.0, SCHATTR_AXIS_MIN);
@@ -201,7 +201,7 @@ ChartItemPool::ChartItemPool():
     pItemInfos = new SfxItemInfo[SCHATTR_END - SCHATTR_START + 1];
 
     USHORT i;
-    for( i = SCHATTR_START; i <= SCHATTR_END; i++ )
+    for( i = SCHATTR_START; i <= SAL_N_ELEMENTS(pItemInfos); i++ )
     {
         pItemInfos[i - SCHATTR_START]._nSID = 0;
         pItemInfos[i - SCHATTR_START]._nFlags = SFX_ITEM_POOLABLE;
@@ -229,7 +229,7 @@ ChartItemPool::~ChartItemPool()
 
     delete[] pItemInfos;
 
-    const USHORT nMax = SCHATTR_END - SCHATTR_START + 1;
+    const USHORT nMax = SAL_N_ELEMENTS(ppPoolDefaults);
     for( USHORT i=0; i<nMax; ++i )
     {
         SetRefCount(*ppPoolDefaults[i], 0);
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 3a55690..c44b819 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -621,7 +621,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
               const uno::Reference< frame::XModel >& xChartModel )
 {
     //------------ 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 ) );
     if( !xDiagram.is())
         return;
@@ -699,7 +699,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             if(pVCooSys)
                 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 );
             OSL_ASSERT( xDataSeriesContainer.is());
             if( !xDataSeriesContainer.is() )
@@ -860,7 +860,7 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
 
 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();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = 
m_aSeriesPlotterList.end();
@@ -1851,7 +1851,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
 
                             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);
                                 if( nAttachedAxisIndex != nAxisIndex )
                                     continue;
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 4fc2ad8..498390a 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -175,22 +175,22 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& 
rPropVal
 
 /*
 //set some properties from service style::CharacterProperties:
-//-------- tabpage: Zeichen -----------
-//Schriftart z.B. 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
-//Schriftgrad (Punktgrösse z.B. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
+//-------- tabpage: Characters -----------
+//FontType eg. Albany               UNO_NAME_EDIT_CHAR_FONTNAME == 
UNO_NAME_EDIT_CHAR_FONTSTYLENAME    //UNO_NAME_CHAR_FONT
+//FontStyle eg. italic              UNO_NAME_EDIT_CHAR_POSTURE    UNO_NAME_CHAR_POSTURE 
awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
+//Fontsize (Pointsize eg. 12)       UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
         //? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
-//Sprache                           UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
-
-//-------- tabpage: Schrifteffekt -----------
-//Unterstreichung                   UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE 
_SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
-//Unterstreichung-farbe             ??? 'CharUnderlineColor' + CharUnderlineHasColor
-//Durchstreichung z.B. doppelt      "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE 
_DOUBLE ...
-//wortweise-Durchstreichung ja/nein "CharWordMode" bool
-//Schriftfarbe                      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
-//Kontur                            "CharContoured" bool
-//Schatten                          UNO_NAME_CHAR_SHADOWED bool
+//Language                          UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
+
+//-------- tabpage: Font Effect -----------
+//Underline                         UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE 
_SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
+//Underline-color                   ??? 'CharUnderlineColor' + CharUnderlineHasColor
+//Strikeout eg. double              "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE 
_DOUBLE ...
+//Strikeout by word yes/no          "CharWordMode" bool
+//Fontcolor                         UNO_NAME_EDIT_CHAR_COLOR sal_Int32      UNO_NAME_CHAR_COLOR
+//ReliefType without/graved/emboss  "CharRelief" sal_Int16 text::FontRelief_NONE 
FontRelief_EMBOSSED FontRelief_ENGRAVED
+//Outline                           "CharContoured" bool
+//Shadows                           UNO_NAME_CHAR_SHADOWED bool
 */
 
 //static
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 585f778..8bb118f 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -298,7 +298,7 @@ void VDataSeries::doSortByXValues()
 {
     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
         double fNan;
         ::rtl::math::setNan( & fNan );
@@ -314,7 +314,7 @@ void VDataSeries::doSortByXValues()
         //do sort
         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_Y.Doubles.realloc( m_nPointCount );
 

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.