1 files changed, 34 insertions, 35 deletions

diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 318f4e9927fe..b4548ce362b2 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -139,7 +139,7 @@ private:
     /** Fills the field windows from the current pivot table settings. */
     void                InitFieldWindows();
     /** Sets focus to the specified field control, if it is not empty. */
-    void                GrabFieldFocus( ScDPFieldControlBase& rFieldWindow );
+    void                GrabFieldFocus( ScDPFieldControlBase* rFieldWindow );
 
     void InitWndSelect(const ScDPLabelDataVector& rLabels);
     void InitWndData(const std::vector<ScPivotField>& rFields);
@@ -166,7 +166,7 @@ private:
     void UpdateSrcRange();
     void UpdateOutputPos();
     void OutputPosUpdated();
-    void MoreBtnClicked();
+    void ExpanderClicked();
 
     void                    RepaintFieldWindows();
 
@@ -188,7 +188,7 @@ private:
     DECL_LINK( ClickHdl, PushButton * );
     DECL_LINK( OkHdl, void * );
     DECL_LINK( CancelHdl, void * );
-    DECL_LINK( MoreClickHdl, void * );
+    DECL_LINK( ExpandHdl, void * );
     DECL_LINK( EdOutModifyHdl, void * );
     DECL_LINK( EdInModifyHdl, void * );
     DECL_LINK( SelAreaHdl, void * );
@@ -197,41 +197,40 @@ private:
 private:
     typedef boost::scoped_ptr<ScDPObject> ScDPObjectPtr;
 
-    FixedLine               maFlLayout;
-    FixedText               maFtPage;
-    ScDPPageFieldControl    maWndPage;
-    FixedText               maFtCol;
-    ScDPColFieldControl     maWndCol;
-    FixedText               maFtRow;
-    ScDPRowFieldControl     maWndRow;
-    FixedText               maFtData;
-    ScDPDataFieldControl    maWndData;
-    ScDPSelectFieldControl  maWndSelect;
-    FixedInfo               maFtInfo;
+    FixedText*               mpFtPage;
+    ScDPPageFieldControl*    mpWndPage;
+    FixedText*               mpFtCol;
+    ScDPColFieldControl*     mpWndCol;
+    FixedText*               mpFtRow;
+    ScDPRowFieldControl*     mpWndRow;
+    FixedText*               mpFtData;
+    ScDPDataFieldControl*    mpWndData;
+    ScDPSelectFieldControl*  mpWndSelect;
+    FixedText*               mpFtInfo;
 
     std::vector<ScDPFieldControlBase*> maFieldCtrls;
 
-    FixedLine               maFlAreas;
-    FixedText               maFtInArea;
-    ::formula::RefEdit      maEdInPos;
-    ::formula::RefButton    maRbInPos;
-    ListBox                 maLbOutPos;
-    FixedText               maFtOutArea;
-    formula::RefEdit        maEdOutPos;
-    formula::RefButton      maRbOutPos;
-    CheckBox                maBtnIgnEmptyRows;
-    CheckBox                maBtnDetectCat;
-    CheckBox                maBtnTotalCol;
-    CheckBox                maBtnTotalRow;
-    CheckBox                maBtnFilter;
-    CheckBox                maBtnDrillDown;
-
-    OKButton                maBtnOk;
-    CancelButton            maBtnCancel;
-    HelpButton              maBtnHelp;
-    PushButton              maBtnRemove;
-    PushButton              maBtnOptions;
-    MoreButton              maBtnMore;
+    FixedText*               mpFtInArea;
+    ::formula::RefEdit*      mpEdInPos;
+    ::formula::RefButton*    mpRbInPos;
+    ListBox*                 mpLbOutPos;
+    FixedText*               mpFtOutArea;
+    formula::RefEdit*        mpEdOutPos;
+    formula::RefButton*      mpRbOutPos;
+    CheckBox*                mpBtnIgnEmptyRows;
+    CheckBox*                mpBtnDetectCat;
+    CheckBox*                mpBtnTotalCol;
+    CheckBox*                mpBtnTotalRow;
+    CheckBox*                mpBtnFilter;
+    CheckBox*                mpBtnDrillDown;
+
+    OKButton*                mpBtnOk;
+    CancelButton*            mpBtnCancel;
+    PushButton*              mpBtnRemove;
+    PushButton*              mpBtnOptions;
+    //FIXME: replace with expander
+    //MoreButton*              mpBtnMore;
+    VclExpander*             mpExpander;
     std::vector<OUString> maFuncNames;     /// Localized function names from resource.
     boost::ptr_vector<OUString> maRefStrs; /// Reference strings stored with the output list box.
     ScDPObjectPtr           mxDlgDPObject;      /// Clone of the pivot table object this dialog is based on.