diff options
Diffstat (limited to 'chart2/source/controller')
16 files changed, 66 insertions, 66 deletions
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 |