diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 14:24:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 14:24:13 +0000 |
| commit | dfadf1ddb3f68bb8b200d1e1738ac3ddf3f0fff8 (patch) | |
| tree | a3a370b572f83a07342f205bc8cfa8a6be9f5831 /sd/source/ui/view/unmodpg.cxx | |
| parent | cb7ed9e5309dcb486752c1210ad584e17556b0a6 (diff) | |
INTEGRATION: CWS aw013 (1.5.452); FILE MERGED
2004/06/28 14:57:59 aw 1.5.452.2: #117254#
2004/06/24 09:33:20 aw 1.5.452.1: #i29181#
Diffstat (limited to 'sd/source/ui/view/unmodpg.cxx')
| -rw-r--r-- | sd/source/ui/view/unmodpg.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index c8aad3feaced..f4f7dcd036ba 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unmodpg.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2001-11-13 18:11:53 $ + * last change: $Author: rt $ $Date: 2004-07-12 15:24:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,8 +117,7 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - USHORT nPos = 0; - SetOfByte aVisibleLayers = pPage->GetMasterPageVisibleLayers(nPos); + SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); bOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd); bOldBckgrndObjsVisible = aVisibleLayers.IsSet(aBckgrndObj); @@ -148,7 +147,7 @@ void ModifyPageUndoAction::Undo() while(pView) { - if(pView->HasMarked()) + if(pView->AreObjectsMarked()) pView->UnmarkAll(); pView = aIter.NextView(); } @@ -171,13 +170,10 @@ void ModifyPageUndoAction::Undo() SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - USHORT nPos = 0; SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, bOldBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, bOldBckgrndObjsVisible); - - nPos = 0; - pPage->SetMasterPageVisibleLayers(aVisibleLayers, nPos); + pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } // Redisplay @@ -208,7 +204,7 @@ void ModifyPageUndoAction::Redo() while(pView) { - if(pView->HasMarked()) + if(pView->AreObjectsMarked()) pView->UnmarkAll(); pView = aIter.NextView(); } @@ -231,13 +227,10 @@ void ModifyPageUndoAction::Redo() SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - USHORT nPos = 0; SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, bNewBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, bNewBckgrndObjsVisible); - - nPos = 0; - pPage->SetMasterPageVisibleLayers(aVisibleLayers, nPos); + pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } // Redisplay |