summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/viewdata.cxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2003-12-01 16:55:09 +0000
committerRüdiger Timm <rt@openoffice.org>2003-12-01 16:55:09 +0000
commitf8239ce67f54eac623f4de9d78b7299dad4ae167 (patch)
tree0113734f7fc54ef6476f3fcc8b112514051e1def /sc/source/ui/view/viewdata.cxx
parent66cbbc16cafb68ab1a5733882d0ca6d319766090 (diff)
INTEGRATION: CWS ooo20031110 (1.38.160); FILE MERGED
2003/11/11 14:37:47 waratah 1.38.160.1: #i22301# Correct for scoping rules
Diffstat (limited to 'sc/source/ui/view/viewdata.cxx')
-rw-r--r--sc/source/ui/view/viewdata.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 449e4c6237f7..e1c0251d3410 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewdata.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: rt $ $Date: 2003-04-08 16:34:19 $
+ * last change: $Author: rt $ $Date: 2003-12-01 17:55:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -329,6 +329,8 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
bPagebreak ( FALSE ),
pSpellingView ( NULL )
{
+ USHORT i;
+
SetGridMode ( TRUE );
SetSyntaxMode ( FALSE );
SetHeaderMode ( TRUE );
@@ -340,7 +342,8 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ),
(long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) );
pTabData[0] = new ScViewDataTable;
- for (USHORT i=1; i<=MAXTAB; i++) pTabData[i] = NULL;
+ for ( i = 1; i <= MAXTAB; i++ )
+ pTabData[i] = NULL;
pThisTab = pTabData[nTabNo];
for (i=0; i<4; i++)
{
@@ -391,6 +394,8 @@ ScViewData::ScViewData( const ScViewData& rViewData )
bPagebreak ( rViewData.bPagebreak ),
pSpellingView ( rViewData.pSpellingView )
{
+ USHORT i;
+
SetGridMode ( rViewData.IsGridMode() );
SetSyntaxMode ( rViewData.IsSyntaxMode() );
SetHeaderMode ( rViewData.IsHeaderMode() );
@@ -400,7 +405,7 @@ ScViewData::ScViewData( const ScViewData& rViewData )
SetOutlineMode ( rViewData.IsOutlineMode() );
aScrSize = rViewData.aScrSize;
- for (USHORT i=0; i<=MAXTAB; i++)
+ for ( i = 0; i <= MAXTAB; i++ )
if (rViewData.pTabData[i])
pTabData[i] = new ScViewDataTable( *rViewData.pTabData[i] );
else