Lines 186-194
Link Here
|
186 |
XclImpRoot( static_cast< XclImpRootData& >( *this ) ), |
186 |
XclImpRoot( static_cast< XclImpRootData& >( *this ) ), |
187 |
maStrm( rSvStrm, *this ), |
187 |
maStrm( rSvStrm, *this ), |
188 |
aIn( maStrm ), |
188 |
aIn( maStrm ), |
189 |
aColOutlineBuff( MAXCOL + 1 ), |
189 |
bFitToPage( sal_False ), |
190 |
aRowOutlineBuff( MAXROW + 1 ), |
|
|
191 |
bFitToPage( sal_False ), |
192 |
bHasHeader( sal_False ), |
190 |
bHasHeader( sal_False ), |
193 |
bHasFooter( sal_False ) |
191 |
bHasFooter( sal_False ) |
194 |
{ |
192 |
{ |
Lines 224-233
Link Here
|
224 |
pExtNameBuff = new NameBuffer( pExcRoot ); //#94039# prevent empty rootdata |
222 |
pExtNameBuff = new NameBuffer( pExcRoot ); //#94039# prevent empty rootdata |
225 |
pExtNameBuff->SetBase( 1 ); |
223 |
pExtNameBuff->SetBase( 1 ); |
226 |
|
224 |
|
227 |
pColRowBuff = new ColRowSettings( *pExcRoot ); //#94039# prevent empty rootdata |
225 |
pOutlineListBuffer = new OutlineListBuffer( ); |
228 |
pColRowBuff->SetDefWidth( STD_COL_WIDTH ); |
226 |
|
229 |
pColRowBuff->SetDefHeight( ( UINT16 ) STD_ROW_HEIGHT ); |
|
|
230 |
|
231 |
// ab Biff8 |
227 |
// ab Biff8 |
232 |
pExcRoot->nCondRangeCnt = ( UINT32 ) -1; // GetCondFormStyleName() starts with increment! |
228 |
pExcRoot->nCondRangeCnt = ( UINT32 ) -1; // GetCondFormStyleName() starts with increment! |
233 |
|
229 |
|
Lines 270-276
Link Here
|
270 |
GetDoc().SetSrcCharSet( GetCharSet() ); |
266 |
GetDoc().SetSrcCharSet( GetCharSet() ); |
271 |
|
267 |
|
272 |
delete pExtNameBuff; |
268 |
delete pExtNameBuff; |
273 |
delete pColRowBuff; |
269 |
|
|
|
270 |
delete pOutlineListBuffer; |
274 |
|
271 |
|
275 |
delete pFormConv; |
272 |
delete pFormConv; |
276 |
} |
273 |
} |
Lines 485-491
Link Here
|
485 |
aIn.Ignore( 2 ); // reserved |
482 |
aIn.Ignore( 2 ); // reserved |
486 |
aIn >> nGrbit; |
483 |
aIn >> nGrbit; |
487 |
|
484 |
|
488 |
aRowOutlineBuff.SetLevel( nRow, EXC_ROW_GETLEVEL( nGrbit ), |
485 |
pRowOutlineBuff->SetLevel( nRow, EXC_ROW_GETLEVEL( nGrbit ), |
489 |
TRUEBOOL( nGrbit & EXC_ROW_COLLAPSED ), TRUEBOOL( nGrbit & EXC_ROW_ZEROHEIGHT ) ); |
486 |
TRUEBOOL( nGrbit & EXC_ROW_COLLAPSED ), TRUEBOOL( nGrbit & EXC_ROW_ZEROHEIGHT ) ); |
490 |
|
487 |
|
491 |
pColRowBuff->SetRowSettings( nRow, nRowHeight, nGrbit ); |
488 |
pColRowBuff->SetRowSettings( nRow, nRowHeight, nGrbit ); |
Lines 1039-1045
Link Here
|
1039 |
if( nColLast > MAXCOL ) |
1036 |
if( nColLast > MAXCOL ) |
1040 |
nColLast = MAXCOL; |
1037 |
nColLast = MAXCOL; |
1041 |
|
1038 |
|
1042 |
aColOutlineBuff.SetLevelRange( nColFirst, nColLast, EXC_COL_GETLEVEL( nOpt ), |
1039 |
pColOutlineBuff->SetLevelRange( nColFirst, nColLast, EXC_COL_GETLEVEL( nOpt ), |
1043 |
TRUEBOOL( nOpt & EXC_COL_COLLAPSED ), TRUEBOOL( nOpt & EXC_COL_HIDDEN ) ); |
1040 |
TRUEBOOL( nOpt & EXC_COL_COLLAPSED ), TRUEBOOL( nOpt & EXC_COL_HIDDEN ) ); |
1044 |
|
1041 |
|
1045 |
if( nOpt & EXC_COL_HIDDEN ) // Cols hidden? |
1042 |
if( nOpt & EXC_COL_HIDDEN ) // Cols hidden? |
Lines 1078-1085
Link Here
|
1078 |
UINT16 nFlags; |
1075 |
UINT16 nFlags; |
1079 |
aIn >> nFlags; |
1076 |
aIn >> nFlags; |
1080 |
|
1077 |
|
1081 |
aRowOutlineBuff.SetButtonMode( HasFlag( nFlags, EXC_WSBOOL_ROWBELOW ) ); |
1078 |
pRowOutlineBuff->SetButtonMode( HasFlag( nFlags, EXC_WSBOOL_ROWBELOW ) ); |
1082 |
aColOutlineBuff.SetButtonMode( HasFlag( nFlags, EXC_WSBOOL_COLBELOW ) ); |
1079 |
pColOutlineBuff->SetButtonMode( HasFlag( nFlags, EXC_WSBOOL_COLBELOW ) ); |
1083 |
|
1080 |
|
1084 |
bFitToPage = HasFlag( nFlags, EXC_WSBOOL_FITTOPAGE ); |
1081 |
bFitToPage = HasFlag( nFlags, EXC_WSBOOL_FITTOPAGE ); |
1085 |
} |
1082 |
} |
Lines 1631-1637
Link Here
|
1631 |
|
1628 |
|
1632 |
aIn >> nGrbit >> nXF; |
1629 |
aIn >> nGrbit >> nXF; |
1633 |
|
1630 |
|
1634 |
aRowOutlineBuff.SetLevel( nRow, EXC_ROW_GETLEVEL( nGrbit ), |
1631 |
pRowOutlineBuff->SetLevel( nRow, EXC_ROW_GETLEVEL( nGrbit ), |
1635 |
TRUEBOOL( nGrbit & EXC_ROW_COLLAPSED ), TRUEBOOL( nGrbit & EXC_ROW_ZEROHEIGHT ) ); |
1632 |
TRUEBOOL( nGrbit & EXC_ROW_COLLAPSED ), TRUEBOOL( nGrbit & EXC_ROW_ZEROHEIGHT ) ); |
1636 |
|
1633 |
|
1637 |
pColRowBuff->SetRowSettings( nRow, nRowHeight, nGrbit ); |
1634 |
pColRowBuff->SetRowSettings( nRow, nRowHeight, nGrbit ); |
Lines 1962-1983
Link Here
|
1962 |
|
1959 |
|
1963 |
void ImportExcel::ResetBof( void ) |
1960 |
void ImportExcel::ResetBof( void ) |
1964 |
{ // setzt alle Einstellungen fuer neuen Tabellenbeginn zurueck |
1961 |
{ // setzt alle Einstellungen fuer neuen Tabellenbeginn zurueck |
1965 |
pColRowBuff->Reset(); |
1962 |
|
|
|
1963 |
// no need anymore as the creation of pColRowBuff is now in NeueTabelle() #i11776 |
1964 |
//pColRowBuff->Reset(); |
1966 |
} |
1965 |
} |
1967 |
|
1966 |
|
1968 |
|
1967 |
|
1969 |
void ImportExcel::EndSheet( void ) |
1968 |
void ImportExcel::EndSheet( void ) |
1970 |
{ // mach 'Gemarmel' am Ende eines Sheets |
1969 |
{ |
1971 |
aColOutlineBuff.SetOutlineArray( pD->GetOutlineTable( GetScTab(), TRUE )->GetColArray() ); |
|
|
1972 |
aColOutlineBuff.MakeScOutline(); |
1973 |
aColOutlineBuff.Reset(); |
1974 |
|
1975 |
aRowOutlineBuff.SetOutlineArray( pD->GetOutlineTable( GetScTab(), TRUE )->GetRowArray() ); |
1976 |
aRowOutlineBuff.MakeScOutline(); |
1977 |
aRowOutlineBuff.Reset(); |
1978 |
|
1979 |
pColRowBuff->Apply( GetScTab() ); |
1980 |
|
1981 |
GetXFIndexBuffer().Apply(); |
1970 |
GetXFIndexBuffer().Apply(); |
1982 |
|
1971 |
|
1983 |
pExcRoot->pExtSheetBuff->Reset(); |
1972 |
pExcRoot->pExtSheetBuff->Reset(); |
Lines 2021-2026
Link Here
|
2021 |
bFitToPage = sal_False; |
2010 |
bFitToPage = sal_False; |
2022 |
bHasHeader = sal_False; |
2011 |
bHasHeader = sal_False; |
2023 |
bHasFooter = sal_False; |
2012 |
bHasFooter = sal_False; |
|
|
2013 |
|
2014 |
pOutlineListBuffer->Insert(*pExcRoot, nTab); //#94039# prevent empty rootdata |
2015 |
|
2016 |
pColRowBuff = pOutlineListBuffer->GetCurrentColRowBuff(); |
2017 |
pColOutlineBuff = pOutlineListBuffer->GetCurrentColOutline(); |
2018 |
pRowOutlineBuff = pOutlineListBuffer->GetCurrentRowOutline(); |
2024 |
} |
2019 |
} |
2025 |
|
2020 |
|
2026 |
|
2021 |
|
Lines 2183-2188
Link Here
|
2183 |
|
2178 |
|
2184 |
void ImportExcel::PostDocLoad( void ) |
2179 |
void ImportExcel::PostDocLoad( void ) |
2185 |
{ |
2180 |
{ |
|
|
2181 |
|
2182 |
pOutlineListBuffer->Apply(pD); |
2183 |
|
2186 |
// visible area if embedded OLE |
2184 |
// visible area if embedded OLE |
2187 |
ScModelObj* pDocObj = GetDocModelObj(); |
2185 |
ScModelObj* pDocObj = GetDocModelObj(); |
2188 |
if( pDocObj ) |
2186 |
if( pDocObj ) |
Lines 2341-2343
Link Here
|
2341 |
} |
2339 |
} |
2342 |
} |
2340 |
} |
2343 |
|
2341 |
|
|
|
2342 |
OutlineListBuffer::OutlineListBuffer() |
2343 |
{ |
2344 |
} |
2345 |
|
2346 |
OutlineListBuffer::~OutlineListBuffer() |
2347 |
{ |
2348 |
for(OutlineDataBuffer* pBuffer = _First(); pBuffer; pBuffer = _Next() ) |
2349 |
delete pBuffer; |
2350 |
} |
2351 |
|
2352 |
void OutlineListBuffer::Insert(RootData& rRootData, UINT16 nTabNo) |
2353 |
{ |
2354 |
Append(new OutlineDataBuffer(rRootData, nTabNo )); |
2355 |
} |
2356 |
|
2357 |
ColRowSettings* OutlineListBuffer::GetCurrentColRowBuff() |
2358 |
{ |
2359 |
OutlineDataBuffer* pBuffer = _Last(); |
2360 |
|
2361 |
return pBuffer->GetColRowBuff(); |
2362 |
} |
2363 |
|
2364 |
OutlineBuffer* OutlineListBuffer::GetCurrentColOutline() |
2365 |
{ |
2366 |
OutlineDataBuffer* pBuffer = _Last(); |
2367 |
|
2368 |
return pBuffer->GetColOutline(); |
2369 |
} |
2370 |
|
2371 |
OutlineBuffer* OutlineListBuffer::GetCurrentRowOutline() |
2372 |
{ |
2373 |
OutlineDataBuffer* pBuffer = _Last(); |
2374 |
|
2375 |
return pBuffer->GetRowOutline(); |
2376 |
} |
2377 |
|
2378 |
void OutlineListBuffer::Apply(ScDocument* pD) |
2379 |
{ |
2380 |
for(OutlineDataBuffer* pBuffer = _First(); pBuffer; pBuffer = _Next() ) |
2381 |
pBuffer->Apply(pD); |
2382 |
} |
2383 |
|
2384 |
OutlineDataBuffer::OutlineDataBuffer(RootData& rRootData, UINT16 nTabNo) : |
2385 |
nTab (nTabNo) |
2386 |
{ |
2387 |
pColOutlineBuff = new OutlineBuffer (MAXCOL + 1); |
2388 |
pRowOutlineBuff = new OutlineBuffer (MAXROW + 1); |
2389 |
pColRowBuff = new ColRowSettings( rRootData ); |
2390 |
|
2391 |
pColRowBuff->SetDefWidth( STD_COL_WIDTH ); |
2392 |
pColRowBuff->SetDefHeight( ( UINT16 ) STD_ROW_HEIGHT ); |
2393 |
} |
2394 |
|
2395 |
OutlineDataBuffer::~OutlineDataBuffer() |
2396 |
{ |
2397 |
delete pColOutlineBuff; |
2398 |
delete pRowOutlineBuff; |
2399 |
delete pColRowBuff; |
2400 |
} |
2401 |
|
2402 |
void OutlineDataBuffer::Apply(ScDocument* pD) |
2403 |
{ |
2404 |
pColOutlineBuff->SetOutlineArray( pD->GetOutlineTable( nTab, TRUE )->GetColArray() ); |
2405 |
pColOutlineBuff->MakeScOutline(); |
2406 |
|
2407 |
pRowOutlineBuff->SetOutlineArray( pD->GetOutlineTable( nTab, TRUE )->GetRowArray() ); |
2408 |
pRowOutlineBuff->MakeScOutline(); |
2409 |
|
2410 |
pColRowBuff->Apply(nTab); |
2411 |
} |