strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw013 (1.29.34); FILE MERGED

Browse source 
2004/06/28 14:57:56 aw 1.29.34.2: #117254#
2004/06/24 09:33:16 aw 1.29.34.1: #i29181#
This commit is contained in:
Rüdiger Timm 2004-07-12 14:16:22 +00:00
parent 2165b22952
commit 67a0b1fb9d
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sd/source/ui/view/drviews2.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviews2.cxx,v $
*
* $Revision: 1.29 $
* $Revision: 1.30 $
*
* last change: $Author: hr $ $Date: 2004-05-10 15:51:10 $
* last change: $Author: rt $ $Date: 2004-07-12 15:16:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -305,7 +305,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if(nSId == SID_ATTR_LINE_WIDTH)
{
SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = pDrView->GetMarkList();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
ULONG nCount = rMarkList.GetMarkCount();
INT32 nNewLineWidth = ((const XLineWidthItem&)rReq.GetArgs()->Get(XATTR_LINEWIDTH)).GetValue();
@ -354,7 +354,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// Ggf. werden transparente Objekte wei?gefuellt
SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = pDrView->GetMarkList();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
ULONG nCount = rMarkList.GetMarkCount();
for (ULONG i=0; i<nCount; i++)
@ -474,8 +474,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->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 = pActualPage->GetMasterPageVisibleLayers(nPos);
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
BOOL bHandoutMode = FALSE;
SdPage* pHandoutMPage = NULL;
String aNewName;
@ -689,8 +688,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE);
aVisibleLayers.Set(aBckgrnd, bBVisible);
aVisibleLayers.Set(aBckgrndObj, bBObjsVisible);
nPos = 0;
pActualPage->SetMasterPageVisibleLayers(aVisibleLayers, nPos);
pActualPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
else
{
@ -1019,7 +1017,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
// fit rectangle of graphic-object to mark-rect
Rectangle aAllMarkedRect;
SdrMarkList aMarkList = pDrView->GetMarkList();
SdrMarkList aMarkList = pDrView->GetMarkedObjectList();
for (int i=0; i < (int) aMarkList.GetMarkCount(); i++)
{
aAllMarkedRect.Union ( aMarkList.GetMark(i)->GetObj()->GetCurrentBoundRect() );
@ -1027,7 +1025,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pGraphicObj->SetLogicRect (aAllMarkedRect);
// get page-view
SdrPageView* pPageView = pDrView->GetMarkList().GetMark(0)->GetPageView();
SdrPageView* pPageView = pDrView->GetMarkedObjectList().GetMark(0)->GetPageView();
// delete marked objects
pDrView->DeleteMarkedObj(); // #69979# delete the objects, not only the marked area
@ -1062,7 +1060,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
else
{
const SdrMarkList& rMarkList = pDrView->GetMarkList();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
ULONG nCount = rMarkList.GetMarkCount();
// In diese Liste werden fuer jedes Praesentationsobjekt ein SfxItemSet
@ -1234,8 +1232,7 @@ void DrawViewShell::CreateOrDuplicatePage (SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->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 = pActualPage->GetMasterPageVisibleLayers(nPos);
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
String aStandardPageName;
String aNotesPageName;