diff options
Diffstat (limited to 'chart2/source/controller/inc')
25 files changed, 199 insertions, 191 deletions
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index 7cae06bd446b..eb43cb984f76 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -28,8 +28,7 @@ #ifndef CHART_AXISITEMCONVERTER_HXX #define CHART_AXISITEMCONVERTER_HXX -#include <com/sun/star/chart2/ExplicitScaleData.hpp> -#include <com/sun/star/chart2/ExplicitIncrementData.hpp> +#include <chartview/ExplicitScaleValues.hxx> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/awt/Size.hpp> @@ -56,8 +55,8 @@ public: SdrModel& rDrawModel, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, - ::com::sun::star::chart2::ExplicitScaleData * pScale = NULL, - ::com::sun::star::chart2::ExplicitIncrementData * pIncrement = NULL, + ExplicitScaleData * pScale = NULL, + ExplicitIncrementData * pIncrement = NULL, ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize = ::std::auto_ptr< ::com::sun::star::awt::Size >() ); virtual ~AxisItemConverter(); @@ -66,12 +65,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: @@ -82,8 +81,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDoc; - ::com::sun::star::chart2::ExplicitScaleData * m_pExplicitScale; - ::com::sun::star::chart2::ExplicitIncrementData * m_pExplicitIncrement; + ExplicitScaleData* m_pExplicitScale; + ExplicitIncrementData* m_pExplicitIncrement; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 05086b005271..51b91c0dd3dd 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -60,12 +60,12 @@ public: virtual ~CharacterPropertyItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx index a28177ed236f..2964e9f889ea 100644 --- a/chart2/source/controller/inc/ConfigurationAccess.hxx +++ b/chart2/source/controller/inc/ConfigurationAccess.hxx @@ -30,7 +30,7 @@ #define _CHART2_CONFIGURATIONACCESS_HXX // header for enum FieldUnit -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 618979ac43da..9f9d6174289d 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -30,7 +30,7 @@ #include "ItemConverter.hxx" #include "GraphicPropertyItemConverter.hxx" -#include "chartview/NumberFormatterWrapper.hxx" +#include "NumberFormatterWrapper.hxx" #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/awt/Size.hpp> @@ -82,12 +82,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 93b5b4d64312..fda4898f274c 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -70,11 +70,11 @@ public: SdrPageView* GetPageView() const; SdrObject* getHitObject( const Point& rPnt ) const; - //BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const; - //BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const; - //BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } + //sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions, SdrObject** ppRootObj, sal_uLong* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const; + //sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions=0) const; + //sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } - //void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE); + //void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False); void MarkObject( SdrObject* pObj ); //---------------------- diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index e1e4af7b2350..8251e1e73ba7 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -30,7 +30,7 @@ #include "ItemConverter.hxx" #include "GraphicPropertyItemConverter.hxx" -#include "chartview/NumberFormatterWrapper.hxx" +#include "NumberFormatterWrapper.hxx" #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -64,12 +64,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 420d776abf2d..1d8ab0b96901 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -64,12 +64,12 @@ public: virtual ~GraphicPropertyItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 3515497b240f..5e20b7980c8b 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -27,131 +27,136 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#include <svl/solar.hrc> -//next is 120 -//free: 20, 21, 22, 30, 31, 32, 33 +#define HID_SCH_ALIGNMENT "CHART2_HID_SCH_ALIGNMENT" +#define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" +#define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" -//see old chart: schhids.h +#define HID_SCH_STAT "CHART2_HID_SCH_STAT" +#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" +#define HID_SCH_CTL_DATA "CHART2_HID_SCH_CTL_DATA" -#define HID_SCH_ALIGNMENT (HID_SCH_START + 4) -#define HID_SCH_LEGEND_POS (HID_SCH_START + 5) -#define HID_SCH_DATA_DESCR (HID_SCH_START + 6) - -#define HID_SCH_STAT (HID_SCH_START + 8) -#define HID_SCH_WIN_DOCUMENT (HID_SCH_START + 9) -#define HID_SCH_CTL_DATA (HID_SCH_START + 10) - -#define HID_SCH_CT_INDICATE (HID_SCH_START + 11) +#define HID_SCH_CT_INDICATE "CHART2_HID_SCH_CT_INDICATE" //for chart type dialog: -#define HID_SCH_CTL_TYPE (HID_SCH_START + 13) -#define HID_SCH_CTL_VARIANT (HID_SCH_START + 14) -#define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43) -#define HID_SCH_SERIES_LIST (HID_SCH_START + 15) -#define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16) - -#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23) -#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24) -#define HID_SCH_TBI_DATA_DELETE_ROW (HID_SCH_START + 25) -#define HID_SCH_TBI_DATA_DELETE_COL (HID_SCH_START + 26) -#define HID_SCH_TBI_DATA_SWAP_COL (HID_SCH_START + 27) -#define HID_SCH_TBI_DATA_SWAP_ROW (HID_SCH_START + 28) -#define HID_SCH_TBI_DATA_INSERT_TEXT_COL (HID_SCH_START + 29) -#define HID_SCH_TBX_DATA (HID_SCH_START + 34) - -#define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35) -#define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36) -#define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37) -#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) - -#define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44) -#define HID_SCH_LB_BAR_GEOMETRY (HID_SCH_START + 45) -#define HID_SCH_DLG_SPLINE_PROPERTIES (HID_SCH_START + 46) -#define HID_SCH_DLG_RANGES (HID_SCH_START + 47) - -#define HID_SCH_CB_XAXIS (HID_SCH_START + 48) -#define HID_SCH_CB_YAXIS (HID_SCH_START + 49) -#define HID_SCH_CB_ZAXIS (HID_SCH_START + 50) -#define HID_SCH_CB_SECONDARY_XAXIS (HID_SCH_START + 51) -#define HID_SCH_CB_SECONDARY_YAXIS (HID_SCH_START + 52) -#define HID_SCH_CB_SECONDARY_ZAXIS (HID_SCH_START + 53) - -#define HID_SCH_CB_XGRID (HID_SCH_START + 54) -#define HID_SCH_CB_YGRID (HID_SCH_START + 55) -#define HID_SCH_CB_ZGRID (HID_SCH_START + 56) -#define HID_SCH_CB_SECONDARY_XGRID (HID_SCH_START + 57) -#define HID_SCH_CB_SECONDARY_YGRID (HID_SCH_START + 58) -#define HID_SCH_CB_SECONDARY_ZGRID (HID_SCH_START + 59) - -#define HID_SCH_LEGEND_POS_LEFT (HID_SCH_START + 60) -#define HID_SCH_LEGEND_POS_TOP (HID_SCH_START + 61) -#define HID_SCH_LEGEND_POS_RIGHT (HID_SCH_START + 62) -#define HID_SCH_LEGEND_POS_BOTTOM (HID_SCH_START + 63) - -#define HID_SCH_STATISTIK_MEANVALUE (HID_SCH_START + 64) -#define HID_SCH_STATISTIK_NO_ERROR (HID_SCH_START + 65) -#define HID_SCH_STATISTIK_VARIANT (HID_SCH_START + 66) -#define HID_SCH_STATISTIK_SIGMA (HID_SCH_START + 67) -#define HID_SCH_STATISTIK_PERCENT (HID_SCH_START + 68) -#define HID_SCH_STATISTIK_BIGERROR (HID_SCH_START + 69) -#define HID_SCH_STATISTIK_CONSTERROR (HID_SCH_START + 70) -#define HID_SCH_STATISTIK_PERCENT_VALUE (HID_SCH_START + 71) -#define HID_SCH_STATISTIK_BIGERROR_VALUE (HID_SCH_START + 72) -#define HID_SCH_STATISTIK_PLUS_VALUE (HID_SCH_START + 73) -#define HID_SCH_STATISTIK_MINUS_VALUE (HID_SCH_START + 74) - -#define HID_SCH_DATALABEL_VALUE (HID_SCH_START + 75) -#define HID_SCH_DATALABEL_NUMBER (HID_SCH_START + 76) -#define HID_SCH_DATALABEL_PERCENT (HID_SCH_START + 77) -#define HID_SCH_DATALABEL_TEXT (HID_SCH_START + 78) -#define HID_SCH_DATALABEL_SYMBOL (HID_SCH_START + 79) -#define HID_SCH_PB_NUMBERFORMAT (HID_SCH_START + 88) -#define HID_SCH_PB_PERCENT_NUMBERFORMAT (HID_SCH_START + 89) -#define HID_SCH_DATALABEL_SEPARATOR (HID_SCH_START + 90) -#define HID_SCH_DATALABEL_PLACEMENT (HID_SCH_START + 91) -#define HID_SCH_TEXTDIRECTION (HID_SCH_START + 115) -#define HID_SCH_TEXTDIRECTION_TITLE (HID_SCH_START + 116) -#define HID_SCH_TEXTDIRECTION_EQUATION (HID_SCH_START + 117) -#define HID_SCH_DATALABEL_ROTATION_KNOB (HID_SCH_START + 118) -#define HID_SCH_DATALABEL_ROTATION_EDIT (HID_SCH_START + 119) - -#define HID_SCH_TITLE_MAIN (HID_SCH_START + 80) -#define HID_SCH_TITLE_SUB (HID_SCH_START + 81) -#define HID_SCH_TITLE_X (HID_SCH_START + 82) -#define HID_SCH_TITLE_Y (HID_SCH_START + 83) -#define HID_SCH_TITLE_Z (HID_SCH_START + 84) -#define HID_SCH_TITLE_SECONDARY_X (HID_SCH_START + 92) -#define HID_SCH_TITLE_SECONDARY_Y (HID_SCH_START + 93) - -#define HID_SCH_WIZARD_ROADMAP (HID_SCH_START + 85) -#define HID_SCH_LEGEND_SHOW (HID_SCH_START + 86) -#define HID_SCH_DATA_SERIES_LABEL (HID_SCH_START + 87) - -#define HID_SCH_STARTING_ANGLE_DIAL (HID_SCH_START + 94) - -#define HID_SCH_TRENDLINE_RB_NONE (HID_SCH_START + 95) -#define HID_SCH_TRENDLINE_RB_LINEAR (HID_SCH_START + 96) -#define HID_SCH_TRENDLINE_RB_LOGARITHMIC (HID_SCH_START + 97) -#define HID_SCH_TRENDLINE_RB_EXPONENTIAL (HID_SCH_START + 98) -#define HID_SCH_TRENDLINE_RB_POWER (HID_SCH_START + 99) -#define HID_SCH_TRENDLINE_SHOW_EQUATION (HID_SCH_START + 100) -#define HID_SCH_TRENDLINE_SHOW_R_SQUARED (HID_SCH_START + 101) - -#define HID_SCH_STATISTIK_FUNCTION (HID_SCH_START + 102) -#define HID_SCH_STATISTIK_RANGE (HID_SCH_START + 103) -#define HID_SCH_STATISTIK_FUNCTION_LB (HID_SCH_START + 104) -#define HID_SCH_STATISTIK_POSITIVE_VALUE (HID_SCH_START + 105) -#define HID_SCH_STATISTIK_POSITIVE_RANGE (HID_SCH_START + 106) -#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER (HID_SCH_START + 107) -#define HID_SCH_STATISTIK_NEGATIVE_VALUE (HID_SCH_START + 108) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE (HID_SCH_START + 109) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER (HID_SCH_START + 110) -#define HID_SCH_STATISTIK_SAME_FOR_BOTH (HID_SCH_START + 111) -#define HID_SCH_STATISTIK_SHOW_BOTH (HID_SCH_START + 112) -#define HID_SCH_STATISTIK_SHOW_POSITIVE (HID_SCH_START + 113) -#define HID_SCH_STATISTIK_SHOW_NEGATIVE (HID_SCH_START + 114) - - -// HID_SCH_START should be 63280 (checked 25.Nov 2002) +#define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE" +#define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT" +#define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES" +#define HID_SCH_SERIES_LIST "CHART2_HID_SCH_SERIES_LIST" +#define HID_SCH_DATA_RANGES_LIST "CHART2_HID_SCH_DATA_RANGES_LIST" +// + +#define HID_SCH_TBI_DATA_INSERT_ROW "CHART2_HID_SCH_TBI_DATA_INSERT_ROW" +#define HID_SCH_TBI_DATA_INSERT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_COL" +#define HID_SCH_TBI_DATA_DELETE_ROW "CHART2_HID_SCH_TBI_DATA_DELETE_ROW" +#define HID_SCH_TBI_DATA_DELETE_COL "CHART2_HID_SCH_TBI_DATA_DELETE_COL" +#define HID_SCH_TBI_DATA_SWAP_COL "CHART2_HID_SCH_TBI_DATA_SWAP_COL" +#define HID_SCH_TBI_DATA_SWAP_ROW "CHART2_HID_SCH_TBI_DATA_SWAP_ROW" +#define HID_SCH_TBI_DATA_INSERT_TEXT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL" +#define HID_SCH_TBX_DATA "CHART2_HID_SCH_TBX_DATA" + +#define HID_SCH_ALIGNMENT_CTR_DIAL "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL" +#define HID_SCH_ALIGNMENT_STACKED "CHART2_HID_SCH_ALIGNMENT_STACKED" +#define HID_SCH_ALIGNMENT_DEGREES "CHART2_HID_SCH_ALIGNMENT_DEGREES" + +#define HID_SCH_TP_AXIS_LABEL "CHART2_HID_SCH_TP_AXIS_LABEL" + +#define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT" +#define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY" +#define HID_SCH_DLG_SPLINE_PROPERTIES "CHART2_HID_SCH_DLG_SPLINE_PROPERTIES" +#define HID_SCH_DLG_RANGES "CHART2_HID_SCH_DLG_RANGES" + +#define HID_SCH_CB_XAXIS "CHART2_HID_SCH_CB_XAXIS" +#define HID_SCH_CB_YAXIS "CHART2_HID_SCH_CB_YAXIS" +#define HID_SCH_CB_ZAXIS "CHART2_HID_SCH_CB_ZAXIS" +#define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS" +#define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS" +#define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS" + +#define HID_SCH_CB_XGRID "CHART2_HID_SCH_CB_XGRID" +#define HID_SCH_CB_YGRID "CHART2_HID_SCH_CB_YGRID" +#define HID_SCH_CB_ZGRID "CHART2_HID_SCH_CB_ZGRID" +#define HID_SCH_CB_SECONDARY_XGRID "CHART2_HID_SCH_CB_SECONDARY_XGRID" +#define HID_SCH_CB_SECONDARY_YGRID "CHART2_HID_SCH_CB_SECONDARY_YGRID" +#define HID_SCH_CB_SECONDARY_ZGRID "CHART2_HID_SCH_CB_SECONDARY_ZGRID" + +#define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT" +#define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP" +#define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT" +#define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM" + +#define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE" +#define HID_SCH_STATISTIK_NO_ERROR "CHART2_HID_SCH_STATISTIK_NO_ERROR" +#define HID_SCH_STATISTIK_VARIANT "CHART2_HID_SCH_STATISTIK_VARIANT" +#define HID_SCH_STATISTIK_SIGMA "CHART2_HID_SCH_STATISTIK_SIGMA" +#define HID_SCH_STATISTIK_PERCENT "CHART2_HID_SCH_STATISTIK_PERCENT" +#define HID_SCH_STATISTIK_BIGERROR "CHART2_HID_SCH_STATISTIK_BIGERROR" +#define HID_SCH_STATISTIK_CONSTERROR "CHART2_HID_SCH_STATISTIK_CONSTERROR" +#define HID_SCH_STATISTIK_PERCENT_VALUE "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE" +#define HID_SCH_STATISTIK_BIGERROR_VALUE "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE" +#define HID_SCH_STATISTIK_PLUS_VALUE "CHART2_HID_SCH_STATISTIK_PLUS_VALUE" +#define HID_SCH_STATISTIK_MINUS_VALUE "CHART2_HID_SCH_STATISTIK_MINUS_VALUE" + +#define HID_SCH_DATALABEL_VALUE "CHART2_HID_SCH_DATALABEL_VALUE" +#define HID_SCH_DATALABEL_NUMBER "CHART2_HID_SCH_DATALABEL_NUMBER" +#define HID_SCH_DATALABEL_PERCENT "CHART2_HID_SCH_DATALABEL_PERCENT" +#define HID_SCH_DATALABEL_TEXT "CHART2_HID_SCH_DATALABEL_TEXT" +#define HID_SCH_DATALABEL_SYMBOL "CHART2_HID_SCH_DATALABEL_SYMBOL" +#define HID_SCH_PB_NUMBERFORMAT "CHART2_HID_SCH_PB_NUMBERFORMAT" +#define HID_SCH_PB_PERCENT_NUMBERFORMAT "CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT" +#define HID_SCH_DATALABEL_SEPARATOR "CHART2_HID_SCH_DATALABEL_SEPARATOR" +#define HID_SCH_DATALABEL_PLACEMENT "CHART2_HID_SCH_DATALABEL_PLACEMENT" +#define HID_SCH_TEXTDIRECTION "CHART2_HID_SCH_TEXTDIRECTION" +#define HID_SCH_TEXTDIRECTION_TITLE "CHART2_HID_SCH_TEXTDIRECTION_TITLE" +#define HID_SCH_TEXTDIRECTION_EQUATION "CHART2_HID_SCH_TEXTDIRECTION_EQUATION" +#define HID_SCH_DATALABEL_ROTATION_KNOB "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB" +#define HID_SCH_DATALABEL_ROTATION_EDIT "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT" + +#define HID_SCH_TITLE_MAIN "CHART2_HID_SCH_TITLE_MAIN" +#define HID_SCH_TITLE_SUB "CHART2_HID_SCH_TITLE_SUB" +#define HID_SCH_TITLE_X "CHART2_HID_SCH_TITLE_X" +#define HID_SCH_TITLE_Y "CHART2_HID_SCH_TITLE_Y" +#define HID_SCH_TITLE_Z "CHART2_HID_SCH_TITLE_Z" +#define HID_SCH_TITLE_SECONDARY_X "CHART2_HID_SCH_TITLE_SECONDARY_X" +#define HID_SCH_TITLE_SECONDARY_Y "CHART2_HID_SCH_TITLE_SECONDARY_Y" + +#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP" +#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW" +#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL" + +#define HID_SCH_STARTING_ANGLE_DIAL "CHART2_HID_SCH_STARTING_ANGLE_DIAL" + +#define HID_SCH_TRENDLINE_RB_NONE "CHART2_HID_SCH_TRENDLINE_RB_NONE" +#define HID_SCH_TRENDLINE_RB_LINEAR "CHART2_HID_SCH_TRENDLINE_RB_LINEAR" +#define HID_SCH_TRENDLINE_RB_LOGARITHMIC "CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC" +#define HID_SCH_TRENDLINE_RB_EXPONENTIAL "CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL" +#define HID_SCH_TRENDLINE_RB_POWER "CHART2_HID_SCH_TRENDLINE_RB_POWER" +#define HID_SCH_TRENDLINE_SHOW_EQUATION "CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION" +#define HID_SCH_TRENDLINE_SHOW_R_SQUARED "CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED" + +#define HID_SCH_STATISTIK_FUNCTION "CHART2_HID_SCH_STATISTIK_FUNCTION" +#define HID_SCH_STATISTIK_RANGE "CHART2_HID_SCH_STATISTIK_RANGE" +#define HID_SCH_STATISTIK_FUNCTION_LB "CHART2_HID_SCH_STATISTIK_FUNCTION_LB" +#define HID_SCH_STATISTIK_POSITIVE_VALUE "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_NEGATIVE_VALUE "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_SAME_FOR_BOTH "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH" +#define HID_SCH_STATISTIK_SHOW_BOTH "CHART2_HID_SCH_STATISTIK_SHOW_BOTH" +#define HID_SCH_STATISTIK_SHOW_POSITIVE "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE" +#define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE" + +#define HID_INSERT_GRIDS "CHART2_HID_INSERT_GRIDS" + +#define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE" +#define HID_3D_VIEW "CHART2_HID_3D_VIEW" +#define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA" +#define HID_INSERT_AXIS "CHART2_HID_INSERT_AXIS" +#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS" +#define HID_INSERT_TITLE "CHART2_HID_INSERT_TITLE" +#define HID_INSERT_CHART_LEGEND "CHART2_HID_INSERT_CHART_LEGEND" +#define HID_INSERT_DESCRIPTION "CHART2_HID_INSERT_DESCRIPTION" + #endif diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 619ea1b483d4..25c5ef5a817c 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -90,9 +90,9 @@ public: // typedefs ------------------------------- - typedef USHORT tWhichIdType; + typedef sal_uInt16 tWhichIdType; typedef ::rtl::OUString tPropertyNameType; - typedef BYTE tMemberIdType; + typedef sal_uInt8 tMemberIdType; typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; @@ -134,7 +134,7 @@ protected: /** implement this method to provide an array of which-ranges of the form: - const USHORT aMyPairs[] = + const sal_uInt16 aMyPairs[] = { from_1, to_1, from_2, to_2, @@ -143,7 +143,7 @@ protected: 0 }; */ - virtual const USHORT * GetWhichPairs() const = 0; + virtual const sal_uInt16 * GetWhichPairs() const = 0; /** implement this method to return a Property object for a given which id. @@ -162,7 +162,7 @@ protected: The default implementation does nothing except showing an assertion */ - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); /** for items that can not be mapped directly to a property. @@ -174,7 +174,7 @@ protected: @return true if the item changed a property, false otherwise. */ - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); // ________ diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index 9c008f972b74..9ec794aed482 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -61,12 +61,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 00f05c32f8da..a4f08c697525 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -56,7 +56,7 @@ public: virtual ~AllAxisItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; }; class AllGridItemConverter : public ::comphelper::MultipleItemConverter @@ -72,7 +72,7 @@ public: virtual ~AllGridItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; }; class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter @@ -90,7 +90,7 @@ public: virtual ~AllDataLabelItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; }; class AllTitleItemConverter : public ::comphelper::MultipleItemConverter @@ -108,7 +108,7 @@ public: virtual ~AllTitleItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; }; class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter @@ -121,7 +121,7 @@ public: virtual ~AllSeriesStatisticsConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 89e27a67c7e1..7ac432bd1c7d 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -37,7 +37,7 @@ namespace comphelper { -/** Note: virtual const USHORT * GetWhichPairs() const; is still pure virtual +/** Note: virtual const sal_uInt16 * GetWhichPairs() const; is still pure virtual */ class MultipleItemConverter : public ItemConverter { diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 9aa85a8858c9..a02a0d956515 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -62,12 +62,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 2064cb77fc50..799189ff1017 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -65,12 +65,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index f900d1096976..1029accb3f3a 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -55,12 +55,12 @@ public: virtual ~SeriesOptionsItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index e20a3f839068..44e157039a89 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -32,7 +32,7 @@ #include "ItemConverter.hxx" #include "GraphicPropertyItemConverter.hxx" -#include "chartview/NumberFormatterWrapper.hxx" +#include "NumberFormatterWrapper.hxx" #include <vector> @@ -56,12 +56,12 @@ public: virtual ~StatisticsItemConverter(); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index e5ba911fa411..cb149ffdd43f 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -62,12 +62,12 @@ public: virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); protected: - virtual const USHORT * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; - virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const throw( ::com::sun::star::uno::Exception ); - virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ); private: diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 1ea3fe942b1b..74ef15aa9fce 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -63,7 +63,7 @@ public: virtual void Resize(); // Dialog - virtual BOOL Close(); + virtual sal_Bool Close(); void SetReadOnly( bool bReadOnly ); bool ApplyChangesToModel(); diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index c385ebc26dfa..140066f5b5c1 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -90,7 +90,7 @@ private: bool m_bRangeChooserTabIsValid; bool m_bDataSourceTabIsValid; - static USHORT m_nLastPageId; + static sal_uInt16 m_nLastPageId; }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index c0512731db4c..62d9c0cf578b 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -74,7 +74,7 @@ protected: HelpButton aPbHelp; public: - SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, BOOL bAxisDlg=true ); + SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, sal_Bool bAxisDlg=true ); virtual ~SchAxisDlg(); void getResult( InsertAxisOrGridDialogData& rOutput ); diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 02deda974fc3..2f40c7dcc20c 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -70,6 +70,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; + bool IsComplexCategoriesAxis() const; + private: rtl::OUString m_aObjectCID; ObjectType m_eObjectType; @@ -97,6 +99,8 @@ private: ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; + + bool m_bComplexCategoriesAxis; }; /************************************************************************* @@ -112,8 +116,8 @@ class SchAttribTabDlg : public SfxTabDialog private: ObjectType eObjectType; bool bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - USHORT nDlgType; - USHORT nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPageType; const ObjectPropertiesDialogParameter * const m_pParameter; const ViewElementListProvider* const m_pViewElementListProvider; @@ -125,7 +129,7 @@ private: double m_fAxisMinorStepWidthForErrorBarDecimals; bool m_bOKPressed; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); Link m_aOriginalOKClickHdl; DECL_LINK( OKPressed, void * ); diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index cc9f29cb8e2f..6fdab7a1eca3 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -47,7 +47,7 @@ public: virtual ~ShapeFontDialog(); private: - virtual void PageCreated( USHORT nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); const ViewElementListProvider* m_pViewElementListProvider; }; diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index 8eeaecb6e9de..404bb6e0081a 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -44,7 +44,7 @@ public: virtual ~ShapeParagraphDialog(); private: - virtual void PageCreated( USHORT nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); }; //............................................................................. diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index f11a9c2d7895..d9e82e93000c 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -73,7 +73,7 @@ private: ControllerLockHelper m_aControllerLocker; - static USHORT m_nLastPageId; + static sal_uInt16 m_nLastPageId; }; //............................................................................. diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index ad8871dbbc33..74ee6de625fe 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -74,7 +74,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument ); void Reset(const SfxItemSet& rInAttrs); - BOOL FillItemSet(SfxItemSet& rOutAttrs) const; + sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const; void FillValueSets(); |