diff options
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_DataEditor.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_DataEditor.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 3cb9598cb2e9..ee120df76fe7 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -19,11 +19,10 @@ #include <dlg_DataEditor.hxx> #include "DataBrowser.hxx" -#include <comphelper/stl_types.hxx> +#include <ChartModel.hxx> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/frame/XStorable.hpp> +#include <utility> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -32,11 +31,11 @@ namespace chart { DataEditor::DataEditor(weld::Window* pParent, - const Reference< chart2::XChartDocument > & xChartDoc, + rtl::Reference<::chart::ChartModel> xChartDoc, const Reference< uno::XComponentContext > & xContext) : GenericDialogController(pParent, "modules/schart/ui/chartdatadialog.ui", "ChartDataDialog") , m_bReadOnly(false) - , m_xChartDoc(xChartDoc) + , m_xChartDoc(std::move(xChartDoc)) , m_xContext(xContext) , m_xTbxData(m_xBuilder->weld_toolbar("toolbar")) , m_xCloseBtn(m_xBuilder->weld_button("close")) @@ -57,13 +56,12 @@ DataEditor::DataEditor(weld::Window* pParent, m_xBrwData->SetCursorMovedHdl( LINK( this, DataEditor, BrowserCursorMovedHdl )); - m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); + m_xBrwData->SetDataFromModel( m_xChartDoc ); m_xBrwData->GrabFocus(); bool bReadOnly = true; - Reference< frame::XStorable > xStor( m_xChartDoc, uno::UNO_QUERY ); - if( xStor.is()) - bReadOnly = xStor->isReadonly(); + if( m_xChartDoc.is()) + bReadOnly = m_xChartDoc->isReadonly(); SetReadOnly( bReadOnly ); } @@ -75,7 +73,7 @@ DataEditor::~DataEditor() } // react on click (or keypress) on toolbar icon -IMPL_LINK(DataEditor, ToolboxHdl, const OString&, rId, void) +IMPL_LINK(DataEditor, ToolboxHdl, const OUString&, rId, void) { if (rId == "InsertRow") m_xBrwData->InsertRow(); @@ -113,8 +111,8 @@ IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) m_xTbxData->set_item_sensitive("MoveLeftColumn", bIsDataValid && m_xBrwData->MayMoveLeftColumns() ); m_xTbxData->set_item_sensitive("MoveRightColumn", bIsDataValid && m_xBrwData->MayMoveRightColumns() ); - m_xTbxData->set_item_sensitive("MoveUpRow", bIsDataValid && m_xBrwData->MayMoveDownRows() ); - m_xTbxData->set_item_sensitive("MoveDownRow", bIsDataValid && m_xBrwData->MayMoveUpRows() ); + m_xTbxData->set_item_sensitive("MoveDownRow", bIsDataValid && m_xBrwData->MayMoveDownRows() ); + m_xTbxData->set_item_sensitive("MoveUpRow", bIsDataValid && m_xBrwData->MayMoveUpRows() ); } // disable all modifying controls |