chart2/inc/DataSeriesState.hxx | 81 ------------------------ chart2/source/view/inc/AbstractShapeFactory.hxx | 2 2 files changed, 83 deletions(-)
New commits: commit 168f26572ab320b210f4b9191ef6f152f01e6a38 Author: Markus Mohrhard <[email protected]> Date: Tue Apr 15 20:39:58 2014 +0200 remove some crap that should not have been pushed Change-Id: I92b9aa565fc04fb095cedc2a89df468b2f568ea1 diff --git a/chart2/inc/DataSeriesState.hxx b/chart2/inc/DataSeriesState.hxx deleted file mode 100644 index 061c467..0000000 --- a/chart2/inc/DataSeriesState.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef DATASERIES_HXX -#define DATASERIES_HXX - -#include <rtl/ustring.hxx> -#include <mdds/multi_type_vector.hpp> -#include <mdds/multi_type_vector_trait.hpp> -#include <vector> -#include <map> - -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/chart/MissingValueTreatment.hpp> - -namespace chart { - -class DataSequence -{ -public: - typedef mdds::multi_type_vector<mdds::mtv::element_block_func> DataSeriesType; - - // used for fast iteration through data series - // allows to easily skip empty data ranges - DataSeriesType getDataSeries(); - - size_t size(); - double getValue(size_t nIndex); - -private: - OUString maLabel; - DataSeriesType maDataSeries; - -}; - -/** - * point properties overwrite series properties - */ -struct DataSeriesProperties -{ - typedef std::map< OUString, com::sun::star::uno::Any > PropertyMap; - PropertyMap aSeriesProps; - // we might want to switch to multi_type_vector for better memory usage - // hopefully this vector is empty most of the time - std::vector< PropertyMap > aPointProps; - - sal_Int32 eMissingValueTreatment; -}; - -struct Axis -{ - double nMin; - double nMax; - bool bLog; - bool bInverseDirection; -}; - -struct DataSeriesState -{ - // length of the data series is min(aXValue.size(), aYValue.size()); - DataSequence aXValue; - DataSequence aYValue; - DataSeriesProperties aProperties; - // also contains bubble chart bubble size - // apply values to properties with functor - std::map<OUString, DataSequence> aMappedProperties; - Axis aXAxis; - Axis aYAxis; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index 833380c..b9b247f 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -29,8 +29,6 @@ #include <rtl/ustring.hxx> -#include "DataSeriesState.hxx" - namespace chart { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
