diff options
Diffstat (limited to 'chart2')
9 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index b852d561764d..0ddb6c1b4038 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::chart2; sal_uInt16 View3DDialog::m_nLastPageId = 0; -View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable ) +View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorList* pColorTable ) : TabDialog(pParent,SchResId(DLG_3D_VIEW)) , m_aTabControl(this,SchResId(TABCTRL)) , m_aBtnOK(this,SchResId(BTN_OK)) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index e6548b58d112..0621e1883318 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -287,7 +287,7 @@ namespace ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel - , XColorTable* pColorTable ) + , XColorList* pColorTable ) : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) , m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) ) , m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 71c16c683bdf..990ece9af8f9 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -79,7 +79,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, - XColorTable* pColorTable=0 ); + XColorList* pColorTable=0 ); virtual ~ThreeD_SceneIllumination_TabPage(); // has to be called in case the dialog was closed with OK diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index bf1096a26e25..0f209a85afb3 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -94,7 +94,7 @@ ViewElementListProvider::~ViewElementListProvider() //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -XColorTable* ViewElementListProvider::GetColorTable() const +XColorList* ViewElementListProvider::GetColorTable() const { if(m_pDrawModelWrapper) return m_pDrawModelWrapper->GetColorTable(); diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx index b6e2b79f93b3..ef1ced680dda 100644 --- a/chart2/source/controller/inc/ViewElementListProvider.hxx +++ b/chart2/source/controller/inc/ViewElementListProvider.hxx @@ -46,7 +46,7 @@ public: ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper ); virtual ~ViewElementListProvider(); - XColorTable* GetColorTable() const; + XColorList* GetColorTable() const; XDashList* GetDashList() const; XLineEndList* GetLineEndList() const; XGradientList* GetGradientList() const; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index d9e82e93000c..699916ff7b88 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -37,7 +37,7 @@ #include <vcl/tabctrl.hxx> // header for class OKButton #include <vcl/button.hxx> -// header for class XColorTable +// header for class XColorList #include <svx/xtable.hxx> #include "ControllerLockGuard.hxx" @@ -55,7 +55,7 @@ class View3DDialog : public TabDialog public: View3DDialog( Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, - XColorTable* pColorTable=0 ); + XColorList* pColorTable=0 ); ~View3DDialog(); // from Dialog (base of TabDialog) diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index f633c990a16c..9f67c4b5893d 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -328,7 +328,7 @@ void ShapeController::executeDispatch_FormatArea() SfxItemPool& rItemPool = pDrawViewWrapper->GetModel()->GetItemPool(); SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(), rItemPool.GetLastWhich() ); const SvxColorTableItem* pColorItem = static_cast< const SvxColorTableItem* >( aSet.GetItem( SID_COLOR_TABLE ) ); - if ( pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable() ) + if ( pColorItem && pColorItem->GetColorTable() == &XColorList::GetStdColorTable() ) { pDlg->DontDeleteColorTable(); } diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 8a39c3dd9519..f2ae17ddb2a5 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -96,7 +96,7 @@ public: getUnoModel(); SdrModel& getSdrModel(); - XColorTable* GetColorTable() const; + XColorList* GetColorTable() const; XDashList* GetDashList() const; XLineEndList* GetLineEndList() const; XGradientList* GetGradientList() const; diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 938ba9ea9758..44f2f37c36b7 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -339,7 +339,7 @@ const SfxItemPool& DrawModelWrapper::GetItemPool() const { return this->SdrModel::GetItemPool(); } -XColorTable* DrawModelWrapper::GetColorTable() const +XColorList* DrawModelWrapper::GetColorTable() const { return this->SdrModel::GetColorTable(); } |