diff options
Diffstat (limited to 'sw/source/ui/shells/drwbassh.cxx')
| -rw-r--r-- | sw/source/ui/shells/drwbassh.cxx | 62 |
1 files changed, 13 insertions, 49 deletions
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 70aba0ae2a8f..e8b452a46625 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,11 +86,6 @@ SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0)) TYPEINIT1(SwDrawBaseShell,SwBaseShell) -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwDrawBaseShell::SwDrawBaseShell(SwView &_rView): SwBaseShell( _rView ) { @@ -105,11 +101,6 @@ SwDrawBaseShell::SwDrawBaseShell(SwView &_rView): SwTransferable::CreateSelection( GetShell() ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwDrawBaseShell::~SwDrawBaseShell() { GetView().ExitDraw(); @@ -117,11 +108,6 @@ SwDrawBaseShell::~SwDrawBaseShell() SwTransferable::ClearSelection( GetShell() ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void SwDrawBaseShell::Execute(SfxRequest &rReq) { SwWrtShell *pSh = &GetShell(); @@ -137,7 +123,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) //Sonderfall Align per Menue if(pItem && nSlotId == SID_OBJECT_ALIGN) { - DBG_ASSERT(PTR_CAST(SfxEnumItem, pItem),"SfxEnumItem erwartet"); + OSL_ENSURE(PTR_CAST(SfxEnumItem, pItem),"SfxEnumItem expected"); nSlotId = nSlotId + ((const SfxEnumItem*)pItem)->GetValue(); nSlotId++; } @@ -174,10 +160,10 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) pSh->GetObjAttr(aSet); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); + OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); SfxAbstractDialog* pDlg = pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, sal_True, RC_DLG_SWWRAPDLG ); - DBG_ASSERT(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (pDlg->Execute() == RET_OK) { @@ -236,7 +222,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) pFact->CreateCaptionDialog( NULL, pSdrView, nAllowedAnchors ); pCaptionDlg->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) ); pDlg = pCaptionDlg; - DBG_ASSERT(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialogdiet fail!"); } } else @@ -249,7 +235,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) pFact->CreateSvxTransformTabDialog( NULL, NULL, pSdrView, nAllowedAnchors ); pTransform->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) ); pDlg = pTransform; - DBG_ASSERT(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialogdiet fail!"); } } SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked()); @@ -422,7 +408,6 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { pSh->LeaveSelFrmMode(); // #105852# FME -// pSh->NoEdit(); } bNotify = sal_True; } @@ -616,7 +601,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) } default: - DBG_ASSERT(!this, "falscher Dispatcher"); + OSL_ENSURE(!this, "wrong Dispatcher"); return; } if(!bDone) @@ -632,7 +617,8 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) GetView().AttrChangedNotify(pSh); // ggf Shellwechsel... } } -/* -----------------------------27.02.2002 15:27------------------------------ + +/* --------------------------------------------------------------------------- Checks whether a given name is allowed for a group shape ---------------------------------------------------------------------------*/ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNameDialog ) @@ -640,7 +626,7 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam SwWrtShell &rSh = GetShell(); SdrView *pSdrView = rSh.GetDrawView(); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - DBG_ASSERT(rMarkList.GetMarkCount() == 1, "wrong draw selection"); + OSL_ENSURE(rMarkList.GetMarkCount() == 1, "wrong draw selection"); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const String sCurrentName = pObj->GetName(); String sNewName; @@ -652,19 +638,6 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam { nRet = 1; SdrModel* pModel = rSh.getIDocumentDrawModelAccess()->GetDrawModel(); - // --> OD 2006-03-09 #i51726# - all drawing objects can be named now. - // consider also drawing objects inside group objects -// SdrPage* pPage = pModel->GetPage(0); -// sal_uInt32 nCount = pPage->GetObjCount(); -// for( sal_uInt32 i=0; i< nCount; i++ ) -// { -// SdrObject* pTemp = pPage->GetObj(i); -// if(pObj != pTemp && pTemp->ISA(SdrObjGroup) && pTemp->GetName() == sNewName) -// { -// nRet = 0; -// break; -// } -// } SdrObjListIter aIter( *(pModel->GetPage(0)), IM_DEEPWITHGROUPS ); while( aIter.IsMore() ) { @@ -679,9 +652,7 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam } return nRet; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ + void SwDrawBaseShell::GetState(SfxItemSet& rSet) { SwWrtShell &rSh = GetShell(); @@ -774,11 +745,6 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich) { sal_Bool bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT); @@ -802,7 +768,7 @@ sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich) return bDisable; } -/*-- 09.03.2004 13:15:03--------------------------------------------------- +/*------------------------------------------------------------------------- Validate of drawing positions -----------------------------------------------------------------------*/ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation ) @@ -995,6 +961,4 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation return 0; } - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |