optsitem.cxx (4772d9af) | optsitem.cxx (2da1a64c) |
---|---|
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 --- 484 unchanged lines hidden (view full) --- 493 bQuickEdit( GetConfigId() != SDCFG_DRAW ), 494 bMasterPageCache( sal_True ), 495 bDragWithCopy( sal_False ), 496 bPickThrough( sal_True ), 497 bBigHandles( sal_True ), // new default: Use big handles 498 bDoubleClickTextEdit( sal_True ), 499 bClickChangeRotation( sal_False ), 500 bStartWithActualPage( sal_False ), | 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 --- 484 unchanged lines hidden (view full) --- 493 bQuickEdit( GetConfigId() != SDCFG_DRAW ), 494 bMasterPageCache( sal_True ), 495 bDragWithCopy( sal_False ), 496 bPickThrough( sal_True ), 497 bBigHandles( sal_True ), // new default: Use big handles 498 bDoubleClickTextEdit( sal_True ), 499 bClickChangeRotation( sal_False ), 500 bStartWithActualPage( sal_False ), |
501 bStartWithPresenterScreen( sal_True ), // default: Enable the Presenter Screen |
|
501 bSolidDragging( sal_True ), 502 bSolidMarkHdl( sal_True ), // default: Use nice handles 503 bSummationOfParagraphs( sal_False ), 504 // #90356# 505 bShowUndoDeleteWarning( sal_True ), 506 bSlideshowRespectZOrder( sal_True ), 507 bShowComments( sal_True ), 508 bPreviewNewEffects( sal_True ), --- 21 unchanged lines hidden (view full) --- 530 IsQuickEdit() == rOpt.IsQuickEdit() && 531 IsMasterPagePaintCaching() == rOpt.IsMasterPagePaintCaching() && 532 IsDragWithCopy() == rOpt.IsDragWithCopy() && 533 IsPickThrough() == rOpt.IsPickThrough() && 534 IsBigHandles() == rOpt.IsBigHandles() && 535 IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() && 536 IsClickChangeRotation() == rOpt.IsClickChangeRotation() && 537 IsStartWithActualPage() == rOpt.IsStartWithActualPage() && | 502 bSolidDragging( sal_True ), 503 bSolidMarkHdl( sal_True ), // default: Use nice handles 504 bSummationOfParagraphs( sal_False ), 505 // #90356# 506 bShowUndoDeleteWarning( sal_True ), 507 bSlideshowRespectZOrder( sal_True ), 508 bShowComments( sal_True ), 509 bPreviewNewEffects( sal_True ), --- 21 unchanged lines hidden (view full) --- 531 IsQuickEdit() == rOpt.IsQuickEdit() && 532 IsMasterPagePaintCaching() == rOpt.IsMasterPagePaintCaching() && 533 IsDragWithCopy() == rOpt.IsDragWithCopy() && 534 IsPickThrough() == rOpt.IsPickThrough() && 535 IsBigHandles() == rOpt.IsBigHandles() && 536 IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() && 537 IsClickChangeRotation() == rOpt.IsClickChangeRotation() && 538 IsStartWithActualPage() == rOpt.IsStartWithActualPage() && |
539 IsStartWithPresenterScreen() == rOpt.IsStartWithPresenterScreen() && |
|
538 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() && 539 IsSolidDragging() == rOpt.IsSolidDragging() && 540 IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() && 541 // #90356# 542 IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() && 543 IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() && 544 GetPrinterIndependentLayout() == rOpt.GetPrinterIndependentLayout() && 545 // #97016# --- 46 unchanged lines hidden (view full) --- 592 593 "PreviewNewEffects", 594 "PreviewChangedEffects", 595 "PreviewTransitions", 596 597 "Display", 598 599 "PenColor", | 540 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() && 541 IsSolidDragging() == rOpt.IsSolidDragging() && 542 IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() && 543 // #90356# 544 IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() && 545 IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() && 546 GetPrinterIndependentLayout() == rOpt.GetPrinterIndependentLayout() && 547 // #97016# --- 46 unchanged lines hidden (view full) --- 594 595 "PreviewNewEffects", 596 "PreviewChangedEffects", 597 "PreviewTransitions", 598 599 "Display", 600 601 "PenColor", |
600 "PenWidth" | 602 "PenWidth", 603 604 "Start/PresenterScreen" |
601 }; 602 | 605 }; 606 |
603 rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 27 : 16 ); | 607 rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 28 : 16 ); |
604 ppNames = aPropNames; 605} 606 607// ----------------------------------------------------------------------------- 608 609sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) 610{ 611 if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); --- 44 unchanged lines hidden (view full) --- 656 if( pValues[24].hasValue() ) 657 SetDisplay(*(sal_Int32*) pValues[ 24 ].getValue()); 658 659 if( pValues[25].hasValue() ) 660 SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 25 ] ) ); 661 662 if( pValues[26].hasValue() ) 663 SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) ); | 608 ppNames = aPropNames; 609} 610 611// ----------------------------------------------------------------------------- 612 613sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) 614{ 615 if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); --- 44 unchanged lines hidden (view full) --- 660 if( pValues[24].hasValue() ) 661 SetDisplay(*(sal_Int32*) pValues[ 24 ].getValue()); 662 663 if( pValues[25].hasValue() ) 664 SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 25 ] ) ); 665 666 if( pValues[26].hasValue() ) 667 SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) ); |
668 669 if( pValues[27].hasValue() ) 670 SetStartWithPresenterScreen( *(sal_Bool*) pValues[ 27 ].getValue() ); |
|
664 } 665 666 return sal_True; 667} 668 669// ----------------------------------------------------------------------------- 670 671sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const --- 30 unchanged lines hidden (view full) --- 702 pValues[ 21 ] <<= IsPreviewNewEffects(); 703 pValues[ 22 ] <<= IsPreviewChangedEffects(); 704 pValues[ 23 ] <<= IsPreviewTransitions(); 705 706 pValues[ 24 ] <<= GetDisplay(); 707 708 pValues[ 25 ] <<= GetPresentationPenColor(); 709 pValues[ 26 ] <<= GetPresentationPenWidth(); | 671 } 672 673 return sal_True; 674} 675 676// ----------------------------------------------------------------------------- 677 678sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const --- 30 unchanged lines hidden (view full) --- 709 pValues[ 21 ] <<= IsPreviewNewEffects(); 710 pValues[ 22 ] <<= IsPreviewChangedEffects(); 711 pValues[ 23 ] <<= IsPreviewTransitions(); 712 713 pValues[ 24 ] <<= GetDisplay(); 714 715 pValues[ 25 ] <<= GetPresentationPenColor(); 716 pValues[ 26 ] <<= GetPresentationPenWidth(); |
717 718 pValues[ 27 ] <<= IsStartWithPresenterScreen(); |
|
710 } 711 712 return sal_True; 713} 714 715/************************************************************************* 716|* 717|* SdOptionsMiscItem --- 11 unchanged lines hidden (view full) --- 729SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) 730: SfxPoolItem ( _nWhich ) 731, maOptionsMisc ( 0, sal_False ) 732{ 733 if( pOpts ) 734 { 735 maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() ); 736 maOptionsMisc.SetStartWithActualPage( pOpts->IsStartWithActualPage() ); | 719 } 720 721 return sal_True; 722} 723 724/************************************************************************* 725|* 726|* SdOptionsMiscItem --- 11 unchanged lines hidden (view full) --- 738SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) 739: SfxPoolItem ( _nWhich ) 740, maOptionsMisc ( 0, sal_False ) 741{ 742 if( pOpts ) 743 { 744 maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() ); 745 maOptionsMisc.SetStartWithActualPage( pOpts->IsStartWithActualPage() ); |
746 maOptionsMisc.SetStartWithPresenterScreen( pOpts->IsStartWithPresenterScreen() ); |
|
737 maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() ); 738 // #90356# 739 maOptionsMisc.SetShowUndoDeleteWarning( pOpts->IsShowUndoDeleteWarning() ); 740 maOptionsMisc.SetPrinterIndependentLayout( pOpts->GetPrinterIndependentLayout() ); 741 // #97016# 742 maOptionsMisc.SetDefaultObjectSizeWidth( pOpts->GetDefaultObjectSizeWidth() ); 743 maOptionsMisc.SetDefaultObjectSizeHeight( pOpts->GetDefaultObjectSizeHeight() ); 744 --- 73 unchanged lines hidden (view full) --- 818 pOpts->SetQuickEdit( maOptionsMisc.IsQuickEdit() ); 819 pOpts->SetMasterPagePaintCaching( maOptionsMisc.IsMasterPagePaintCaching() ); 820 pOpts->SetDragWithCopy( maOptionsMisc.IsDragWithCopy() ); 821 pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() ); 822 pOpts->SetBigHandles( maOptionsMisc.IsBigHandles() ); 823 pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() ); 824 pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() ); 825 pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() ); | 747 maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() ); 748 // #90356# 749 maOptionsMisc.SetShowUndoDeleteWarning( pOpts->IsShowUndoDeleteWarning() ); 750 maOptionsMisc.SetPrinterIndependentLayout( pOpts->GetPrinterIndependentLayout() ); 751 // #97016# 752 maOptionsMisc.SetDefaultObjectSizeWidth( pOpts->GetDefaultObjectSizeWidth() ); 753 maOptionsMisc.SetDefaultObjectSizeHeight( pOpts->GetDefaultObjectSizeHeight() ); 754 --- 73 unchanged lines hidden (view full) --- 828 pOpts->SetQuickEdit( maOptionsMisc.IsQuickEdit() ); 829 pOpts->SetMasterPagePaintCaching( maOptionsMisc.IsMasterPagePaintCaching() ); 830 pOpts->SetDragWithCopy( maOptionsMisc.IsDragWithCopy() ); 831 pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() ); 832 pOpts->SetBigHandles( maOptionsMisc.IsBigHandles() ); 833 pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() ); 834 pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() ); 835 pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() ); |
836 pOpts->SetStartWithPresenterScreen( maOptionsMisc.IsStartWithPresenterScreen() ); |
|
826 pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() ); 827 pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() ); 828 pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() ); 829 // #90356# 830 pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() ); 831 pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() ); 832 pOpts->SetShowComments( maOptionsMisc.IsShowComments() ); 833 // #97016# --- 784 unchanged lines hidden --- | 837 pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() ); 838 pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() ); 839 pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() ); 840 // #90356# 841 pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() ); 842 pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() ); 843 pOpts->SetShowComments( maOptionsMisc.IsShowComments() ); 844 // #97016# --- 784 unchanged lines hidden --- |