INTEGRATION: CWS sab008 (1.4.238); FILE MERGED

2003/10/13 14:55:27 dr 1.4.238.4: #i8868# scale printout to width/height, fixed texts for all ctrls
2003/09/25 10:36:53 dr 1.4.238.3: #i8868# scale printout to width/height
2003/09/24 15:13:51 dr 1.4.238.2: #i8868# scale printout to width/height
2003/08/29 12:03:41 dr 1.4.238.1: #i8868# 1st prototype: scale printout to width/height

1 files changed, 38 insertions, 18 deletions

diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 2ffd9208bfef..41b3abb3fe36 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tptable.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dr $ $Date: 2002-05-31 11:20:43 $
+ *  last change: $Author: obo $ $Date: 2004-03-19 16:13:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,13 +69,32 @@
 #ifndef _SV_FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
 #endif
-
+#ifndef _SV_LSTBOX_HXX
+#include <vcl/lstbox.hxx>
+#endif
 #ifndef _SV_FIELD_HXX //autogen
 #include <vcl/field.hxx>
 #endif
 
 //===================================================================
 
+/** A vcl/NumericField that additionally supports empty text.
+    @descr  Value 0 is set as empty text, and empty text is returned as 0. */
+class EmptyNumericField : public NumericField
+{
+public:
+    inline explicit     EmptyNumericField( Window* pParent, WinBits nWinStyle ) :
+                            NumericField( pParent, nWinStyle ) {}
+    inline explicit     EmptyNumericField( Window* pParent, const ResId& rResId ) :
+                            NumericField( pParent, rResId ) {}
+
+    virtual void        Modify();
+    virtual void        SetValue( long nValue );
+    virtual long        GetValue() const;
+};
+
+//===================================================================
+
 class ScTablePage : public SfxTabPage
 {
 public:
@@ -88,9 +107,8 @@ public:
     virtual void        DataChanged     ( const DataChangedEvent& rDCEvt );
 
 private:
-           ScTablePage( Window*         pParent,
-                         const SfxItemSet&  rCoreSet );
-            ~ScTablePage();
+                    ScTablePage( Window* pParent, const SfxItemSet& rCoreSet );
+    virtual         ~ScTablePage();
 
     void            ShowImage();
 
@@ -116,22 +134,24 @@ private:
     CheckBox        aBtnFormulas;
     CheckBox        aBtnNullVals;
 
-    FixedLine       aFlScale;
-    RadioButton     aBtnScaleAll;
-    RadioButton     aBtnScalePageNum;
-    MetricField     aEdScaleAll;
-    NumericField    aEdScalePageNum;
+    FixedLine           aFlScale;
+    FixedText           aFtScaleMode;
+    ListBox             aLbScaleMode;
+    FixedText           aFtScaleAll;
+    MetricField         aEdScaleAll;
+    FixedText           aFtScalePageWidth;
+    EmptyNumericField   aEdScalePageWidth;
+    FixedText           aFtScalePageHeight;
+    EmptyNumericField   aEdScalePageHeight;
+    FixedText           aFtScalePageNum;
+    NumericField        aEdScalePageNum;
 
-#ifdef _TPTABLE_CXX
 private:
     //------------------------------------
     // Handler:
-    DECL_LINK( ScaleHdl,   RadioButton* );
-    DECL_LINK( PageDirHdl, RadioButton* );
-    DECL_LINK( PageNoHdl,  CheckBox* );
-#endif
+    DECL_LINK( PageDirHdl,      RadioButton* );
+    DECL_LINK( PageNoHdl,       CheckBox* );
+    DECL_LINK( ScaleHdl,        ListBox* );
 };
 
-
-
 #endif // SC_TPTABLE_HXX