diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 17:26:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 17:26:48 +0000 |
| commit | 25dbebda88a273885782fd0520c94326a053952c (patch) | |
| tree | d4a3791e3474d24d963137b4b07a3f300587a08d /chart2/source/inc/chartview | |
| parent | INTEGRATION: CWS chart2mst3 (1.2.4); FILE MERGED (diff) | |
| download | core-25dbebda88a273885782fd0520c94326a053952c.tar.gz core-25dbebda88a273885782fd0520c94326a053952c.zip | |
INTEGRATION: CWS chart2mst3 (1.2.4); FILE MERGED
2006/12/15 13:34:13 iha 1.2.4.6: #i72360# use axis number format for data labels when one is provided
2005/10/07 11:48:53 bm 1.2.4.5: RESYNC: (1.2-1.3); FILE MERGED
2005/07/21 14:47:06 bm 1.2.4.4: support for number formats from data provider
2005/06/10 18:18:42 iha 1.2.4.3: removed comment
2005/06/08 11:30:25 iha 1.2.4.2: use number format key at API instead of string
2005/06/07 15:46:16 iha 1.2.4.1: use numberformatter from model
Diffstat (limited to 'chart2/source/inc/chartview')
| -rw-r--r-- | chart2/source/inc/chartview/NumberFormatterWrapper.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 7c8f7d3aff25..dd81fad2c49d 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: NumberFormatterWrapper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 00:49:15 $ + * last change: $Author: vg $ $Date: 2007-05-22 18:26:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,15 +35,14 @@ #ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX #define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX -#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <com/sun/star/chart2/NumberFormat.hpp> -#endif - -//only needed for temp numberformatter #ifndef _ZFORLIST_HXX #include <svtools/zforlist.hxx> #endif +#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#endif + //............................................................................. namespace chart { @@ -57,34 +56,35 @@ class FixedNumberFormatter; class NumberFormatterWrapper { public: - NumberFormatterWrapper(); + NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ); virtual ~NumberFormatterWrapper(); - ::com::sun::star::chart2::NumberFormat getNumberFormatForKey( sal_Int32 nIndex ) const; - sal_Int32 getKeyForNumberFormat( const ::com::sun::star::chart2::NumberFormat& rNumberFormat ) const; - - //this method should only be used by the ViewElementListProvider SvNumberFormatter* getSvNumberFormatter() const; + ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; + + rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; private: //private member - SvNumberFormatter* m_pNumberFormatter; + ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > + m_xNumberFormatsSupplier; -friend class FixedNumberFormatter; + SvNumberFormatter* m_pNumberFormatter; }; class FixedNumberFormatter { public: - FixedNumberFormatter( NumberFormatterWrapper* pNumberFormatterWrapper - , const ::com::sun::star::chart2::NumberFormat& rNumberFormat ); + FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier + , sal_Int32 nNumberFormatKey ); virtual ~FixedNumberFormatter(); rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; private: - NumberFormatterWrapper* m_pNumberFormatterWrapper; - ULONG m_nFormatIndex; + NumberFormatterWrapper m_aNumberFormatterWrapper; + ULONG m_nNumberFormatKey; }; //............................................................................. |