tpview.cxx (b3f79822) | tpview.cxx (97e8a929) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 337 unchanged lines hidden (view full) --- 346 aColorFT.Disable(), aColorLB.Disable(); 347 348 if ( aColorLB.GetEntryCount() == 0 ) 349 { 350 SfxObjectShell* pDocSh = SfxObjectShell::Current(); 351 // hier koennte auch eine andere DocShell kommen! 352 pDocSh = PTR_CAST(ScDocShell, pDocSh); 353 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 337 unchanged lines hidden (view full) --- 346 aColorFT.Disable(), aColorLB.Disable(); 347 348 if ( aColorLB.GetEntryCount() == 0 ) 349 { 350 SfxObjectShell* pDocSh = SfxObjectShell::Current(); 351 // hier koennte auch eine andere DocShell kommen! 352 pDocSh = PTR_CAST(ScDocShell, pDocSh); 353 |
354 XColorTable* pColorTable = NULL; | 354 XColorList* pColorTable = NULL; |
355 356 if ( pDocSh ) 357 { 358 const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); 359 360 if ( pItem ) 361 pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); 362 } 363 else | 355 356 if ( pDocSh ) 357 { 358 const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); 359 360 if ( pItem ) 361 pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); 362 } 363 else |
364 pColorTable = XColorTable::GetStdColorTable(); | 364 pColorTable = XColorList::GetStdColorList(); |
365 366 if ( !pColorTable ) 367 return; 368 369 //------------------------------------------------------ 370 371 aColorLB.SetUpdateMode( sal_False ); 372 --- 369 unchanged lines hidden --- | 365 366 if ( !pColorTable ) 367 return; 368 369 //------------------------------------------------------ 370 371 aColorLB.SetUpdateMode( sal_False ); 372 --- 369 unchanged lines hidden --- |