INTEGRATION: CWS calc18 (1.6.158); FILE MERGED

2003/12/05 09:52:10 dr 1.6.158.2: RESYNC: (1.6-1.7); FILE MERGED
2003/11/05 08:44:22 dr 1.6.158.1: #112908# excel export: visible/selected sheet handling

1 files changed, 6 insertions, 53 deletions

diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 501fbba4e268..f358f0af88d0 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: scextopt.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2003-12-01 17:48:40 $
+ *  last change: $Author: rt $ $Date: 2004-03-02 09:31:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,9 +103,7 @@ struct ScExtTabOptions
     BOOL                        bFrozen;            // = TRUE -> nSplitX / nSplitY contain
                                                     // count of visible columns/rows
 
-    inline                      ScExtTabOptions( void );
-    inline                      ScExtTabOptions( const ScExtTabOptions& rCpy );
-    inline void                 operator =( const ScExtTabOptions& rCpy );
+    explicit                    ScExtTabOptions();
 
     void                        SetSelection( const ScRange& rSelection );
     void                        SetDimension( const ScRange& rDim );
@@ -150,6 +148,8 @@ private:
     BOOL                    bChanged;       // for import: copy data only first time to doc
     bool                    bWinProtection;  // Excel Workbook Windows protection flag
 
+    void                    Reset();
+
 public:
     UINT32                  nLinkCnt;       // Zaehlt die Rekursionstufe beim Laden
                                             //  von externen Dokumenten
@@ -163,6 +163,7 @@ public:
     UINT16                  nCurRow;
     // -------------------------------------------------------------------
                             ScExtDocOptions( void );
+                            ScExtDocOptions( const ScExtDocOptions& rCpy );
                             ~ScExtDocOptions();
 
     ScExtDocOptions&        operator =( const ScExtDocOptions& rCpy );
@@ -226,54 +227,6 @@ inline const String* CodenameList::Act( void ) const
 
 
 
-inline ScExtTabOptions::ScExtTabOptions( void )
-{
-    nTabNum = nSplitX = nSplitY = nLeftCol = nTopRow = nLeftSplitCol = nTopSplitRow = 0;
-    nActPane = 3;
-    bSelected = bFrozen = bValidSel = bValidDim = FALSE;
-}
-
-
-inline ScExtTabOptions::ScExtTabOptions( const ScExtTabOptions& rCpy )
-{
-    nTabNum = rCpy.nTabNum;
-    nSplitX = rCpy.nSplitX;
-    nSplitY = rCpy.nSplitY;
-    nLeftCol = rCpy.nLeftCol;
-    nTopRow = rCpy.nTopRow;
-    nLeftSplitCol = rCpy.nLeftSplitCol;
-    nTopSplitRow = rCpy.nTopSplitRow;
-    nActPane = rCpy.nActPane;
-    aLastSel = rCpy.aLastSel;
-    aDim = rCpy.aDim;
-    bSelected = rCpy.bSelected;
-    bFrozen = rCpy.bFrozen;
-    bValidSel = rCpy.bValidSel;
-    bValidDim = rCpy.bValidDim;
-}
-
-
-inline void ScExtTabOptions::operator =( const ScExtTabOptions& rCpy )
-{
-    nTabNum = rCpy.nTabNum;
-    nSplitX = rCpy.nSplitX;
-    nSplitY = rCpy.nSplitY;
-    nLeftCol = rCpy.nLeftCol;
-    nTopRow = rCpy.nTopRow;
-    nLeftSplitCol = rCpy.nLeftSplitCol;
-    nTopSplitRow = rCpy.nTopSplitRow;
-    nActPane = rCpy.nActPane;
-    aLastSel = rCpy.aLastSel;
-    aDim = rCpy.aDim;
-    bSelected = rCpy.bSelected;
-    bFrozen = rCpy.bFrozen;
-    bValidSel = rCpy.bValidSel;
-    bValidDim = rCpy.bValidDim;
-}
-
-
-
-
 inline const ScExtTabOptions* ScExtDocOptions::GetExtTabOptions( const UINT16 nTab ) const
 {
     return (nTab <= MAXTAB) ? ppExtTabOpts[ nTab ] : NULL;