diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 13:59:23 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-13 11:04:31 +0000 |
commit | cc6725773b0bd2b8984f516e8faf01e9aa520681 (patch) | |
tree | aa7565ea1f106193f020b33fce1e0ac9fb693f99 /sc/source/ui/inc/pvlaydlg.hxx | |
parent | 02ef234b77b6c5f4c0d6634881168313e97288d1 (diff) |
Various adjustments of the pivot table
especially relative positions were relative
to the dialog which was assumed to be then
a direct parent of the widgets so that
a simple calculation could make the positions
relative to the widgets
also now the pivot table fits into a 768 pixel high
screen
Change-Id: I86a4155439872e8273943b90f15320e560e237a4
Diffstat (limited to 'sc/source/ui/inc/pvlaydlg.hxx')
-rw-r--r-- | sc/source/ui/inc/pvlaydlg.hxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index b4548ce362b2..7f3f4c0a419c 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -79,6 +79,18 @@ class ScDocument; struct ScPivotFuncData; class ScDPObject; +#define PIVOTSTR_SUM 0 +#define PIVOTSTR_COUNT 1 +#define PIVOTSTR_AVG 2 +#define PIVOTSTR_MAX 3 +#define PIVOTSTR_MIN 4 +#define PIVOTSTR_PROD 5 +#define PIVOTSTR_COUNT2 6 +#define PIVOTSTR_DEV 7 +#define PIVOTSTR_DEV2 8 +#define PIVOTSTR_VAR 9 +#define PIVOTSTR_VAR2 10 + class ScPivotLayoutDlg : public ScAnyRefDlg { /** data source type */ @@ -102,7 +114,7 @@ public: void NotifyMoveFieldToEnd ( ScPivotFieldType eToType ); void NotifyRemoveField ( ScPivotFieldType eType, size_t nFieldIndex ); - Size GetStdFieldBtnSize() const; + Size GetStdFieldBtnSize() const; /** * Drop currently dragged field item into specified position. @@ -113,10 +125,10 @@ public: void DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType ); /** - * Get pointer style at current mouse position during dragging of field + * Get pointer style during dragging of field * item. */ - PointerStyle GetPointerStyleAtPoint( const Point& rScrPos, ScPivotFieldType eFieldType ); + PointerStyle GetPointerStyle( ScPivotFieldType eFieldType ); /** * Determine the type of field at mouse cursor position. @@ -133,8 +145,8 @@ protected: virtual sal_Bool Close(); private: - /** Returns the localized function name for the specified (1-based) resource index. */ - inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } + /** Returns the localized function name for the specified resource index. */ + inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx]; } /** Fills the field windows from the current pivot table settings. */ void InitFieldWindows(); |