diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 08:56:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 08:56:27 +0000 |
| commit | 1a97ee3084c7a10171d338b3bca9bd5aa759eb58 (patch) | |
| tree | 44844d427aa2478d2b1cc833de8f368b065c9146 | |
| parent | f2e42ed5c1c3399a1109314eb32b5b4e20e3987c (diff) | |
INTEGRATION: CWS aw018 (1.19.72); FILE MERGED
2004/10/11 11:26:53 aw 1.19.72.2: RESYNC: (1.19-1.20); FILE MERGED
2004/09/21 14:47:47 aw 1.19.72.1: #i26631#
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 0fe0d4442edb..a1e33a55e98e 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmview.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:44:48 $ + * last change: $Author: hr $ $Date: 2004-10-12 09:56:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,6 +254,10 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * eHandoutEditMode = pFrameView->GetViewShEditMode(PK_HANDOUT); bLayerMode = pFrameView->IsLayerMode(); bQuickEdit = pFrameView->IsQuickEdit(); + + // #i26631# + SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); + bDragWithCopy = pFrameView->IsDragWithCopy(); bBigHandles = pFrameView->IsBigHandles(); bDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit(); @@ -647,8 +651,11 @@ void FrameView::Update(SdOptions* pOptions) Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 )); SetSnapGridWidth(aFractX, aFractY); SetQuickEdit(pOptions->IsQuickEdit()); - SetDragWithCopy(pOptions->IsDragWithCopy()); + // #i26631# + SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); + + SetDragWithCopy(pOptions->IsDragWithCopy()); SetBigHandles( pOptions->IsBigHandles() ); SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() ); SetClickChangeRotation( pOptions->IsClickChangeRotation() ); |