diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-16 18:57:44 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-16 18:57:44 -0800 |
commit | f417c6cad6608705d674610e99c17170a340f549 (patch) | |
tree | c7e98cb749312d8e4f861b094979cf0d81b01f9c /chart2 | |
parent | a1a1c816de870bea49318a2dc3cef683394ff002 (diff) |
HC Cleanup - calc
Diffstat (limited to 'chart2')
10 files changed, 56 insertions, 136 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 61c8241c5016..afb572eab907 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -633,11 +633,12 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED )) ); + rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) ); + rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) ); + rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) ); + rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) ); } + bool PieChartDialogController::shouldShow_3DLookControl() const { return true; @@ -1047,9 +1048,11 @@ StockChartDialogController::StockChartDialogController() { bSupports3D = false; } + StockChartDialogController::~StockChartDialogController() { } + String StockChartDialogController::getName() { return String( SchResId( STR_TYPE_STOCK )); @@ -1058,6 +1061,7 @@ Image StockChartDialogController::getImage() { return Image( SchResId( IMG_TYPE_STOCK )); } + const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = @@ -1094,6 +1098,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController() { bSupports3D = false; } + CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() { if(m_pFT_NumberOfLines) @@ -1101,14 +1106,17 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() if(m_pMF_NumberOfLines) delete m_pMF_NumberOfLines; } + String CombiColumnLineChartDialogController::getName() { return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } -Image CombiColumnLineChartDialogController::getImage() + +Image CombiColumnLineChartDialogController::getImage( ) { - return Image( SchResId( IMG_TYPE_COLUMN_LINE )); + return Image( SchResId( IMG_TYPE_COLUMN_LINE ) ); } + const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 1b12ba57f1c5..736bc49a128f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -88,7 +88,6 @@ // with shift up/down, and entering non-editable cells would be problematic, // e.g. the first cell, or when being in read-only mode - using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -140,6 +139,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) : m_nStartColumn( 0 ), m_bShowWarningBox( false ) {} + SeriesHeaderEdit::~SeriesHeaderEdit() {} @@ -214,7 +214,8 @@ private: static Image GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis); + bool bSwapXAndYAxis + ); sal_Int32 m_nStartCol, m_nEndCol; sal_Int32 m_nWidth; @@ -305,7 +306,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth ) SetPos( m_aPos ); } - void SeriesHeader::SetPixelPosX( sal_Int32 nPos ) { Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT )); @@ -320,9 +320,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth ) void SeriesHeader::SetChartType( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis ) + bool bSwapXAndYAxis +) { - m_spSymbol->SetImage(GetChartTypeImage(xChartType, bSwapXAndYAxis)); + m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) ); } void SeriesHeader::SetSeriesName( const String & rName ) @@ -383,7 +384,8 @@ bool SeriesHeader::HasFocus() const Image SeriesHeader::GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, - bool bSwapXAndYAxis) + bool bSwapXAndYAxis +) { Image aResult; if( !xChartType.is()) @@ -392,40 +394,40 @@ Image SeriesHeader::GetChartTypeImage( if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA )) { - aResult = Image( SchResId( IMG_TYPE_AREA )); + aResult = Image( SchResId( IMG_TYPE_AREA ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )) { if( bSwapXAndYAxis ) - aResult = Image( SchResId( IMG_TYPE_BAR )); + aResult = Image( SchResId( IMG_TYPE_BAR ) ); else - aResult = Image( SchResId( IMG_TYPE_COLUMN )); + aResult = Image( SchResId( IMG_TYPE_COLUMN ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE )) { - aResult = Image( SchResId( IMG_TYPE_LINE )); + aResult = Image( SchResId( IMG_TYPE_LINE ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER )) { - aResult = Image( SchResId( IMG_TYPE_XY )); + aResult = Image( SchResId( IMG_TYPE_XY ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE )) { - aResult = Image( SchResId( IMG_TYPE_PIE )); + aResult = Image( SchResId( IMG_TYPE_PIE ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET ) || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) ) { - aResult = Image( SchResId( IMG_TYPE_NET )); + aResult = Image( SchResId( IMG_TYPE_NET ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK )) { // @todo: correct image for candle-stick type - aResult = Image( SchResId( IMG_TYPE_STOCK )); + aResult = Image( SchResId( IMG_TYPE_STOCK ) ); } else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE )) { - aResult = Image( SchResId( IMG_TYPE_BUBBLE )); + aResult = Image( SchResId( IMG_TYPE_BUBBLE ) ); } return aResult; diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index df6f9e93e68b..cea3192bacab 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -42,7 +42,7 @@ namespace chart RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { - SetModeImage( Image( SchResId(IMG_SELECTRANGE) ) ); + SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) ); this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE)); } diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 2d94859f255e..f2073c4e52e8 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -115,8 +115,6 @@ DataEditor::DataEditor( SetOutputSizePixel( aWinSize ); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); - // allow travelling to toolbar with F6 notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::AddWindow )); } @@ -215,83 +213,11 @@ IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG ) return 0; } -// IMPL_LINK( DataEditor, BrowserColumnResized, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - -// IMPL_LINK( DataEditor, BrowserContentScrolled, void*, EMPTYARG ) -// { -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); -// return 0; -// } - void DataEditor::UpdateData() { m_apBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); } -// react on the change of the underlying document by displaying the new data -// void DataEditor::SFX_NOTIFY( -// SfxBroadcaster& rBC, -// const TypeId& rBCType, -// const SfxHint& rHint, -// const TypeId& rHintType ) -// { -// if( rHint.Type() == TYPE(SfxSimpleHint) ) -// { -// // note: if dynamic_cast works this should be changed -// switch( static_cast< const SfxSimpleHint & >( rHint ).GetId()) -// { -// case SFX_HINT_DOCCHANGED: -// UpdateData(); -// break; - -// case SFX_HINT_DYING: -// break; -// } -// } -// } - -// { -// BOOL bRet = TRUE; - -// // confirm changes currently made and not saved -// m_apBrwData->EndEditing(); - -// if( m_apBrwData->IsDirty() ) -// { -// QueryBox aSafetyQuery( this, WB_YES_NO_CANCEL | WB_DEF_YES, -// String( SchResId( STR_DIAGRAM_DATA_SAFETY_QUERY ))); -// long nQueryResult = aSafetyQuery.Execute(); - -// bRet = ( nQueryResult != RET_CANCEL ); - -// if( nQueryResult == RET_YES ) -// { -// // save changes -// ApplyChangesToModel(); -// } -// } - -// if( bRet ) -// { -// // close child window -// SfxBoolItem aItem( SID_DIAGRAM_DATA, FALSE ); -// if( m_pBindings ) -// { -// SfxDispatcher* pDisp = m_pBindings->GetDispatcher(); -// if( pDisp ) -// pDisp->Execute( SID_DIAGRAM_DATA, SFX_CALLMODE_ASYNCHRON, &aItem, 0L); -// else -// DBG_ERROR( "Couldn't dispatch command" ); -// } -// } - -// return ( bRet? SfxFloatingWindow::Close(): FALSE ); -// } - void DataEditor::AdaptBrowseBoxSize() { Size aSize( PixelToLogic( GetResizeOutputSizePixel(), MAP_APPFONT )); @@ -307,7 +233,6 @@ void DataEditor::Resize() { Dialog::Resize(); AdaptBrowseBoxSize(); -// ImplAdjustHeaderControls( false /* bRefreshFromModel */ ); } BOOL DataEditor::Close() @@ -323,11 +248,7 @@ bool DataEditor::ApplyChangesToModel() return m_apBrwData->EndEditing(); } -/** - * sets the correct toolbar icons depending on the current mode (e.g. high contrast) - * FIXME: does not serve any purpose anymore, as the high contrast theme has been removed - * FIXME: check callers and see if we can do away with it - */ +// sets the correct toolbar icons depending on the current mode (e.g. high contrast) void DataEditor::ApplyImageList() { m_aTbxData.SetImageList( m_aToolboxImageList ); diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk index dfeb02800ac8..cc6927476e64 100644 --- a/chart2/source/controller/dialogs/makefile.mk +++ b/chart2/source/controller/dialogs/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ GEN_HID_OTHER=TRUE # i26518 the gcc-3.0.4 requires to enhance the template-depth # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore -.IF "$(COM)"=="GCC" +.IF "$(COM)"=="GCC" CFLAGS+=-ftemplate-depth-128 .ENDIF @@ -154,7 +154,7 @@ SRC1FILES= \ SRS1NAME=$(TARGET) # --- Targets ----------------------------------------------------------------- -LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc +LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc .INCLUDE: target.mk $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_DataLabel.hrc $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_LegendPosition.hrc @@ -191,9 +191,5 @@ $(SRS)$/chcdialogs.srs: \ tp_RangeChooser.hrc \ tp_Wizard_TitlesAndObjects.hrc -# res_DataLabel.hrc \ -# res_LegendPosition.hrc \ -# res_Statistic.hrc \ - #$(SRS)$/chcdialogs.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 6f8cd3118e8f..e6283dfecd1c 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -694,15 +694,15 @@ void ErrorBarResources::FillValueSets() { if( m_eErrorBarType == ERROR_BAR_Y ) { - m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN ))); - m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP ))); - m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI ))); + m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN ) ) ); + m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP ) ) ); + m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) ); } else if( m_eErrorBarType == ERROR_BAR_X ) { - m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT ))); - m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT ))); - m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI ))); + m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT ) ) ); + m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT ) ) ); + m_aFiBoth.SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) ); } } diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 1af1e2c13e0d..dadfd998940a 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -81,21 +81,22 @@ enum StatTrendLine TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs, bool bNoneAvailable ) : m_aFLType( pParent, SchResId( FL_TYPE )), - m_aRBNone( pParent, SchResId( RB_NONE )), - m_aRBLinear( pParent, SchResId( RB_LINEAR )), + m_aRBNone( pParent, SchResId( RB_NONE )), + m_aRBLinear( pParent, SchResId( RB_LINEAR )), m_aRBLogarithmic( pParent, SchResId( RB_LOGARITHMIC )), m_aRBExponential( pParent, SchResId( RB_EXPONENTIAL )), - m_aRBPower( pParent, SchResId( RB_POWER )), + m_aRBPower( pParent, SchResId( RB_POWER )), - m_aFINone( pParent, SchResId( FI_NONE )), - m_aFILinear( pParent, SchResId( FI_LINEAR )), + m_aFINone( pParent, SchResId( FI_NONE )), + m_aFILinear( pParent, SchResId( FI_LINEAR )), m_aFILogarithmic( pParent, SchResId( FI_LOGARITHMIC )), m_aFIExponential( pParent, SchResId( FI_EXPONENTIAL )), - m_aFIPower( pParent, SchResId( FI_POWER )), + m_aFIPower( pParent, SchResId( FI_POWER )), - m_aFLEquation( pParent, SchResId( FL_EQUATION )), - m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), + m_aFLEquation( pParent, SchResId( FL_EQUATION )), + m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )), m_aCBShowCorrelationCoeff( pParent, SchResId( CB_SHOW_CORRELATION_COEFF )), + m_eTrendLineType( CHREGRESS_NONE ), m_bNoneAvailable( bNoneAvailable ), m_bTrendLineUnique( true ) @@ -256,11 +257,11 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const void TrendlineResources::FillValueSets() { if( m_bNoneAvailable ) - m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE )) ); - m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR )) ); - m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG )) ); - m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP )) ); - m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER )) ); + m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE ) ) ); + m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR ) ) ); + m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG ) ) ); + m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP ) ) ); + m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER ) ) ); } void TrendlineResources::UpdateControlStates() diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 935e77370d46..dcf70f841db7 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -353,8 +353,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); - //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 597b20d4abe8..1ea3fe942b1b 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -77,7 +77,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ImageList m_aToolboxImageList; - ImageList m_aToolboxImageListHighContrast; /// handles actions of the toolbox DECL_LINK( ToolboxHdl, void* ); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 3eb69bed785e..4f315240d678 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1170,9 +1170,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors { uno::Sequence< datatransfer::DataFlavor > aRet(1); -// aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, -// C2U( "GDIMetaFile" ), -// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, C2U( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); @@ -1183,8 +1180,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (uno::RuntimeException) { -// return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || -// aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } |