diff options
Diffstat (limited to 'chart2/source/view/axes/VAxisBase.cxx')
| -rw-r--r-- | chart2/source/view/axes/VAxisBase.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 3844a1074df9..30aead187dcb 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -21,11 +21,10 @@ #include <ShapeFactory.hxx> #include <ExplicitCategoriesProvider.hxx> #include "Tickmarks.hxx" -#include <com/sun/star/drawing/XShapes.hpp> +#include <Axis.hxx> +#include <VSeriesPlotter.hxx> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <osl/diagnose.h> @@ -85,10 +84,10 @@ void VAxisBase::initAxisLabelProperties( const css::awt::Size& rFontReferenceSiz m_bUseTextLabels = true; } - m_aAxisLabelProperties.nNumberFormatKey = m_aAxisProperties.m_nNumberFormatKey; + m_aAxisLabelProperties.m_nNumberFormatKey = m_aAxisProperties.m_nNumberFormatKey; m_aAxisLabelProperties.init(m_aAxisProperties.m_xAxisModel); if( m_aAxisProperties.m_bComplexCategories && m_aAxisProperties.m_nAxisType == AxisType::CATEGORY ) - m_aAxisLabelProperties.eStaggering = AxisLabelStaggering::SideBySide; + m_aAxisLabelProperties.m_eStaggering = AxisLabelStaggering::SideBySide; } bool VAxisBase::isDateAxis() const @@ -136,11 +135,10 @@ bool VAxisBase::isAnythingToDraw() if(!(m_xLogicTarget.is()&&m_xFinalTarget.is())) return false; - uno::Reference< beans::XPropertySet > xProps( m_aAxisProperties.m_xAxisModel, uno::UNO_QUERY ); - if( xProps.is() ) + if( m_aAxisProperties.m_xAxisModel.is() ) { bool bShow = false; - xProps->getPropertyValue( "Show" ) >>= bShow; + m_aAxisProperties.m_xAxisModel->getPropertyValue( "Show" ) >>= bShow; if( !bShow ) return false; } @@ -186,8 +184,10 @@ bool VAxisBase::prepareShapeCreation() //create named group shape m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); - if( m_aAxisProperties.m_bDisplayLabels ) + if (m_aAxisProperties.m_bDisplayLabels) m_xTextTarget = ShapeFactory::createGroup2D( m_xFinalTarget, m_aCID ); + if (m_aAxisProperties.m_bDisplayDataTable) + m_xDataTableTarget = ShapeFactory::createGroup2D(m_xFinalTarget); return true; } @@ -242,6 +242,13 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter ) } } +void VAxisBase::createDataTableView(std::vector<std::unique_ptr<VSeriesPlotter>>& /*rSeriesPlotterList*/, + uno::Reference<util::XNumberFormatsSupplier> const& /*xNumberFormatsSupplier*/, + rtl::Reference<::chart::ChartModel> const& /*xChartDoc*/, + css::uno::Reference<css::uno::XComponentContext> const& /*rComponentContext*/) +{ +} + } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |