option dialog changes

4 files changed, 79 insertions, 74 deletions

diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index c3324becb3bf..1ad853a14323 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: opredlin.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:00 $
+ *  last change: $Author: os $ $Date: 2001-03-28 13:26:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,7 @@ class ScRedlineOptionsTabPage : public SfxTabPage
     ColorListBox        aInsertColorLB;
     FixedText           aMoveFT;
     ColorListBox        aMoveColorLB;
-    GroupBox            aChangedGB;
+    FixedLine           aChangedGB;
     String              aAuthorStr;
     DECL_LINK( ColorHdl, ColorListBox *pColorLB );
 
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 72392bdbcd53..a6e0ba08396b 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optdlg.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:00 $
+ *  last change: $Author: os $ $Date: 2001-03-28 13:26:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,6 +171,16 @@
 #define CB_CLIP             33
 
 // TP_LAYOUT
+#define GB_LINK                 1
+#define RB_ALWAYS               2
+#define RB_REQUEST              3
+#define RB_NEVER                4
+#define CB_DOCONLY              5
+#define CB_MERGE_PARA_DIST      6
+#define GB_COMPAT               7
+#define CB_AUTO_UPDATE_FIELDS   8
+#define CB_AUTO_UPDATE_CHARTS   9
+#define FT_UPDATE_LINKS         10
 
 #define GB_WINDOW       50
 #define CB_ROWCOLHEADER 51
@@ -191,7 +201,8 @@
 #define CB_PAGEBREAKS   66
 #define CB_HANDLES      67
 #define CB_BIGHANDLES   68
-
+#define FT_TAB          69
+#define FT_UNIT         70
 // TP_INPUT
 
 #define GB_OPTIONS      70
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index bc198c66b2ca..24c0fad99a71 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpcalc.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: er $ $Date: 2001-01-30 15:12:35 $
+ *  last change: $Author: os $ $Date: 2001-03-28 13:26:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,13 +109,13 @@ private:
     NumericField    aEdSteps;
     FixedText       aFtEps;
     Edit            aEdEps;
-    GroupBox        aGbZRefs;
+    FixedLine       aGbZRefs;
 
     RadioButton     aBtnDateStd;
     RadioButton     aBtnDateSc10;
     RadioButton     aBtnDate1904;
 
-    GroupBox        aGbDate;
+    FixedLine       aGbDate;
 
     CheckBox        aBtnCase;
     CheckBox        aBtnCalc;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 3617c7341f26..6b02a45fb8dd 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpview.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:01 $
