diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 17:47:16 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-27 00:44:41 -0600 |
| commit | f2cdf8848cb27d6385ad6c817e6c8c61e36e8ff7 (patch) | |
| tree | aa56ac9a53399dd9d3db650bedcbd140ff0af88f /chart2 | |
| parent | 2e40ddbd325fb5dc963e2017245e3df2f4f809c8 (diff) | |
Remove visual noise from chart2
Change-Id: Ic8dc71c2815df265e1935e629e0220396a50aaac
Reviewed-on: https://gerrit.libreoffice.org/8239
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2')
39 files changed, 134 insertions, 134 deletions
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index be1f911be55b..083f63580d8c 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -101,7 +101,7 @@ public class TestCaseOldAPI extends ComplexTestCase { }; } - // ____________ + public void before() { @@ -117,7 +117,7 @@ public class TestCaseOldAPI extends ComplexTestCase { XChartDocument.class, mxChartModel ); } - // ____________ + public void after() { @@ -140,7 +140,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ____________ + public void testTitle() { @@ -190,7 +190,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ____________ + public void testSubTitle() { @@ -235,7 +235,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testDiagram() { @@ -348,7 +348,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testAxis() { @@ -445,7 +445,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testLegend() { @@ -492,7 +492,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testArea() { @@ -528,7 +528,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testChartType() { @@ -594,7 +594,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testAggregation() { @@ -608,7 +608,7 @@ public class TestCaseOldAPI extends ComplexTestCase { assure( "querying back to old interface failed", xDoc != null ); } - // ------------ + public void testDataSeriesAndPoints() { @@ -707,7 +707,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testStatistics() { @@ -729,7 +729,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void setStockData_Type4() { @@ -783,7 +783,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testStockProperties() { @@ -831,7 +831,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testFactory() { @@ -851,7 +851,7 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ------------ + public void testData() { @@ -932,13 +932,13 @@ public class TestCaseOldAPI extends ComplexTestCase { } } - // ================================================================================ + private XModel mxChartModel; private XChartDocument mxOldDoc; private boolean mbCreateView; - // -------------------------------------------------------------------------------- + private XModel createDocument( String sDocType ) { @@ -965,7 +965,7 @@ public class TestCaseOldAPI extends ComplexTestCase { return aResult; } - // ------------ + public XModel createChartModel() { @@ -985,7 +985,7 @@ public class TestCaseOldAPI extends ComplexTestCase { return aResult; } - // ------------ + private XComponentContext getComponentContext( XMultiServiceFactory xFact ) { @@ -1010,7 +1010,7 @@ public class TestCaseOldAPI extends ComplexTestCase { return xResult; } - // ------------ + private void printInterfacesAndServices( Object oObj ) { @@ -1020,7 +1020,7 @@ public class TestCaseOldAPI extends ComplexTestCase { util.dbg.printInterfaces( (XInterface)oObj, true ); } - // ------------ + /// see rtl/math.hxx private boolean approxEqual( double a, double b ) @@ -1032,7 +1032,7 @@ public class TestCaseOldAPI extends ComplexTestCase { < ((a < 0.0 ? -a : a) * (1.0 / (16777216.0 * 16777216.0))); } - // ------------ + /** returns true if a and b differ no more than tolerance. @param tolerance diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 82b08e6075a9..617ee8e3e436 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -117,7 +117,7 @@ void AccessibleChartElement::InitTextEdit() } } -// + // Interfaces // ________ AccessibleBase::XAccessibleContext ________ diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 349953b7d6a5..6f99effce516 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -25,7 +25,7 @@ #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } #endif -//----------------------------------------------------------------------------- + // chart types // Images: @@ -44,11 +44,11 @@ #define IMG_STEP_CENTER_X (RID_APP_START + 13) #define IMG_STEP_CENTER_Y (RID_APP_START + 14) -//----------------------------------------------------------------------------- + //Chart Subtypes // Bitmaps: -//---------------------- + // Column Chart Subtypes #define BMP_COLUMNS_2D_1 (RID_APP_START + 1) #define BMP_COLUMNS_2D_2 (RID_APP_START + 2) @@ -74,7 +74,7 @@ #define BMP_PYRAMID_3D_3 (RID_APP_START + 18) #define BMP_PYRAMID_3D_4 (RID_APP_START + 19) -//---------------------- + // Bar Chart Subtypes #define BMP_BARS_2D_1 (RID_APP_START + 20) @@ -101,7 +101,7 @@ #define BMP_PYRAMIDQ_3D_3 (RID_APP_START + 37) #define BMP_PYRAMIDQ_3D_4 (RID_APP_START + 38) -//---------------------- + // Pie and Donut Chart Subtypes #define BMP_CIRCLES_2D (RID_APP_START + 39) @@ -113,7 +113,7 @@ #define BMP_DONUT_3D (RID_APP_START + 45) #define BMP_DONUT_3D_EXPLODED (RID_APP_START + 46) -//---------------------- + // Points and Lines Chart Subtypes #define BMP_POINTS_XVALUES (RID_APP_START + 47) @@ -158,7 +158,7 @@ #define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104) #define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105) -//---------------------- + // Area Chart Subtypes #define BMP_AREAS_2D (RID_APP_START + 68) @@ -168,7 +168,7 @@ #define BMP_AREAS_3D_1 (RID_APP_START + 72) #define BMP_AREAS_3D_2 (RID_APP_START + 73) -//---------------------- + // Net Chart Subtypes #define BMP_NET (RID_APP_START + 74) @@ -180,7 +180,7 @@ #define BMP_NET_FILL (RID_APP_START + 80) #define BMP_NET_FILL_STACK (RID_APP_START + 81) -//---------------------- + // Stock Chart Subtypes #define BMP_STOCK_1 (RID_APP_START + 82) @@ -188,17 +188,17 @@ #define BMP_STOCK_3 (RID_APP_START + 84) #define BMP_STOCK_4 (RID_APP_START + 85) -//---------------------- + // Column + Line Chart Subtypes #define BMP_COLUMN_LINE (RID_APP_START + 86) #define BMP_COLUMN_LINE_STACKED (RID_APP_START + 87) -//---------------------- + // Bubble Chart Subtypes #define BMP_BUBBLE_1 (RID_APP_START + 88) -//----------------------------------------------------------------------------- + //further Images: //SchStatisticTabPage and SchDataStatisticsDlg part 1 diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index d4f780990e52..802de334552d 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.src @@ -116,7 +116,7 @@ Bitmap BMP_AREAS_3D_2 { File = "areasfull3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_BARS_2D_1 { File = "bar_52x60.png" ; @@ -145,7 +145,7 @@ Bitmap BMP_BARS_3D_3 { File = "barpercent3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_CIRCLES_2D { File = "pie_52x60.png" ; @@ -162,7 +162,7 @@ Bitmap BMP_CIRCLES_3D_EXPLODED { File = "pie3dexploded_52x60.png" ; }; -//--------------------- + Bitmap BMP_DONUT_2D { File = "donut_52x60.png" ; @@ -179,7 +179,7 @@ Bitmap BMP_DONUT_3D_EXPLODED { File = "donut3dexploded_52x60.png" ; }; -//--------------------- + Bitmap BMP_COLUMNS_2D_1 { File = "columns_52x60.png" ; @@ -200,7 +200,7 @@ Bitmap BMP_COLUMN_LINE_STACKED { File = "columnstackline_52x60.png" ; }; -//--------------------- + Bitmap BMP_COLUMNS_3D { File = "columns3ddeep_52x60.png" ; @@ -217,7 +217,7 @@ Bitmap BMP_COLUMNS_3D_3 { File = "columnpercent3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_KEGELQ_3D_1 { File = "conehori_52x60.png" ; @@ -250,7 +250,7 @@ Bitmap BMP_KEGEL_3D_4 { File = "conedeep_52x60.png" ; }; -//--------------------- + Bitmap BMP_POINTS_XVALUES { File = "valueaxisdirectpoints_52x60.png" ; @@ -263,7 +263,7 @@ Bitmap BMP_POINTS_STACKED { File = "stackdirectpoints_52x60.png" ; }; -//--------------------- + Bitmap BMP_LINE_P_XVALUES { @@ -306,7 +306,7 @@ Bitmap BMP_LINE3D_STACKED File = "stackdirect3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_LINE_P_XVALUES_SMOOTH { File = "valueaxissmoothboth_52x60.png" ; @@ -343,7 +343,7 @@ Bitmap BMP_LINE3D_STACKED_SMOOTH { File = "stacksmooth3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_LINE_P_XVALUES_STEPPED { File = "valueaxissteppedboth_52x60.png" ; @@ -380,7 +380,7 @@ Bitmap BMP_LINE3D_STACKED_STEPPED { File = "stackstepped3d_52x60.png" ; }; -//--------------------- + Bitmap BMP_NET { File = "net_52x60.png" ; @@ -413,7 +413,7 @@ Bitmap BMP_NET_FILL_STACK { File = "netstackfill_52x60.png" ; }; -//--------------------- + Bitmap BMP_PYRAMIDQ_3D_1 { File = "pyramindhori_52x60.png" ; @@ -446,7 +446,7 @@ Bitmap BMP_PYRAMID_3D_4 { File = "pyraminddeep_52x60.png" ; }; -//--------------------- + Bitmap BMP_ROEHRE_3D_1 { File = "cylinderhori_52x60.png" ; @@ -463,7 +463,7 @@ Bitmap BMP_ROEHRE_3D_4 { File = "cylinderhorideep_52x60.png" ; }; -//--------------------- + Bitmap BMP_SAEULE_3D_1 { File = "cylinder_52x60.png" ; @@ -480,7 +480,7 @@ Bitmap BMP_SAEULE_3D_4 { File = "cylinderdeep_52x60.png" ; }; -//--------------------- + Bitmap BMP_STOCK_1 { File = "stock_52x60.png" ; @@ -497,9 +497,9 @@ Bitmap BMP_STOCK_4 { File = "stockcolumnsattach_52x60.png" ; }; -//--------------------- -//--------------------- -//--------------------- + + + //error indicator Image BMP_INDICATE_BOTH_VERTI { @@ -544,7 +544,7 @@ Image BMP_INDICATE_LEFT }; }; -//--------------------- + //regression curves Image BMP_REGRESSION_NONE { diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 9dbe6537ad6d..09a4c05abf19 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -20,10 +20,10 @@ #ifndef _CHART2_RESOURCE_IDS_HRC #define _CHART2_RESOURCE_IDS_HRC -//----------------------------------------------------------------------------- + //for strings see Strings.hrc //for Bimaps see Bimaps.hrc -//----------------------------------------------------------------------------- + //Dialog Ids: #define DLG_CHART_WIZARD 902 #define DLG_DATA_SOURCE 901 @@ -31,7 +31,7 @@ #define DLG_LEGEND 835 #define DLG_SPLINE_PROPERTIES 904 -//----------------------------------------------------------------------------- + //TabPage Ids: #define TP_LEGEND_POS 900 #define TP_DATA_DESCR 901 @@ -52,12 +52,12 @@ #define TP_YERRORBAR 919 #define TP_XERRORBAR 923 -//----------------------------------------------------------------------------- + //listbox Ids: #define LB_BAR_GEOMETRY 1000 #define LB_TEXT_SEPARATOR 1001 -//----------------------------------------------------------------------------- + #endif diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 371e2e9f6beb..6e5d565edf2e 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -408,8 +408,8 @@ String STR_STATUS_PIE_SEGMENT_EXPLODED Text [ en-US ] = "Pie exploded by %PERCENTVALUE percent"; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + String STR_OBJECT_FOR_SERIES { Text [ en-US ] = "%OBJECTNAME for Data Series '%SERIESNAME'" ; @@ -420,8 +420,8 @@ String STR_OBJECT_FOR_ALL_SERIES Text [ en-US ] = "%OBJECTNAME for all Data Series" ; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + String STR_ACTION_EDIT_CHARTTYPE { Text [ en-US ] = "Edit chart type" ; @@ -476,9 +476,9 @@ String STR_ROW_LABEL Text [ en-US ] = "Row %ROWNUMBER" ; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + + //for range didalog String STR_DATA_ROLE_LABEL @@ -599,7 +599,7 @@ String STR_TEXT_DIRECTION_SUPER Text [ en-US ] = "Use superordinate object settings"; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src index 1f6f7a17a665..e7972d872efb 100644 --- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src +++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src @@ -61,6 +61,6 @@ String STR_LINETYPE_STEPPED Text [ en-US ] = "Stepped"; }; -//----------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src index 17d01ec5d81e..86ed516f3ab5 100644 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ b/chart2/source/controller/dialogs/Strings_ChartTypes.src @@ -71,7 +71,7 @@ String STR_LINES_3D { Text [ en-US ] = "3D Lines" ; }; -//----------------------------------------------------------------------------- + String STR_TYPE_COMBI_COLUMN_LINE { Text [ en-US ] = "Column and Line" ; @@ -84,12 +84,12 @@ String STR_LINE_STACKEDCOLUMN { Text [ en-US ] = "Stacked Columns and Lines" ; }; -//----------------------------------------------------------------------------- + String STR_TYPE_NET { Text [ en-US ] = "Net" ; }; -//----------------------------------------------------------------------------- + String STR_TYPE_STOCK { Text [ en-US ] = "Stock"; @@ -110,7 +110,7 @@ String STR_STOCK_4 { Text [ en-US ] = "Stock Chart 4"; }; -//----------------------------------------------------------------------------- + String STR_NORMAL { Text [ en-US ] = "Normal" ; @@ -132,7 +132,7 @@ String STR_FILLED { Text [ en-US ] = "Filled" ; }; -//----------------------------------------------------------------------------- + String STR_TYPE_BUBBLE { Text [ en-US ] = "Bubble" ; @@ -141,7 +141,7 @@ String STR_BUBBLE_1 { Text [ en-US ] = "Bubble Chart" ; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src index ab91545e24f6..1cff7519e462 100644 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ b/chart2/source/controller/dialogs/Strings_Statistic.src @@ -39,8 +39,8 @@ String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA Text [ en-US ] = "From Data Table" ; }; -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + String STR_REGRESSION_LINEAR { diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 64a96028ff6b..472dd2ac2b49 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.hrc @@ -36,7 +36,7 @@ #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 -//------------ + //from old chart tplabel.hrc #define CB_AXIS_LABEL_SCHOW_DESCR 1 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 2eeb6cdba651..1dad1d823969 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -41,9 +41,9 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() aExistenceList[nN]=false; } -// + // SchAxisDlg -// + SchAxisDlg::SchAxisDlg(Window* pWindow, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg) diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index fd28aaa070b8..d87dc697bd74 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -25,7 +25,7 @@ #define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE" #define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT" #define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES" -// + #define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT" #define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY" diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index b62d511f37de..b84f0ee15248 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -117,7 +117,7 @@ public: static void InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItemSet &rSourceSet ); protected: - // ________ + /** implement this method to provide an array of which-ranges of the form: @@ -164,7 +164,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); - // ________ + /// Returns the pool SfxItemPool & GetItemPool() const; diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc index c78b07e592f4..d1a172d21485 100644 --- a/chart2/source/controller/inc/MenuResIds.hrc +++ b/chart2/source/controller/inc/MenuResIds.hrc @@ -21,7 +21,7 @@ #include <svl/solar.hrc> -//----------------------------------------------------------------------------- + // context menus #define RID_CONTEXTMENU_SHAPE (RID_APP_START + 1) diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc index 8994c43333f7..f13dd08a001f 100644 --- a/chart2/source/controller/inc/ShapeController.hrc +++ b/chart2/source/controller/inc/ShapeController.hrc @@ -19,7 +19,7 @@ #ifndef CHART_SHAPECONTROLLER_HRC #define CHART_SHAPECONTROLLER_HRC -//----------------------------------------------------------------------------- + //Command Ids: #define COMMAND_ID_FORMAT_LINE 1 #define COMMAND_ID_FORMAT_AREA 2 diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index d0fda11ad522..d141d011ab07 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -492,7 +492,7 @@ void ChartController::execute_Paint( const Rectangle& rRect ) } xProp->setPropertyValue( "Resolution", uno::makeAny( aResolution )); } - // + uno::Reference< util::XUpdatable > xUpdatable( m_xChartView, uno::UNO_QUERY ); if( xUpdatable.is() ) diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc index 058baf8ab80f..1836fed013b0 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.hrc @@ -19,7 +19,7 @@ #ifndef CHART_DRAWCOMMANDDISPATCH_HRC #define CHART_DRAWCOMMANDDISPATCH_HRC -//----------------------------------------------------------------------------- + //Command Ids: #define COMMAND_ID_OBJECT_SELECT 1 #define COMMAND_ID_DRAW_LINE 2 diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 5e6dc49a58fd..e2426d878b48 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -180,7 +180,7 @@ your XComponent::dispose method has to be implemented in the following way: return; //--release all resources and references - //... + } */ diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index a71eab2815eb..03b5fe4a4cc7 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -27,9 +27,9 @@ static com::sun::star::uno::Sequence< OUString > Class::getSupportedServiceNames_Static(); */ -// + // XServiceInfo decl -// + namespace apphelper { @@ -48,9 +48,9 @@ namespace apphelper static ::com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); -// + // XServiceInfo impl -// + #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ @@ -87,9 +87,9 @@ Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -// + // Service factory helper decl+impl -// + //to use this macro you need to provide a constructor: //class( Reference< XComponentContext > const & xContext ) //and implement OWeakObject diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 9fcdf139cc5f..c3d5b44591ec 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -24,7 +24,7 @@ //next free is 303 -//----------------------------------------------------------------------------- + //chart types //see Strings_ChartTypes.src @@ -65,7 +65,7 @@ #define STR_TYPE_BUBBLE (RID_APP_START + 282) #define STR_BUBBLE_1 (RID_APP_START + 283) -//----------------------------------------------------------------------------- + //additional controls for wizard: #define STR_BAR_GEOMETRY (RID_APP_START + 127) @@ -82,7 +82,7 @@ //additional strings #define STR_TEXT_SEPARATOR (RID_APP_START + 20) -//----------------------------------------------------------------------------- + //SchStatisticTabPage and SchDataStatisticsDlg //see Strings_Statistic.src @@ -98,7 +98,7 @@ #define STR_REGRESSION_POLYNOMIAL (RID_APP_START + 300) #define STR_REGRESSION_MOVING_AVERAGE (RID_APP_START + 301) -//----------------------------------------------------------------------------- + //for scale tab page //see Strings_Scale.src @@ -109,7 +109,7 @@ #define STR_INVALID_INTERVALS (RID_APP_START + 291) #define STR_INVALID_TIME_UNIT (RID_APP_START + 292) -//----------------------------------------------------------------------------- + //for range didalog #define STR_DATA_ROLE_LABEL (RID_APP_START + 241) #define STR_DATA_ROLE_X (RID_APP_START + 242) @@ -134,7 +134,7 @@ #define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253) #define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195) -//----------------------------------------------------------------------------- + //chart objects //e.g. used as titles for insert dialogs and object properties dialog //also used in tip help, in status descriptions e.g. '%object% marked' or in undo action e.g. 'moved %object%' @@ -208,7 +208,7 @@ #define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) #define STR_OBJECT_SHAPE (RID_APP_START + 290) -//----------------------------------------------------------------------------- + //Titles for tabpages and dialogs #define STR_PAGE_LINE (RID_APP_START + 216) @@ -244,7 +244,7 @@ #define STR_PAGE_POSITIONING (RID_APP_START + 277) #define STR_PAGE_ASIAN (RID_APP_START + 281) -//----------------------------------------------------------------------------- + //strings used as description for actions on toolbar icons, as tip help or for undo #define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) @@ -257,7 +257,7 @@ #define STR_ACTION_REARRANGE_CHART (RID_APP_START + 94) #define STR_ACTION_EDIT_TEXT (RID_APP_START + 95) -//----------------------------------------------------------------------------- + //statusbar strings and balloon help #define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) @@ -268,7 +268,7 @@ #define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) #define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) -//----------------------------------------------------------------------------- + //warning and info boxes #define STR_ACTION_NOTPOSSIBLE (RID_APP_START + 107) @@ -285,7 +285,7 @@ #define STR_BUTTON_UP (RID_APP_START + 500) #define STR_BUTTON_DOWN (RID_APP_START + 501) -//----------------------------------------------------------------------------- + // ids must not exceed RID_APP_START + 499 // ids >= RID_APP_START + 500 are defined in glob.hrc diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 50ee0ec18b1d..ba2ee856dc08 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX -//---- + #include <svx/svdmodel.hxx> // header for class SdrObject #include <svx/svdobj.hxx> -//---- + #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 4ab08f617fee..dd5d5ab5b21d 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -289,7 +289,7 @@ void SAL_CALL ChartModel::storeToURL( if(!aGuard.startApiCall(sal_True)) //start LongLastingCall return; //behave passive if already disposed or closed or throw exception @todo? //do not change the internal state of the document here - //... + aGuard.clear(); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index f2deb8ac5dd7..83e747e773ec 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -901,7 +901,7 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( comphelper::copyProperties( xSource, xDestination ); } -// ________ + Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static() { diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 8f1c3d249042..5aac56053fdb 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -243,7 +243,7 @@ void CharacterProperties::AddPropertiesToVector( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharacterPropertiesAsian - // ===== + // CharFontNameAsian rOutProperties.push_back( Property( "CharFontNameAsian", @@ -310,7 +310,7 @@ void CharacterProperties::AddPropertiesToVector( beans::PropertyAttribute::MAYBEDEFAULT )); // CharacterPropertiesComplex - // === + // CharFontNameComplex rOutProperties.push_back( Property( "CharFontNameComplex", diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 49cf103c0135..2443e20aeea8 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -681,7 +681,7 @@ void AreaChart::createShapes() m_bPointsWereSkipped = false; sal_Int32 nSkippedPoints = 0; sal_Int32 nCreatedPoints = 0; - // + bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis()); @@ -847,7 +847,7 @@ void AreaChart::createShapes() continue; } aSeriesFormerPointMap[pSeries] = FormerPoint(aScaledLogicPosition.PositionX, aScaledLogicPosition.PositionY, aScaledLogicPosition.PositionZ); - // + //store point information for series polygon //for area and/or line (symbols only do not need this) diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 941257b3c401..c0d546abd3cd 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -436,7 +436,7 @@ void BarChart::createShapes() m_bPointsWereSkipped = false; sal_Int32 nSkippedPoints = 0; sal_Int32 nCreatedPoints = 0; - // + sal_Int32 nStartIndex = 0; sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); @@ -704,9 +704,9 @@ void BarChart::createShapes() continue; } aSeriesFormerPointMap[pSeries] = FormerBarPoint(fLogicX,fUpperYValue,fLowerYValue,fLogicZ); - // - // + + if( bDrawConnectionLines ) { //store point information for connection lines diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index f25ddf34be95..c8c6db5ae00c 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -217,7 +217,7 @@ void BubbleChart::createShapes() m_bPointsWereSkipped = false; sal_Int32 nSkippedPoints = 0; sal_Int32 nCreatedPoints = 0; - // + calculateMaximumLogicBubbleSize(); calculateBubbleSizeScalingFactor(); diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index a9709eb0b45f..f50b231a0c95 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -377,7 +377,7 @@ void NetChart::createShapes() m_bPointsWereSkipped = false; sal_Int32 nSkippedPoints = 0; sal_Int32 nCreatedPoints = 0; - // + bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis()); @@ -547,7 +547,7 @@ void NetChart::createShapes() continue; } aSeriesFormerPointMap[pSeries] = FormerPoint(aScaledLogicPosition.PositionX, aScaledLogicPosition.PositionY, aScaledLogicPosition.PositionZ); - // + //store point information for series polygon //for area and/or line (symbols only do not need this) diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index c5fdcc29ece7..81d35394a521 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -717,7 +717,7 @@ bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) } while( pCurrent != pStart ); - // + bool bAlternativeMoveDirection = false; if( !tryMoveLabels( pFirstBorder, pSecondBorder, pCenter, bSingleCenter, bAlternativeMoveDirection, rPageSize ) ) tryMoveLabels( pFirstBorder, pSecondBorder, pCenter, bSingleCenter, bAlternativeMoveDirection, rPageSize ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 74322777a79d..944b31a63bff 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -51,7 +51,7 @@ #include "CandleStickChart.hxx" #include "BubbleChart.hxx" #include "NetChart.hxx" -// + #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/TimeUnit.hpp> diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index 1ff07c004ea8..9d0b8edc8519 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -84,7 +84,7 @@ public: ::com::sun::star::drawing::XShapes >& xTarget , OUString aName = OUString() ) = 0; - //------ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCube( const ::com::sun::star::uno::Reference< @@ -249,7 +249,7 @@ public: getChartRootShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>& xPage ); - //------ + static void makeShapeInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 5e90b6550001..e2a6cf327e69 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -165,7 +165,7 @@ public: double transformToRadius( double fLogicValueOnRadiusAxis, bool bDoScaling=true ) const; double transformToAngleDegree( double fLogicValueOnAngleAxis, bool bDoScaling=true ) const; double getWidthAngleDegree( double& fStartLogicValueOnAngleAxis, double& fEndLogicValueOnAngleAxis ) const; - // + virtual ::com::sun::star::drawing::Position3D transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const; diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index b4b3672e9000..3f9652d4ccde 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -44,7 +44,7 @@ public: ::com::sun::star::drawing::XShapes >& xTarget , OUString aName = OUString() ); - //------ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCube( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index f8401284c8df..548c1c17b4b2 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -156,7 +156,7 @@ protected: //member 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< ::com::sun::star::drawing::XShapes > m_xLogicTargetForGrids; ::com::sun::star::uno::Reference< @@ -171,7 +171,7 @@ protected: //member CuboidPlanePosition m_eBackWallPos; CuboidPlanePosition m_eBottomPos; - // + MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 2cdbe6e60b1e..6b708addf668 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -176,7 +176,7 @@ public: virtual long calculateTimeResolutionOnXAxis(); virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); - //------ + void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const; void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const; diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index 34807609738b..724a0b9166a1 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -22,7 +22,7 @@ namespace chart { -// + #define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32) //There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls #define GRID_TO_WALL_DISTANCE (1.0) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 99e7b348c8e8..67404e09e673 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1490,7 +1490,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& Sequence<sal_Int32> aCoordinateSystemResolution = pVCooSys->getCoordinateSystemResolution( rPageSize, m_aPageResolution ); pSeriesPlotter->setCoordinateSystemResolution( aCoordinateSystemResolution ); } - // + pSeriesPlotter->createShapes(); m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped(); } diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index 65deaa52c9a5..98792ada4cd7 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -220,7 +220,7 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg } } - // + std::vector< sal_Int32 > aResultPointCount;//per polygon index //apply clipping: diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 99bd2fc860e4..1b5b05473a97 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -747,7 +747,7 @@ drawing::PolyPolygonBezierCoords getCircularArcBezierCoords( drawing::PointSequence aPoints(nPointCount); drawing::FlagSequence aFlags(nPointCount); - // + //!! applying matrix to vector does ignore translation, so it is important to use a B2DPoint here instead of B2DVector ::basegfx::B2DPoint P0,P1,P2,P3; |