diff options
Diffstat (limited to 'sd/source/ui/view/drviews6.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 6be0ffe52c90..a29abf742705 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) GetValue()); if(HasCurrentFunction(SID_BEZIER_EDIT)) - { // ggf. die richtige Editfunktion aktivieren + { // ggf. die richtige Editfunktion aktivieren GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } @@ -149,8 +149,8 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) !((SdrTextObj*) pObj)->HasText() ) { // automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert -// if ( pDlg ) -// pDlg->SetActive(FALSE); +// if ( pDlg ) +// pDlg->SetActive(FALSE); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); @@ -169,7 +169,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) { if ( pDlg ) { -// pDlg->SetActive(); +// pDlg->SetActive(); pDlg->SetColorTable(GetDoc()->GetColorTable()); } @@ -250,7 +250,7 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + UINT16 nId = pObj->GetObjIdentifier(); // 1 selektiertes Gruppenobjekt if( nInv == SdrInventor && nId == OBJ_GRUP ) nValue = 3; @@ -362,8 +362,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if ( pObj && !mpDrawView->IsTextEdit() ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); - BOOL bCont = TRUE; + SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + BOOL bCont = TRUE; if( pNewObj->IsLinkedGraphic() ) { @@ -381,8 +381,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( bCont ) { - const Graphic& rOldGraphic = pNewObj->GetGraphic(); - const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + const Graphic& rOldGraphic = pNewObj->GetGraphic(); + const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( rOldGraphic ) ); @@ -391,7 +391,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) SdrPageView* pPV = mpDrawView->GetSdrPageView(); pNewObj->SetEmptyPresObj( FALSE ); - pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); @@ -420,11 +420,11 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; - USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); - SvxBmpMask* pDlg = NULL; - BOOL bEnable = FALSE; + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrObject* pObj = NULL; + USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); + SvxBmpMask* pDlg = NULL; + BOOL bEnable = FALSE; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -672,7 +672,7 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) rReq.Ignore (); } break; - + case SID_LAYER_DIALOG_WIN: { if ( rReq.GetArgs() ) |