+ *  last change: $Author: os $ $Date: 2001-03-28 13:26:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,48 +96,7 @@ class ScViewOptions;
 
 class ScTpContentOptions : public SfxTabPage
 {
-    GroupBox    aDisplayGB;
-    CheckBox    aFormulaCB;
-    CheckBox    aNilCB;
-    CheckBox    aAnnotCB;
-    CheckBox    aValueCB;
-    CheckBox    aAnchorCB;
-    CheckBox    aClipMarkCB;
-
-    GroupBox    aObjectGB;
-    FixedText   aObjGrfFT;
-    ListBox     aObjGrfLB;
-    FixedText   aDiagramFT;
-    ListBox     aDiagramLB;
-    FixedText   aDrawFT;
-    ListBox     aDrawLB;
-
-    ScViewOptions*  pLocalOptions;
-
-    DECL_LINK( SelLbObjHdl, ListBox* );
-    DECL_LINK( CBHdl, CheckBox* );
-
-            ScTpContentOptions( Window*         pParent,
-                             const SfxItemSet&  rArgSet );
-            ~ScTpContentOptions();
-
-public:
-    static  SfxTabPage* Create          ( Window*               pParent,
-                                          const SfxItemSet&     rCoreSet );
-    virtual BOOL        FillItemSet     ( SfxItemSet& rCoreSet );
-    virtual void        Reset           ( const SfxItemSet& rCoreSet );
-    virtual void        ActivatePage( const SfxItemSet& );
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
-
-
-};
-
-//========================================================================
-// TabPage Layout
-
-class ScTpLayoutOptions : public SfxTabPage
-{
-    GroupBox        aLinesGB;
+    FixedLine       aLinesGB;
     CheckBox        aGridCB;
     FixedText       aColorFT;
     ColorListBox    aColorLB;
@@ -146,30 +105,40 @@ class ScTpLayoutOptions : public SfxTabPage
     CheckBox        aHandleCB;
     CheckBox        aBigHandleCB;
 
-    GroupBox        aWindowGB;
+    FixedLine       aDisplayGB;
+    CheckBox        aFormulaCB;
+    CheckBox        aNilCB;
+    CheckBox        aAnnotCB;
+    CheckBox        aValueCB;
+    CheckBox        aAnchorCB;
+    CheckBox        aClipMarkCB;
+    CheckBox        aRangeFindCB;
+
+    FixedLine       aObjectGB;
+    FixedText       aObjGrfFT;
+    ListBox         aObjGrfLB;
+    FixedText       aDiagramFT;
+    ListBox         aDiagramLB;
+    FixedText       aDrawFT;
+    ListBox         aDrawLB;
+
+    FixedLine       aWindowGB;
     CheckBox        aRowColHeaderCB;
     CheckBox        aHScrollCB;
     CheckBox        aVScrollCB;
     CheckBox        aTblRegCB;
     CheckBox        aOutlineCB;
 
-    GroupBox        aUnitGB;
-    ListBox         aUnitLB;
-
-    GroupBox    aTabGB;
-    MetricField aTabMF;
-
-    SvxStringArray  aUnitArr;
     ScViewOptions*  pLocalOptions;
 
     void    InitGridOpt();
     DECL_LINK( GridHdl, CheckBox* );
+    DECL_LINK( SelLbObjHdl, ListBox* );
     DECL_LINK( CBHdl, CheckBox* );
-    DECL_LINK(MetricHdl, ListBox*);
 
-            ScTpLayoutOptions( Window*          pParent,
+            ScTpContentOptions( Window*         pParent,
                              const SfxItemSet&  rArgSet );
-            ~ScTpLayoutOptions();
+            ~ScTpContentOptions();
 
 public:
     static  SfxTabPage* Create          ( Window*               pParent,
@@ -181,35 +150,60 @@ public:
 
 
 };
-//========================================================================
-// TabPage Eingabe
 
-class ScTpInputOptions : public SfxTabPage
+//========================================================================
+// TabPage Layout
+class ScDocument;
+class ScTpLayoutOptions : public SfxTabPage
 {
-    GroupBox        aOptionsGB;
+    FixedLine       aUnitGB;
+    FixedText       aUnitFT;
+    ListBox         aUnitLB;
+    FixedText       aTabFT;
+    MetricField     aTabMF;
+
+    FixedLine       aLinkGB;
+    FixedText       aLinkFT;
+    RadioButton     aAlwaysRB;
+    RadioButton     aRequestRB;
+    RadioButton     aNeverRB;
+
+    FixedLine       aOptionsGB;
     CheckBox        aAlignCB;
     ListBox         aAlignLB;
     CheckBox        aEditModeCB;
     CheckBox        aFormatCB;
-    CheckBox        aRangeFindCB;
     CheckBox        aExpRefCB;
     CheckBox        aMarkHdrCB;
 
+    SvxStringArray  aUnitArr;
+    ScViewOptions*  pLocalOptions;
+
+    DECL_LINK( CBHdl, CheckBox* );
+
+    DECL_LINK(MetricHdl, ListBox*);
     DECL_LINK( AlignHdl, CheckBox* );
 
-            ScTpInputOptions( Window*           pParent,
+    ScDocument *pDoc;
+
+    DECL_LINK(  UpdateHdl, CheckBox* );
+
+            ScTpLayoutOptions( Window*          pParent,
                              const SfxItemSet&  rArgSet );
-            ~ScTpInputOptions();
+            ~ScTpLayoutOptions();
 
 public:
     static  SfxTabPage* Create          ( Window*               pParent,
                                           const SfxItemSet&     rCoreSet );
     virtual BOOL        FillItemSet     ( SfxItemSet& rCoreSet );
     virtual void        Reset           ( const SfxItemSet& rCoreSet );
+    virtual void        ActivatePage( const SfxItemSet& );
+    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
-};
-
+    void                SetDocument(ScDocument* pPtr){pDoc = pPtr;}
 
+};
+//========================================================================
 
 #endif // SC_TPUSRLST_HXX